November 2014 - crux-commits

ports/xorg (3.1): xorg-xkbcomp: update to 1.3.0
by crux＠crux.nu 22 Nov '14

22 Nov '14

commit 91142453bdf65488b4c9326c6abad0a6cc0f62b7 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Nov 22 11:56:46 2014 +0100 xorg-xkbcomp: update to 1.3.0 diff --git a/xorg-xkbcomp/.md5sum b/xorg-xkbcomp/.md5sum index 20c1f3a..fc464cc 100644 --- a/xorg-xkbcomp/.md5sum +++ b/xorg-xkbcomp/.md5sum @@ -1 +1 @@ -a0fc1ac3fc4fe479ade09674347c5aa0 xkbcomp-1.2.4.tar.bz2 +0012a8e3092cddf7f87b250f96bb38c5 xkbcomp-1.3.0.tar.bz2 diff --git a/xorg-xkbcomp/Pkgfile b/xorg-xkbcomp/Pkgfile index 3cbcb1e..2658ba9 100644 --- a/xorg-xkbcomp/Pkgfile +++ b/xorg-xkbcomp/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-libx11, xorg-libxkbfile name=xorg-xkbcomp -version=1.2.4 +version=1.3.0 release=1 source=(http://xorg.freedesktop.org/releases/individual/app/xkbcomp-$versio…

1 0

ports/xorg (3.1): mesa3d: update to 10.3.4
by crux＠crux.nu 22 Nov '14

22 Nov '14

commit 8150e9b2e4574daec81ae99f41ba9a7a4d4f0879 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Nov 22 11:57:12 2014 +0100 mesa3d: update to 10.3.4 diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index e4610b4..a88110f 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1 +1 @@ -4fe6fc9e28fb2a88a2387e5d3a49ae8b MesaLib-10.3.3.tar.bz2 +fa0558a3d02c2bb8c208c030ccdc992e MesaLib-10.3.4.tar.bz2 diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 2c9db15..31ad0f6 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -4,7 +4,7 @@ # Depends on: elfutils expat libdrm libvdpau libxml2-python llvm talloc xorg-dri2proto xorg-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxt xorg-libxvmc xorg-libxxf86vm xorg-makedepend xorg-presentproto name=mesa3d -version=10.3.3 +version=10.3.4 release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz…

1 0

ports/opt (3.1): harfbuzz: updated to 0.9.36
by crux＠crux.nu 22 Nov '14

22 Nov '14

commit 401370844142e449606e896d2b4ef696ba548eac Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Nov 21 22:33:21 2014 +0100 harfbuzz: updated to 0.9.36 diff --git a/harfbuzz/.footprint b/harfbuzz/.footprint index fb9299e..689c5cf 100644 --- a/harfbuzz/.footprint +++ b/harfbuzz/.footprint @@ -26,8 +26,8 @@ drwxr-xr-x root/root usr/include/harfbuzz/ -rw-r--r-- root/root usr/include/harfbuzz/hb.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libharfbuzz.la -lrwxrwxrwx root/root usr/lib/libharfbuzz.so -> libharfbuzz.so.0.934.0 -lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.934.0 --rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.934.0 +lrwxrwxrwx root/root usr/lib/libharfbuzz.so -> libharfbuzz.so.0.936.0 +lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.936.0 +-rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.936.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/harfbuzz.pc diff --git a/harfbuzz/.md5sum b/harfbuzz/.md5sum index a0da6ee..1aa0e87 100644 --- a/harfbuzz/.md5sum +++ b/harfbuzz/.md5sum @@ -1 +1 @@ -7a94684e560d0857c9ef28b7746d1349 harfbuzz-0.9.34.tar.bz2 +8290671001399f762a5ec10b1a8c3519 harfbuzz-0.9.36.tar.bz2 diff --git a/harfbuzz/Pkgfile b/harfbuzz/Pkgfile index c4a9f4c..0dad7f6 100644 --- a/harfbuzz/Pkgfile +++ b/harfbuzz/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cairo name=harfbuzz -version=0.9.34 +version=0.9.36 release=1 source=(http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$vers…

1 0

ports/opt (3.1): libpng: updated to 1.6.15
by crux＠crux.nu 22 Nov '14

22 Nov '14

commit 2e817c5139444f7602ea62e40c8957c228361347 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Nov 21 22:32:14 2014 +0100 libpng: updated to 1.6.15 diff --git a/libpng/.footprint b/libpng/.footprint index 9684a79..b4fa4e1 100644 --- a/libpng/.footprint +++ b/libpng/.footprint @@ -18,9 +18,9 @@ lrwxrwxrwx root/root usr/lib/libpng.la -> libpng16.la lrwxrwxrwx root/root usr/lib/libpng.so -> libpng16.so -rw-r--r-- root/root usr/lib/libpng16.a -rwxr-xr-x root/root usr/lib/libpng16.la -lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.14.0 -lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.14.0 --rwxr-xr-x root/root usr/lib/libpng16.so.16.14.0 +lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.15.0 +lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.15.0 +-rwxr-xr-x root/root usr/lib/libpng16.so.16.15.0 drwxr-xr-x root/root usr/lib/pkgconfig/ lrwxrwxrwx root/root usr/lib/pkgconfig/libpng.pc -> libpng16.pc -rw-r--r-- root/root usr/lib/pkgconfig/libpng16.pc diff --git a/libpng/.md5sum b/libpng/.md5sum index cbff6c3..1da11c5 100644 --- a/libpng/.md5sum +++ b/libpng/.md5sum @@ -1,2 +1,2 @@ -39f35cde00159c24b5a10258d8f2c5ce libpng-1.6.14-apng.patch.gz -aefd9fda2178acab908707737174a0cd libpng-1.6.14.tar.xz +612524080d5515f4ea81541a9b13bf61 libpng-1.6.15-apng.patch.gz +a95cb387c53215b034203b41ec57c7e5 libpng-1.6.15.tar.xz diff --git a/libpng/Pkgfile b/libpng/Pkgfile index 03acb72..9d9c548 100644 --- a/libpng/Pkgfile +++ b/libpng/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib name=libpng -version=1.6.14 +version=1.6.15 release=1 source=(http://download.sourceforge.net/$name/$name-$version.tar.xz \ http://downloads.sourceforge.net/project/libpng-apng/libpng16/$version/$nam…)

1 0

ports/opt (3.1): libffi: updated to 3.2.1
by crux＠crux.nu 22 Nov '14

22 Nov '14

commit 9255e6b3819201d64c40a99fbb45572a7046f8c4 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Nov 12 18:57:34 2014 +0100 libffi: updated to 3.2.1 diff --git a/libffi/.footprint b/libffi/.footprint index 508a45b..21d5e3f 100644 --- a/libffi/.footprint +++ b/libffi/.footprint @@ -1,9 +1,9 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/libffi-3.2/ -drwxr-xr-x root/root usr/lib/libffi-3.2/include/ --rw-r--r-- root/root usr/lib/libffi-3.2/include/ffi.h --rw-r--r-- root/root usr/lib/libffi-3.2/include/ffitarget.h +drwxr-xr-x root/root usr/lib/libffi-3.2.1/ +drwxr-xr-x root/root usr/lib/libffi-3.2.1/include/ +-rw-r--r-- root/root usr/lib/libffi-3.2.1/include/ffi.h +-rw-r--r-- root/root usr/lib/libffi-3.2.1/include/ffitarget.h -rw-r--r-- root/root usr/lib/libffi.a -rwxr-xr-x root/root usr/lib/libffi.la lrwxrwxrwx root/root usr/lib/libffi.so -> libffi.so.6.0.4 diff --git a/libffi/.md5sum b/libffi/.md5sum index d0f5f1b..345818c 100644 --- a/libffi/.md5sum +++ b/libffi/.md5sum @@ -1 +1 @@ -41e0216cc2be4029fad3128988295f0f libffi-3.2.tar.gz +83b89587607e3eb65c70d361f13bab43 libffi-3.2.1.tar.gz diff --git a/libffi/Pkgfile b/libffi/Pkgfile index 85f2ebf..18d5831 100644 --- a/libffi/Pkgfile +++ b/libffi/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu name=libffi -version=3.2 +version=3.2.1 release=1 source=(ftp://sourceware.org/pub/libffi/$name-$version.tar.gz)

1 0

ports/contrib (3.1): docker: Improved rc script and default configuration
by crux＠crux.nu 22 Nov '14

22 Nov '14

commit 9355a877a68c0118178d22884babcfa8f06abc6c Author: James Mills <prologic(a)shortcircuit.net.au> Date: Sat Nov 22 10:28:51 2014 +1000 docker: Improved rc script and default configuration diff --git a/docker/.md5sum b/docker/.md5sum index ff59825..b30f276 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,4 +1,4 @@ d5e8ec779bb6e49cc6a44781f85d98b7 check-config.sh -966e1916d611427c44686ad09145996f docker.conf -139afe9c85732d52148035d62810b938 docker.rc +849b268387b3a23ce4e0b0bdf0c342d4 docker +5a4c44dc046f863f60bba02080d66fd1 docker.conf 098c366f9c8eb82ba537b93eec66303e v1.3.1.tar.gz diff --git a/docker/Pkgfile b/docker/Pkgfile index 8cc1a30..282ba18 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -1,5 +1,5 @@ # Description: Pack, ship and run any application as a lightweight container -# URL: http://www.docker.io/ +# URL: http://www.docker.com/ # Maintainer: James Mills, prologic at shortcircuit dot net dot au # # Depends on: go sqlite3 cgroupfs-mount @@ -7,11 +7,11 @@ name=docker version=1.3.1 revision=4e9bbfa900 -release=1 +release=2 source=( https://raw.githubusercontent.com/dotcloud/docker/v${version}/contrib/check… https://github.com/dotcloud/$name/archive/v$version.tar.gz - $name.rc + $name $name.conf ) @@ -35,7 +35,7 @@ build() { install -D -m 644 "contrib/udev/80-docker.rules" \ "$PKG/etc/udev/rules.d/80-docker.rules" - install -D -m 755 $SRC/$name.rc $PKG/etc/rc.d/$name + install -D -m 755 $SRC/$name $PKG/etc/rc.d/$name install -D -m 644 $SRC/$name.conf $PKG/etc/$name.conf chown -R root:root $PKG diff --git a/docker/docker b/docker/docker new file mode 100755 index 0000000..92fbbe9 --- /dev/null +++ b/docker/docker @@ -0,0 +1,45 @@ +#!/bin/sh +# +# /etc/rc.d/docker: start/stop docker daemon +# + +export PATH="/sbin:/usr/sbin:$PATH" + +source /etc/docker.conf + +case $1 in +start) + # Ensure ownership and permissiong of log file. + touch /var/log/docker.log + chgrp docker /var/log/docker.log + chown 640 /var/log/docker.log + + # Ensure cgroups is properly mounted. + cgroupfs-mount + + nohup /usr/bin/docker $DOCKER_OPTS > /var/log/docker.log 2>&1 & + ;; +stop) + if [ -f /var/run/docker.pid ]; then + kill $(< /var/run/docker.pid) + rm -f /var/run/docker.pid + rm -f /var/run/docker.sock + else + killall -q /usr/bin/docker + rm -f /var/run/docker.sock + fi + + # Unmount cgroups is + cgroupfs-umount + ;; +restart) + $0 stop + sleep 2 + $0 start + ;; +*) + echo "usage: $0 [start|stop|restart]" + ;; +esac + +# End of file diff --git a/docker/docker.conf b/docker/docker.conf index 0b2644b..383629d 100644 --- a/docker/docker.conf +++ b/docker/docker.conf @@ -1,5 +1,7 @@ # Docker Daemon Configuration +# +# For configuration options see: docker --help -DOCKER_OPTS="-d -p /var/run/docker.pid -H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock" +DOCKER_OPTS="-d -p /var/run/docker.pid" # vim: syntax=sh diff --git a/docker/docker.rc b/docker/docker.rc deleted file mode 100755 index 3f24d6f..0000000 --- a/docker/docker.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/docker: start/stop docker daemon -# - -source /etc/docker.conf - -case $1 in -start) - # Ensure ownership and permissiong of log file. - touch /var/log/docker.log - chgrp docker /var/log/docker.log - chown 640 /var/log/docker.log - - # Ensure cgroups is properly mounted. - cgroupfs-mount - - nohup /usr/bin/docker $DOCKER_OPTS > /var/log/docker.log 2>&1 & - ;; -stop) - if [ -f /var/run/docker.pid ]; then - kill $(< /var/run/docker.pid) - rm -f /var/run/docker.pid - rm -f /var/run/docker.sock - else - killall -q /usr/bin/docker - rm -f /var/run/docker.sock - fi - - # Unmount cgroups is - cgroupfs-umount - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -*) - echo "usage: $0 [start|stop|restart]" - ;; -esac - -# End of file

1 0

ports/core (3.1): kbd: switched the link from ftp to http for people behind firewalls
by crux＠crux.nu 21 Nov '14

21 Nov '14

commit c61d3e82f71aa477c607e352f8a8c4f52528c285 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Nov 21 22:41:16 2014 +0100 kbd: switched the link from ftp to http for people behind firewalls diff --git a/kbd/Pkgfile b/kbd/Pkgfile index 3028876..c0a5a6e 100644 --- a/kbd/Pkgfile +++ b/kbd/Pkgfile @@ -5,7 +5,7 @@ name=kbd version=2.0.2 release=1 -source=(ftp://ftp.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz) +source=(http://ftp.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz) build() { cd $name-$version

1 0

ports/contrib (3.1): sxiv: 1.3 -> 1.3.1
by crux＠crux.nu 21 Nov '14

21 Nov '14

commit bbb967642d7b278a6e0d194be0532926258f9aca Author: Maximilian Dietrich <dxm(a)openmailbox.org> Date: Fri Nov 21 16:23:13 2014 +0100 sxiv: 1.3 -> 1.3.1 diff --git a/sxiv/.md5sum b/sxiv/.md5sum index 644cd2a..0f87061 100644 --- a/sxiv/.md5sum +++ b/sxiv/.md5sum @@ -1,2 +1,2 @@ 9d471c49984c0357d63bf984bc09dd09 config.h -af4c832ae3857fc177691aa624ad6017 v1.3.tar.gz +3255d0d47e0a4cddd752ec03ee4bddaf v1.3.1.tar.gz diff --git a/sxiv/Pkgfile b/sxiv/Pkgfile index 4c71d4a..7010c30 100644 --- a/sxiv/Pkgfile +++ b/sxiv/Pkgfile @@ -4,7 +4,7 @@ # Depends on: imlib2 libexif giflib name=sxiv -version=1.3 +version=1.3.1 release=1 source=(https://github.com/muennich/$name/archive/v$version.tar.gz config.h)

1 0

ports/contrib (3.1): denyhost: renamed from denyhosts which is a dead project, denyhost is a active fork of denyhosts
by crux＠crux.nu 21 Nov '14

21 Nov '14

commit 91b14108362325e05933117cffef9ffa4b5422a4 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Nov 21 23:40:52 2014 +1100 denyhost: renamed from denyhosts which is a dead project, denyhost is a active fork of denyhosts diff --git a/denyhost/.footprint b/denyhost/.footprint new file mode 100644 index 0000000..422af98 --- /dev/null +++ b/denyhost/.footprint @@ -0,0 +1,58 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/denyhosts/ +-rw-r--r-- root/root etc/denyhosts/denyhosts.conf +drwxr-xr-x root/root etc/rc.d/ +-rwxr-xr-x root/root etc/rc.d/denyhosts +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/python2.7/ +drwxr-xr-x root/root usr/lib/python2.7/site-packages/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHost-2.9-py2.7.egg-info +drwxr-xr-x root/root usr/lib/python2.7/site-packages/DenyHosts/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/__init__.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/allowedhosts.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/allowedhosts.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/constants.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/constants.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/counter.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/counter.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/daemon.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/daemon.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/deny_hosts.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/deny_hosts.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/denyfileutil.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/denyfileutil.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/filetracker.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/filetracker.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/lockfile.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/lockfile.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/loginattempt.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/loginattempt.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/old-daemon.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/old-daemon.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/plugin.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/plugin.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/prefs.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/prefs.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/purgecounter.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/purgecounter.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/python_version.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/python_version.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/regex.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/regex.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/report.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/report.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/restricted.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/restricted.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/sync.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/sync.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/util.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/util.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/version.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/version.pyc +drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/denyhosts.8.gz +drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/denyhosts diff --git a/denyhost/.md5sum b/denyhost/.md5sum new file mode 100644 index 0000000..d5b5601 --- /dev/null +++ b/denyhost/.md5sum @@ -0,0 +1 @@ +2c1d82799e43676db667c447959d9d97 denyhosts-2.9.tar.gz diff --git a/denyhost/Pkgfile b/denyhost/Pkgfile new file mode 100644 index 0000000..a08cb78 --- /dev/null +++ b/denyhost/Pkgfile @@ -0,0 +1,40 @@ +# Description: A script intended to be run by Linux system administrators to help thwart ssh server attacks. (fork of denyhosts) +# URL: http://denyhost.sourceforge.net/ +# Maintainer: Danny Rawlins, crux at romster dot me +# Packager: Danny Rawlins, crux at romster dot me +# Depends on: python + +name=denyhost +version=2.9 +release=1 +source=(http://downloads.sourceforge.net/project/$name/$name-$version/denyhosts-$version.tar.gz) + +build() { + cd DenyHosts-$version + + /usr/bin/python setup.py install --root=$PKG + + install -d $PKG/etc/{denyhosts,rc.d} $PKG/usr/sbin + + mv $PKG/etc/denyhosts.conf \ + $PKG/etc/denyhosts/denyhosts.conf + + mv $PKG/usr/bin/daemon-control-dist \ + $PKG/etc/rc.d/denyhosts + + mv $PKG/usr/bin/denyhosts.py $PKG/usr/sbin/denyhosts + mv $PKG/usr/share/man $PKG/usr/man + + rmdir $PKG/usr/share $PKG/usr/bin + + sed -i \ + -e 's|^DENYHOSTS_LOCK = .*|DENYHOSTS_LOCK = "/var/run/denyhosts.pid"|' \ + -e 's|^DENYHOSTS_CFG = .*|DENYHOSTS_CFG = "/etc/denyhosts/denyhosts.conf"|' \ + $PKG/etc/rc.d/denyhosts + + sed -i \ + -e 's|^SECURE_LOG = /var/log/auth.log|SECURE_LOG = /var/log/auth|' \ + -e 's|^IPTABLES = /sbin/iptables|IPTABLES = /usr/sbin/iptables|' \ + -e 's|^# BLOCKPORT = 22|BLOCKPORT = 22|' \ + $PKG/etc/denyhosts/denyhosts.conf +} diff --git a/denyhost/README b/denyhost/README new file mode 100644 index 0000000..b66fd63 --- /dev/null +++ b/denyhost/README @@ -0,0 +1,37 @@ +This is a fork of denyhosts, it'll run the same with a few small changes. I +expect more code cleanup and a total shift to iptables in future. + +REQUIREMENTS: + +PRECAUTION: + +PRE-INSTALL: + +POST-INSTALL: + +Edit /etc/denyhosts/denyhosts.conf as needed. + +Edit /etc/inetd.conf, I added: + +#<service_name> <sock_type> <proto> <flags> <user> <server_path> <args> +sshd stream tcp nowait root /usr/sbin/sshd in.sshd + +Add inetd and denyhosts to services array on /etc/rc.conf, after net and before sshd is loaded (and any other services used by denyhost and inetd (not sure if this is necessary but i believe its good to allow protection before the services start). + +PRE-REMOVE: + +POST-REMOVE: + +NOTES: + +To protect sshd. + +Edit /etc/hosts.allow and comment out everything, everything will have access by default. + +Edit /etc/hosts.deny and comment out the "ALL: ALL: DENY" part, also the "#End of file" bit will be useless as denyhosts appends to the file. + +(note the config in inetd.conf doesn't seem to be right or needed? see +messages upon boot up, any corrections email me :) ) + +Danny Rawlins, <contact at romster dot me + diff --git a/denyhosts/.footprint b/denyhosts/.footprint deleted file mode 100644 index 422af98..0000000 --- a/denyhosts/.footprint +++ /dev/null @@ -1,58 +0,0 @@ -drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/denyhosts/ --rw-r--r-- root/root etc/denyhosts/denyhosts.conf -drwxr-xr-x root/root etc/rc.d/ --rwxr-xr-x root/root etc/rc.d/denyhosts -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/python2.7/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHost-2.9-py2.7.egg-info -drwxr-xr-x root/root usr/lib/python2.7/site-packages/DenyHosts/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/__init__.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/__init__.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/allowedhosts.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/allowedhosts.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/constants.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/constants.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/counter.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/counter.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/daemon.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/daemon.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/deny_hosts.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/deny_hosts.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/denyfileutil.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/denyfileutil.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/filetracker.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/filetracker.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/lockfile.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/lockfile.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/loginattempt.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/loginattempt.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/old-daemon.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/old-daemon.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/plugin.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/plugin.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/prefs.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/prefs.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/purgecounter.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/purgecounter.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/python_version.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/python_version.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/regex.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/regex.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/report.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/report.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/restricted.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/restricted.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/sync.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/sync.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/util.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/util.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/version.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/version.pyc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/denyhosts.8.gz -drwxr-xr-x root/root usr/sbin/ --rwxr-xr-x root/root usr/sbin/denyhosts diff --git a/denyhosts/.md5sum b/denyhosts/.md5sum deleted file mode 100644 index d5b5601..0000000 --- a/denyhosts/.md5sum +++ /dev/null @@ -1 +0,0 @@ -2c1d82799e43676db667c447959d9d97 denyhosts-2.9.tar.gz diff --git a/denyhosts/Pkgfile b/denyhosts/Pkgfile deleted file mode 100644 index 6c7f624..0000000 --- a/denyhosts/Pkgfile +++ /dev/null @@ -1,34 +0,0 @@ -# Description: DenyHosts is a script intended to be run by Linux system administrators to help thwart ssh server attacks. -# URL: http://denyhost.sourceforge.net/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me -# Depends on: python - -name=denyhosts -version=2.9 -release=1 -source=(http://downloads.sourceforge.net/project/denyhost/denyhost-$version/$name-$version.tar.gz) - -build() { - cd DenyHosts-$version - - /usr/bin/python setup.py install --root=$PKG - - install -d $PKG/etc/{denyhosts,rc.d} $PKG/usr/sbin - - mv $PKG/etc/denyhosts.conf \ - $PKG/etc/denyhosts/denyhosts.conf - - mv $PKG/usr/bin/daemon-control-dist \ - $PKG/etc/rc.d/denyhosts - - mv $PKG/usr/bin/denyhosts.py $PKG/usr/sbin/denyhosts - mv $PKG/usr/share/man $PKG/usr/man - - rmdir $PKG/usr/share $PKG/usr/bin - - sed -i \ - -e 's|^DENYHOSTS_LOCK = .*|DENYHOSTS_LOCK = "/var/run/denyhosts.pid"|' \ - -e 's|^DENYHOSTS_CFG = .*|DENYHOSTS_CFG = "/etc/denyhosts/denyhosts.conf"|' \ - $PKG/etc/rc.d/denyhosts -} diff --git a/denyhosts/README b/denyhosts/README deleted file mode 100644 index c2c706b..0000000 --- a/denyhosts/README +++ /dev/null @@ -1,34 +0,0 @@ -REQUIREMENTS: - -PRECAUTION: - -PRE-INSTALL: - -POST-INSTALL: - -Edit /etc/denyhosts/denyhosts.conf as needed. - -Edit /etc/inetd.conf, I added: - -#<service_name> <sock_type> <proto> <flags> <user> <server_path> <args> -sshd stream tcp nowait root /usr/sbin/sshd in.sshd - -Add inetd and denyhosts to services array on /etc/rc.conf, after net and before sshd is loaded (and any other services used by denyhost and inetd (not sure if this is necessary but i believe its good to allow protection before the services start). - -PRE-REMOVE: - -POST-REMOVE: - -NOTES: - -To protect sshd. - -Edit /etc/hosts.allow and comment out everything, everything will have access by default. - -Edit /etc/hosts.deny and comment out the "ALL: ALL: DENY" part, also the "#End of file" bit will be useless as denyhosts appends to the file. - -(note the config in inetd.conf doesn't seem to be right or needed? see -messages upon boot up, any corrections email me :) ) - -Danny Rawlins, <contact at romster dot me -

1 0

ports/contrib (3.1): denyhosts: 2.6 -> 2.9
by crux＠crux.nu 21 Nov '14

21 Nov '14

commit 6db33dc1eb5408c5535d7cf35d5d4c86ef00978d Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Nov 21 22:32:14 2014 +1100 denyhosts: 2.6 -> 2.9 diff --git a/denyhosts/.footprint b/denyhosts/.footprint index f6df45a..422af98 100644 --- a/denyhosts/.footprint +++ b/denyhosts/.footprint @@ -2,14 +2,12 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/denyhosts/ -rw-r--r-- root/root etc/denyhosts/denyhosts.conf drwxr-xr-x root/root etc/rc.d/ -lrwxrwxrwx root/root etc/rc.d/denyhosts -> /usr/share/denyhosts/daemon-control +-rwxr-xr-x root/root etc/rc.d/denyhosts drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/denyhosts drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts-2.6-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHost-2.9-py2.7.egg-info drwxr-xr-x root/root usr/lib/python2.7/site-packages/DenyHosts/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/__init__.pyc @@ -53,16 +51,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/DenyHosts/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/util.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/version.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/DenyHosts/version.pyc -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/denyhosts/ --rwx------ root/root usr/share/denyhosts/daemon-control -drwxr-xr-x root/root usr/share/denyhosts/plugins/ --rw-r--r-- root/root usr/share/denyhosts/plugins/shorewall_allow.sh --rw-r--r-- root/root usr/share/denyhosts/plugins/shorewall_deny.sh --rwxr-xr-x root/root usr/share/denyhosts/plugins/test_deny.py -drwxr-xr-x root/root usr/share/denyhosts/scripts/ --rwxr-xr-x root/root usr/share/denyhosts/scripts/restricted_from_invalid.py --rwxr-xr-x root/root usr/share/denyhosts/scripts/restricted_from_passwd.py --rw-r--r-- root/root usr/share/denyhosts/setup.py -drwxr-xr-x root/root var/ -drwxr-xr-x root/root var/log/ +drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/denyhosts.8.gz +drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/denyhosts diff --git a/denyhosts/.md5sum b/denyhosts/.md5sum index 74ae689..d5b5601 100644 --- a/denyhosts/.md5sum +++ b/denyhosts/.md5sum @@ -1,6 +1 @@ -fc2365305a9402886a2b0173d1beb7df DenyHosts-2.6.tar.gz -a0abe102add4420e766cc90d0709f425 denyhosts-2.6-config.patch -67e0d788356f9f7183c217a2eae71bf1 denyhosts-2.6-cve-2013-6890.patch -79abdfcd7ce0859f2f3f134598a89209 denyhosts-2.6-log-injection-regex.patch -6ed4e279640b8a5c0c04dd4193ac15e2 denyhosts-2.6-plugin_deny.patch -dfd91828e48d97af2e77e009c67c4754 denyhosts-2.6-single_config_switch.patch +2c1d82799e43676db667c447959d9d97 denyhosts-2.9.tar.gz diff --git a/denyhosts/Pkgfile b/denyhosts/Pkgfile index 6e9dfe8..6c7f624 100644 --- a/denyhosts/Pkgfile +++ b/denyhosts/Pkgfile @@ -1,46 +1,34 @@ # Description: DenyHosts is a script intended to be run by Linux system administrators to help thwart ssh server attacks. -# URL: http://denyhosts.sourceforge.net/ +# URL: http://denyhost.sourceforge.net/ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Danny Rawlins, crux at romster dot me # Depends on: python name=denyhosts -version=2.6 -release=2 -source=(http://downloads.sourceforge.net/project/$name/$name/$version/DenyHosts-$version.tar.gz - denyhosts-$version-config.patch - denyhosts-2.6-cve-2013-6890.patch - denyhosts-2.6-log-injection-regex.patch - denyhosts-2.6-single_config_switch.patch - denyhosts-2.6-plugin_deny.patch) +version=2.9 +release=1 +source=(http://downloads.sourceforge.net/project/denyhost/denyhost-$version/$name-$version.tar.gz) build() { cd DenyHosts-$version - patch -p0 -i $SRC/$name-$version-config.patch - patch -p1 -i $SRC/denyhosts-2.6-log-injection-regex.patch - patch -p1 -i $SRC/denyhosts-2.6-single_config_switch.patch - patch -p1 -i $SRC/denyhosts-2.6-plugin_deny.patch - patch -p1 -i $SRC/denyhosts-2.6-cve-2013-6890.patch - /usr/bin/python setup.py install --root=$PKG - rm $PKG/usr/share/denyhosts/*.txt - - install -d \ - $PKG/etc/ \ - $PKG/etc/{denyhosts,rc.d} \ - $PKG/var/log + install -d $PKG/etc/{denyhosts,rc.d} $PKG/usr/sbin - mv $PKG/usr/share/denyhosts/denyhosts.cfg-dist \ + mv $PKG/etc/denyhosts.conf \ $PKG/etc/denyhosts/denyhosts.conf - mv $PKG/usr/share/denyhosts/daemon-control-dist \ - $PKG/usr/share/denyhosts/daemon-control - - chmod 700 $PKG/usr/share/denyhosts/daemon-control + mv $PKG/usr/bin/daemon-control-dist \ + $PKG/etc/rc.d/denyhosts - ln -s /usr/share/denyhosts/daemon-control $PKG/etc/rc.d/denyhosts - rm $PKG/usr/share/denyhosts/plugins/README.contrib - mv $PKG/usr/bin/denyhosts.py $PKG/usr/bin/denyhosts + mv $PKG/usr/bin/denyhosts.py $PKG/usr/sbin/denyhosts + mv $PKG/usr/share/man $PKG/usr/man + + rmdir $PKG/usr/share $PKG/usr/bin + + sed -i \ + -e 's|^DENYHOSTS_LOCK = .*|DENYHOSTS_LOCK = "/var/run/denyhosts.pid"|' \ + -e 's|^DENYHOSTS_CFG = .*|DENYHOSTS_CFG = "/etc/denyhosts/denyhosts.conf"|' \ + $PKG/etc/rc.d/denyhosts } diff --git a/denyhosts/README b/denyhosts/README index b00c75e..c2c706b 100644 --- a/denyhosts/README +++ b/denyhosts/README @@ -23,11 +23,12 @@ NOTES: To protect sshd. -Edit /etc/hosts.allow and comment out everyting, everything will have access by default. +Edit /etc/hosts.allow and comment out everything, everything will have access by default. Edit /etc/hosts.deny and comment out the "ALL: ALL: DENY" part, also the "#End of file" bit will be useless as denyhosts appends to the file. -(note the config in inetd.conf dosn't seem to be right or needed? see messages apon boot up, any corections email me :) ) +(note the config in inetd.conf doesn't seem to be right or needed? see +messages upon boot up, any corrections email me :) ) -Danny Rawlins, <romster at shortcircuit dot net dot au +Danny Rawlins, <contact at romster dot me diff --git a/denyhosts/denyhosts-2.6-config.patch b/denyhosts/denyhosts-2.6-config.patch deleted file mode 100644 index 68de8a4..0000000 --- a/denyhosts/denyhosts-2.6-config.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- daemon-control-dist~ 2006-04-22 09:04:43.000000000 +1000 -+++ daemon-control-dist 2007-01-03 01:47:12.000000000 +1100 -@@ -11,9 +11,9 @@ - #### Edit these to suit your configuration #### - ############################################### - --DENYHOSTS_BIN = "/usr/bin/denyhosts.py" --DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" --DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" -+DENYHOSTS_BIN = "/usr/bin/denyhosts" -+DENYHOSTS_LOCK = "/var/run/denyhosts.pid" -+DENYHOSTS_CFG = "/etc/denyhosts/denyhosts.conf" - - PYTHON_BIN = "/usr/bin/env python" - ---- denyhosts.cfg-dist~ 2006-08-21 00:09:57.000000000 +1000 -+++ denyhosts.cfg-dist 2007-01-03 01:44:25.000000000 +1100 -@@ -8,8 +8,11 @@ - # The file to process can be overridden with the --file command line - # argument - # -+# CRUX -+SECURE_LOG = /var/log/auth -+# - # Redhat or Fedora Core: --SECURE_LOG = /var/log/secure -+#SECURE_LOG = /var/log/secure - # - # Mandrake, FreeBSD or OpenBSD: - #SECURE_LOG = /var/log/auth.log -@@ -191,8 +194,11 @@ - # and deleted upon exit. This ensures that only one instance is - # running at a time. - # -+# CRUX -+LOCK_FILE = /var/run/denyhosts.pid -+# - # Redhat/Fedora: --LOCK_FILE = /var/lock/subsys/denyhosts -+#LOCK_FILE = /var/lock/subsys/denyhosts - # - # Debian - #LOCK_FILE = /var/run/denyhosts.pid diff --git a/denyhosts/denyhosts-2.6-cve-2013-6890.patch b/denyhosts/denyhosts-2.6-cve-2013-6890.patch deleted file mode 100644 index 3065d5e..0000000 --- a/denyhosts/denyhosts-2.6-cve-2013-6890.patch +++ /dev/null @@ -1,60 +0,0 @@ -Subject: address remote denial of service CVE-2013-6890 -From: Helmut Grohne <helmut () subdivi de> - -ssh -l 'Invalid user root from 123.123.123.123' 21.21.21.21 - -results in a log lines - -sshd[123]: Invalid user Invalid user root from 123.123.123.123 from 21.21.21.21 -sshd[123]: input_userauth_request: invalid user Invalid user root from 123.123.123.123 [preauth] -sshd[123]: Connection closed by 21.21.21.21 [preauth] - -and causes denyhosts to block both ips 21.21.21.21 and 123.123.123.123. - -This patch tightens the regular expressions used to avoid these and similar -injections. - -Index: denyhosts-2.6/DenyHosts/regex.py -=================================================================== ---- denyhosts-2.6.orig/DenyHosts/regex.py 2013-12-22 11:54:42.000000000 +0100 -+++ denyhosts-2.6/DenyHosts/regex.py 2013-12-22 11:55:05.000000000 +0100 -@@ -6,22 +6,22 @@ - - #DATE_FORMAT_REGEX = re.compile(r"""(?P<month>[A-z]{3,3})\s*(?P<day>\d+)""") - --SSHD_FORMAT_REGEX = re.compile(r""".* (sshd.*:|\[sshd\]) (?P<message>.*)""") -+SSHD_FORMAT_REGEX = re.compile(r""".*? (sshd.*?:|\[sshd\]) (?P<message>.*)""") - #SSHD_FORMAT_REGEX = re.compile(r""".* sshd.*: (?P<message>.*)""") - --FAILED_ENTRY_REGEX = re.compile(r"""Failed (?P<method>.*) for (?P<invalid>invalid user |illegal user )?(?P<user>.*?) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") -+FAILED_ENTRY_REGEX = re.compile(r"""Failed (?P<method>\S*) for (?P<invalid>invalid user |illegal user )?(?P<user>.*) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") - --FAILED_ENTRY_REGEX2 = re.compile(r"""(?P<invalid>(Illegal|Invalid)) user (?P<user>.*?) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") -+FAILED_ENTRY_REGEX2 = re.compile(r"""(?P<invalid>(Illegal|Invalid)) user (?P<user>.*) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") - --FAILED_ENTRY_REGEX3 = re.compile(r"""Authentication failure for (?P<user>.*) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") -+FAILED_ENTRY_REGEX3 = None - --FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P<user>.*) .*from (?P<host>.*)""") -+FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P<user>.*) from (::ffff:)?(?P<host>\S+)$""") - --FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) .*from (?P<host>.*) not allowed because none of user's groups are listed in AllowGroups$""") -+FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) from (::ffff:)?(?P<host>\S+) not allowed because none of user's groups are listed in AllowGroups$""") - --FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") -+FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") - --FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) not allowed because not listed in AllowUsers""") -+FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) from (::ffff:)?(?P<host>\S+) not allowed because not listed in AllowUsers$""") - - - # these are reserved for future versions -@@ -42,7 +42,7 @@ - FAILED_ENTRY_REGEX_MAP[i] = rx - - --SUCCESSFUL_ENTRY_REGEX = re.compile(r"""Accepted (?P<method>.*) for (?P<user>.*?) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") -+SUCCESSFUL_ENTRY_REGEX = re.compile(r"""Accepted (?P<method>\S+) for (?P<user>.*?) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") - - TIME_SPEC_REGEX = re.compile(r"""(?P<units>\d*)\s*(?P<period>[smhdwy])?""") - diff --git a/denyhosts/denyhosts-2.6-log-injection-regex.patch b/denyhosts/denyhosts-2.6-log-injection-regex.patch deleted file mode 100644 index c6fc205..0000000 --- a/denyhosts/denyhosts-2.6-log-injection-regex.patch +++ /dev/null @@ -1,21 +0,0 @@ -Address Log injection reported at - -http://bugs.gentoo.org/show_bug.cgi?id=181213 - -diff -ur a/DenyHosts/regex.py b/DenyHosts/regex.py ---- a/DenyHosts/regex.py 2006-12-07 13:47:04.000000000 -0600 -+++ b/DenyHosts/regex.py 2007-06-19 18:51:54.000000000 -0500 -@@ -17,11 +17,11 @@ - - FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P<user>.*) .*from (?P<host>.*)""") - --FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) .*from (?P<host>.*) not allowed because none of user's groups are listed in AllowGroups""") -+FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) .*from (?P<host>.*) not allowed because none of user's groups are listed in AllowGroups$""") - - FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") - --FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) not allowed because not listed in AllowUsers""") -+FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) not allowed because not listed in AllowUsers""") - - - # these are reserved for future versions diff --git a/denyhosts/denyhosts-2.6-plugin_deny.patch b/denyhosts/denyhosts-2.6-plugin_deny.patch deleted file mode 100644 index 74868e7..0000000 --- a/denyhosts/denyhosts-2.6-plugin_deny.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Marco Bertorello <marco(a)bertorello.ns0.it> -Date: Thu, 14 Apr 2011 00:11:35 +0200 -Subject: 09_plugin_deny - -Correct the upstream bug http://sourceforge.net/tracker/index.php?func=detail&aid=1734736&group_id=1… ---- - DenyHosts/deny_hosts.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/DenyHosts/deny_hosts.py b/DenyHosts/deny_hosts.py -index f308264..0f5f48d 100644 ---- a/DenyHosts/deny_hosts.py -+++ b/DenyHosts/deny_hosts.py -@@ -443,7 +443,7 @@ allowed based on your %s file""" % (self.__prefs.get("HOSTS_DENY"), - self.__report.add_section(msg, new_denied_hosts) - if self.__sync_server: self.sync_add_hosts(new_denied_hosts) - plugin_deny = self.__prefs.get('PLUGIN_DENY') -- if plugin_deny: plugin.execute(plugin_deny, deny_hosts) -+ if plugin_deny: plugin.execute(plugin_deny, new_denied_hosts) - - new_suspicious_logins = login_attempt.get_new_suspicious_logins() - if new_suspicious_logins: --- diff --git a/denyhosts/denyhosts-2.6-single_config_switch.patch b/denyhosts/denyhosts-2.6-single_config_switch.patch deleted file mode 100644 index cb39df9..0000000 --- a/denyhosts/denyhosts-2.6-single_config_switch.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Marco Bertorello <marco(a)bertorello.ns0.it> -Date: Thu, 14 Apr 2011 00:11:35 +0200 -Subject: 11_single_config_switch - -A patch to prevent denyhosts running with a double --config switch ---- - daemon-control-dist | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/daemon-control-dist b/daemon-control-dist -index 9f42b60..14d0f70 100755 ---- a/daemon-control-dist -+++ b/daemon-control-dist -@@ -144,7 +144,8 @@ if __name__ == '__main__': - - try: - if option in ('start', 'restart', 'condrestart'): -- if '--config' not in args and '-c' not in args: -+ anystartswith = lambda prefix, xs: any(map(lambda x: x.startswith(prefix), xs)) -+ if not anystartswith('--config', args) and '-c' not in args: - args.append("--config=%s" % DENYHOSTS_CFG) - - cmd = cases[option] ---

1 0