Author: viper Date: 2006-04-18 22:34:02 +0200 (Tue, 18 Apr 2006) New Revision: 1267 Removed: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch Modified: crux-2.2/ports/opt/cyrus-sasl/.footprint crux-2.2/ports/opt/cyrus-sasl/.md5sum crux-2.2/ports/opt/cyrus-sasl/Pkgfile Log: cyrus-sasl: removed plugin_path patch; removed symbolic link to /etc/sasl/apps Modified: crux-2.2/ports/opt/cyrus-sasl/.footprint =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/.footprint 2006-04-17 13:02:01 UTC (rev 1266) +++ crux-2.2/ports/opt/cyrus-sasl/.footprint 2006-04-18 20:34:02 UTC (rev 1267) @@ -1,8 +1,6 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/saslauthd -drwxr-xr-x root/root etc/sasl/ -lrwxrwxrwx root/root etc/sasl/apps -> /usr/lib/sasl2 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/sasl/ Modified: crux-2.2/ports/opt/cyrus-sasl/.md5sum =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/.md5sum 2006-04-17 13:02:01 UTC (rev 1266) +++ crux-2.2/ports/opt/cyrus-sasl/.md5sum 2006-04-18 20:34:02 UTC (rev 1267) @@ -1,5 +1,4 @@ 4ecd4363f41acc640bec4eedbd3b76c9 cyrus-sasl-2.1.21-crypt.patch d5d1c592c1581ec4bd02bb96e299bd9e cyrus-sasl-2.1.21-gcc4.patch -88896aa3a87ca1a56ba126a398b1ebb1 cyrus-sasl-2.1.21-plugin_path.patch dde02db234dea892bee298390890502e cyrus-sasl-2.1.21.tar.gz ec81c1d452216c3da110d7b9a6f8fa8f saslauthd Modified: crux-2.2/ports/opt/cyrus-sasl/Pkgfile =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/Pkgfile 2006-04-17 13:02:01 UTC (rev 1266) +++ crux-2.2/ports/opt/cyrus-sasl/Pkgfile 2006-04-18 20:34:02 UTC (rev 1267) @@ -6,11 +6,10 @@ name=cyrus-sasl version=2.1.21 -release=3 +release=4 source=(http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz \ $name-$version-crypt.patch \ $name-$version-gcc4.patch \ - $name-$version-plugin_path.patch \ saslauthd) build(){ @@ -18,8 +17,6 @@ # fix the crypt function patch -p0 < $SRC/$name-$version-crypt.patch - # set the plugin path to '/etc/sasl/apps' - patch -p0 < $SRC/$name-$version-plugin_path.patch # necessary to compile cyrus-sasl with gcc4 patch -p0 < $SRC/$name-$version-gcc4.patch @@ -43,11 +40,10 @@ mkdir -p \ $PKG/usr/lib/sasl2 \ $PKG/var/sasl/saslauthd \ - $PKG/etc/{sasl,rc.d} \ + $PKG/etc/rc.d \ $PKG/usr/man/man8 install -m 755 $SRC/saslauthd $PKG/etc/rc.d - ln -s /usr/lib/sasl2 $PKG/etc/sasl/apps mv $PKG/usr/man/cat8/*.8 $PKG/usr/man/man8 rmdir $PKG/usr/man/cat8 Deleted: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch 2006-04-17 13:02:01 UTC (rev 1266) +++ crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch 2006-04-18 20:34:02 UTC (rev 1267) @@ -1,22 +0,0 @@ -Index: lib/server.c ---- lib/server.c 2004-11-17 15:19:30 +0100 -+++ lib/server.c 2005-05-26 20:54:36 +0200 -@@ -473,16 +473,8 @@ - return SASL_CONTINUE; - } - -- /* get the path to the plugins; for now the config file will reside there */ -- getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks ); -- if (getpath_cb==NULL) return SASL_BADPARAM; -- -- /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type -- system */ -- result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context, -- &path_to_config); -- if (result!=SASL_OK) goto done; -- if (path_to_config == NULL) path_to_config = ""; -+ result = SASL_OK; -+ path_to_config = "/etc/sasl/apps"; - - c = strchr(path_to_config, PATHS_DELIMITER); -