8 files changed, 40 insertions, 47 deletions
diff --git a/network/loic/loic.SlackBuild b/network/LOIC/LOIC.SlackBuild
index 75da03349dd7..a328c7eda706 100644
--- a/network/loic/loic.SlackBuild
+++ b/network/LOIC/LOIC.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for loic
+# Slackware build script for LOIC
 
-# Copyright 2011  Chris Abela, Malta
+# Copyright 2012  Chris Abela, Malta
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,12 +28,12 @@
 # caught. This script is released for educational purposes only.              #
 ###############################################################################
 
-PRGNAM=loic
-VERSION=${VERSION:-v1.1.1.25}
-BUILD=${BUILD:-3}
+PRGNAM=LOIC  # This replaces the earlier "loic"
+VERSION=${VERSION:-1.0.7.42}  # The versioning scheme has changed
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=noarch # Leave this alone
+ARCH=noarch
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -43,37 +43,30 @@ OUTPUT=${OUTPUT:-/tmp}
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/opt $OUTPUT
+mkdir -p $TMP $PKG/opt/LOIC $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM.$VERSION.zip
+unzip $CWD/$PRGNAM-$VERSION-binary.zip
 chown -R root:root .
 
-## This broke for every monodevelop update,
-## so now it is not supported. Sorry!
-#if [ "$MONODEVELOP" = yes ] ;then
-#  mdtool -v build -f source/LOIC.sln
-#  cp -a source/bin/Debug $PKG/opt/loic
-#else
-  cp -a debug $PKG/opt/loic
-#fi
+cp -a LOIC.exe $PKG/opt/LOIC
 
-# This for GUI users
-mkdir -p $PKG/usr/share/applications
-cat $CWD/loic.desktop > $PKG/usr/share/applications/loic.desktop
+# This is for GUI users
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat $CWD/LOIC.desktop > $PKG/usr/share/applications/LOIC.desktop
 
 # This is a handy script for CLI users
 mkdir -p $PKG/usr/bin
 cat > $PKG/usr/bin/loic << EOF
 #!/bin/sh
-mono /opt/loic/LOIC.exe
+mono /opt/LOIC/LOIC.exe
 EOF
 chmod 755 $PKG/usr/bin/loic
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -m0644 -oroot README.TXT $CWD/README.WARNING $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 -oroot $CWD/README.WARNING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/loic/loic.desktop b/network/LOIC/LOIC.desktop
index 785e76fab321..b66fb18995db 100644
--- a/network/loic/loic.desktop
+++ b/network/LOIC/LOIC.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=LOIC
 Comment="Low Orbit Ion Cannon"
-Exec=mono /opt/loic/LOIC.exe
+Exec=mono /opt/LOIC/LOIC.exe
 Terminal=false
 Type=Application
 Categories=Network;
diff --git a/network/LOIC/LOIC.info b/network/LOIC/LOIC.info
new file mode 100644
index 000000000000..82b570bf9ce2
--- /dev/null
+++ b/network/LOIC/LOIC.info
@@ -0,0 +1,10 @@
+PRGNAM="LOIC"
+VERSION="1.0.7.42"
+HOMEPAGE="https://github.com/NewEraCracker/LOIC/"
+DOWNLOAD="http://sourceforge.net/projects/loic/files/loic/loic-1.0.7/LOIC-1.0.7.42-binary.zip"
+MD5SUM="08c62a8f40fb9432ea86f31d88917553"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="mono"
+MAINTAINER="Chris Abela"
+EMAIL="kristofru@gmail.com"
diff --git a/network/loic/README b/network/LOIC/README
index 980f39159f08..f6ccb67a39af 100644
--- a/network/loic/README
+++ b/network/LOIC/README
@@ -9,12 +9,12 @@ individuals, a DDoS attack) on a target site by flooding the server with TCP
 packets, UDP packets, or HTTP requests with the intention of disrupting the
 service of a particular host. People have used LOIC to join voluntary botnets.
 
-This SlackBuild simply builds a package from the binaries included in the
-source archive. 
+This SlackBuild simply builds a package from the binaries. If you would like
+to build it from source, you might want to consider loiq.
 
-mono is needed to run loic:
+mono is needed to run LOIC:
 
-  mono /opt/loic/LOIC.exe
+  mono /opt/LOIC/LOIC.exe
 
 A handy script /usr/bin/loic and a basic desktop integration file have been
 included for ease of use.
diff --git a/network/loic/README.WARNING b/network/LOIC/README.WARNING
index 871818be460b..871818be460b 100644
--- a/network/loic/README.WARNING
+++ b/network/LOIC/README.WARNING
diff --git a/network/loic/doinst.sh b/network/LOIC/doinst.sh
index 5fb28930db0b..5fb28930db0b 100644
--- a/network/loic/doinst.sh
+++ b/network/LOIC/doinst.sh
diff --git a/network/loic/slack-desc b/network/LOIC/slack-desc
index 1ca95b82a2b2..f6c3f58e8bc8 100644
--- a/network/loic/slack-desc
+++ b/network/LOIC/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-loic: LOIC (open source network attack application)
-loic:
-loic: LOIC is an open source network attack application, written in C#. LOIC
-loic: was initially developed by Praetox Technologies, but later it was
-loic: released into the public domain
-loic:
-loic: LOIC performs a denial-of-service (DoS) attack (or when used by multiple
-loic: individuals, a DDoS attack) on a target site by flooding the server with
-loic: TCP packets, UDP packets, or HTTP requests with the intention of
-loic: disrupting the service of a particular host. People have used LOIC to
-loic: join voluntary botnets.
+LOIC: LOIC (open source network attack application)
+LOIC:
+LOIC: LOIC is an open source network attack application, written in C#. LOIC
+LOIC: was initially developed by Praetox Technologies, but later it was
+LOIC: released into the public domain
+LOIC:
+LOIC: LOIC performs a denial-of-service (DoS) attack (or when used by multiple
+LOIC: individuals, a DDoS attack) on a target site by flooding the server with
+LOIC: TCP packets, UDP packets, or HTTP requests with the intention of
+LOIC: disrupting the service of a particular host. People have used LOIC to
+LOIC: join voluntary botnets.
diff --git a/network/loic/loic.info b/network/loic/loic.info
deleted file mode 100644
index 59e4bff4c9b6..000000000000
--- a/network/loic/loic.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="loic"
-VERSION="v1.1.1.25"
-HOMEPAGE="https://github.com/NewEraCracker/LOIC/"
-DOWNLOAD="https://github.com/downloads/NewEraCracker/LOIC/loic.v1.1.1.25.zip"
-MD5SUM="ae8fe2ec8064cb3f3e0765d2b6a8484e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="mono"
-MAINTAINER="Chris Abela"
-EMAIL="kristofru@gmail.com"