Date: Sat, 11 Mar 2000 00:55:35 -0800 (PST) From: Kris Kennaway <kris@hub.freebsd.org> To: current@freebsd.org Cc: jkh@freebsd.org Subject: Commit candidate: libRSAglue patches Message-ID: <Pine.BSF.4.21.0003110053030.29522-100000@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Here are the patches which seem to fix the libRSAglue upgrade problems
people had been seeing when upgrading from trees built in a certain time
window. I've tested these on both an older system which was breaking and a
current one with no ill effects - nor should there be any since libRSAglue
is an empty stub library thesedays.
Kris
Index: usr.sbin/ppp/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- usr.sbin/ppp/Makefile 2000/03/09 06:29:02 1.72
+++ usr.sbin/ppp/Makefile 2000/03/11 02:23:24
@@ -39,10 +39,6 @@
SRCS+= chap_ms.c
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+= -lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
.endif
.if defined(NORADIUS)
Index: usr.sbin/pppd/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pppd/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- usr.sbin/pppd/Makefile 2000/03/09 06:29:05 1.18
+++ usr.sbin/pppd/Makefile 2000/03/11 02:23:27
@@ -34,10 +34,6 @@
SRCS+= chap_ms.c
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+= -lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
.endif
.if defined(RELEASE_CRUNCH)
Index: kerberosIV/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/kerberosIV/Makefile.inc,v
retrieving revision 1.7
diff -u -r1.7 Makefile.inc
--- kerberosIV/Makefile.inc 2000/02/24 20:56:39 1.7
+++ kerberosIV/Makefile.inc 2000/03/11 01:13:01
@@ -71,10 +71,6 @@
CFLAGS+= -I${.CURDIR}/../../include -Wall -DHAVE_CONFIG_H \
-I${INCLUDEOBJDIR} -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\"
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+= -lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
protos.h: ${KRB4DIR}/include/protos.H
ln -sf ${.ALLSRC} ${.TARGET}
----
In God we Trust -- all others must submit an X.509 certificate.
-- Charles Forsythe <forsythe@alum.mit.edu>
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0003110053030.29522-100000>