diff options
| -rw-r--r-- | cyrus-sasl/.footprint | 52 | ||||
| -rw-r--r-- | cyrus-sasl/.md5sum | 5 | ||||
| -rw-r--r-- | cyrus-sasl/Pkgfile | 10 | ||||
| -rw-r--r-- | cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch | 10 | ||||
| -rw-r--r-- | cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch | 11 | ||||
| -rw-r--r-- | cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch | 10 |
6 files changed, 42 insertions, 56 deletions
diff --git a/cyrus-sasl/.footprint b/cyrus-sasl/.footprint index 09be30749..d7f253352 100644 --- a/cyrus-sasl/.footprint +++ b/cyrus-sasl/.footprint @@ -13,38 +13,38 @@ 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.21 -lrwxrwxrwx root/root usr/lib/libsasl2.so.2 -> libsasl2.so.2.0.21 --rwxr-xr-x root/root usr/lib/libsasl2.so.2.0.21 +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 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.21 -lrwxrwxrwx root/root usr/lib/sasl2/libanonymous.so.2 -> libanonymous.so.2.0.21 --rwxr-xr-x root/root usr/lib/sasl2/libanonymous.so.2.0.21 +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 -rwxr-xr-x root/root usr/lib/sasl2/libcrammd5.la -lrwxrwxrwx root/root usr/lib/sasl2/libcrammd5.so -> libcrammd5.so.2.0.21 -lrwxrwxrwx root/root usr/lib/sasl2/libcrammd5.so.2 -> libcrammd5.so.2.0.21 --rwxr-xr-x root/root usr/lib/sasl2/libcrammd5.so.2.0.21 +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 -rwxr-xr-x root/root usr/lib/sasl2/libdigestmd5.la -lrwxrwxrwx root/root usr/lib/sasl2/libdigestmd5.so -> libdigestmd5.so.2.0.21 -lrwxrwxrwx root/root usr/lib/sasl2/libdigestmd5.so.2 -> libdigestmd5.so.2.0.21 --rwxr-xr-x root/root usr/lib/sasl2/libdigestmd5.so.2.0.21 +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/liblogin.la -lrwxrwxrwx root/root usr/lib/sasl2/liblogin.so -> liblogin.so.2.0.21 -lrwxrwxrwx root/root usr/lib/sasl2/liblogin.so.2 -> liblogin.so.2.0.21 --rwxr-xr-x root/root usr/lib/sasl2/liblogin.so.2.0.21 +lrwxrwxrwx root/root usr/lib/sasl2/liblogin.so -> liblogin.so.2.0.22 +lrwxrwxrwx root/root usr/lib/sasl2/liblogin.so.2 -> liblogin.so.2.0.22 +-rwxr-xr-x root/root usr/lib/sasl2/liblogin.so.2.0.22 -rwxr-xr-x root/root usr/lib/sasl2/libotp.la -lrwxrwxrwx root/root usr/lib/sasl2/libotp.so -> libotp.so.2.0.21 -lrwxrwxrwx root/root usr/lib/sasl2/libotp.so.2 -> libotp.so.2.0.21 --rwxr-xr-x root/root usr/lib/sasl2/libotp.so.2.0.21 +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 -rwxr-xr-x root/root usr/lib/sasl2/libplain.la -lrwxrwxrwx root/root usr/lib/sasl2/libplain.so -> libplain.so.2.0.21 -lrwxrwxrwx root/root usr/lib/sasl2/libplain.so.2 -> libplain.so.2.0.21 --rwxr-xr-x root/root usr/lib/sasl2/libplain.so.2.0.21 +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 -rwxr-xr-x root/root usr/lib/sasl2/libsasldb.la -lrwxrwxrwx root/root usr/lib/sasl2/libsasldb.so -> libsasldb.so.2.0.21 -lrwxrwxrwx root/root usr/lib/sasl2/libsasldb.so.2 -> libsasldb.so.2.0.21 --rwxr-xr-x root/root usr/lib/sasl2/libsasldb.so.2.0.21 +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 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/sasl.3.gz @@ -69,6 +69,7 @@ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/sasl_errdetail.3.gz -rw-r--r-- root/root usr/man/man3/sasl_errors.3.gz -rw-r--r-- root/root usr/man/man3/sasl_errstring.3.gz +-rw-r--r-- root/root usr/man/man3/sasl_getconfpath_t.3.gz -rw-r--r-- root/root usr/man/man3/sasl_getopt_t.3.gz -rw-r--r-- root/root usr/man/man3/sasl_getpath_t.3.gz -rw-r--r-- root/root usr/man/man3/sasl_getprop.3.gz @@ -90,13 +91,16 @@ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/sasl_user_exists.3.gz -rw-r--r-- root/root usr/man/man3/sasl_verifyfile_t.3.gz drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/pluginviewer.8.gz -rw-r--r-- root/root usr/man/man8/saslauthd.8.gz -rw-r--r-- root/root usr/man/man8/sasldblistusers2.8.gz -rw-r--r-- root/root usr/man/man8/saslpasswd2.8.gz drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/pluginviewer -rwxr-xr-x root/root usr/sbin/saslauthd -rwxr-xr-x root/root usr/sbin/sasldblistusers2 -rwxr-xr-x root/root usr/sbin/saslpasswd2 +-rwxr-xr-x root/root usr/sbin/testsaslauthd drwxr-xr-x root/root var/ drwxr-xr-x root/root var/sasl/ drwxr-xr-x root/root var/sasl/saslauthd/ diff --git a/cyrus-sasl/.md5sum b/cyrus-sasl/.md5sum index 898139e3f..14c7a31b4 100644 --- a/cyrus-sasl/.md5sum +++ b/cyrus-sasl/.md5sum @@ -1,4 +1,3 @@ -12abd43ee1bb76804d4a08e7c14779e2 cyrus-sasl-2.1.21-crypt.patch -7d8078328937d6d99db509931cec6664 cyrus-sasl-2.1.21-gcc4.patch -dde02db234dea892bee298390890502e cyrus-sasl-2.1.21.tar.gz +24cceff814d8e00e80e06ca195e4e9fe cyrus-sasl-2.1.22-crypt.patch +45dde9d19193ae9dd388eb68b2027bc9 cyrus-sasl-2.1.22.tar.gz ec81c1d452216c3da110d7b9a6f8fa8f saslauthd diff --git a/cyrus-sasl/Pkgfile b/cyrus-sasl/Pkgfile index 638ef4f5d..ddbbc464b 100644 --- a/cyrus-sasl/Pkgfile +++ b/cyrus-sasl/Pkgfile @@ -5,11 +5,10 @@ # Depends on: db, openssl name=cyrus-sasl -version=2.1.21 -release=4 +version=2.1.22 +release=1 source=(http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz \ $name-$version-crypt.patch \ - $name-$version-gcc4.patch \ saslauthd) build(){ @@ -17,8 +16,6 @@ build(){ # fix the crypt function patch -p1 < $SRC/$name-$version-crypt.patch - # necessary to compile cyrus-sasl with gcc4 - patch -p1 < $SRC/$name-$version-gcc4.patch ./configure \ --prefix=/usr \ @@ -44,7 +41,4 @@ build(){ $PKG/usr/man/man8 install -m 755 $SRC/saslauthd $PKG/etc/rc.d - mv $PKG/usr/man/cat8/*.8 $PKG/usr/man/man8 - - rmdir $PKG/usr/man/cat8 } diff --git a/cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch b/cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch deleted file mode 100644 index 858b56c4d..000000000 --- a/cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cyrus-sasl-2.1.21/saslauthd/auth_shadow.c 2004-04-27 17:56:23.000000000 +0200 -+++ cyrus-sasl-2.1.21-new/saslauthd/auth_shadow.c 2006-04-18 22:42:15.000000000 +0200 -@@ -45,6 +45,7 @@ - # include <time.h> - # include <pwd.h> - # include <syslog.h> -+# include <crypt.h> - # ifndef HAVE_GETSPNAM - - # ifdef WITH_DES diff --git a/cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch b/cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch deleted file mode 100644 index 14d8eac16..000000000 --- a/cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cyrus-sasl-2.1.21/lib/client.c 2004-11-17 15:19:30.000000000 +0100 -+++ cyrus-sasl-2.1.21-new/lib/client.c 2006-04-18 22:42:15.000000000 +0200 -@@ -61,7 +61,7 @@ - - static cmech_list_t *cmechlist; /* global var which holds the list */ - --static sasl_global_callbacks_t global_callbacks; -+sasl_global_callbacks_t global_callbacks; - - static int _sasl_client_active = 0; - diff --git a/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch new file mode 100644 index 000000000..328600268 --- /dev/null +++ b/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch @@ -0,0 +1,10 @@ +--- cyrus-sasl-2.1.22/saslauthd/auth_shadow.c 2006-04-19 21:36:36.000000000 +0200 ++++ cyrus-sasl-2.1.22-new/saslauthd/auth_shadow.c 2006-05-22 13:21:31.000000000 +0200 +@@ -45,6 +45,7 @@ + # include <time.h> + # include <pwd.h> + # include <syslog.h> ++# include <crypt.h> + # ifndef HAVE_GETSPNAM + + # ifdef WITH_DES |