Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el

Conflicts:
	community/acpi/PKGBUILD
	community/alure/PKGBUILD
	community/ario/PKGBUILD
	community/cantata/PKGBUILD
	community/cgit/PKGBUILD
	community/chntpw/PKGBUILD
	community/clamz/PKGBUILD
	community/deadbeef/PKGBUILD
	community/dunst/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnome-commander/PKGBUILD
	community/gq/PKGBUILD
	community/gtkimageview/PKGBUILD
	community/i3status/PKGBUILD
	community/iasl/PKGBUILD
	community/krename/PKGBUILD
	community/libesmtp/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/libmilter/PKGBUILD
	community/libpaper/PKGBUILD
	community/libvirt/PKGBUILD
	community/libx86emu/PKGBUILD
	community/libxdg-basedir/PKGBUILD
	community/lightdm-gtk2-greeter/PKGBUILD
	community/lightdm-gtk3-greeter/PKGBUILD
	community/lightdm/PKGBUILD
	community/luakit/PKGBUILD
	community/lxtask/PKGBUILD
	community/marisa/PKGBUILD
	community/megaglest/PKGBUILD
	community/mumble/PKGBUILD
	community/opencolorio/PKGBUILD
	community/openssh-askpass/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/pidgin-toobars/PKGBUILD
	community/powerdns/PKGBUILD
	community/python-numexpr/PKGBUILD
	community/python-pybox2d/PKGBUILD
	community/python-pytables/PKGBUILD
	community/python2-imaging/PKGBUILD
	community/python2-pybluez/PKGBUILD
	community/remmina/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/ruby-iconv/PKGBUILD
	community/scummvm-tools/PKGBUILD
	community/shapelib/PKGBUILD
	community/sshfs/PKGBUILD
	community/subtle/PKGBUILD
	community/teeworlds/PKGBUILD
	community/uget/PKGBUILD
	community/wireshark/PKGBUILD
	community/wxcam/PKGBUILD
	community/wxgtk2.9/PKGBUILD
	community/xchm/PKGBUILD
	community/xdelta3/PKGBUILD
	community/zynaddsubfx/PKGBUILD
	core/gcc/PKGBUILD
	core/gcc/gcc_mips64el_lib.patch
	core/gdbm/PKGBUILD
	core/ldns/PKGBUILD
	core/pth/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	elementary/postler/PKGBUILD
	elementary/vala-010/PKGBUILD
	extra/aubio/PKGBUILD
	extra/audacity/PKGBUILD
	extra/bc/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/chmlib/PKGBUILD
	extra/clamav/PKGBUILD
	extra/clisp/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/cups/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ecore/PKGBUILD
	extra/edje/PKGBUILD
	extra/eet/PKGBUILD
	extra/eeze/PKGBUILD
	extra/efreet/PKGBUILD
	extra/eina/PKGBUILD
	extra/eio/PKGBUILD
	extra/embryo/PKGBUILD
	extra/emotion/PKGBUILD
	extra/enlightenment17/PKGBUILD
	extra/ethumb/PKGBUILD
	extra/evas/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/git/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtkmathview/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/hugin/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/jack/PKGBUILD
	extra/ktorrent/PKGBUILD
	extra/libaccounts-qt/PKGBUILD
	extra/libdvdnav/PKGBUILD
	extra/libdvdread/PKGBUILD
	extra/libetpan/PKGBUILD
	extra/libgadu/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libsecret/PKGBUILD
	extra/libssh/PKGBUILD
	extra/libvorbis/PKGBUILD
	extra/lilv/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/obex-data-server/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/opencv/PKGBUILD
	extra/opengtl/PKGBUILD
	extra/perl-net-dns/PKGBUILD
	extra/perl-socket6/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/qt5/PKGBUILD
	extra/redland/PKGBUILD
	extra/ruby/PKGBUILD
	extra/shared-mime-info/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v4l-utils/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vim/PKGBUILD
	extra/wildmidi/PKGBUILD
	extra/wxpython/PKGBUILD
	extra/x2goclient/PKGBUILD
	extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
	extra/xf86-video-siliconmotion/PKGBUILD
	extra/xfce4-taskmanager/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zsh/PKGBUILD
	libre-testing/unace-libre/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/audacity-libre/PKGBUILD
	libre/audex-libre/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/bumblebee-libre/PKGBUILD
	libre/crosstool-ng/PKGBUILD
	libre/dvdrip-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/enscript/PKGBUILD
	libre/epdfview-libre/PKGBUILD
	libre/hardinfo/PKGBUILD
	libre/kile-libre/PKGBUILD
	libre/lesspipe-libre/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/linux-libre-tools/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD
	libre/midori-libre/PKGBUILD
	libre/oss-libre/PKGBUILD
	libre/p7zip-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD
	libre/seamonkey-libre/PKGBUILD
	libre/unzip-libre/PKGBUILD
	libre/xarchiver-libre/PKGBUILD
	libre/xmlstarlet/PKGBUILD
	pcr/a2jmidid/PKGBUILD
	pcr/amsynth/PKGBUILD
	pcr/anyremote/PKGBUILD
	pcr/azr3-jack/PKGBUILD
	pcr/bambus/PKGBUILD
	pcr/bamf2/PKGBUILD
	pcr/barnyard2/PKGBUILD
	pcr/bison++/PKGBUILD
	pcr/bup/PKGBUILD
	pcr/din/PKGBUILD
	pcr/django-tagging/PKGBUILD
	pcr/doxymacs/PKGBUILD
	pcr/emacs-js2-mode/PKGBUILD
	pcr/eterm/PKGBUILD
	pcr/frame/PKGBUILD
	pcr/freeipmi/PKGBUILD
	pcr/geis/PKGBUILD
	pcr/ginn/PKGBUILD
	pcr/grail/PKGBUILD
	pcr/libast/PKGBUILD
	pcr/libdshconfig/PKGBUILD
	pcr/networkmanager-openswan/PKGBUILD
	pcr/networkmanager-strongswan/PKGBUILD
	pcr/openswan/PKGBUILD
	pcr/par/PKGBUILD
	pcr/snort/PKGBUILD
	pcr/strongswan/PKGBUILD
	social/batctl/PKGBUILD
	social/bip/PKGBUILD
	social/bitcoin-daemon/PKGBUILD
	social/dropbear/PKGBUILD
	social/ffingerd/PKGBUILD
	social/haveged/PKGBUILD
	social/inadyn-opendns/PKGBUILD
	social/liblockfile/PKGBUILD
	social/libowfat/PKGBUILD
	social/lockfile-progs/PKGBUILD
	social/netatalk/PKGBUILD
	social/olsrd/PKGBUILD
	social/poco/PKGBUILD
	social/spectrum/PKGBUILD
	social/squirm/PKGBUILD
	social/tokyotyrant/PKGBUILD
	social/tomoyo-tools/PKGBUILD

3 files changed, 181 insertions, 5 deletions

diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD
index dca4adc8d..51394f622 100644
--- a/extra/davfs2/PKGBUILD
+++ b/extra/davfs2/PKGBUILD
@@ -1,16 +1,29 @@
-# $Id: PKGBUILD 187054 2013-06-03 11:16:20Z allan $
+# $Id: PKGBUILD 203671 2014-01-13 22:05:39Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 pkgname=davfs2
 pkgver=1.4.7
-pkgrel=2
+pkgrel=3
 pkgdesc="File system driver that allows you to mount a WebDAV folder"
 arch=(i686 x86_64 'mips64el')
 url="http://savannah.nongnu.org/projects/davfs2"
 license=('GPL')
 depends=('neon')
 backup=(etc/davfs2/davfs2.conf etc/davfs2/secrets)
-source=(http://mirrors.zerg.biz/nongnu/davfs2/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044')
+source=(http://mirrors.zerg.biz/nongnu/davfs2/${pkgname}-${pkgver}.tar.gz
+        davfs2-1.4.7-system.diff
+        davfs2-1.4.7-fix-neon-version-check.patch)
+sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044'
+            '1d7e921da5edf07bddbd2bfbbf5010a690b4d47166a86ab5abaa6de4dc82125e'
+            'd637ccfcac85bf642083525018ca6799754b3728766483a616de27213318c1a1')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}"/davfs2-1.4.7-system.diff
+  # Some autotools files are missing, so autoreconf fails!
+  # Running autoconf may fail here, it does work for now
+  patch -p1 -i "${srcdir}"/davfs2-1.4.7-fix-neon-version-check.patch
+  autoconf  
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,6 +35,7 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  rm -rf ${pkgdir}/sbin
+  # This directory contains worthless symlinks
+  rm -r ${pkgdir}/sbin
   rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS}
 }
diff --git a/extra/davfs2/davfs2-1.4.7-fix-neon-version-check.patch b/extra/davfs2/davfs2-1.4.7-fix-neon-version-check.patch
new file mode 100644
index 000000000..25b5cb6c4
--- /dev/null
+++ b/extra/davfs2/davfs2-1.4.7-fix-neon-version-check.patch
@@ -0,0 +1,12 @@
+diff -Nur davfs2-1.4.7.orig/configure.ac davfs2-1.4.7/configure.ac
+--- davfs2-1.4.7.orig/configure.ac	2012-07-19 13:38:47.000000000 +0200
++++ davfs2-1.4.7/configure.ac	2014-01-13 23:00:15.021471570 +0100
+@@ -36,7 +36,7 @@
+ # Checks for libraries.
+ AM_GNU_GETTEXT_VERSION(0.14.4)
+ AM_GNU_GETTEXT([external])
+-NE_REQUIRE_VERSIONS([0], [25 26 27 28 29])
++NE_REQUIRE_VERSIONS([0], [25 26 27 28 29 30])
+ DAV_CHECK_NEON
+ 
+ # Checks for header files.
diff --git a/extra/davfs2/davfs2-1.4.7-system.diff b/extra/davfs2/davfs2-1.4.7-system.diff
new file mode 100644
index 000000000..d0d62fc59
--- /dev/null
+++ b/extra/davfs2/davfs2-1.4.7-system.diff
@@ -0,0 +1,150 @@
+diff -ur davfs2-1.4.7/ChangeLog davfs2-1.4.7.new/ChangeLog
+--- davfs2-1.4.7/ChangeLog	2012-07-19 13:37:52.000000000 +0200
++++ davfs2-1.4.7.new/ChangeLog	2013-09-15 10:19:12.000000000 +0200
+@@ -1,6 +1,11 @@
+ ChangeLog for davfs2
+ --------------------
+ 
++2013-09-08 Werner Baumann (werner.baumann@onlinehome.de)
++    * kernel_interface.c, mount_davfs.c:
++      Don't create /dev/coda and /dev/fuse.
++      Remove insecure calls of system().
++
+ 2012-07-19 Werner Baumann (werner.baumann@onlinehome.de)
+     * Release version 1.4.7.
+ 
+diff -ur davfs2-1.4.7/src/kernel_interface.c davfs2-1.4.7.new/src/kernel_interface.c
+--- davfs2-1.4.7/src/kernel_interface.c	2012-07-19 12:58:48.000000000 +0200
++++ davfs2-1.4.7.new/src/kernel_interface.c	2013-09-15 10:15:07.000000000 +0200
+@@ -167,29 +167,6 @@
+         ++minor;
+     }
+ 
+-    if (*dev <= 0 && system("/sbin/modprobe coda &>/dev/null") == 0) {
+-        minor = 0;
+-        while (*dev <= 0 && minor < MAX_CODADEVS) {
+-            char *path;
+-            if (asprintf(&path, "%s/%s%i",
+-                         DAV_DEV_DIR, CODA_DEV_NAME, minor) < 0)
+-                abort();
+-            *dev = open(path, O_RDWR | O_NONBLOCK);
+-            if (*dev <= 0) {
+-                if (mknod(path, S_IFCHR, makedev(CODA_MAJOR, minor)) == 0) {
+-                    if (chown(path, 0, 0) == 0
+-                            && chmod(path, S_IRUSR | S_IWUSR) == 0) {
+-                        *dev = open(path, O_RDWR | O_NONBLOCK);
+-                    } else {
+-                        remove(path);
+-                    }
+-                }
+-            }
+-            free(path);
+-            ++minor;
+-        }
+-    }
+-
+     if (*dev <= 0) {
+         error(0, 0, _("no free coda device to mount"));
+         return -1;
+@@ -225,20 +202,6 @@
+             abort();
+ 
+     *dev = open(path, O_RDWR | O_NONBLOCK);
+-    if (*dev <= 0 && system("/sbin/modprobe fuse &>/dev/null") == 0) {
+-        *dev = open(path, O_RDWR | O_NONBLOCK);
+-    }
+-    if (*dev <= 0) {
+-        if (mknod(path, S_IFCHR, makedev(FUSE_MAJOR, FUSE_MINOR)) == 0) {
+-             if (chown(path, 0, 0) == 0
+-                    && chmod(path, S_IRUSR | S_IWUSR) == 0) {
+-                *dev = open(path, O_RDWR | O_NONBLOCK);
+-            } else {
+-                remove(path);
+-            }
+-        }
+-    }
+-
+     free(path);
+     if (*dev <= 0) {
+         error(0, 0, _("can't open fuse device"));
+diff -ur davfs2-1.4.7/src/mount_davfs.c davfs2-1.4.7.new/src/mount_davfs.c
+--- davfs2-1.4.7/src/mount_davfs.c	2012-07-19 13:35:11.000000000 +0200
++++ davfs2-1.4.7.new/src/mount_davfs.c	2013-09-15 10:15:22.000000000 +0200
+@@ -170,6 +170,9 @@
+ static int
+ arg_to_int(const char *arg, int base, const char *opt);
+ 
++static void
++cp_file(const char *src, const char *dest);
++
+ static int
+ debug_opts(const char *s);
+ 
+@@ -530,10 +533,7 @@
+             char *file_name = ne_concat(path, "/", DAV_CONFIG, NULL);
+             if (access(file_name, F_OK) != 0) {
+                 char *template = ne_concat(DAV_DATA_DIR, "/", DAV_CONFIG, NULL);
+-                char *command = ne_concat("cp ", template, " ", file_name,
+-                                          NULL);
+-                if (system(command) != 0);
+-                free(command);
++                cp_file(template, file_name);
+                 free(template);
+             }
+             free(file_name);
+@@ -542,11 +542,7 @@
+             if (access(file_name, F_OK) != 0) {
+                 char *template = ne_concat(DAV_DATA_DIR, "/", DAV_SECRETS,
+                                            NULL);
+-                char *command = ne_concat("cp ", template, " ", file_name,
+-                                          NULL);
+-                if (system(command) == 0)
+-                    chmod(file_name, S_IRUSR | S_IWUSR);
+-                free(command);
++                cp_file(template, file_name);
+                 free(template);
+             }
+             free(file_name);
+@@ -1304,6 +1300,7 @@
+    opt    : name of the option, arg belongs to. Used in the error message.
+    return value: the value of the integer number in arg */
+ static int
++
+ arg_to_int(const char *arg, int base, const char *opt)
+ {
+     char *tail = NULL;
+@@ -1325,6 +1322,34 @@
+ }
+ 
+ 
++/* Creates a copy of src with name dest. */
++static void
++cp_file(const char *src, const char *dest)
++{
++    FILE *in = fopen(src, "r");
++    if (!in)
++        error(EXIT_FAILURE, errno, _("can't open file %s"), src);
++
++    FILE *out = fopen(dest, "w");
++    if (!out)
++        error(EXIT_FAILURE, errno, _("can't open file %s"), dest);
++
++    size_t n = 0;
++    char *line = NULL;
++    int length = getline(&line, &n, in);
++    while (length > 0) {
++        if (fputs(line, out) == EOF) 
++            error(EXIT_FAILURE, errno, _("error writing to file %s"), dest);
++        length = getline(&line, &n, in);
++    }
++
++    if (line)
++        free(line);
++    fclose(out);
++    fclose(in);
++}
++
++
+ /* Converts a debug option string s into numerical value. If s is not a
+    valid debug option, it returns 0. */
+ static int