[arch-commits] Commit in tcpdump/trunk (3 files)

[Giovanni Scafora]

    Date: Monday, December 5, 2011 @ 07:07:51
  Author: giovanni
Revision: 144369

upgpkg: tcpdump 4.2.0-1

upstream release

Added:
  tcpdump/trunk/ppi.h
Modified:
  tcpdump/trunk/PKGBUILD
  tcpdump/trunk/tcpdump_duplicate_executable.patch

------------------------------------+
 PKGBUILD                           |   17 ++++++++++++-----
 ppi.h                              |    8 ++++++++
 tcpdump_duplicate_executable.patch |    6 +++---
 3 files changed, 23 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-05 12:06:36 UTC (rev 144368)
+++ PKGBUILD	2011-12-05 12:07:51 UTC (rev 144369)
@@ -3,23 +3,29 @@
 # Contributor: dorphell <dorphell at 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 @@
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 
   #install the license

Added: ppi.h
===================================================================
--- ppi.h	                        (rev 0)
+++ ppi.h	2011-12-05 12:07:51 UTC (rev 144369)
@@ -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

Modified: tcpdump_duplicate_executable.patch
===================================================================
--- tcpdump_duplicate_executable.patch	2011-12-05 12:06:36 UTC (rev 144368)
+++ tcpdump_duplicate_executable.patch	2011-12-05 12:07:51 UTC (rev 144369)
@@ -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)