summaryrefslogtreecommitdiff
path: root/staging
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-04 12:33:13 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-04 12:33:13 -0300
commitb6c59f3d5bcae3f0b61856c1bea145c25c02a6f7 (patch)
treedfc5defd8f0a8c6e64d7c41cfddfb0721b7e865c /staging
parent4919be024064582a1f552f864d6f230ed58d4485 (diff)
Removed files
Diffstat (limited to 'staging')
-rw-r--r--staging/glu/PKGBUILD32
-rw-r--r--staging/libotr/PKGBUILD27
-rw-r--r--staging/pyalpm/PKGBUILD23
-rw-r--r--staging/python/PKGBUILD75
-rw-r--r--staging/sip/PKGBUILD64
-rw-r--r--staging/systemd/0001-Reinstate-TIMEOUT-handling.patch124
-rw-r--r--staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch30
-rw-r--r--staging/systemd/initcpio-hook-udev20
-rw-r--r--staging/systemd/initcpio-install-timestamp14
-rw-r--r--staging/systemd/systemd.install29
-rw-r--r--staging/systemd/use-split-usr-path.patch14
11 files changed, 0 insertions, 452 deletions
diff --git a/staging/glu/PKGBUILD b/staging/glu/PKGBUILD
deleted file mode 100644
index 1aadbccb1..000000000
--- a/staging/glu/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 166931 2012-09-22 12:55:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=glu
-pkgver=9.0.0
-pkgrel=1
-pkgdesc="Mesa OpenGL Utility library"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/mesa/glu/"
-license=('LGPL')
-depends=('libgl')
-makedepends=('mesa')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --disable-static
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make -k check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
diff --git a/staging/libotr/PKGBUILD b/staging/libotr/PKGBUILD
deleted file mode 100644
index ebc81d058..000000000
--- a/staging/libotr/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 166024 2012-09-04 14:32:25Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Bug <Bug2000@gmail.com>
-
-pkgname=libotr
-pkgver=4.0.0
-pkgrel=1
-pkgdesc='Off-the-Record Messaging Library and Toolkit'
-url='http://www.cypherpunks.ca/otr/'
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-depends=('libgcrypt')
-options=('!libtool')
-source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/pyalpm/PKGBUILD b/staging/pyalpm/PKGBUILD
deleted file mode 100644
index c9d420471..000000000
--- a/staging/pyalpm/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
-
-pkgname=pyalpm
-pkgver=0.5.3
-pkgrel=2
-pkgdesc="Libalpm bindings for Python 3"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/users/remy/pyalpm.git/"
-license=('GPL')
-depends=('python>=3.2' 'pacman>=4')
-source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz")
-md5sums=('a76019106d17de3a5933c773013a63d1')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- python setup.py build
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- python setup.py install --root=${pkgdir}
-}
-
diff --git a/staging/python/PKGBUILD b/staging/python/PKGBUILD
deleted file mode 100644
index ec300968b..000000000
--- a/staging/python/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 167272 2012-09-29 16:34:59Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=python
-pkgver=3.3.0
-pkgrel=1
-_pybasever=3.3
-pkgdesc="Next generation of the python high-level scripting language"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.python.org/"
-depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk' 'sqlite' 'valgrind')
-optdepends=('tk: for tkinter' 'sqlite')
-provides=('python3')
-replaces=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a')
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- # FS#23997
- sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
-
- # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
- # rather than copies shipped in the tarball
- rm -r Modules/expat
- rm -r Modules/zlib
- rm -r Modules/_ctypes/{darwin,libffi}*
-
- ./configure --prefix=/usr \
- --enable-shared \
- --with-threads \
- --with-computed-gotos \
- --enable-ipv6 \
- --with-valgrind \
- --with-system-expat \
- --with-dbmliborder=gdbm:ndbm \
- --with-system-ffi
-
- make
-}
-
-check() {
- cd "${srcdir}/Python-${pkgver}"
- LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
- "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \
- test_urllib test_uuid test_pydoc
-}
-
-package() {
- cd "${srcdir}/Python-${pkgver}"
- make DESTDIR="${pkgdir}" install maninstall
-
- # Why are these not done by default...
- ln -sf python3 "${pkgdir}/usr/bin/python"
- ln -sf python3-config "${pkgdir}/usr/bin/python-config"
- ln -sf idle3 "${pkgdir}/usr/bin/idle"
- ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc"
- ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
-
- # Fix FS#22552
- ln -sf ../../libpython${_pybasever}m.so \
- "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so"
-
- # Clean-up reference to build directory
- sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile"
-
- # License
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD
deleted file mode 100644
index b03e62351..000000000
--- a/staging/sip/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 167297 2012-09-30 16:56:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgbase=sip
-pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-makedepends=('python' 'python2')
-source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('9a48ad975e04ac824188840ea498ac32')
-
-build() {
- cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
- cd ${pkgbase}-${pkgver}
- python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
- make
-
- ### Python2 version ###
- cd ../python2-${pkgbase}-${pkgver}
- python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
- make
-}
-
-package_sip() {
- pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
- depends=('glibc')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install -C sipgen
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python-sip() {
- pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
- depends=('sip' 'python')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install -C siplib
-
- install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py
- install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-sip() {
- pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
- depends=('sip' 'python2')
-
- cd python2-${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install -C siplib
-
- install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
- install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 766dcb87f..000000000
--- a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
----
- src/libudev/libudev-device.c | 19 +++++++++++++++++++
- src/libudev/libudev-private.h | 1 +
- src/udev/udevd.c | 13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
- struct udev_list tags_list;
- unsigned long long int seqnum;
- unsigned long long int usec_initialized;
-+ int timeout;
- int devlink_priority;
- int refcount;
- dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
- bool db_persist;
- };
-
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+ return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+ char num[32];
-+
-+ udev_device->timeout = timeout;
-+ snprintf(num, sizeof(num), "%u", timeout);
-+ udev_device_add_property(udev_device, "TIMEOUT", num);
-+ return 0;
-+}
-+
- /**
- * udev_device_get_seqnum:
- * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
-
- util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
- udev_device_set_syspath(udev_device, path);
-+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
- } else if (startswith(property, "SUBSYSTEM=")) {
- udev_device_set_subsystem(udev_device, &property[10]);
- } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
- udev_list_init(udev, &udev_device->sysattr_value_list, true);
- udev_list_init(udev, &udev_device->sysattr_list, false);
- udev_list_init(udev, &udev_device->tags_list, true);
-+ udev_device->timeout = -1;
- udev_device->watch_handle = -1;
- /* copy global properties */
- udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
---- a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
- }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
- struct udev_list_node *loop;
-
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
- return;
- }
-
-- if (children >= children_max) {
-+ if (!force && children >= children_max) {
- if (children_max > 1)
- log_debug("maximum number (%i) of children reached\n", children);
- return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
-
- event->state = EVENT_QUEUED;
- udev_list_node_append(&event->node, &event_list);
-+
-+ /* run all events with a timeout set immediately */
-+ if (udev_device_get_timeout(dev) > 0) {
-+ event_run(event, true);
-+ return 0;
-+ }
-+
- return 0;
- }
-
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
- if (is_devpath_busy(event))
- continue;
-
-- event_run(event);
-+ event_run(event, false);
- }
- }
-
---
-1.7.10.2
-
diff --git a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
deleted file mode 100644
index 9be6ef28f..000000000
--- a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Thu, 27 Sep 2012 20:48:13 -0400
-Subject: [PATCH] tmpfiles: restore previous behavior for F/f
-
-d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
-them to glob_item(). Restore the old behavior and shortcut straight to
-write_one_file().
----
- src/tmpfiles/tmpfiles.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index f10f908..bf900fa 100644
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -673,6 +673,10 @@ static int create_item(Item *i) {
-
- case CREATE_FILE:
- case TRUNCATE_FILE:
-+ r = write_one_file(i, i->path);
-+ if (r < 0)
-+ return r;
-+ break;
- case WRITE_FILE:
- r = glob_item(i, write_one_file);
- if (r < 0)
---
-1.7.12.1
-
diff --git a/staging/systemd/initcpio-hook-udev b/staging/systemd/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/staging/systemd/initcpio-hook-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- udevd --daemon --resolve-names=never
- udevd_running=1
-}
-
-run_hook() {
- msg ":: Triggering uevents..."
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
- udevadm settle
-}
-
-run_cleanuphook() {
- udevadm control --exit
- udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/systemd/initcpio-install-timestamp b/staging/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/staging/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
- add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
- cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install
deleted file mode 100644
index 784926e17..000000000
--- a/staging/systemd/systemd.install
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-sd_booted() {
- [ -e sys/fs/cgroup/systemd ]
-}
-
-post_install() {
- # enable getty@tty1 by default, but don't track the file
- systemctl enable getty@.service
-
- systemd-machine-id-setup
-
- echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
- echo " bootloader to replace sysvinit with systemd"
-}
-
-post_upgrade() {
- systemd-machine-id-setup
-
- # getty@tty1.service is no longer enabled by default, but we don't want to break
- # existing setups.
- if [ "$(vercmp 183 "$2")" -eq 1 ]; then
- # systemctl seems to be whiny on sysvinit. this will succeed unless something
- # horrific happens, so just mask the error.
- systemctl -q enable getty@.service || true
- fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/systemd/use-split-usr-path.patch b/staging/systemd/use-split-usr-path.patch
deleted file mode 100644
index 2fd32998d..000000000
--- a/staging/systemd/use-split-usr-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400
-+++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400
-@@ -1455,11 +1455,7 @@
-
- /* Set up PATH unless it is already set */
- setenv("PATH",
--#ifdef HAVE_SPLIT_USR
- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
--#else
-- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
--#endif
- arg_running_as == SYSTEMD_SYSTEM);
-
- if (arg_running_as == SYSTEMD_SYSTEM) {