From 58d31609653a2e56cb83107a5be60b98b8b05393 Mon Sep 17 00:00:00 2001
From: fredb <fredb@pkgsrc.org>
Date: Thu, 20 Mar 2003 17:30:17 +0000
Subject: Give authentication with blowfish hashes a fighting chance to work on
 NetBSD, by linking in -lcrypt before -lcrypto in the shared library and
 scheduler. (cups_crypto() looks to fall-back to crypt(). Both of the shared
 libraries in question have crypt(), but only the one in -lcrypt supports
 blowfish hashes.) Not tested.

---
 print/cups/distinfo         |  4 +++-
 print/cups/patches/patch-aa | 15 +++++++++++++++
 print/cups/patches/patch-ae | 17 +++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 print/cups/patches/patch-aa
 create mode 100644 print/cups/patches/patch-ae

diff --git a/print/cups/distinfo b/print/cups/distinfo
index f6454d3bae4..584919cc183 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.20 2002/12/20 06:59:59 jlam Exp $
+$NetBSD: distinfo,v 1.21 2003/03/20 17:30:17 fredb Exp $
 
 SHA1 (cups-1.1.18-source.tar.bz2) = 03973207391df399608691563e804ed5afce45b3
 Size (cups-1.1.18-source.tar.bz2) = 3491321 bytes
+SHA1 (patch-aa) = d7d9d573dae58174dc2d3a0d032655bfb715827e
 SHA1 (patch-ab) = 00d438f297bee64411869ab605fc07fe6380f25d
+SHA1 (patch-ae) = e7f8883e9e12c822a4508ea121a27a5647f9823a
 SHA1 (patch-an) = 5ef594098978476eaee13cc8afc05679b6321176
 SHA1 (patch-ao) = cbe2edda168434d0c58214f2a8089555357de292
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
new file mode 100644
index 00000000000..6de6539f2d2
--- /dev/null
+++ b/print/cups/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.15 2003/03/20 17:30:18 fredb Exp $
+
+--- Makedefs.in.orig	Tue Dec 17 12:56:25 2002
++++ Makedefs.in
+@@ -28,8 +28,8 @@
+ 
+ AR	=	@AR@
+ AWK	=	@AWK@
+-CC	=	@LIBTOOL@ @CC@
+-CXX	=	@LIBTOOL@ @CXX@
++CC	=	@LIBTOOL@ --preserve-dup-deps @CC@
++CXX	=	@LIBTOOL@ --preserve-dup-deps @CXX@
+ DSO	=	@DSO@
+ HTMLDOC	=	@HTMLDOC@
+ INSTALL	=	@INSTALL@
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
new file mode 100644
index 00000000000..ee29da5e634
--- /dev/null
+++ b/print/cups/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.12 2003/03/20 17:30:18 fredb Exp $
+
+--- config-scripts/cups-openssl.m4.orig	Tue Dec 17 12:56:39 2002
++++ config-scripts/cups-openssl.m4
+@@ -45,7 +45,12 @@ if test x$enable_ssl != xno; then
+ 	dnl of OpenSSL exists.  So we test the linking three times in
+ 	dnl case the RSAREF libraries are needed.
+ 
++	dnl NetBSD 1.6 has a crypt() in both -lcrypt and -lcrypto, but only
++	dnl the one in -lcrypt supports blowfish and other password salts,
++	dnl so always link -lcrypt in first, if possible.
++
+ 	for libcrypto in \
++	    "-lcrypt -lcrypto" \
+ 	    "-lcrypto" \
+ 	    "-lcrypto -lrsaref" \
+ 	    "-lcrypto -lRSAglue -lrsaref"
-- 
cgit v1.2.3