[Python-modules-commits] r2461 - in /packages/scapy: tags/1.1.1-1/ trunk/debian/ trunk/debian/patches/
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Tue May 22 21:48:03 UTC 2007
Author: piotr
Date: Tue May 22 21:48:03 2007
New Revision: 2461
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2461
Log:
* remove 1.1.1-1 from tags
* fix debian/watch file
* remove build dir in clean rule
* split debian.patch into several files
- use compiled version of scapy.py in scapy executable
- fix tcpdump path (/usr/sbin is not in PATH by default)
Added:
packages/scapy/trunk/debian/patches/executable.patch
packages/scapy/trunk/debian/patches/manpage.patch
packages/scapy/trunk/debian/patches/scapy.py.patch
packages/scapy/trunk/debian/patches/setup.py.patch
Removed:
packages/scapy/tags/1.1.1-1/
packages/scapy/trunk/debian/patches/debian.patch
Modified:
packages/scapy/trunk/debian/rules
packages/scapy/trunk/debian/watch
Added: packages/scapy/trunk/debian/patches/executable.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/scapy/trunk/debian/patches/executable.patch?rev=2461&op=file
==============================================================================
--- packages/scapy/trunk/debian/patches/executable.patch (added)
+++ packages/scapy/trunk/debian/patches/executable.patch Tue May 22 21:48:03 2007
@@ -1,0 +1,6 @@
+diff -Nur trunk/scapy trunk.new/scapy
+--- trunk/scapy 1970-01-01 01:00:00.000000000 +0100
++++ trunk.new/scapy 2007-05-15 00:38:15.000000000 +0200
+@@ -0,0 +1,2 @@
++#!/bin/sh
++exec /usr/bin/python /var/lib/python-support/`pyversions -d`/scapy.py
Added: packages/scapy/trunk/debian/patches/manpage.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/scapy/trunk/debian/patches/manpage.patch?rev=2461&op=file
==============================================================================
--- packages/scapy/trunk/debian/patches/manpage.patch (added)
+++ packages/scapy/trunk/debian/patches/manpage.patch Tue May 22 21:48:03 2007
@@ -1,0 +1,20 @@
+--- scapy.1.orig 2007-05-22 23:28:33.000000000 +0200
++++ scapy.1 2007-05-22 23:29:26.000000000 +0200
+@@ -17,7 +17,7 @@
+
+ First, with most other tools, you won't build someting the author did not imagine. These tools have been built for a specific goal and can't deviate much from it. For example, an ARP cache poisoning program won't let you use double 802.1q encapsulation. Or try to find a program that can send, say, an ICMP packet with padding (I said padding, not payload, see?). In fact, each time you have a new need, you have to build a new tool.
+
+-Second, they usually confuse decoding and interpreting. Machines are good at decoding and can help human beings with that. Interpretation is reserved to human beings. Some programs try to mimic this behaviour. For instance they say "this port is open" instead of "I received a SYN-ACK". Sometimes they are right. Sometimes not. It's easier for beginners, but when you know what you're doing, you keep on trying to deduce what really happened from the program's interpretation to make your own, which is hard because you lost a big amount of information. And you often end up using tcpdump -xX to decode and interpret what the tool missed.
++Second, they usually confuse decoding and interpreting. Machines are good at decoding and can help human beings with that. Interpretation is reserved to human beings. Some programs try to mimic this behaviour. For instance they say "this port is open" instead of "I received a SYN-ACK". Sometimes they are right. Sometimes not. It's easier for beginners, but when you know what you're doing, you keep on trying to deduce what really happened from the program's interpretation to make your own, which is hard because you lost a big amount of information. And you often end up using tcpdump \-xX to decode and interpret what the tool missed.
+
+ Third, even programs which only decode do not give you all the information they received. The network's vision they give you is the one their author thought was sufficient. But it is not complete, and you have a bias. For instance, do you know a tool that reports the padding ?
+
+@@ -66,7 +66,7 @@
+ .LP
+ Test the robustness of a network stack with invalid packets:
+ .nf
+-sr(IP(dst="172.16.1.1", ihl=2, options="\verb$\x02$", version=3)/ICMP())
++sr(IP(dst="172.16.1.1", ihl=2, options="0x02", version=3)/ICMP())
+ .fi
+
+ .LP
Added: packages/scapy/trunk/debian/patches/scapy.py.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/scapy/trunk/debian/patches/scapy.py.patch?rev=2461&op=file
==============================================================================
--- packages/scapy/trunk/debian/patches/scapy.py.patch (added)
+++ packages/scapy/trunk/debian/patches/scapy.py.patch Tue May 22 21:48:03 2007
@@ -1,0 +1,30 @@
+--- scapy.py.orig 2007-05-22 23:23:04.000000000 +0200
++++ scapy.py 2007-05-22 23:23:18.000000000 +0200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/env python
+
+ #############################################################################
+ ## ##
+@@ -169,7 +168,7 @@
+ raise
+
+ if not PCAP:
+- f = os.popen("tcpdump -V 2> /dev/null")
++ f = os.popen("/usr/sbin/tcpdump -V 2> /dev/null")
+ if f.close() >> 8 == 0x7f:
+ log_loading.warning("Failed to execute tcpdump. Check it is installed and in the PATH")
+ TCPDUMP=0
+@@ -11787,11 +11786,11 @@
+ return s[:-1]
+
+ class ProgPath(ConfClass):
+- pdfreader = "acroread"
++ pdfreader = "xpdf"
+ psreader = "gv"
+ dot = "dot"
+ display = "display"
+- tcpdump = "tcpdump"
++ tcpdump = "/usr/sbin/tcpdump"
+ hexedit = "hexer"
+ wireshark = "wireshark"
+
Added: packages/scapy/trunk/debian/patches/setup.py.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/scapy/trunk/debian/patches/setup.py.patch?rev=2461&op=file
==============================================================================
--- packages/scapy/trunk/debian/patches/setup.py.patch (added)
+++ packages/scapy/trunk/debian/patches/setup.py.patch Tue May 22 21:48:03 2007
@@ -1,0 +1,22 @@
+diff -Nur trunk/setup.py trunk.new/setup.py
+--- trunk/setup.py 1970-01-01 01:00:00.000000000 +0100
++++ trunk.new/setup.py 2007-05-15 00:38:03.000000000 +0200
+@@ -0,0 +1,18 @@
++from distutils.core import setup
++
++setup(name = 'scapy',
++ version = '1.1.1',
++ description = 'Packet generator/sniffer and network scanner.',
++ url = 'http://www.secdev.org/projects/scapy/',
++ download_url = 'http://www.secdev.org/projects/scapy/files/scapy.py',
++ author = 'Philippe Biondi',
++ author_email = '<phil at secdev.org>',
++ maintainer = 'David Villa Alises',
++ maintainer_email = 'David.Villa at uclm.es',
++ platforms = ['GNU/Linux', 'Unix', 'OpenBSD', 'FreeBSD', 'Mac OSX'],
++ keywords = 'network sniffer packet-forge',
++ license = 'GPL v2',
++ data_files = [('share/man/man1',['scapy.1'])],
++ scripts = ['scapy'],
++ py_modules = ['scapy'],
++ )
Modified: packages/scapy/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/scapy/trunk/debian/rules?rev=2461&op=diff
==============================================================================
--- packages/scapy/trunk/debian/rules (original)
+++ packages/scapy/trunk/debian/rules Tue May 22 21:48:03 2007
@@ -8,3 +8,6 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+clean::
+ -rm -rf build
Modified: packages/scapy/trunk/debian/watch
URL: http://svn.debian.org/wsvn/python-modules/packages/scapy/trunk/debian/watch?rev=2461&op=diff
==============================================================================
--- packages/scapy/trunk/debian/watch (original)
+++ packages/scapy/trunk/debian/watch Tue May 22 21:48:03 2007
@@ -1,2 +1,2 @@
version=3
-http://www.secdev.org/projects/scapy/all/scapy-([0-9.]*)\.py
+http://www.secdev.org/projects/scapy/files/scapy-(.*)\.tar\.gz
More information about the Python-modules-commits
mailing list