aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authornectar <nectar@FreeBSD.org>2004-04-03 07:06:44 +0800
committernectar <nectar@FreeBSD.org>2004-04-03 07:06:44 +0800
commitc3597f60fcadf1b7bf455f22e9cbb061d88f5441 (patch)
treeb221d034e46fbf350b5874dd027cdd590c9c8a7e /security
parent3497dadec29b9b618187098450ef94a13ca93b27 (diff)
downloadfreebsd-ports-gnome-c3597f60fcadf1b7bf455f22e9cbb061d88f5441.tar.gz
freebsd-ports-gnome-c3597f60fcadf1b7bf455f22e9cbb061d88f5441.tar.zst
freebsd-ports-gnome-c3597f60fcadf1b7bf455f22e9cbb061d88f5441.zip
Update 0.6 -> 0.6.1
Use OPTIONS Use USE_OPENLDAP
Diffstat (limited to 'security')
-rw-r--r--security/heimdal/Makefile44
-rw-r--r--security/heimdal/distinfo4
-rw-r--r--security/heimdal/files/patch-ftp-gssapi.c30
-rw-r--r--security/heimdal/files/patch-verify_krb5_conf.c21
-rw-r--r--security/heimdal/pkg-plist11
5 files changed, 27 insertions, 83 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index a2be63690f36..58f70aa4385c 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= heimdal
-PORTVERSION= 0.6
-PORTREVISION= 2
+PORTVERSION= 0.6.1
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \
@@ -18,49 +17,39 @@ DISTNAME= heimdal-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.ORG
COMMENT= A re-implementation of Kerberos V
-.if defined(WITH_LDAP)
-LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client
-.endif
-.if defined(WITH_CRACKLIB)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
-.endif
+OPTIONS+= LDAP "Use OpenLDAP as the KDC backend" off
+OPTIONS+= CRACKLIB "Use CrackLib for password quality checking" off
+OPTIONS+= X11 "Build X11 utilies" off
-USE_LIBTOOL_VER=13
USE_OPENSSL= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
CONFIGURE_ARGS+= --enable-shared --without-krb4
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_LDAP)
+USE_OPENLDAP= yes
CONFIGURE_ARGS+= --with-openldap=${LOCALBASE}
.endif
-
-.if defined(HEIMDAL_HOME)
-PREFIX= ${HEIMDAL_HOME}
+.if defined(WITH_CRACKLIB)
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
.endif
-
-.if exists(${X11BASE}/lib/libX11.a) && !defined(WITHOUT_X11)
+.if defined(WITH_X11)
USE_XLIB= yes
-.endif
-
-.if defined(USE_XLIB)
CONFIGURE_ARGS+= --with-x
.else
CONFIGURE_ARGS+= --without-x
.endif
+.if defined(HEIMDAL_HOME)
+PREFIX= ${HEIMDAL_HOME}
+.endif
+
INFO= heimdal
PLIST:= ${WRKDIR}/PLIST
-pre-configure:
-.if !defined(WITH_CRACKLIB)
- @${ECHO_MSG}
- @${ECHO_MSG} You can utilize CrackLib for the kpasswdd by defining
- @${ECHO_MSG} WITH_CRACKLIB and uncommenting the appropriate lines in
- @${ECHO_MSG} ${PREFIX}/etc/rc.d/kdc.sh.
- @${ECHO_MSG}
-.endif
-
post-build:
.if defined(WITH_CRACKLIB)
${SED} -e "s;%%LOCALBASE%%;${LOCALBASE};g" \
@@ -72,7 +61,7 @@ post-build:
pre-install:
@${CP} ${PKGDIR}/pkg-plist ${PLIST}
-.if defined(USE_XLIB)
+.if defined(WITH_X11)
@${CAT} ${PKGDIR}/pkg-plist.x11 >> ${PLIST}
.endif
.if !exists(/usr/include/ifaddrs.h)
@@ -90,7 +79,6 @@ post-install:
${SED} 's;%%PREFIX%%;${PREFIX};g' ${FILESDIR}/kdc.sh > \
${PREFIX}/etc/rc.d/kdc.sh.sample
-.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
CFLAGS+= -fPIC
.endif
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index b0f1a1b8ac8d..07e976811b47 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,2 +1,2 @@
-MD5 (heimdal-0.6.tar.gz) = e68c260181f2ee58e01215b8d03c35ba
-SIZE (heimdal-0.6.tar.gz) = 3135319
+MD5 (heimdal-0.6.1.tar.gz) = 20ef3dade89afc45eac9d8935a1a9cc0
+SIZE (heimdal-0.6.1.tar.gz) = 3312603
diff --git a/security/heimdal/files/patch-ftp-gssapi.c b/security/heimdal/files/patch-ftp-gssapi.c
deleted file mode 100644
index 1b0b8060834a..000000000000
--- a/security/heimdal/files/patch-ftp-gssapi.c
+++ /dev/null
@@ -1,30 +0,0 @@
-*** appl/ftp/ftp/gssapi.c.orig Wed Dec 17 14:12:55 2003
---- appl/ftp/ftp/gssapi.c Wed Dec 17 14:13:52 2003
-***************
-*** 228,239 ****
- gss_release_buffer(&min_stat, &export_name);
- goto out;
- }
-! name = realloc(export_name.value, export_name.length + 1);
- if(name == NULL) {
- reply(500, "Out of memory");
- gss_release_buffer(&min_stat, &export_name);
- goto out;
- }
- name[export_name.length] = '\0';
- gss_release_buffer(&min_stat, &export_name);
- d->client_name = name;
---- 228,240 ----
- gss_release_buffer(&min_stat, &export_name);
- goto out;
- }
-! name = malloc(export_name.length + 1);
- if(name == NULL) {
- reply(500, "Out of memory");
- gss_release_buffer(&min_stat, &export_name);
- goto out;
- }
-+ memcpy(name, export_name.value, export_name.length);
- name[export_name.length] = '\0';
- gss_release_buffer(&min_stat, &export_name);
- d->client_name = name;
diff --git a/security/heimdal/files/patch-verify_krb5_conf.c b/security/heimdal/files/patch-verify_krb5_conf.c
deleted file mode 100644
index a46c891cd395..000000000000
--- a/security/heimdal/files/patch-verify_krb5_conf.c
+++ /dev/null
@@ -1,21 +0,0 @@
-*** lib/krb5/verify_krb5_conf.c.orig Mon Aug 18 19:15:38 2003
---- lib/krb5/verify_krb5_conf.c Mon Aug 18 19:15:57 2003
-***************
-*** 449,456 ****
-
- #if 0
- struct entry kdcdefaults_entries[] = {
-! { "kdc_ports, krb5_config_string, mit_entry },
-! { "v4_mode, krb5_config_string, mit_entry },
- { NULL }
- };
- #endif
---- 449,456 ----
-
- #if 0
- struct entry kdcdefaults_entries[] = {
-! { "kdc_ports", krb5_config_string, mit_entry },
-! { "v4_mode", krb5_config_string, mit_entry },
- { NULL }
- };
- #endif
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index b6fc38569e9a..6528df70d016 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -1,4 +1,5 @@
bin/afslog
+bin/compile_et
bin/ftp
bin/kauth
bin/kdestroy
@@ -23,6 +24,8 @@ bin/verify_krb5_conf
etc/rc.d/kdc.sh.sample
include/asn1_err.h
include/base64.h
+include/com_err.h
+include/com_right.h
include/der.h
include/editline.h
include/fnmatch.h
@@ -58,13 +61,17 @@ include/rtbl.h
include/sl.h
include/ss/ss.h
include/xdbm.h
+info/dir
lib/libasn1.a
lib/libasn1.so
lib/libasn1.so.6
+lib/libcom_err.a
+lib/libcom_err.so
+lib/libcom_err.so.2
lib/libeditline.a
lib/libgssapi.a
lib/libgssapi.so
-lib/libgssapi.so.4
+lib/libgssapi.so.5
lib/libhdb.a
lib/libhdb.so
lib/libhdb.so.7
@@ -79,7 +86,7 @@ lib/libkafs.so
lib/libkafs.so.4
lib/libkrb5.a
lib/libkrb5.so
-lib/libkrb5.so.19
+lib/libkrb5.so.20
lib/libotp.a
lib/libotp.so
lib/libotp.so.1