Date: Tuesday, August 26, 2014 @ 17:10:46 Author: fyan Revision: 117916
archrelease: copy trunk to community-i686, community-x86_64 Added: tcpflow/repos/community-i686/FS41697.patch (from rev 117915, tcpflow/trunk/FS41697.patch) tcpflow/repos/community-i686/PKGBUILD (from rev 117915, tcpflow/trunk/PKGBUILD) tcpflow/repos/community-x86_64/FS41697.patch (from rev 117915, tcpflow/trunk/FS41697.patch) tcpflow/repos/community-x86_64/PKGBUILD (from rev 117915, tcpflow/trunk/PKGBUILD) Deleted: tcpflow/repos/community-i686/PKGBUILD tcpflow/repos/community-x86_64/PKGBUILD --------------------------------+ /PKGBUILD | 96 +++++++++++++++++++++++++++++++++++++++ community-i686/FS41697.patch | 11 ++++ community-i686/PKGBUILD | 44 ----------------- community-x86_64/FS41697.patch | 11 ++++ community-x86_64/PKGBUILD | 44 ----------------- 5 files changed, 118 insertions(+), 88 deletions(-) Copied: tcpflow/repos/community-i686/FS41697.patch (from rev 117915, tcpflow/trunk/FS41697.patch) =================================================================== --- community-i686/FS41697.patch (rev 0) +++ community-i686/FS41697.patch 2014-08-26 15:10:46 UTC (rev 117916) @@ -0,0 +1,11 @@ +--- a/src/tcpip.cpp ++++ b/src/tcpip.cpp +@@ -262,7 +262,7 @@ void tcpip::print_packet(const u_char *d + else if(demux.opt.output_strip_nonprint){ + for(const u_char *cc = data;cc<data+length;cc++){ + if(isprint(*cc) || (*cc=='\n') || (*cc=='\r')){ +- written += fputc(*cc,stdout); ++ written += (fputc(*cc,stdout)!=EOF); + } + } + } Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-08-26 15:10:15 UTC (rev 117915) +++ community-i686/PKGBUILD 2014-08-26 15:10:46 UTC (rev 117916) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: Chris Brannon <cmbranno...@gmail.com> -# Contributor: Jeff Mickey <j...@archlinux.org> - -pkgname=tcpflow -pkgver=1.4.4 -pkgrel=1 -pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" -arch=('i686' 'x86_64') -url="http://afflib.org/software/tcpflow" -license=('GPL') -depends=('libpcap' 'cairo') -makedepends=('git' 'boost') -source=("git+https://github.com/simsong/$pkgname.git#tag=$pkgname-$pkgver" - 'git+https://github.com/simsong/be13_api.git' - 'git+https://github.com/simsong/dfxml.git' - 'git+https://github.com/joyent/http-parser.git') -md5sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP') - -prepare() { - cd $pkgname - git submodule init - git config submodule."src/be13_api".url "$srcdir/be13_api" - git config submodule."src/dfxml".url "$srcdir/dfxml" - git config submodule."src/http-parser".url "$srcdir/http-parser" - git submodule update -} - -build() { - cd $pkgname - sh bootstrap.sh - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd $pkgname - make DESTDIR="$pkgdir" install -} - Copied: tcpflow/repos/community-i686/PKGBUILD (from rev 117915, tcpflow/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-08-26 15:10:46 UTC (rev 117916) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: Chris Brannon <cmbranno...@gmail.com> +# Contributor: Jeff Mickey <j...@archlinux.org> + +pkgname=tcpflow +pkgver=1.4.4 +pkgrel=2 +pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" +arch=('i686' 'x86_64') +url="http://afflib.org/software/tcpflow" +license=('GPL') +depends=('libpcap' 'cairo') +makedepends=('git' 'boost') +source=("git+https://github.com/simsong/$pkgname.git#tag=$pkgname-$pkgver" + 'git+https://github.com/simsong/be13_api.git' + 'git+https://github.com/simsong/dfxml.git' + 'git+https://github.com/joyent/http-parser.git' + 'FS41697.patch') +md5sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'b4e66e456beffe28414e55fee913a84c') + +prepare() { + cd $pkgname + git submodule init + git config submodule."src/be13_api".url "$srcdir/be13_api" + git config submodule."src/dfxml".url "$srcdir/dfxml" + git config submodule."src/http-parser".url "$srcdir/http-parser" + git submodule update + + patch -p1 -i ../FS41697.patch +} + +build() { + cd $pkgname + sh bootstrap.sh + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} + Copied: tcpflow/repos/community-x86_64/FS41697.patch (from rev 117915, tcpflow/trunk/FS41697.patch) =================================================================== --- community-x86_64/FS41697.patch (rev 0) +++ community-x86_64/FS41697.patch 2014-08-26 15:10:46 UTC (rev 117916) @@ -0,0 +1,11 @@ +--- a/src/tcpip.cpp ++++ b/src/tcpip.cpp +@@ -262,7 +262,7 @@ void tcpip::print_packet(const u_char *d + else if(demux.opt.output_strip_nonprint){ + for(const u_char *cc = data;cc<data+length;cc++){ + if(isprint(*cc) || (*cc=='\n') || (*cc=='\r')){ +- written += fputc(*cc,stdout); ++ written += (fputc(*cc,stdout)!=EOF); + } + } + } Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-08-26 15:10:15 UTC (rev 117915) +++ community-x86_64/PKGBUILD 2014-08-26 15:10:46 UTC (rev 117916) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: Chris Brannon <cmbranno...@gmail.com> -# Contributor: Jeff Mickey <j...@archlinux.org> - -pkgname=tcpflow -pkgver=1.4.4 -pkgrel=1 -pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" -arch=('i686' 'x86_64') -url="http://afflib.org/software/tcpflow" -license=('GPL') -depends=('libpcap' 'cairo') -makedepends=('git' 'boost') -source=("git+https://github.com/simsong/$pkgname.git#tag=$pkgname-$pkgver" - 'git+https://github.com/simsong/be13_api.git' - 'git+https://github.com/simsong/dfxml.git' - 'git+https://github.com/joyent/http-parser.git') -md5sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP') - -prepare() { - cd $pkgname - git submodule init - git config submodule."src/be13_api".url "$srcdir/be13_api" - git config submodule."src/dfxml".url "$srcdir/dfxml" - git config submodule."src/http-parser".url "$srcdir/http-parser" - git submodule update -} - -build() { - cd $pkgname - sh bootstrap.sh - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd $pkgname - make DESTDIR="$pkgdir" install -} - Copied: tcpflow/repos/community-x86_64/PKGBUILD (from rev 117915, tcpflow/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-08-26 15:10:46 UTC (rev 117916) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: Chris Brannon <cmbranno...@gmail.com> +# Contributor: Jeff Mickey <j...@archlinux.org> + +pkgname=tcpflow +pkgver=1.4.4 +pkgrel=2 +pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" +arch=('i686' 'x86_64') +url="http://afflib.org/software/tcpflow" +license=('GPL') +depends=('libpcap' 'cairo') +makedepends=('git' 'boost') +source=("git+https://github.com/simsong/$pkgname.git#tag=$pkgname-$pkgver" + 'git+https://github.com/simsong/be13_api.git' + 'git+https://github.com/simsong/dfxml.git' + 'git+https://github.com/joyent/http-parser.git' + 'FS41697.patch') +md5sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'b4e66e456beffe28414e55fee913a84c') + +prepare() { + cd $pkgname + git submodule init + git config submodule."src/be13_api".url "$srcdir/be13_api" + git config submodule."src/dfxml".url "$srcdir/dfxml" + git config submodule."src/http-parser".url "$srcdir/http-parser" + git submodule update + + patch -p1 -i ../FS41697.patch +} + +build() { + cd $pkgname + sh bootstrap.sh + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} +