[packages/metasploit/merge3: 8/9] - leave shebang chunks out of patch

[glen]

commit bd35c5df91dd219b243669d585fd7545dd461e24
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu Jul 24 22:04:02 2008 +0000

    - leave shebang chunks out of patch
    
    Changed files:
        metasploit3-datadir.patch -> 1.2
        metasploit3.spec -> 1.7

 metasploit.spec           | 10 ++++++++--
 metasploit3-datadir.patch | 45 ++++++++-------------------------------------
 2 files changed, 16 insertions(+), 39 deletions(-)
---
diff --git a/metasploit.spec b/metasploit.spec
index 0ff7408..6f4482d 100644
--- a/metasploit.spec
+++ b/metasploit.spec
@@ -5,7 +5,7 @@ Summary:	The Metasploit Framework - a powerful tool for penetration testing
 Summary(pl.UTF-8):	Metasploit Framework - narzędzie wspomagające testy penetracyjne
 Name:		metasploit3
 Version:	3.1
-Release:	0.6
+Release:	0.7
 License:	MFL v1.2+
 Group:		Applications
 Source0:	http://spool.metasploit.com/releases/framework-%{version}.tar.gz
@@ -48,11 +48,17 @@ Metasploit Framework 2.7.
 %prep
 %setup -q -n framework-%{version}
 find -name .svn -type d -print0 | xargs -0 rm -rf
-%patch0 -p1
 egrep -rl '/usr/local/bin/ruby|/usr/bin/env' . | xargs %{__sed} -i -e '
 	1s,#!.*/bin/ruby,#!/usr/bin/ruby,
 	1s,#!/usr/bin/env ruby,#!/usr/bin/ruby,
 '
+%patch0 -p1
+
+# cleanup backups after patching
+find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
+# win32 binary with source
+rm -rf tools/memdump
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/metasploit3-datadir.patch b/metasploit3-datadir.patch
index 760f343..9758582 100644
--- a/metasploit3-datadir.patch
+++ b/metasploit3-datadir.patch
@@ -1,10 +1,6 @@
 --- 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
+@@ -2,9 +2,8 @@
  # command line interface (CLI) rather than having to use a prompting console
  # or web-based interface.
  #
@@ -17,11 +13,7 @@
  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
+@@ -2,8 +2,7 @@
  # framework.
  #
  
@@ -33,12 +25,6 @@
  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.
  #
@@ -51,9 +37,7 @@
  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
+@@ -2,6 +2,5 @@
  
 -msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 -$:.unshift(File.join(File.dirname(msfbase), 'lib'))
@@ -63,10 +47,7 @@
  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
- #
+@@ -2,9 +2,7 @@
  # This is a basic user interface using the Gtk2 GUI library
  #
  
@@ -79,10 +60,7 @@
  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
- #
+@@ -2,10 +2,9 @@
  # 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.
@@ -96,9 +74,7 @@
  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
+@@ -2,6 +2,5 @@
  
 -msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 -$:.unshift(File.join(File.dirname(msfbase), 'lib'))
@@ -108,9 +84,7 @@
  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
+@@ -2,6 +2,5 @@
  
 -msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 -$:.unshift(File.join(File.dirname(msfbase), 'lib'))
@@ -120,10 +94,7 @@
  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
- #
+@@ -2,10 +2,8 @@
  # This user interface provides users with a web-based interface to the framework
  #
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/metasploit.git/commitdiff/5af0fd996c95d9330f123fadf8bceb31bbe6f108