Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre

10 files changed, 248 insertions, 139 deletions

diff --git a/pcr/apparmor/PKGBUILD b/pcr/apparmor/PKGBUILD
index cb1bbd75b..ad6cbcdf9 100644
--- a/pcr/apparmor/PKGBUILD
+++ b/pcr/apparmor/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=apparmor
 pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim)
-pkgver=2.9.0
+pkgver=2.9.1
 #_majorver=${pkgver%.*}  # bleh, AUR...
 _majorver=2.9
 pkgrel=1
diff --git a/pcr/apparmor/PKGBUILD.save b/pcr/apparmor/PKGBUILD.save
new file mode 100644
index 000000000..24377b098
--- /dev/null
+++ b/pcr/apparmor/PKGBUILD.save
@@ -0,0 +1,161 @@
+# Maintainer : Aurelien Desbriers <aurelien@hackers.camp>
+# Contributor: Thomas Kuther <archlinux@kuther.net>
+# Contributor: Gianni Vialetto <gianni at rootcube dot net>
+# Contributor: Paul N. Maxwell <msg dot maxwel at gmail dot com>
+# Contributor: Thomas Mudrunka <harvie@@email..cz>
+# Contributor: Max Fierke <max@maxfierke.com>
+
+pkgbase=apparmor
+pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim)
+pkgver=2.9.1
+#_majorver=${pkgver%.*}  # bleh, AUR...
+_majorver=2.9
+pkgrel=1
+pkgdesc='Linux application security framework - mandatory access control for programs'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://wiki.apparmor.net/index.php/Main_Page'
+makedepends=('bzr' 'flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit')
+
+source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname-$pkgver.tar.gz"
+        "apparmor_load.sh"
+        "apparmor_unload.sh"
+        "apparmor.service")
+
+md5sums=('0e036d69d7ebfb9cc113ed301b8a6c5d'
+         'a657bc9e2670509e489615e63ba718c9'
+         'f083aa1926430bc48eb332f1b77fca08'
+         '872f48da4f60f669f89e6f79f8c67171')
+
+#Configuration
+core_perl_dir='/usr/bin/core_perl'
+export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man"
+export MAKEFLAGS+=" POD2HTML=${core_perl_dir}/pod2html"
+export MAKEFLAGS+=" PROVE=${core_perl_dir}/prove"
+export MAKEFLAGS+=" PYTHON=python3"
+
+
+prepare() {
+  cd "${srcdir}/${pkgbase}-${pkgver}/parser"
+  # avoid depend on texlive-latex
+  sed -i -e 's/pdflatex/true/g' Makefile
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/utils"
+  # Set Arch paths
+  sed -e '/logfiles/ s/syslog /syslog.log /g' \
+      -e '/logfiles/ s/messages/messages.log/g' \
+      -e '/parser/ s# /sbin/# /usr/bin/#g' \
+      -i logprof.conf
+  # do not build/install vim file with utils package (causes ref to $srcdir and wrong location)
+  sed -i '/vim/d' Makefile
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d"
+  # /usr merge vs. profiles
+  for i in `find . -name "*sbin*"`; do sed -i -e 's@sbin@bin@g' ${i} && mv ${i} ${i/sbin/bin}; done
+  for i in klogd ping syslog-ng syslogd; do 
+    sed -e "s@/bin/${i}@/usr/bin/${i}@g" \
+        -e "s@bin\.${i}@usr\.bin\.${i}@g" \
+        -i bin.${i} && \
+    mv bin.${i} usr.bin.${i}
+  done
+}
+
+build() {
+  msg2 "Building: apparmor-libapparmor"
+  cd "${srcdir}/${pkgbase}-${pkgver}/libraries/libapparmor"
+  unset PERL_MM_OPT
+  NOCONFIGURE=1 ./autogen.sh
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-perl --with-python
+  make
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  msg2 "Building: apparmor-parser"
+  make -C parser
+
+  msg2 "Building: apparmor-utils"
+  make -C utils
+
+  msg2 "Building: apparmor-profiles"
+  make -C profiles
+
+  msg2 "Building: apparmor-pam"
+  make -C changehat/pam_apparmor
+
+  msg2 "Building: apparmor-vim"
+  make -C utils/vim -j1
+}
+
+package_apparmor() {
+  pkgdesc='Linux application security framework - mandatory access control for programs (metapackage)'
+  depends=(apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim)
+  optdepends=('linux-apparmor: an arch kernel with AppArmor patches')
+  install='apparmor.install'
+}
+
+package_apparmor-parser() {
+  pkgdesc='AppArmor parser - loads AA profiles to kernel module'
+  depends=('apparmor-libapparmor' 'bash')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C parser install DESTDIR=${pkgdir}
+  mv "${pkgdir}/lib" "${pkgdir}/usr/lib"
+  mv "${pkgdir}/sbin" "${pkgdir}/usr/bin"
+}
+
+package_apparmor-libapparmor() {
+  pkgdesc='AppArmor library'
+  makedepends=('swig' 'perl' 'python')
+  depends=('python')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C libraries/libapparmor install DESTDIR=${pkgdir}
+  install -D -m644 "libraries/libapparmor/swig/perl/LibAppArmor.pm" "${pkgdir}/usr/lib/perl5/vendor_perl/"
+}
+
+package_apparmor-utils() {
+  pkgdesc='AppArmor userspace utilities'
+  arch=('any')
+  depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' 
+    'perl-file-tail' 'perl-rpc-xml' 'python' 'bash')
+  install='apparmor-utils.install'
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C utils install DESTDIR=${pkgdir} BINDIR=${pkgdir}/usr/bin
+  install -D -m755 "${srcdir}/apparmor_load.sh" "${pkgdir}/usr/bin/apparmor_load.sh"
+  install -D -m755 "${srcdir}/apparmor_unload.sh" "${pkgdir}/usr/bin/apparmor_unload.sh"
+  install -D -m644 "${srcdir}/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service"
+}
+
+package_apparmor-profiles() {
+  pkgdesc='AppArmor sample pre-made profiles'
+  depends=(apparmor-parser)
+  arch=('any')
+
+  # backup /etc/apparmor.d/* so using logprof is safe
+  cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d"
+  declare -a _profiles=(`find -type f|sed 's@./@etc/apparmor.d/@'`)
+  backup=(`echo ${_profiles[@]}`)
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C profiles install DESTDIR=${pkgdir}
+}
+
+package_apparmor-pam() {
+  pkgdesc='AppArmor PAM library'
+  depends=('apparmor-libapparmor' 'pam')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C changehat/pam_apparmor install DESTDIR=${pkgdir}/usr
+  install -D -m644 changehat/pam_apparmor/README "${pkgdir}/usr/share/doc/apparmor/README.pam_apparmor"
+}
+package_apparmor-vim() {
+  pkgdesc='AppArmor VIM support'
+  arch=('any')
+  depends=('vim')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/utils/vim"
+  install -D -m644 apparmor.vim \
+    "${pkgdir}/usr/share/vim/vimfiles/syntax/apparmor.vim"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/bup/PKGBUILD b/pcr/bup/PKGBUILD
deleted file mode 100644
index eeea2b521..000000000
--- a/pcr/bup/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor (Arch): Bram Schoenmakers <me@bramschoenmakers.nl>
-# Contributor (Arch): henning mueller <henning@orgizm.net>
-# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io>
-
-# If you'd like to have documentation, please set the variable below to 1.
-# This implies installing pandoc, which in turn depends on many Haskell packages.
-# Which you can build if you wish.
-_havedocs=0
-
-pkgname=bup
-pkgver=0.25rc1
-_pkgver=0.25-rc1
-pkgrel=2
-pkgdesc="Backup tool using git pack files."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://github.com/apenwarr/bup"
-license=('GPL')
-depends=('python2-fuse' 'par2cmdline' 'python' 'git')
-[ $_havedocs = 1 ] && makedepends=('haskell-pandoc')
-source=("https://github.com/apenwarr/${pkgname}/archive/${pkgname}-${_pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${_pkgver}"
-
-  find . -name \*.py | xargs sed -i 's:env python:env python2:'
-  sed -i 's:PYTHON=python:PYTHON=python2:' Makefile
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${_pkgver}"
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/pcr/gnoduino/PKGBUILD b/pcr/gnoduino/PKGBUILD
new file mode 100644
index 000000000..329c5a5bd
--- /dev/null
+++ b/pcr/gnoduino/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer : Aurelien Desbriers <aurelien@hackers.camp>
+# Contributor: speps <speps at aur dot archlinux dot org>
+
+pkgname=gnoduino
+pkgver=0.5.1
+pkgrel=1
+pkgdesc="An implementation of well-known Arduino IDE for GNOME"
+arch=(any)
+url="http://gnome.eu.org/index.php/Gnoduino"
+license=('GPL')
+depends=('avr-libc' 'avrdude' 'avr-binutils' 'gcc-avr' 'pyxdg'
+         'pygtksourceview2' 'python2-pyserial'
+         'python2-gconf' 'desktop-file-utils')
+makedepends=('python2-distribute')
+install="$pkgname.install"
+source=("http://gnome.eu.org/$pkgname-$pkgver.tar.gz")
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # do not install gconf schema
+  sed -i "/installSchema.*)$/d" setup.py
+
+  # python2 shebang
+  sed -i "s|bin/python$|&2|" `find . -name "*.py"`
+}
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  python2 setup.py install --root="$pkgdir/"
+
+  # gconf schema
+  install -Dm644 data/$pkgname.schemas \
+    "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/gnoduino/gnoduino.install b/pcr/gnoduino/gnoduino.install
new file mode 100644
index 000000000..fd110bee7
--- /dev/null
+++ b/pcr/gnoduino/gnoduino.install
@@ -0,0 +1,23 @@
+pkgname=gnoduino
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  post_remove
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
diff --git a/pcr/lynis/PKGBUILD b/pcr/lynis/PKGBUILD
index c6b6cca03..9221aae5d 100644
--- a/pcr/lynis/PKGBUILD
+++ b/pcr/lynis/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>
 # Contributor: Levente Polyak <levente[at]leventepolyak[dot]net>
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=lynis
-pkgver=1.6.2
-pkgrel=2
+_pkgname=Lynis
+pkgver=1.6.4
+pkgrel=1
 pkgdesc='Security and system auditing tool to harden Unix/Linux systems'
 url='http://cisofy.com/lynis/'
 license=('GPL3')
@@ -14,10 +15,15 @@ depends=('sh')
 optdepends=('net-tools: networking tests'
             'bash-completion: completion for bash')
 install=lynis.install
-source=(http://cisofy.com/files/${pkgname}-${pkgver}.tar.gz)
+source=(https://github.com/CISOfy/${_pkgname}/archive/${pkgver}.tar.gz)
+
+prepare() {
+  cd ${_pkgname}-${pkgver}
+  sed -e 's|/path/to/lynis|/usr/bin/lynis|g' -i extras/systemd/lynis.service
+}
 
 package() {
-  cd ${pkgname}
+  cd ${_pkgname}-${pkgver}
 
   # profile
   install -Dm 644 default.prf "${pkgdir}/etc/${pkgname}/default.prf"
@@ -37,7 +43,11 @@ package() {
   install -Dm 644 "${pkgname}.8" "${pkgdir}/usr/share/man/man8/${pkgname}.8"
 
   # completion
-  install -Dm 644 dev/bash_completion.d/${pkgname} "${pkgdir}/usr/share/bash-completion/completions/${pkgname}"
+  install -Dm 644 extras/bash_completion.d/${pkgname} "${pkgdir}/usr/share/bash-completion/completions/${pkgname}"
+
+  # systemd
+  install -d "${pkgdir}/usr/lib/systemd/system/"
+  install -m 644 extras/systemd/{lynis.service,lynis.timer} "${pkgdir}/usr/lib/systemd/system/"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/pcr/owncloud-app-roundcube/PKGBUILD b/pcr/owncloud-app-roundcube/PKGBUILD
index 8b3a9beb0..063117ead 100644
--- a/pcr/owncloud-app-roundcube/PKGBUILD
+++ b/pcr/owncloud-app-roundcube/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 103944 2014-01-13 20:31:53Z spupykin $
-# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Parabola Aurélien Desbrières <aurelien@hackers.guru>
+# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=owncloud-app-roundcube
-pkgver=1.3.1
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="Roundcubemail integration for owncloud"
 arch=('any')
@@ -12,9 +11,9 @@ license=('GPL')
 depends=('owncloud')
 makedepends=()
 options=('!strip')
-source=("https://github.com/hypery2k/owncloud/releases/download/v$pkgver/roundcube.zip")
+source=("$pkgname-$pkgver.zip::https://github.com/hypery2k/owncloud/archive/v$pkgver/roundcube.tar.gz")
 
 package() {
   install -d ${pkgdir}/usr/share/webapps/owncloud/apps
-  cp -a ${srcdir}/roundcube ${pkgdir}/usr/share/webapps/owncloud/apps/roundcube
+  cp -a ${srcdir}/owncloud-$pkgver/roundcube/src/main/php ${pkgdir}/usr/share/webapps/owncloud/apps/roundcube
 }
diff --git a/pcr/spyder/PKGBUILD b/pcr/spyder/PKGBUILD
deleted file mode 100644
index 1e9c456a1..000000000
--- a/pcr/spyder/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor (Arch)     : Muflone http://url.muflone.com/contacts
-# Contributor (Arch)     : Francois Boulogne <fboulogne@april.org>
-# Contributor (Arch)     : TDY <tdy@gmx.com>
-# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
-
-pkgname=spyder
-pkgver=2.2.5
-pkgrel=2
-pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.'
-arch=('any')
-url='http://code.google.com/p/spyderlib/'
-license=('MIT')
-install="${pkgname}.install"
-depends=('python2-pyqt4' 'python2-pyflakes' 'desktop-file-utils' 'gtk-update-icon-cache' 'python2-pyzmq' 'python2-pygments')
-makedepends=('python2-sphinx' 'python2-setuptools')
-optdepends=('python2-pylint: powerful code analysis'
-            'ipython2: enhanced Python interpreter'
-            'python2-rope: editor code completion, calltips and go-to-definition'
-            'python2-sphinx: rich text help on the object inspector'
-            'python2-numpy: N-dimensional arrays'
-            'python2-scipy: signal/image processing'
-            'python2-psutil: memory/CPU usage in the status bar'
-            'python2-h5py: HDF5 support'
-            'python2-matplotlib: interactive 2D/3D data plotting'
-            'pep8-python2: real-time code style analysis'
-            'python2-sympy: symbolic mathematics for the IPython console')
-source=("http://spyderlib.googlecode.com/files/${pkgname}-${pkgver}.zip" 
-        "pylint.patch")
-md5sums=('1c9aa650dae9f883616e917803f8a3be'
-         '3fe95915036634841b619670ad947e96')
-
-prepare() {
-  patch -p0 < "pylint.patch"
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-  # Install license file
-  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  # Install icon and desktop file
-  install -D -m644 "scripts/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "spyderlib/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-  # Remove useless spyder_win_post_install script
-  rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py"
-}
diff --git a/pcr/spyder/pylint.patch b/pcr/spyder/pylint.patch
deleted file mode 100644
index faa1edcf1..000000000
--- a/pcr/spyder/pylint.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur spyder-2.2.5/spyderplugins/widgets/pylintgui.py spyder-2.2.5-patched/spyderplugins/widgets/pylintgui.py
---- spyder-2.2.5/spyderplugins/widgets/pylintgui.py	2013-10-12 20:35:52.000000000 +0200
-+++ spyder-2.2.5-patched/spyderplugins/widgets/pylintgui.py	2013-11-12 00:42:22.809509805 +0100
-@@ -40,7 +40,7 @@
- _ = get_translation("p_pylint", dirname="spyderplugins")

- 

- 

--PYLINT_PATH = programs.find_program('pylint')

-+PYLINT_PATH = programs.find_program('pylint2')

- 

- 

- def get_pylint_version():

-@@ -48,13 +48,13 @@
-     global PYLINT_PATH

-     if PYLINT_PATH is None:

-         return

--    process = subprocess.Popen(['pylint', '--version'],

-+    process = subprocess.Popen(['pylint2', '--version'],

-                                stdout=subprocess.PIPE, stderr=subprocess.PIPE,

-                                cwd=osp.dirname(PYLINT_PATH),

-                                shell=True if os.name == 'nt' else False)

-     lines = to_unicode_from_fs(process.stdout.read()).splitlines()

-     if lines:

--        match = re.match('(pylint|pylint-script.py) ([0-9\.]*)', lines[0])

-+        match = re.match('(pylint2|pylint-script.py) ([0-9\.]*)', lines[0])

-         if match is not None:

-             return match.groups()[1]

- 

diff --git a/pcr/spyder/spyder.install b/pcr/spyder/spyder.install
deleted file mode 100644
index 62a045c59..000000000
--- a/pcr/spyder/spyder.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}