diff --git a/PKGBUILD b/PKGBUILD index 37a29dd..26e5a43 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,23 +4,27 @@ 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) +source=("http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz") md5sums=('d0dd58bbd6cd36795e05c6f1f74420b0') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --enable-ipv6 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + cd "$srcdir/$pkgname-$pkgver" + # do not install tcpdump-4.1.1 executable (FS#23346) + patch <"$startdir/tcpdump_duplicate_executable.patch" + ./configure --prefix=/usr \ + --enable-ipv6 + make +} - #install the license - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + #install the license + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/tcpdump_duplicate_executable.patch b/tcpdump_duplicate_executable.patch new file mode 100644 index 0000000..f1b0ca5 --- /dev/null +++ b/tcpdump_duplicate_executable.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.in b/Makefile.in +index 8e7b73b..fbc5d45 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -403,7 +403,6 @@ install: all + [ -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