summaryrefslogtreecommitdiff
path: root/kerberosV
diff options
context:
space:
mode:
Diffstat (limited to 'kerberosV')
-rw-r--r--kerberosV/lib/Makefile4
-rw-r--r--kerberosV/lib/libkafs/Makefile (renamed from kerberosV/lib/libkafs5/Makefile)11
-rw-r--r--kerberosV/lib/libkafs/shlib_version2
-rw-r--r--kerberosV/lib/libkafs5/shlib_version2
-rw-r--r--kerberosV/src/tools/krb5-config.in2
-rw-r--r--kerberosV/usr.bin/kcc/Makefile4
-rw-r--r--kerberosV/usr.bin/kdestroy/Makefile4
-rw-r--r--kerberosV/usr.bin/kinit/Makefile4
-rw-r--r--kerberosV/usr.bin/verify_krb5_conf/Makefile4
-rw-r--r--kerberosV/usr.sbin/kimpersonate/Makefile4
10 files changed, 17 insertions, 24 deletions
diff --git a/kerberosV/lib/Makefile b/kerberosV/lib/Makefile
index 3fb4c882236..267058e5c0b 100644
--- a/kerberosV/lib/Makefile
+++ b/kerberosV/lib/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.10 2013/06/21 17:04:01 robert Exp $
+# $OpenBSD: Makefile,v 1.11 2013/08/10 09:07:39 ajacoutot Exp $
SUBDIR= libasn1 libgssapi libhdb libkadm5clnt libkadm5srv \
- libkafs5 libkrb5 libroken libsl libvers libkdc \
+ libkafs libkrb5 libroken libsl libvers libkdc \
libwind libheimbase libheimipcc libheimipcs \
libcom_err
diff --git a/kerberosV/lib/libkafs5/Makefile b/kerberosV/lib/libkafs/Makefile
index 751f0b98630..964be437e9a 100644
--- a/kerberosV/lib/libkafs5/Makefile
+++ b/kerberosV/lib/libkafs/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2013/08/09 18:29:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.1 2013/08/10 09:07:39 ajacoutot Exp $
-LIB= kafs5
+LIB= kafs
INCS= kafs.h
MPAGES= kafs.3
MSRC= ${KRB5DIR}/lib/kafs
@@ -10,7 +10,6 @@ MLINKS= kafs.3 k_afs_cell_of_file.3 \
kafs.3 k_pioctl.3 \
kafs.3 k_setpag.3 \
kafs.3 k_unlog.3 \
- kafs.3 kafs5.3 \
kafs.3 kafs_set_verbose.3 \
kafs.3 kafs_settoken.3 \
kafs.3 kafs_settoken5.3 \
@@ -20,7 +19,6 @@ MLINKS= kafs.3 k_afs_cell_of_file.3 \
kafs.3 krb_afslog.3 \
kafs.3 krb_afslog_uid.3
-SRCS= afssys.c afskrb5.c common.c krb5_err.h
SRCS= afssys.c \
afskrb5.c \
common.c
@@ -29,11 +27,6 @@ CPPFLAGS= -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/roken
-CLEANFILES= kafs5.3
-
-kafs5.3: kafs.3
- sed -e 's/libkafs, -lkafs/libkafs5, -lkafs5/g' ${.ALLSRC} >${.TARGET}
-
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/kafs
diff --git a/kerberosV/lib/libkafs/shlib_version b/kerberosV/lib/libkafs/shlib_version
new file mode 100644
index 00000000000..0aab0406bf8
--- /dev/null
+++ b/kerberosV/lib/libkafs/shlib_version
@@ -0,0 +1,2 @@
+major=19
+minor=0
diff --git a/kerberosV/lib/libkafs5/shlib_version b/kerberosV/lib/libkafs5/shlib_version
deleted file mode 100644
index 97c9f92d6b8..00000000000
--- a/kerberosV/lib/libkafs5/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=0
-minor=0
diff --git a/kerberosV/src/tools/krb5-config.in b/kerberosV/src/tools/krb5-config.in
index 393a2f41e83..74e8cb8a0f9 100644
--- a/kerberosV/src/tools/krb5-config.in
+++ b/kerberosV/src/tools/krb5-config.in
@@ -132,7 +132,7 @@ if test "$do_libs" = "yes"; then
lib_flags="$lib_flags -lkadm5srv @LIB_dbopen@"
;;
kafs)
- lib_flags="$lib_flags -lkafs5"
+ lib_flags="$lib_flags -lkafs"
;;
esac
lib_flags="$lib_flags -lkrb5 @LIB_pkinit@ -lasn1"
diff --git a/kerberosV/usr.bin/kcc/Makefile b/kerberosV/usr.bin/kcc/Makefile
index d5555bded04..84c81c3f591 100644
--- a/kerberosV/usr.bin/kcc/Makefile
+++ b/kerberosV/usr.bin/kcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2013/07/10 11:14:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2013/08/10 09:07:41 ajacoutot Exp $
PROG= kcc
MPAGES= klist.1
@@ -9,7 +9,7 @@ CPPFLAGS= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/sl -I.
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lkafs5 ${LIBSL} \
+LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lkafs ${LIBSL} \
${LIBVERS} -ledit -lcurses -lwind -lcom_err -lheimbase
SRCS= kcc.c \
kcc-commands.c \
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index 4b51ed79ebd..2c954ac08a8 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2013/07/10 11:14:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2013/08/10 09:07:41 ajacoutot Exp $
PROG= kdestroy
CPPFLAGS= -I${KRB5DIR}/lib/roken
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO}
-LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+LDADD= -lkafs -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lwind -lcom_err \
-lheimbase
MPAGES= kdestroy.1
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index 276e6f5faa2..b5e4f3f229a 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2013/07/10 11:14:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2013/08/10 09:07:41 ajacoutot Exp $
PROG= kinit
CPPFLAGS= -I${KRB5DIR}/lib/roken
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO}
-LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+LDADD= -lkafs -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcom_err -lheimbase -lwind
.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index 6d1e32014d8..64a8d7b8332 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/07/10 11:14:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2013/08/10 09:07:41 ajacoutot Exp $
PROG= verify_krb5_conf
MPAGES= verify_krb5_conf.8
@@ -6,7 +6,7 @@ MSRC= ${KRB5DIR}/lib/krb5
CPPFLAGS= -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
+LDADD= -lkafs -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcom_err -lwind -lheimbase
.include <bsd.prog.mk>
diff --git a/kerberosV/usr.sbin/kimpersonate/Makefile b/kerberosV/usr.sbin/kimpersonate/Makefile
index d9061925a2d..2fbd11ce8c0 100644
--- a/kerberosV/usr.sbin/kimpersonate/Makefile
+++ b/kerberosV/usr.sbin/kimpersonate/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/07/10 11:14:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2013/08/10 09:07:42 ajacoutot Exp $
PROG= kimpersonate
MPAGES= kimpersonate.8
@@ -9,7 +9,7 @@ CPPFLAGS= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/sl -I.
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
${LIBVERS}
-LDADD= -lkafs5 -lkrb5 -lroken -lasn1 -lcrypto \
+LDADD= -lkafs -lkrb5 -lroken -lasn1 -lcrypto \
${LIBVERS} -lcom_err -lheimbase -lwind
.include <bsd.prog.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 04:52:36 +0000