Date: Tuesday, January 3, 2012 @ 14:57:08 Author: giovanni Revision: 145890
archrelease: copy trunk to extra-i686, extra-x86_64 Added: tcpdump/repos/extra-i686/PKGBUILD (from rev 145889, tcpdump/trunk/PKGBUILD) tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch (from rev 145889, tcpdump/trunk/tcpdump_duplicate_executable.patch) tcpdump/repos/extra-x86_64/PKGBUILD (from rev 145889, tcpdump/trunk/PKGBUILD) tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch (from rev 145889, tcpdump/trunk/tcpdump_duplicate_executable.patch) Deleted: tcpdump/repos/extra-i686/PKGBUILD tcpdump/repos/extra-i686/ppi.h tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch tcpdump/repos/extra-x86_64/PKGBUILD tcpdump/repos/extra-x86_64/ppi.h tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch -------------------------------------------------+ extra-i686/PKGBUILD | 77 ++++++++++------------ extra-i686/ppi.h | 8 -- extra-i686/tcpdump_duplicate_executable.patch | 20 ++--- extra-x86_64/PKGBUILD | 77 ++++++++++------------ extra-x86_64/ppi.h | 8 -- extra-x86_64/tcpdump_duplicate_executable.patch | 20 ++--- 6 files changed, 92 insertions(+), 118 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-01-03 19:56:44 UTC (rev 145889) +++ extra-i686/PKGBUILD 2012-01-03 19:57:08 UTC (rev 145890) @@ -1,41 +0,0 @@ -# $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/PKGBUILD (from rev 145889, tcpdump/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-01-03 19:57:08 UTC (rev 145890) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=tcpdump +pkgver=4.2.1 +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=('c202878c6db054767b52651041b9e60e' + 'b45c978dff8193ff5529d3566e7dbfa3') + +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" +} Deleted: extra-i686/ppi.h =================================================================== --- extra-i686/ppi.h 2012-01-03 19:56:44 UTC (rev 145889) +++ extra-i686/ppi.h 2012-01-03 19:57:08 UTC (rev 145890) @@ -1,8 +0,0 @@ -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 2012-01-03 19:56:44 UTC (rev 145889) +++ extra-i686/tcpdump_duplicate_executable.patch 2012-01-03 19:57:08 UTC (rev 145890) @@ -1,10 +0,0 @@ ---- 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 Copied: tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch (from rev 145889, tcpdump/trunk/tcpdump_duplicate_executable.patch) =================================================================== --- extra-i686/tcpdump_duplicate_executable.patch (rev 0) +++ extra-i686/tcpdump_duplicate_executable.patch 2012-01-03 19:57:08 UTC (rev 145890) @@ -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 2012-01-03 19:56:44 UTC (rev 145889) +++ extra-x86_64/PKGBUILD 2012-01-03 19:57:08 UTC (rev 145890) @@ -1,41 +0,0 @@ -# $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/PKGBUILD (from rev 145889, tcpdump/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-01-03 19:57:08 UTC (rev 145890) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=tcpdump +pkgver=4.2.1 +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=('c202878c6db054767b52651041b9e60e' + 'b45c978dff8193ff5529d3566e7dbfa3') + +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" +} Deleted: extra-x86_64/ppi.h =================================================================== --- extra-x86_64/ppi.h 2012-01-03 19:56:44 UTC (rev 145889) +++ extra-x86_64/ppi.h 2012-01-03 19:57:08 UTC (rev 145890) @@ -1,8 +0,0 @@ -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 2012-01-03 19:56:44 UTC (rev 145889) +++ extra-x86_64/tcpdump_duplicate_executable.patch 2012-01-03 19:57:08 UTC (rev 145890) @@ -1,10 +0,0 @@ ---- 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 Copied: tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch (from rev 145889, tcpdump/trunk/tcpdump_duplicate_executable.patch) =================================================================== --- extra-x86_64/tcpdump_duplicate_executable.patch (rev 0) +++ extra-x86_64/tcpdump_duplicate_executable.patch 2012-01-03 19:57:08 UTC (rev 145890) @@ -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