Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

5 files changed, 56 insertions, 63 deletions

diff --git a/base/cyrus-sasl/.footprint.i686 b/base/cyrus-sasl/.footprint.i686
index 465b70d0b..ccc4bb30c 100644
--- a/base/cyrus-sasl/.footprint.i686
+++ b/base/cyrus-sasl/.footprint.i686
@@ -10,38 +10,34 @@ drwxr-xr-x	root/root	usr/include/sasl/
 -rw-r--r--	root/root	usr/include/sasl/saslutil.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libsasl2.la
-lrwxrwxrwx	root/root	usr/lib/libsasl2.so -> libsasl2.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/libsasl2.so.2 -> libsasl2.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/libsasl2.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/libsasl2.so -> libsasl2.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/libsasl2.so.2 -> libsasl2.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/libsasl2.so.2.0.23
 drwxr-xr-x	root/root	usr/lib/sasl2/
 -rwxr-xr-x	root/root	usr/lib/sasl2/libanonymous.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so -> libanonymous.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so.2 -> libanonymous.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libanonymous.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so -> libanonymous.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so.2 -> libanonymous.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libanonymous.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libcrammd5.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so -> libcrammd5.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so.2 -> libcrammd5.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libcrammd5.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so -> libcrammd5.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so.2 -> libcrammd5.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libcrammd5.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libdigestmd5.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so -> libdigestmd5.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so.2 -> libdigestmd5.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libdigestmd5.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libgssapiv2.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libgssapiv2.so -> libgssapiv2.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libgssapiv2.so.2 -> libgssapiv2.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libgssapiv2.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so -> libdigestmd5.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so.2 -> libdigestmd5.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libdigestmd5.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libotp.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so -> libotp.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so.2 -> libotp.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libotp.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so -> libotp.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so.2 -> libotp.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libotp.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libplain.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so -> libplain.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so.2 -> libplain.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libplain.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so -> libplain.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so.2 -> libplain.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libplain.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libsasldb.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so -> libsasldb.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so.2 -> libsasldb.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libsasldb.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so -> libsasldb.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so.2 -> libsasldb.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libsasldb.so.2.0.23
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/pluginviewer
 -rwxr-xr-x	root/root	usr/sbin/saslauthd
diff --git a/base/cyrus-sasl/.footprint.x86_64 b/base/cyrus-sasl/.footprint.x86_64
index 465b70d0b..ccc4bb30c 100644
--- a/base/cyrus-sasl/.footprint.x86_64
+++ b/base/cyrus-sasl/.footprint.x86_64
@@ -10,38 +10,34 @@ drwxr-xr-x	root/root	usr/include/sasl/
 -rw-r--r--	root/root	usr/include/sasl/saslutil.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libsasl2.la
-lrwxrwxrwx	root/root	usr/lib/libsasl2.so -> libsasl2.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/libsasl2.so.2 -> libsasl2.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/libsasl2.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/libsasl2.so -> libsasl2.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/libsasl2.so.2 -> libsasl2.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/libsasl2.so.2.0.23
 drwxr-xr-x	root/root	usr/lib/sasl2/
 -rwxr-xr-x	root/root	usr/lib/sasl2/libanonymous.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so -> libanonymous.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so.2 -> libanonymous.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libanonymous.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so -> libanonymous.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libanonymous.so.2 -> libanonymous.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libanonymous.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libcrammd5.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so -> libcrammd5.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so.2 -> libcrammd5.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libcrammd5.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so -> libcrammd5.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libcrammd5.so.2 -> libcrammd5.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libcrammd5.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libdigestmd5.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so -> libdigestmd5.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so.2 -> libdigestmd5.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libdigestmd5.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libgssapiv2.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libgssapiv2.so -> libgssapiv2.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libgssapiv2.so.2 -> libgssapiv2.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libgssapiv2.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so -> libdigestmd5.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libdigestmd5.so.2 -> libdigestmd5.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libdigestmd5.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libotp.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so -> libotp.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so.2 -> libotp.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libotp.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so -> libotp.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libotp.so.2 -> libotp.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libotp.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libplain.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so -> libplain.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so.2 -> libplain.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libplain.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so -> libplain.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libplain.so.2 -> libplain.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libplain.so.2.0.23
 -rwxr-xr-x	root/root	usr/lib/sasl2/libsasldb.la
-lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so -> libsasldb.so.2.0.22
-lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so.2 -> libsasldb.so.2.0.22
--rwxr-xr-x	root/root	usr/lib/sasl2/libsasldb.so.2.0.22
+lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so -> libsasldb.so.2.0.23
+lrwxrwxrwx	root/root	usr/lib/sasl2/libsasldb.so.2 -> libsasldb.so.2.0.23
+-rwxr-xr-x	root/root	usr/lib/sasl2/libsasldb.so.2.0.23
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/pluginviewer
 -rwxr-xr-x	root/root	usr/sbin/saslauthd
diff --git a/base/cyrus-sasl/.md5sum.i686 b/base/cyrus-sasl/.md5sum.i686
index da2c9c0eb..3a091208f 100644
--- a/base/cyrus-sasl/.md5sum.i686
+++ b/base/cyrus-sasl/.md5sum.i686
@@ -1,2 +1 @@
-45dde9d19193ae9dd388eb68b2027bc9  cyrus-sasl-2.1.22.tar.gz
-022c1a9b260cb49887b4908e5acfeb44  gcc44-1.patch
+2eb0e48106f0e9cd8001e654f267ecbc  cyrus-sasl-2.1.23.tar.gz
diff --git a/base/cyrus-sasl/.md5sum.x86_64 b/base/cyrus-sasl/.md5sum.x86_64
index da2c9c0eb..3a091208f 100644
--- a/base/cyrus-sasl/.md5sum.x86_64
+++ b/base/cyrus-sasl/.md5sum.x86_64
@@ -1,2 +1 @@
-45dde9d19193ae9dd388eb68b2027bc9  cyrus-sasl-2.1.22.tar.gz
-022c1a9b260cb49887b4908e5acfeb44  gcc44-1.patch
+2eb0e48106f0e9cd8001e654f267ecbc  cyrus-sasl-2.1.23.tar.gz
diff --git a/base/cyrus-sasl/Pkgfile b/base/cyrus-sasl/Pkgfile
index 7b9894fe2..7534a428c 100644
--- a/base/cyrus-sasl/Pkgfile
+++ b/base/cyrus-sasl/Pkgfile
@@ -5,19 +5,22 @@
 
 name=cyrus-sasl
 version=2.1.23
-release=1
-source=( http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz\
-	http://nutyx.meticul.eu/files/patchs/$name/gcc44-1.patch)
+release=2
+source=( http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz)
+
 build() {
 	cd $name-$version
-#	patch -Np1 -i ../gcc44-1.patch
 	
-	./configure --prefix=/usr --sysconfdir=/etc \
-	--mandir=/usr/share/man \
-	--with-dbpath=/var/lib/sasl/sasldb2 \
-	--with-saslauthd=/var/run/saslauthd
+	sed -i.bak 's/#elif WITH_DES/#elif defined(WITH_DES)/' \
+    		plugins/digestmd5.c &&
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--with-dbpath=/var/lib/sasl/sasldb2 \
+		--with-saslauthd=/var/run/saslauthd
 	make
 	make DESTDIR=$PKG install
 	install -v -m700 -d $PKG/var/lib/sasl $PKG/var/run/saslauthd
 }
-  
+