aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/wireshark/README6
-rw-r--r--network/wireshark/slack-desc2
-rw-r--r--network/wireshark/wireshark.SlackBuild2
-rw-r--r--network/wireshark/wireshark.info6
4 files changed, 11 insertions, 5 deletions
diff --git a/network/wireshark/README b/network/wireshark/README
index df4dae5664196..a690d6e4800f5 100644
--- a/network/wireshark/README
+++ b/network/wireshark/README
@@ -22,3 +22,9 @@ You will need to remove any already-installed wireshark package before
building this one or else the new one will not work (the new build will
link libraries present in the old package, which will then be removed
when upgrading).
+
+WARNING: Wireshark will not compile currently on a sysytem that has QT4 AND
+QT5 installed. The easiest way to fix this is to either 1) Build in a clean
+enviroment or 2) Remove QT5 temporarily while building Wirehark so it links
+properly against Slackware's own QT4.
+
diff --git a/network/wireshark/slack-desc b/network/wireshark/slack-desc
index 39a0f5bcb5873..3fc348587a310 100644
--- a/network/wireshark/slack-desc
+++ b/network/wireshark/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-wireshark: WireShark (packet sniffer and protocol analyzer)
+wireshark: wireshark (packet sniffer and protocol analyzer)
wireshark:
wireshark: Wireshark (aka Ethereal) is a free packet sniffer computer
wireshark: application. It is used for network troubleshooting, analysis,
diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild
index a867c86c6ab4a..58e1da659a520 100644
--- a/network/wireshark/wireshark.SlackBuild
+++ b/network/wireshark/wireshark.SlackBuild
@@ -26,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wireshark
-VERSION=${VERSION:-1.12.1}
+VERSION=${VERSION:-1.12.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info
index f8ecf8d2b21ce..fbef769df1fa1 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,8 +1,8 @@
PRGNAM="wireshark"
-VERSION="1.12.1"
+VERSION="1.12.2"
HOMEPAGE="http://www.wireshark.org/"
-DOWNLOAD="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-1.12.1.tar.bz2"
-MD5SUM="14b3e3d8979d1eb27ff085bb5f400e67"
+DOWNLOAD="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-1.12.2.tar.bz2"
+MD5SUM="2f2a16be8b087227cb17733c72288ae4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""