Merge branch 'master' of vparabola:abslibre

20 files changed, 407 insertions, 81 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 1ed9e7d46..9590f1a83 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $
+# $Id: PKGBUILD 214251 2014-06-04 14:43:58Z dreisner $
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=filesystem
-pkgver=2013.05
-pkgrel=2.2
+pkgver=2014.05
+pkgrel=2
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,6 +21,26 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
         'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
         'locale.sh')
+md5sums=('e26a6b21c1e154e87a5c45e8b8c366fd'
+         '6be47d893fd49b2e4a8c0e811b350861'
+         '9e4533df61f0c82d6b2e2371f7376282'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '932af5f313265a774ec5995d9e720025'
+         '2ef2429c2c98d0883906aa6f5363be80'
+         '693c97f2c9a519bb97a17008e92c2b74'
+         '1745349eb24ed21b4cfaa6f423bddb76'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         'f45389e116ab0b9e9968287617d27c7d'
+         '0b6f835598c7640184e476057b3c7722'
+         'a8a962370cd0128465d514e6a1f74130'
+         'd5732ffdb3488e1383d4ea199343e767'
+         '4fab2b798deff348e04f05152111aae0')
 
 build() {
 	cd ${srcdir}
@@ -53,7 +73,7 @@ package() {
 		install -m600 ${srcdir}/${f} etc/
 	done
 	touch etc/parabola-release
-	ln -s parabola-release etc/arch-release
+	ln -sv parabola-release etc/arch-release
 	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
 	install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
 
@@ -112,23 +132,3 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
-md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
-         '6be47d893fd49b2e4a8c0e811b350861'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '0e145e18fea8fd190b30d45764f5707c'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
-         '0b6f835598c7640184e476057b3c7722'
-         'a8a962370cd0128465d514e6a1f74130'
-         'd5732ffdb3488e1383d4ea199343e767'
-         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index c04374422..62e553ce4 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -25,15 +25,19 @@ post_upgrade() {
 	_addgroup games   -g 50
 	_addgroup uucp    -g 14
 	_addgroup http    -g 33
-	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false
+	_adduser  http    -u 33 -d /srv/http -g http -s /usr/bin/nologin
 	_addgroup scanner -g 96
 	_addgroup rfkill  -g 24
 	_addgroup lock    -g 54
 	_addgroup uuidd   -g 68
-	_adduser uuidd    -u 68 -d / -g uuidd -s /sbin/nologin
+	_adduser uuidd    -u 68 -d / -g uuidd -s /usr/bin/nologin
 	_addgroup dbus    -g 81
-	_adduser dbus     -u 81 -d / -g dbus -s /sbin/nologin
+	_adduser dbus     -u 81 -d / -g dbus -s /usr/bin/nologin
 	_addgroup systemd-journal -g 190
+	_addgroup systemd-journal-gateway -g 191
+	_adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin
+	_addgroup systemd-timesync -g 192
+	_adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin
 
 	# sync gshadow to group (fixes FS#19869)
 	if ! grep -q '^lock:' etc/gshadow; then
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 6c91b292f..0d0918cbb 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -33,3 +33,5 @@ power:x:98:
 nobody:x:99:
 users:x:100:
 systemd-journal:x:190:
+systemd-journal-gateway:x:191:
+systemd-timesync:x:192:
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh
index 5fd4174d5..3cfc89c1b 100644
--- a/libre/filesystem/locale.sh
+++ b/libre/filesystem/locale.sh
@@ -9,11 +9,10 @@ elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
   . "$HOME/.config/locale.conf"
 elif [ -r /etc/locale.conf ]; then
   . /etc/locale.conf
-elif [ -r /etc/rc.conf ]; then
-  LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
 fi
 
-export LANG="${LANG:-C}"
+LANG=${LANG:-C}
+export LANG
 [ -n "$LC_CTYPE" ]          && export LC_CTYPE
 [ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
 [ -n "$LC_TIME" ]           && export LC_TIME
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
index 671fc486e..b65b7cc8a 100644
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -7,3 +7,5 @@ http:x:33:33:http:/srv/http:/bin/false
 uuidd:x:68:68:uuidd:/:/sbin/nologin
 dbus:x:81:81:dbus:/:/sbin/nologin
 nobody:x:99:99:nobody:/:/bin/false
+systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/bin/false
+systemd-timesync:x:192:192:systemd-timesync:/:/bin/false
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index 336cb4dd6..a4a345635 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 107420 2014-03-17 10:06:48Z alucryd $
+# $Id: PKGBUILD 112452 2014-06-02 10:30:28Z alucryd $
 # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
 # Contributor (Arch): TingPing <tingping@tingping.se>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=hexchat
 pkgname=hexchat-libre
-pkgver=2.9.6.1
-pkgrel=2
+pkgver=2.10.0
+pkgrel=1
 pkgdesc='A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://hexchat.github.io/'
 license=('GPL')
-depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
-makedepends=('perl' 'python')
+depends=('dbus-glib' 'desktop-file-utils' 'gtk2' 'libcanberra' 'libnotify' 'libproxy' 'pciutils')
+makedepends=('intltool' 'iso-codes' 'perl' 'python')
 optdepends=('enchant: Spell check'
             'perl: Perl plugin'
             'python: Python plugin')
@@ -21,7 +21,7 @@ replaces=($_pkgname)
 conflicts=($_pkgname)
 provides=($_pkgname=$pkgver)
 source=("http://dl.hexchat.org/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
-sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470')
+sha256sums=('a0247f1e12379154d0719d9c6861dc22817b588562653bb9d3626863d8eca916')
 
 build() {
   cd ${_pkgname}-${pkgver}
@@ -33,7 +33,7 @@ build() {
   sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c
   sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n"\\\n		"NAME Open Link in Private Icecat Window\\n"		"CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c
 
-  ./configure --prefix='/usr' --enable-{python='python3.4',shm,spell='libsexy',textfe}
+  ./configure --prefix='/usr' --enable-{python='python3.4',textfe}
   make
 }
 
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 5371822a3..bdeebdb56 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109662 2014-04-17 21:37:35Z seblu $
+# $Id: PKGBUILD 112360 2014-06-01 08:43:39Z fyan $
 # Maintainer (Arch): Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
@@ -18,7 +18,7 @@ _basekernel=3.14
 #_sublevel=3
 #_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=2
+pkgrel=3
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
index f26e026c3..a21694e5d 100644
--- a/libre/vim-runtime/PKGBUILD
+++ b/libre/vim-runtime/PKGBUILD
@@ -12,7 +12,7 @@ _patchlevel=307
 __hgrev=54d96e3b2eec
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
diff --git a/libre/winetricks-libre/PKGBUILD b/libre/winetricks-libre/PKGBUILD
new file mode 100644
index 000000000..9b74efa9c
--- /dev/null
+++ b/libre/winetricks-libre/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 107291 2014-03-16 16:05:59Z lfleischer $
+# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor (Arch): Laurent Carlier <lordheavym@gmail.com>
+# Contributor (Arch): DsTr <dstr@gmail.com>
+# Contributor (Arch): Allan McRae <allan@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Gaming4JC <gaming4jc2@yahoo.com>
+
+_pkgname=winetricks
+pkgname=winetricks-libre
+pkgver=1.0
+pkgrel=1
+pkgdesc='Script to install various redistributable runtime libraries in Wine (a libre fork of winetricks)'
+url='https://github.com/g4jc/winetricks-libre'
+license=('LGPL')
+arch=('any')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname)
+optdepends=('zenity: GUI for GNOME desktop'
+            'kdebase-kdialog: GUI for KDE desktop')
+source=("https://github.com/g4jc/${pkgname}/archive/${pkgver}.tar.gz")
+md5sums=('aec9a4c60f793b25bd9df79e3c336994')
+
+package() {
+  depends=('wine' 'cabextract' 'unzip' 'xorg-xmessage')
+
+  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  ln -sv ${pkgname} "${pkgdir}/usr/bin/${_pkgname}"
+}
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index 1214dc947..50bee2561 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $
+# $Id: PKGBUILD 213744 2014-05-28 22:09:31Z eric $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 _pkgname=xchat
 pkgname=xchat-libre
 pkgver=2.8.8
-pkgrel=13
+pkgrel=14
 pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xchat.org/"
@@ -18,7 +18,6 @@ depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
 makedepends=('tcl' 'perl' 'python2' 'librsvg')
 optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
             'python2: for python plugin')
-options=('!libtool')
 install=xchat.install
 source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz
         http://xchat.org/files/icons/xchat-svg.tar.bz2
diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
index acdf8439b..a0aa863a9 100644
--- a/nonprism/claws-mail-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 213598 2014-05-26 13:43:12Z andyrtr $
+# $Id: PKGBUILD 213829 2014-05-29 18:40:04Z andyrtr $
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=claws-mail
 pkgname=$_pkgname-nonprism
 pkgver=3.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based e-mail client, without libgdata support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
index d7593d2a0..d6ae8811d 100644
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205034 2014-02-03 14:10:06Z foutrelis $
+# $Id: PKGBUILD 213831 2014-05-29 19:02:38Z foutrelis $
 # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
 _pkgname=pidgin
 pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
 pkgver=2.10.9
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
@@ -107,6 +107,10 @@ package_libpurple-nonprism(){
   for _dir in libpurple share/sounds share/ca-certs m4macros po; do
     make -C "$_dir" DESTDIR="$pkgdir" install
   done
+
+  # Remove GConf schema file
+  rm "$pkgdir/etc/gconf/schemas/purple.schemas"
+  rmdir "$pkgdir"/etc{/gconf{/schemas,},}
 }
 
 package_finch-nonprism(){
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