[arch-commits] Commit in wireshark/trunk (3 files)

Eli Schwartz eschwartz at archlinux.org
Tue Jan 9 03:56:05 UTC 2018


    Date: Tuesday, January 9, 2018 @ 03:56:04
  Author: eschwartz
Revision: 280635

upgpkg: wireshark 2.4.3-2

migrate to systemd-sysusers

Added:
  wireshark/trunk/wireshark.sysusers
Modified:
  wireshark/trunk/PKGBUILD
  wireshark/trunk/wireshark.install

--------------------+
 PKGBUILD           |    5 ++++-
 wireshark.install  |    4 +---
 wireshark.sysusers |    1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-09 03:52:26 UTC (rev 280634)
+++ PKGBUILD	2018-01-09 03:56:04 UTC (rev 280635)
@@ -6,7 +6,7 @@
 pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
 pkgbase=wireshark
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('GPL2')
 makedepends=('c-ares' 'geoip' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
@@ -14,8 +14,10 @@
 options=('!emptydirs')
 url='https://www.wireshark.org/'
 source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
+        wireshark.sysusers
         do_not_use_svn_version.patch)
 sha256sums=('189495996b68940626cb53b31c8902fa1bb5a96b61217cea42734c13925ff12e'
+            'df07748152443c7d727bd51cd57af950c345b7141986b4f0e476cd6aa3623ac4'
             '3981bb46f592e319f9c679c5e215ae0af828044a3b64d49d2cf0305ecacf4691')
 
 prepare() {
@@ -56,6 +58,7 @@
   make DESTDIR="${pkgdir}" uninstall-local
 
   # wireshark uid group is 150
+  install -Dm644 "${srcdir}/wireshark.sysusers" "${pkgdir}/usr/lib/sysusers.d/wireshark.conf"
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
   rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"

Modified: wireshark.install
===================================================================
--- wireshark.install	2018-01-09 03:52:26 UTC (rev 280634)
+++ wireshark.install	2018-01-09 03:56:04 UTC (rev 280635)
@@ -1,10 +1,8 @@
 post_install() {
-	post_upgrade
+    post_upgrade
     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 CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
 }

Added: wireshark.sysusers
===================================================================
--- wireshark.sysusers	                        (rev 0)
+++ wireshark.sysusers	2018-01-09 03:56:04 UTC (rev 280635)
@@ -0,0 +1 @@
+g wireshark 150 - -



More information about the arch-commits mailing list