diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-20 10:35:46 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-20 10:35:46 +0200 |
commit | 964dfed2669c05373815ba135efc563e313cf792 (patch) | |
tree | f4ccee9d34e51f3a53d7334f4fcec5bf2055a9f2 /extra/tcpdump | |
parent | 4f22a5c482279b73ed0140e8962f75169f9b3e57 (diff) | |
parent | 383955a81810f344e11b1472bd4c5069fa77020c (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/kvpnc/PKGBUILD
extra/bmp/PKGBUILD
extra/parted/PKGBUILD
extra/python-m2crypto/PKGBUILD
extra/vamp-plugin-sdk/PKGBUILD
extra/xsane/PKGBUILD
libre/syslinux/PKGBUILD
Diffstat (limited to 'extra/tcpdump')
-rw-r--r-- | extra/tcpdump/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/tcpdump/tcpdump_duplicate_executable.patch | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD index 171c06763..c7a65c864 100644 --- a/extra/tcpdump/PKGBUILD +++ b/extra/tcpdump/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184005 2013-04-30 18:42:55Z giovanni $ +# $Id: PKGBUILD 185812 2013-05-19 11:54:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=tcpdump pkgver=4.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for network monitoring and data acquisition" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org" @@ -13,7 +13,7 @@ depends=('libpcap' 'openssl') source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz" 'tcpdump_duplicate_executable.patch') md5sums=('6f75aabcffd012f73bd7c331bb5d8232' - '96c116e5ed51759a029bb6c236d63178') + '01379e4a12a208ce951c6c2abe80300f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,6 +22,7 @@ build() { patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-ipv6 make } diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch index bb3e60f1a..f3efb6d40 100644 --- a/extra/tcpdump/tcpdump_duplicate_executable.patch +++ b/extra/tcpdump/tcpdump_duplicate_executable.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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) |