diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-11-06 20:10:41 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-11-06 20:10:41 -0300 |
commit | 385fda403f286573a778ee525fe56a86d11fc967 (patch) | |
tree | 1aabb3a26d366ffa745a559409bcbe91b04dc240 /community/sshguard | |
parent | 922fd0a3c35beb57adbef0b4c4c122dd29563c97 (diff) | |
parent | fbe5d27eadf86b85244a5ffff62c132cb9a4a158 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/adns/PKGBUILD
community/afpfs-ng/PKGBUILD
community/aqbanking/PKGBUILD
community/arp-scan/PKGBUILD
community/arpack/PKGBUILD
community/bind/PKGBUILD
community/bird/PKGBUILD
community/cairo-dock/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/commoncpp2/PKGBUILD
community/cuetools/PKGBUILD
community/erlang/PKGBUILD
community/fxdesktop/PKGBUILD
community/gavl/PKGBUILD
community/google-gadgets/PKGBUILD
community/gpicview/PKGBUILD
community/gtk-aurora-engine/PKGBUILD
community/icewm-utils/PKGBUILD
community/inotify-tools/PKGBUILD
community/jack2/PKGBUILD
community/judy/PKGBUILD
community/lash/PKGBUILD
community/libdlna/PKGBUILD
community/libgexiv2/PKGBUILD
community/libgig/PKGBUILD
community/liblinebreak/PKGBUILD
community/liblockfile/PKGBUILD
community/libopenraw/PKGBUILD
community/librcd/PKGBUILD
community/librsync/PKGBUILD
community/libvirt/PKGBUILD
community/libyaml/PKGBUILD
community/linux-tools/PKGBUILD
community/lomoco/PKGBUILD
community/luasec/PKGBUILD
community/luasocket/PKGBUILD
community/lwp/PKGBUILD
community/lxappearance-obconf/PKGBUILD
community/lxappearance/PKGBUILD
community/lxsplit/PKGBUILD
community/metamail/PKGBUILD
community/mg/PKGBUILD
community/nemo-fileroller/PKGBUILD
community/nsd/PKGBUILD
community/obby/PKGBUILD
community/openarena/PKGBUILD
community/opensc/PKGBUILD
community/osmo/PKGBUILD
community/perl-json-xs/PKGBUILD
community/pyqt3/PKGBUILD
community/python-pymongo/PKGBUILD
community/python-pytables/PKGBUILD
community/qscintilla-qt3/PKGBUILD
community/qtcurve-gtk2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
community/rxvt-unicode/PKGBUILD
community/smalltalk/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xpad/PKGBUILD
community/xsettings-client/PKGBUILD
community/yaws/PKGBUILD
core/bzip2/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/keyutils/PKGBUILD
core/ldns/PKGBUILD
core/libmpc/PKGBUILD
core/librpcsecgss/PKGBUILD
core/libtool/PKGBUILD
core/lvm2/PKGBUILD
core/lzo2/PKGBUILD
core/openssl/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/aalib/PKGBUILD
extra/aiksaurus/PKGBUILD
extra/alsa-oss/PKGBUILD
extra/alsa-tools/PKGBUILD
extra/apache/PKGBUILD
extra/autopano-sift-c/PKGBUILD
extra/avahi/PKGBUILD
extra/cfitsio/PKGBUILD
extra/clamav/PKGBUILD
extra/compface/PKGBUILD
extra/dotconf/PKGBUILD
extra/enca/PKGBUILD
extra/eventlog/PKGBUILD
extra/exiv2/PKGBUILD
extra/faad2/PKGBUILD
extra/fcgi/PKGBUILD
extra/ffcall/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/flac/PKGBUILD
extra/fltk/PKGBUILD
extra/freealut/PKGBUILD
extra/freetds/PKGBUILD
extra/gc/PKGBUILD
extra/gdome2/PKGBUILD
extra/giblib/PKGBUILD
extra/gmime/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gnome-speech/PKGBUILD
extra/graphviz/PKGBUILD
extra/gsasl/PKGBUILD
extra/gsl/PKGBUILD
extra/gtkspell/PKGBUILD
extra/gupnp-igd/PKGBUILD
extra/htdig/PKGBUILD
extra/hugin/PKGBUILD
extra/id3lib/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imagemagick/PKGBUILD
extra/iptraf-ng/PKGBUILD
extra/jade/PKGBUILD
extra/jasper/PKGBUILD
extra/kdesdk-thumbnailers/PKGBUILD
extra/kdevelop-php/PKGBUILD
extra/lablgtk/PKGBUILD
extra/lame/PKGBUILD
extra/lcms2/PKGBUILD
extra/lesstif/PKGBUILD
extra/libaio/PKGBUILD
extra/libart-lgpl/PKGBUILD
extra/libass/PKGBUILD
extra/libasyncns/PKGBUILD
extra/libavc1394/PKGBUILD
extra/libbluray/PKGBUILD
extra/libcaca/PKGBUILD
extra/libcddb/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libdca/PKGBUILD
extra/libdv/PKGBUILD
extra/libglade/PKGBUILD
extra/libgtkhtml/PKGBUILD
extra/libice/PKGBUILD
extra/libid3tag/PKGBUILD
extra/libidl2/PKGBUILD
extra/libieee1284/PKGBUILD
extra/libjpeg-turbo/PKGBUILD
extra/liblo/PKGBUILD
extra/libmad/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libmowgli/PKGBUILD
extra/libmpd/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/libofa/PKGBUILD
extra/liboil/PKGBUILD
extra/libotf/PKGBUILD
extra/libpeas/PKGBUILD
extra/libqalculate/PKGBUILD
extra/libraw1394/PKGBUILD
extra/libsndfile/PKGBUILD
extra/libstroke/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libxkbui/PKGBUILD
extra/libxss/PKGBUILD
extra/libytnef/PKGBUILD
extra/libzvt/PKGBUILD
extra/lynx/PKGBUILD
extra/lzo/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/mhash/PKGBUILD
extra/musicbrainz/PKGBUILD
extra/ocaml/PKGBUILD
extra/openal/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/perl-dbi/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/phonon/PKGBUILD
extra/ppl/PKGBUILD
extra/progsreiserfs/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pycurl/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/pyxml/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/schroedinger/PKGBUILD
extra/sdl_gfx/PKGBUILD
extra/signon/PKGBUILD
extra/slang/PKGBUILD
extra/sofia-sip/PKGBUILD
extra/spandsp/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/sqlite/PKGBUILD
extra/t1lib/PKGBUILD
extra/taglib/PKGBUILD
extra/tidyhtml/PKGBUILD
extra/totem/PKGBUILD
extra/unixodbc/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/wavpack/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webrtc-audio-processing/PKGBUILD
extra/xfce4-mailwatch-plugin/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xmms/PKGBUILD
extra/xorg-server/PKGBUILD
extra/yajl/PKGBUILD
extra/yasm/PKGBUILD
extra/zenity/PKGBUILD
extra/zziplib/PKGBUILD
libre/blackbox-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/sdl-libre/PKGBUILD
Diffstat (limited to 'community/sshguard')
-rw-r--r-- | community/sshguard/PKGBUILD | 11 | ||||
-rw-r--r-- | community/sshguard/sshguard-journalctl | 4 | ||||
-rw-r--r-- | community/sshguard/sshguard.service | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index 0e81c4e9a..63c7ba59b 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96970 2013-09-09 14:29:18Z mtorromeo $ +# $Id: PKGBUILD 99653 2013-10-30 18:22:33Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=15 +pkgrel=16 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64' 'mips64el') url="http://www.sshguard.net/" @@ -15,9 +15,6 @@ install=sshguard.install source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2" sshguard.service sshguard-journalctl) -sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' - '3185cd3ceeee0bbb1f1df54baf025857200f39bd1eb747a59d6f46c562be4a51' - 'f7b307fe9dbbe8c18fe91ca751679d62b2a3ade03cfe164e76ca411cfafffca6') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -41,3 +38,7 @@ package() { install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service" install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl" } + +sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' + '24be7918dcba37805dea2fd1d9e4c1c139e3ea840773aea49574d4c6a7056507' + 'a8f315d163128d4e8458c1d50c90082581092476937921cba2afb167f51cbe3f') diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl index e9bb14c5f..8a800ff26 100644 --- a/community/sshguard/sshguard-journalctl +++ b/community/sshguard/sshguard-journalctl @@ -1,4 +1,4 @@ #!/bin/sh -DBFILE=$1 +SSHGUARD_OPTS=$1 shift -/usr/bin/journalctl -afb -p info -n1 "$@" | /usr/bin/sshguard -l- -b $DBFILE +LANG=C /usr/bin/journalctl -afb -p info -n1 -o cat "$@" | /usr/bin/sshguard -l- $SSHGUARD_OPTS diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service index 11115727b..1c019fde2 100644 --- a/community/sshguard/sshguard.service +++ b/community/sshguard/sshguard.service @@ -4,7 +4,7 @@ After=iptables.service ip6tables.service network.target Wants=iptables.service ip6tables.service [Service] -ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl /var/db/sshguard/blacklist.db SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 +ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl "-b /var/db/sshguard/blacklist.db" SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 [Install] WantedBy=multi-user.target |