Cosmetic cleanup for message content display ; installation cleanups and fixes; Bumped to 2.1.80rt-2.1.80

6 files changed, 35 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index ad4cdf45ed..833733764e 100755
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 RT_VERSION_MAJOR	=	2
 RT_VERSION_MINOR	=	1
-RT_VERSION_PATCH	=	79
+RT_VERSION_PATCH	=	80
 
 RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
 TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
@@ -109,9 +109,11 @@ RT_CRON_BIN		=	$(RT_BIN_PATH)/rt-crontool
 
 # }}}
 
-SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER)
+SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+				$(DESTDIR)/$(RT_WIN32_FASTCGI_HANDLER)
 
 BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
+				$(DESTDIR)/$(RT_MAILGATE_BIN) \
 				$(DESTDIR)/$(RT_CRON_BIN) \
 				$(SETGID_BINARIES)
 SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
@@ -208,9 +210,9 @@ upgrade-instruct:
 	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datafile etc/upgrade/<version>"
 
 
-upgrade: dirs upgrade-noclobber  upgrade-instruct
+upgrade: dirs upgrade-noclobber upgrade-instruct
 
-upgrade-noclobber: libs-install html-install bin-install local-install doc-install fixperms
+upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
 
 
 # {{{ dependencies
@@ -246,9 +248,9 @@ fixperms:
 	chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE)
 
 	# Make the interfaces executable and setgid rt
-	chown $(BIN_OWNER) $(SETGID_BINARIES)
-	chgrp $(RTGROUP) $(SETGID_BINARIES)
-	chmod 0755  $(SETGID_BINARIES)
+	chown $(BIN_OWNER) $(BINARIES)
+	chgrp $(RTGROUP) $(BINARIES)
+	chmod 0755  $(BINARIES)
 	chmod g+s $(SETGID_BINARIES)
 
 	# Make the web ui readable by all. 
diff --git a/Makefile.in b/Makefile.in
index 1abb650ff5..02b01b7c0e 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,9 +109,11 @@ RT_CRON_BIN		=	$(RT_BIN_PATH)/rt-crontool
 
 # }}}
 
-SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER)
+SETGID_BINARIES	 	= 	$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+				$(DESTDIR)/$(RT_WIN32_FASTCGI_HANDLER)
 
 BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
+				$(DESTDIR)/$(RT_MAILGATE_BIN) \
 				$(DESTDIR)/$(RT_CRON_BIN) \
 				$(SETGID_BINARIES)
 SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
@@ -208,9 +210,9 @@ upgrade-instruct:
 	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datafile etc/upgrade/<version>"
 
 
-upgrade: dirs upgrade-noclobber  upgrade-instruct
+upgrade: dirs upgrade-noclobber upgrade-instruct
 
-upgrade-noclobber: libs-install html-install bin-install local-install doc-install fixperms
+upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
 
 
 # {{{ dependencies
@@ -246,9 +248,9 @@ fixperms:
 	chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE)
 
 	# Make the interfaces executable and setgid rt
-	chown $(BIN_OWNER) $(SETGID_BINARIES)
-	chgrp $(RTGROUP) $(SETGID_BINARIES)
-	chmod 0755  $(SETGID_BINARIES)
+	chown $(BIN_OWNER) $(BINARIES)
+	chgrp $(RTGROUP) $(BINARIES)
+	chmod 0755  $(BINARIES)
 	chmod g+s $(SETGID_BINARIES)
 
 	# Make the web ui readable by all. 
diff --git a/configure b/configure
index f14194bffd..bdb99bfc15 100644
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.54 for RT 2.1.79.
+# Generated by GNU Autoconf 2.54 for RT 2.1.80.
 #
 # Report bugs to <rt-3.0-bugs@fsck.com>.
 #
@@ -266,8 +266,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='2.1.79'
-PACKAGE_STRING='RT 2.1.79'
+PACKAGE_VERSION='2.1.80'
+PACKAGE_STRING='RT 2.1.80'
 PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
 
 ac_unique_file="lib/RT.pm.in"
@@ -725,7 +725,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 2.1.79 to adapt to many kinds of systems.
+\`configure' configures RT 2.1.80 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -782,7 +782,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 2.1.79:";;
+     short | recursive ) echo "Configuration of RT 2.1.80:";;
    esac
   cat <<\_ACEOF
 
@@ -802,7 +802,8 @@ Optional Packages:
   --with-db-host=HOSTNAME FQDN of database server (default: localhost)
   --with-db-port=PORT     port on which the database listens on
   --with-db-rt-host=HOSTNAME
-                          FQDN of database server (default: localhost)
+                          FQDN of RT server which talks to the database server
+                          (default: localhost)
   --with-db-dba=DBA       name of database administrator (default: root)
   --with-db-database=DBNAME
                           name of the database to use (default: rt3)
@@ -882,7 +883,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 2.1.79
+RT configure 2.1.80
 generated by GNU Autoconf 2.54
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -897,7 +898,7 @@ cat >&5 <<_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 2.1.79, which was
+It was created by RT $as_me 2.1.80, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   $ $0 $@
@@ -1209,7 +1210,7 @@ rt_version_major=2
 
 rt_version_minor=1
 
-rt_version_patch=79
+rt_version_patch=80
 
 test "x$rt_version_major" = 'x' && rt_version_major=0
 test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -2244,7 +2245,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 2.1.79, which was
+This file was extended by RT $as_me 2.1.80, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2298,7 +2299,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 2.1.79
+RT config.status 2.1.80
 configured by $0, generated by GNU Autoconf 2.54,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 1f06a11692..37ca96975c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_REVISION($Revision: 1.1 $)dnl
 
 dnl Setup autoconf
 AC_PREREQ(2.53)
-AC_INIT(RT, [2.1.79], [rt-3.0-bugs@fsck.com])
+AC_INIT(RT, [2.1.80], [rt-3.0-bugs@fsck.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components
@@ -91,7 +91,7 @@ AC_SUBST(DB_PORT)
 dnl DB_RT_HOST
 AC_ARG_WITH(db-rt-host,
 	    AC_HELP_STRING([--with-db-rt-host=HOSTNAME],
-	    		   [FQDN of database server (default: localhost)]),
+	    		   [FQDN of RT server which talks to the database server (default: localhost)]),
             DB_RT_HOST=$withval,
             DB_RT_HOST=localhost)
 AC_SUBST(DB_RT_HOST)
diff --git a/html/Ticket/Elements/ShowMessageStanza b/html/Ticket/Elements/ShowMessageStanza
index 4f0ad8f810..766644a402 100755
--- a/html/Ticket/Elements/ShowMessageStanza
+++ b/html/Ticket/Elements/ShowMessageStanza
@@ -33,6 +33,8 @@ foreach my $stanza (@$Message) {
         my $content = $stanza->{raw};
         RT::Interface::Web::EscapeUTF8(\$content);
          $m->comp('/Elements/Callback', content_ref  => \$content, %ARGS);
+                $content =~ s/\n/<br>/gi;
+
 </%perl>
 <font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
 %       }
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 4ac99e01f3..b9ea153587 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -126,8 +126,8 @@ sub EscapeUTF8  {
         $$ref =~ s/>/&gt;/g;
         $$ref =~ s/\(/&#40;/g;
         $$ref =~ s/\)/&#41;/g;
-        $$ref =~ s/"/&#42;/g;
-        $$ref =~ s/'/&#47;/g;
+        $$ref =~ s/"/&#34;/g;
+        $$ref =~ s/'/&#39;/g;
 
 }