summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/mkinitcpio-busybox/PKGBUILD10
-rw-r--r--core/mkinitcpio-busybox/glibc-2.16.patch10
-rw-r--r--core/nfsidmap/PKGBUILD8
-rw-r--r--core/patch/PKGBUILD24
-rw-r--r--core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch30
-rw-r--r--core/systemd/PKGBUILD30
-rw-r--r--core/systemd/use-split-usr-path.patch10
7 files changed, 88 insertions, 34 deletions
diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD
index f0bb42286..c0e94f2b0 100644
--- a/core/mkinitcpio-busybox/PKGBUILD
+++ b/core/mkinitcpio-busybox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160678 2012-06-03 16:32:18Z dreisner $
+# $Id: PKGBUILD 167188 2012-09-27 01:16:40Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=mkinitcpio-busybox
-pkgver=1.20.1
+pkgver=1.20.2
pkgrel=1
pkgdesc="base initramfs tools"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,10 @@ license=('GPL')
depends=('glibc')
options=('!buildflags')
source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
+ 'glibc-2.16.patch'
'config')
-sha256sums=('3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9'
+sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882'
+ 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d'
'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0')
build() {
@@ -29,6 +31,8 @@ build() {
sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
"$srcdir/config" > .config
+ patch -Np1 < "$srcdir/glibc-2.16.patch"
+
make
}
diff --git a/core/mkinitcpio-busybox/glibc-2.16.patch b/core/mkinitcpio-busybox/glibc-2.16.patch
new file mode 100644
index 000000000..5e2fb4fa5
--- /dev/null
+++ b/core/mkinitcpio-busybox/glibc-2.16.patch
@@ -0,0 +1,10 @@
+--- a/include/libbb.h.orig 2012-09-17 08:28:35.215518120 -0400
++++ b/include/libbb.h 2012-09-17 08:28:49.807212925 -0400
+@@ -44,6 +44,7 @@
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #ifndef major
+ # include <sys/sysmacros.h>
+ #endif
diff --git a/core/nfsidmap/PKGBUILD b/core/nfsidmap/PKGBUILD
index 08a78b077..5f00e41da 100644
--- a/core/nfsidmap/PKGBUILD
+++ b/core/nfsidmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136619 2011-08-31 07:19:40Z tpowa $
+# $Id: PKGBUILD 167157 2012-09-26 16:38:02Z tpowa $
# Maintainer:
# Contributor: Judd <jvinet@zeroflux.org>
pkgname=nfsidmap
-pkgver=0.24
-pkgrel=3
+pkgver=0.25
+pkgrel=1
pkgdesc="Library to help mapping IDs, mainly for NFSv4"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -12,7 +12,6 @@ depends=('glibc' 'libldap>=2.4.18')
license=('custom:nfsidmap')
options=(!libtool)
source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz)
-md5sums=('d71a1ee9881d5b5814ff3ec41256937d')
build() {
cd $srcdir/lib$pkgname-$pkgver
@@ -27,3 +26,4 @@ package() {
# install license
install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE
}
+md5sums=('2ac4893c92716add1a1447ae01df77ab')
diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD
index e66b9163b..d2852c447 100644
--- a/core/patch/PKGBUILD
+++ b/core/patch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142074 2011-11-04 23:36:08Z allan $
+# $Id: PKGBUILD 167281 2012-09-29 22:30:14Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=patch
-pkgver=2.6.1
-pkgrel=3.1
+pkgver=2.7.1
+pkgrel=1
pkgdesc="A utility to apply patch files to original sources"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/patch/patch.html"
@@ -12,20 +12,14 @@ license=('GPL')
groups=('base-devel')
depends=('glibc')
makedepends=('ed')
-optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
- patch-2.6.1-get-arg.patch)
-md5sums=('d758eb96d3f75047efc004a720d33daf'
- 'f7953f3e472fae5118815e6138372e22'
- '45cd5709adbbcdcb3ab95dc43559c07c')
+optdepends=('ed: for patch -e functionality')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('e9ae5393426d3ad783a300a338c09b72'
+ 'b12189e0de3cb2af25268441647ec517')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- # Fixed argument type for --get
- # see https://bugzilla.redhat.com/show_bug.cgi?id=553624
- patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch
- ./configure --prefix=/usr --mandir=/usr/share/man
+ ./configure --prefix=/usr
make
}
@@ -36,5 +30,5 @@ check() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+ make DESTDIR=$pkgdir install
}
diff --git a/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
new file mode 100644
index 000000000..9be6ef28f
--- /dev/null
+++ b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
@@ -0,0 +1,30 @@
+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/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 9e8841aee..1c826da58 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,27 +3,30 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=189
-pkgrel=4
+pkgver=193
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
- 'pam' 'xz')
+ 'pam' 'quota-tools' 'xz')
+checkdepends=('python')
options=('!libtool')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
'0001-Reinstate-TIMEOUT-handling.patch'
+ '0001-tmpfiles-restore-previous-behavior-for-F-f.patch'
'use-split-usr-path.patch')
-md5sums=('ac2eb313f5dce79622f60aac56bca66d'
+md5sums=('732a9de2b1d2a15cab639c987ff9e90e'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'59e91c4d7a69b7bf12c86a9982e37ced'
'df69615503ad293c9ddf9d8b7755282d'
'5543be25f205f853a21fa5ee68e03f0d'
- '482dba45a783f06c2239f1355f4ce72f')
+ '1f435290db227c3a4f4396f86819227e'
+ 'fd5b5f04ab0a847373d357555129d4c0')
build() {
cd "$pkgname-$pkgver"
@@ -34,6 +37,9 @@ build() {
# hang onto this until we do the /{,s}bin merge
patch -Np1 <"$srcdir/use-split-usr-path.patch"
+ # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0
+ patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch"
+
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \
@@ -49,6 +55,10 @@ build() {
make
}
+check() {
+ make -C "$pkgname-$pkgver" check
+}
+
package_systemd() {
pkgdesc="system and service manager"
depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
@@ -60,7 +70,8 @@ package_systemd() {
'python2-cairo: systemd-analyze'
'python2-dbus: systemd-analyze'
'systemd-sysvcompat: symlink package to provide sysvinit binaries'
- 'cryptsetup: required for encrypted block devices')
+ 'cryptsetup: required for encrypted block devices'
+ 'quota-tools: kernel-level quota management')
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
@@ -130,9 +141,14 @@ package_systemd() {
package_systemd-sysvcompat() {
pkgdesc="sysvinit compat for systemd"
- conflicts=('sysvinit')
+ conflicts=('sysvinit' 'initscripts')
depends=('sysvinit-tools')
+ # the initscripts conflict here isn't actually needed, but in order to make
+ # this package remove both sysvinit and initscripts, the initscripts conflict
+ # is needed. There's no case in which you would ever want initscripts installed
+ # without sysvinit, and vice versa, as in both cases, they are unusable.
+
mv "$srcdir/_sysvcompat"/* "$pkgdir"
install -dm755 "$pkgdir/sbin"
diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch
index 057045bf1..2fd32998d 100644
--- a/core/systemd/use-split-usr-path.patch
+++ b/core/systemd/use-split-usr-path.patch
@@ -1,6 +1,6 @@
---- a/src/core/main.c 2012-07-17 19:46:24.000000000 -0400
-+++ b/src/core/main.c 2012-07-27 10:04:13.000000000 -0400
-@@ -1379,11 +1379,7 @@
+--- 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",
@@ -9,6 +9,6 @@
-#else
- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
-#endif
- arg_running_as == MANAGER_SYSTEM);
+ arg_running_as == SYSTEMD_SYSTEM);
- if (arg_running_as == MANAGER_SYSTEM) {
+ if (arg_running_as == SYSTEMD_SYSTEM) {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-08 01:03:11 +0000