Date: Wednesday, September 11, 2013 @ 04:06:50 Author: eric Revision: 194226
archrelease: copy trunk to extra-i686, extra-x86_64 Added: wireshark/repos/extra-i686/PKGBUILD (from rev 194225, wireshark/trunk/PKGBUILD) wireshark/repos/extra-i686/wireshark-gtk.install (from rev 194225, wireshark/trunk/wireshark-gtk.install) wireshark/repos/extra-i686/wireshark.install (from rev 194225, wireshark/trunk/wireshark.install) wireshark/repos/extra-x86_64/PKGBUILD (from rev 194225, wireshark/trunk/PKGBUILD) wireshark/repos/extra-x86_64/wireshark-gtk.install (from rev 194225, wireshark/trunk/wireshark-gtk.install) wireshark/repos/extra-x86_64/wireshark.install (from rev 194225, wireshark/trunk/wireshark.install) Deleted: wireshark/repos/extra-i686/01_fix_pod_file.patch wireshark/repos/extra-i686/PKGBUILD wireshark/repos/extra-i686/wireshark-gtk.install wireshark/repos/extra-i686/wireshark.install wireshark/repos/extra-x86_64/01_fix_pod_file.patch wireshark/repos/extra-x86_64/PKGBUILD wireshark/repos/extra-x86_64/wireshark-gtk.install wireshark/repos/extra-x86_64/wireshark.install ------------------------------------+ /PKGBUILD | 148 +++++++++++++++++++++++++++++++++++ /wireshark-gtk.install | 24 +++++ /wireshark.install | 36 ++++++++ extra-i686/01_fix_pod_file.patch | 11 -- extra-i686/PKGBUILD | 78 ------------------ extra-i686/wireshark-gtk.install | 12 -- extra-i686/wireshark.install | 18 ---- extra-x86_64/01_fix_pod_file.patch | 11 -- extra-x86_64/PKGBUILD | 78 ------------------ extra-x86_64/wireshark-gtk.install | 12 -- extra-x86_64/wireshark.install | 18 ---- 11 files changed, 208 insertions(+), 238 deletions(-) Deleted: extra-i686/01_fix_pod_file.patch =================================================================== --- extra-i686/01_fix_pod_file.patch 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-i686/01_fix_pod_file.patch 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,11 +0,0 @@ ---- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435 -+++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436 -@@ -40,6 +40,8 @@ - When the B<-n> option is used, B<reordercap> will not write out the output - file if it finds that the input file is already in order. - -+=back -+ - =head1 SEE ALSO - - pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1), Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-i686/PKGBUILD 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,78 +0,0 @@ -# $Id$ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=('wireshark-cli' 'wireshark-gtk') -pkgbase=wireshark -pkgver=1.10.1 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL2') -makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua51' 'python') -url='http://www.wireshark.org/' -options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_fix_pod_file.patch) -sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc' - '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 <${srcdir}/01_fix_pod_file.patch - - ./autogen.sh - ./configure \ - --prefix=/usr \ - --with-ssl \ - --with-zlib=yes \ - --with-lua \ - --with-gtk3=yes - make all -} - -package_wireshark-cli() { - pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') - install=wireshark.install - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - #wireshark uid group is 150 - chgrp 150 "${pkgdir}/usr/bin/dumpcap" - chmod 754 "${pkgdir}/usr/bin/dumpcap" - rm "${pkgdir}/usr/bin/wireshark" - - # Headers - install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} - - install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" - for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do - install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} - done -} - -package_wireshark-gtk() { - pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' - depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') - install=wireshark-gtk.install - replaces=(wireshark) - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" - for d in 16 32 48; do - install -Dm644 image/hi${d}-app-wireshark.png \ - "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" - done - - for d in 16 24 32 48 64 128 256 ; do - install -Dm644 image/WiresharkDoc-${d}.png \ - "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png" - done - install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" -} Copied: wireshark/repos/extra-i686/PKGBUILD (from rev 194225, wireshark/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-09-11 02:06:50 UTC (rev 194226) @@ -0,0 +1,74 @@ +# $Id$ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=('wireshark-cli' 'wireshark-gtk') +pkgbase=wireshark +pkgver=1.10.2 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' + 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme') +url='http://www.wireshark.org/' +options=(!libtool) +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d') + +build() { + cd ${pkgbase}-${pkgver} + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --with-ssl \ + --with-zlib=yes \ + --with-lua \ + --with-gtk3=yes + make all +} + +package_wireshark-cli() { + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua') + install=wireshark.install + conflicts=(wireshark) + + cd ${pkgbase}-${pkgver} + + make DESTDIR="${pkgdir}" install + + #wireshark uid group is 150 + chgrp 150 "${pkgdir}/usr/bin/dumpcap" + chmod 754 "${pkgdir}/usr/bin/dumpcap" + rm "${pkgdir}/usr/bin/wireshark" + + # Headers + install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} + + install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" + for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do + install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d} + done +} + +package_wireshark-gtk() { + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' + depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + install=wireshark-gtk.install + replaces=(wireshark) + conflicts=(wireshark) + + cd ${pkgbase}-${pkgver} + + install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" + for d in 16 32 48; do + install -Dm644 image/hi${d}-app-wireshark.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + done + + for d in 16 24 32 48 64 128 256 ; do + install -Dm644 image/WiresharkDoc-${d}.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png" + done + install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" +} Deleted: extra-i686/wireshark-gtk.install =================================================================== --- extra-i686/wireshark-gtk.install 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-i686/wireshark-gtk.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: wireshark/repos/extra-i686/wireshark-gtk.install (from rev 194225, wireshark/trunk/wireshark-gtk.install) =================================================================== --- extra-i686/wireshark-gtk.install (rev 0) +++ extra-i686/wireshark-gtk.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/wireshark.install =================================================================== --- extra-i686/wireshark.install 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-i686/wireshark.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,18 +0,0 @@ -post_install() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap - echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" -} - -post_upgrade() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap -} - -post_remove() { - if /usr/bin/getent group wireshark >/dev/null 2>&1; then - /usr/sbin/groupdel wireshark - fi -} Copied: wireshark/repos/extra-i686/wireshark.install (from rev 194225, wireshark/trunk/wireshark.install) =================================================================== --- extra-i686/wireshark.install (rev 0) +++ extra-i686/wireshark.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -0,0 +1,18 @@ +post_install() { + getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" +} + +post_upgrade() { + getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap +} + +post_remove() { + if getent group wireshark >/dev/null 2>&1; then + groupdel wireshark + fi +} Deleted: extra-x86_64/01_fix_pod_file.patch =================================================================== --- extra-x86_64/01_fix_pod_file.patch 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-x86_64/01_fix_pod_file.patch 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,11 +0,0 @@ ---- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435 -+++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436 -@@ -40,6 +40,8 @@ - When the B<-n> option is used, B<reordercap> will not write out the output - file if it finds that the input file is already in order. - -+=back -+ - =head1 SEE ALSO - - pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1), Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-x86_64/PKGBUILD 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,78 +0,0 @@ -# $Id$ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=('wireshark-cli' 'wireshark-gtk') -pkgbase=wireshark -pkgver=1.10.1 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL2') -makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua51' 'python') -url='http://www.wireshark.org/' -options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_fix_pod_file.patch) -sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc' - '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 <${srcdir}/01_fix_pod_file.patch - - ./autogen.sh - ./configure \ - --prefix=/usr \ - --with-ssl \ - --with-zlib=yes \ - --with-lua \ - --with-gtk3=yes - make all -} - -package_wireshark-cli() { - pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') - install=wireshark.install - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - #wireshark uid group is 150 - chgrp 150 "${pkgdir}/usr/bin/dumpcap" - chmod 754 "${pkgdir}/usr/bin/dumpcap" - rm "${pkgdir}/usr/bin/wireshark" - - # Headers - install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} - - install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" - for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do - install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} - done -} - -package_wireshark-gtk() { - pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' - depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') - install=wireshark-gtk.install - replaces=(wireshark) - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" - for d in 16 32 48; do - install -Dm644 image/hi${d}-app-wireshark.png \ - "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" - done - - for d in 16 24 32 48 64 128 256 ; do - install -Dm644 image/WiresharkDoc-${d}.png \ - "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png" - done - install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" -} Copied: wireshark/repos/extra-x86_64/PKGBUILD (from rev 194225, wireshark/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-09-11 02:06:50 UTC (rev 194226) @@ -0,0 +1,74 @@ +# $Id$ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +pkgname=('wireshark-cli' 'wireshark-gtk') +pkgbase=wireshark +pkgver=1.10.2 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' + 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme') +url='http://www.wireshark.org/' +options=(!libtool) +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d') + +build() { + cd ${pkgbase}-${pkgver} + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --with-ssl \ + --with-zlib=yes \ + --with-lua \ + --with-gtk3=yes + make all +} + +package_wireshark-cli() { + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua') + install=wireshark.install + conflicts=(wireshark) + + cd ${pkgbase}-${pkgver} + + make DESTDIR="${pkgdir}" install + + #wireshark uid group is 150 + chgrp 150 "${pkgdir}/usr/bin/dumpcap" + chmod 754 "${pkgdir}/usr/bin/dumpcap" + rm "${pkgdir}/usr/bin/wireshark" + + # Headers + install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} + + install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" + for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do + install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d} + done +} + +package_wireshark-gtk() { + pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' + depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + install=wireshark-gtk.install + replaces=(wireshark) + conflicts=(wireshark) + + cd ${pkgbase}-${pkgver} + + install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" + for d in 16 32 48; do + install -Dm644 image/hi${d}-app-wireshark.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + done + + for d in 16 24 32 48 64 128 256 ; do + install -Dm644 image/WiresharkDoc-${d}.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png" + done + install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" +} Deleted: extra-x86_64/wireshark-gtk.install =================================================================== --- extra-x86_64/wireshark-gtk.install 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-x86_64/wireshark-gtk.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: wireshark/repos/extra-x86_64/wireshark-gtk.install (from rev 194225, wireshark/trunk/wireshark-gtk.install) =================================================================== --- extra-x86_64/wireshark-gtk.install (rev 0) +++ extra-x86_64/wireshark-gtk.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/wireshark.install =================================================================== --- extra-x86_64/wireshark.install 2013-09-11 02:05:42 UTC (rev 194225) +++ extra-x86_64/wireshark.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -1,18 +0,0 @@ -post_install() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap - echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" -} - -post_upgrade() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap -} - -post_remove() { - if /usr/bin/getent group wireshark >/dev/null 2>&1; then - /usr/sbin/groupdel wireshark - fi -} Copied: wireshark/repos/extra-x86_64/wireshark.install (from rev 194225, wireshark/trunk/wireshark.install) =================================================================== --- extra-x86_64/wireshark.install (rev 0) +++ extra-x86_64/wireshark.install 2013-09-11 02:06:50 UTC (rev 194226) @@ -0,0 +1,18 @@ +post_install() { + getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" +} + +post_upgrade() { + getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap +} + +post_remove() { + if getent group wireshark >/dev/null 2>&1; then + groupdel wireshark + fi +}