SOURCES: metasploit3-datadir.patch (NEW) - hardcode msfbase, not to depend ...

[glen]

Author: glen                         Date: Thu Jul 24 21:06:31 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- hardcode msfbase, not to depend on symlinks

---- Files affected:
SOURCES:
   metasploit3-datadir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/metasploit3-datadir.patch
diff -u /dev/null SOURCES/metasploit3-datadir.patch:1.1
--- /dev/null	Thu Jul 24 23:06:32 2008
+++ SOURCES/metasploit3-datadir.patch	Thu Jul 24 23:06:26 2008
@@ -0,0 +1,147 @@
+--- framework-3.1/msfcli	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfcli	2008-07-24 23:42:51.739797982 +0300
+@@ -1,12 +1,11 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ #
+ # This user interface allows users to interact with the framework through a
+ # command line interface (CLI) rather than having to use a prompting console
+ # or web-based interface.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'rex'
+ require 'msf/ui'
+--- framework-3.1/msfconsole	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfconsole	2008-07-24 23:42:55.576019334 +0300
+@@ -1,11 +1,10 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ #
+ # This user interface provides users with a command console interface to the
+ # framework.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'rex'
+ require 'msf/ui'
+--- framework-3.1/msfd	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfd	2008-07-24 23:42:58.584192908 +0300
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ #
+ # This user interface listens on a port and provides clients that connect to
+ # it with an msfconsole instance.  The nice thing about this interface is that
+@@ -6,8 +6,7 @@
+ # possible for sessions to to be shared from a single vantage point.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'msf/base'
+ require 'msf/ui'
+--- framework-3.1/msfencode	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfencode	2008-07-24 23:43:01.484360250 +0300
+@@ -1,7 +1,6 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'rex'
+ require 'msf/ui'
+--- framework-3.1/msfgui	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfgui	2008-07-24 23:43:06.008621303 +0300
+@@ -1,11 +1,9 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ #
+ # This is a basic user interface using the Gtk2 GUI library
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
+-
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'rex'
+ require 'msf/base'
+--- framework-3.1/msfopcode	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfopcode	2008-07-24 23:42:44.267366817 +0300
+@@ -1,12 +1,11 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ #
+ # This user interface provides a command line interface to the Metasploit
+ # Opcode Database.  It provides users with the ability to search for opcodes
+ # and to display information about modules.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'rex'
+ require 'rex/ui'
+--- framework-3.1/msfpayload	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfpayload	2008-07-24 23:43:13.361045543 +0300
+@@ -1,7 +1,6 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'rex'
+ require 'msf/ui'
+--- framework-3.1/msfpescan	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfpescan	2008-07-24 23:43:16.729239890 +0300
+@@ -1,7 +1,6 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'rex/peparsey'
+ require 'rex/pescan'
+--- framework-3.1/msfweb	2008-01-28 05:46:07.000000000 +0200
++++ framework-3.1-datadir/msfweb	2008-07-24 23:43:27.001832626 +0300
+@@ -1,12 +1,10 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ #
+ # This user interface provides users with a web-based interface to the framework
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
+-
+-
++msfbase = '/usr/share/metasploit3'
++$:.unshift('/usr/share/metasploit3/lib')
+ 
+ require 'msf/base'
+ require 'rex'
+@@ -14,7 +12,7 @@
+ 
+ 
+ 
+-msfroot = File.join(File.dirname(msfbase), 'data', 'msfweb')
++msfroot = File.join(msfbase, 'data', 'msfweb')
+ Dir.chdir(msfroot)
+ 
+ msfserv = File.join('script', 'server')
================================================================