mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

Update to 2.1.19.

Browse Source
This commit is contained in:
Hajimu UMEMOTO 2004-07-14 18:01:22 +00:00
parent 5273cd98db
commit 08de8a9c7e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=113667
4 changed files with 19 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/cyrus-sasl2-saslauthd/Makefile
View File

@ -6,8 +6,8 @@
# #
PORTNAME= saslauthd PORTNAME= saslauthd
PORTVERSION= 2.1.18 PORTVERSION= 2.1.19
PORTREVISION= 2 #PORTREVISION= 0
CATEGORIES= security ipv6 CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \

7
security/cyrus-sasl2/Makefile
View File

@ -6,8 +6,8 @@
# #
PORTNAME= cyrus-sasl PORTNAME= cyrus-sasl
PORTVERSION= 2.1.18 PORTVERSION= 2.1.19
PORTREVISION= 1 #PORTREVISION= 0
CATEGORIES= security ipv6 CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
@ -99,9 +99,6 @@ CONFIGURE_ARGS+=--without-pgsql
.endif .endif
.if defined(WITH_SQLITE) .if defined(WITH_SQLITE)
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= nork
PATCHFILES= cyrus-sasl2-sqlite.20040529.diff
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite
CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE} CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE}
.else .else

6
security/cyrus-sasl2/distinfo
View File

@ -1,4 +1,2 @@
MD5 (cyrus-sasl-2.1.18.tar.gz) = 1eafae95f0289c10f187d8b2bc4032cf MD5 (cyrus-sasl-2.1.19.tar.gz) = ea76410ad88fa7b6c17a6aac424382c9
SIZE (cyrus-sasl-2.1.18.tar.gz) = 1522578 SIZE (cyrus-sasl-2.1.19.tar.gz) = 1537350
MD5 (cyrus-sasl2-sqlite.20040529.diff) = 2e16532da510130e10efbbadc85966b5
SIZE (cyrus-sasl2-sqlite.20040529.diff) = 6042

67
security/cyrus-sasl2/files/patch-configure
View File

