From b901a9df679c70a345a12e673c67a68785730fc0 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Mon, 24 Jan 2000 05:22:22 +0000
Subject: Update to version 1.5.15.

PR:		16130
Submitted by:	maintainer
---
 security/cyrus-sasl/files/patch-ab   | 31 +++----------------------------
 security/cyrus-sasl/files/pwcheck.sh |  5 ++++-
 2 files changed, 7 insertions(+), 29 deletions(-)

(limited to 'security/cyrus-sasl/files')

diff --git a/security/cyrus-sasl/files/patch-ab b/security/cyrus-sasl/files/patch-ab
index 0b4cbade7bcf..7818e6664158 100644
--- a/security/cyrus-sasl/files/patch-ab
+++ b/security/cyrus-sasl/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.in.orig	Thu Dec  2 14:10:30 1999
-+++ configure.in	Sat Dec  4 17:59:13 1999
-@@ -213,6 +213,7 @@
+--- configure.in.orig	Thu Jan 13 23:00:16 2000
++++ configure.in	Fri Jan 14 17:56:41 2000
+@@ -222,6 +222,7 @@
    AC_CHECK_LIB(crypt, crypt,
  	       LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
  	       cmu_have_crypt=no))
@@ -8,28 +8,3 @@
  
  CMU_SOCKETS
  
-@@ -503,15 +504,22 @@
- 	    with_rc4=no)
- 
-   if test "$with_rc4" = no; then
-+
-+	  dnl if openssl has been compiled with the rsaref2 libraries,
-+	  dnl we need to include the rsaref libraries in the crypto check
-+	  LIB_RSAREF=""
-+	  AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
-+		  LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
-+		  cmu_have_rsaref=no)
-+
- 	  AC_CHECK_LIB(crypto, RC4_set_key,
- 		  AC_CHECK_HEADER(openssl/rc4.h, [AC_DEFINE(WITH_SSL_RC4)
-                                                   LIB_RC4="-lcrypto";
- 						  with_rc4="openssl"],
- 			          AC_WARN([SSL: Disabling rc4 support]); 
-                                   with_rc4=no),
--		       AC_WARN([SSL2: Disabling rc4 support]); with_rc4=no)
-+		       AC_WARN([SSL2: Disabling rc4 support]); with_rc4=no, $LIB_RSAREF)
-   fi
--
-   LIBS="$cmu_save_LIBS"
- fi
- 
diff --git a/security/cyrus-sasl/files/pwcheck.sh b/security/cyrus-sasl/files/pwcheck.sh
index 17c4597433bb..ba07b9fc580a 100644
--- a/security/cyrus-sasl/files/pwcheck.sh
+++ b/security/cyrus-sasl/files/pwcheck.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 #
+# $FreeBSD$
+#
 
-PREFIX=/usr/local
+PREFIX=%%PREFIX%%
 
 case "$1" in
 
@@ -16,6 +18,7 @@ stop)
 	if [ -r /var/run/pwcheck.pid ]
 	then
 		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
+		rm /var/run/pwcheck.pid
 	fi
 	;;
 
-- 
cgit v1.2.3