Merge branch 'master' of vparabola:abslibre

8 files changed, 320 insertions, 34 deletions

diff --git a/pcr/fwsnort/#PKGBUILD# b/pcr/fwsnort/#PKGBUILD#
new file mode 100644
index 000000000..a4b666dfa
--- /dev/null
+++ b/pcr/fwsnort/#PKGBUILD#
@@ -0,0 +1,44 @@
+# Contributor (Arch)    : Colin Shea <colin@evaryont.me>
+# Maintainer  (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname=fwsnort
+pkgver=1.6.4
+pkgrel=1
+pkgdesc="application layer IDS/IPS by translating snort rules into iptables"
+arch=('any')
+url="http://www.cipherdyne.org/fwsnort/"
+license=('GPL')
+# net-tools: sorry, but fwsnort needs ifconfig. Doesn't support iproute yet
+depends=('perl' 'perl-netaddr-ip' 'perl-iptables-parse' 'iptables' 'net-tools')
+makedepends=('wget')
+source=(http://www.cipherdyne.org/$pkgname/download/$pkgname-$pkgver.tar.bz2
+       )
+
+options=(emptydirs)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # fix up the installer for our purposes:
+  # - removes the root check
+  # - includes sbin as another place to check for binares
+  # - fixes various paths for utilities & the man page
+  #patch -p1 -i $srcdir/install_pl.patch
+
+  # -S skips installing the perl modules, which we did with packages
+  # and --install-test-dir sets the INSTALL_ROOT to src/../test/fwsnort-test. An
+  # easy way to collect all the files into 1
+  #./install.pl -S --install-test-dir
+}
+
+#package() {
+  #cp -r $srcdir/fwsnort-$pkgver/test/fwsnort-install/* -t $pkgdir
+  # delete references to $pkgdir from fwsnort; they were made by the installer
+  # as part of installing to the test dir
+  #cp -f $srcdir/fwsnort-$pkgver/fwsnort.conf $pkgdir/etc/fwsnort/fwsnort.conf
+
+  # avoid a 'warning: directory permissions differ on etc/' line from pacman
+  #chmod 755 $pkgdir/etc
+#}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/fwsnort/#install_pl.patch# b/pcr/fwsnort/#install_pl.patch#
new file mode 100644
index 000000000..cf0602d04
--- /dev/null
+++ b/pcr/fwsnort/#install_pl.patch#
@@ -0,0 +1,126 @@
+diff -u fwsnort-1.6.4-1/install.pl fwsnort-1..3/install.pl
+--- fwsnort-1.6.3-2/install.pl	2012-12-24 21:31:28.597018440 -0700
++++ fwsnort-1.6.3/install.pl	2012-12-24 21:40:38.564569377 -0700
+@@ -45,7 +45,7 @@
+ my $perlCmd = '/usr/bin/perl';
+ my $makeCmd = '/usr/bin/make';
+ my $wgetCmd = '/usr/bin/wget';
+-my $gzipCmd = '/bin/gzip';
++my $gzipCmd = '/usr/bin/gzip';
+ my $tarCmd  = '/bin/tar';
+ #======================= end config ======================
+
+@@ -129,10 +129,6 @@
+ ### make sure the system binaries are where we think they are.
+ &check_commands();
+
+-### check to make sure we are running as root
+-$< == 0 && $> == 0 or die "You need to be root (or equivalent UID 0",
+-    " account) to install/uninstall fwsnort!\n";
+-
+ if ($uninstall) {
+     &uninstall();
+ } else {
+@@ -154,10 +150,10 @@
+         "sources directory." unless -e 'fwsnort' and -e 'fwsnort.conf';
+
+     unless (-d $config{'CONF_DIR'}) {
+-        &full_mkdir($config{'CONF_DIR'}, 0500);
++        &full_mkdir($config{'CONF_DIR'}, 0700);
+     }
+     unless (-d $config{'RULES_DIR'}) {
+-        &full_mkdir($config{'RULES_DIR'}, 0500);
++        &full_mkdir($config{'RULES_DIR'}, 0700);
+     }
+
+     ### install perl modules
+@@ -336,52 +332,11 @@
+
+ sub install_manpage() {
+     my $manpage = 'fwsnort.8';
+-    ### remove old man page
+-    unlink "/usr/local/man/man8/${manpage}" if
+-        (-e "/usr/local/man/man8/${manpage}");
+
+     ### default location to put the fwsnort man page, but check with
+     ### /etc/man.config
+-    my $mpath = '/usr/share/man/man8';
+-    if (-e '/etc/man.config') {
+-        ### prefer to install $manpage in /usr/local/man/man8 if
+-        ### this directory is configured in /etc/man.config
+-        open M, '< /etc/man.config' or
+-            die "[*] Could not open /etc/man.config: $!";
+-        my @lines = <M>;
+-        close M;
+-        ### prefer the path "/usr/share/man"
+-        my $found = 0;
+-        for my $line (@lines) {
+-            chomp $line;
+-            if ($line =~ m|^MANPATH\s+/usr/share/man|) {
+-                $found = 1;
+-                last;
+-            }
+-        }
+-        ### try to find "/usr/local/man" if we didn't find /usr/share/man
+-        unless ($found) {
+-            for my $line (@lines) {
+-                chomp $line;
+-                if ($line =~ m|^MANPATH\s+/usr/local/man|) {
+-                    $mpath = '/usr/local/man/man8';
+-                    $found = 1;
+-                    last;
+-                }
+-            }
+-        }
+-        ### if we still have not found one of the above man paths,
+-        ### just select the first one out of /etc/man.config
+-        unless ($found) {
+-            for my $line (@lines) {
+-                chomp $line;
+-                if ($line =~ m|^MANPATH\s+(\S+)|) {
+-                    $mpath = $1;
+-                    last;
+-                }
+-            }
+-        }
+-    }
++    my $mpath = $config{'INSTALL_ROOT'}.'/usr/share/man/man8';
++
+     &full_mkdir($mpath, 0755);
+     my $mfile = "${mpath}/${manpage}";
+     print "[+] Installing $manpage man page as $mfile\n";
+@@ -532,6 +487,9 @@
+         /bin
+         /usr/bin
+         /usr/local/bin
++        /sbin
++        /usr/sbin
++        /usr/local/sbin
+     );
+     CMD: for my $cmd (keys %cmds) {
+         unless (-x $cmds{$cmd}) {
+diff -u fwsnort-1.6.3-2/fwsnort.conf fwsnort-1.6.3/fwsnort.conf
+--- fwsnort-1.6.3-2/fwsnort.conf	2012-12-24 22:39:21.323178467 -0700
++++ fwsnort-1.6.3/fwsnort.conf	2012-12-24 22:41:52.172194457 -0700
+@@ -103,14 +103,14 @@
+
+ ### system binaries
+ shCmd                   /bin/sh;
+-echoCmd                 /bin/echo;
++echoCmd                 /usr/bin/echo;
+ tarCmd                  /bin/tar;
+ wgetCmd                 /usr/bin/wget;
+ unameCmd                /usr/bin/uname;
+ ifconfigCmd             /sbin/ifconfig;
+-iptablesCmd             /sbin/iptables;
+-iptables-saveCmd        /sbin/iptables-save;
+-iptables-restoreCmd     /sbin/iptables-restore;
+-ip6tablesCmd            /sbin/ip6tables;
+-ip6tables-saveCmd       /sbin/ip6tables-save;
+-ip6tables-restoreCmd    /sbin/ip6tables-restore;
++iptablesCmd             /usr/sbin/iptables;
++iptables-saveCmd        /usr/sbin/iptables-save;
++iptables-restoreCmd     /usr/sbin/iptables-restore;
++ip6tablesCmd            /usr/sbin/ip6tables;
++ip6tables-saveCmd       /usr/sbin/ip6tables-save;
++ip6tables-restoreCmd    /usr/sbin/ip6tables-restore;
diff --git a/pcr/fwsnort/PKGBUILD b/pcr/fwsnort/PKGBUILD
index b4983658d..a4b666dfa 100644
--- a/pcr/fwsnort/PKGBUILD
+++ b/pcr/fwsnort/PKGBUILD
@@ -1,9 +1,9 @@
-# Contributor: Colin Shea <colin@evaryont.me>
-# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp>
+# Contributor (Arch)    : Colin Shea <colin@evaryont.me>
+# Maintainer  (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=fwsnort
-pkgver=1.6.3
-pkgrel=3
+pkgver=1.6.4
+pkgrel=1
 pkgdesc="application layer IDS/IPS by translating snort rules into iptables"
 arch=('any')
 url="http://www.cipherdyne.org/fwsnort/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl' 'perl-netaddr-ip' 'perl-iptables-parse' 'iptables' 'net-tools')
 makedepends=('wget')
 source=(http://www.cipherdyne.org/$pkgname/download/$pkgname-$pkgver.tar.bz2
-        'install_pl.patch')
+       )
 
 options=(emptydirs)
 
@@ -23,22 +23,22 @@ build() {
   # - removes the root check
   # - includes sbin as another place to check for binares
   # - fixes various paths for utilities & the man page
-  patch -p1 -i $srcdir/install_pl.patch
+  #patch -p1 -i $srcdir/install_pl.patch
 
   # -S skips installing the perl modules, which we did with packages
   # and --install-test-dir sets the INSTALL_ROOT to src/../test/fwsnort-test. An
   # easy way to collect all the files into 1
-  ./install.pl -S --install-test-dir
+  #./install.pl -S --install-test-dir
 }
 
-package() {
-  cp -r $srcdir/fwsnort-$pkgver/test/fwsnort-install/* -t $pkgdir
+#package() {
+  #cp -r $srcdir/fwsnort-$pkgver/test/fwsnort-install/* -t $pkgdir
   # delete references to $pkgdir from fwsnort; they were made by the installer
   # as part of installing to the test dir
-  cp -f $srcdir/fwsnort-$pkgver/fwsnort.conf $pkgdir/etc/fwsnort/fwsnort.conf
+  #cp -f $srcdir/fwsnort-$pkgver/fwsnort.conf $pkgdir/etc/fwsnort/fwsnort.conf
 
   # avoid a 'warning: directory permissions differ on etc/' line from pacman
-  chmod 755 $pkgdir/etc
-}
+  #chmod 755 $pkgdir/etc
+#}
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/python-gensim/PKGBUILD b/pcr/python-gensim/PKGBUILD
new file mode 100755
index 000000000..e00cab736
--- /dev/null
+++ b/pcr/python-gensim/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname=python-gensim
+pkgver=0.10.0
+pkgrel=1
+pkgdesc="Python framework for fast Vector Space Modelling"
+arch=('i686' 'x86_64')
+url="http://nlp.fi.muni.cz/projekty/gensim/"
+license=('LGPL')
+depends=('python-scipy')
+makedepends=('gcc' 'setuptools')
+conflicts=()
+source=("http://pypi.python.org/packages/source/g/gensim/gensim-${pkgver}.tar.gz")
+
+build() {
+    unset LDFLAGS
+    unset FFLAGS
+
+    cd ${srcdir}/gensim-${pkgver}
+
+    # python2 fix
+    for file in $(find . -name '*.py' -print); do
+        sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+        sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+    done
+
+    #python2 setup.py test
+    python2 setup.py build
+    python2 setup.py install --prefix=/usr --root=${pkgdir}
+    #install -D -m644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt TODO: where to get license?
+}
diff --git a/pcr/python2-vcstools/PKGBUILD b/pcr/python2-vcstools/PKGBUILD
new file mode 100644
index 000000000..19581f3f1
--- /dev/null
+++ b/pcr/python2-vcstools/PKGBUILD
@@ -0,0 +1,34 @@
+# Contributor (Arch)     : Georg Bremer <pkgbuild@dschoordsch.de>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+pkgname='python2-vcstools'
+pkgver=0.1.33
+pkgrel=1
+pkgdesc=""
+arch=('any')
+url="http://ros.org/"
+license=('BSD')
+groups=()
+depends=('python2' 'python2-yaml')
+makedepends=('python2-setuptools')
+optdepends=()
+provides=()
+conflicts=('vcstools')
+replaces=('vcstools')
+backup=()
+options=()
+install=
+source=("http://download.ros.org/downloads/vcstools/vcstools-$pkgver.tar.gz")
+
+
+noextract=()
+
+build() {
+  echo ""
+}
+
+package() {
+    cd "$srcdir/vcstools-$pkgver"
+    python2 setup.py install --root "$pkgdir"
+}
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/shogun/PKGBUILD b/pcr/shogun/PKGBUILD
new file mode 100644
index 000000000..9439143e0
--- /dev/null
+++ b/pcr/shogun/PKGBUILD
@@ -0,0 +1,38 @@
+# Contributor (Arch)     : Fabian Yamaguchi <fabian.yamaguchi@cs.uni-goettingen.de>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+
+# Based on shogun-git package by
+# Alex Babescu <alex.babescu@gmail.com>
+
+pkgname=shogun
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="Shogun - A Large Scale Machine Learning Toolbox"
+arch=('i686' 'x86_64')
+url="http://www.shogun-toolbox.org"
+license=('GPLv3')
+depends=('python2' 'python2-numpy' 'swig' 'hdf5' 'blas' 'lapack')
+makedepends=('git' 'python2' 'lzo2' 'glpk' 'gcc' 'make' 'pkg-config' 'libxml2')
+optdepends=('atlas-lapack' 'octave' 'doxygen' 'r')
+provides=('shogun')
+source=("http://shogun-toolbox.org/archives/shogun/releases/3.2/sources/shogun-3.2.0.tar.bz2")
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # msg "Starting make..."
+    
+  # python2 fix
+  # sed -i 's/PYTHON=python/PYTHON=python2/g' src/configure
+  # sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+  #     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+  # $(find ./ -name '*.py')
+
+  #cd src
+  #./configure --prefix=/usr
+  #make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  make DESTDIR="$pkgdir/" .r-install.sh
+} 
diff --git a/pcr/snort/PKGBUILD b/pcr/snort/PKGBUILD
index a92d8cb43..78eaa633e 100644
--- a/pcr/snort/PKGBUILD
+++ b/pcr/snort/PKGBUILD
@@ -1,37 +1,34 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Contributor (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
-# Contributor (Arch): Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
-# Contributor (Arch): dorphell <dorphell@archlinux.org>
-# Contributor (Arch): Gregor Ibic <gregor.ibic@intelicom.si>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Contributor (Arch)     : M0Rf30
+# Contributor (Arch)     : Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor (Arch)     : Hugo Doria <hugo@archlinux.org>
+# Contributor (Arch)     : Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
+# Contributor (Arch)     : dorphell <dorphell@archlinux.org>
+# Contributor (Arch)     : Gregor Ibic <gregor.ibic@intelicom.si>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=snort
-pkgver=2.9.3.1
-pkgrel=1
+pkgver=2.9.6.1
+pkgrel=2
 pkgdesc='A lightweight network intrusion detection system.'
 arch=('i686' 'x86_64')
 url='http://www.snort.org'
 license=('GPL')
-depends=('libdaq' 'libdnet' 'libpcap' 'pcre' 'zlib')
-makedepends=('ca-certificates')
-backup=('etc/conf.d/snort'
-        'etc/snort/snort.conf'
+depends=('libdaq' 'libdnet' 'libpcap' 'openssl' 'pcre' 'zlib')
+backup=('etc/snort/snort.conf'
         'etc/snort/threshold.conf'
-        'etc/snort/confreference.config'
+        'etc/snort/reference.config'
         'etc/snort/classification.config')
 options=('!makeflags' '!libtool')
 install='snort.install'
-source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'snort'
-        'snort.conf.d')
+source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"
+	"http://rules.emergingthreats.net/open/${pkgname}-2.9.0/emerging.rules.tar.gz"
+	'snort.service')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   ./configure --prefix=/usr --sysconfdir=/etc/snort --with-libpcap-includes=/usr/include/pcap \
-              --without-mysql --without-postgresql --without-oracle --without-odbc --enable-zlib \
-              --enable-ipv6
+	      --with-daq-includes=/usr/include --with-daq-libraries=/usr/lib/ \
+              --enable-zlib --disable-static-daq
   make
 }
 
@@ -44,8 +41,14 @@ package() {
 
   install -d -m755 "${pkgdir}/var/log/snort"
   install -D -m644 etc/{*.conf*,*.map} "${pkgdir}/etc/snort/"
-  install -D -m644 "${srcdir}/snort.conf.d" "${pkgdir}/etc/conf.d/snort"
-  install -D -m755 "${srcdir}/snort" "${pkgdir}/etc/rc.d/snort"
+
+# init service file
+  install -D -m644 ../snort.service $pkgdir/usr/lib/systemd/system/snort.service
 
   sed -i 's#/usr/local/lib/#/usr/lib/#' "${pkgdir}/etc/snort/snort.conf"
+
+# emerginthreats rules
+  echo 'include $RULE_PATH/emerging.conf' >> "${pkgdir}/etc/snort/snort.conf"
+  cp ${srcdir}/rules/* "${pkgdir}/etc/snort/rules"
 }
+
diff --git a/pcr/snort/snort.service b/pcr/snort/snort.service
new file mode 100644
index 000000000..d3d0da01f
--- /dev/null
+++ b/pcr/snort/snort.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Snort IDS system listening on '%I'
+
+[Service]
+Type=simple
+ExecStartPre=/usr/sbin/ip link set up dev %I
+ExecStart=/usr/bin/snort -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I
+
+[Install]
+Alias=multi-user.target.wants/snort@eth0.service