From eb37f07b69acdd7573d5f55181fa8e115b308107 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Fri, 1 Jun 2012 19:28:58 -0700 Subject: [PATCH] commit configured RT files to avoid conflicts --- rt/bin/rt-crontool | 2 +- rt/bin/rt-mailgate | 2 +- rt/bin/standalone_httpd | 2 +- rt/config.log | 216 ++++++++++++++-------------- rt/config.status | 186 ++++++++++++------------ rt/etc/upgrade/3.8-branded-queues-extension | 4 +- rt/etc/upgrade/3.8-ical-extension | 4 +- rt/etc/upgrade/generate-rtaddressregexp | 4 +- rt/etc/upgrade/split-out-cf-categories | 4 +- rt/etc/upgrade/vulnerable-passwords | 4 +- rt/sbin/rt-attributes-viewer | 2 +- rt/sbin/rt-clean-sessions | 2 +- rt/sbin/rt-dump-database | 2 +- rt/sbin/rt-email-dashboards | 2 +- rt/sbin/rt-email-digest | 2 +- rt/sbin/rt-email-group-admin | 2 +- rt/sbin/rt-server | 2 +- rt/sbin/rt-shredder | 2 +- rt/sbin/rt-validator | 2 +- rt/t/data/configs/apache2.2+fastcgi.conf | 4 +- rt/t/data/configs/apache2.2+mod_perl.conf | 4 +- 21 files changed, 231 insertions(+), 223 deletions(-) mode change 100644 => 100755 rt/bin/rt-crontool diff --git a/rt/bin/rt-crontool b/rt/bin/rt-crontool old mode 100644 new mode 100755 index 61932804c..cb099f31c --- a/rt/bin/rt-crontool +++ b/rt/bin/rt-crontool @@ -52,7 +52,7 @@ use Carp; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/bin/rt-mailgate b/rt/bin/rt-mailgate index 373d2cfbf..082e922d4 100755 --- a/rt/bin/rt-mailgate +++ b/rt/bin/rt-mailgate @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # BEGIN BPS TAGGED BLOCK {{{ # # COPYRIGHT: diff --git a/rt/bin/standalone_httpd b/rt/bin/standalone_httpd index a307910c1..3c53437b9 100755 --- a/rt/bin/standalone_httpd +++ b/rt/bin/standalone_httpd @@ -52,7 +52,7 @@ use strict; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/config.log b/rt/config.log index e619abd86..c616b74d9 100644 --- a/rt/config.log +++ b/rt/config.log @@ -1,20 +1,20 @@ 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 +It was created by RT configure 3.8.13, which was generated by GNU Autoconf 2.68. Invocation command line was - $ ./configure --enable-layout=Freeside --with-db-type=Pg --with-db-dba=freeside --with-db-database=freeside --with-db-rt-user=freeside --with-db-rt-pass= --with-web-user=freeside --with-web-group=freeside --with-rt-group=freeside + $ ./configure --enable-layout=Freeside --with-db-type=Pg --with-db-dba=freeside --with-db-database=freeside --with-db-rt-user=freeside --with-db-rt-pass= --with-web-user=freeside --with-web-group=freeside --with-rt-group=freeside --with-web-handler=modperl2 ## --------- ## ## 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 = fleetpaw +uname -m = x86_64 +uname -r = 3.2.0-2-amd64 +uname -s = Linux +uname -v = #1 SMP Sun Apr 15 16:47:38 UTC 2012 /usr/bin/uname -p = unknown /bin/uname -X = unknown @@ -22,50 +22,16 @@ uname -v = Darwin Kernel Version 10.7.0: Sat Jan 29 15:17:16 PST 2011; root:xnu- /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/local/bin PATH: /usr/bin PATH: /bin -PATH: /usr/sbin -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: /usr/bin/X11 +PATH: /usr/games ## ----------- ## @@ -75,48 +41,45 @@ PATH: /Users/falcone/Documents//android-sdk-mac_86/tools 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:2108: result: no +configure:2078: checking for mawk +configure:2094: found /usr/bin/mawk +configure:2105: result: mawk configure:2119: checking for perl +configure:2137: found /usr/bin/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:2528: result: Freeside 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. +gcc (Debian 4.7.0-11) 4.7.0 +Copyright (C) 2012 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 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=gcc +COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/4.7/lto-wrapper +Target: x86_64-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Debian 4.7.0-11' --with-bugurl=file:///usr/share/doc/gcc-4.7/README.Bugs --enable-languages=c,c++,go,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.7 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.7 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --with-arch-32=i586 --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) +gcc version 4.7.0 (Debian 4.7.0-11) configure:3137: $? = 0 configure:3126: gcc -V >&5 -gcc-4.2: argument to `-V' is missing -configure:3137: $? = 1 +gcc: error: unrecognized command line option '-V' +gcc: fatal error: no input files +compilation terminated. +configure:3137: $? = 4 configure:3126: gcc -qversion >&5 -i686-apple-darwin10-gcc-4.2.1: no input files -configure:3137: $? = 1 +gcc: error: unrecognized command line option '-qversion' +gcc: fatal error: no input files +compilation terminated. +configure:3137: $? = 4 configure:3157: checking whether the C compiler works configure:3179: gcc conftest.c >&5 configure:3183: $? = 0 @@ -151,15 +114,15 @@ 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 -collect2: ld returned 1 exit status +/usr/bin/ld: cannot find -lgraph +collect2: error: ld returned 1 exit status configure:3629: $? = 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.13" +| #define PACKAGE_STRING "RT 3.8.13" | #define PACKAGE_BUGREPORT "rt-bugs@bestpractical.com" | #define PACKAGE_URL "" | /* end confdefs.h. */ @@ -180,10 +143,9 @@ configure: failed program was: | } configure:3638: result: no configure:3664: checking for gdlib-config -configure:3680: found /opt/local/bin/gdlib-config -configure:3692: result: yes +configure:3692: result: no configure:3720: checking for gpg -configure:3736: found /opt/local/bin/gpg +configure:3736: found /usr/bin/gpg configure:3748: result: yes configure:4059: creating ./config.status @@ -191,7 +153,7 @@ configure:4059: creating ./config.status ## Running config.status. ## ## ---------------------- ## -This file was extended by RT config.status 3.8.10, which was +This file was extended by RT config.status 3.8.13, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = @@ -200,7 +162,7 @@ generated by GNU Autoconf 2.68. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on transom.local +on fleetpaw config.status:869: creating etc/upgrade/3.8-branded-queues-extension config.status:869: creating etc/upgrade/3.8-ical-extension @@ -248,8 +210,8 @@ ac_cv_env_LDFLAGS_set= ac_cv_env_LDFLAGS_value= ac_cv_env_LIBS_set= ac_cv_env_LIBS_value= -ac_cv_env_PERL_set=set -ac_cv_env_PERL_value=/usr/bin/perl +ac_cv_env_PERL_set= +ac_cv_env_PERL_value= ac_cv_env_build_alias_set= ac_cv_env_build_alias_value= ac_cv_env_host_alias_set= @@ -260,73 +222,110 @@ ac_cv_lib_graph_aginitlib=no ac_cv_objext=o ac_cv_path_PERL=/usr/bin/perl ac_cv_path_install='/usr/bin/install -c' -ac_cv_prog_AWK=gawk +ac_cv_prog_AWK=mawk +ac_cv_prog_RT_GD=no +ac_cv_prog_RT_GPG=yes +ac_cv_prog_ac_ct_CC=gcc +ac_cv_prog_cc_c89= +ac_cv_prog_cc_g=yes ## ----------------- ## ## Output variables. ## ## ----------------- ## -APACHECTL='/usr/sbin/apachectl' -AWK='gawk' +APACHECTL='' +AWK='mawk' BIN_OWNER='root' +CC='gcc' +CFLAGS='-g -O2' +COMMENT_INPLACE_LAYOUT='' CONFIG_FILE_PATH='/opt/rt3/etc' +CONFIG_FILE_PATH_R='/opt/rt3/etc' +CPPFLAGS='' DATABASE_ENV_PREF='' DB_DATABASE='freeside' DB_DBA='freeside' DB_HOST='localhost' DB_PORT='' 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='' +DB_RT_PASS='' +DB_RT_USER='freeside' +DB_TYPE='Pg' +DEFS='-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"3.8.13\" -DPACKAGE_STRING=\"RT\ 3.8.13\" -DPACKAGE_BUGREPORT=\"rt-bugs@bestpractical.com\" -DPACKAGE_URL=\"\"' +ECHO_C='' +ECHO_N='-n' ECHO_T='' +EXEEXT='' INSTALL_DATA='${INSTALL} -m 644' INSTALL_PROGRAM='${INSTALL}' INSTALL_SCRIPT='${INSTALL}' +LDFLAGS='' LIBOBJS='' LIBS='' LIBS_GROUP='bin' LIBS_OWNER='root' LOCAL_ETC_PATH='/opt/rt3/local/etc' +LOCAL_ETC_PATH_R='/opt/rt3/local/etc' LOCAL_LEXICON_PATH='/opt/rt3/local/po' +LOCAL_LEXICON_PATH_R='/opt/rt3/local/po' LOCAL_LIB_PATH='/opt/rt3/local/lib' +LOCAL_LIB_PATH_R='/opt/rt3/local/lib' LTLIBOBJS='' MASON_DATA_PATH='/usr/local/etc/freeside/masondata' +MASON_DATA_PATH_R='/usr/local/etc/freeside/masondata' MASON_HTML_PATH='/var/www/freeside/rt' +MASON_HTML_PATH_R='/var/www/freeside/rt' MASON_LOCAL_HTML_PATH='/opt/rt3/local/html' +MASON_LOCAL_HTML_PATH_R='/opt/rt3/local/html' MASON_SESSION_PATH='/opt/rt3/var/session_data' +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.13' PACKAGE_TARNAME='rt' PACKAGE_URL='' -PACKAGE_VERSION='3.8.10' +PACKAGE_VERSION='3.8.13' PATH_SEPARATOR=':' PERL='/usr/bin/perl' -RTGROUP='www' -RT_BIN_PATH='bin' +RTGROUP='freeside' +RT_BIN_PATH='/opt/rt3/bin' RT_BIN_PATH_R='/opt/rt3/bin' RT_DEVEL_MODE='0' RT_DOC_PATH='/opt/rt3/share/doc' +RT_DOC_PATH_R='/opt/rt3/share/doc' RT_ETC_PATH='/opt/rt3/etc' +RT_ETC_PATH_R='/opt/rt3/etc' +RT_FONT_PATH='/opt/rt3/share/fonts' +RT_FONT_PATH_R='/opt/rt3/share/fonts' +RT_GD='0' +RT_GPG='1' +RT_GRAPHVIZ='0' RT_LIB_PATH='/opt/rt3/lib' +RT_LIB_PATH_R='/opt/rt3/lib' RT_LOCAL_PATH='/opt/rt3/local' +RT_LOCAL_PATH_R='/opt/rt3/local' RT_LOG_PATH='/opt/rt3/var/log' +RT_LOG_PATH_R='/opt/rt3/var/log' RT_MAN_PATH='/opt/rt3/man' +RT_MAN_PATH_R='/opt/rt3/man' RT_PATH='/opt/rt3' +RT_PATH_R='/opt/rt3' +RT_PLUGIN_PATH='' +RT_PLUGIN_PATH_R='' RT_SBIN_PATH='/opt/rt3/sbin' -RT_STANDALONE='0' +RT_SBIN_PATH_R='/opt/rt3/sbin' RT_VAR_PATH='/opt/rt3/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='13' +SHELL='/bin/bash' SPEEDY_BIN='/usr/local/bin/speedy' WEB_GROUP='freeside' +WEB_HANDLER='modperl2' WEB_USER='freeside' +ac_ct_CC='gcc' bindir='/opt/rt3/bin' build_alias='' customdir='/opt/rt3/local' @@ -335,6 +334,9 @@ customhtmldir='/opt/rt3/local/html' customlexdir='/opt/rt3/local/po' customlibdir='/opt/rt3/local/lib' datadir='/opt/rt3/share' +datarootdir='${prefix}/share' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +dvidir='${docdir}' exec_prefix='/opt/rt3' exp_bindir='/opt/rt3/bin' exp_customdir='/opt/rt3/local' @@ -344,6 +346,7 @@ exp_customlexdir='/opt/rt3/local/po' exp_customlibdir='/opt/rt3/local/lib' exp_datadir='/opt/rt3/share' exp_exec_prefix='/opt/rt3' +exp_fontdir='/opt/rt3/share/fonts' exp_htmldir='/var/www/freeside/rt' exp_libdir='/opt/rt3/lib' exp_localstatedir='/opt/rt3/var' @@ -351,30 +354,36 @@ exp_logfiledir='/opt/rt3/var/log' exp_mandir='/opt/rt3/man' exp_manualdir='/opt/rt3/share/doc' exp_masonstatedir='/usr/local/etc/freeside/masondata' +exp_plugindir='' exp_prefix='/opt/rt3' exp_sbindir='/opt/rt3/sbin' exp_sessionstatedir='/opt/rt3/var/session_data' exp_sysconfdir='/opt/rt3/etc' +fontdir='/opt/rt3/share/fonts' host_alias='' htmldir='/var/www/freeside/rt' includedir='${prefix}/include' -infodir='${prefix}/info' +infodir='${datarootdir}/info' libdir='/opt/rt3/lib' libexecdir='${exec_prefix}/libexec' +localedir='${datarootdir}/locale' localstatedir='/opt/rt3/var' logfiledir='/opt/rt3/var/log' mandir='/opt/rt3/man' manualdir='/opt/rt3/share/doc' masonstatedir='/usr/local/etc/freeside/masondata' oldincludedir='/usr/include' +pdfdir='${docdir}' +plugindir='' prefix='/opt/rt3' program_transform_name='s,x,x,' +psdir='${docdir}' rt_layout_name='Freeside' rt_version_major='3' rt_version_minor='8' -rt_version_patch='10' -sbindir='sbin' -sessionstatedir='var/session_data' +rt_version_patch='13' +sbindir='/opt/rt3/sbin' +sessionstatedir='/opt/rt3/var/session_data' sharedstatedir='${prefix}/com' sysconfdir='/opt/rt3/etc' target_alias='' @@ -383,12 +392,11 @@ target_alias='' ## confdefs.h. ## ## ----------- ## -#define PACKAGE_BUGREPORT "rt-bugs@bestpractical.com" +/* confdefs.h */ #define PACKAGE_NAME "RT" -#define PACKAGE_STRING "RT 3.6.4" #define PACKAGE_TARNAME "rt" -#define PACKAGE_VERSION "3.8.10" -#define PACKAGE_STRING "RT 3.8.10" +#define PACKAGE_VERSION "3.8.13" +#define PACKAGE_STRING "RT 3.8.13" #define PACKAGE_BUGREPORT "rt-bugs@bestpractical.com" #define PACKAGE_URL "" diff --git a/rt/config.status b/rt/config.status index 83560ece8..1d77d4d35 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. ## @@ -392,7 +392,7 @@ 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 +This file was extended by RT $as_me 3.8.13, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -429,9 +429,9 @@ $config_files Report bugs to ." -ac_cs_config="'PERL=/usr/bin/perl'" +ac_cs_config="'--enable-layout=Freeside' '--with-db-type=Pg' '--with-db-dba=freeside' '--with-db-database=freeside' '--with-db-rt-user=freeside' '--with-db-rt-pass=' '--with-web-user=freeside' '--with-web-group=freeside' '--with-rt-group=freeside' '--with-web-handler=modperl2'" ac_cs_version="\ -RT config.status 3.8.10 +RT config.status 3.8.13 configured by ./configure, generated by GNU Autoconf 2.68, with options \"$ac_cs_config\" @@ -439,10 +439,10 @@ 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/ivan/freeside2.3/rt' srcdir='.' INSTALL='/usr/bin/install -c' -AWK='gawk' +AWK='mawk' test -n "$AWK" || AWK=awk # The default lists apply if the user does not specify any file. ac_need_defaults=: @@ -509,10 +509,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' '--enable-layout=Freeside' '--with-db-type=Pg' '--with-db-dba=freeside' '--with-db-database=freeside' '--with-db-rt-user=freeside' '--with-db-rt-pass=' '--with-web-user=freeside' '--with-web-group=freeside' '--with-rt-group=freeside' '--with-web-handler=modperl2' $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 @@ -631,10 +631,10 @@ S["LOCAL_LIB_PATH_R"]="/opt/rt3/local/lib" S["LOCAL_LEXICON_PATH_R"]="/opt/rt3/local/po" S["MASON_LOCAL_HTML_PATH_R"]="/opt/rt3/local/html" S["LOCAL_ETC_PATH_R"]="/opt/rt3/local/etc" -S["MASON_HTML_PATH_R"]="/opt/rt3/share/html" +S["MASON_HTML_PATH_R"]="/var/www/freeside/rt" S["MASON_SESSION_PATH_R"]="/opt/rt3/var/session_data" -S["MASON_DATA_PATH_R"]="/opt/rt3/var/mason_data" -S["RT_PLUGIN_PATH_R"]="/opt/rt3/plugins" +S["MASON_DATA_PATH_R"]="/usr/local/etc/freeside/masondata" +S["RT_PLUGIN_PATH_R"]="" S["RT_FONT_PATH_R"]="/opt/rt3/share/fonts" S["RT_MAN_PATH_R"]="/opt/rt3/man" S["RT_VAR_PATH_R"]="/opt/rt3/var" @@ -646,31 +646,31 @@ S["RT_LIB_PATH_R"]="/opt/rt3/lib" S["RT_LOCAL_PATH_R"]="/opt/rt3/local" S["RT_DOC_PATH_R"]="/opt/rt3/share/doc" S["RT_PATH_R"]="/opt/rt3" -S["RT_LOG_PATH"]="var/log" -S["LOCAL_LIB_PATH"]="local/lib" -S["LOCAL_LEXICON_PATH"]="local/po" -S["MASON_LOCAL_HTML_PATH"]="local/html" -S["LOCAL_ETC_PATH"]="local/etc" -S["MASON_HTML_PATH"]="share/html" -S["MASON_SESSION_PATH"]="var/session_data" -S["MASON_DATA_PATH"]="var/mason_data" -S["RT_PLUGIN_PATH"]="plugins" -S["RT_FONT_PATH"]="share/fonts" -S["RT_MAN_PATH"]="man" -S["RT_VAR_PATH"]="var" -S["RT_SBIN_PATH"]="sbin" -S["RT_BIN_PATH"]="bin" -S["CONFIG_FILE_PATH"]="etc" -S["RT_ETC_PATH"]="etc" -S["RT_LIB_PATH"]="lib" -S["RT_LOCAL_PATH"]="local" -S["RT_DOC_PATH"]="share/doc" +S["RT_LOG_PATH"]="/opt/rt3/var/log" +S["LOCAL_LIB_PATH"]="/opt/rt3/local/lib" +S["LOCAL_LEXICON_PATH"]="/opt/rt3/local/po" +S["MASON_LOCAL_HTML_PATH"]="/opt/rt3/local/html" +S["LOCAL_ETC_PATH"]="/opt/rt3/local/etc" +S["MASON_HTML_PATH"]="/var/www/freeside/rt" +S["MASON_SESSION_PATH"]="/opt/rt3/var/session_data" +S["MASON_DATA_PATH"]="/usr/local/etc/freeside/masondata" +S["RT_PLUGIN_PATH"]="" +S["RT_FONT_PATH"]="/opt/rt3/share/fonts" +S["RT_MAN_PATH"]="/opt/rt3/man" +S["RT_VAR_PATH"]="/opt/rt3/var" +S["RT_SBIN_PATH"]="/opt/rt3/sbin" +S["RT_BIN_PATH"]="/opt/rt3/bin" +S["CONFIG_FILE_PATH"]="/opt/rt3/etc" +S["RT_ETC_PATH"]="/opt/rt3/etc" +S["RT_LIB_PATH"]="/opt/rt3/lib" +S["RT_LOCAL_PATH"]="/opt/rt3/local" +S["RT_DOC_PATH"]="/opt/rt3/share/doc" S["RT_PATH"]="/opt/rt3" -S["RT_VERSION_PATCH"]="10" +S["RT_VERSION_PATCH"]="13" S["RT_VERSION_MINOR"]="8" S["RT_VERSION_MAJOR"]="3" S["RT_GPG"]="1" -S["RT_GD"]="1" +S["RT_GD"]="0" S["RT_GRAPHVIZ"]="0" S["OBJEXT"]="o" S["EXEEXT"]="" @@ -680,64 +680,64 @@ S["LDFLAGS"]="" S["CFLAGS"]="-g -O2" S["CC"]="gcc" S["RT_DEVEL_MODE"]="0" -S["APACHECTL"]="/usr/sbin/apachectl" -S["RTGROUP"]="www" -S["WEB_GROUP"]="www" -S["WEB_USER"]="www" -S["DB_RT_PASS"]="rt_pass" -S["DB_RT_USER"]="rt_user" -S["DB_DATABASE"]="rt3" -S["DB_DBA"]="root" +S["APACHECTL"]="" +S["RTGROUP"]="freeside" +S["WEB_GROUP"]="freeside" +S["WEB_USER"]="freeside" +S["DB_RT_PASS"]="" +S["DB_RT_USER"]="freeside" +S["DB_DATABASE"]="freeside" +S["DB_DBA"]="freeside" S["DB_RT_HOST"]="localhost" S["DB_PORT"]="" S["DB_HOST"]="localhost" S["DATABASE_ENV_PREF"]="" -S["DB_TYPE"]="mysql" +S["DB_TYPE"]="Pg" S["LIBS_GROUP"]="bin" S["LIBS_OWNER"]="root" S["BIN_OWNER"]="root" S["COMMENT_INPLACE_LAYOUT"]="" -S["rt_layout_name"]="relative" -S["exp_customlibdir"]="local/lib" -S["customlibdir"]="local/lib" -S["exp_customlexdir"]="local/po" -S["customlexdir"]="local/po" -S["exp_customhtmldir"]="local/html" -S["customhtmldir"]="local/html" -S["exp_custometcdir"]="local/etc" -S["custometcdir"]="local/etc" -S["exp_customdir"]="local" -S["customdir"]="local" -S["exp_sessionstatedir"]="var/session_data" -S["sessionstatedir"]="var/session_data" -S["exp_masonstatedir"]="var/mason_data" -S["masonstatedir"]="var/mason_data" -S["exp_logfiledir"]="var/log" -S["logfiledir"]="var/log" -S["exp_localstatedir"]="var" -S["exp_plugindir"]="plugins" -S["plugindir"]="plugins" -S["exp_manualdir"]="share/doc" -S["manualdir"]="share/doc" -S["exp_fontdir"]="share/fonts" -S["fontdir"]="share/fonts" -S["exp_htmldir"]="share/html" -S["exp_datadir"]="share" -S["exp_libdir"]="lib" -S["exp_mandir"]="man" -S["exp_sysconfdir"]="etc" -S["exp_sbindir"]="sbin" -S["exp_bindir"]="bin" +S["rt_layout_name"]="Freeside" +S["exp_customlibdir"]="/opt/rt3/local/lib" +S["customlibdir"]="/opt/rt3/local/lib" +S["exp_customlexdir"]="/opt/rt3/local/po" +S["customlexdir"]="/opt/rt3/local/po" +S["exp_customhtmldir"]="/opt/rt3/local/html" +S["customhtmldir"]="/opt/rt3/local/html" +S["exp_custometcdir"]="/opt/rt3/local/etc" +S["custometcdir"]="/opt/rt3/local/etc" +S["exp_customdir"]="/opt/rt3/local" +S["customdir"]="/opt/rt3/local" +S["exp_sessionstatedir"]="/opt/rt3/var/session_data" +S["sessionstatedir"]="/opt/rt3/var/session_data" +S["exp_masonstatedir"]="/usr/local/etc/freeside/masondata" +S["masonstatedir"]="/usr/local/etc/freeside/masondata" +S["exp_logfiledir"]="/opt/rt3/var/log" +S["logfiledir"]="/opt/rt3/var/log" +S["exp_localstatedir"]="/opt/rt3/var" +S["exp_plugindir"]="" +S["plugindir"]="" +S["exp_manualdir"]="/opt/rt3/share/doc" +S["manualdir"]="/opt/rt3/share/doc" +S["exp_fontdir"]="/opt/rt3/share/fonts" +S["fontdir"]="/opt/rt3/share/fonts" +S["exp_htmldir"]="/var/www/freeside/rt" +S["exp_datadir"]="/opt/rt3/share" +S["exp_libdir"]="/opt/rt3/lib" +S["exp_mandir"]="/opt/rt3/man" +S["exp_sysconfdir"]="/opt/rt3/etc" +S["exp_sbindir"]="/opt/rt3/sbin" +S["exp_bindir"]="/opt/rt3/bin" S["exp_exec_prefix"]="/opt/rt3" S["exp_prefix"]="/opt/rt3" S["SPEEDY_BIN"]="/usr/local/bin/speedy" -S["WEB_HANDLER"]="fastcgi" +S["WEB_HANDLER"]="modperl2" S["PERL"]="/usr/bin/perl" -S["AWK"]="gawk" +S["AWK"]="mawk" S["INSTALL_DATA"]="${INSTALL} -m 644" S["INSTALL_SCRIPT"]="${INSTALL}" S["INSTALL_PROGRAM"]="${INSTALL}" -S["rt_version_patch"]="10" +S["rt_version_patch"]="13" S["rt_version_minor"]="8" S["rt_version_major"]="3" S["target_alias"]="" @@ -745,40 +745,40 @@ 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.13\\\" -DPACKAGE_STRING=\\\"RT\\ 3.8.13\\\" -DPACKAGE_BUGREPORT=\\\"rt-bugs@bestpracti"\ "cal.com\\\" -DPACKAGE_URL=\\\"\\\"" -S["mandir"]="man" +S["mandir"]="/opt/rt3/man" S["localedir"]="${datarootdir}/locale" -S["libdir"]="lib" +S["libdir"]="/opt/rt3/lib" S["psdir"]="${docdir}" S["pdfdir"]="${docdir}" S["dvidir"]="${docdir}" -S["htmldir"]="share/html" +S["htmldir"]="/var/www/freeside/rt" S["infodir"]="${datarootdir}/info" S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}" S["oldincludedir"]="/usr/include" S["includedir"]="${prefix}/include" -S["localstatedir"]="var" +S["localstatedir"]="/opt/rt3/var" S["sharedstatedir"]="${prefix}/com" -S["sysconfdir"]="etc" -S["datadir"]="share" +S["sysconfdir"]="/opt/rt3/etc" +S["datadir"]="/opt/rt3/share" S["datarootdir"]="${prefix}/share" S["libexecdir"]="${exec_prefix}/libexec" -S["sbindir"]="sbin" -S["bindir"]="bin" +S["sbindir"]="/opt/rt3/sbin" +S["bindir"]="/opt/rt3/bin" S["program_transform_name"]="s,x,x," 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.13" +S["PACKAGE_VERSION"]="3.8.13" 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 && for (key in S) S_is_set[key] = 1 @@ -972,11 +972,11 @@ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ac_datarootdir_hack=' - s&@datadir@&share&g + s&@datadir@&/opt/rt3/share&g s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g s&@infodir@&${datarootdir}/info&g s&@localedir@&${datarootdir}/locale&g - s&@mandir@&man&g + s&@mandir@&/opt/rt3/man&g s&\${datarootdir}&${prefix}/share&g' ;; esac ac_sed_extra="/^[ ]*VPATH[ ]*=[ ]*/{ diff --git a/rt/etc/upgrade/3.8-branded-queues-extension b/rt/etc/upgrade/3.8-branded-queues-extension index b3785342f..b0127d77d 100755 --- a/rt/etc/upgrade/3.8-branded-queues-extension +++ b/rt/etc/upgrade/3.8-branded-queues-extension @@ -49,8 +49,8 @@ use strict; use warnings; -use lib "local/lib"; -use lib "lib"; +use lib "/opt/rt3/local/lib"; +use lib "/opt/rt3/lib"; use RT; diff --git a/rt/etc/upgrade/3.8-ical-extension b/rt/etc/upgrade/3.8-ical-extension index a241ee2a1..7e3b87709 100755 --- a/rt/etc/upgrade/3.8-ical-extension +++ b/rt/etc/upgrade/3.8-ical-extension @@ -49,8 +49,8 @@ use strict; use warnings; -use lib "local/lib"; -use lib "lib"; +use lib "/opt/rt3/local/lib"; +use lib "/opt/rt3/lib"; use RT; diff --git a/rt/etc/upgrade/generate-rtaddressregexp b/rt/etc/upgrade/generate-rtaddressregexp index adffab9cd..cac08723b 100755 --- a/rt/etc/upgrade/generate-rtaddressregexp +++ b/rt/etc/upgrade/generate-rtaddressregexp @@ -49,8 +49,8 @@ use strict; use warnings; -use lib "local/lib"; -use lib "lib"; +use lib "/opt/rt3/local/lib"; +use lib "/opt/rt3/lib"; use RT; RT::LoadConfig(); diff --git a/rt/etc/upgrade/split-out-cf-categories b/rt/etc/upgrade/split-out-cf-categories index 23169f43c..b1012ec0d 100755 --- a/rt/etc/upgrade/split-out-cf-categories +++ b/rt/etc/upgrade/split-out-cf-categories @@ -49,8 +49,8 @@ use strict; use warnings; -use lib "local/lib"; -use lib "lib"; +use lib "/opt/rt3/local/lib"; +use lib "/opt/rt3/lib"; use RT; RT::LoadConfig(); diff --git a/rt/etc/upgrade/vulnerable-passwords b/rt/etc/upgrade/vulnerable-passwords index 28d1bc5b0..0272e017b 100755 --- a/rt/etc/upgrade/vulnerable-passwords +++ b/rt/etc/upgrade/vulnerable-passwords @@ -49,8 +49,8 @@ use strict; use warnings; -use lib "local/lib"; -use lib "lib"; +use lib "/opt/rt3/local/lib"; +use lib "/opt/rt3/lib"; use RT; RT::LoadConfig; diff --git a/rt/sbin/rt-attributes-viewer b/rt/sbin/rt-attributes-viewer index 1ae83217b..e141b83ae 100755 --- a/rt/sbin/rt-attributes-viewer +++ b/rt/sbin/rt-attributes-viewer @@ -52,7 +52,7 @@ use warnings; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-clean-sessions b/rt/sbin/rt-clean-sessions index c3dc20143..1649b3407 100755 --- a/rt/sbin/rt-clean-sessions +++ b/rt/sbin/rt-clean-sessions @@ -52,7 +52,7 @@ use warnings; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-dump-database b/rt/sbin/rt-dump-database index f460e8648..2cdcc9279 100755 --- a/rt/sbin/rt-dump-database +++ b/rt/sbin/rt-dump-database @@ -55,7 +55,7 @@ binmode(STDOUT, ":utf8"); # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-email-dashboards b/rt/sbin/rt-email-dashboards index 9453931ed..7cdb9c468 100755 --- a/rt/sbin/rt-email-dashboards +++ b/rt/sbin/rt-email-dashboards @@ -52,7 +52,7 @@ use warnings; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-email-digest b/rt/sbin/rt-email-digest index e26dde890..466ac04c5 100755 --- a/rt/sbin/rt-email-digest +++ b/rt/sbin/rt-email-digest @@ -51,7 +51,7 @@ use strict; BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-email-group-admin b/rt/sbin/rt-email-group-admin index 169ef9ab6..2025a24a6 100755 --- a/rt/sbin/rt-email-group-admin +++ b/rt/sbin/rt-email-group-admin @@ -89,7 +89,7 @@ use strict; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-server b/rt/sbin/rt-server index f932ce8b4..28370aee7 100755 --- a/rt/sbin/rt-server +++ b/rt/sbin/rt-server @@ -52,7 +52,7 @@ use strict; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-shredder b/rt/sbin/rt-shredder index 3a9db9d24..8cc0c0003 100755 --- a/rt/sbin/rt-shredder +++ b/rt/sbin/rt-shredder @@ -113,7 +113,7 @@ use warnings FATAL => 'all'; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/sbin/rt-validator b/rt/sbin/rt-validator index d0ba1a71e..4bf84aff3 100755 --- a/rt/sbin/rt-validator +++ b/rt/sbin/rt-validator @@ -52,7 +52,7 @@ use warnings; # fix lib paths, some may be relative BEGIN { require File::Spec; - my @libs = ("lib", "local/lib"); + my @libs = ("/opt/rt3/lib", "/opt/rt3/local/lib"); my $bin_path; for my $lib (@libs) { diff --git a/rt/t/data/configs/apache2.2+fastcgi.conf b/rt/t/data/configs/apache2.2+fastcgi.conf index c9d9cb0b9..0a6945054 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%% -User www -Group www +User freeside +Group freeside diff --git a/rt/t/data/configs/apache2.2+mod_perl.conf b/rt/t/data/configs/apache2.2+mod_perl.conf index 9f4587e04..17761c532 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 -User www -Group www +User freeside +Group freeside -- 2.11.0