Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

10 files changed, 328 insertions, 37 deletions

diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
index 2c11b4d30..f8fc7fd46 100644
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ b/artistic/blender-spacenav-libre/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=blender
 pkgname=blender-spacenav-libre
 pkgver=2.63a
-pkgrel=2.1
+pkgrel=3
 epoch=4
 pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,15 +18,19 @@ makedepends=('cmake' 'boost')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}" "${_pkgname}-libre")
 provides=("${_pkgname}=${pkgver}" "${_pkgname}-libre=${pkgver}")
-options=(!strip)
 install=${_pkgname}.install
-source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch)
-md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217')
+source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
+        ffmpeg-0.11.patch
+        boost-1.50.patch)
+md5sums=('31a60b3ce5466d965cb7e2648995e092'
+         '9e5649403e51654615d30b10bc460217'
+         '0bab80da07d980c47b8ce3cb998edaef')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
   patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
+  patch -Np1 < "${srcdir}"/boost-1.50.patch
   sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
   sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
 
@@ -60,10 +64,6 @@ build() {
 
   make $MAKEFLAGS
 
-#  cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \
-#    "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/
-#  cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi
-#  chmod 755 bmake
   make
 }
 
@@ -71,11 +71,4 @@ package() {
   cd "${srcdir}/${_pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
   python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-#  install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-#  cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \
-#    "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-#  cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \
-#    "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
 }
