Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/haskell-stm/PKGBUILD
	community-staging/haskell-syb/PKGBUILD
	community/cantata/PKGBUILD
	community/linux-tools/PKGBUILD
	community/python-pymongo/PKGBUILD
	core/less/PKGBUILD
	extra/alsa-plugins/PKGBUILD
	extra/avfs/PKGBUILD
	extra/cups/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdemultimedia-mplayerthumbs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mysql/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vim/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	multilib/lib32-alsa-lib/PKGBUILD
	multilib/lib32-alsa-plugins/PKGBUILD
	multilib/lib32-fontconfig/PKGBUILD
	staging/ghc/PKGBUILD
	staging/ghc/build.mk
	staging/haskell-http/PKGBUILD
	staging/haskell-mtl/PKGBUILD
	staging/haskell-network/PKGBUILD
	staging/haskell-parsec/PKGBUILD
	staging/haskell-random/PKGBUILD
	staging/haskell-text/PKGBUILD
	staging/haskell-transformers/PKGBUILD
	staging/haskell-zlib/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/coreutils/coreutils.install
	testing/dhcpcd/PKGBUILD
	testing/kactivities/PKGBUILD
	testing/kdeaccessibility-jovie/PKGBUILD
	testing/kdeaccessibility-kaccessible/PKGBUILD
	testing/kdeaccessibility-kmag/PKGBUILD
	testing/kdeaccessibility-kmousetool/PKGBUILD
	testing/kdeaccessibility-kmouth/PKGBUILD
	testing/kdeadmin/PKGBUILD
	testing/kdeartwork/PKGBUILD
	testing/kdebase-konsole/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase/PKGBUILD
	testing/kdebindings-kimono/PKGBUILD
	testing/kdebindings-korundum/PKGBUILD
	testing/kdebindings-kross/PKGBUILD
	testing/kdebindings-perlkde/PKGBUILD
	testing/kdebindings-perlqt/PKGBUILD
	testing/kdebindings-python/PKGBUILD
	testing/kdebindings-qtruby/PKGBUILD
	testing/kdebindings-qyoto/PKGBUILD
	testing/kdebindings-smokegen/PKGBUILD
	testing/kdebindings-smokekde/PKGBUILD
	testing/kdebindings-smokeqt/PKGBUILD
	testing/kdeedu-analitza/PKGBUILD
	testing/kdeedu-blinken/PKGBUILD
	testing/kdeedu-cantor/PKGBUILD
	testing/kdeedu-kalgebra/PKGBUILD
	testing/kdeedu-kalzium/PKGBUILD
	testing/kdeedu-kanagram/PKGBUILD
	testing/kdeedu-kbruch/PKGBUILD
	testing/kdeedu-kgeography/PKGBUILD
	testing/kdeedu-khangman/PKGBUILD
	testing/kdeedu-kig/PKGBUILD
	testing/kdeedu-kiten/PKGBUILD
	testing/kdeedu-klettres/PKGBUILD
	testing/kdeedu-kmplot/PKGBUILD
	testing/kdeedu-kstars/PKGBUILD
	testing/kdeedu-ktouch/PKGBUILD
	testing/kdeedu-kturtle/PKGBUILD
	testing/kdeedu-kwordquiz/PKGBUILD
	testing/kdeedu-marble/PKGBUILD
	testing/kdeedu-pairs/PKGBUILD
	testing/kdeedu-parley/PKGBUILD
	testing/kdeedu-rocs/PKGBUILD
	testing/kdeedu-step/PKGBUILD
	testing/kdegames/PKGBUILD
	testing/kdegraphics-gwenview/PKGBUILD
	testing/kdegraphics-kamera/PKGBUILD
	testing/kdegraphics-kcolorchooser/PKGBUILD
	testing/kdegraphics-kgamma/PKGBUILD
	testing/kdegraphics-kolourpaint/PKGBUILD
	testing/kdegraphics-kruler/PKGBUILD
	testing/kdegraphics-ksaneplugin/PKGBUILD
	testing/kdegraphics-ksnapshot/PKGBUILD
	testing/kdegraphics-mobipocket/PKGBUILD
	testing/kdegraphics-okular/PKGBUILD
	testing/kdegraphics-strigi-analyzer/PKGBUILD
	testing/kdegraphics-svgpart/PKGBUILD
	testing/kdegraphics-thumbnailers/PKGBUILD
	testing/kdemultimedia-audiocd-kio/PKGBUILD
	testing/kdemultimedia-dragonplayer/PKGBUILD
	testing/kdemultimedia-ffmpegthumbs/PKGBUILD
	testing/kdemultimedia-juk/PKGBUILD
	testing/kdemultimedia-kmix/PKGBUILD
	testing/kdemultimedia-kscd/PKGBUILD
	testing/kdemultimedia-mplayerthumbs/PKGBUILD
	testing/kdenetwork/PKGBUILD
	testing/kdepim-runtime/PKGBUILD
	testing/kdepim/PKGBUILD
	testing/kdepimlibs/PKGBUILD
	testing/kdeplasma-addons/PKGBUILD
	testing/kdesdk-kate/PKGBUILD
	testing/kdesdk/PKGBUILD
	testing/kdetoys/PKGBUILD
	testing/kdeutils-filelight/PKGBUILD
	testing/kdeutils-kcalc/PKGBUILD
	testing/kdeutils-kcharselect/PKGBUILD
	testing/kdeutils-kdf/PKGBUILD
	testing/kdeutils-kfloppy/PKGBUILD
	testing/kdeutils-kgpg/PKGBUILD
	testing/kdeutils-kremotecontrol/PKGBUILD
	testing/kdeutils-ktimer/PKGBUILD
	testing/kdeutils-kwallet/PKGBUILD
	testing/kdeutils-superkaramba/PKGBUILD
	testing/kdeutils-sweeper/PKGBUILD
	testing/kdewebdev/PKGBUILD
	testing/kmod/PKGBUILD
	testing/libkcddb/PKGBUILD
	testing/libkcompactdisc/PKGBUILD
	testing/libkdcraw/PKGBUILD
	testing/libkdeedu/PKGBUILD
	testing/libkexiv2/PKGBUILD
	testing/libkipi/PKGBUILD
	testing/libksane/PKGBUILD
	testing/libmpc/PKGBUILD
	testing/nepomuk-core/PKGBUILD
	testing/procps-ng/PKGBUILD
	testing/sudo/PKGBUILD
	testing/sysvinit/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

