Merge head from 7/28

15 files changed, 25 insertions, 3 deletions

diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 72f7125..937d0bf 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -14,6 +14,8 @@ LDADD=	-lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
 	${LIBVERS} -lheimntlm
 USEPRIVATELIB= heimipcs
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/digest-service/Makefile.depend b/kerberos5/libexec/digest-service/Makefile.depend
index 2ced5da..8910b84 100644
--- a/kerberos5/libexec/digest-service/Makefile.depend
+++ b/kerberos5/libexec/digest-service/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
-	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimipcs \
 	kerberos5/lib/libheimntlm \
 	kerberos5/lib/libheimsqlite \
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index ac1dffa..95b4739 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -16,6 +16,8 @@ LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index e0722bd..31a5895 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -10,6 +10,8 @@ LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 99a4f9c..8dbe315 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -11,6 +11,8 @@ LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
+NO_PIE=	yes
+
 foo::
 	echo ${LIBHX509}
 
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 8a72d9e..4aa1f27 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -11,6 +11,8 @@ LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/lib/kadm5
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index f88ac2f..898e429 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -15,6 +15,8 @@ LDADD=	-lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \
 	-lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kadmin
diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile
index bc84c05..003c510 100644
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -26,6 +26,8 @@ LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lheimntlm -lheimipcs \
 USEPRIVATELIB= heimipcs
 LDFLAGS=${LDAPLDFLAGS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kcm
diff --git a/kerberos5/libexec/kcm/Makefile.depend b/kerberos5/libexec/kcm/Makefile.depend
index 35a316f..ae60a40 100644
--- a/kerberos5/libexec/kcm/Makefile.depend
+++ b/kerberos5/libexec/kcm/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
-	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimipcs \
 	kerberos5/lib/libheimntlm \
 	kerberos5/lib/libheimsqlite \
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 4ca5c3a..b309a25 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -14,6 +14,8 @@ DPADD=	${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
 LDADD=	-lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile
index c88e3b9..03f1ddf 100644
--- a/kerberos5/libexec/kdigest/Makefile
+++ b/kerberos5/libexec/kdigest/Makefile
@@ -13,6 +13,8 @@ SRCS=	kdigest.c \
 	kdigest-commands.c \
 	kdigest-commands.h
 
+NO_PIE=	yes
+
 kdigest-commands.h: kdigest-commands.in
 	${SLC} ${.ALLSRC:M*.in}
 
diff --git a/kerberos5/libexec/kdigest/Makefile.depend b/kerberos5/libexec/kdigest/Makefile.depend
index 28e0985..a99bfac 100644
--- a/kerberos5/libexec/kdigest/Makefile.depend
+++ b/kerberos5/libexec/kdigest/Makefile.depend
@@ -26,7 +26,7 @@ DIRDEPS = \
 	lib/libcrypt \
 	lib/libedit \
 	lib/libthr \
-	lib/ncurses/ncurses \
+	lib/ncurses/ncursesw \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile
index f5081f1..130cd45 100644
--- a/kerberos5/libexec/kfd/Makefile
+++ b/kerberos5/libexec/kfd/Makefile
@@ -9,6 +9,8 @@ DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
 LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
 	${LIBVERS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/appl/kf
diff --git a/kerberos5/libexec/kimpersonate/Makefile b/kerberos5/libexec/kimpersonate/Makefile
index 32f9777..2dfeecb 100644
--- a/kerberos5/libexec/kimpersonate/Makefile
+++ b/kerberos5/libexec/kimpersonate/Makefile
@@ -11,6 +11,8 @@ DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO}
 LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \
 	${LIBVERS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 2287686..4d3914c 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -9,6 +9,8 @@ LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kpasswd