Module Name: src
Committed By: christos
Date: Sun Feb 20 05:17:47 UTC 2011
Modified Files:
src/crypto/external/bsd/libsaslc/etc: Makefile
Added Files:
src/crypto/external/bsd/libsaslc/etc/mech: ANONYMOUS.conf CRAM-MD5.conf
DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf Makefile
PLAIN.conf
Removed Files:
src/crypto/external/bsd/libsaslc/etc: ANONYMOUS.conf CRAM-MD5.conf
DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf PLAIN.conf
Log Message:
Re-do using bsd.files.mk
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf \
src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf \
src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf \
src/crypto/external/bsd/libsaslc/etc/LOGIN.conf \
src/crypto/external/bsd/libsaslc/etc/PLAIN.conf
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/etc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf \
src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/mech/EXTERNAL.conf \
src/crypto/external/bsd/libsaslc/etc/mech/GSSAPI.conf \
src/crypto/external/bsd/libsaslc/etc/mech/LOGIN.conf \
src/crypto/external/bsd/libsaslc/etc/mech/Makefile \
src/crypto/external/bsd/libsaslc/etc/mech/PLAIN.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/libsaslc/etc/Makefile
diff -u src/crypto/external/bsd/libsaslc/etc/Makefile:1.2 src/crypto/external/bsd/libsaslc/etc/Makefile:1.3
--- src/crypto/external/bsd/libsaslc/etc/Makefile:1.2 Sat Feb 19 21:14:42 2011
+++ src/crypto/external/bsd/libsaslc/etc/Makefile Sun Feb 20 00:17:47 2011
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/02/20 02:14:42 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/20 05:17:47 christos Exp $
.include <bsd.own.mk>
-CFG_DIR=/usr/share/examples/libsaslc
+SUBDIR=mech
-CFG_FILE= saslc.conf
-CFG_FILE+= README
+FILESDIR=/usr/share/examples/libsaslc
+FILESOWN=root
+FILESGRP=wheel
+FILESMODE=444
+
+FILES= saslc.conf
+FILES+= README
CFG_MECH=
CFG_MECH+= ANONYMOUS.conf
CFG_MECH+= CRAM-MD5.conf
@@ -15,8 +20,5 @@
CFG_MECH+= LOGIN.conf
CFG_MECH+= PLAIN.conf
-install:
- ${INSTALL_FILE} -o root -g wheel -m 444 \
- ${CFG_FILE} ${DESTDIR}${CFG_DIR}
- ${INSTALL_FILE} -o root -g wheel -m 444 \
- ${CFG_MECH} ${DESTDIR}${CFG_DIR}/mech
+.include <bsd.files.mk>
+.include <bsd.subdir.mk>
Added files:
Index: src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,8 @@
+# $NetBSD: ANONYMOUS.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID "authentication ID"
Index: src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,9 @@
+# $NetBSD: CRAM-MD5.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID "username" # usually passed by the caller
+# PASSWD "password" # usually passed by the caller
Index: src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,17 @@
+# $NetBSD: DIGEST-MD5.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID "username" # usually passed by the caller
+# AUTHZID "authorization ID" # typically not used
+# CIPHERMASK "3des,aes,des,rc4,rc4-40,rc4-56" # optional
+# HOSTNAME "hostname" # usually passed by the caller
+# MAXBUF 0x10000 # optional
+# PASSWD "password" # usually passed by the caller
+# QOPMASK "auth,auth-int,auth-conf" # optional
+# REALM "[hostname:]realm[,...]" # for multiple realms
+# SERVICE "service to use, e.g., SMTP" # usually passed by the caller
+# SERVNAME "[hostname:]serv-name[,...]" # typically not used
Index: src/crypto/external/bsd/libsaslc/etc/mech/EXTERNAL.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/EXTERNAL.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/EXTERNAL.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,8 @@
+# $NetBSD: EXTERNAL.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHZID "authorization ID" # the server may need this
Index: src/crypto/external/bsd/libsaslc/etc/mech/GSSAPI.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/GSSAPI.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/GSSAPI.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,11 @@
+# $NetBSD: GSSAPI.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID "username" # usually passed by the caller
+# HOSTNAME "hostname" # usually passed by the caller
+# QOPMASK "auth,auth-int,auth-conf" # optional
+# SERVICE "service to use, e.g., SMTP" # usually passed by the caller
Index: src/crypto/external/bsd/libsaslc/etc/mech/LOGIN.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/LOGIN.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/LOGIN.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,9 @@
+# $NetBSD: LOGIN.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID "username" # usually passed by the caller
+# PASSWD "password" # usually passed by the caller
Index: src/crypto/external/bsd/libsaslc/etc/mech/Makefile
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/Makefile:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/Makefile Sun Feb 20 00:17:47 2011
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2011/02/20 05:17:47 christos Exp $
+
+.include <bsd.own.mk>
+
+FILESDIR=/usr/share/examples/libsaslc/mech
+FILESOWN=root
+FILESGRP=wheel
+FILESMODE=444
+
+FILES=
+FILES+= ANONYMOUS.conf
+FILES+= CRAM-MD5.conf
+FILES+= DIGEST-MD5.conf
+FILES+= EXTERNAL.conf
+FILES+= GSSAPI.conf
+FILES+= LOGIN.conf
+FILES+= PLAIN.conf
+
+.include <bsd.files.mk>
Index: src/crypto/external/bsd/libsaslc/etc/mech/PLAIN.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/PLAIN.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/PLAIN.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,9 @@
+# $NetBSD: PLAIN.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID "username" # usually passed by the caller
+# PASSWD "password" # usually passed by the caller