3 files changed, 31 insertions, 12 deletions

diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index 405321d03..ab0dd4bd3 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 55676 2011-09-17 17:07:50Z spupykin $
+# $Id: PKGBUILD 75998 2012-09-08 15:38:53Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=sshguard
 pkgver=1.5
-pkgrel=3
+pkgrel=5
 pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64' 'mips64el')
 #url="http://sourceforge.net/projects/sshguard/"
@@ -15,25 +16,31 @@ options=(zipman)
 install=sshguard.install
 source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2"
 	sshguard.rc
-	sshguard.conf.d)
-md5sums=('11b9f47f9051e25bdfe84a365c961ec1'
-         '07bffbbfbf452d09cda10a1bab8cc03b'
-         '1dc6604975d3cd51321a8ad7cd53947c')
+	sshguard.conf.d
+	sshguard.service
+	sshguard-journalctl)
+sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
+            'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e'
+            '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3'
+            '299b5f73e4c53aac6007c87210fc862987042b9d4c088180721bae6ab2214b09'
+            '385d1dea0c6f5495a7c7e5051f1354f1eab85ee5ef599f6698ab353263b8c9bb')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --with-firewall=iptables
   make
 }
 
 check() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   strings src/sshguard | grep -E "^`which iptables`[[:space:]]" >/dev/null
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-  install -Dm0755 $srcdir/sshguard.rc $pkgdir/etc/rc.d/sshguard
-  install -Dm0644 $srcdir/sshguard.conf.d $pkgdir/etc/conf.d/sshguard
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir/usr" install
+  install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service"
+  install -Dm0755 "$srcdir/sshguard.rc" "$pkgdir/etc/rc.d/sshguard"
+  install -Dm0644 "$srcdir/sshguard.conf.d" "$pkgdir/etc/conf.d/sshguard"
+  install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl"
 }
diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl
new file mode 100644
index 000000000..ffb61b1cc
--- /dev/null
+++ b/community/sshguard/sshguard-journalctl
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/journalctl -flbp info -n0 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@"
diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service
new file mode 100644
index 000000000..ad9f90ce2
--- /dev/null
+++ b/community/sshguard/sshguard.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Block hacking attempts
+Wants=sshd.service
+
+[Service]
+EnvironmentFile=/etc/conf.d/sshguard
+ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS}
+
+[Install]
+WantedBy=multi-user.target