diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-08-11 13:45:31 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-08-11 13:45:31 +0000 |
| commit | c2f1fae07cc766560bcc9337852f23623fbfbed9 (patch) | |
| tree | e88fee4eed7c76dab0281678e1e8e77cfa8f80ad /net/citrix_xenapp/files/patch-linuxx86::hinst | |
| parent | lmule is very likely to have the same format string vulnerability (diff) | |
Upgrade to v. 7.00, integrate it into Gnome/KDE
Notes
Notes:
svn path=/head/; revision=86756
Diffstat (limited to 'net/citrix_xenapp/files/patch-linuxx86::hinst')
| -rw-r--r-- | net/citrix_xenapp/files/patch-linuxx86::hinst | 125 |
1 files changed, 94 insertions, 31 deletions
diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst index 99963035e66c..de042206045f 100644 --- a/net/citrix_xenapp/files/patch-linuxx86::hinst +++ b/net/citrix_xenapp/files/patch-linuxx86::hinst @@ -1,6 +1,6 @@ ---- linuxx86/hinst.orig Tue Mar 19 17:18:14 2002 -+++ linuxx86/hinst Sat Apr 27 11:33:28 2002 -@@ -1965,10 +1965,32 @@ +--- linuxx86/hinst.orig Thu May 22 12:30:28 2003 ++++ linuxx86/hinst Mon Aug 11 15:06:44 2003 +@@ -2132,10 +2132,32 @@ # ############################################################################### @@ -15,17 +15,17 @@ +} + +NSCP="/usr/local/libexec/netscape \ -+ /usr/local/libexec/netscape-linux \ -+ /usr/local/netscape \ -+ /usr/local/netscape-linux \ -+ /usr/local/lib/netscape \ -+ /usr/local/lib/netscape-linux \ -+ $MOZILLA_HOME" ++ /usr/local/libexec/netscape-linux \ ++ /usr/local/netscape \ ++ /usr/local/netscape-linux \ ++ /usr/local/lib/netscape \ ++ /usr/local/lib/netscape-linux \ ++ $MOZILLA_HOME" + +for dir in ${NSCP}; do -+ if [ -e $dir/plugins/libnullplugin.so ]; then -+ check_for_ns $dir; -+ fi ++ if [ -e $dir/plugins/libnullplugin.so ]; then ++ check_for_ns $dir; ++ fi +done + INST_DIR=$ICAInstDir @@ -34,34 +34,97 @@ -PLUGIN_PATH="/usr/local/netscape/plugins" PLUGIN_NAME=npica.so PLUGIN_CLASS=ICAClObj.class - -@@ -2017,15 +2039,12 @@ + MAILCAP_FILE=mailcap +@@ -2207,35 +2229,29 @@ + netscape_integrate() + { $ECHO_CMD $integrate_netscape1 - search_ok=0 - -- if test -d "/usr/lib/netscape"\ -- || test -d "/usr/local/netscape"\ -- || test -d "/opt/netscape"\ -- || test -d "/usr/local/lib/netscape"\ -- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME" -- then -+ case ${FOUND_NS} in -+ TRUE) +- if test -z "$SU_INSTALL" ++ if [ test -z "$SU_INSTALL" ]; + then + set_npui_variables + found_netscape + else + search_ok=0 +- EXTRA_BROWSERS=`find_browsers` +- +- if test -d "/usr/lib/netscape"\ +- || test -d "/usr/local/netscape"\ +- || test -d "/opt/netscape"\ +- || test -d "/usr/local/lib/netscape"\ +- || test -d "/usr/dt/appconfig/netscape"\ +- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\ +- || test "$EXTRA_BROWSERS" != "" +- then ++ ++ case ${FOUND_NS} in ++ TRUE) $ECHO_CMD $integrate_netscape3 found_netscape -- else +- else + ;; -+ *) ++ *) echo_no_nl $integrate_netscape2 getyesno $INSTALLER_NO - if [ "$ANSWER" = "$INSTALLER_YES" ] -@@ -2034,7 +2053,8 @@ +- if [ "$ANSWER" = "$INSTALLER_YES" ] +- then ++ if [ "$ANSWER" = "$INSTALLER_YES" ]; then + found_netscape else $ECHO_CMD $integrate_netscape6 fi -- fi; -+ ;; -+ esac; +- fi +- fi ++ ;; ++ esac ++ fi + + # Create utility script files in install root. + create_wfica_script +@@ -2866,37 +2882,6 @@ + echo "$BINDIR" } +-################################################################################ +-# +-# find_browsers +-# +-# Returns a list of directories containing new-style mozilla-based browsers +-# that may be launched by files on the $PATH. +-# +-################################################################################ +-find_browsers() +-{ +- PROGS="netscape mozilla" +- DIST_BIN_DIR="" +- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla" +- for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS +- do +- echo $d +- done | sort -u | while read d +- do +- for p in $PROGS +- do +- # Find the each instance of each named browser +- PROG=$d/$p +- if test -f $PROG +- then +- # Where is the installation and what version is it? +- find_extra_bin_dirs $PROG +- fi +- done +- done | sort -u +-} +- + BROWSER_LIST_KEY="BROWSER_DIR" ################################################################################ + # +@@ -3119,6 +3104,8 @@ + wfcmgr_NAME='Citrix ICA Client' + DEFAULT_DT_TARGET_DIRS="/usr/share/applications \ + /usr/share/applnk/Applications \ ++ /usr/local/share/applnk/Internet \ ++ /usr/local/share/applnk/Networking \ + /usr/share/applnk-redhat/Internet \ + /usr/share/applnk-mdk/Networking" + DEFAULT_DT_FOLDER="Applications" |