diff --git a/artistic/blender-spacenav-libre/boost-1.50.patch b/artistic/blender-spacenav-libre/boost-1.50.patch
new file mode 100644
index 000000000..fa698a3a6
--- /dev/null
+++ b/artistic/blender-spacenav-libre/boost-1.50.patch
@@ -0,0 +1,42 @@
+diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
+--- a/intern/cycles/util/util_cache.cpp	2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_cache.cpp	2012-07-15 14:19:34.893238929 -0300
+@@ -26,8 +26,6 @@
+ #include "util_path.h"
+ #include "util_types.h"
+ 
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp> 
+ #include <boost/algorithm/string.hpp>
+ 
+@@ -117,7 +115,7 @@
+ 		boost::filesystem::directory_iterator it(dir), it_end;
+ 
+ 		for(; it != it_end; it++) {
+-			string filename = it->path().filename();
++			string filename = it->path().filename().string();
+ 
+ 			if(boost::starts_with(filename, name))
+ 				if(except.find(filename) == except.end())
+diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
+--- a/intern/cycles/util/util_path.cpp	2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_path.cpp	2012-07-15 14:19:14.126293394 -0300
+@@ -26,8 +26,6 @@
+ 
+ #include <stdio.h>
+ 
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp> 
+ #include <boost/algorithm/string.hpp>
+ 
+@@ -60,7 +58,7 @@
+ 
+ string path_filename(const string& path)
+ {
+-	return boost::filesystem::path(path).filename();
++	return boost::filesystem::path(path).filename().string();
+ }
+ 
+ string path_dirname(const string& path)
diff --git a/libre-testing/luxrender-libre/PKGBUILD b/libre-testing/luxrender-libre/PKGBUILD
new file mode 100644
index 000000000..44df6f3c2
--- /dev/null
+++ b/libre-testing/luxrender-libre/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+pkgname=luxrender-libre
+pkgver=1.0rc2
+_pkgver=008805644181
+pkgrel=2
+pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+            'python: Python interface (pylux)')
+makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
+replaces=('luxrender')
+conflicts=('luxrender')
+provides=("luxrender=$pkgver")
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+        boost_1.50_fix.diff)
+md5sums=('1922ccce6f70e7d707b340e2415875cd'
+         '8c7774bb0c97aadd77d9e665d8fa4aab')
+
+build() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+
+  # fix for boost 1.50
+  # the boost::TIME_UTC has been renamed due to the conflict with C++11
+  patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=ON \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+  make DESTDIR="$pkgdir" install
+
+  # fix library path on x86_64
+  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/luxrender-libre/boost_1.50_fix.diff b/libre-testing/luxrender-libre/boost_1.50_fix.diff
new file mode 100644
index 000000000..c1aa0a8e2
--- /dev/null
+++ b/libre-testing/luxrender-libre/boost_1.50_fix.diff
@@ -0,0 +1,131 @@
+diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp
+--- luxrender-lux-008805644181/core/film.cpp	2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/film.cpp	2012-07-07 15:44:59.867492295 +0200
+@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte
+	int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth);
+	samplePerPass = xRealWidth * yRealHeight;
+
+-	boost::xtime_get(&creationTime, boost::TIME_UTC);
++	boost::xtime_get(&creationTime, boost::TIME_UTC_);
+
+	//Queryable parameters
+	AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution);
+@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) {
+	if (haltTime > 0) {
+		// Check if we have met the enough rendering time condition
+		boost::xtime t;
+-		boost::xtime_get(&t, boost::TIME_UTC);
++		boost::xtime_get(&t, boost::TIME_UTC_);
+		if (t.sec - creationTime.sec > haltTime)
+			enoughSamplesPerPixel = true;
+	}
+diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp
+--- luxrender-lux-008805644181/core/photonmap.cpp	2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/photonmap.cpp	2012-07-07 15:44:59.870825579 +0200
+@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen
+
+	boost::xtime photonShootingStartTime;
+	boost::xtime lastUpdateTime;
+-	boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC);
+-	boost::xtime_get(&lastUpdateTime, boost::TIME_UTC);
++	boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_);
++	boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_);
+	u_int nshot = 0;
+	while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) {
+		// Dade - print some progress information
+		boost::xtime currentTime;
+-		boost::xtime_get(&currentTime, boost::TIME_UTC);
++		boost::xtime_get(&currentTime, boost::TIME_UTC_);
+		if (currentTime.sec - lastUpdateTime.sec > 5) {
+			ss.str("");
+			ss << "Photon shooting progress: Direct[" << directPhotons.size();
+@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen
+		return;
+
+	boost::xtime photonShootingEndTime;
+-	boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC);
++	boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_);
+	LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)";
+
+	if (computeRadianceMap) {
+@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen
+		for (u_int i = 0; i < radiancePhotons.size(); ++i) {
+			// Dade - print some progress info
+			boost::xtime currentTime;
+-			boost::xtime_get(&currentTime, boost::TIME_UTC);
++			boost::xtime_get(&currentTime, boost::TIME_UTC_);
+			if (currentTime.sec - lastUpdateTime.sec > 5) {
+				LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)";
+
+@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen
+
+
+		boost::xtime radianceComputeEndTime;
+-		boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC);
++		boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_);
+		LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)";
+	}
+
+diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp
+--- luxrender-lux-008805644181/core/renderfarm.cpp	2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/renderfarm.cpp	2012-07-07 15:44:59.870825579 +0200
+@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+	// Dade - thread to update the film with data from servers
+
+	boost::xtime reft;
+-	boost::xtime_get(&reft, boost::TIME_UTC);
++	boost::xtime_get(&reft, boost::TIME_UTC_);
+
+	while (filmUpdaterThread->signal == SIG_NONE) {
+		// Dade - check signal every 1 sec
+@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+		for(;;) {
+			// Dade - sleep for 1 sec
+			boost::xtime xt;
+-			boost::xtime_get(&xt, boost::TIME_UTC);
++			boost::xtime_get(&xt, boost::TIME_UTC_);
+			xt.sec += 1;
+			boost::thread::sleep(xt);
+
+diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp
+--- luxrender-lux-008805644181/film/fleximage.cpp	2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/film/fleximage.cpp	2012-07-07 15:44:59.877492150 +0200
+@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres,
+	m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != "";
+
+	// init timer
+-	boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC);
++	boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_);
+	lastWriteFLMTime = lastWriteImageTime;
+ }
+
+@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter
+ {
+	// Check write output interval
+	boost::xtime currentTime;
+-	boost::xtime_get(&currentTime, boost::TIME_UTC);
++	boost::xtime_get(&currentTime, boost::TIME_UTC_);
+	bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval);
+	bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval);
+
+@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter
+	// WriteImage can take a very long time to be executed (i.e. by saving
+	// the film. It is better to refresh timestamps after the
+	// execution of WriteImage instead than before.
+-	boost::xtime_get(&currentTime, boost::TIME_UTC);
++	boost::xtime_get(&currentTime, boost::TIME_UTC_);
+
+	if (timeToWriteImage)
+		lastWriteImageTime = currentTime;
+diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h
+--- luxrender-lux-008805644181/renderers/sppmrenderer.h	2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h	2012-07-07 15:44:59.874158864 +0200
+@@ -126,7 +126,7 @@ public:
+	{
+		while (state == PAUSE && !boost::this_thread::interruption_requested()) {
+			boost::xtime xt;
+-			boost::xtime_get(&xt, boost::TIME_UTC);
++			boost::xtime_get(&xt, boost::TIME_UTC_);
+			xt.sec += 1;
+			boost::thread::sleep(xt);
+		}
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 5dd14405d..b4ba9f827 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=blender
 pkgname=blender-libre
 pkgver=2.63a
-pkgrel=2.1
+pkgrel=3
 epoch=4
 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,15 +18,19 @@ makedepends=('cmake' 'boost')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
-options=(!strip)
 install=${_pkgname}.install
-source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch)
-md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217')
+source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
+        ffmpeg-0.11.patch
+        boost-1.50.patch)
+md5sums=('31a60b3ce5466d965cb7e2648995e092'
+         '9e5649403e51654615d30b10bc460217'
+         '0bab80da07d980c47b8ce3cb998edaef')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
   patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
+  patch -Np1 < "${srcdir}"/boost-1.50.patch
   sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
   sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
 
@@ -60,10 +64,6 @@ build() {
 
   make $MAKEFLAGS
 
-#  cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \
-#    "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/
-#  cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi
-#  chmod 755 bmake
   make
 }
 
@@ -71,11 +71,4 @@ package() {
   cd "${srcdir}/${_pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
   python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-#  install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-#  cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \
-#    "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-#  cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \
-#    "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
 }
diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch
new file mode 100644
index 000000000..fa698a3a6
--- /dev/null
+++ b/libre/blender-libre/boost-1.50.patch
@@ -0,0 +1,42 @@
+diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
+--- a/intern/cycles/util/util_cache.cpp	2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_cache.cpp	2012-07-15 14:19:34.893238929 -0300
+@@ -26,8 +26,6 @@
+ #include "util_path.h"
+ #include "util_types.h"
+ 
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp> 
+ #include <boost/algorithm/string.hpp>
+ 
+@@ -117,7 +115,7 @@
+ 		boost::filesystem::directory_iterator it(dir), it_end;
+ 
+ 		for(; it != it_end; it++) {
+-			string filename = it->path().filename();
++			string filename = it->path().filename().string();
+ 
+ 			if(boost::starts_with(filename, name))
+ 				if(except.find(filename) == except.end())
+diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
+--- a/intern/cycles/util/util_path.cpp	2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_path.cpp	2012-07-15 14:19:14.126293394 -0300
+@@ -26,8 +26,6 @@
+ 
+ #include <stdio.h>
+ 
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp> 
+ #include <boost/algorithm/string.hpp>
+ 
+@@ -60,7 +58,7 @@
+ 
+ string path_filename(const string& path)
+ {
+-	return boost::filesystem::path(path).filename();
++	return boost::filesystem::path(path).filename().string();
+ }
+ 
+ string path_dirname(const string& path)
diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
new file mode 100644
index 000000000..a9b7a2423
--- /dev/null
+++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
@@ -0,0 +1,29 @@
+From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 3 Jul 2012 22:28:05 -0400
+Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
+To: arch-projects@archlinux.org
+
+systemd-186 writes this file when running systemd-tmpfiles, but
+initscripts never removes it. This disallows all non-root logins.
+
+Reported-by: Dan McGee <dan@archlinux.org>
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+---
+ rc.multi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/rc.multi b/rc.multi
+index daf2372..7d4acaa 100755
+--- a/rc.multi
++++ b/rc.multi
+@@ -31,4 +31,6 @@ run_hook multi_end
+ 
+ bootlogd_stop
+ 
++rm -f /run/nologin
++
+ # vim: set ts=2 sw=2 noet:
+-- 
+1.7.11.1
+
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index aee2585d9..cc509fdd3 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.06.28
+pkgver=2012.07.14
 pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
@@ -21,12 +21,19 @@ optdepends=('bridge-utils: Network bridging support'
 makedepends=(asciidoc)
 install=initscripts.install
 source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
+        0001-remove-run-nologin-before-leaving-rc.multi.patch
         'wireless.conf.d')
 
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+#  patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
+}
+
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('21651eaba1fd34542c78f39c755cd171'
+md5sums=('15e2f373be03b25b0033fd4fb4820d30'
+         'ba32b9d723c20b38487669fb3c00d3d5'
          '027576534885b8d5dded9be546057b12')
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index b577f0cf1..410a3dd2b 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -4,7 +4,7 @@
 # Run `makepkg -srp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.9.4
+pkgver=1.9.4.2
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
@@ -57,6 +57,6 @@ package() {
     find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
     find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
-md5sums=('dbf83bc5fae25877f8f1444c67fcc706'
-         '179a9b8a716e1de8e6afba3d43c3ebef'
-         'ec809a0c1f787dc53c896c391d32ef6e')
+md5sums=('3a9191e729a4547370f756ba831cad77'
+         'a8da851ee560ce54c7c5044dfb5042f0'
+         '8dab4575128cf33941a577bfb500c417')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index c8b13d906..68939a103 100644
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -2,7 +2,7 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.9.4
+pkgver=1.9.4.2
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'