diff options
| author | ivan <ivan> | 2012-01-21 03:46:24 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2012-01-21 03:46:24 +0000 |
| commit | 24548f7cf666bac02335d0bc74f81251c7b4ab50 (patch) | |
| tree | e0f4f4a25b3a55e71957a1fb186e35fb9800be92 | |
| parent | 75162bb14b3e38d66617077843f4dfdcaf09d5c4 (diff) | |
import rt 3.8.11BESTPRACTICAL
43 files changed, 697 insertions, 596 deletions
diff --git a/rt/Makefile b/rt/Makefile index b6e00c6fd..43554b49a 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -63,14 +63,14 @@ SITE_CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_SiteConfig.pm RT_VERSION_MAJOR = 3 RT_VERSION_MINOR = 8 -RT_VERSION_PATCH = 10 +RT_VERSION_PATCH = 11 RT_VERSION = $(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH) TAG = rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH) # This is the group that all of the installed files will be chgrp'ed to. -RTGROUP = www +RTGROUP = www-data # User which should own rt binaries. @@ -82,8 +82,8 @@ LIBS_OWNER = root # Group that should own all of RT's libraries, generally root. LIBS_GROUP = bin -WEB_USER = www -WEB_GROUP = www +WEB_USER = www-data +WEB_GROUP = www-data APACHECTL = /usr/sbin/apachectl diff --git a/rt/autom4te.cache/output.0 b/rt/autom4te.cache/output.0 index f568c9cb2..9b6148bc2 100644 --- a/rt/autom4te.cache/output.0 +++ b/rt/autom4te.cache/output.0 @@ -1,7 +1,7 @@ @%:@! /bin/sh @%:@ From configure.ac Revision. @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.68 for RT 3.8.10. +@%:@ Generated by GNU Autoconf 2.67 for RT 3.8.11. @%:@ @%:@ Report bugs to <rt-bugs@bestpractical.com>. @%:@ @@ -92,7 +92,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in @%:@(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -217,18 +216,11 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - case $- in @%:@ (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -560,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RT' PACKAGE_TARNAME='rt' -PACKAGE_VERSION='3.8.10' -PACKAGE_STRING='RT 3.8.10' +PACKAGE_VERSION='3.8.11' +PACKAGE_STRING='RT 3.8.11' PACKAGE_BUGREPORT='rt-bugs@bestpractical.com' PACKAGE_URL='' @@ -1164,7 +1156,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac @@ -1302,7 +1294,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures RT 3.8.10 to adapt to many kinds of systems. +\`configure' configures RT 3.8.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1363,7 +1355,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RT 3.8.10:";; + short | recursive ) echo "Configuration of RT 3.8.11:";; esac cat <<\_ACEOF @@ -1488,8 +1480,8 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RT configure 3.8.10 -generated by GNU Autoconf 2.68 +RT configure 3.8.11 +generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1535,7 +1527,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } @%:@ ac_fn_c_try_compile @@ -1581,7 +1573,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } @%:@ ac_fn_c_try_link @@ -1589,8 +1581,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RT $as_me 3.8.10, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by RT $as_me 3.8.11, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1848,7 +1840,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -1924,7 +1916,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -1943,7 +1935,7 @@ rt_version_major=3 rt_version_minor=8 -rt_version_patch=10 +rt_version_patch=11 test "x$rt_version_major" = 'x' && rt_version_major=0 test "x$rt_version_minor" = 'x' && rt_version_minor=0 @@ -1966,7 +1958,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1995,7 +1987,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2077,7 +2069,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2118,7 +2110,7 @@ done set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : +if test "${ac_cv_path_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -2156,7 +2148,7 @@ fi if test "$PERL" = 'not found'; then - as_fn_error $? "cannot use $PACKAGE_NAME without perl" "$LINENO" 5 + as_fn_error $? "cannot use $PACKAGE_NAME without perl" "$LINENO" 5 fi @@ -2170,7 +2162,7 @@ fi my_web_handler_test=$($PERL -e 'print "ok" unless grep $_ !~ /^(modperl1|modperl2|fastcgi(?:-server)?|speedycgi|standalone)$/i, grep defined && length, split /\s*,\s*/, $ARGV0' $WEB_HANDLER) if test "$my_web_handler_test" != "ok"; then - as_fn_error $? "Only modperl1, modperl2, fastcgi, fastcgi-server, speedycgi and standalone are valid web-handlers" "$LINENO" 5 + as_fn_error $? "Only modperl1, modperl2, fastcgi, fastcgi-server, speedycgi and standalone are valid web-handlers" "$LINENO" 5 fi @@ -2183,7 +2175,7 @@ else fi if test "$WEB_HANDLER" = 'speedycgi' -a ! -x "$SPEEDY_BIN"; then - as_fn_error $? "cannot find speedycgi binary" "$LINENO" 5 + as_fn_error $? "cannot find speedycgi binary" "$LINENO" 5 fi @@ -2522,7 +2514,7 @@ $as_echo "none" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LAYOUT" >&5 $as_echo "$LAYOUT" >&6; } fi - as_fn_error $? "a valid layout must be specified (or the default used)" "$LINENO" 5 + as_fn_error $? "a valid layout must be specified (or the default used)" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rt_layout_name" >&5 @@ -2586,17 +2578,17 @@ else fi if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' -a "$DB_TYPE" != 'Informix' -a "$DB_TYPE" != 'Sybase' ; then - as_fn_error $? "Only Oracle, Pg, mysql and SQLite are valid db types" "$LINENO" 5 + as_fn_error $? "Only Oracle, Pg, mysql and SQLite are valid db types" "$LINENO" 5 fi if test "$DB_TYPE" = 'Oracle'; then - test "x$ORACLE_HOME" = 'x' && as_fn_error $? "Please declare the ORACLE_HOME environment variable" "$LINENO" 5 + test "x$ORACLE_HOME" = 'x' && as_fn_error $? "Please declare the ORACLE_HOME environment variable" "$LINENO" 5 DATABASE_ENV_PREF="\$ENV{'ORACLE_HOME'} = '$ORACLE_HOME';" fi if test "$DB_TYPE" = 'Sybase'; then - test "x$SYBASE" = 'x' && as_fn_error $? "Please declare the SYBASE_HOME environment variable" "$LINENO" 5 + test "x$SYBASE" = 'x' && as_fn_error $? "Please declare the SYBASE_HOME environment variable" "$LINENO" 5 DATABASE_ENV_PREF="\$ENV{'SYBASE'} = '$SYBASE';" fi @@ -2770,7 +2762,7 @@ $as_echo_n "checking if database name is valid... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "no. database name ($DB_DATABASE) contains '-' which is not valid for mysql" "$LINENO" 5 + as_fn_error $? "no. database name ($DB_DATABASE) contains '-' which is not valid for mysql" "$LINENO" 5 fi @@ -2820,7 +2812,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2860,7 +2852,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2913,7 +2905,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2953,7 +2945,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3012,7 +3004,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3056,7 +3048,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3111,7 +3103,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3226,7 +3218,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3269,7 +3261,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3328,7 +3320,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3339,7 +3331,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3380,7 +3372,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3390,7 +3382,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3427,7 +3419,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3505,7 +3497,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3603,7 +3595,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aginitlib in -lgraph" >&5 $as_echo_n "checking for aginitlib in -lgraph... " >&6; } -if ${ac_cv_lib_graph_aginitlib+:} false; then : +if test "${ac_cv_lib_graph_aginitlib+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3637,7 +3629,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_graph_aginitlib" >&5 $as_echo "$ac_cv_lib_graph_aginitlib" >&6; } -if test "x$ac_cv_lib_graph_aginitlib" = xyes; then : +if test "x$ac_cv_lib_graph_aginitlib" = x""yes; then : RT_GRAPHVIZ="1" fi @@ -3663,7 +3655,7 @@ fi set dummy gdlib-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RT_GD+:} false; then : +if test "${ac_cv_prog_RT_GD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RT_GD"; then @@ -3719,7 +3711,7 @@ fi set dummy gpg; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RT_GPG+:} false; then : +if test "${ac_cv_prog_RT_GPG+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RT_GPG"; then @@ -3970,21 +3962,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then + test "x$cache_file" != "x/dev/null" && { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi + cat confcache >$cache_file else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -4052,7 +4033,7 @@ LTLIBOBJS=$ac_ltlibobjs -: "${CONFIG_STATUS=./config.status}" +: ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -4153,7 +4134,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in @%:@(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4460,8 +4440,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RT $as_me 3.8.10, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by RT $as_me 3.8.11, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4513,8 +4493,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -RT config.status 3.8.10 -configured by $0, generated by GNU Autoconf 2.68, +RT config.status 3.8.11 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -4656,7 +4636,7 @@ do "t/data/configs/apache2.2+mod_perl.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+mod_perl.conf" ;; "t/data/configs/apache2.2+fastcgi.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+fastcgi.conf" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -4677,10 +4657,9 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -4688,13 +4667,12 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -4716,7 +4694,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF @@ -4725,18 +4703,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -4744,7 +4722,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -4792,7 +4770,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"\$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -4824,8 +4802,8 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF # VPATH may cause trouble with some makes, so we remove sole $(srcdir), @@ -4864,7 +4842,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -4883,7 +4861,7 @@ do for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -4892,7 +4870,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -4918,8 +4896,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -5049,24 +5027,23 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -5131,7 +5108,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. diff --git a/rt/autom4te.cache/requests b/rt/autom4te.cache/requests index 344704662..86bf57d16 100644 --- a/rt/autom4te.cache/requests +++ b/rt/autom4te.cache/requests @@ -1,4 +1,4 @@ -# This file was generated. +# This file was generated by Autom4te Thu Aug 5 21:29:16 UTC 2010. # It contains the lists of macros which have been traced. # It can be safely removed. @@ -7,10 +7,10 @@ '0', 1, [ - '/opt/local/share/autoconf' + '/usr/share/autoconf' ], [ - '/opt/local/share/autoconf/autoconf/autoconf.m4f', + '/usr/share/autoconf/autoconf/autoconf.m4f', 'aclocal.m4', 'configure.ac' ], @@ -27,7 +27,6 @@ 'AC_CANONICAL_HOST' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AM_PATH_GUILE' => 1, 'AC_CONFIG_SUBDIRS' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, @@ -36,20 +35,15 @@ 'm4_sinclude' => 1, 'LT_SUPPORTED_TAG' => 1, 'AM_MAINTAINER_MODE' => 1, - 'AM_NLS' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, '_m4_warn' => 1, 'AM_PROG_CXX_C_O' => 1, '_AM_COND_ENDIF' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, - 'AM_PROG_MOC' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, 'LT_INIT' => 1, - 'AM_PROG_AR' => 1, 'AM_GNU_GETTEXT' => 1, 'AC_LIBSOURCE' => 1, 'AM_PROG_FC_C_O' => 1, @@ -59,14 +53,12 @@ '_AM_SUBST_NOTMAKE' => 1, 'AC_CONFIG_AUX_DIR' => 1, 'sinclude' => 1, - 'AM_PROG_CC_C_O' => 1, 'm4_pattern_allow' => 1, - 'AM_XGETTEXT_OPTION' => 1, + 'AM_PROG_CC_C_O' => 1, 'AC_CANONICAL_SYSTEM' => 1, 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_POT_TOOLS' => 1, 'm4_include' => 1, '_AM_COND_ELSE' => 1, 'AC_SUBST_TRACE' => 1 diff --git a/rt/autom4te.cache/traces.0 b/rt/autom4te.cache/traces.0 index 750d9529a..811900e97 100644 --- a/rt/autom4te.cache/traces.0 +++ b/rt/autom4te.cache/traces.0 @@ -1,4 +1,4 @@ -m4trace:configure.ac:10: -1- AC_INIT([RT], [3.8.10], [rt-bugs@bestpractical.com]) +m4trace:configure.ac:10: -1- AC_INIT([RT], [3.8.11], [rt-bugs@bestpractical.com]) m4trace:configure.ac:10: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:10: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:10: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -152,7 +152,7 @@ m4trace:configure.ac:14: -1- m4_pattern_allow([^rt_version_major$]) m4trace:configure.ac:16: -1- AC_SUBST([rt_version_minor], [8]) m4trace:configure.ac:16: -1- AC_SUBST_TRACE([rt_version_minor]) m4trace:configure.ac:16: -1- m4_pattern_allow([^rt_version_minor$]) -m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [10]) +m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [11]) m4trace:configure.ac:18: -1- AC_SUBST_TRACE([rt_version_patch]) m4trace:configure.ac:18: -1- m4_pattern_allow([^rt_version_patch$]) m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([install-sh]) diff --git a/rt/config.log b/rt/config.log index 3c65cbbf7..6c4d6c091 100644 --- a/rt/config.log +++ b/rt/config.log @@ -1,8 +1,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RT configure 3.8.10, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by RT configure 3.8.11, which was +generated by GNU Autoconf 2.67. Invocation command line was $ ./configure @@ -10,156 +10,135 @@ generated by GNU Autoconf 2.68. Invocation command line was ## Platform. ## ## --------- ## -hostname = transom.local -uname -m = i386 -uname -r = 10.7.0 -uname -s = Darwin -uname -v = Darwin Kernel Version 10.7.0: Sat Jan 29 15:17:16 PST 2011; root:xnu-1504.9.37~1/RELEASE_I386 +hostname = umgah +uname -m = x86_64 +uname -r = 2.6.39-020639rc4-generic +uname -s = Linux +uname -v = #201104191410 SMP Tue Apr 19 14:19:01 UTC 2011 -/usr/bin/uname -p = i386 +/usr/bin/uname -p = unknown /bin/uname -X = unknown /bin/arch = unknown /usr/bin/arch -k = unknown /usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = Mach kernel version: - Darwin Kernel Version 10.7.0: Sat Jan 29 15:17:16 PST 2011; root:xnu-1504.9.37~1/RELEASE_I386 -Kernel configured for up to 2 processors. -2 processors are physically available. -2 processors are logically available. -Processor type: i486 (Intel 80486) -Processors active: 0 1 -Primary memory available: 8.00 gigabytes -Default processor set: 141 tasks, 509 threads, 2 processors -Load average: 1.63, Mach factor: 0.74 +/usr/bin/hostinfo = unknown /bin/machine = unknown /usr/bin/oslevel = unknown /bin/universe = unknown -PATH: /Users/falcone/perl5/perlbrew/bin -PATH: /Users/falcone/perl5/perlbrew/perls/current/bin -PATH: /Users/falcone/gitprojects/v/ -PATH: /opt/local/bin -PATH: /opt/local/sbin -PATH: /opt/local/bin -PATH: /opt/local/sbin -PATH: /opt/local/bin -PATH: /opt/local/sbin -PATH: /Users/falcone/bin -PATH: /Users/falcone/ec2/bin -PATH: /Users/falcone/work/git/git-sync -PATH: /Users/falcone/work/private-git/git-tools -PATH: /Users/falcone/Documents//android-sdk-mac_86/tools -PATH: /usr/bin -PATH: /bin +PATH: /home/chmrr/prog/perlbrew/bin +PATH: /home/chmrr/bin +PATH: /usr/local/sbin +PATH: /usr/local/bin PATH: /usr/sbin +PATH: /usr/bin PATH: /sbin -PATH: /usr/local/bin -PATH: /usr/X11/bin -PATH: /Users/falcone/perl5/perlbrew/bin -PATH: /Users/falcone/perl5/perlbrew/perls/current/bin -PATH: /Users/falcone/gitprojects/v/ -PATH: /opt/local/bin -PATH: /opt/local/sbin -PATH: /Users/falcone/bin -PATH: /Users/falcone/ec2/bin -PATH: /Users/falcone/work/git/git-sync -PATH: /Users/falcone/work/private-git/git-tools -PATH: /Users/falcone/Documents//android-sdk-mac_86/tools +PATH: /bin +PATH: /usr/games +PATH: /home/chmrr/aws/bin/ +PATH: /home/chmrr/prog/android/sdk/tools +PATH: /home/chmrr/prog/android/sdk/platform-tools ## ----------- ## ## Core tests. ## ## ----------- ## -configure:1995: checking for a BSD-compatible install -configure:2063: result: /usr/bin/install -c -configure:2078: checking for gawk -configure:2094: found /opt/local/bin/gawk -configure:2105: result: gawk -configure:2119: checking for perl -configure:2150: result: /usr/bin/perl -configure:2515: checking for chosen layout -configure:2528: result: relative -configure:2687: checking if user www exists -configure:2690: result: found -configure:2711: checking if group www exists -configure:2714: result: found -configure:2734: checking if group rt3 exists -configure:2740: result: not found -configure:2734: checking if group rt exists -configure:2740: result: not found -configure:2734: checking if group www exists -configure:2737: result: found -configure:2767: checking if database name is valid -configure:2770: result: yes -configure:2861: checking for gcc -configure:2877: found /usr/bin/gcc -configure:2888: result: gcc -configure:3117: checking for C compiler version -configure:3126: gcc --version >&5 -i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) -Copyright (C) 2007 Free Software Foundation, Inc. +configure:1987: checking for a BSD-compatible install +configure:2055: result: /usr/bin/install -c +configure:2070: checking for gawk +configure:2086: found /usr/bin/gawk +configure:2097: result: gawk +configure:2111: checking for perl +configure:2142: result: /usr/bin/perl +configure:2507: checking for chosen layout +configure:2520: result: relative +configure:2679: checking if user www exists +configure:2685: result: not found +configure:2679: checking if user www-data exists +configure:2682: result: found +configure:2703: checking if group www exists +configure:2709: result: not found +configure:2703: checking if group www-data exists +configure:2706: result: found +configure:2726: checking if group rt3 exists +configure:2732: result: not found +configure:2726: checking if group rt exists +configure:2732: result: not found +configure:2726: checking if group www-data exists +configure:2729: result: found +configure:2759: checking if database name is valid +configure:2762: result: yes +configure:2853: checking for gcc +configure:2880: result: ccache gcc +configure:3109: checking for C compiler version +configure:3118: ccache gcc --version >&5 +gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 +Copyright (C) 2010 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -configure:3137: $? = 0 -configure:3126: gcc -v >&5 +configure:3129: $? = 0 +configure:3118: ccache gcc -v >&5 Using built-in specs. -Target: i686-apple-darwin10 -Configured with: /var/tmp/gcc/gcc-5666.3~6/src/configure --disable-checking --enable-werror --prefix=/usr --mandir=/share/man --enable-languages=c,objc,c++,obj-c++ --program-transform-name=/^[cg][^.-]*$/s/$/-4.2/ --with-slibdir=/usr/lib --build=i686-apple-darwin10 --program-prefix=i686-apple-darwin10- --host=x86_64-apple-darwin10 --target=i686-apple-darwin10 --with-gxx-include-dir=/include/c++/4.2.1 +COLLECT_GCC=/usr/bin/gcc +COLLECT_LTO_WRAPPER=/usr/lib/x86_64-linux-gnu/gcc/x86_64-linux-gnu/4.5.2/lto-wrapper +Target: x86_64-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.5.2-8ubuntu4' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --with-multiarch-defaults=x86_64-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib/x86_64-linux-gnu --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib/x86_64-linux-gnu --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-plugin --enable-gold --enable-ld=default --with-plugin-ld=ld.gold --enable-objc-gc --disable-werror --with-arch-32=i686 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu Thread model: posix -gcc version 4.2.1 (Apple Inc. build 5666) (dot 3) -configure:3137: $? = 0 -configure:3126: gcc -V >&5 -gcc-4.2: argument to `-V' is missing -configure:3137: $? = 1 -configure:3126: gcc -qversion >&5 -i686-apple-darwin10-gcc-4.2.1: no input files -configure:3137: $? = 1 -configure:3157: checking whether the C compiler works -configure:3179: gcc conftest.c >&5 -configure:3183: $? = 0 -configure:3231: result: yes -configure:3234: checking for C compiler default output file name -configure:3236: result: a.out -configure:3242: checking for suffix of executables -configure:3249: gcc -o conftest conftest.c >&5 -configure:3253: $? = 0 -configure:3275: result: -configure:3297: checking whether we are cross compiling -configure:3305: gcc -o conftest conftest.c >&5 -configure:3309: $? = 0 -configure:3316: ./conftest -configure:3320: $? = 0 -configure:3335: result: no -configure:3340: checking for suffix of object files -configure:3362: gcc -c conftest.c >&5 -configure:3366: $? = 0 -configure:3387: result: o -configure:3391: checking whether we are using the GNU C compiler -configure:3410: gcc -c conftest.c >&5 -configure:3410: $? = 0 -configure:3419: result: yes -configure:3428: checking whether gcc accepts -g -configure:3448: gcc -c -g conftest.c >&5 -configure:3448: $? = 0 -configure:3489: result: yes -configure:3506: checking for gcc option to accept ISO C89 -configure:3570: gcc -c -g -O2 conftest.c >&5 -configure:3570: $? = 0 -configure:3583: result: none needed -configure:3604: checking for aginitlib in -lgraph -configure:3629: gcc -o conftest -g -O2 conftest.c -lgraph >&5 -ld: library not found for -lgraph +gcc version 4.5.2 (Ubuntu/Linaro 4.5.2-8ubuntu4) +configure:3129: $? = 0 +configure:3118: ccache gcc -V >&5 +gcc: '-V' option must have argument +configure:3129: $? = 1 +configure:3118: ccache gcc -qversion >&5 +gcc: unrecognized option '-qversion' +gcc: no input files +configure:3129: $? = 1 +configure:3149: checking whether the C compiler works +configure:3171: ccache gcc conftest.c >&5 +configure:3175: $? = 0 +configure:3223: result: yes +configure:3226: checking for C compiler default output file name +configure:3228: result: a.out +configure:3234: checking for suffix of executables +configure:3241: ccache gcc -o conftest conftest.c >&5 +configure:3245: $? = 0 +configure:3267: result: +configure:3289: checking whether we are cross compiling +configure:3297: ccache gcc -o conftest conftest.c >&5 +configure:3301: $? = 0 +configure:3308: ./conftest +configure:3312: $? = 0 +configure:3327: result: no +configure:3332: checking for suffix of object files +configure:3354: ccache gcc -c conftest.c >&5 +configure:3358: $? = 0 +configure:3379: result: o +configure:3383: checking whether we are using the GNU C compiler +configure:3402: ccache gcc -c conftest.c >&5 +configure:3402: $? = 0 +configure:3411: result: yes +configure:3420: checking whether ccache gcc accepts -g +configure:3440: ccache gcc -c -g conftest.c >&5 +configure:3440: $? = 0 +configure:3481: result: yes +configure:3498: checking for ccache gcc option to accept ISO C89 +configure:3562: ccache gcc -c -g -O2 conftest.c >&5 +configure:3562: $? = 0 +configure:3575: result: none needed +configure:3596: checking for aginitlib in -lgraph +configure:3621: ccache gcc -o conftest -g -O2 conftest.c -lgraph >&5 +/usr/bin/ld: cannot find -lgraph collect2: ld returned 1 exit status -configure:3629: $? = 1 +configure:3621: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "RT" | #define PACKAGE_TARNAME "rt" -| #define PACKAGE_VERSION "3.8.10" -| #define PACKAGE_STRING "RT 3.8.10" +| #define PACKAGE_VERSION "3.8.11" +| #define PACKAGE_STRING "RT 3.8.11" | #define PACKAGE_BUGREPORT "rt-bugs@bestpractical.com" | #define PACKAGE_URL "" | /* end confdefs.h. */ @@ -178,21 +157,21 @@ configure: failed program was: | ; | return 0; | } -configure:3638: result: no -configure:3664: checking for gdlib-config -configure:3680: found /opt/local/bin/gdlib-config -configure:3692: result: yes -configure:3720: checking for gpg -configure:3736: found /opt/local/bin/gpg -configure:3748: result: yes -configure:4059: creating ./config.status +configure:3630: result: no +configure:3656: checking for gdlib-config +configure:3672: found /usr/bin/gdlib-config +configure:3684: result: yes +configure:3712: checking for gpg +configure:3728: found /usr/bin/gpg +configure:3740: result: yes +configure:4040: creating ./config.status ## ---------------------- ## ## Running config.status. ## ## ---------------------- ## -This file was extended by RT config.status 3.8.10, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by RT config.status 3.8.11, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = CONFIG_HEADERS = @@ -200,46 +179,46 @@ generated by GNU Autoconf 2.68. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on transom.local +on umgah -config.status:869: creating etc/upgrade/3.8-branded-queues-extension -config.status:869: creating etc/upgrade/3.8-ical-extension -config.status:869: creating etc/upgrade/split-out-cf-categories -config.status:869: creating etc/upgrade/generate-rtaddressregexp -config.status:869: creating etc/upgrade/vulnerable-passwords -config.status:869: creating sbin/rt-attributes-viewer -config.status:869: creating sbin/rt-dump-database -config.status:869: creating sbin/rt-setup-database -config.status:869: creating sbin/rt-test-dependencies -config.status:869: creating sbin/rt-email-digest -config.status:869: creating sbin/rt-email-dashboards -config.status:869: creating sbin/rt-clean-sessions -config.status:869: creating sbin/rt-shredder -config.status:869: creating sbin/rt-validator -config.status:869: creating sbin/rt-email-group-admin -config.status:869: creating sbin/rt-server -config.status:869: creating bin/fastcgi_server -config.status:869: creating bin/mason_handler.fcgi -config.status:869: creating bin/mason_handler.scgi -config.status:869: creating bin/standalone_httpd -config.status:869: creating bin/rt-crontool -config.status:869: creating bin/rt-mailgate -config.status:869: creating bin/rt -config.status:869: creating Makefile -config.status:869: creating etc/RT_Config.pm -config.status:869: creating lib/RT.pm -config.status:869: creating bin/mason_handler.svc -config.status:869: creating bin/webmux.pl -config.status:869: creating t/data/configs/apache2.2+mod_perl.conf -config.status:869: creating t/data/configs/apache2.2+fastcgi.conf +config.status:866: creating etc/upgrade/3.8-branded-queues-extension +config.status:866: creating etc/upgrade/3.8-ical-extension +config.status:866: creating etc/upgrade/split-out-cf-categories +config.status:866: creating etc/upgrade/generate-rtaddressregexp +config.status:866: creating etc/upgrade/vulnerable-passwords +config.status:866: creating sbin/rt-attributes-viewer +config.status:866: creating sbin/rt-dump-database +config.status:866: creating sbin/rt-setup-database +config.status:866: creating sbin/rt-test-dependencies +config.status:866: creating sbin/rt-email-digest +config.status:866: creating sbin/rt-email-dashboards +config.status:866: creating sbin/rt-clean-sessions +config.status:866: creating sbin/rt-shredder +config.status:866: creating sbin/rt-validator +config.status:866: creating sbin/rt-email-group-admin +config.status:866: creating sbin/rt-server +config.status:866: creating bin/fastcgi_server +config.status:866: creating bin/mason_handler.fcgi +config.status:866: creating bin/mason_handler.scgi +config.status:866: creating bin/standalone_httpd +config.status:866: creating bin/rt-crontool +config.status:866: creating bin/rt-mailgate +config.status:866: creating bin/rt +config.status:866: creating Makefile +config.status:866: creating etc/RT_Config.pm +config.status:866: creating lib/RT.pm +config.status:866: creating bin/mason_handler.svc +config.status:866: creating bin/webmux.pl +config.status:866: creating t/data/configs/apache2.2+mod_perl.conf +config.status:866: creating t/data/configs/apache2.2+fastcgi.conf ## ---------------- ## ## Cache variables. ## ## ---------------- ## ac_cv_c_compiler_gnu=yes -ac_cv_env_CC_set= -ac_cv_env_CC_value= +ac_cv_env_CC_set=set +ac_cv_env_CC_value='ccache gcc' ac_cv_env_CFLAGS_set= ac_cv_env_CFLAGS_value= ac_cv_env_CPPFLAGS_set= @@ -263,7 +242,7 @@ ac_cv_path_install='/usr/bin/install -c' ac_cv_prog_AWK=gawk ac_cv_prog_RT_GD=yes ac_cv_prog_RT_GPG=yes -ac_cv_prog_ac_ct_CC=gcc +ac_cv_prog_ac_ct_CC='ccache gcc' ac_cv_prog_cc_c89= ac_cv_prog_cc_g=yes @@ -274,7 +253,7 @@ ac_cv_prog_cc_g=yes APACHECTL='/usr/sbin/apachectl' AWK='gawk' BIN_OWNER='root' -CC='gcc' +CC='ccache gcc' CFLAGS='-g -O2' COMMENT_INPLACE_LAYOUT='' CONFIG_FILE_PATH='etc' @@ -289,9 +268,9 @@ DB_RT_HOST='localhost' DB_RT_PASS='rt_pass' DB_RT_USER='rt_user' DB_TYPE='mysql' -DEFS='-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.8.10\" -DPACKAGE_STRING=\"RT\ 3.8.10\" -DPACKAGE_BUGREPORT=\"rt-bugs@bestpractical.com\" -DPACKAGE_URL=\"\"' -ECHO_C='\c' -ECHO_N='' +DEFS='-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.8.11\" -DPACKAGE_STRING=\"RT\ 3.8.11\" -DPACKAGE_BUGREPORT=\"rt-bugs@bestpractical.com\" -DPACKAGE_URL=\"\"' +ECHO_C='' +ECHO_N='-n' ECHO_T='' EXEEXT='' INSTALL_DATA='${INSTALL} -m 644' @@ -320,13 +299,13 @@ MASON_SESSION_PATH_R='/opt/rt3/var/session_data' OBJEXT='o' PACKAGE_BUGREPORT='rt-bugs@bestpractical.com' PACKAGE_NAME='RT' -PACKAGE_STRING='RT 3.8.10' +PACKAGE_STRING='RT 3.8.11' PACKAGE_TARNAME='rt' PACKAGE_URL='' -PACKAGE_VERSION='3.8.10' +PACKAGE_VERSION='3.8.11' PATH_SEPARATOR=':' PERL='/usr/bin/perl' -RTGROUP='www' +RTGROUP='www-data' RT_BIN_PATH='bin' RT_BIN_PATH_R='/opt/rt3/bin' RT_DEVEL_MODE='0' @@ -357,13 +336,13 @@ RT_VAR_PATH='var' RT_VAR_PATH_R='/opt/rt3/var' RT_VERSION_MAJOR='3' RT_VERSION_MINOR='8' -RT_VERSION_PATCH='10' -SHELL='/bin/sh' +RT_VERSION_PATCH='11' +SHELL='/bin/bash' SPEEDY_BIN='/usr/local/bin/speedy' -WEB_GROUP='www' +WEB_GROUP='www-data' WEB_HANDLER='fastcgi' -WEB_USER='www' -ac_ct_CC='gcc' +WEB_USER='www-data' +ac_ct_CC='ccache gcc' bindir='bin' build_alias='' customdir='local' @@ -419,7 +398,7 @@ psdir='${docdir}' rt_layout_name='relative' rt_version_major='3' rt_version_minor='8' -rt_version_patch='10' +rt_version_patch='11' sbindir='sbin' sessionstatedir='var/session_data' sharedstatedir='${prefix}/com' @@ -433,8 +412,8 @@ target_alias='' /* confdefs.h */ #define PACKAGE_NAME "RT" #define PACKAGE_TARNAME "rt" -#define PACKAGE_VERSION "3.8.10" -#define PACKAGE_STRING "RT 3.8.10" +#define PACKAGE_VERSION "3.8.11" +#define PACKAGE_STRING "RT 3.8.11" #define PACKAGE_BUGREPORT "rt-bugs@bestpractical.com" #define PACKAGE_URL "" diff --git a/rt/config.status b/rt/config.status index 83560ece8..edd6a850b 100755 --- a/rt/config.status +++ b/rt/config.status @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # Generated by configure. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging @@ -8,7 +8,7 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=${CONFIG_SHELL-/bin/sh} +SHELL=${CONFIG_SHELL-/bin/bash} export SHELL ## -------------------- ## ## M4sh Initialization. ## @@ -89,7 +89,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -392,8 +391,8 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RT $as_me 3.8.10, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by RT $as_me 3.8.11, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -429,17 +428,17 @@ $config_files Report bugs to <rt-bugs@bestpractical.com>." -ac_cs_config="'PERL=/usr/bin/perl'" +ac_cs_config="'PERL=/usr/bin/perl' 'CC=ccache gcc'" ac_cs_version="\ -RT config.status 3.8.10 -configured by ./configure, generated by GNU Autoconf 2.68, +RT config.status 3.8.11 +configured by ./configure, generated by GNU Autoconf 2.67, with options \"$ac_cs_config\" Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/Users/falcone/work/rt/security/rt-3.8.10' +ac_pwd='/home/chmrr/work/bps/git/rt/rt-3.8.11' srcdir='.' INSTALL='/usr/bin/install -c' AWK='gawk' @@ -509,10 +508,10 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - set X '/bin/sh' './configure' 'PERL=/usr/bin/perl' $ac_configure_extra_args --no-create --no-recursion + set X '/bin/bash' './configure' 'PERL=/usr/bin/perl' 'CC=ccache gcc' $ac_configure_extra_args --no-create --no-recursion shift - $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 - CONFIG_SHELL='/bin/sh' + $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6 + CONFIG_SHELL='/bin/bash' export CONFIG_SHELL exec "$@" fi @@ -562,7 +561,7 @@ do "t/data/configs/apache2.2+mod_perl.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+mod_perl.conf" ;; "t/data/configs/apache2.2+fastcgi.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+fastcgi.conf" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -583,10 +582,9 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -594,13 +592,12 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -622,8 +619,8 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -cat >>"$ac_tmp/subs1.awk" <<\_ACAWK && +echo 'BEGIN {' >"$tmp/subs1.awk" && +cat >>"$tmp/subs1.awk" <<\_ACAWK && S["LTLIBOBJS"]="" S["LIBOBJS"]="" S["RT_LOG_PATH_R"]="/opt/rt3/var/log" @@ -666,7 +663,7 @@ S["RT_LIB_PATH"]="lib" S["RT_LOCAL_PATH"]="local" S["RT_DOC_PATH"]="share/doc" S["RT_PATH"]="/opt/rt3" -S["RT_VERSION_PATCH"]="10" +S["RT_VERSION_PATCH"]="11" S["RT_VERSION_MINOR"]="8" S["RT_VERSION_MAJOR"]="3" S["RT_GPG"]="1" @@ -674,16 +671,16 @@ S["RT_GD"]="1" S["RT_GRAPHVIZ"]="0" S["OBJEXT"]="o" S["EXEEXT"]="" -S["ac_ct_CC"]="gcc" +S["ac_ct_CC"]="ccache gcc" S["CPPFLAGS"]="" S["LDFLAGS"]="" S["CFLAGS"]="-g -O2" -S["CC"]="gcc" +S["CC"]="ccache gcc" S["RT_DEVEL_MODE"]="0" S["APACHECTL"]="/usr/sbin/apachectl" -S["RTGROUP"]="www" -S["WEB_GROUP"]="www" -S["WEB_USER"]="www" +S["RTGROUP"]="www-data" +S["WEB_GROUP"]="www-data" +S["WEB_USER"]="www-data" S["DB_RT_PASS"]="rt_pass" S["DB_RT_USER"]="rt_user" S["DB_DATABASE"]="rt3" @@ -737,7 +734,7 @@ S["AWK"]="gawk" S["INSTALL_DATA"]="${INSTALL} -m 644" S["INSTALL_SCRIPT"]="${INSTALL}" S["INSTALL_PROGRAM"]="${INSTALL}" -S["rt_version_patch"]="10" +S["rt_version_patch"]="11" S["rt_version_minor"]="8" S["rt_version_major"]="3" S["target_alias"]="" @@ -745,9 +742,9 @@ S["host_alias"]="" S["build_alias"]="" S["LIBS"]="" S["ECHO_T"]="" -S["ECHO_N"]="" -S["ECHO_C"]="\\c" -S["DEFS"]="-DPACKAGE_NAME=\\\"RT\\\" -DPACKAGE_TARNAME=\\\"rt\\\" -DPACKAGE_VERSION=\\\"3.8.10\\\" -DPACKAGE_STRING=\\\"RT\\ 3.8.10\\\" -DPACKAGE_BUGREPORT=\\\"rt-bugs@bestpracti"\ +S["ECHO_N"]="-n" +S["ECHO_C"]="" +S["DEFS"]="-DPACKAGE_NAME=\\\"RT\\\" -DPACKAGE_TARNAME=\\\"rt\\\" -DPACKAGE_VERSION=\\\"3.8.11\\\" -DPACKAGE_STRING=\\\"RT\\ 3.8.11\\\" -DPACKAGE_BUGREPORT=\\\"rt-bugs@bestpracti"\ "cal.com\\\" -DPACKAGE_URL=\\\"\\\"" S["mandir"]="man" S["localedir"]="${datarootdir}/locale" @@ -773,14 +770,14 @@ S["prefix"]="/opt/rt3" S["exec_prefix"]="/opt/rt3" S["PACKAGE_URL"]="" S["PACKAGE_BUGREPORT"]="rt-bugs@bestpractical.com" -S["PACKAGE_STRING"]="RT 3.8.10" -S["PACKAGE_VERSION"]="3.8.10" +S["PACKAGE_STRING"]="RT 3.8.11" +S["PACKAGE_VERSION"]="3.8.11" S["PACKAGE_TARNAME"]="rt" S["PACKAGE_NAME"]="RT" S["PATH_SEPARATOR"]=":" -S["SHELL"]="/bin/sh" +S["SHELL"]="/bin/bash" _ACAWK -cat >>"$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -810,7 +807,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 fi # test -n "$CONFIG_FILES" @@ -824,7 +821,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -843,7 +840,7 @@ do for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -852,7 +849,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -878,8 +875,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -1011,22 +1008,21 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/rt/configure b/rt/configure index 1857b95d2..e20c023a0 100755 --- a/rt/configure +++ b/rt/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for RT 3.8.10. +# Generated by GNU Autoconf 2.67 for RT 3.8.11. # # Report bugs to <rt-bugs@bestpractical.com>. # @@ -92,7 +92,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -217,18 +216,11 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -560,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RT' PACKAGE_TARNAME='rt' -PACKAGE_VERSION='3.8.10' -PACKAGE_STRING='RT 3.8.10' +PACKAGE_VERSION='3.8.11' +PACKAGE_STRING='RT 3.8.11' PACKAGE_BUGREPORT='rt-bugs@bestpractical.com' PACKAGE_URL='' @@ -1164,7 +1156,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac @@ -1302,7 +1294,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures RT 3.8.10 to adapt to many kinds of systems. +\`configure' configures RT 3.8.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1363,7 +1355,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RT 3.8.10:";; + short | recursive ) echo "Configuration of RT 3.8.11:";; esac cat <<\_ACEOF @@ -1488,8 +1480,8 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RT configure 3.8.10 -generated by GNU Autoconf 2.68 +RT configure 3.8.11 +generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1535,7 +1527,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1581,7 +1573,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1589,8 +1581,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RT $as_me 3.8.10, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by RT $as_me 3.8.11, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1848,7 +1840,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -1943,7 +1935,7 @@ rt_version_major=3 rt_version_minor=8 -rt_version_patch=10 +rt_version_patch=11 test "x$rt_version_major" = 'x' && rt_version_major=0 test "x$rt_version_minor" = 'x' && rt_version_minor=0 @@ -1995,7 +1987,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2077,7 +2069,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2118,7 +2110,7 @@ done set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : +if test "${ac_cv_path_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -2820,7 +2812,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2860,7 +2852,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2913,7 +2905,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2953,7 +2945,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3012,7 +3004,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3056,7 +3048,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3111,7 +3103,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3226,7 +3218,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3269,7 +3261,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3328,7 +3320,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3339,7 +3331,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3380,7 +3372,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3390,7 +3382,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3427,7 +3419,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3505,7 +3497,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3603,7 +3595,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aginitlib in -lgraph" >&5 $as_echo_n "checking for aginitlib in -lgraph... " >&6; } -if ${ac_cv_lib_graph_aginitlib+:} false; then : +if test "${ac_cv_lib_graph_aginitlib+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3637,7 +3629,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_graph_aginitlib" >&5 $as_echo "$ac_cv_lib_graph_aginitlib" >&6; } -if test "x$ac_cv_lib_graph_aginitlib" = xyes; then : +if test "x$ac_cv_lib_graph_aginitlib" = x""yes; then : RT_GRAPHVIZ="1" fi @@ -3663,7 +3655,7 @@ fi set dummy gdlib-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RT_GD+:} false; then : +if test "${ac_cv_prog_RT_GD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RT_GD"; then @@ -3719,7 +3711,7 @@ fi set dummy gpg; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RT_GPG+:} false; then : +if test "${ac_cv_prog_RT_GPG+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RT_GPG"; then @@ -3970,21 +3962,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then + test "x$cache_file" != "x/dev/null" && { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi + cat confcache >$cache_file else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -4052,7 +4033,7 @@ LTLIBOBJS=$ac_ltlibobjs -: "${CONFIG_STATUS=./config.status}" +: ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -4153,7 +4134,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4460,8 +4440,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RT $as_me 3.8.10, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by RT $as_me 3.8.11, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4513,8 +4493,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -RT config.status 3.8.10 -configured by $0, generated by GNU Autoconf 2.68, +RT config.status 3.8.11 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -4656,7 +4636,7 @@ do "t/data/configs/apache2.2+mod_perl.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+mod_perl.conf" ;; "t/data/configs/apache2.2+fastcgi.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+fastcgi.conf" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -4677,10 +4657,9 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -4688,13 +4667,12 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -4716,7 +4694,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF @@ -4744,7 +4722,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -4792,7 +4770,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"\$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -4824,7 +4802,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -4864,7 +4842,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -4883,7 +4861,7 @@ do for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -4892,7 +4870,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -4918,8 +4896,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -5049,22 +5027,21 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; diff --git a/rt/configure.ac b/rt/configure.ac index b5b38eec3..122b59a6d 100644 --- a/rt/configure.ac +++ b/rt/configure.ac @@ -3,11 +3,11 @@ dnl dnl Process this file with autoconf to produce a configure script dnl dnl Embed in generated ./configure script the following CVS info: -AC_REVISION($Revision: 1.1.1.14 $)dnl +AC_REVISION($Revision: 1.1.1.15 $)dnl dnl Setup autoconf AC_PREREQ([2.53]) -AC_INIT(RT, 3.8.10, [rt-bugs@bestpractical.com]) +AC_INIT(RT, 3.8.11, [rt-bugs@bestpractical.com]) AC_CONFIG_SRCDIR([lib/RT.pm.in]) dnl Extract RT version number components diff --git a/rt/etc/RT_Config.pm b/rt/etc/RT_Config.pm index 67d131319..1b7e756c5 100644 --- a/rt/etc/RT_Config.pm +++ b/rt/etc/RT_Config.pm @@ -1235,6 +1235,19 @@ via SSL encrypted HTTP connections. Set($WebSecureCookies, 0); +=item C<$WebHttpOnlyCookies> + +Default RT's session cookie to not being directly accessible to +javascript. The content is still sent during regular and AJAX requests, +and other cookies are unaffected, but the session-id is less +programmatically accessible to javascript. Turning this off should only +be necessary in situations with odd client-side authentication +requirements. + +=cut + +Set($WebHttpOnlyCookies, 1); + =item C<$WebFlushDbCacheEveryRequest> By default, RT clears its database cache after every page view. diff --git a/rt/etc/RT_Config.pm.in b/rt/etc/RT_Config.pm.in index ea64a2e01..1df9c66fd 100644 --- a/rt/etc/RT_Config.pm.in +++ b/rt/etc/RT_Config.pm.in @@ -1235,6 +1235,19 @@ via SSL encrypted HTTP connections. Set($WebSecureCookies, 0); +=item C<$WebHttpOnlyCookies> + +Default RT's session cookie to not being directly accessible to +javascript. The content is still sent during regular and AJAX requests, +and other cookies are unaffected, but the session-id is less +programmatically accessible to javascript. Turning this off should only +be necessary in situations with odd client-side authentication +requirements. + +=cut + +Set($WebHttpOnlyCookies, 1); + =item C<$WebFlushDbCacheEveryRequest> By default, RT clears its database cache after every page view. diff --git a/rt/etc/schema.mysql-4.1 b/rt/etc/schema.mysql-4.1 index 172e477c1..b5b1c4346 100755 --- a/rt/etc/schema.mysql-4.1 +++ b/rt/etc/schema.mysql-4.1 @@ -14,7 +14,7 @@ CREATE TABLE Attachments ( Creator integer NOT NULL DEFAULT 0 , Created DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX Attachments2 ON Attachments (TransactionId) ; CREATE INDEX Attachments3 ON Attachments (Parent, TransactionId) ; @@ -36,7 +36,7 @@ CREATE TABLE Queues ( LastUpdated DATETIME NULL , Disabled int2 NOT NULL DEFAULT 0 , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE UNIQUE INDEX Queues1 ON Queues (Name) ; CREATE INDEX Queues2 ON Queues (Disabled) ; @@ -57,7 +57,7 @@ CREATE TABLE Links ( Creator integer NOT NULL DEFAULT 0 , Created DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET ascii; +) ENGINE=InnoDB CHARACTER SET ascii; CREATE INDEX Links2 ON Links (Base, Type) ; CREATE INDEX Links3 ON Links (Target, Type) ; @@ -73,7 +73,7 @@ CREATE TABLE Principals ( ObjectId integer, # foreign key to Users or Groups, depending Disabled int2 NOT NULL DEFAULT 0 , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET ascii; +) ENGINE=InnoDB CHARACTER SET ascii; CREATE INDEX Principals2 ON Principals (ObjectId); @@ -89,7 +89,7 @@ CREATE TABLE Groups ( Type varchar(64) CHARACTER SET ascii NULL, Instance integer, PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX Groups1 ON Groups (Domain,Instance,Type,id); CREATE INDEX Groups2 On Groups (Type, Instance); @@ -111,7 +111,7 @@ CREATE TABLE ScripConditions ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; # }}} @@ -133,7 +133,7 @@ CREATE TABLE Transactions ( Creator integer NOT NULL DEFAULT 0 , Created DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId); @@ -159,7 +159,7 @@ CREATE TABLE Scrips ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; # }}} @@ -175,7 +175,7 @@ CREATE TABLE ACL ( DelegatedBy integer NOT NULL default 0, #foreign key to principals with a userid DelegatedFrom integer NOT NULL default 0, #foreign key to ACL PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX ACL1 on ACL(RightName, ObjectType, ObjectId,PrincipalType,PrincipalId); @@ -188,7 +188,7 @@ CREATE TABLE GroupMembers ( GroupId integer NOT NULL DEFAULT 0, MemberId integer NOT NULL DEFAULT 0, #Foreign key to Principals PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE UNIQUE INDEX GroupMembers1 on GroupMembers (GroupId, MemberId); @@ -210,7 +210,7 @@ create table CachedGroupMembers ( # group members recursively. # Also, this allows us to have the ACL system elide members of disabled groups PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX DisGrouMem on CachedGroupMembers (GroupId,MemberId,Disabled); CREATE INDEX CachedGroupMembers3 on CachedGroupMembers (MemberId, ImmediateParentId); @@ -256,7 +256,7 @@ CREATE TABLE Users ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE UNIQUE INDEX Users1 ON Users (Name) ; @@ -296,7 +296,7 @@ CREATE TABLE Tickets ( Created DATETIME NULL , Disabled int2 NOT NULL DEFAULT 0 , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX Tickets1 ON Tickets (Queue, Status) ; CREATE INDEX Tickets2 ON Tickets (Owner) ; @@ -317,7 +317,7 @@ CREATE TABLE ScripActions ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; # }}} @@ -337,7 +337,7 @@ CREATE TABLE Templates ( Creator integer NOT NULL DEFAULT 0 , Created DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; # }}} @@ -361,7 +361,7 @@ CREATE TABLE ObjectCustomFieldValues ( LastUpdated DATETIME NULL , Disabled int2 NOT NULL DEFAULT 0 , # New -- whether the value was current PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX ObjectCustomFieldValues1 ON ObjectCustomFieldValues (Content); CREATE INDEX ObjectCustomFieldValues2 ON ObjectCustomFieldValues (CustomField,ObjectType,ObjectId); @@ -387,7 +387,7 @@ CREATE TABLE CustomFields ( LastUpdated DATETIME NULL , Disabled int2 NOT NULL DEFAULT 0 , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; # }}} @@ -404,7 +404,7 @@ CREATE TABLE ObjectCustomFields ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; # }}} @@ -422,7 +422,7 @@ CREATE TABLE CustomFieldValues ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField); @@ -444,7 +444,7 @@ CREATE TABLE Attributes ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , PRIMARY KEY (id) -) TYPE=InnoDB CHARACTER SET utf8; +) ENGINE=InnoDB CHARACTER SET utf8; CREATE INDEX Attributes1 on Attributes(Name); CREATE INDEX Attributes2 on Attributes(ObjectType, ObjectId); diff --git a/rt/lib/RT.pm b/rt/lib/RT.pm index edfe1fb1a..adc5422ca 100644 --- a/rt/lib/RT.pm +++ b/rt/lib/RT.pm @@ -57,7 +57,7 @@ use Cwd (); use vars qw($Config $System $SystemUser $Nobody $Handle $Logger $_INSTALL_MODE); -our $VERSION = '3.8.10'; +our $VERSION = '3.8.11'; diff --git a/rt/lib/RT/Action/CreateTickets.pm b/rt/lib/RT/Action/CreateTickets.pm index 7b8a13699..08763d531 100644 --- a/rt/lib/RT/Action/CreateTickets.pm +++ b/rt/lib/RT/Action/CreateTickets.pm @@ -723,7 +723,7 @@ sub ParseLines { } } - foreach my $date qw(due starts started resolved) { + foreach my $date (qw(due starts started resolved)) { my $dateobj = RT::Date->new( $self->CurrentUser ); next unless $args{$date}; if ( $args{$date} =~ /^\d+$/ ) { @@ -1080,7 +1080,7 @@ sub UpdateWatchers { my @results; - foreach my $type qw(Requestor Cc AdminCc) { + foreach my $type (qw(Requestor Cc AdminCc)) { my $method = $type . 'Addresses'; my $oldaddr = $ticket->$method; diff --git a/rt/lib/RT/Approval/Rule/Created.pm b/rt/lib/RT/Approval/Rule/Created.pm index 324061e88..40382f9ef 100644 --- a/rt/lib/RT/Approval/Rule/Created.pm +++ b/rt/lib/RT/Approval/Rule/Created.pm @@ -68,4 +68,6 @@ sub Commit { $self->RunScripAction('Open Tickets' => 'Blank'); } +RT::Base->_ImportOverlays(); + 1; diff --git a/rt/lib/RT/Approval/Rule/NewPending.pm b/rt/lib/RT/Approval/Rule/NewPending.pm index 6d93d8252..026f7e680 100644 --- a/rt/lib/RT/Approval/Rule/NewPending.pm +++ b/rt/lib/RT/Approval/Rule/NewPending.pm @@ -94,4 +94,6 @@ sub Commit { } +RT::Base->_ImportOverlays(); + 1; diff --git a/rt/lib/RT/Approval/Rule/Passed.pm b/rt/lib/RT/Approval/Rule/Passed.pm index 1618e6e8f..e0560bac1 100644 --- a/rt/lib/RT/Approval/Rule/Passed.pm +++ b/rt/lib/RT/Approval/Rule/Passed.pm @@ -62,13 +62,7 @@ sub Prepare { sub Commit { my $self = shift; - my $note; - my $t = $self->TicketObj->Transactions; - - while ( my $o = $t->Next ) { - next unless $o->Type eq 'Correspond'; - $note .= $o->Content . "\n" if $o->ContentObj; - } + my $note = $self->GetNotes; my ($top) = $self->TicketObj->AllDependedOnBy( Type => 'ticket' ); my $links = $self->TicketObj->DependedOnBy; @@ -108,4 +102,19 @@ sub Commit { return; } +sub GetNotes { + my $self = shift; + my $t = $self->TicketObj->Transactions; + my $note = ''; + + while ( my $o = $t->Next ) { + next unless $o->Type eq 'Correspond'; + $note .= $o->Content . "\n" if $o->ContentObj; + } + return $note; + +} + +RT::Base->_ImportOverlays(); + 1; diff --git a/rt/lib/RT/Approval/Rule/Rejected.pm b/rt/lib/RT/Approval/Rule/Rejected.pm index b10f5f0ea..a97cf47b2 100644 --- a/rt/lib/RT/Approval/Rule/Rejected.pm +++ b/rt/lib/RT/Approval/Rule/Rejected.pm @@ -65,14 +65,7 @@ sub Commit { # XXX: from custom prepare code my $self = shift; if ( my ($rejected) = $self->TicketObj->AllDependedOnBy( Type => 'ticket' ) ) { - my $note = ''; - if ( RT->Config->Get('ApprovalRejectionNotes') ) { - my $t = $self->TicketObj->Transactions; - while ( my $o = $t->Next ) { - next unless $o->Type eq 'Correspond'; - $note .= $o->Content . "\n" if $o->ContentObj; - } - } + my $note = $self->GetNotes; my $template = $self->GetTemplate('Approval Rejected', TicketObj => $rejected, @@ -112,4 +105,20 @@ sub Commit { # XXX: from custom prepare code } +sub GetNotes { + my $self = shift; + my $note = ''; + + if ( RT->Config->Get('ApprovalRejectionNotes') ) { + my $t = $self->TicketObj->Transactions; + while ( my $o = $t->Next ) { + next unless $o->Type eq 'Correspond'; + $note .= $o->Content . "\n" if $o->ContentObj; + } + } + return $note; +} + +RT::Base->_ImportOverlays(); + 1; diff --git a/rt/lib/RT/Base.pm b/rt/lib/RT/Base.pm index 39708504a..c7fc66e98 100644 --- a/rt/lib/RT/Base.pm +++ b/rt/lib/RT/Base.pm @@ -168,8 +168,8 @@ sub _ImportOverlays { my $class = shift; my ($package,undef,undef) = caller(); $package =~ s|::|/|g; - for (qw(Overlay Vendor Local)) { - my $filename = $package."_".$_.".pm"; + for my $type (qw(Overlay Vendor Local)) { + my $filename = $package."_".$type.".pm"; eval { require $filename }; die $@ if ($@ && $@ !~ qr{^Can't locate $filename}); } diff --git a/rt/lib/RT/Crypt/GnuPG.pm b/rt/lib/RT/Crypt/GnuPG.pm index 314e6cc38..bb8b2dbfc 100644 --- a/rt/lib/RT/Crypt/GnuPG.pm +++ b/rt/lib/RT/Crypt/GnuPG.pm @@ -351,6 +351,8 @@ my %supported_opt = map { $_ => 1 } qw( verbose ); +our $RE_FILE_EXTENSIONS = qr/pgp|asc/i; + # DEV WARNING: always pass all STD* handles to GnuPG interface even if we don't # need them, just pass 'new IO::Handle' and then close it after safe_run_child. # we don't want to leak anything into FCGI/Apache/MP handles, this break things. @@ -891,6 +893,8 @@ sub FindProtectedParts { # inline PGP block, only in singlepart unless ( $entity->is_multipart ) { + my $file = ($entity->head->recommended_filename||'') =~ /\.${RE_FILE_EXTENSIONS}$/; + my $io = $entity->open('r'); unless ( $io ) { $RT::Logger->warning( "Entity of type ". $entity->effective_type ." has no body" ); @@ -902,8 +906,8 @@ sub FindProtectedParts { $RT::Logger->debug("Found $type inline part"); return { Type => $type, - Format => 'Inline', - Data => $entity, + Format => !$file || $type eq 'signed'? 'Inline' : 'Attachment', + Data => $entity, }; } $io->close; @@ -1000,7 +1004,7 @@ sub FindProtectedParts { # attachments with inline encryption my @encrypted_indices = - grep {($entity->parts($_)->head->recommended_filename || '') =~ /\.pgp$/} + grep {($entity->parts($_)->head->recommended_filename || '') =~ /\.${RE_FILE_EXTENSIONS}$/} 0 .. $entity->parts - 1; foreach my $i ( @encrypted_indices ) { @@ -1472,9 +1476,16 @@ sub DecryptAttachment { $args{'Data'}->bodyhandle( new MIME::Body::File $res_fn ); $args{'Data'}->{'__store_tmp_handle_to_avoid_early_cleanup'} = $res_fh; - my $filename = $args{'Data'}->head->recommended_filename; - $filename =~ s/\.pgp$//i; - $args{'Data'}->head->mime_attr( $_ => $filename ) + my $head = $args{'Data'}->head; + + # we can not trust original content type + # TODO: and don't have way to detect, so we just use octet-stream + # some clients may send .asc files (encryped) as text/plain + $head->mime_attr( "Content-Type" => 'application/octet-stream' ); + + my $filename = $head->recommended_filename; + $filename =~ s/\.${RE_FILE_EXTENSIONS}$//i; + $head->mime_attr( $_ => $filename ) foreach (qw(Content-Type.name Content-Disposition.filename)); return %res; diff --git a/rt/lib/RT/CustomField_Overlay.pm b/rt/lib/RT/CustomField_Overlay.pm index 9cf608e5a..5db11db00 100644 --- a/rt/lib/RT/CustomField_Overlay.pm +++ b/rt/lib/RT/CustomField_Overlay.pm @@ -1417,7 +1417,7 @@ sub SetBasedOn { return (0, "Permission denied") unless $cf->Id && $cf->CurrentUserHasRight('SeeCustomField'); - return $self->AddAttribute( + return $self->SetAttribute( Name => "BasedOn", Description => "Custom field whose CF we depend on", Content => $cf->Id, diff --git a/rt/lib/RT/I18N.pm b/rt/lib/RT/I18N.pm index 2056b3e28..4c70922ef 100644 --- a/rt/lib/RT/I18N.pm +++ b/rt/lib/RT/I18N.pm @@ -203,11 +203,6 @@ charset encoding (encoded as octets, *not* unicode-strings). It will iterate all the entities in $entity, and try to convert each one into specified charset if whose Content-Type is 'text/plain'. -the methods are tries in order: -1) to convert the entity to $encoding, -2) to interpret the entity as iso-8859-1 and then convert it to $encoding, -3) forcibly convert it to $encoding. - This function doesn't return anything meaningful. =cut @@ -248,46 +243,21 @@ sub SetMIMEEntityToEncoding { if ( $enc ne $charset && $body ) { my $string = $body->as_string or return; - # NOTE:: see the comments at the end of the sub. - Encode::_utf8_off($string); - my $orig_string = $string; # {{{ Convert the body - eval { - $RT::Logger->debug( "Converting '$charset' to '$enc' for " - . $head->mime_type . " - " - . ( $head->get('subject') || 'Subjectless message' ) ); - Encode::from_to( $string, $charset => $enc, Encode::FB_CROAK ); - }; - - if ($@) { - $RT::Logger->error( "Encoding error: " - . $@ - . " falling back to iso-8859-1 => $enc" ); - $string = $orig_string; - eval { - Encode::from_to( - $string, - 'iso-8859-1' => $enc, - Encode::FB_CROAK - ); - }; - if ($@) { - $RT::Logger->error( "Encoding error: " - . $@ - . " forcing conversion to $charset => $enc" ); - $string = $orig_string; - Encode::from_to( $string, $charset => $enc ); - } - } + $RT::Logger->debug( "Converting '$charset' to '$enc' for " . $head->mime_type . " - " . ( $head->get('subject') || 'Subjectless message' ) ); + + # NOTE:: see the comments at the end of the sub. + Encode::_utf8_off( $string); + Encode::from_to( $string, $charset => $enc ); # }}} - my $new_body = MIME::Body::InCore->new($string); + my $new_body = MIME::Body::InCore->new( $string); # set up the new entity $head->mime_attr( "content-type" => 'text/plain' ) - unless ( $head->mime_attr("content-type") ); + unless ( $head->mime_attr("content-type") ); $head->mime_attr( "content-type.charset" => $enc ); $entity->bodyhandle($new_body); } @@ -361,13 +331,7 @@ sub DecodeMIMEWordsToEncoding { # now we have got a decoded subject, try to convert into the encoding unless ( $charset eq $to_charset ) { - my $orig_str = $enc_str; - eval { Encode::from_to( $enc_str, $charset, $to_charset, Encode::FB_CROAK ) }; - if ($@) { - $enc_str = $orig_str; - $charset = _GuessCharset( $enc_str ); - Encode::from_to( $enc_str, $charset, $to_charset ); - } + Encode::from_to( $enc_str, $charset, $to_charset ); } # XXX TODO: RT doesn't currently do the right thing with mime-encoded headers @@ -514,32 +478,10 @@ sub SetMIMEHeadToEncoding { my @values = $head->get_all($tag); $head->delete($tag); foreach my $value (@values) { - Encode::_utf8_off($value); - my $orig_value = $value; if ( $charset ne $enc ) { - eval { - Encode::from_to( $value, $charset => $enc, Encode::FB_CROAK ); - }; - if ($@) { - $RT::Logger->error( "Encoding error: " - . $@ - . " falling back to iso-8859-1 => $enc" ); - $value = $orig_value; - eval { - Encode::from_to( - $value, - 'iso-8859-1' => $enc, - Encode::FB_CROAK - ); - }; - if ($@) { - $RT::Logger->error( "Encoding error: " - . $@ - . " forcing conversion to $charset => $enc" ); - $value = $orig_value; - Encode::from_to( $value, $charset => $enc ); - } - } + + Encode::_utf8_off($value); + Encode::from_to( $value, $charset => $enc ); } $value = DecodeMIMEWordsToEncoding( $value, $enc, $tag ) unless $preserve_words; diff --git a/rt/lib/RT/I18N/fi.po b/rt/lib/RT/I18N/fi.po index ea7555350..fb5d479a2 100644 --- a/rt/lib/RT/I18N/fi.po +++ b/rt/lib/RT/I18N/fi.po @@ -263,7 +263,7 @@ msgstr "%1 muutettu arvosta %2 arvoon %3" #. ($m->scomp('Elements/SelectChartType', Name => 'ChartStyle', Default => $ChartStyle), $m->scomp('Elements/SelectGroupBy', Name => 'PrimaryGroupBy', Query => $ARGS{Query}, Default => $PrimaryGroupBy)) #. ($m->scomp('SelectChartType', Name => 'ChartStyle'), $m->scomp('SelectGroupBy', Name => 'PrimaryGroupBy', Query => $Query)) msgid "%1 chart by %2" -msgstr "% kaavio %2" +msgstr "%1 kaavio %2" #: share/html/Search/Elements/EditSearches:200 #. ($SavedSearch->{'Object'}->Description) diff --git a/rt/lib/RT/I18N/ru.po b/rt/lib/RT/I18N/ru.po index 60111a457..0580e82c9 100644 --- a/rt/lib/RT/I18N/ru.po +++ b/rt/lib/RT/I18N/ru.po @@ -251,7 +251,7 @@ msgstr "%1 изменено с '%2' на '%3'" #. ($m->scomp('Elements/SelectChartType', Name => 'ChartStyle', Default => $ChartStyle), $m->scomp('Elements/SelectGroupBy', Name => 'PrimaryGroupBy', Query => $ARGS{Query}, Default => $PrimaryGroupBy)) #. ($m->scomp('SelectChartType', Name => 'ChartStyle'), $m->scomp('SelectGroupBy', Name => 'PrimaryGroupBy', Query => $Query)) msgid "%1 chart by %2" -msgstr "график %1 группированный по" +msgstr "график %1 группированный по %2" #: share/html/Search/Elements/EditSearches:200 #. ($SavedSearch->{'Object'}->Description) diff --git a/rt/lib/RT/I18N/sv.po b/rt/lib/RT/I18N/sv.po index a15690797..5efa87ed2 100644 --- a/rt/lib/RT/I18N/sv.po +++ b/rt/lib/RT/I18N/sv.po @@ -269,7 +269,7 @@ msgstr "%1 ändrat från %2 till %3" #. ($m->scomp('Elements/SelectChartType', Name => 'ChartStyle', Default => $ChartStyle), $m->scomp('Elements/SelectGroupBy', Name => 'PrimaryGroupBy', Query => $ARGS{Query}, Default => $PrimaryGroupBy)) #. ($m->scomp('SelectChartType', Name => 'ChartStyle'), $m->scomp('SelectGroupBy', Name => 'PrimaryGroupBy', Query => $Query)) msgid "%1 chart by %2" -msgstr "%1diagram enligt %2" +msgstr "%1 diagram enligt %2" #: share/html/Search/Elements/EditSearches:200 #. ($SavedSearch->{'Object'}->Description) diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm index f56abb362..b3f593a9f 100644 --- a/rt/lib/RT/Interface/Web.pm +++ b/rt/lib/RT/Interface/Web.pm @@ -657,10 +657,11 @@ sub InstantiateNewSession { sub SendSessionCookie { my $cookie = CGI::Cookie->new( - -name => _SessionCookieName(), - -value => $HTML::Mason::Commands::session{_session_id}, - -path => RT->Config->Get('WebPath'), - -secure => ( RT->Config->Get('WebSecureCookies') ? 1 : 0 ) + -name => _SessionCookieName(), + -value => $HTML::Mason::Commands::session{_session_id}, + -path => RT->Config->Get('WebPath'), + -secure => ( RT->Config->Get('WebSecureCookies') ? 1 : 0 ), + -httponly => ( RT->Config->Get('WebHttpOnlyCookies') ? 1 : 0 ), ); $HTML::Mason::Commands::r->err_headers_out->{'Set-Cookie'} = $cookie->as_string; @@ -2299,6 +2300,7 @@ sub _parse_saved_search { return ( _load_container_object( $obj_type, $obj_id ), $search_id ); } +package RT::Interface::Web; RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Interface/Web/Session.pm b/rt/lib/RT/Interface/Web/Session.pm index 0cce092df..8ce8afd2b 100644 --- a/rt/lib/RT/Interface/Web/Session.pm +++ b/rt/lib/RT/Interface/Web/Session.pm @@ -170,7 +170,7 @@ sub ClearOld { my $class = shift || __PACKAGE__; my $attributes = $class->Attributes; if( $attributes->{Directory} ) { - return $class->_CleariOldDir( $attributes->{Directory}, @_ ); + return $class->_ClearOldDir( $attributes->{Directory}, @_ ); } else { return $class->_ClearOldDB( $RT::Handle->dbh, @_ ); } diff --git a/rt/lib/RT/Shredder/Plugin.pm b/rt/lib/RT/Shredder/Plugin.pm index b7c63ec7f..34380689a 100644 --- a/rt/lib/RT/Shredder/Plugin.pm +++ b/rt/lib/RT/Shredder/Plugin.pm @@ -129,7 +129,7 @@ sub List my %res; for my $f (reverse @files) { - $res{$1} = $_ if $f =~ /([^\\\/]+)\.pm$/; + $res{$1} = $f if $f =~ /([^\\\/]+)\.pm$/; } return %res unless $type; diff --git a/rt/lib/RT/Ticket_Overlay.pm b/rt/lib/RT/Ticket_Overlay.pm index 8dd88c927..9f1e26c0d 100644 --- a/rt/lib/RT/Ticket_Overlay.pm +++ b/rt/lib/RT/Ticket_Overlay.pm @@ -471,13 +471,13 @@ sub Create { ); # Parameters passed in during an import that we probably don't want to touch, otherwise - foreach my $attr qw(id Creator Created LastUpdated LastUpdatedBy) { + foreach my $attr (qw(id Creator Created LastUpdated LastUpdatedBy)) { $params{$attr} = $args{$attr} if $args{$attr}; } # Delete null integer parameters foreach my $attr - qw(TimeWorked TimeLeft TimeEstimated InitialPriority FinalPriority) + (qw(TimeWorked TimeLeft TimeEstimated InitialPriority FinalPriority)) { delete $params{$attr} unless ( exists $params{$attr} && $params{$attr} ); @@ -745,7 +745,7 @@ sub _Parse822HeadersForAttributes { } - foreach my $date qw(due starts started resolved) { + foreach my $date (qw(due starts started resolved)) { my $dateobj = RT::Date->new($RT::SystemUser); if ( defined ($args{$date}) and $args{$date} =~ /^\d+$/ ) { $dateobj->Set( Format => 'unix', Value => $args{$date} ); @@ -2600,7 +2600,7 @@ sub MergeInto { } # Update time fields - foreach my $type qw(TimeEstimated TimeWorked TimeLeft) { + foreach my $type (qw(TimeEstimated TimeWorked TimeLeft)) { my $mutator = "Set$type"; $MergeInto->$mutator( @@ -2608,7 +2608,7 @@ sub MergeInto { } #add all of this ticket's watchers to that ticket. - foreach my $watcher_type qw(Requestors Cc AdminCc) { + foreach my $watcher_type (qw(Requestors Cc AdminCc)) { my $people = $self->$watcher_type->MembersObj; my $addwatcher_type = $watcher_type; @@ -3226,7 +3226,7 @@ sub _ApplyTransactionBatch { my $batch = $self->TransactionBatch; my %seen; - my $types = join ',', grep !$seen{$_}++, grep defined, map $_->Type, grep defined, @{$batch}; + my $types = join ',', grep !$seen{$_}++, grep defined, map $_->__Value('Type'), grep defined, @{$batch}; require RT::Scrips; RT::Scrips->new($RT::SystemUser)->Apply( diff --git a/rt/lib/RT/Transaction_Overlay.pm b/rt/lib/RT/Transaction_Overlay.pm index b8ea9389c..487097382 100644 --- a/rt/lib/RT/Transaction_Overlay.pm +++ b/rt/lib/RT/Transaction_Overlay.pm @@ -144,7 +144,7 @@ sub Create { ); # Parameters passed in during an import that we probably don't want to touch, otherwise - foreach my $attr qw(id Creator Created LastUpdated TimeTaken LastUpdatedBy) { + foreach my $attr (qw(id Creator Created LastUpdated TimeTaken LastUpdatedBy)) { $params{$attr} = $args{$attr} if ($args{$attr}); } diff --git a/rt/sbin/rt-test-dependencies b/rt/sbin/rt-test-dependencies index 18e7c06aa..3d8ede547 100644 --- a/rt/sbin/rt-test-dependencies +++ b/rt/sbin/rt-test-dependencies @@ -303,7 +303,7 @@ Log::Dispatch::Perl $deps{'FASTCGI'} = [ text_to_hash( << '.') ]; CGI 3.38 -FCGI +FCGI 0.74 CGI::Fast . @@ -588,12 +588,12 @@ sub check_perl_version { sub check_users { section("users"); - print_found("rt group (www)", defined getgrnam("www")); + print_found("rt group (www-data)", defined getgrnam("www-data")); print_found("bin owner (root)", defined getpwnam("root")); print_found("libs owner (root)", defined getpwnam("root")); print_found("libs group (bin)", defined getgrnam("bin")); - print_found("web owner (www)", defined getpwnam("www")); - print_found("web group (www)", defined getgrnam("www")); + print_found("web owner (www-data)", defined getpwnam("www-data")); + print_found("web group (www-data)", defined getgrnam("www-data")); } diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in index 1ce118fde..a964e2912 100644 --- a/rt/sbin/rt-test-dependencies.in +++ b/rt/sbin/rt-test-dependencies.in @@ -303,7 +303,7 @@ Log::Dispatch::Perl $deps{'FASTCGI'} = [ text_to_hash( << '.') ]; CGI 3.38 -FCGI +FCGI 0.74 CGI::Fast . diff --git a/rt/share/html/Admin/CustomFields/Modify.html b/rt/share/html/Admin/CustomFields/Modify.html index c94c560ec..c428bcd25 100644 --- a/rt/share/html/Admin/CustomFields/Modify.html +++ b/rt/share/html/Admin/CustomFields/Modify.html @@ -196,7 +196,7 @@ if ( $ARGS{'Update'} && $id ne 'new' ) { # Update any existing values my $values = $CustomFieldObj->ValuesObj; while ( my $value = $values->Next ) { - foreach my $attr qw(Name Description SortOrder Category) { + foreach my $attr (qw(Name Description SortOrder Category)) { my $param = join("-", $paramtag, $value->Id, $attr); next unless exists $ARGS{$param}; $ARGS{$param} =~ s/^\s+//; diff --git a/rt/share/html/REST/1.0/logout b/rt/share/html/REST/1.0/logout index a6b0bac1f..2e59b1dca 100755 --- a/rt/share/html/REST/1.0/logout +++ b/rt/share/html/REST/1.0/logout @@ -46,6 +46,6 @@ %# %# END BPS TAGGED BLOCK }}} <%PERL> -tied(%session)->delete if (defined %session); +tied(%session)->delete if keys %session; </%PERL> RT/<% $RT::VERSION %> 200 Ok diff --git a/rt/share/html/Search/Bulk.html b/rt/share/html/Search/Bulk.html index e2b757499..74487cdd6 100755 --- a/rt/share/html/Search/Bulk.html +++ b/rt/share/html/Search/Bulk.html @@ -60,7 +60,7 @@ <& /Elements/ListActions, actions => \@results &> <form method="post" action="<% RT->Config->Get('WebPath') %>/Search/Bulk.html" enctype="multipart/form-data"> -% foreach my $var qw(Query Format OrderBy Order Rows Page SavedChartSearchId) { +% foreach my $var (qw(Query Format OrderBy Order Rows Page SavedChartSearchId)) { <input type="hidden" class="hidden" name="<%$var%>" value="<%$ARGS{$var} || ''%>" /> %} <& /Elements/CollectionList, @@ -358,13 +358,13 @@ unless ( $ARGS{'AddMoreAttach'} ) { my @watchresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS ); - foreach my $type qw(MergeInto DependsOn MemberOf RefersTo) { + foreach my $type (qw(MergeInto DependsOn MemberOf RefersTo)) { $ARGS{ $Ticket->id . "-" . $type } = $ARGS{"Ticket-$type"}; $ARGS{ $type . "-" . $Ticket->id } = $ARGS{"$type-Ticket"}; } @linkresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS ); - foreach my $type qw(MergeInto DependsOn MemberOf RefersTo) { + foreach my $type (qw(MergeInto DependsOn MemberOf RefersTo)) { delete $ARGS{ $type . "-" . $Ticket->id }; delete $ARGS{ $Ticket->id . "-" . $type }; } diff --git a/rt/share/html/Search/Elements/SelectChartType b/rt/share/html/Search/Elements/SelectChartType index da4cbfa62..42cd4e4b2 100644 --- a/rt/share/html/Search/Elements/SelectChartType +++ b/rt/share/html/Search/Elements/SelectChartType @@ -50,7 +50,7 @@ $Name => 'ChartType' $Default => 'bar' </%args> <select id="<%$Name%>" name="<%$Name%>"> -% foreach my $option qw(bar pie) { +% foreach my $option (qw(bar pie)) { % # 'bar' # loc % # 'pie' # loc <option value="<%$option%>"<% $option eq $Default ? qq[ selected="selected"] : '' |n %>><%loc($option)%></option> diff --git a/rt/share/html/Ticket/Elements/PreviewScrips b/rt/share/html/Ticket/Elements/PreviewScrips index a7576e5ad..dcf85a558 100755 --- a/rt/share/html/Ticket/Elements/PreviewScrips +++ b/rt/share/html/Ticket/Elements/PreviewScrips @@ -65,7 +65,7 @@ my @non_recipients = @{ $squelch{'EmailAddresses'} }; <b><% $scrip->Description || loc('Scrip #[_1]',$scrip->id) %></b><br /> <&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&> <br /> -%foreach my $type qw(To Cc Bcc) { +%foreach my $type (qw(To Cc Bcc)) { %my @addresses = $scrip->ActionObj->Action->$type(); <ul> %foreach my $addr (@addresses) { @@ -90,7 +90,7 @@ my @non_recipients = @{ $squelch{'EmailAddresses'} }; % next unless $rule->{hints} && $rule->{hints}{class} eq 'SendEmail'; <b><% $rule->Describe %></b> % my $data = $rule->{hints}{recipients}; -% foreach my $type qw(To Cc Bcc) { +% foreach my $type (qw(To Cc Bcc)) { <ul> % foreach my $address (@{$data->{$type}}) { <li> @@ -205,7 +205,7 @@ foreach my $scrip ( @{ $txn->Scrips->Prepared } ) { my $action = $scrip->ActionObj->Action; next unless $action->isa('RT::Action::SendEmail'); - foreach my $type qw(To Cc Bcc) { + foreach my $type (qw(To Cc Bcc)) { push @recipients, $action->$type(); } } @@ -250,7 +250,7 @@ foreach my $scrip ( @{ $txn->Scrips->Prepared } ) { my $action = $scrip->ActionObj->Action; next unless $action->isa('RT::Action::SendEmail'); - foreach my $type qw(To Cc Bcc) { + foreach my $type (qw(To Cc Bcc)) { push @recipients, $action->$type(); } } diff --git a/rt/share/html/Ticket/Elements/ShowTransaction b/rt/share/html/Ticket/Elements/ShowTransaction index 14c4d2aba..e76e00495 100755 --- a/rt/share/html/Ticket/Elements/ShowTransaction +++ b/rt/share/html/Ticket/Elements/ShowTransaction @@ -142,6 +142,13 @@ unless ( $type_class ) { } } +$m->callback( + CallbackName => 'MassageTypeClass', + Transaction => $Transaction, + TypeClassRef => \$type_class, + ARGSRef => \%ARGS, +); + my $TicketString = ''; if ( $Ticket->Id != $Transaction->Ticket ) { $TicketString = loc("Ticket #[_1]:", $Transaction->Ticket) .' '; @@ -158,6 +165,13 @@ unless ($Attachments) { } my $titlebar_commands = ''; +$m->callback( + CallbackName => 'MassageAttachments', + Transaction => $Transaction, + AttachmentsRef => \$Attachments, + ARGSRef => \%ARGS, +); + if ( $type =~ /EmailRecord$/ ) { $titlebar_commands .= diff --git a/rt/t/data/configs/apache2.2+fastcgi.conf b/rt/t/data/configs/apache2.2+fastcgi.conf index c9d9cb0b9..4033479bb 100644 --- a/rt/t/data/configs/apache2.2+fastcgi.conf +++ b/rt/t/data/configs/apache2.2+fastcgi.conf @@ -9,8 +9,8 @@ FastCgiIpcDir %%TMP_DIR%% <IfModule !mpm_netware_module> <IfModule !mpm_winnt_module> -User www -Group www +User www-data +Group www-data </IfModule> </IfModule> diff --git a/rt/t/data/configs/apache2.2+mod_perl.conf b/rt/t/data/configs/apache2.2+mod_perl.conf index 9f4587e04..d1a6e9f15 100644 --- a/rt/t/data/configs/apache2.2+mod_perl.conf +++ b/rt/t/data/configs/apache2.2+mod_perl.conf @@ -7,8 +7,8 @@ ServerAdmin root@localhost <IfModule !mpm_netware_module> <IfModule !mpm_winnt_module> -User www -Group www +User www-data +Group www-data </IfModule> </IfModule> diff --git a/rt/t/data/gnupg/emails/special/binary-asc-attach-marked-plain-text.txt b/rt/t/data/gnupg/emails/special/binary-asc-attach-marked-plain-text.txt new file mode 100644 index 000000000..db904ae24 --- /dev/null +++ b/rt/t/data/gnupg/emails/special/binary-asc-attach-marked-plain-text.txt @@ -0,0 +1,60 @@ +Message-ID: <46BCDCF2.3080704@mit.edu> +Date: Fri, 10 Aug 2007 17:47:30 -0400 +From: Christian Ternus <ternus@mit.edu> +User-Agent: Thunderbird 1.5.0.12 (X11/20070604) +MIME-Version: 1.0 +To: rt-recipient@example.com +Subject: Test Email ID:12 +X-Enigmail-Version: 0.94.2.0 +Content-Type: multipart/mixed; + boundary="------------090206040704060905090502" + +This is a multi-part message in MIME format. +--------------090206040704060905090502 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit + +Attached file has .asc extension +and content type is text/plain. + +ASC in some clients stands for ascii, so it's +attached as text/plain. + +--------------090206040704060905090502 +Content-Type: text/plain; + name="favicon.png.asc" +Content-Transfer-Encoding: base64 +Content-Disposition: attachment; + filename="favicon.png.asc" + +hQIOA076g5OuwfIOEAf+P0Qp/k1B0WDRr9bNcEANStTaiefYoLrUrtMJv+aFtkiSqKfft0A9 +okrYkVUKs6kxfgxueuqNMFQh58nl8+d7Z2qGIgVEXxC8rRxexEQ8mXu5LXzzBbc6Dq8Jsa7B +bXzwGty51culYcKeMEjpEY8Qx76qoNQDNCuvth1JJxJ6xQix/pVyZZbJRu/nLrv1i3Z4KRFY +qafnJlcsUTVj2o9dLfeU13z8nd0uBPY+hiCgYJHSPDLr+mkA+c6YK0m4a88r/wjLmsVHMkn2 +N5nCjuqP4tzT8SCjhoICGTbu+fFdks9NhQjvsW7MHBi9HFFzm6SoEvquFHThzwMl3hAhTLpi +Jwf/a6unMP/swAxoFTJ2GRXBmQOH4sJHR/M31rEVkLZGJixhU94Tpx8ptgLXqme5VCXgl+M3 +Oh0GHRXqFYjR/HGUTZokRKR/BgCEpOGlH5FcabHiu/Gy8UBezPbuC+BNvxuCbuwODMp9R5DE +F8RSCAQ1hrRoJjeHT2wyE7HdCvN/xx7NyenA3GdJa5Z6W7Y0gshr2fAOFL39jKXw4WwCh/Yq +XnyG8uOyPgFrnHI3WpO24VpQHp3MBKebWNhQ/Opy/cABunCSwWQpDB9Ar4GeS3R1WGtMNC4r +ph4afmTHJcQQkoa0VfvHL0hEzycwysYD46O9QhZfhxtKKShgX356oCeMEIUCDgOxaIPydPr+ +7xAH+gMnbi5OLPf5xMeZydvNWdHE/wJTub2rrWFtzvj0Aa5Ne/KFhcDDqSjaL3MXP1WfIJr1 +/ANe1eWcM2hlYVDpEn6YOh0bz6BASE4kbHA5nGMyUrgH0hWfcOgkMUloRZdf1q32j80mchCJ +rF4YsQ6EndnUYzAiXKHGJRUy/6IA2qBH2n/fRiyC2FmmQPtWO4c6t15Vgh4fB3QXSTri8J5r +577yIiHRE+dq6gg1BfyqCtw0DW56lSFQ7dxyMXeLyTGyjTGPlUDc+FbP23CRK7zDIVujARmm +mX3bP2lMfCK326FwBZf2Q4Zl/ac1BN8Mcb4wwcnKvRzfEw8d1Y6pkphe7KYH/0MDDqtmuEw2 +D/xdw4FHB16/HW32bcPaMVvFuseczEfrwPGCrCiPHPm++edAoY0rWoBtzHVpgN+s5bset5OR +snhjuWceuCb+Ga0QV0s/xmIPIQ8VYaXyD5hob6nHEIeskS68Vbni0BpY3nejDPoV3dNHY2Tp +2fjYNHCpsdTz8yyavQVixoQjZQH9hUb48zZDHCt0Af9Rfq6Et5/Qr8iJqAyEU8JzZtrkpO4O +HgLU7JTPLxOGzYtOj8JkLmLguVA5kOafAuU4OTEU43utQfS3KYbdEWT2jJ1QaJVS8CjFJrqH +V99FUsDvgKWSTy5hA9gkQAQE1QdwkoQKpkCWm18KZqTSwNkBfrsEuvHC3Cz4Sy+cJmhr4Hvx +dyZY8DuuWExUcVCjkeuASLgjLEgahnCbMkyKATazswwTEdfzjcOowjLTdaWFEN/Cg22nF/px +9MXMtzBkrTkjYPhfywETKoMVH/Nw7rRNZhkOSb5WJV5ynF1BlbzXI7Z8rA/KrIn8aydzwJUU +qFr8Dw1C7kbE76+SFVWX8fqpwGmQhDAO+kos6ivgN9HDHtuXmwfGeROi2U0WcmFGbAyLo5fT +LCcNPOMflU27WDXm8m+tjq9naUynqvwg5zBBz/xY67L1R8uOwfZplvRi35iZAJjzMHGirkiB +W3ZDXbDqEfKl4aCXqU+XhQZsku2z3OtKZOBVVI5p8nGVEfavg6QECRUNUS7qbtMxlj5IwCGl +babK3W5YVuERjklrrLUYZjqFIZ2yLK3Z2VmSn7yKAb/eRvdEeha+9PKcN11pXPkS/M3t+Vpr +G+4TqNgqwLVWMvbENp08dS3OAPpZLDnqG9CJV0qacDMjv69X26V3Xp6vuZoKqAPxMG9QKAfX +E9LInR1Kd0cpRUkb +--------------090206040704060905090502-- + + diff --git a/rt/t/data/gnupg/emails/special/inline-binary-attachment-with-wrap.txt b/rt/t/data/gnupg/emails/special/inline-binary-attachment-with-wrap.txt new file mode 100644 index 000000000..6c84b53a2 --- /dev/null +++ b/rt/t/data/gnupg/emails/special/inline-binary-attachment-with-wrap.txt @@ -0,0 +1,54 @@ +Message-ID: <46BCDCF2.3080704@mit.edu> +Date: Fri, 10 Aug 2007 17:47:30 -0400 +From: Christian Ternus <ternus@mit.edu> +User-Agent: Thunderbird 1.5.0.12 (X11/20070604) +MIME-Version: 1.0 +To: rt-recipient@example.com +Subject: Test Email ID:12 +X-Enigmail-Version: 0.94.2.0 +Content-Type: multipart/mixed; + boundary="------------090206040704060905090502" + +This is a multi-part message in MIME format. +--------------090206040704060905090502 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit + +A binary file encrypted with PGP MESSAGE wrapping then attached +to a mail. As it's .asc some clients attach it as content type is +text/plain. + +--------------090206040704060905090502 +Content-Type: text/plain; + name="favicon.png.asc" +Content-Disposition: attachment; + filename="favicon.png.asc" + +-----BEGIN PGP MESSAGE----- +Version: GnuPG v1.4.11 (Darwin) + +hQIOA076g5OuwfIOEAf/Qxa6rk76JTSjlyb27k1kZwpsvtXocnALZEd1tbJ4HwwH +o0CQb5Ew6apUzAcfSFdVcZ+IbFXYmjJ7bH1mpG5kjfSz8mEYO0muX+ZrgVeL+Q3J +/lR+A+THD7LNxnsZe11OfDi1aX8Uz71R03vmK+0o1ZIge3zzdm1BoUT9cmy1QPMi +aJSdBAJn01EJ++ETfrBqspFj8n6yR/q0BukAcoefaMA0qzrJNQeluMsrqSEjbcuq +nwXDEv8fhqF6efrWW+wtyMnY/JpIEwmlNbcCI0NZQFM92vkp89nusRPwbP0+z87m +Qsr1vyLHMX79kqwcRKadf1EW/3eWVqlbrOC+yhvKKAf+MAcixgFDIUDup+NuWpjp +YUbS357E4yqh2LXogpTZDsvjSL+Z4hKEurKq8TYju8T4exGHkas3VbcWnoPBKiMU +3RjyVNCQzS3XeOtQv9g8WclENq6Pg8eQVNKd5tbpQ6Sios0J1FYFVXHSr/dQOaET +Y1jSVKV/6GxVwERpR7DN+yTIVIr//pYnMIb6agNapSKbosvTKNEcGPSjjSB8ixpo +C9yiZuIhml5lQUXV9ouDDMtHOFtguDUSSm7Ta84wRJ2VcVQUIv/ADg3jBC5Lmp5Q +CGqwq5Hx7q5AKKZDnGNqHepWzeCiEs5Dg9J9onBYx4zrNMrGVP5uvF+RwK4J0pf0 +XtLAzgFryuv7cswKKxP9vJaEjLDI4Tizdui+la0vA2tJ6gVQ1CPVtREt0s3s+LM0 +oUzgVMvnb1X9KgyazcGp/a+bGHAZwy9/CscxoDYyDrQuUbypNK+f0xefpOURiQ0z +N86G/DeaRwLkePoGWZySWk5Ktat6594lRP5h1/B/VYXhvBeh98Rm6E7S8gpjJlMr +6wit2Bd3oPVeqv1fxru9BR1CEl4N+/4ODVwphqMhYM9MplIzGrrCC9bTudKC7g34 +UZ+IQV4GLlCK/1BckJQgkWEHTS5fDxAdwG4F7TWfpGzsp43IlDUr073aL7Z3TfkY +iyAYGVdnq1EpzVAOPAc2IUMlybUGjoYTmolI1/XIEAxZG9cSFuSMXlrJ2On2kvFO +/rla7j5euFpucFWumcNDbZ1HIgDUQ0AMxpzIqwVtd8ZGE0OhSqbT6lgP7jZUwiSA +H4g6/4w+aM5XIy26jifvHOlHzsCraG/xGbzXgYkocXbmSuBhtFdoR4KFzOyFaI7H +uFoUez7HUuEjl80w77pBeU2v +=j0Yd +-----END PGP MESSAGE----- +--------------090206040704060905090502-- + + diff --git a/rt/t/mail/gnupg-special.t b/rt/t/mail/gnupg-special.t index 7e50819e8..6a31ef131 100644 --- a/rt/t/mail/gnupg-special.t +++ b/rt/t/mail/gnupg-special.t @@ -2,13 +2,15 @@ use strict; use warnings; -use RT::Test tests => 11; +use RT::Test tests => 23; plan skip_all => 'GnuPG required.' unless eval 'use GnuPG::Interface; 1'; plan skip_all => 'gpg executable is required.' unless RT::Test->find_executable('gpg'); +use Digest::MD5 qw(md5_hex); + use File::Temp qw(tempdir); my $homedir = tempdir( CLEANUP => 1 ); @@ -21,6 +23,7 @@ RT->Config->Set( 'GnuPG', RT->Config->Set( 'GnuPGOptions', homedir => $homedir, + 'passphrase' => 'rt-test', 'no-permission-warning' => undef); RT->Config->Set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' ); @@ -71,6 +74,46 @@ RT::Test->set_rights( is(scalar @mail, 1, "autoreply only"); } +{ + my $id = send_via_mailgate('binary-asc-attach-marked-plain-text.txt'); + + my $tick = RT::Ticket->new( $RT::SystemUser ); + $tick->Load( $id ); + ok ($tick->id, "loaded ticket #$id"); + + my $txn = $tick->Transactions->First; + my ($msg, @attachs) = @{$txn->Attachments->ItemsArrayRef}; + + is (scalar @attachs, 3, 'text, attachment and original'); + my $bin = $attachs[1]; + is( + (split /;/, $bin->GetHeader('Content-Type'))[0], + 'application/octet-stream', + 'binary attachment' + ); + is(md5_hex($bin->Content), '1e35f1aa90c98ca2bab85c26ae3e1ba7', "correct png"); +} + +{ + my $id = send_via_mailgate('inline-binary-attachment-with-wrap.txt'); + + my $tick = RT::Ticket->new( $RT::SystemUser ); + $tick->Load( $id ); + ok ($tick->id, "loaded ticket #$id"); + + my $txn = $tick->Transactions->First; + my ($msg, @attachs) = @{$txn->Attachments->ItemsArrayRef}; + + is (scalar @attachs, 3, 'text, attachment and original'); + my $bin = $attachs[1]; + is( + (split /;/, $bin->GetHeader('Content-Type'))[0], + 'application/octet-stream', + 'binary attachment' + ); + is(md5_hex($bin->Content), '1e35f1aa90c98ca2bab85c26ae3e1ba7', "correct png"); +} + sub send_via_mailgate { my $fname = shift; my $emaildatadir = RT::Test::get_relocatable_dir(File::Spec->updir(), diff --git a/rt/t/mail/wrong_mime_charset.t b/rt/t/mail/wrong_mime_charset.t index f53c872e5..71a574f26 100644 --- a/rt/t/mail/wrong_mime_charset.t +++ b/rt/t/mail/wrong_mime_charset.t @@ -9,17 +9,23 @@ use Encode; my $test_string = 'À'; my $encoded_string = encode( 'iso-8859-1', $test_string ); my $mime = MIME::Entity->build( - Subject => $encoded_string, - Data => [$encoded_string], + "Subject" => $encoded_string, + "Data" => [$encoded_string], ); # set the wrong charset mime in purpose $mime->head->mime_attr( "Content-Type.charset" => 'utf8' ); RT::I18N::SetMIMEEntityToEncoding( $mime, 'iso-8859-1' ); + +TODO: { + local $TODO = +'need a better approach of encoding converter, should be fixed in 4.2'; + my $subject = decode( 'iso-8859-1', $mime->head->get('Subject') ); chomp $subject; is( $subject, $test_string, 'subject is set to iso-8859-1' ); my $body = decode( 'iso-8859-1', $mime->stringify_body ); chomp $body; is( $body, $test_string, 'body is set to iso-8859-1' ); +} |