Date: Monday, December 5, 2011 @ 07:08:20 Author: giovanni Revision: 144370
archrelease: copy trunk to extra-i686, extra-x86_64 Added: tcpdump/repos/extra-i686/PKGBUILD (from rev 144369, tcpdump/trunk/PKGBUILD) tcpdump/repos/extra-i686/ppi.h (from rev 144369, tcpdump/trunk/ppi.h) tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch (from rev 144369, tcpdump/trunk/tcpdump_duplicate_executable.patch) tcpdump/repos/extra-x86_64/PKGBUILD (from rev 144369, tcpdump/trunk/PKGBUILD) tcpdump/repos/extra-x86_64/ppi.h (from rev 144369, tcpdump/trunk/ppi.h) tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch (from rev 144369, tcpdump/trunk/tcpdump_duplicate_executable.patch) Deleted: tcpdump/repos/extra-i686/PKGBUILD tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch tcpdump/repos/extra-x86_64/PKGBUILD tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch -------------------------------------------------+ extra-i686/PKGBUILD | 75 ++++++++++++---------- extra-i686/ppi.h | 8 ++ extra-i686/tcpdump_duplicate_executable.patch | 20 ++--- extra-x86_64/PKGBUILD | 75 ++++++++++++---------- extra-x86_64/ppi.h | 8 ++ extra-x86_64/tcpdump_duplicate_executable.patch | 20 ++--- 6 files changed, 118 insertions(+), 88 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-12-05 12:07:51 UTC (rev 144369) +++ extra-i686/PKGBUILD 2011-12-05 12:08:20 UTC (rev 144370) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=tcpdump -pkgver=4.1.1 -pkgrel=2 -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') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # do not install tcpdump-4.1.1 executable (FS#23346) - patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch" - ./configure --prefix=/usr \ - --enable-ipv6 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - #install the license - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: tcpdump/repos/extra-i686/PKGBUILD (from rev 144369, tcpdump/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-12-05 12:08:20 UTC (rev 144370) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=tcpdump +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' + '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 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + #install the license + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: tcpdump/repos/extra-i686/ppi.h (from rev 144369, tcpdump/trunk/ppi.h) =================================================================== --- extra-i686/ppi.h (rev 0) +++ extra-i686/ppi.h 2011-12-05 12:08:20 UTC (rev 144370) @@ -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 Deleted: extra-i686/tcpdump_duplicate_executable.patch =================================================================== --- extra-i686/tcpdump_duplicate_executable.patch 2011-12-05 12:07:51 UTC (rev 144369) +++ extra-i686/tcpdump_duplicate_executable.patch 2011-12-05 12:08:20 UTC (rev 144370) @@ -1,10 +0,0 @@ ---- 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 @@ - [ -d $(DESTDIR)$(sbindir) ] || \ - (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) - $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) -- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION` - [ -d $(DESTDIR)$(mandir)/man1 ] || \ - (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1) - $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 Copied: tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch (from rev 144369, tcpdump/trunk/tcpdump_duplicate_executable.patch) =================================================================== --- extra-i686/tcpdump_duplicate_executable.patch (rev 0) +++ extra-i686/tcpdump_duplicate_executable.patch 2011-12-05 12:08:20 UTC (rev 144370) @@ -0,0 +1,10 @@ +--- 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) +- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION` + [ -d $(DESTDIR)$(mandir)/man1 ] || \ + (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1) + $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-12-05 12:07:51 UTC (rev 144369) +++ extra-x86_64/PKGBUILD 2011-12-05 12:08:20 UTC (rev 144370) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=tcpdump -pkgver=4.1.1 -pkgrel=2 -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') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # do not install tcpdump-4.1.1 executable (FS#23346) - patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch" - ./configure --prefix=/usr \ - --enable-ipv6 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - #install the license - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: tcpdump/repos/extra-x86_64/PKGBUILD (from rev 144369, tcpdump/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-12-05 12:08:20 UTC (rev 144370) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=tcpdump +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' + '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 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + #install the license + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: tcpdump/repos/extra-x86_64/ppi.h (from rev 144369, tcpdump/trunk/ppi.h) =================================================================== --- extra-x86_64/ppi.h (rev 0) +++ extra-x86_64/ppi.h 2011-12-05 12:08:20 UTC (rev 144370) @@ -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 Deleted: extra-x86_64/tcpdump_duplicate_executable.patch =================================================================== --- extra-x86_64/tcpdump_duplicate_executable.patch 2011-12-05 12:07:51 UTC (rev 144369) +++ extra-x86_64/tcpdump_duplicate_executable.patch 2011-12-05 12:08:20 UTC (rev 144370) @@ -1,10 +0,0 @@ ---- 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 @@ - [ -d $(DESTDIR)$(sbindir) ] || \ - (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) - $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) -- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION` - [ -d $(DESTDIR)$(mandir)/man1 ] || \ - (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1) - $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1 Copied: tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch (from rev 144369, tcpdump/trunk/tcpdump_duplicate_executable.patch) =================================================================== --- extra-x86_64/tcpdump_duplicate_executable.patch (rev 0) +++ extra-x86_64/tcpdump_duplicate_executable.patch 2011-12-05 12:08:20 UTC (rev 144370) @@ -0,0 +1,10 @@ +--- 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) +- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION` + [ -d $(DESTDIR)$(mandir)/man1 ] || \ + (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1) + $(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1