summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/bash/PKGBUILD112
-rw-r--r--core/bridge-utils/PKGBUILD22
-rw-r--r--core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch30
-rw-r--r--core/bridge-utils/bridges.conf.d27
-rw-r--r--core/coreutils/PKGBUILD18
-rw-r--r--core/cryptsetup/PKGBUILD8
-rw-r--r--core/dash/PKGBUILD6
-rw-r--r--core/dhcpcd/PKGBUILD20
-rw-r--r--core/dhcpcd/dhcpcd.conf.d6
-rw-r--r--core/e2fsprogs/PKGBUILD11
-rw-r--r--core/ed/PKGBUILD5
-rw-r--r--core/gcc/PKGBUILD14
-rw-r--r--core/glibc/PKGBUILD20
-rw-r--r--core/inetutils/PKGBUILD7
-rw-r--r--core/iproute2/PKGBUILD13
-rw-r--r--core/iptables/PKGBUILD20
-rw-r--r--core/iw/PKGBUILD6
-rw-r--r--core/kmod/PKGBUILD14
-rw-r--r--core/libsasl/PKGBUILD8
-rw-r--r--core/libsasl/saslauthd49
-rw-r--r--core/libtool/PKGBUILD6
-rw-r--r--core/lvm2/PKGBUILD25
-rw-r--r--core/lvm2/dmeventd.service4
-rw-r--r--core/lvm2/lvm-monitoring.service4
-rw-r--r--core/lvm2/lvm2_install8
-rw-r--r--core/lvm2/lvmetad.service4
-rw-r--r--core/net-tools/PKGBUILD37
-rw-r--r--core/net-tools/net-tools.install12
-rw-r--r--core/nilfs-utils/PKGBUILD8
-rw-r--r--core/openvpn/PKGBUILD7
-rw-r--r--core/openvpn/openvpn-tapdev.conf12
-rwxr-xr-xcore/openvpn/openvpn-tapdev.rc40
-rwxr-xr-xcore/openvpn/openvpn.rc43
-rw-r--r--core/openvpn/openvpn@.service2
-rw-r--r--core/ppp/PKGBUILD9
-rw-r--r--core/pptpclient/PKGBUILD14
-rw-r--r--core/sed/PKGBUILD8
-rw-r--r--core/shadow/PKGBUILD19
-rw-r--r--core/shadow/login.defs4
-rwxr-xr-xcore/shadow/shadow.cron.daily4
-rw-r--r--core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch87
-rw-r--r--core/systemd/PKGBUILD26
-rw-r--r--core/systemd/use-split-usr-path.patch14
-rw-r--r--core/sysvinit-tools/PKGBUILD11
-rw-r--r--core/tar/PKGBUILD8
-rw-r--r--core/util-linux/PKGBUILD12
-rw-r--r--core/wpa_actiond/PKGBUILD6
-rw-r--r--core/wpa_supplicant/PKGBUILD8
48 files changed, 390 insertions, 468 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index cf53e9650..e8642e15b 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180066 2013-03-15 22:55:31Z allan $
+# $Id: PKGBUILD 187018 2013-06-03 11:14:54Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -6,7 +6,7 @@ pkgname=bash
_basever=4.2
_patchlevel=045 #prepare for some patches
pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=4
pkgdesc="The GNU Bourne Again shell"
arch=('i686' 'x86_64')
license=('GPL')
@@ -28,15 +28,20 @@ if [ $_patchlevel -gt 000 ]; then
done
fi
-build() {
+prepare() {
cd ${srcdir}/${pkgname}-$_basever
+
for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
done
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-$_basever
- _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\'
- -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\'
+ _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\'
+ -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\'
-DSYS_BASHRC=\'\"/etc/bash.bashrc\"\'
-DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\')
export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
@@ -55,10 +60,7 @@ package() {
cd ${srcdir}/${pkgname}-$_basever
make DESTDIR=${pkgdir} install
- # put needed symlinks in /bin
- install -dm755 ${pkgdir}/bin
- ln -s ../usr/bin/bash ${pkgdir}/bin/bash
- ln -s ../usr/bin/bash ${pkgdir}/bin/sh
+ ln -s bash ${pkgdir}/usr/bin/sh
install -dm755 ${pkgdir}/etc/skel/
@@ -73,99 +75,99 @@ package() {
}
md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
- '8d37a3f97a48c1e56e1a4ded877ed944'
+ 'SKIP'
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
'3546099a1b2f667adc9794f52e78e35b'
'472f536d7c9e8250dc4568ec4cfaf294'
'1100bc1dda2cdc06ac44d7e5d17864a3'
- 'a7184b76eb4a079f10174a0a8f574819'
+ 'SKIP'
'30e7948079921d3261efcc6a40722135'
- 'c4d45307f7e69fe508ce347c4cec1955'
+ 'SKIP'
'9ea06decec43a198f3d7cf29acc602f8'
- '74bddae6eeb9227a04a467d42597a34d'
+ 'SKIP'
'fb48f6134d7b013135929476aa0c250c'
- '3e6a18226b16c773229246abd07a1f5e'
+ 'SKIP'
'e70e45de33426b38153b390be0dbbcd4'
- 'e667dc9348ebc3e0e14bfdd87f4b6ff2'
+ 'SKIP'
'ce4e5c484993705b27daa151eca242c2'
- '41cbd8e57589bc081a546a014ddb12f8'
+ 'SKIP'
'88d1f96db29461767602e2546803bda7'
- 'b8b781520f4c7493a2a1ac3010a44a44'
+ 'SKIP'
'24c574bf6d6a581e300823d9c1276af6'
- '354a0899a7c4b446454c52546562b55b'
+ 'SKIP'
'4c5835f2fbab36c4292bb334977e5b6d'
- 'ff4547ca7b508d52101729d61f5b77b6'
+ 'SKIP'
'0a51602b535ef661ee707be6c8bdb373'
- 'cec7c92a4d8052ea4b29216365d16566'
+ 'SKIP'
'58deacf3d57cbd75575444ff6a3b0806'
- '9ed2a08e549c3c17745f19e8413cfb31'
+ 'SKIP'
'72d5059820015231483bb7415d09e9db'
- '45b04b41a4230f469d3e47ab9952c2df'
+ 'SKIP'
'608336ebe215984ef126e3c29d2d3409'
- '623f63025d155a84977b62531e260ee2'
+ 'SKIP'
'ed19da878e3f630834c62b9d9dcc6fce'
- 'eef2dd4a0e4505dc8f8e664b40c6cd66'
+ 'SKIP'
'2d07daba0b8ca8f876d2aa052ff594b4'
- '0cb823a44e6dc1cde7ac97ae5c8163c9'
+ 'SKIP'
'53d246537e1fffd1aaa02ba5c056211c'
- '60f983a1dded5f0b28040ff4b3f1e9b5'
+ 'SKIP'
'304fd129a58fee2d8a34f8b4704db0aa'
- '9df4bf4f46aaadc436f430187741f815'
+ 'SKIP'
'6921a0b4228fe89b6537a5c29f027c89'
- '4ef0e2a2cbfbdd53346f927000b7e112'
+ 'SKIP'
'1195d85447f3d048d2c9bcd075fa765c'
- 'b0f3a651ce29a1feee687d93177870f1'
+ 'SKIP'
'b09000bba08da6ac753124593850cdf7'
- '204bb5054d1f8bafe2b446d4e5d0d99a'
+ 'SKIP'
'09d3f96a16b881334cfaee0cf320b47e'
- 'aab415350bcc2bb0c29943b413499d96'
+ 'SKIP'
'597bf71a2aac6feb510b7505cdd3d4f7'
- 'b0db384bdedecafbdd70c8d22c56af5f'
+ 'SKIP'
'3fab459b4e09daea529cacad025b13b3'
- 'bab99835ad6198cb1109fac89a085262'
+ 'SKIP'
'4ad8d11e72afc6090e701073ff034cf4'
- '5658ef10c9d0d804126ec1ce700e4e2c'
+ 'SKIP'
'c7d2493e44490f01dd20bdc8feb0a6a7'
- 'e4855dbc4b743618b54d408bd5878637'
+ 'SKIP'
'9f19c199dd8d1fa9254eebe738759272'
- '600c8e90c2fb13cdbc7aa3f18566df03'
+ 'SKIP'
'a6ed82daf034587aee2f2581ba5fe829'
- '821620a0389df723644911c56796ca8c'
+ 'SKIP'
'da9265aa2527fd4a7481baa3e0550287'
- '0043f8b75f46f43608a67b863e300fe8'
+ 'SKIP'
'ec444d229e8899fbaaf6fc7de2d82ae6'
- 'b632fca3a4943825bfaf3bd29df6b27d'
+ 'SKIP'
'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
- '2ffa9a802bbd57540021715f84cc76f4'
+ 'SKIP'
'89390ff6a3c2ef7e09dd4b8b097a8e56'
- '3e9b529ef3726b75d125d678de76977f'
+ 'SKIP'
'eee08003395c417f677d1a4bf8c548ee'
- 'f670f7672b11d0df8c31885dbf15f390'
+ 'SKIP'
'2fe070dd6d75d8ff16f269184a16e9c4'
- '5018b6b7737808141043b57cf4eb842d'
+ 'SKIP'
'4e610506c1711bf3483b965800ac3d5d'
- 'cb65e541f9b60a8cb1fe58404f264b73'
+ 'SKIP'
'7cd9bfdf7cbfd45274d07620ee94c8d9'
- 'a7d2eace0da5fd236c93dbfd93458838'
+ 'SKIP'
'9c3142956064d175a880bcb186e51ef9'
- 'a1a87649853f20fe99572ddc02b0c67f'
+ 'SKIP'
'c10692f447d4966c879f8fb8d7c8ebc9'
- '1bf5e34ad46566bc2d0eb7560ff8968e'
+ 'SKIP'
'9ef3c308cde413e95866c1266cfb4e98'
- 'afbb94e04dab29bd4ce92199892f2b5e'
+ 'SKIP'
'cd48f57a404498d4e5c73a3501c4b1a5'
- 'd2693a2728b5a0448947d23ce47cb4b3'
+ 'SKIP'
'00a2371b6c05acbfce6bc850c6d982f8'
- '72744ac844a1dfd15dddbba7f73ec45c'
+ 'SKIP'
'7bc4942a66ca4024ee964db7ede07896'
- '7e97f02d9dd1436eed278f2732542ecf'
+ 'SKIP'
'1cf7701017ebfc8e129de92c8f8b798c'
- '4ef8b5af440bf7b939b7955ce68b4dc7'
+ 'SKIP'
'9e61168fca692d8d1a733c389a63712e'
- '665861582049ba270cc726b7a6e0324d'
+ 'SKIP'
'b4b11d64b45ea9ec50dcc74c6c3861f6'
- '233031ccf9cbb1265be30753e0fa41f4'
+ 'SKIP'
'1661bcc83c4715f54368877452ff2247'
- '302c5516e469171b5187118024fca2a7')
+ 'SKIP')
diff --git a/core/bridge-utils/PKGBUILD b/core/bridge-utils/PKGBUILD
index fb452354e..07742e381 100644
--- a/core/bridge-utils/PKGBUILD
+++ b/core/bridge-utils/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 140510 2011-10-16 05:39:52Z eric $
+# $Id: PKGBUILD 187019 2013-06-03 11:14:55Z allan $
# Maintainer:
# Contributor: Judd Vinet <judd@archlinux.org>
pkgname=bridge-utils
pkgver=1.5
-pkgrel=1
+pkgrel=2
pkgdesc="Utilities for configuring the Linux ethernet bridge"
arch=('i686' 'x86_64')
url="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge"
license=('GPL')
depends=('glibc')
-backup=('etc/conf.d/bridges')
source=(http://downloads.sourceforge.net/bridge/bridge-utils-$pkgver.tar.gz
- bridges.conf.d)
-md5sums=('ec7b381160b340648dede58c31bb2238'
- 'f5d691282653580dd5fd4a1092ef365b')
+ bridge-utils-1.5-linux_3.8.x.patch)
+
+prepare () {
+ # fix compiling with newer kernel headers
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../bridge-utils-1.5-linux_3.8.x.patch
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
aclocal
autoconf
- ./configure --prefix=/usr --sysconfdir=/etc
+ ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
-
- # install config file
- install -Dm644 ../bridges.conf.d "${pkgdir}/etc/conf.d/bridges"
}
+md5sums=('ec7b381160b340648dede58c31bb2238'
+ 'fba700dcb2a3225d72b3bae64c7f49ca')
diff --git a/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch
new file mode 100644
index 000000000..0455a9085
--- /dev/null
+++ b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch
@@ -0,0 +1,30 @@
+commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
+Author: Russell Senior <russell@personaltelco.net>
+Date: Wed Mar 6 12:49:42 2013 -0800
+
+ bridge-utils: Fix compile against linux-3.8.x
+
+ Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
+ struct in6_addr but doesn't define it. The trivial seeming fix of
+ including the header that does define it causes more problems. The
+ problem was discussed on mailing lists in January 2013. The final
+ suggestion I found was here:
+
+ http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
+
+ This is intended to implement that suggestion.
+
+ Signed-off-by: Russell Senior <russell@personaltelco.net>
+
+diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
+index 39964f2..dd14bae 100644
+--- a/libbridge/libbridge.h
++++ b/libbridge/libbridge.h
+@@ -20,6 +20,7 @@
+ #define _LIBBRIDGE_H
+
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+
diff --git a/core/bridge-utils/bridges.conf.d b/core/bridge-utils/bridges.conf.d
deleted file mode 100644
index 2609cf51f..000000000
--- a/core/bridge-utils/bridges.conf.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Settings for layer-2 bridges
-#
-# For each bridge interface declared in INTERFACES (in rc.conf), declare
-# a bridge_${IF} variable that contains the real ethernet interfaces that
-# should be bridged togeether.
-#
-# Then list the bridge interface name in the BRIDGE_INTERFACES array.
-#
-
-# example:
-#
-# in /etc/rc.conf:
-# eth0="eth0 up"
-# eth1="eth1 up"
-# br0="br0 192.168.0.2 netmask 255.255.255.0 up"
-# INTERFACES=(lo eth0 eth1 br0)
-#
-# in /etc/conf.d/bridges
-# bridge_br0="eth0 eth1"
-# BRIDGE_INTERFACES=(br0)
-#
-
-
-#bridge_br0="eth0 eth1"
-#BRIDGE_INTERFACES=(br0)
-
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index 73cc73f86..f5a11ec40 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178157 2013-02-17 10:37:53Z allan $
+# $Id: PKGBUILD 187020 2013-06-03 11:14:56Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=coreutils
pkgver=8.21
-pkgrel=1
+pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -14,11 +14,10 @@ depends=('glibc' 'pam' 'acl' 'gmp' 'libcap')
install=${pkgname}.install
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
md5sums=('065ba41828644eca5dd8163446de5d64'
- '5d68aee0cfb701c13ec624ad8df142a9')
+ 'SKIP')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
./configure --prefix=/usr --libexecdir=/usr/lib \
--enable-no-install-program=groups,hostname,kill,uptime
make
@@ -32,15 +31,4 @@ check() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-
- cd ${pkgdir}/usr/bin
- install -dm755 ${pkgdir}/bin
-
- # binaries required by FHS
- _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
- 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync'
- 'true' 'uname')
- for i in ${_fhs[@]}; do
- ln -s ../usr/bin/$i ${pkgdir}/bin/$i
- done
}
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index fbc39ee53..1d011b651 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184226 2013-05-04 14:17:39Z thomas $
+# $Id: PKGBUILD 187021 2013-06-03 11:14:58Z allan $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=cryptsetup
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
arch=(i686 x86_64)
license=('GPL')
@@ -31,4 +31,8 @@ package() {
# install hook
install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
+
+ # usrmove
+ cd "$pkgdir"/usr
+ mv sbin bin
}
diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD
index 6e2d4a66a..eb288f561 100644
--- a/core/dash/PKGBUILD
+++ b/core/dash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175814 2013-01-22 03:43:27Z dan $
+# $Id: PKGBUILD 187022 2013-06-03 11:14:59Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=dash
pkgver=0.5.7
-pkgrel=3
+pkgrel=4
pkgdesc="A POSIX compliant shell that aims to be as small as possible"
arch=('i686' 'x86_64')
url="http://gondor.apana.org.au/~herbert/dash/"
@@ -15,7 +15,7 @@ sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix=""
+ ./configure --prefix=/usr --bindir=/usr/bin --mandir=/usr/share/man --exec-prefix=""
make
}
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 58b63ab65..7e64410c1 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184223 2013-05-04 10:58:11Z foutrelis $
+# $Id: PKGBUILD 187023 2013-06-03 11:15:01Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
pkgver=5.6.8
-pkgrel=1
+pkgrel=3
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
arch=('i686' 'x86_64')
@@ -13,12 +13,11 @@ license=('BSD')
groups=('base')
depends=('glibc' 'sh')
provides=('dhcp-client')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
+backup=('etc/dhcpcd.conf')
options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
- 'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
+ 'dhcpcd_.service' 'dhcpcd.service')
sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
- 'b67b9ce6a2faaca75fea356966a16be2283b7db0'
'6245b8db7e6f39a0305571726bb693a53901c400'
'e49e01041f831281a1cd0c97ca21204e0aa07fda')
@@ -37,13 +36,6 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
- # Create Binary Symlink
- install -d ${pkgdir}/usr/sbin
- ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
- # Install Configuration File used in /etc/rc.d/network
- install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
# Install License
install -d $pkgdir/usr/share/licenses/$pkgname
awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
@@ -55,4 +47,8 @@ package() {
# install systemd files
install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
+
+ # usrmove
+ cd "$pkgdir"
+ mv sbin usr/bin
}
diff --git a/core/dhcpcd/dhcpcd.conf.d b/core/dhcpcd/dhcpcd.conf.d
deleted file mode 100644
index 83c6f14ad..000000000
--- a/core/dhcpcd/dhcpcd.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP client daemon
-#
-
-DHCPCD_ARGS="-q"
-
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index af79b247e..2f2a5b09c 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178092 2013-02-16 07:50:44Z ronald $
+# $Id: PKGBUILD 187024 2013-06-03 11:15:03Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=e2fsprogs
pkgver=1.42.7
-pkgrel=1
+pkgrel=2
pkgdesc="Ext2/3/4 filesystem utilities"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'MIT')
@@ -45,4 +45,11 @@ package() {
# install MIT license
install -Dm644 "${srcdir}/MIT-LICENSE" \
"${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
+
+ # usrmove
+ cd "$pkgdir"
+ mv sbin/* usr/bin/
+ rmdir sbin
+ mv usr/sbin/* usr/bin/
+ rmdir usr/sbin
}
diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD
index c3785934d..c5397f236 100644
--- a/core/ed/PKGBUILD
+++ b/core/ed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184200 2013-05-03 13:44:53Z dreisner $
+# $Id: PKGBUILD 187025 2013-06-03 11:15:04Z allan $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=ed
pkgver=1.8
-pkgrel=1
+pkgrel=2
pkgdesc="A POSIX-compliant line-oriented text editor"
arch=('i686' 'x86_64')
license=('GPL')
@@ -20,6 +20,7 @@ build() {
cd "$pkgname-$pkgver"
./configure --prefix=/ \
+ --bindir=/usr/bin \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
"CFLAGS=$CFLAGS" \
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index b003f22f8..73d6ef280 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 184258 2013-05-05 07:09:51Z allan $
+# $Id: PKGBUILD 186997 2013-06-03 02:50:08Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
# NOTE: libtool requires rebuilt with each new gcc version
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.8.0
-pkgrel=4
-_snapshot=4.8-20130502
+pkgver=4.8.1
+pkgrel=1
+#_snapshot=4.8-20130502
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -15,9 +15,9 @@ url="http://gcc.gnu.org"
makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
checkdepends=('dejagnu' 'inetutils')
options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2)
- #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-md5sums=('672a1ad73f8391c5a6b3c4429eb0d798')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
+ #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+md5sums=('3b2386c114cd74185aa3754b58a79304')
if [ -n "${_snapshot}" ]; then
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index e89e1aedc..0eafa46ff 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182400 2013-04-10 06:04:12Z allan $
+# $Id: PKGBUILD 187027 2013-06-03 11:15:09Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.17
-pkgrel=5
+pkgrel=6
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
@@ -61,6 +61,8 @@ build() {
fi
echo "slibdir=/usr/lib" >> configparms
+ echo "sbindir=/usr/bin" >> configparms
+ echo "rootsbindir=/usr/bin" >> configparms
# remove hardening options for building libraries
CFLAGS=${CFLAGS/-fstack-protector/}
@@ -88,7 +90,7 @@ build() {
make
# remove harding in preparation to run test-suite
- sed -i '2,4d' configparms
+ sed -i '4,6d' configparms
}
check() {
@@ -119,9 +121,6 @@ package() {
install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
- # temporary symlink
- ln -s ../../sbin/ldconfig ${pkgdir}/usr/bin/ldconfig
-
# create /etc/locale.gen
install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
@@ -135,11 +134,10 @@ package() {
# libthread_db-1.0.so
cd $pkgdir
- strip $STRIP_BINARIES sbin/{ldconfig,sln} \
- usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
- usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
- usr/lib/getconf/* \
- usr/sbin/{iconvconfig,nscd}
+ strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
+ usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
+ usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
+ usr/lib/getconf/*
[[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
strip $STRIP_STATIC usr/lib/*.a
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index a25f1a53b..7e6a80563 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $
+# $Id: PKGBUILD 187028 2013-06-03 11:15:10Z allan $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=inetutils
pkgver=1.9.1
-pkgrel=5
+pkgrel=6
pkgdesc="A collection of common network programs"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/inetutils/"
@@ -60,9 +60,6 @@ package() {
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/bin"
- ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname"
- ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname"
install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname"
echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index a42ee69c7..f0e3302d8 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184614 2013-05-07 16:15:47Z foutrelis $
+# $Id: PKGBUILD 187029 2013-06-03 11:15:12Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=iproute2
pkgver=3.9.0
-pkgrel=1
+pkgrel=2
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -46,12 +46,11 @@ package() {
make DESTDIR="$pkgdir" install
- # allow loopback to be started before /usr is mounted, this may not be supported in the future
- mkdir -p "$pkgdir/sbin"
- mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
- ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
-
# libnetlink isn't installed, install it FS#19385
install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+
+ # usrmove
+ cd "$pkgdir"
+ mv usr/sbin usr/bin
}
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 17c057d0a..0d6cf7e3f 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 186735 2013-05-30 21:29:53Z andrea $
+# $Id: PKGBUILD 187030 2013-06-03 11:15:14Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=iptables
-pkgver=1.4.18
-pkgrel=2
+pkgver=1.4.19.1
+pkgrel=1
pkgdesc='Linux kernel packet control tool'
arch=('i686' 'x86_64')
license=('GPL2')
url='http://www.netfilter.org/projects/iptables/index.html'
depends=('glibc' 'bash')
-makedepends=('linux-api-headers' 'chrpath')
+makedepends=('linux-api-headers')
+backup=('etc/xtables/connlabel.conf')
options=('!libtool')
-source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
+source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig}
empty.rules
simple_firewall.rules
empty-filter.rules
@@ -24,7 +25,8 @@ source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.t
iptables.service
ip6tables.service
iptables-flush)
-sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e'
+sha1sums=('566ba23b73403b0e4b4511d35c40124717bba97b'
+ 'SKIP'
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
'd9f9f06b46b4187648e860afa0552335aafe3ce4'
@@ -58,10 +60,6 @@ package() {
make DESTDIR="${pkgdir}" install
- # Remove RPATH from iptables libraries
- # http://www.spinics.net/lists/netfilter-devel/msg24969.html
- chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so
-
cd "${srcdir}"
install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
@@ -73,6 +71,6 @@ package() {
# install systemd files
install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service
install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service
- install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush
+ install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush
}
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index e18bb22cd..ddd497948 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185217 2013-05-12 09:08:11Z thomas $
+# $Id: PKGBUILD 187031 2013-06-03 11:15:15Z allan $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=iw
pkgver=3.10
-pkgrel=1
+pkgrel=2
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
arch=("i686" "x86_64")
url="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -20,5 +20,5 @@ build() {
package() {
cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" SBINDIR="/usr/bin" install
}
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 6bf5076f3..4ea0575c4 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182754 2013-04-14 16:44:17Z dreisner $
+# $Id: PKGBUILD 187032 2013-06-03 11:15:16Z allan $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=kmod
pkgver=13
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64')
url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -11,7 +11,7 @@ license=('GPL2')
depends=('glibc' 'zlib')
makedepends=('gtk-doc')
options=('!libtool')
-provides=('module-init-tools=3.16')
+provides=('module-init-tools=3.16' 'libkmod.so')
conflicts=('module-init-tools')
replaces=('module-init-tools')
source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
@@ -38,13 +38,9 @@ package() {
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
# extra directories
- install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin"
+ install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d
- # add symlinks to kmod
- ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
- ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
-
- for tool in {ins,ls,rm}mod modinfo; do
+ for tool in {ins,ls,rm,dep}mod mod{probe,info}; do
ln -s kmod "$pkgdir/usr/bin/$tool"
done
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index b99f0afd4..df0e24d52 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $
+# $Id: PKGBUILD 187033 2013-06-03 11:15:22Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# This package spans multiple repositories.
@@ -8,7 +8,7 @@
#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
pkgname=libsasl
pkgver=2.1.26
-pkgrel=3
+pkgrel=4
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=('i686' 'x86_64')
url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
0030-dont_use_la_files_for_opening_plugins.patch
saslauthd.service
saslauthd.conf.d
- saslauthd
tmpfiles.conf)
md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
'79b8a5e8689989e2afd4b7bda595a7b1'
@@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
'8e7106f32e495e9ade69014fd1b3352a'
'3499dcd610ad1ad58e0faffde2aa7a23'
'49219af5641150edec288a3fdb65e7c1'
- '75542f613185d5a90520ad0d7d926a20'
'45bb0192d2f188066240b9a66ee6365f')
build() {
@@ -74,6 +72,7 @@ build() {
popd
./configure --prefix=/usr \
+ --sbin=/usr/bin \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-static \
@@ -131,7 +130,6 @@ package_cyrus-sasl() {
cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
make DESTDIR="${pkgdir}" install
- install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf"
diff --git a/core/libsasl/saslauthd b/core/libsasl/saslauthd
deleted file mode 100644
index 6afafae0b..000000000
--- a/core/libsasl/saslauthd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="saslauthd"
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case "$1" in
- start)
- stat_busy "Starting $DAEMON_NAME"
- [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
- if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
- add_daemon $DAEMON_NAME
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping $DAEMON_NAME"
- [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm_daemon $DAEMON_NAME
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index c530b2d6a..46cd0264a 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181169 2013-04-02 06:48:59Z allan $
+# $Id: PKGBUILD 186998 2013-06-03 02:50:09Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
@@ -6,7 +6,7 @@
pkgname=('libtool' 'libltdl')
pkgver=2.4.2
-pkgrel=8
+pkgrel=9
pkgdesc="A generic library support script"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libtool"
@@ -28,7 +28,7 @@ check() {
}
package_libtool() {
- depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.0')
+ depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.1')
groups=('base-devel')
install=libtool.install
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index f34523f4d..fe6c368a2 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 177953 2013-02-12 12:13:50Z thomas $
+# $Id: PKGBUILD 187034 2013-06-03 11:15:24Z allan $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.98
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/"
license=('GPL2' 'LGPL2.1')
+makedepends=('systemd')
groups=('base')
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
lvm2_install
@@ -21,24 +22,24 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
lvmetad.service
lvmetad.socket)
sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
- '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
- '8008547b133af89f79461a6df5412539ed3f26b7'
+ 'SKIP'
+ '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
'ff0fdf0a3005a41acd4b36865056109effc3474b'
'f6a554eea9557c3c236df2943bb6e7e723945c41'
'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
- 'cbc64f377fbb1c1a9ff53bc6ca85c324075499b7'
+ '01782ce8e10718c1513e3906b126f30f682f5cab'
'1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
- 'ae945cae2d71b286439a9945876acb78dc9eeaf7'
- '460b094e8689298ed59842d1abcee5d4e706e1d7'
+ 'adf26f5e5636de9c055b2ac3b179641a543a8937'
+ 'f857a4a63fcc604a981e56875edda91767d4f1bf'
'fcfc265e3b10294cc4b10949a342e9db4310b186')
build() {
cd "${srcdir}/LVM2.${pkgver}"
unset LDFLAGS
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-udev-prefix=/usr \
- --with-systemdsystemunitdir=/usr/lib/systemd/system --with-default-pid-dir=/run \
- --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
+ --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
--enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
--enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
--enable-lvmetad
@@ -48,7 +49,7 @@ build() {
package_device-mapper() {
pkgdesc="Device mapper userspace library and tools"
url="http://sourceware.org/dm/"
- depends=('glibc' 'udev')
+ depends=('glibc' 'systemd')
cd "${srcdir}/LVM2.${pkgver}"
make DESTDIR="${pkgdir}" install_device-mapper
@@ -63,7 +64,7 @@ package_device-mapper() {
package_lvm2() {
pkgdesc="Logical Volume Manager 2 utilities"
- depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+ depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline')
conflicts=('lvm' 'mkinitcpio<0.7')
backup=('etc/lvm/lvm.conf')
options=('!makeflags')
diff --git a/core/lvm2/dmeventd.service b/core/lvm2/dmeventd.service
index 15ca21c0b..e0b1b33d0 100644
--- a/core/lvm2/dmeventd.service
+++ b/core/lvm2/dmeventd.service
@@ -7,8 +7,8 @@ DefaultDependencies=no
[Service]
Type=forking
-ExecStart=/usr/sbin/dmeventd
-ExecReload=/usr/sbin/dmeventd -R
+ExecStart=/usr/bin/dmeventd
+ExecReload=/usr/bin/dmeventd -R
Environment=SD_ACTIVATION=1
PIDFile=/run/dmeventd.pid
OOMScoreAdjust=-1000
diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service
index 8f5247b00..138e91a08 100644
--- a/core/lvm2/lvm-monitoring.service
+++ b/core/lvm2/lvm-monitoring.service
@@ -10,8 +10,8 @@ Conflicts=shutdown.target
[Service]
Type=oneshot
Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
-ExecStart=/usr/sbin/lvm vgchange --monitor y
-ExecStop=/usr/sbin/lvm vgchange --monitor n
+ExecStart=/usr/bin/lvm vgchange --monitor y
+ExecStop=/usr/bin/lvm vgchange --monitor n
RemainAfterExit=yes
[Install]
diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install
index be27614bd..6f3c1cb41 100644
--- a/core/lvm2/lvm2_install
+++ b/core/lvm2/lvm2_install
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
build() {
local mod
@@ -6,9 +6,9 @@ build() {
add_module "$mod"
done
- add_binary "/usr/sbin/lvm"
- add_binary "/usr/sbin/lvmetad"
- add_binary "/usr/sbin/dmsetup"
+ add_binary "/usr/bin/lvm"
+ add_binary "/usr/bin/lvmetad"
+ add_binary "/usr/bin/dmsetup"
add_file "/usr/lib/udev/rules.d/10-dm.rules"
add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
diff --git a/core/lvm2/lvmetad.service b/core/lvm2/lvmetad.service
index 64168f465..4be520a3b 100644
--- a/core/lvm2/lvmetad.service
+++ b/core/lvm2/lvmetad.service
@@ -9,8 +9,8 @@ Conflicts=shutdown.target
[Service]
Type=forking
NonBlocking=true
-ExecStart=/usr/sbin/lvmetad
-ExecReload=/usr/sbin/lvmetad -R
+ExecStart=/usr/bin/lvmetad
+ExecReload=/usr/bin/lvmetad -R
Environment=SD_ACTIVATION=1
Restart=on-abort
PIDFile=/run/lvmetad.pid
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 3bd848408..dc1a16197 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,39 +1,40 @@
-# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $
+# $Id: PKGBUILD 187035 2013-06-03 11:15:26Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=net-tools
-pkgver=1.60.20120804git
-pkgrel=2
+pkgver=1.60.20130531git
+pkgrel=1
pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
license=('GPL2')
url="http://net-tools.sourceforge.net/"
depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use git checkout instead
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
- Makefile.patch)
+makedepends=('git')
+# use git snapshot currently prefered over release
+source=("net-tools::git://git.code.sf.net/p/net-tools/code#commit=6a14c03f")
options=(!makeflags)
-install=net-tools.install
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
- '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
+sha1sums=('SKIP')
+
+prepare() {
+ sed -i "s#/sbin#/bin#" ${srcdir}/${pkgname}/Makefile
+ sed -i "s#/usr##" ${srcdir}/${pkgname}/man/Makefile
+}
+
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np0 -i ${srcdir}/Makefile.patch
+ cd ${srcdir}/${pkgname}
yes "" | make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make BASEDIR=${pkgdir} update
+ cd ${srcdir}/${pkgname}
+ make DESTDIR=${pkgdir}/usr update
# the following is provided by yp-tools
- rm "${pkgdir}"/bin/{nis,yp}domainname
+ rm "${pkgdir}"/usr/bin/{nis,yp}domainname
rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
# hostname is provided by inetutils
- rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
+ rm "${pkgdir}"/usr/bin/{hostname,dnsdomainname,domainname}
rm -rf "${pkgdir}"/usr/share/man/man1
}
diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install
deleted file mode 100644
index 9eee9e51b..000000000
--- a/core/net-tools/net-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
- if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
- echo "hostname and {,yp,nis}domainname has moved:"
- echo "----------"
- echo "hostname is now in coreutils"
- echo "domainname is now in yp-tools"
- echo "their functionality might have changed slightly"
- echo ""
- echo "dnsdomainname remains in net-tools"
- echo "----------"
- fi
-}
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index e962cb42a..75614121d 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185727 2013-05-17 18:43:30Z dan $
+# $Id: PKGBUILD 187036 2013-06-03 11:15:27Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=nilfs-utils
pkgver=2.1.5
-pkgrel=1
+pkgrel=2
pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
arch=('i686' 'x86_64')
url="http://www.nilfs.org/"
@@ -17,11 +17,11 @@ md5sums=('f072cc53c288492061b3199d63e32177')
build() {
cd $pkgname-$pkgver
- ./configure --enable-libmount
+ ./configure --sbindir=/usr/bin --enable-libmount
make
}
package() {
cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
+ make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true
}
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index 3b79a7ab8..7c63db027 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184228 2013-05-04 14:17:41Z thomas $
+# $Id: PKGBUILD 187038 2013-06-03 11:15:29Z allan $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=openvpn
pkgver=2.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
arch=(i686 x86_64)
url="http://openvpn.net/index.php/open-source.html"
@@ -22,7 +22,7 @@ md5sums=('57a3b64597fc37b7842a3fde354d8bbe'
'SKIP'
'fbf818b6e1f212e77b9ce0e6d92584a1'
'SKIP'
- '0846aa59d0b123d61030890f9a4135ae'
+ '57ef7353ba2c28c04dfc387c3ca77a4f'
'e1bd1523e38745e948c710db1a330bb1')
options=(!libtool)
@@ -32,6 +32,7 @@ build() {
# Build openvpn
CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
--prefix=/usr \
+ --sbindir=/usr/bin \
--enable-password-save \
--mandir=/usr/share/man \
--enable-iproute2 \
diff --git a/core/openvpn/openvpn-tapdev.conf b/core/openvpn/openvpn-tapdev.conf
deleted file mode 100644
index afa5586dd..000000000
--- a/core/openvpn/openvpn-tapdev.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/conf.d/openvpn-tapdev
-#
-# Place openvpn-tapdev before network into your DAEMONS array
-# This will create permanent tap devices which you can use for bridging
-#
-# Example:
-# TAPDEVS="work home"
-# Will create two tap devices "work" and "home"
-#
-
-TAPDEVS=""
diff --git a/core/openvpn/openvpn-tapdev.rc b/core/openvpn/openvpn-tapdev.rc
deleted file mode 100755
index 2c51f8248..000000000
--- a/core/openvpn/openvpn-tapdev.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/openvpn-tapdev
-
-case "$1" in
- start)
- stat_busy "Creating tap devices for OpenVPN ... "
- success=0
- for tapdev in ${TAPDEVS}; do
- stat_append "${tapdev} "
- /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
- done
- if [ $success -eq 0 ]; then
- add_daemon openvpn-tapdev
- stat_done
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Destroying tap devices for OpenVPN ..."
- for tapdev in ${TAPDEVS}; do
- stat_append "${tapdev} "
- /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
- done
- rm_daemon openvpn-tapdev
- stat_done
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/openvpn/openvpn.rc b/core/openvpn/openvpn.rc
deleted file mode 100755
index 96c28b641..000000000
--- a/core/openvpn/openvpn.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-CFGDIR="/etc/openvpn"
-STATEDIR="/var/run/openvpn"
-
-case "$1" in
- start)
- stat_busy "Starting OpenVPN ... "
- success=0
- mkdir -p "${STATEDIR}"
- for cfg in "${CFGDIR}"/*.conf; do
- stat_append "$(basename "${cfg}" .conf) "
- /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$?
- done
- if [ $success -eq 0 ]; then
- add_daemon openvpn
- stat_done
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping OpenVPN ..."
- for pidfile in "${STATEDIR}"/*.pid; do
- stat_append "$(basename "${pidfile}" .pid) "
- kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
- rm -f "${pidfile}"
- done
- rm_daemon openvpn
- stat_done
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/core/openvpn/openvpn@.service b/core/openvpn/openvpn@.service
index 0b7232899..63fdf0e36 100644
--- a/core/openvpn/openvpn@.service
+++ b/core/openvpn/openvpn@.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
Type=forking
-ExecStart=/usr/sbin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
+ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
[Install]
WantedBy=multi-user.target
diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD
index 9b392bb2e..0489a38bf 100644
--- a/core/ppp/PKGBUILD
+++ b/core/ppp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169337 2012-10-19 21:33:57Z thomas $
+# $Id: PKGBUILD 187039 2013-06-03 11:15:31Z allan $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgname=ppp
pkgver=2.4.5
-pkgrel=5
+pkgrel=6
pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
arch=(i686 x86_64)
url="http://www.samba.org/ppp/"
@@ -91,4 +91,9 @@ package() {
install -d -m755 "${pkgdir}/etc/ppp/peers"
chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service
+
+ # usrmove
+ cd "$pkgdir"/usr
+ mv sbin/* bin/
+ rmdir sbin
}
diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD
index b27c7d5bc..d4e2d3e0e 100644
--- a/core/pptpclient/PKGBUILD
+++ b/core/pptpclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142906 2011-11-18 07:42:07Z pierre $
+# $Id: PKGBUILD 187040 2013-06-03 11:15:32Z allan $
# Maintainer: Daniel Isenmann <daniel @ archlinux.org>
# Contributor: Mark Nikkel <mnikkel@gmail.com>
pkgname=pptpclient
pkgver=1.7.2
-pkgrel=4
+pkgrel=5
pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP."
arch=('i686' 'x86_64')
url="http://pptpclient.sourceforge.net/"
@@ -14,7 +14,7 @@ backup=('etc/ppp/options.pptp')
source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz")
md5sums=('4c3d19286a37459a632c7128c92a9857')
-build() {
+prepare() {
cd $srcdir/pptp-$pkgver
# use our CFLAGS and LDFLAGS
@@ -22,8 +22,14 @@ build() {
sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile
# adjust ip path
- sed -i 's#/bin/ip#/usr/sbin/ip#' routing.c
+ sed -i 's#/bin/ip#/usr/bin/ip#' routing.c
+
+ # put binaries in /usr/bin
+ sed -i "/BINDIR/s#/sbin#/bin#" Makefile
+}
+build() {
+ cd $srcdir/pptp-$pkgver
make
}
diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD
index 05d520bf4..1fa6ca913 100644
--- a/core/sed/PKGBUILD
+++ b/core/sed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176248 2013-01-28 00:29:26Z allan $
+# $Id: PKGBUILD 187041 2013-06-03 11:15:34Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=sed
pkgver=4.2.2
-pkgrel=2
+pkgrel=3
pkgdesc="GNU stream editor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/sed"
@@ -31,8 +31,4 @@ check() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-
- mkdir $pkgdir/bin
- ln -s ../usr/bin/sed $pkgdir/bin
-
}
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index 743c179a9..2080f59c3 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180325 2013-03-20 12:45:26Z dreisner $
+# $Id: PKGBUILD 187042 2013-06-03 11:15:35Z allan $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=shadow
pkgver=4.1.5.1
-pkgrel=5
+pkgrel=6
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -32,15 +32,15 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{
shadow-strncpy-usage.patch
lastlog.tmpfiles)
sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
- '126570e2939bf3b57f28df5197ab9309747a6b5c'
+ 'SKIP'
'33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
- '6fac49a4826e2b821c8d41ed5911bc8d04735986'
+ 'e92045fb75e0c21a3f294a00de0bd2cd252e9463'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'611be25d91c3f8f307c7fe2485d5f781e5dee75f'
- '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
+ '98f4919014b1a9eb9f01ca7731e04b1d973cedd5'
'9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
'21e12966a6befb25ec123b403cd9b5c492fe5b16'
@@ -64,6 +64,8 @@ build() {
./configure \
--prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
--libdir=/lib \
--mandir=/usr/share/man \
--sysconfdir=/etc \
@@ -112,8 +114,7 @@ package() {
# Remove utilities provided by util-linux
rm \
- "$pkgdir"/usr/bin/{chsh,chfn,sg} \
- "$pkgdir"/bin/{login,su} \
+ "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \
"$pkgdir"/usr/sbin/{vipw,vigr}
# but we keep newgrp, as sg is really an alias to it
@@ -133,4 +134,8 @@ package() {
rmdir \
"$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \
"$pkgdir"/usr/share/man/{fi,ko/man8}
+
+ # move everything else to /usr/bin, because this isn't handled by ./configure
+ mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin
+ rmdir "$pkgdir/usr/sbin"
}
diff --git a/core/shadow/login.defs b/core/shadow/login.defs
index 5dabf78df..591367100 100644
--- a/core/shadow/login.defs
+++ b/core/shadow/login.defs
@@ -81,8 +81,8 @@ HUSHLOGIN_FILE .hushlogin
# *REQUIRED* The default PATH settings, for superuser and normal users.
#
# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH PATH=/bin:/usr/bin
+ENV_SUPATH PATH=/usr/bin
+ENV_PATH PATH=/usr/bin
#
# Terminal permissions
diff --git a/core/shadow/shadow.cron.daily b/core/shadow/shadow.cron.daily
index 1931a793e..1373ecde9 100755
--- a/core/shadow/shadow.cron.daily
+++ b/core/shadow/shadow.cron.daily
@@ -1,6 +1,6 @@
#!/bin/sh
# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
+/usr/bin/pwck -r
+/usr/bin/grpck -r
diff --git a/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
new file mode 100644
index 000000000..372ecebff
--- /dev/null
+++ b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
@@ -0,0 +1,87 @@
+From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 28 May 2013 20:45:34 +0200
+Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't
+ exist
+
+Since 11ec7ce, journald isn't setting the ACLs properly anymore if
+the files had no ACLs to begin with: acl_set_fd fails with EINVAL.
+
+An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is
+invalid, so make sure a mask exists before trying to set the ACL.
+---
+ src/journal/journald-server.c | 6 ++++--
+ src/shared/acl-util.c | 28 ++++++++++++++++++++++++++++
+ src/shared/acl-util.h | 1 +
+ 3 files changed, 33 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index b717b92..da5b725 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
+ }
+ }
+
+- /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */
++ /* We do not recalculate the mask unconditionally here,
++ * so that the fchmod() mask above stays intact. */
+ if (acl_get_permset(entry, &permset) < 0 ||
+- acl_add_perm(permset, ACL_READ) < 0) {
++ acl_add_perm(permset, ACL_READ) < 0 ||
++ calc_acl_mask_if_needed(&acl) < 0) {
+ log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
+ goto finish;
+ }
+diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
+index 48bb12f..fb04e49 100644
+--- a/src/shared/acl-util.c
++++ b/src/shared/acl-util.c
+@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
+ return 0;
+ }
+
++int calc_acl_mask_if_needed(acl_t *acl_p) {
++ acl_entry_t i;
++ int found;
++
++ assert(acl_p);
++
++ for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i);
++ found > 0;
++ found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) {
++
++ acl_tag_t tag;
++
++ if (acl_get_tag_type(i, &tag) < 0)
++ return -errno;
++
++ if (tag == ACL_MASK)
++ return 0;
++ }
++
++ if (found < 0)
++ return -errno;
++
++ if (acl_calc_mask(acl_p) < 0)
++ return -errno;
++
++ return 0;
++}
++
+ int search_acl_groups(char*** dst, const char* path, bool* belong) {
+ acl_t acl;
+
+diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
+index 23090d9..36ef490 100644
+--- a/src/shared/acl-util.h
++++ b/src/shared/acl-util.h
+@@ -24,4 +24,5 @@
+ #include <stdbool.h>
+
+ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
++int calc_acl_mask_if_needed(acl_t *acl_p);
+ int search_acl_groups(char*** dst, const char* path, bool* belong);
+--
+1.8.3
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 3a71fe769..9b17e6d8f 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=204
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -14,24 +14,24 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection
options=('!libtool')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
+ 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
'initcpio-hook-udev'
'initcpio-install-udev'
- 'initcpio-install-timestamp'
- 'use-split-usr-path.patch')
+ 'initcpio-install-timestamp')
md5sums=('a07619bb19f48164fbf0761d12fd39a8'
'7f39f9fde1ff7b48293ed1e3d0a6c213'
+ '66e3162856ded8eb7dc7383405c6e0d6'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
- 'df69615503ad293c9ddf9d8b7755282d'
- '76bf83fe34c5b40533abc5dc940576a6')
+ 'df69615503ad293c9ddf9d8b7755282d')
prepare() {
cd "$pkgname-$pkgver"
- # hang onto this until we do the /{,s}bin merge
- patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch"
+
+ patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch"
+
autoreconf
}
@@ -101,10 +101,6 @@ package_systemd() {
# get rid of RPM macros
rm -r "$pkgdir/etc/rpm"
- # the path to udevadm is hardcoded in some places
- install -d "$pkgdir/sbin"
- ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
# add back tmpfiles.d/legacy.conf
install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
@@ -133,12 +129,12 @@ package_systemd-sysvcompat() {
mv "$srcdir/_sysvcompat"/* "$pkgdir"
- install -dm755 "$pkgdir/sbin"
+ install -dm755 "$pkgdir/usr/bin"
for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
+ ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
done
- ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
+ ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
}
# vim: ft=sh syn=sh et
diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch
deleted file mode 100644
index 40dd62f90..000000000
--- a/core/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
-@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) {
-
- /* 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) {
diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD
index e0c3c0358..b8938d02f 100644
--- a/core/sysvinit-tools/PKGBUILD
+++ b/core/sysvinit-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185338 2013-05-13 13:18:59Z tomegun $
+# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=sysvinit-tools
pkgver=2.88
-pkgrel=10
+pkgrel=11
arch=('i686' 'x86_64')
url="http://savannah.nongnu.org/projects/sysvinit"
license=('GPL')
@@ -32,8 +32,8 @@ package() {
cd "${srcdir}/sysvinit-${pkgver}dsf"
make ROOT="${pkgdir}" install
- ### drop the stuff provided by systemd-sysvcompat and util-linux
cd "${pkgdir}"
+ ### drop the stuff provided by systemd-sysvcompat and util-linux
rm -r usr/share/man/man5
rm -r usr/include
rm bin/mountpoint
@@ -41,4 +41,9 @@ package() {
rm usr/bin/{mesg,utmpdump,wall}
rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1
rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8
+ ### usrmerge
+ mv sbin/* usr/bin/
+ rm -r sbin
+ mv bin/* usr/bin/
+ rm -r bin
}
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index 472bf0d44..03a867fcf 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183049 2013-04-17 02:02:04Z allan $
+# $Id: PKGBUILD 187045 2013-06-03 11:15:39Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=tar
pkgver=1.26
-pkgrel=3
+pkgrel=4
pkgdesc="Utility used to store, backup, and transport files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/tar/tar.html"
@@ -41,9 +41,5 @@ package() {
cd ${srcdir}/$pkgname-$pkgver
make DESTDIR=${pkgdir} install
- # probably needed for compatibility
- install -dm755 ${pkgdir}/bin
- ln -s ../usr/bin/tar ${pkgdir}/bin/tar
-
install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1
}
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 78e90224d..91d7e9cfb 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186677 2013-05-30 12:45:22Z tomegun $
+# $Id: PKGBUILD 187046 2013-06-03 11:15:40Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
pkgver=2.23.1
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
@@ -39,7 +39,7 @@ build() {
./configure --prefix=/usr \
--libdir=/usr/lib \
--localstatedir=/run \
- --enable-fs-paths-extra=/usr/bin:/usr/sbin \
+ --enable-fs-paths-extra=/usr/bin \
--enable-raw \
--enable-vipw \
--enable-newgrp \
@@ -78,4 +78,10 @@ package() {
# include tmpfiles fragment for uuidd
# TODO(dreisner): offer this upstream?
install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
+
+ # usrmove
+ cd "$pkgdir"
+ mv {,usr/}sbin/* usr/bin
+ mv bin/* usr/bin
+ rmdir bin sbin usr/sbin
}
diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD
index 4fe9e1e79..f233fd586 100644
--- a/core/wpa_actiond/PKGBUILD
+++ b/core/wpa_actiond/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184227 2013-05-04 14:17:40Z thomas $
+# $Id: PKGBUILD 187047 2013-06-03 11:15:41Z allan $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wpa_actiond
pkgver=1.4
-pkgrel=1
+pkgrel=2
pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
arch=('i686' 'x86_64')
url="http://projects.archlinux.org/wpa_actiond.git/"
@@ -22,6 +22,6 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond"
+ install -D -m755 wpa_actiond "${pkgdir}/usr/bin/wpa_actiond"
}
# vim:set ts=2 sw=2 et:
diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD
index 8e44259c6..e99d67561 100644
--- a/core/wpa_supplicant/PKGBUILD
+++ b/core/wpa_supplicant/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179639 2013-03-08 23:40:42Z foutrelis $
+# $Id: PKGBUILD 187048 2013-06-03 11:15:42Z allan $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wpa_supplicant
pkgver=2.0
-pkgrel=3
+pkgrel=4
pkgdesc="A utility providing key negotiation for WPA wireless networks"
url="http://hostap.epitest.fi/wpa_supplicant"
arch=('i686' 'x86_64')
@@ -47,4 +47,8 @@ package() {
install -d -m755 "${pkgdir}/usr/lib/systemd/system"
install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/"
+
+ # usrmove
+ cd "$pkgdir"/usr
+ mv sbin bin
}