[arch-commits] Commit in tcpdump/repos (8 files)

Giovanni Scafora giovanni at nymeria.archlinux.org
Sun May 19 11:54:46 UTC 2013


    Date: Sunday, May 19, 2013 @ 13:54:46
  Author: giovanni
Revision: 185812

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  tcpdump/repos/extra-i686/PKGBUILD
    (from rev 185811, tcpdump/trunk/PKGBUILD)
  tcpdump/repos/extra-i686/tcpdump_duplicate_executable.patch
    (from rev 185811, tcpdump/trunk/tcpdump_duplicate_executable.patch)
  tcpdump/repos/extra-x86_64/PKGBUILD
    (from rev 185811, tcpdump/trunk/PKGBUILD)
  tcpdump/repos/extra-x86_64/tcpdump_duplicate_executable.patch
    (from rev 185811, 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

-------------------------------------------------+
 /PKGBUILD                                       |   74 ++++++++++++++++++++++
 /tcpdump_duplicate_executable.patch             |   20 +++++
 extra-i686/PKGBUILD                             |   36 ----------
 extra-i686/tcpdump_duplicate_executable.patch   |   10 --
 extra-x86_64/PKGBUILD                           |   36 ----------
 extra-x86_64/tcpdump_duplicate_executable.patch |   10 --
 6 files changed, 94 insertions(+), 92 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-19 11:54:39 UTC (rev 185811)
+++ extra-i686/PKGBUILD	2013-05-19 11:54:46 UTC (rev 185812)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=tcpdump
-pkgver=4.4.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=('6f75aabcffd012f73bd7c331bb5d8232'
-         '96c116e5ed51759a029bb6c236d63178')
-
-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 185811, tcpdump/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-19 11:54:46 UTC (rev 185812)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=tcpdump
+pkgver=4.4.0
+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=('6f75aabcffd012f73bd7c331bb5d8232'
+         '01379e4a12a208ce951c6c2abe80300f')
+
+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 \
+              --sbindir=/usr/bin \
+              --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/tcpdump_duplicate_executable.patch
===================================================================
--- extra-i686/tcpdump_duplicate_executable.patch	2013-05-19 11:54:39 UTC (rev 185811)
+++ extra-i686/tcpdump_duplicate_executable.patch	2013-05-19 11:54:46 UTC (rev 185812)
@@ -1,10 +0,0 @@
---- a/Makefile.in	2012-06-12 18:56:20.000000000 +0200
-+++ b/Makefile.in	2012-06-13 08:41:09.000000000 +0200
-@@ -409,7 +409,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 185811, tcpdump/trunk/tcpdump_duplicate_executable.patch)
===================================================================
--- extra-i686/tcpdump_duplicate_executable.patch	                        (rev 0)
+++ extra-i686/tcpdump_duplicate_executable.patch	2013-05-19 11:54:46 UTC (rev 185812)
@@ -0,0 +1,10 @@
+--- a/Makefile.in	2013-03-24 22:49:18.000000000 +0100
++++ b/Makefile.in	2013-05-19 13:44:29.000000000 +0200
+@@ -326,7 +326,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	2013-05-19 11:54:39 UTC (rev 185811)
+++ extra-x86_64/PKGBUILD	2013-05-19 11:54:46 UTC (rev 185812)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=tcpdump
-pkgver=4.4.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=('6f75aabcffd012f73bd7c331bb5d8232'
-         '96c116e5ed51759a029bb6c236d63178')
-
-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 185811, tcpdump/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-19 11:54:46 UTC (rev 185812)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=tcpdump
+pkgver=4.4.0
+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=('6f75aabcffd012f73bd7c331bb5d8232'
+         '01379e4a12a208ce951c6c2abe80300f')
+
+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 \
+              --sbindir=/usr/bin \
+              --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/tcpdump_duplicate_executable.patch
===================================================================
--- extra-x86_64/tcpdump_duplicate_executable.patch	2013-05-19 11:54:39 UTC (rev 185811)
+++ extra-x86_64/tcpdump_duplicate_executable.patch	2013-05-19 11:54:46 UTC (rev 185812)
@@ -1,10 +0,0 @@
---- a/Makefile.in	2012-06-12 18:56:20.000000000 +0200
-+++ b/Makefile.in	2012-06-13 08:41:09.000000000 +0200
-@@ -409,7 +409,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 185811, tcpdump/trunk/tcpdump_duplicate_executable.patch)
===================================================================
--- extra-x86_64/tcpdump_duplicate_executable.patch	                        (rev 0)
+++ extra-x86_64/tcpdump_duplicate_executable.patch	2013-05-19 11:54:46 UTC (rev 185812)
@@ -0,0 +1,10 @@
+--- a/Makefile.in	2013-03-24 22:49:18.000000000 +0100
++++ b/Makefile.in	2013-05-19 13:44:29.000000000 +0200
+@@ -326,7 +326,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




More information about the arch-commits mailing list