pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/fetchmail Add option for kerberos5 like suggested...
details: https://anonhg.NetBSD.org/pkgsrc/rev/76346ec0b88c
branches: trunk
changeset: 487795:76346ec0b88c
user: frueauf <frueauf%pkgsrc.org@localhost>
date: Thu Jan 20 12:59:11 2005 +0000
description:
Add option for kerberos5 like suggested in pr pkg/26170.
Since I have no kerberos server I just verified it compiled.
diffstat:
mail/fetchmail/distinfo | 3 +-
mail/fetchmail/options.mk | 14 +-
mail/fetchmail/patches/patch-ae | 7475 +++++++++++++++++++++++++++++++++++++++
3 files changed, 7489 insertions(+), 3 deletions(-)
diffs (truncated from 7524 to 300 lines):
diff -r 83ead407b458 -r 76346ec0b88c mail/fetchmail/distinfo
--- a/mail/fetchmail/distinfo Thu Jan 20 12:39:56 2005 +0000
+++ b/mail/fetchmail/distinfo Thu Jan 20 12:59:11 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2003/11/05 05:20:36 itojun Exp $
+$NetBSD: distinfo,v 1.27 2005/01/20 12:59:11 frueauf Exp $
SHA1 (fetchmail-6.2.5.tar.gz) = 4656ec4393ccd1c137fe7b331f77cb26b576ac0e
Size (fetchmail-6.2.5.tar.gz) = 1257376 bytes
@@ -6,4 +6,5 @@
SHA1 (patch-ab) = 009a97639502365f8b6ec4e854622620391a812f
SHA1 (patch-ac) = ef0e651807bb0942ca79ed3b10ffc000f71bd330
SHA1 (patch-ad) = b6bffc59f28992fa0d3de0f9dad250c73bbeffc6
+SHA1 (patch-ae) = 852a18b86dcbd645df233e2b08134064dd9a7b20
SHA1 (patch-af) = 06e7b84566b0d3ed50b56f88baf23f15ae21eb21
diff -r 83ead407b458 -r 76346ec0b88c mail/fetchmail/options.mk
--- a/mail/fetchmail/options.mk Thu Jan 20 12:39:56 2005 +0000
+++ b/mail/fetchmail/options.mk Thu Jan 20 12:59:11 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2005/01/10 20:59:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.6 2005/01/20 12:59:11 frueauf Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail
-PKG_SUPPORTED_OPTIONS= inet6 kerberos4 ssl
+PKG_SUPPORTED_OPTIONS= inet6 kerberos4 kerberos5 ssl
.if !defined(PKG_OPTIONS.fetchmail)
PKG_DEFAULT_OPTIONS+= ssl
@@ -30,6 +30,16 @@
.endif
###
+### Kerberos 5 / GSSAPI support.
+###
+.if !empty(PKG_OPTIONS:Mkerberos5)
+CRYPTO+= uses Kerberos encryption code
+CONFIGURE_ARGS+= --with-kerberos5=yes
+.else
+CONFIGURE_ARGS+= --with-kerberos5=no
+.endif
+
+###
### Support POP3 and IMAP over SSL.
###
.if !empty(PKG_OPTIONS:Mssl)
diff -r 83ead407b458 -r 76346ec0b88c mail/fetchmail/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/fetchmail/patches/patch-ae Thu Jan 20 12:59:11 2005 +0000
@@ -0,0 +1,7475 @@
+$NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $
+
+--- configure.in.orig Fri Oct 10 10:36:57 2003
++++ configure.in Thu Jan 20 13:02:54 2005
+@@ -434,6 +434,13 @@
+ AC_DEFINE(KERBEROS_V5)
+ CEFLAGS="$CEFLAGS -I/usr/include/kerberosV"
+ LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs"
++elif test "$with_kerberos5" = "yes" && ( test `uname` = "NetBSD" )
++then
++ AC_CHECKING([kerberosV for NetBSD])
++ AC_DEFINE(HEIMDAL)
++ AC_DEFINE(KERBEROS_V5)
++ CEFLAGS="$CEFLAGS -I/usr/include/krb5"
++ LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lroken -lcrypto -ldes"
+ else
+ if test "$with_kerberos5" != "yes"
+ then
+@@ -700,13 +707,13 @@
+ fi
+ if test "$with_gssapi" != "yes" -a -n "$with_gssapi"
+ then
+- CFLAGS="$CFLAGS -I$with_gssapi/include"
++ CFLAGS="$CFLAGS -I$with_gssapi/include/gssapi"
+ LDFLAGS="$LDFLAGS -L$with_gssapi/lib"
+ fi
+
+- if test -f "$with_gssapi/include/roken.h"
++ if test -f "$with_gssapi/include/krb5/roken.h"
+ then
+- LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl"
++ LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken"
+ AC_CHECK_LIB(gssapi, gss_init_sec_context,LIBS="$LIBS -lgssapi",
+ AC_MSG_ERROR([could not find libgssapi which is needed for GSSAPI support]), )
+ AC_DEFINE(HEIMDAL)
+--- configure.orig Fri Oct 10 10:39:54 2003
++++ configure Thu Jan 20 13:04:41 2005
+@@ -1,9 +1,8 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.57 for fetchmail 6.1.2.
++# Generated by GNU Autoconf 2.59 for fetchmail 6.1.2.
+ #
+-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
++# Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -20,9 +19,10 @@
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
+ fi
++DUALCASE=1; export DUALCASE # for MKS sh
+
+ # Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+ else
+ as_unset=false
+@@ -41,7 +41,7 @@
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+ do
+- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ $as_unset $as_var
+@@ -218,16 +218,17 @@
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+ else
++ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+ fi
+
+ as_executable_p="test -f"
+
+ # Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+ # Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+ # IFS
+@@ -667,7 +668,7 @@
+
+ # Be sure to have absolute paths.
+ for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+- localstatedir libdir includedir oldincludedir infodir mandir
++ localstatedir libdir includedir oldincludedir infodir mandir
+ do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+@@ -707,10 +708,10 @@
+ # Try the directory containing this script, then its parent.
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$0" : 'X\(//\)[^/]' \| \
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(//\)[^/]' \| \
++ X"$0" : 'X\(//\)$' \| \
++ X"$0" : 'X\(/\)' \| \
++ . : '\(.\)' 2>/dev/null ||
+ echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+@@ -802,9 +803,9 @@
+ cat <<_ACEOF
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+- [$ac_default_prefix]
++ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+- [PREFIX]
++ [PREFIX]
+
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+@@ -934,12 +935,45 @@
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++ case "$ac_dir" in
++ .) ac_abs_builddir=`pwd`;;
++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++ *) ac_abs_builddir=`pwd`/"$ac_dir";;
++ esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++ case ${ac_top_builddir}. in
++ .) ac_abs_top_builddir=$ac_abs_builddir;;
++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++ esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++ case $ac_srcdir in
++ .) ac_abs_srcdir=$ac_abs_builddir;;
++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++ esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++ case $ac_top_srcdir in
++ .) ac_abs_top_srcdir=$ac_abs_builddir;;
++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++ esac;;
++esac
+
+ cd $ac_dir
+ # Check for guested configure; otherwise get Cygnus style configure.
+@@ -950,7 +984,7 @@
+ echo
+ $SHELL $ac_srcdir/configure --help=recursive
+ elif test -f $ac_srcdir/configure.ac ||
+- test -f $ac_srcdir/configure.in; then
++ test -f $ac_srcdir/configure.in; then
+ echo
+ $ac_configure --help
+ else
+@@ -964,10 +998,9 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ fetchmail configure 6.1.2
+-generated by GNU Autoconf 2.57
++generated by GNU Autoconf 2.59
+
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-Free Software Foundation, Inc.
++Copyright (C) 2003 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -979,7 +1012,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by fetchmail $as_me 6.1.2, which was
+-generated by GNU Autoconf 2.57. Invocation command line was
++generated by GNU Autoconf 2.59. Invocation command line was
+
+ $ $0 $@
+
+@@ -1056,19 +1089,19 @@
+ 2)
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+- ac_must_keep_next=false # Got value, back to normal.
++ ac_must_keep_next=false # Got value, back to normal.
+ else
+- case $ac_arg in
+- *=* | --config-cache | -C | -disable-* | --disable-* \
+- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+- | -with-* | --with-* | -without-* | --without-* | --x)
+- case "$ac_configure_args0 " in
+- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+- esac
+- ;;
+- -* ) ac_must_keep_next=true ;;
+- esac
++ case $ac_arg in
++ *=* | --config-cache | -C | -disable-* | --disable-* \
++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++ | -with-* | --with-* | -without-* | --without-* | --x)
++ case "$ac_configure_args0 " in
++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++ esac
++ ;;
++ -* ) ac_must_keep_next=true ;;
++ esac
+ fi
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+@@ -1102,12 +1135,12 @@
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ sed -n \
+- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
+ *)
Home |
Main Index |
Thread Index |
Old Index