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

[Bartłomiej Piotrowski]

    Date: Friday, November 11, 2016 @ 17:14:43
  Author: bpiotrowski
Revision: 280554

upgpkg: tcpdump 4.8.1-1

new upstream release

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

------------------------------------+
 PKGBUILD                           |   32 ++++++++++++--------------------
 tcpdump_duplicate_executable.patch |   10 ----------
 2 files changed, 12 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-11 16:44:00 UTC (rev 280553)
+++ PKGBUILD	2016-11-11 17:14:43 UTC (rev 280554)
@@ -3,7 +3,7 @@
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=tcpdump
-pkgver=4.7.4
+pkgver=4.8.1
 pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
 arch=('i686' 'x86_64')
@@ -10,32 +10,24 @@
 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=('58af728de36f499341918fc4b8e827c3'
-         '01379e4a12a208ce951c6c2abe80300f')
+source=(http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz{,.sig})
+validpgpkeys=('1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D') # The Tcpdump Group
+sha256sums=('20e4341ec48fcf72abcae312ea913e6ba6b958617b2f3fb496d51f0ae88d831c'
+            'SKIP')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # do not install tcpdump-4.1.1 executable (FS#23346)
-  patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
-}
-
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr \
-              --sbindir=/usr/bin \
-              --enable-ipv6
+    --sbindir=/usr/bin \
+    --enable-ipv6
+
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  #install the license
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  rm -f "$pkgdir"/usr/bin/tcpdump.$pkgver
 }

Deleted: tcpdump_duplicate_executable.patch
===================================================================
--- tcpdump_duplicate_executable.patch	2016-11-11 16:44:00 UTC (rev 280553)
+++ tcpdump_duplicate_executable.patch	2016-11-11 17:14:43 UTC (rev 280554)
@@ -1,10 +0,0 @@
---- 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