summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-12-06 02:18:52 -0800
committerroot <root@rshg054.dnsready.net>2012-12-06 02:18:52 -0800
commit3f0c4efbf72adbd091565fcc39ad1d09c92be5d0 (patch)
treef9b2abf9234090740a20840b7ca92991803a9316
parent947a049195183934ba5dffc131f9512fe253f4db (diff)
Thu Dec 6 02:15:36 PST 2012
-rw-r--r--community/cython/PKGBUILD6
-rw-r--r--community/mcabber/PKGBUILD8
-rw-r--r--community/shotwell/0001-Port-to-GStreamer-1.0.patch159
-rw-r--r--community/shotwell/PKGBUILD19
-rw-r--r--community/vidalia/PKGBUILD10
-rw-r--r--core/dbus/30-dbus8
-rw-r--r--core/dbus/PKGBUILD59
-rw-r--r--core/dbus/dbus51
-rw-r--r--core/dbus/dbus.install6
-rw-r--r--core/dbus/systemd-user-session.patch183
-rw-r--r--core/dnsutils/PKGBUILD6
-rw-r--r--core/isl/PKGBUILD10
-rw-r--r--extra/dnsmasq/PKGBUILD12
-rw-r--r--extra/dnsmasq/dnsmasq.service2
-rw-r--r--extra/enlightenment17/PKGBUILD8
-rw-r--r--extra/hugin/PKGBUILD51
-rw-r--r--extra/hugin/install13
-rw-r--r--extra/thunar/PKGBUILD17
-rw-r--r--extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch57
-rw-r--r--libre/filesystem/PKGBUILD12
-rw-r--r--libre/filesystem/filesystem.install4
-rw-r--r--libre/filesystem/group1
-rw-r--r--libre/filesystem/gshadow1
-rw-r--r--libre/filesystem/passwd1
-rw-r--r--libre/filesystem/shadow1
-rw-r--r--libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch41
-rw-r--r--libre/linux-libre-lts/PKGBUILD17
-rw-r--r--libre/linux-libre-lts/config.i68688
-rw-r--r--libre/linux-libre-lts/config.x86_6471
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
-rw-r--r--libre/linux-libre/PKGBUILD14
-rw-r--r--libre/linux-libre/fat-3.6.x.patch33
-rw-r--r--libre/linux-libre/linux-libre.install2
33 files changed, 730 insertions, 243 deletions
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index 3622249bf..50f01ab1e 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79427 2012-11-04 20:20:04Z spupykin $
+# $Id: PKGBUILD 80879 2012-12-05 10:04:35Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Igor Scabini <furester @ gmail.com>
pkgname=('cython' 'cython2')
pkgbase=cython
-pkgver=0.17.1
+pkgver=0.17.2
pkgrel=1
pkgdesc="C-Extensions for Python "
arch=(i686 x86_64)
@@ -12,7 +12,7 @@ url="http://www.cython.org"
license=('APACHE')
makedepends=('python-distribute' 'python2-distribute')
source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('f0bd2494dbe080a1185b61fa358135f2')
+md5sums=('09dfd4f5f82046f85025a391f084d8f9')
build() {
true
diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD
index 913de56f1..3637a85e2 100644
--- a/community/mcabber/PKGBUILD
+++ b/community/mcabber/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79621 2012-11-09 00:24:34Z ebelanger $
+# $Id: PKGBUILD 80881 2012-12-05 10:05:02Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: 3ED <kas1987@o2.pl>
pkgname=mcabber
-pkgver=0.10.1
-pkgrel=4
+pkgver=0.10.2
+pkgrel=1
pkgdesc="A small Jabber console client, includes features: SSL, PGP, MUC, UTF8"
arch=('i686' 'x86_64')
url="http://www.lilotux.net/~mikael/mcabber/"
@@ -14,7 +14,7 @@ depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr3' 'aspell')
makedepends=('pkg-config')
options=('!libtool')
source=(http://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2)
-md5sums=('fe96beab30f535d5d6270fd1719659b4')
+md5sums=('6bb2302f5168ad4c28b647390e37f9b3')
build() {
cd "${srcdir}"/$pkgname-${pkgver/_/-}
diff --git a/community/shotwell/0001-Port-to-GStreamer-1.0.patch b/community/shotwell/0001-Port-to-GStreamer-1.0.patch
new file mode 100644
index 000000000..7d7ac742d
--- /dev/null
+++ b/community/shotwell/0001-Port-to-GStreamer-1.0.patch
@@ -0,0 +1,159 @@
+From 9cb0726dd0873e3664f3589aabadea8bb7c8ff37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
+Date: Tue, 25 Sep 2012 18:15:02 -0400
+Subject: [PATCH] Port to GStreamer 1.0
+
+---
+ Makefile | 21 +++++++++++----------
+ src/VideoSupport.vala | 8 ++++----
+ src/libshotwell.deps | 5 +++--
+ thumbnailer/shotwell-video-thumbnailer.vala | 18 ++++++++----------
+ 4 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1bd09e0..06059e3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -37,7 +37,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru
+ LOCAL_LANG_DIR=locale-langpack
+ SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
+
+-VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated $(USER_VALAFLAGS)
++VALAFLAGS := -g --enable-checking --thread --enable-deprecated $(USER_VALAFLAGS)
+ ifdef UNITY_SUPPORT
+ VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
+ endif
+@@ -293,9 +293,9 @@ EXT_PKGS = \
+ gio-unix-2.0 \
+ glib-2.0 \
+ gmodule-2.0 \
+- gstreamer-0.10 \
+- gstreamer-base-0.10 \
+- gstreamer-pbutils-0.10 \
++ gstreamer-1.0 \
++ gstreamer-base-1.0 \
++ gstreamer-pbutils-1.0 \
+ gtk+-3.0 \
+ gudev-1.0 \
+ libexif \
+@@ -314,8 +314,9 @@ endif
+ THUMBNAILER_PKGS = \
+ gtk+-3.0 \
+ gee-1.0 \
+- gstreamer-0.10 \
+- gstreamer-base-0.10
++ gstreamer-1.0 \
++ gstreamer-base-1.0 \
++ gstreamer-app-1.0 \
+
+ DIRECT_LIBS =
+
+@@ -325,10 +326,10 @@ EXT_PKG_VERSIONS = \
+ gio-unix-2.0 >= 2.20 \
+ glib-2.0 >= $(MIN_GLIB_VERSION) \
+ gmodule-2.0 >= 2.24.0 \
+- gstreamer-0.10 >= 0.10.28 \
+- gstreamer-base-0.10 >= 0.10.28 \
+- gstreamer-plugins-base-0.10 >= 0.10.32 \
+- gstreamer-pbutils-0.10 >= 0.10.32 \
++ gstreamer-1.0 >= 1.0.0 \
++ gstreamer-base-1.0 >= 1.0.0 \
++ gstreamer-plugins-base-1.0 >= 1.0.0 \
++ gstreamer-pbutils-1.0 >= 1.0.0 \
+ gtk+-3.0 >= 3.0.11 \
+ gudev-1.0 >= 145 \
+ libexif >= 0.6.16 \
+diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
+index deb45e2..f679bd0 100644
+--- a/src/VideoSupport.vala
++++ b/src/VideoSupport.vala
+@@ -163,8 +163,8 @@ public class VideoReader {
+ file.get_path()));
+
+ try {
+- Gst.Discoverer d = new Gst.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
+- Gst.DiscovererInfo info = d.discover_uri(file.get_uri());
++ Gst.PbUtils.Discoverer d = new Gst.PbUtils.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
++ Gst.PbUtils.DiscovererInfo info = d.discover_uri(file.get_uri());
+
+ clip_duration = ((double) info.get_duration()) / 1000000000.0;
+
+@@ -172,7 +172,7 @@ public class VideoReader {
+ // TODO: Note that TAG_DATE can be changed to TAG_DATE_TIME in the future
+ // (and the corresponding output struct) in order to implement #2836.
+ Date? video_date = null;
+- if (info.get_tags() != null && info.get_tags().get_date(Gst.TAG_DATE, out video_date)) {
++ if (info.get_tags() != null && info.get_tags().get_date(Gst.Tags.DATE, out video_date)) {
+ timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(),
+ video_date.get_day(), 0, 0, 0);
+ }
+@@ -323,7 +323,7 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
+ Gst.init(ref fake_unowned_args);
+
+ int saved_state = Config.Facade.get_instance().get_video_interpreter_state_cookie();
+- current_state = (int) Gst.Registry.get_default().get_feature_list_cookie();
++ current_state = (int) Gst.Registry.get().get_feature_list_cookie();
+ if (saved_state == Config.Facade.NO_VIDEO_INTERPRETER_STATE) {
+ message("interpreter state cookie not found; assuming all video thumbnails are out of date");
+ interpreter_state_changed = true;
+diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
+index a4d7dc2..c12784e 100644
+--- a/thumbnailer/shotwell-video-thumbnailer.vala
++++ b/thumbnailer/shotwell-video-thumbnailer.vala
+@@ -10,11 +10,7 @@
+ // Shotwell Thumbnailer takes in a video file and returns a thumbnail to stdout. This is
+ // a replacement for totem-video-thumbnailer
+ class ShotwellThumbnailer {
+- const string caps_string = """video/x-raw-rgb,bpp = (int) 32, depth = (int) 32,
+- endianness = (int) BIG_ENDIAN,
+- red_mask = (int) 0xFF000000,
+- green_mask = (int) 0x00FF0000,
+- blue_mask = (int) 0x0000FF00,
++ const string caps_string = """video/x-raw, format=RGBA,
+ width = (int) [ 1, max ],
+ height = (int) [ 1, max ],
+ framerate = (fraction) [ 0, max ]""";
+@@ -36,7 +32,7 @@ class ShotwellThumbnailer {
+ return 1;
+ }
+
+- descr = "filesrc location=\"%s\" ! decodebin2 ! ffmpegcolorspace ! ".printf(args[1]) +
++ descr = "filesrc location=\"%s\" ! decodebin ! videoconvert ! ".printf(args[1]) +
+ "appsink name=sink caps=\"%s\"".printf(caps_string);
+
+ try {
+@@ -69,7 +65,7 @@ class ShotwellThumbnailer {
+ // by seeking to somewhere else we have a bigger chance of getting something
+ // more interesting. An optimization would be to detect black images and then
+ // seek a little more.
+- position = (int64) (Gst.Format.PERCENT_MAX * 0.05);
++ position = (int64) (Gst.FORMAT_PERCENT_MAX * 0.05);
+ pipeline.seek_simple(Gst.Format.PERCENT, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH , position);
+
+ // Get the preroll buffer from appsink, this block untils appsink really
+@@ -86,7 +82,7 @@ class ShotwellThumbnailer {
+ // that it can only be an rgb buffer. The only thing we have not specified
+ // on the caps is the height, which is dependant on the pixel-aspect-ratio
+ // of the source material.
+- caps = buffer.get_caps();
++ caps = (sink as Gst.App.Sink).caps;
+ if (caps == null) {
+ stderr.printf("could not get snapshot format\n");
+ return 5;
+@@ -104,9 +100,11 @@ class ShotwellThumbnailer {
+
+ // Create pixmap from buffer and save, gstreamer video buffers have a stride
+ // that is rounded up to the nearest multiple of 4.
+- pixbuf = new Gdk.Pixbuf.from_data(buffer.data, Gdk.Colorspace.RGB, true, 8,
++ Gst.MapInfo info;
++ buffer.map(out info, Gst.MapFlags.READ);
++ pixbuf = new Gdk.Pixbuf.from_data(info.data, Gdk.Colorspace.RGB, true, 8,
+ width, height, width * 4, null);
+-
++ buffer.unmap(info);
+ // Save the pixbuf.
+ pixbuf.save("/dev/stdout", "png");
+ } else {
+--
+1.7.11.4
+
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index f156811aa..14a61356c 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 79739 2012-11-11 19:39:26Z spupykin $
+# $Id: PKGBUILD 80877 2012-12-05 06:02:30Z bgyorgy $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
pkgname=shotwell
pkgver=0.13.1
-pkgrel=3
+pkgrel=4
pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
arch=('i686' 'x86_64')
url="http://yorba.org/shotwell/"
license=('LGPL2.1')
-depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
+depends=('libgee' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
- 'gstreamer0.10-base-plugins' 'libgphoto2')
-makedepends=('intltool' 'vala>=0.17.2')
+ 'gst-plugins-base' 'libgphoto2')
+makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
install=shotwell.install
source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz"
- "no-libexec.patch")
+ "no-libexec.patch"
+ "0001-Port-to-GStreamer-1.0.patch")
md5sums=('71eb1346093705ca2b37c12a21994d14'
- 'b4124e022c98b4382530e6fbcef965e2')
+ 'b4124e022c98b4382530e6fbcef965e2'
+ '86e47eade2b5a49bd6503294751d95f0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 <$srcdir/no-libexec.patch
+ # http://redmine.yorba.org/issues/5548
+ patch -p1 <$srcdir/0001-Port-to-GStreamer-1.0.patch
+
./configure --prefix=/usr \
--disable-schemas-compile \
--disable-desktop-update \
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
index 06692a29a..3a2d72c19 100644
--- a/community/vidalia/PKGBUILD
+++ b/community/vidalia/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76115 2012-09-11 15:43:23Z tredaelli $
+# $Id: PKGBUILD 80885 2012-12-05 14:14:00Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Rorschach <r0rschach@lavabit.com>
pkgname=vidalia
-pkgver=0.2.20
-pkgrel=2
+pkgver=0.2.21
+pkgrel=1
pkgdesc="Controller GUI for Tor"
url="https://www.torproject.org/vidalia"
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('geoip' 'qt' 'tor')
makedepends=('cmake')
install=vidalia.install
source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('f40a3a1c43f4a1f16322969c0cb6f5bf'
- '703c872eb865f11027a6d6b02d2e5e72')
+md5sums=('8d3079a66d79c79ccfefb929b820f9ac'
+ 'c735521ae9d231e974c753a5206c2c0f')
build() {
[[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh
diff --git a/core/dbus/30-dbus b/core/dbus/30-dbus
new file mode 100644
index 000000000..69d2660da
--- /dev/null
+++ b/core/dbus/30-dbus
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# launches a session dbus instance
+
+dbuslaunch="`which dbus-launch 2>/dev/null`"
+if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ eval `$dbuslaunch --sh-syntax --exit-with-session`
+fi
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
new file mode 100644
index 000000000..32b9a30bf
--- /dev/null
+++ b/core/dbus/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 172792 2012-12-06 01:48:03Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Link Dupont <link@subpop.net>
+#
+pkgname=dbus
+pkgver=1.6.8
+pkgrel=6
+pkgdesc="Freedesktop.org message bus system"
+url="http://www.freedesktop.org/Software/dbus"
+arch=(i686 x86_64)
+license=('GPL' 'custom')
+# do not depend on systemd to avoid circular dep,
+# dep on shadow for install scriptlet FS#29341
+depends=('expat' 'coreutils' 'filesystem' 'shadow')
+makedepends=('libx11')
+optdepends=('libx11: dbus-launch support')
+provides=('dbus-core')
+conflicts=('dbus-core')
+replaces=('dbus-core')
+options=(!libtool)
+install=dbus.install
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
+ 30-dbus dbus systemd-user-session.patch)
+
+build() {
+ cd dbus-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
+ --with-system-pid-file=/run/dbus/pid \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-console-auth-dir=/run/console/ \
+ --enable-inotify --disable-dnotify \
+ --disable-verbose-mode --disable-static \
+ --disable-tests --disable-asserts \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --enable-systemd
+
+ patch -p1 < "$srcdir/systemd-user-session.patch"
+
+ make
+}
+
+package(){
+ cd dbus-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir/var/run"
+
+ install -Dm755 ../dbus "$pkgdir/etc/rc.d/dbus"
+
+ install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
+}
+md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
+ '9fafe8b28460aeaa6054309ef4c5ed92'
+ 'f0364f3f5dc5f653bb05d39aa36e3264'
+ 'd8a1bd529b3ddca671ee1a695a143db9')
diff --git a/core/dbus/dbus b/core/dbus/dbus
new file mode 100644
index 000000000..bf532a274
--- /dev/null
+++ b/core/dbus/dbus
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case $1 in
+ start)
+ stat_busy "Starting D-BUS system messagebus"
+ if [[ ! -d /run/dbus ]] ; then
+ install -m755 -g 81 -o 81 -d /run/dbus
+ fi
+
+ if ! dbus-daemon --system; then
+ stat_fail
+ else
+ add_daemon dbus
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping D-BUS system messagebus"
+ if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
+ stat_fail
+ else
+ rm -f /run/dbus/pid
+ rm_daemon dbus
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ reload)
+ stat_busy "Reloading D-BUS configuration"
+ if ! { [[ -f /run/dbus/pid ]] && dbus-send \
+ --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig; }; then
+ stat_fail
+ else
+ stat_done
+ fi
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|reload}"
+ ;;
+esac
+exit 0
diff --git a/core/dbus/dbus.install b/core/dbus/dbus.install
new file mode 100644
index 000000000..01506cf96
--- /dev/null
+++ b/core/dbus/dbus.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+ # Make sure new rc script can shutdown running dbus
+ if [ -f run/dbus.pid -a -d run/dbus ]; then
+ mv run/dbus.pid run/dbus/pid
+ fi
+}
diff --git a/core/dbus/systemd-user-session.patch b/core/dbus/systemd-user-session.patch
new file mode 100644
index 000000000..3e05324da
--- /dev/null
+++ b/core/dbus/systemd-user-session.patch
@@ -0,0 +1,183 @@
+commit d728fdc655f17031da3bb129ab2fd17dadf0fe3a
+Author: Simon Peeters <peeters.simon@gmail.com>
+Date: 8 weeks ago
+
+ Set correct address when using --address=systemd:
+
+ When dbus gets launched through systemd, we need to create an address
+ string based on the sockets passed.
+
+ The _dbus_append_addres_from_socket() function is responsible for
+ extracting the address information from the file-descriptor and
+ formatting it in a dbus friendly way.
+
+ This fixes bus activation when running dbus under a systemd session.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=50962
+
+ Signed-off-by: Simon Peeters <peeters.simon@gmail.com>
+
+diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
+index 130f66e..d995240 100644
+--- a/dbus/dbus-server-unix.c
++++ b/dbus/dbus-server-unix.c
+@@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
+ }
+ else if (strcmp (method, "systemd") == 0)
+ {
+- int n, *fds;
++ int i, n, *fds;
+ DBusString address;
+
+ n = _dbus_listen_systemd_sockets (&fds, error);
+@@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+ }
+
+- _dbus_string_init_const (&address, "systemd:");
++ if (!_dbus_string_init (&address))
++ goto systemd_oom;
+
+- *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
+- if (*server_p == NULL)
++ for (i = 0; i < n; i++)
+ {
+- int i;
+-
+- for (i = 0; i < n; i++)
++ if (i > 0)
+ {
+- _dbus_close_socket (fds[i], NULL);
++ if (!_dbus_string_append (&address, ";"))
++ goto systemd_oom;
+ }
+- dbus_free (fds);
+-
+- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
++ if (!_dbus_append_address_from_socket (fds[i], &address, error))
++ goto systemd_err;
+ }
+
++ *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
++ if (*server_p == NULL)
++ goto systemd_oom;
++
+ dbus_free (fds);
+
+ return DBUS_SERVER_LISTEN_OK;
+- }
++ systemd_oom:
++ _DBUS_SET_OOM (error);
++ systemd_err:
++ for (i = 0; i < n; i++)
++ {
++ _dbus_close_socket (fds[i], NULL);
++ }
++ dbus_free (fds);
++ _dbus_string_free (&address);
++
++ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
++ }
+ #ifdef DBUS_ENABLE_LAUNCHD
+ else if (strcmp (method, "launchd") == 0)
+ {
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index b4ecc96..55743b1 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -55,6 +55,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <grp.h>
++#include <arpa/inet.h>
+
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+@@ -4160,4 +4161,71 @@ _dbus_check_setuid (void)
+ #endif
+ }
+
++/**
++ * Read the address from the socket and append it to the string
++ *
++ * @param fd the socket
++ * @param address
++ * @param error return location for error code
++ */
++dbus_bool_t
++_dbus_append_address_from_socket (int fd,
++ DBusString *address,
++ DBusError *error)
++{
++ union {
++ struct sockaddr sa;
++ struct sockaddr_storage storage;
++ struct sockaddr_un un;
++ struct sockaddr_in ipv4;
++ struct sockaddr_in6 ipv6;
++ } socket;
++ char hostip[INET6_ADDRSTRLEN];
++ int size = sizeof (socket);
++
++ if (getsockname (fd, &socket.sa, &size))
++ goto err;
++
++ switch (socket.sa.sa_family)
++ {
++ case AF_UNIX:
++ if (socket.un.sun_path[0]=='\0')
++ {
++ if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1])))
++ return TRUE;
++ }
++ else
++ {
++ if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path))
++ return TRUE;
++ }
++ break;
++ case AF_INET:
++ if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip)))
++ if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u",
++ hostip, ntohs (socket.ipv4.sin_port)))
++ return TRUE;
++ break;
++#ifdef AF_INET6
++ case AF_INET6:
++ if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip)))
++ if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u",
++ hostip, ntohs (socket.ipv6.sin6_port)))
++ return TRUE;
++ break;
++#endif
++ default:
++ dbus_set_error (error,
++ _dbus_error_from_errno (EINVAL),
++ "Failed to read address from socket: Unknown socket type.");
++ return FALSE;
++ }
++ err:
++ dbus_set_error (error,
++ _dbus_error_from_errno (errno),
++ "Failed to open socket: %s",
++ _dbus_strerror (errno));
++ return FALSE;
++}
++
+ /* tests in dbus-sysdeps-util.c */
+diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h
+index 9b70896..a265b33 100644
+--- a/dbus/dbus-sysdeps-unix.h
++++ b/dbus/dbus-sysdeps-unix.h
+@@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString *uid_str,
+
+ void _dbus_close_all (void);
+
++dbus_bool_t _dbus_append_address_from_socket (int fd,
++ DBusString *address,
++ DBusError *error);
++
+ /** @} */
+
+ DBUS_END_DECLS
diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index 03ae9a15a..b68e67f9c 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168406 2012-10-11 06:22:42Z bisson $
+# $Id: PKGBUILD 172785 2012-12-06 00:11:18Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
# Contributor: mario <mario_vazq@hotmail.com>
pkgname=dnsutils
-_pkgver=9.9.2
+_pkgver=9.9.2-P1
pkgver=${_pkgver//-/.}
pkgrel=1
pkgdesc='DNS utilities: dig host nslookup'
@@ -15,7 +15,7 @@ options=('!makeflags')
depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
'remove-bind.patch')
-sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
+sha1sums=('9d56db2a86dde8167f7adfb200beee0f51d771a5'
'bb13bd54134e4d787469be25461a3cc3f5cb57f4')
replaces=('bind-tools' 'host')
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index 2aa5e2194..959a457ac 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 162067 2012-06-19 12:27:31Z allan $
+# $Id: PKGBUILD 172787 2012-12-06 01:18:23Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
pkgname=isl
-pkgver=0.10
+pkgver=0.11
pkgrel=1
pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
arch=('i686' 'x86_64')
url="http://www.kotnet.org/~skimo/isl/"
-license=('LGPL2.1')
+license=('MIT')
options=('!libtool')
source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('c1ece653891bb2a5f55ca25e3f4e8f35')
+md5sums=('8dd36a28ed255f4fd3d903adb24e99db')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -28,5 +28,5 @@ package() {
make -j1 DESTDIR="$pkgdir/" install
install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
- mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.0.0-gdb.py
+ mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.0-gdb.py
}
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index ad155e96e..f701c66c9 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165413 2012-08-18 13:27:49Z dreisner $
+# $Id: PKGBUILD 172766 2012-12-05 11:05:17Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=dnsmasq
-pkgver=2.63
+pkgver=2.64
pkgrel=1
pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
@@ -18,19 +18,17 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
'dnsmasq.confd'
'rc.dnsmasq'
'dnsmasq.service')
-md5sums=('43e771997615ebcd8f6c6ffa60c3e40b'
+md5sums=('60adb8e01960a41ce67e0422c4cf9ab3'
'66479e99123faeab83ebaed709ef95b5'
'819fbdf6440d710616e6df5f8ca9cdba'
- '631d8349acbed1b01d4e11d9f42fdb7d')
+ '7ac45726cabef4145db40d758cc7fedf')
build() {
cd "$pkgname-$pkgver"
# link against dbus. this ugliness is needed to ensure that the
# compile time opts report properly on startup. yuck.
- sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ {
- i#define HAVE_DBUS
- }' src/config.h
+ sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h
make
}
diff --git a/extra/dnsmasq/dnsmasq.service b/extra/dnsmasq/dnsmasq.service
index 05a1f0b69..a0525b9c2 100644
--- a/extra/dnsmasq/dnsmasq.service
+++ b/extra/dnsmasq/dnsmasq.service
@@ -1,5 +1,7 @@
[Unit]
Description=A lightweight DHCP and caching DNS server
+After=network.target
+Documentation=man:dnsmasq(8)
[Service]
Type=dbus
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index 843a6af5b..5e8651abe 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172451 2012-12-02 20:54:27Z ronald $
+# $Id: PKGBUILD 172777 2012-12-05 18:43:12Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=enlightenment17
_pkgname=enlightenment
-pkgver=0.17.0alpha7
-_pkgver=0.17.0-alpha7
+pkgver=0.17.0alpha8
+_pkgver=0.17.0-alpha8
pkgrel=1
pkgdesc="Enlightenment window manager DR17 (aka e17)"
arch=('i686' 'x86_64')
@@ -22,7 +22,7 @@ options=('!libtool' '!emptydirs')
install=enlightenment17.install
source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz
'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
-sha1sums=('97ed2c936e6fa2385658f876a4099a029df43787'
+sha1sums=('12612175f08d11ff34c0c509f4e28e412cc13510'
'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
'3f53931ae86de8fe99e386aeb097521aac0decd8'
'86f1c5e36dc274c3101362532378be034e89c593')
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index c6c81350d..3c34d8e9a 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,39 +1,36 @@
-# $Id: PKGBUILD 169748 2012-10-27 23:41:52Z eric $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
+# $Id: PKGBUILD 172786 2012-12-06 00:11:28Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Dominik Ryba <domryba@post.pl>
pkgname=hugin
-pkgver=2011.4.0
-pkgrel=7
-pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
+pkgver=2012.0.0
+pkgrel=1
+pkgdesc='Panorama photo stitcher'
+url='http://hugin.sourceforge.net/'
license=('GPL')
+arch=('i686' 'x86_64')
depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
- 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
-makedepends=('zip' 'cmake' 'boost' 'tclap' 'mesa')
-install=hugin.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- gcc47.patch)
-sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
- 'aa0fc9425bd7a4b5e270412f4ca72258fac77298')
+ 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
+makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python' 'swig')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d')
+
+install=install
build() {
- cd "${srcdir}"
- patch -Np0 -i gcc47.patch
- mkdir build
- cd build
- export CXXFLAGS+=" -fpermissive"
- cmake "${srcdir}/${pkgname}-${pkgver}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
- -DENABLE_LAPACK=yes
- make
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export CXXFLAGS+=" -fpermissive"
+ cmake . \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
+ -DENABLE_LAPACK=yes
+ make
}
package(){
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/hugin/install b/extra/hugin/install
new file mode 100644
index 000000000..f959d50f6
--- /dev/null
+++ b/extra/hugin/install
@@ -0,0 +1,13 @@
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+ update-desktop-database -q
+ update-mime-database usr/share/mime > /dev/null
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index f1a9e1fcf..6d8ef4bed 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 172467 2012-12-03 11:50:24Z foutrelis $
+# $Id: PKGBUILD 172779 2012-12-05 19:01:30Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
pkgname=thunar
pkgver=1.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="Modern file manager for Xfce"
arch=('i686' 'x86_64')
url="http://thunar.xfce.org"
license=('GPL2' 'LGPL2.1')
groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev'
- 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
+ 'systemd' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
'polkit-gnome: for mounting internal partitions (needs root password)'
@@ -22,12 +22,17 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
'thunar-media-tags-plugin: view/edit id3/ogg tags')
options=('!libtool')
install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a')
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2
+ thunar-1.6.0-show-nodisplay-true-applications.patch)
+sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a'
+ 'f7377aad1eb60420d0c1c878c3916913934f994df810f3a60d580fc2be3b80c0')
build() {
cd "$srcdir/Thunar-$pkgver"
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9595
+ patch -Np1 -i "$srcdir/thunar-1.6.0-show-nodisplay-true-applications.patch"
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
new file mode 100644
index 000000000..d054180b5
--- /dev/null
+++ b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
@@ -0,0 +1,57 @@
+From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Wed, 05 Dec 2012 17:34:38 +0000
+Subject: Show NoDisplay=true applications (bug #9595).
+
+See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
+---
+diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
+index f7ae355..f2993b8 100644
+--- a/thunar/thunar-chooser-button.c
++++ b/thunar/thunar-chooser-button.c
+@@ -453,7 +453,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
+ /* add all possible applications */
+ for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i)
+ {
+- /* skip infos that have NoDisplay or OnlyShowIn set */
+ if (thunar_g_app_info_should_show (lp->data))
+ {
+ /* insert the item into the store */
+diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
+index d77f72a..1b9026a 100644
+--- a/thunar/thunar-gio-extensions.c
++++ b/thunar/thunar-gio-extensions.c
+@@ -569,26 +569,17 @@ gboolean
+ thunar_g_app_info_should_show (GAppInfo *info)
+ {
+ #ifdef HAVE_GIO_UNIX
+- const gchar *filename;
+-
+ _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
+
+- /* check if NoDesktop is set or OnlyShowIn is set but
+- * does not contain XFCE */
+- if (g_app_info_should_show (info))
+- return TRUE;
+-
+ if (G_IS_DESKTOP_APP_INFO (info))
+ {
+- /* show custom command from the user directory, this to not
+- * exclude custom commands */
+- filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
+- if (filename != NULL
+- && g_str_has_prefix (filename, g_get_user_data_dir ()))
+- return TRUE;
++ /* NoDisplay=true files should be visible in the interface,
++ * because this key is intent to hide mime-helpers from the
++ * application menu. Hidden=true is never returned by GIO. */
++ return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL);
+ }
+
+- return FALSE;
++ return TRUE;
+ #else
+ /* we cannot exclude custom actions, so show everything */
+ return TRUE;
+--
+cgit v0.9.0.3
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index c024b5700..fb422594c 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171894 2012-11-22 14:54:47Z tomegun $
+# $Id: PKGBUILD 172494 2012-12-04 01:05:09Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=filesystem
-pkgver=2012.11
+pkgver=2012.12
pkgrel=1
pkgdesc='Base filesystem for Parabola'
arch=('any')
@@ -90,14 +90,14 @@ package() {
done
ln -s ../man usr/local/share/man
}
-md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
+md5sums=('c61f6ac4f6377108e59879f203f18633'
'6be47d893fd49b2e4a8c0e811b350861'
'9e4533df61f0c82d6b2e2371f7376282'
'4c4540eeb748bf1f71d631b8c1dcf0b3'
'f28150d4c0b22a017be51b9f7f9977ed'
'6e488ffecc8ba142c0cf7e2d7aeb832e'
- '455b78cada80f40b6f6968f5cbd97a2e'
- '01249bb0ba4468f95e2cc3a627f5e6e3'
+ '1cfd310dff0804a7d21958487c32a3b1'
+ '2ef2429c2c98d0883906aa6f5363be80'
'693c97f2c9a519bb97a17008e92c2b74'
'1745349eb24ed21b4cfaa6f423bddb76'
'7bc65f234dfb6abf24e7c3b03e86f4ff'
@@ -105,7 +105,7 @@ md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
'0e145e18fea8fd190b30d45764f5707c'
'6f48288b6fcaf0065fcb7b0e525413e0'
'22518e922891f9359f971f4f5b4e793c'
- '677523dbe94b79299aa91b35ed8203b6'
+ 'ffe983034b8004989b8c3df97ec91095'
'f3b6ae7db8adffaaa4bffc6099dcbd50'
'a8a962370cd0128465d514e6a1f74130'
'd5732ffdb3488e1383d4ea199343e767'
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 34fcc0dee..12e59b01b 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -42,7 +42,9 @@ post_upgrade() {
_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 /sbin/nologin
+ _addgroup dbus -g 81
+ _adduser dbus -u 81 -d / -g dbus -s /sbin/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 cfee1f23e..3e6645c83 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -21,6 +21,7 @@ http:x:33:
games:x:50:
lock:x:54:
uuidd:x:68:
+dbus:x:81:
network:x:90:
video:x:91:
audio:x:92:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index c5ac18581..253f35838 100644
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -21,6 +21,7 @@ http:::
games:::
lock:::
uuidd:!::
+dbus:x::
network:x::
video:x::
audio:::
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
index cb9fec7ff..671fc486e 100644
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -5,4 +5,5 @@ mail:x:8:12:mail:/var/spool/mail:/bin/false
ftp:x:14:11:ftp:/srv/ftp:/bin/false
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
diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow
index 5eff4935c..39ebb13c7 100644
--- a/libre/filesystem/shadow
+++ b/libre/filesystem/shadow
@@ -5,4 +5,5 @@ mail:x:14871::::::
ftp:x:14871::::::
http:x:14871::::::
uuidd:x:14871::::::
+dbus:x:14871::::::
nobody:x:14871::::::
diff --git a/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
new file mode 100644
index 000000000..6ef275bda
--- /dev/null
+++ b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
@@ -0,0 +1,41 @@
+From: H. Peter Anvin <hpa@linux.intel.com>
+Date: Wed, 21 Nov 2012 06:21:02 +0000 (-0800)
+Subject: x86-32: Export kernel_stack_pointer() for modules
+X-Git-Tag: v3.6.9~50
+X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=051d62f6f239a9427fcab244a310610ed8bedb43
+
+x86-32: Export kernel_stack_pointer() for modules
+
+commit cb57a2b4cff7edf2a4e32c0163200e9434807e0a upstream.
+
+Modules, in particular oprofile (and possibly other similar tools)
+need kernel_stack_pointer(), so export it using EXPORT_SYMBOL_GPL().
+
+Link: http://lkml.kernel.org/r/20120912135059.GZ8285@erda.amd.com
+Cc: Yang Wei <wei.yang@windriver.com>
+Cc: Robert Richter <robert.richter@amd.com>
+Cc: Jun Zhang <jun.zhang@intel.com>
+Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+
+diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
+index 947cf90..9ee1787 100644
+--- a/arch/x86/kernel/ptrace.c
++++ b/arch/x86/kernel/ptrace.c
+@@ -21,6 +21,7 @@
+ #include <linux/signal.h>
+ #include <linux/perf_event.h>
+ #include <linux/hw_breakpoint.h>
++#include <linux/module.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -192,6 +193,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
+
+ return (unsigned long)regs;
+ }
++EXPORT_SYMBOL_GPL(kernel_stack_pointer);
+
+ static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)
+ {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index a36ead268..0170fdfac 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=53
+_sublevel=54
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.53 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -30,11 +30,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'ext4-options.patch'
'module-symbol-waiting-3.0.patch'
'module-init-wait-3.0.patch'
+ '3.0.54-ptrace-i686-build.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- 'bb8cb7d0f02f0b7a5861ee04236875a7'
- 'aed25ab047e1c0b020a1516c235c6a74'
- '7d37e8ce0f4bd5a957172b12ae742ea0'
+ '2fd5511915299a3f60b0494914881e3f'
+ 'a5d98603d79d3ab7f979af49b2970f26'
+ '0ed396b368d8cdf8845f7ef2f62fc93c'
'c072b17032e80debc6a8626299245d46'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -44,7 +45,8 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'ecf9d21d2d6dfbc29dc18b616cbce4e1')
+ '80889d526d86e516757b52fc99dca64d'
+ '461adf81c9df997b57bfb3fa07d13746')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -87,6 +89,9 @@ build() {
patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+ # fix building on i686 platform
+ patch -Np1 -i "${srcdir}/3.0.54-ptrace-i686-build.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 823d65d18..a4198fa07 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.43-1 Kernel Configuration
+# Linux/i386 3.0.54-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -431,6 +431,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
@@ -1533,89 +1534,7 @@ CONFIG_IWMC3200TOP=m
CONFIG_TI_ST=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
#
# SCSI device support
@@ -4523,7 +4442,6 @@ CONFIG_LEDS_TRIGGERS=y
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 89eed9382..ed86b4b62 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.43-1 Kernel Configuration
+# Linux/x86_64 3.0.54-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -417,6 +417,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
@@ -1475,72 +1476,7 @@ CONFIG_IWMC3200TOP=m
CONFIG_TI_ST=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
#
# SCSI device support
@@ -4298,7 +4234,6 @@ CONFIG_LEDS_TRIGGERS=y
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index a273c9f0e..1251b68c7 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.53-1-LIBRE-LTS
+KERNEL_VERSION=3.0.54-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 55d68e2a6..9924386ea 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.6
-_sublevel=8
+_sublevel=9
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,9 +32,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-symbol-waiting-3.6.patch'
'module-init-wait-3.6.patch'
'irq_cfg_pointer-3.6.6.patch'
+ 'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
- '3f4d630f49a12079598a3601dd2adb24'
+ '2127e118d09154c7a44dd2dfed2cfecd'
'e4a3a4677e1fac6ecf0e0fb44c41ca08'
'68fc36a4efb6ade0eca409b9444fef0c'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -45,7 +46,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
'4909a0271af4e5f373136b382826717f'
- 'acc79d1934fe9710acd9039dcd4e8b30')
+ '88d501404f172dac6fcb248978251560'
+ '2f3ae0624acb4a4b12ea2c008b964bd2')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -78,6 +80,10 @@ build() {
# fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+ # fix cosmetic fat issue
+ # https://bugs.archlinux.org/task/32916
+ patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/fat-3.6.x.patch b/libre/linux-libre/fat-3.6.x.patch
new file mode 100644
index 000000000..d8deeb788
--- /dev/null
+++ b/libre/linux-libre/fat-3.6.x.patch
@@ -0,0 +1,33 @@
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100)
+Subject: fs/fat: strip "cp" prefix from codepage in display
+X-Git-Tag: next-20121130~1^2~97
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405
+
+fs/fat: strip "cp" prefix from codepage in display
+
+Option parsing code expects an unsigned integer for the codepage option,
+but prefixes and stores this option with "cp" before passing to
+load_nls(). This makes the displayed option in /proc an invalid one.
+Strip the prefix when printing so that the displayed option is valid for
+reuse.
+
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+---
+
+diff --git a/fs/fat/inode.c b/fs/fat/inode.c
+index 3b733a7..3580681 100644
+--- a/fs/fat/inode.c
++++ b/fs/fat/inode.c
+@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root)
+ if (opts->allow_utime)
+ seq_printf(m, ",allow_utime=%04o", opts->allow_utime);
+ if (sbi->nls_disk)
+- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset);
++ /* strip "cp" prefix from displayed option */
++ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]);
+ if (isvfat) {
+ if (sbi->nls_io)
+ seq_printf(m, ",iocharset=%s", sbi->nls_io->charset);
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 62df4eb18..89024bf96 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.6.8-1-LIBRE
+KERNEL_VERSION=3.6.9-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'