summaryrefslogtreecommitdiff
path: root/extra/tcpdump
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-12-06 23:14:44 +0000
committerroot <root@rshg054.dnsready.net>2011-12-06 23:14:44 +0000
commitd1d87d2ac643e3dabc251f3cec7d3b00e29b282c (patch)
tree09d9025934fe06bd25753f98cf2eab3140456cc3 /extra/tcpdump
parent55d1e19e71b453a0f47c599f281a2ad2644247d2 (diff)
Tue Dec 6 23:14:44 UTC 2011
Diffstat (limited to 'extra/tcpdump')
-rw-r--r--extra/tcpdump/PKGBUILD19
-rw-r--r--extra/tcpdump/ppi.h8
-rw-r--r--extra/tcpdump/tcpdump_duplicate_executable.patch6
3 files changed, 24 insertions, 9 deletions
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index c6c455be5..3e9865440 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 117379 2011-04-01 00:46:15Z giovanni $
+# $Id: PKGBUILD 144370 2011-12-05 12:08:20Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=tcpdump
-pkgver=4.1.1
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
pkgdesc="A tool for network monitoring and data acquisition"
arch=('i686' 'x86_64')
url="http://www.tcpdump.org"
license=('BSD')
depends=('libpcap' 'openssl')
source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz"
- tcpdump_duplicate_executable.patch)
-md5sums=('d0dd58bbd6cd36795e05c6f1f74420b0'
- 'd4c374b25d10e41b77d2c72bb9ec0d79')
+ 'tcpdump_duplicate_executable.patch'
+ 'ppi.h')
+md5sums=('0296d4c487c3a156879783643704bd39'
+ 'b45c978dff8193ff5529d3566e7dbfa3'
+ 'd898c868bb730e14dbd2afd1ad883b87')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Add missing header file
+ cp ${srcdir}/ppi.h .
# do not install tcpdump-4.1.1 executable (FS#23346)
patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
+
./configure --prefix=/usr \
--enable-ipv6
make
@@ -27,6 +33,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
make DESTDIR="${pkgdir}" install
#install the license
diff --git a/extra/tcpdump/ppi.h b/extra/tcpdump/ppi.h
new file mode 100644
index 000000000..be7f5f02e
--- /dev/null
+++ b/extra/tcpdump/ppi.h
@@ -0,0 +1,8 @@
+typedef struct ppi_header {
+uint8_t ppi_ver;
+uint8_t ppi_flags;
+uint16_t ppi_len;
+uint32_t ppi_dlt;
+} ppi_header_t;
+
+#define PPI_HDRLEN 8
diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch
index 6e27b717a..705983ccc 100644
--- a/extra/tcpdump/tcpdump_duplicate_executable.patch
+++ b/extra/tcpdump/tcpdump_duplicate_executable.patch
@@ -1,6 +1,6 @@
---- a/Makefile.in 2010-04-06 03:18:35.000000000 +0200
-+++ b/Makefile.in 2011-04-01 02:39:10.000000000 +0200
-@@ -403,7 +403,6 @@
+--- a/Makefile.in 2011-07-24 22:58:55.000000000 +0200
++++ b/Makefile.in 2011-12-05 12:59:23.000000000 +0100
+@@ -399,7 +399,6 @@
[ -d $(DESTDIR)$(sbindir) ] || \
(mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)