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

Conflicts:
	core/glibc/PKGBUILD

5 files changed, 0 insertions, 258 deletions

diff --git a/testing/systemd/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch b/testing/systemd/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
deleted file mode 100644
index 456d679ed..000000000
--- a/testing/systemd/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From fdcad0c25579a60061b1fda956686e878a80faef Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Wed, 11 Jan 2012 22:07:35 +0100
-Subject: [PATCH] tmpfiles: fix parsing of /proc/net/unix on 32Bit machines
-
-Tracked down by Michael Meeks
----
- src/tmpfiles.c |   30 ++++++++++++++++++++----------
- 1 files changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/tmpfiles.c b/src/tmpfiles.c
-index 19a7c08..44e5c9d 100644
---- a/src/tmpfiles.c
-+++ b/src/tmpfiles.c
-@@ -117,41 +117,50 @@ static void load_unix_sockets(void) {
-         /* We maintain a cache of the sockets we found in
-          * /proc/net/unix to speed things up a little. */
- 
--        if (!(unix_sockets = set_new(string_hash_func, string_compare_func)))
-+        unix_sockets = set_new(string_hash_func, string_compare_func);
-+        if (!unix_sockets)
-                 return;
- 
--        if (!(f = fopen("/proc/net/unix", "re")))
-+        f = fopen("/proc/net/unix", "re");
-+        if (!f)
-                 return;
- 
--        if (!(fgets(line, sizeof(line), f)))
-+        /* Skip header */
-+        if (!fgets(line, sizeof(line), f))
-                 goto fail;
- 
-         for (;;) {
-                 char *p, *s;
-                 int k;
- 
--                if (!(fgets(line, sizeof(line), f)))
-+                if (!fgets(line, sizeof(line), f))
-                         break;
- 
-                 truncate_nl(line);
- 
--                if (strlen(line) < 53)
-+                p = strchr(line, ':');
-+                if (!p)
-+                        continue;
-+
-+                if (strlen(p) < 37)
-                         continue;
- 
--                p = line + 53;
-+                p += 37;
-                 p += strspn(p, WHITESPACE);
--                p += strcspn(p, WHITESPACE);
-+                p += strcspn(p, WHITESPACE); /* skip one more word */
-                 p += strspn(p, WHITESPACE);
- 
-                 if (*p != '/')
-                         continue;
- 
--                if (!(s = strdup(p)))
-+                s = strdup(p);
-+                if (!s)
-                         goto fail;
- 
-                 path_kill_slashes(s);
- 
--                if ((k = set_put(unix_sockets, s)) < 0) {
-+                k = set_put(unix_sockets, s);
-+                if (k < 0) {
-                         free(s);
- 
-                         if (k != -EEXIST)
-@@ -1059,7 +1068,8 @@ int main(int argc, char *argv[]) {
-         Item *i;
-         Iterator iterator;
- 
--        if ((r = parse_argv(argc, argv)) <= 0)
-+        r = parse_argv(argc, argv);
-+        if (r <= 0)
-                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- 
-         log_set_target(LOG_TARGET_AUTO);
--- 
-1.7.8.3
-
diff --git a/testing/systemd/0001-units-make-sure-syslog-socket-goes-away-early-during.patch b/testing/systemd/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
deleted file mode 100644
index 49248a6a4..000000000
--- a/testing/systemd/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ead51eb4ed55981f290e40a871ffbca6480c4cd3 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 12 Jan 2012 04:34:50 +0100
-Subject: [PATCH] units: make sure syslog socket goes away early during
- shutdown
-
----
- units/syslog.socket |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/units/syslog.socket b/units/syslog.socket
-index 323fa86..657e791 100644
---- a/units/syslog.socket
-+++ b/units/syslog.socket
-@@ -11,6 +11,8 @@
- Description=Syslog Socket
- DefaultDependencies=no
- Before=sockets.target syslog.target
-+Conflicts=shutdown.target
-+Before=shutdown.target
- 
- # Pull in syslog.target to tell people that /dev/log is now accessible
- Wants=syslog.target
--- 
-1.7.8.3
-
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
deleted file mode 100644
index f1cfcbd5f..000000000
--- a/testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 146660 2012-01-15 17:04:30Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=systemd
-pkgver=38
-pkgrel=3
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
-makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
-            'dbus-python: systemd-analyze'
-            'initscripts: legacy support for hostname and vconsole setup'
-            'initscripts-systemd: native boot and initialization scripts'
-            'python2-cairo: systemd-analyze'
-            'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-groups=('systemd')
-options=('!libtool')
-backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-        etc/dbus-1/system.d/org.freedesktop.login1.conf
-        etc/dbus-1/system.d/org.freedesktop.locale1.conf
-        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-        etc/systemd/system.conf
-        etc/systemd/user.conf
-        etc/systemd/systemd-logind.conf)
-install=systemd.install
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release"
-        '0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch'
-        '0001-units-make-sure-syslog-socket-goes-away-early-during.patch')
-md5sums=('68c66dce5a28c0efd7c210af5d11efed'
-         '752636def0db3c03f121f8b4f44a63cd'
-         '07437e70be65ef14fd4f13c5ec5bd1fe'
-         'c567ce597f68c07b9bc5b7e835f80f7d')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # Don't unset locale in getty
-  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
-  sed -i -e '/^Environ.*LANG/s/^/#/' \
-         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
-
-  patch -Np1 < "$srcdir/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch"
-  patch -Np1 < "$srcdir/0001-units-make-sure-syslog-socket-goes-away-early-during.patch"
-
-  ./configure --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --libdir=/usr/lib \
-              --localstatedir=/var \
-              --with-rootprefix= \
-              --with-rootlibdir=/lib
-
-  make
-
-  # fix .so links in manpages
-  sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
-  sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # fix systemd-analyze for python2
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # rename man pages to avoid conflicts with sysvinit and initscripts
-  cd "$pkgdir/usr/share/man"
-
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/systemd/os-release b/testing/systemd/os-release
deleted file mode 100644
index 5e24a6031..000000000
--- a/testing/systemd/os-release
+++ /dev/null
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
deleted file mode 100644
index 4850c879e..000000000
--- a/testing/systemd/systemd.install
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
-  if ! getent group lock >/dev/null; then
-    sbin/groupadd -g 54 lock
-  fi
-}
-
-sd_booted() {
-  [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  echo "systemd has been installed to /bin/systemd. Please ensure you append"
-  echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    systemctl daemon-reexec >/dev/null
-  fi
-
-  newpkgver=${1%-*}
-  oldpkgver=${2%-*}
-
-  # catch v31 need for restarting systemd-logind.service
-  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
-    # but only if systemd is running
-    if sd_booted; then
-      systemctl try-restart systemd-logind.service
-    fi
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et: