From de9ab185a1c49d54b0ab5cee79f016d663d90b10 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sat, 14 Jul 2012 17:40:19 -0300 Subject: initscript: updating package --- ...emove-run-nologin-before-leaving-rc.multi.patch | 28 ++++++++++++++++++++++ libre/initscripts/PKGBUILD | 13 +++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch (limited to 'libre') 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..3dc75df1c --- /dev/null +++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch @@ -0,0 +1,28 @@ +From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +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 +Signed-off-by: Dave Reisner +--- + 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..a25daabe2 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2012.06.28 -pkgrel=1 +pkgver=2012.07.5 +pkgrel=2 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') url="https://parabolagnulinux.org" @@ -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=('c95c3cd09975414fbb6719e4222ff74b' + '87f02d111e0c613dd9fc61a9613f9c92' '027576534885b8d5dded9be546057b12') -- cgit v1.2.3 From d1c720e0d937ab956225ca4ce869066cdcec325e Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 14 Jul 2012 18:07:12 -0300 Subject: libre/initscripts-2012.07.5 --- libre/initscripts/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index aee2585d9..ac9d98d27 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2012.06.28 +pkgver=2012.07.5 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -28,5 +28,5 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -md5sums=('21651eaba1fd34542c78f39c755cd171' +md5sums=('c95c3cd09975414fbb6719e4222ff74b' '027576534885b8d5dded9be546057b12') -- cgit v1.2.3 From a4d72c480892aecc4f2d61fb1887b1a67a3378f3 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 14 Jul 2012 18:13:14 -0300 Subject: libre/initscripts-2012.07.14 --- .../0001-remove-run-nologin-before-leaving-rc.multi.patch | 7 ++++--- libre/initscripts/PKGBUILD | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'libre') 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 index 3dc75df1c..a9b7a2423 100644 --- a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch +++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch @@ -18,11 +18,12 @@ 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 85ada99ca..cc509fdd3 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2012.07.5 +pkgver=2012.07.14 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -26,7 +26,7 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch" +# patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch" } package() { @@ -34,3 +34,6 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } +md5sums=('15e2f373be03b25b0033fd4fb4820d30' + 'ba32b9d723c20b38487669fb3c00d3d5' + '027576534885b8d5dded9be546057b12') -- cgit v1.2.3 From a8a2c7388922e286a6aa4bbd388a128aef9c720b Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sun, 15 Jul 2012 15:45:11 -0300 Subject: blender-libre: updating package --- libre/blender-libre/PKGBUILD | 23 +++++++------------- libre/blender-libre/boost-1.50.patch | 42 ++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 libre/blender-libre/boost-1.50.patch (limited to 'libre') 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 "//d" intern/ffmpeg/ffmpeg_compat.h sed -i "//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 + #include + +@@ -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 + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -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) -- cgit v1.2.3