@ -1,17 +1,8 @@
Index: configure Index: configure
diff -u configure.orig configure diff -u configure.orig configure
--- configure.orig Thu Mar 11 00:56:10 2004 --- configure.orig Sat Jul 3 04:39:54 2004
+++ configure Fri May 28 18:13:50 2004 +++ configure Thu Jul 15 02:37:58 2004
@@ -309,7 +309,7 @@ @@ -1577,6 +1577,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all saslauthd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB LIBTOOL PURECOV PURIFY JAVAC JAVAH JAVADOC JAVA_TRUE JAVA_FALSE JAVA_INCLUDES JAVAROOT SAMPLE_TRUE SAMPLE_FALSE LIB_SOCKET EGREP SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB NO_SASL_DB_MANS_TRUE NO_SASL_DB_MANS_FALSE SASL_DL_LIB NM SASLAUTHD_TRUE SASLAUTHD_FALSE PWCHECKMETH PWCHECK_TRUE PWCHECK_FALSE IPCTYPE LIB_DES OTP_LIBS SRP_LIBS SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS PLAIN_LIBS NTLM_LIBS LIB_MYSQL LIB_PGSQL SASL_MECHS SASL_STATIC_OBJS SASL_STATIC_LIBS plugindir MACOSX_TRUE MACOSX_FALSE DMALLOC_LIBS SFIO_INC_FLAGS SFIO_LIB_FLAGS SMTPTEST_PROGRAM SASL_UTIL_LIBS_EXTRA SASL_UTIL_HEADERS_EXTRA LIBOBJS GETSUBOPT SNPRINTFOBJS LTSNPRINTFOBJS GETADDRINFOOBJS LTGETADDRINFOOBJS GETNAMEINFOOBJS LTGETNAMEINFOOBJS LTLIBOBJS DIRS subdirs'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB LIBTOOL PURECOV PURIFY JAVAC JAVAH JAVADOC JAVA_TRUE JAVA_FALSE JAVA_INCLUDES JAVAROOT SAMPLE_TRUE SAMPLE_FALSE LIB_SOCKET EGREP SASL_DB_UTILS SASL_DB_MANS SASL_DB_BACKEND SASL_DB_BACKEND_STATIC SASL_DB_INC SASL_DB_LIB NO_SASL_DB_MANS_TRUE NO_SASL_DB_MANS_FALSE SASL_DL_LIB NM SASLAUTHD_TRUE SASLAUTHD_FALSE PWCHECKMETH PWCHECK_TRUE PWCHECK_FALSE IPCTYPE LIB_DES OTP_LIBS SRP_LIBS SASL_KRB_LIB LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS PLAIN_LIBS NTLM_LIBS LIB_MYSQL LIB_PGSQL LIB_SQLITE SASL_MECHS SASL_STATIC_OBJS SASL_STATIC_LIBS plugindir MACOSX_TRUE MACOSX_FALSE DMALLOC_LIBS SFIO_INC_FLAGS SFIO_LIB_FLAGS SMTPTEST_PROGRAM SASL_UTIL_LIBS_EXTRA SASL_UTIL_HEADERS_EXTRA LIBOBJS GETSUBOPT SNPRINTFOBJS LTSNPRINTFOBJS GETADDRINFOOBJS LTGETADDRINFOOBJS GETNAMEINFOOBJS LTGETNAMEINFOOBJS LTLIBOBJS DIRS subdirs'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1576,6 +1576,7 @@
fi fi
echo "$as_me:$LINENO: result: yes" >&5 echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
@ -19,7 +10,7 @@ diff -u configure.orig configure
test "$program_prefix" != NONE && test "$program_prefix" != NONE &&
program_transform_name="s,^,$program_prefix,;$program_transform_name" program_transform_name="s,^,$program_prefix,;$program_transform_name"
# Use a double $ so make ignores it. # Use a double $ so make ignores it.
@@ -5126,7 +5127,7 @@ @@ -5127,7 +5128,7 @@
BDB_LIBADD="" BDB_LIBADD=""
fi fi
@ -28,7 +19,7 @@ diff -u configure.orig configure
do do
as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
@@ -5150,11 +5151,11 @@ @@ -5151,11 +5152,11 @@
#endif #endif
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
@ -42,7 +33,7 @@ diff -u configure.orig configure
; ;
return 0; return 0;
} }
@@ -5929,7 +5930,7 @@ @@ -5930,7 +5931,7 @@
BDB_LIBADD="" BDB_LIBADD=""
fi fi
@ -51,7 +42,7 @@ diff -u configure.orig configure
do do
as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
@@ -5953,11 +5954,11 @@ @@ -5954,11 +5955,11 @@
#endif #endif
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
@ -65,7 +56,7 @@ diff -u configure.orig configure
; ;
return 0; return 0;
} }
@@ -7181,6 +7182,8 @@ @@ -7182,6 +7183,8 @@
SASLAUTHD_TRUE='#' SASLAUTHD_TRUE='#'
SASLAUTHD_FALSE= SASLAUTHD_FALSE=
fi fi
@ -74,7 +65,7 @@ diff -u configure.orig configure
echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6 echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
@@ -10167,7 +10170,7 @@ @@ -10170,7 +10173,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@ -83,7 +74,7 @@ diff -u configure.orig configure
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
/* confdefs.h. */ /* confdefs.h. */
@@ -10516,7 +10519,7 @@ @@ -10519,7 +10522,7 @@
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a" GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
elif test "$gss_impl" = "heimdal"; then elif test "$gss_impl" = "heimdal"; then
@ -92,44 +83,12 @@ diff -u configure.orig configure
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
elif test "$gss_impl" = "cybersafe03"; then elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries # Version of CyberSafe with two libraries
@@ -11224,7 +11227,7 @@ @@ -11291,7 +11294,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpq $LIB_PGSQL_DIR $LIBS" -LIBS="-lpq $LIBS"
+LIBS="-lpq $LIB_PGSQL_DIR $GSSAPIBASE_LIBS $LIBS" +LIBS="-lpq $GSSAPIBASE_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
/* confdefs.h. */ /* confdefs.h. */
@@ -11288,7 +11291,22 @@
esac
-if test "$sql" = yes -a "$with_pgsql" = no -a "$with_mysql" = no; then
+LIB_SQLITE=""
+
+case "$with_sqlite" in
+ no) true;;
+ *)
+ LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib -lsqlite"
+ CPPFLAGS="${CPPFLAGS} -I${with_sqlite}/include"
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SQLITE
+_ACEOF
+ ;;
+esac
+
+
+if test "$sql" = yes -a "$with_pgsql" = no -a "$with_mysql" = no -a "$with_sqlite" = no; then
{ { echo "$as_me:$LINENO: error: --enable-sql chosen but neither Postgres nor MySQL found" >&5
echo "$as_me: error: --enable-sql chosen but neither Postgres nor MySQL found" >&2;}
{ (exit 1); exit 1; }; }
@@ -15021,6 +15039,7 @@
s,@NTLM_LIBS@,$NTLM_LIBS,;t t
s,@LIB_MYSQL@,$LIB_MYSQL,;t t
s,@LIB_PGSQL@,$LIB_PGSQL,;t t
+s,@LIB_SQLITE@,$LIB_SQLITE,;t t
s,@SASL_MECHS@,$SASL_MECHS,;t t
s,@SASL_STATIC_OBJS@,$SASL_STATIC_OBJS,;t t
s,@SASL_STATIC_LIBS@,$SASL_STATIC_LIBS,;t t