[arch-commits] Commit in wireshark/repos (12 files)
Guillaume Alaux
guillaume at archlinux.org
Sun Jul 29 10:20:53 UTC 2012
Date: Sunday, July 29, 2012 @ 06:20:53
Author: guillaume
Revision: 164263
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wireshark/repos/extra-i686/PKGBUILD
(from rev 164262, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-i686/wireshark-gtk.install
(from rev 164262, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-i686/wireshark.install
(from rev 164262, wireshark/trunk/wireshark.install)
wireshark/repos/extra-x86_64/PKGBUILD
(from rev 164262, wireshark/trunk/PKGBUILD)
wireshark/repos/extra-x86_64/wireshark-gtk.install
(from rev 164262, wireshark/trunk/wireshark-gtk.install)
wireshark/repos/extra-x86_64/wireshark.install
(from rev 164262, wireshark/trunk/wireshark.install)
Deleted:
wireshark/repos/extra-i686/PKGBUILD
wireshark/repos/extra-i686/wireshark-gtk.install
wireshark/repos/extra-i686/wireshark.install
wireshark/repos/extra-x86_64/PKGBUILD
wireshark/repos/extra-x86_64/wireshark-gtk.install
wireshark/repos/extra-x86_64/wireshark.install
------------------------------------+
extra-i686/PKGBUILD | 140 ++++++++++++++++++-----------------
extra-i686/wireshark-gtk.install | 24 +++---
extra-i686/wireshark.install | 36 ++++-----
extra-x86_64/PKGBUILD | 140 ++++++++++++++++++-----------------
extra-x86_64/wireshark-gtk.install | 24 +++---
extra-x86_64/wireshark.install | 36 ++++-----
6 files changed, 206 insertions(+), 194 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-07-29 10:20:09 UTC (rev 164262)
+++ extra-i686/PKGBUILD 2012-07-29 10:20:53 UTC (rev 164263)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk')
-pkgbase=wireshark
-pkgver=1.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
- 'libgcrypt' 'lua' 'python')
-url="http://www.wireshark.org/"
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3eca81253800a0089d0f957e75853b05')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
- --with-lua
- 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' 'lua')
- 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 "${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=('gtk2' '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
- install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}
Copied: wireshark/repos/extra-i686/PKGBUILD (from rev 164262, wireshark/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-29 10:20:53 UTC (rev 164263)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-gtk')
+pkgbase=wireshark
+pkgver=1.8.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+ 'libgcrypt' 'lua' 'python')
+url="http://www.wireshark.org/"
+options=(!libtool)
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('629fe03f4a64eb8c7bd9308ee4e22e2e')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-ssl \
+ --with-zlib=yes \
+ --with-lua
+ 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' 'lua')
+ 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 "${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=('gtk2' '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"
+}
Deleted: extra-i686/wireshark-gtk.install
===================================================================
--- extra-i686/wireshark-gtk.install 2012-07-29 10:20:09 UTC (rev 164262)
+++ extra-i686/wireshark-gtk.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -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 164262, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- extra-i686/wireshark-gtk.install (rev 0)
+++ extra-i686/wireshark-gtk.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -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 2012-07-29 10:20:09 UTC (rev 164262)
+++ extra-i686/wireshark.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -1,18 +0,0 @@
-post_install() {
- getent group wireshark >/dev/null 2>&1 || usr/sbin/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 || usr/sbin/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
-}
Copied: wireshark/repos/extra-i686/wireshark.install (from rev 164262, wireshark/trunk/wireshark.install)
===================================================================
--- extra-i686/wireshark.install (rev 0)
+++ extra-i686/wireshark.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -0,0 +1,18 @@
+post_install() {
+ /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null
+
+ /usr/sbin/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/sbin/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
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-07-29 10:20:09 UTC (rev 164262)
+++ extra-x86_64/PKGBUILD 2012-07-29 10:20:53 UTC (rev 164263)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk')
-pkgbase=wireshark
-pkgver=1.8.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
- 'libgcrypt' 'lua' 'python')
-url="http://www.wireshark.org/"
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3eca81253800a0089d0f957e75853b05')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
- --with-lua
- 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' 'lua')
- 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 "${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=('gtk2' '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
- install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}
Copied: wireshark/repos/extra-x86_64/PKGBUILD (from rev 164262, wireshark/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-29 10:20:53 UTC (rev 164263)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-gtk')
+pkgbase=wireshark
+pkgver=1.8.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+ 'libgcrypt' 'lua' 'python')
+url="http://www.wireshark.org/"
+options=(!libtool)
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('629fe03f4a64eb8c7bd9308ee4e22e2e')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --with-ssl \
+ --with-zlib=yes \
+ --with-lua
+ 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' 'lua')
+ 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 "${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=('gtk2' '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"
+}
Deleted: extra-x86_64/wireshark-gtk.install
===================================================================
--- extra-x86_64/wireshark-gtk.install 2012-07-29 10:20:09 UTC (rev 164262)
+++ extra-x86_64/wireshark-gtk.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -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 164262, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- extra-x86_64/wireshark-gtk.install (rev 0)
+++ extra-x86_64/wireshark-gtk.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -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 2012-07-29 10:20:09 UTC (rev 164262)
+++ extra-x86_64/wireshark.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -1,18 +0,0 @@
-post_install() {
- getent group wireshark >/dev/null 2>&1 || usr/sbin/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 || usr/sbin/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
-}
Copied: wireshark/repos/extra-x86_64/wireshark.install (from rev 164262, wireshark/trunk/wireshark.install)
===================================================================
--- extra-x86_64/wireshark.install (rev 0)
+++ extra-x86_64/wireshark.install 2012-07-29 10:20:53 UTC (rev 164263)
@@ -0,0 +1,18 @@
+post_install() {
+ /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null
+
+ /usr/sbin/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/sbin/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
+}
More information about the arch-commits
mailing list