[arch-commits] Commit in tcpdump/trunk (PKGBUILD tcpdump_duplicate_executable.patch)

[Giovanni Scafora]

    Date: Thursday, March 31, 2011 @ 20:46:15
  Author: giovanni
Revision: 117379

upgpkg: tcpdump 4.1.1-2
Fixed duplicate executable FS23346

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

------------------------------------+
 PKGBUILD                           |   20 ++++++++++++++------
 tcpdump_duplicate_executable.patch |   10 ++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-31 21:49:57 UTC (rev 117378)
+++ PKGBUILD	2011-04-01 00:46:15 UTC (rev 117379)
@@ -4,23 +4,31 @@
 
 pkgname=tcpdump
 pkgver=4.1.1
-pkgrel=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)
-md5sums=('d0dd58bbd6cd36795e05c6f1f74420b0')
+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 || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
   #install the license
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Added: tcpdump_duplicate_executable.patch
===================================================================
--- tcpdump_duplicate_executable.patch	                        (rev 0)
+++ tcpdump_duplicate_executable.patch	2011-04-01 00:46:15 UTC (rev 117379)
@@ -0,0 +1,10 @@
+--- 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