diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
commit | 572f3b3bd973bfa7e64c4c42fe87c8e3a79b7c20 (patch) | |
tree | 89f43dd22eaacadfa97977de1f3b73285da15735 /core | |
parent | cebf33d7109e0157a80f34d6136e212f0a28d274 (diff) | |
parent | 5898d76e47144f2366f9acda9ab52827b696c2d5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/ecryptfs-utils/PKGBUILD
community/erlang/PKGBUILD
community/esmtp/PKGBUILD
community/gmic/PKGBUILD
community/ibus-sunpinyin/PKGBUILD
community/libev/PKGBUILD
community/libmirage/PKGBUILD
community/libraw/PKGBUILD
community/lilypond/PKGBUILD
community/luajit/PKGBUILD
community/matchbox-window-manager/PKGBUILD
community/miniupnpc/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/oss/PKGBUILD
community/pidgin-lwqq/PKGBUILD
community/postgis/PKGBUILD
community/python2-pytables/PKGBUILD
community/qmc2/PKGBUILD
community/qtfm/PKGBUILD
community/ruby-gtk3/PKGBUILD
community/tea/PKGBUILD
community/yacpi/PKGBUILD
core/bridge-utils/PKGBUILD
core/gcc/PKGBUILD
core/libsasl/PKGBUILD
core/lvm2/PKGBUILD
core/net-tools/PKGBUILD
core/ppp/PKGBUILD
core/pptpclient/PKGBUILD
core/sdparm/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
extra/aisleriot/PKGBUILD
extra/arora/PKGBUILD
extra/bluez-hcidump/PKGBUILD
extra/bluez/PKGBUILD
extra/cups/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dhcp/PKGBUILD
extra/gnome-bluetooth/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gts/PKGBUILD
extra/guile/PKGBUILD
extra/harfbuzz/PKGBUILD
extra/iptraf-ng/PKGBUILD
extra/json-c/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/libatasmart/PKGBUILD
extra/libbsd/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libhangul/PKGBUILD
extra/libindi/PKGBUILD
extra/libpeas/PKGBUILD
extra/libsmbios/PKGBUILD
extra/libspiro/PKGBUILD
extra/libsrtp/PKGBUILD
extra/libxml2/PKGBUILD
extra/libxrender/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/msmtp/PKGBUILD
extra/ortp/PKGBUILD
extra/perl-dbd-sqlite/PKGBUILD
extra/perl-yaml-syck/PKGBUILD
extra/php/PKGBUILD
extra/pm-utils/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt4/PKGBUILD
extra/scim-anthy/PKGBUILD
extra/scim-chewing/PKGBUILD
extra/scim-m17n/PKGBUILD
extra/scim/PKGBUILD
extra/ssmtp/PKGBUILD
extra/texmacs/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wireshark/PKGBUILD
extra/zsh/PKGBUILD
libre/bogofilter-libre/PKGBUILD
libre/ecasound-libre/PKGBUILD
libre/libretools/libretools.install
libre/mc-libre/PKGBUILD
Diffstat (limited to 'core')
74 files changed, 596 insertions, 918 deletions
diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index ba6f40720..0b68f0d2a 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176120 2013-01-27 15:38:26Z dreisner $ +# $Id: PKGBUILD 188195 2013-06-12 15:53:07Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.51 -pkgrel=3 +pkgver=2.2.52 +pkgrel=1 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/acl" @@ -14,8 +14,8 @@ provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' - '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') +sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' + 'SKIP') build() { cd "$pkgname-$pkgver" diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD index 65b5d7545..7d0615c97 100644 --- a/core/attr/PKGBUILD +++ b/core/attr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158576 2012-05-05 00:02:37Z allan $ +# $Id: PKGBUILD 188196 2013-06-12 15:53:08Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.46 -pkgrel=2 +pkgver=2.4.47 +pkgrel=1 pkgdesc="Extended attribute support library for ACL support" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/attr" @@ -15,8 +15,8 @@ provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' - 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') +sha256sums=('25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859' + 'SKIP') build() { cd "$pkgname-$pkgver" @@ -30,7 +30,7 @@ package() { make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f "$pkgdir"/usrlib/libattr.a + rm -f "$pkgdir"/usr/lib/libattr.a chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* # remove conflicting manpages diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index f8a33ad7c..5c6e0be11 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' 'mips64el') 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 f6006a8a6..b6f98d122 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.2 +pkgrel=2 pkgdesc="Utilities for configuring the Linux ethernet bridge" arch=('i686' 'x86_64' 'mips64el') 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 743cd1f07..63732bf4e 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' 'mips64el') 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 3b920e97e..c362abafa 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 'mips64el') 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 3a4f830a8..b7ac42bd7 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' 'mips64el') 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/dbus/PKGBUILD b/core/dbus/PKGBUILD index 2415f2c43..4c49dc4f1 100644 --- a/core/dbus/PKGBUILD +++ b/core/dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184216 2013-05-03 22:55:42Z tomegun $ +# $Id: PKGBUILD 188480 2013-06-14 20:26:05Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.6.10 +pkgver=1.6.12 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -48,6 +48,6 @@ package(){ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } -md5sums=('de4970c20629aeb958a12132415b3630' +md5sums=('a70edc50524f258eaf5c9a9994ed8748' '3314d727fa57fc443fce25b5cbeebbcc' 'd8a1bd529b3ddca671ee1a695a143db9') diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index ed7198fe3..ce258579f 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' 'mips64el') @@ -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/dialog/PKGBUILD b/core/dialog/PKGBUILD index 34752d162..d27f184be 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 186478 2013-05-27 12:00:13Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 187873 2013-06-07 13:39:39Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog pkgver=1.2_20130523 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64' 'mips64el') url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') -source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('54768b8443af3de2e6cd16073ec666f19d4ded7a') +source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz) +sha256sums=('c8d114b7698022bcbd6c88f3c0b2296b0e846c60c5ed6bd28f86dd72b94fd36d') build() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ncursesw --enable-nls + cd "$srcdir/$pkgname-${pkgver/_/-}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-ncursesw \ + --enable-nls make } package() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - make DESTDIR="${pkgdir}" install install-lib - - rm "${pkgdir}"/usr/lib/libdialog.a + cd "$srcdir/$pkgname-${pkgver/_/-}" + make DESTDIR="$pkgdir" install-full } + +# vim:set ts=2 sw=2 et: diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index a51005dbe..e142a6476 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186902 2013-05-31 16:49:40Z tpowa $ +# $Id: PKGBUILD 188586 2013-06-16 16:11:16Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.17 +pkgver=3.0.20 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') @@ -10,6 +10,8 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') +md5sums=('b34dcf1d22bc1074ebdba68799fa3cad' + 'SKIP') build() { cd $srcdir/$pkgname-$pkgver @@ -18,7 +20,5 @@ build() { package () { cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install + make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DOCDIR=/usr/share/doc install } -md5sums=('468b953ddc8baf66e9881d1a5eae03e2' - 'SKIP') diff --git a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch deleted file mode 100644 index 44e6e86b5..000000000 --- a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 -+++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 -@@ -174,7 +174,10 @@ - offset = fs->root_start + next_free * sizeof(DIR_ENT); - memset(de, 0, sizeof(DIR_ENT)); - while (1) { -- sprintf((char *)de->name, pattern, curr_num); -+ char expanded[12]; -+ sprintf(expanded, pattern, curr_num); -+ memcpy(de->name, expanded, 8); -+ memcpy(de->ext, expanded + 8, 3); - for (scan = 0; scan < fs->root_entries; scan++) - if (scan != next_free && - !strncmp((const char *)root[scan].name, ---- dosfstools-3.0.12/src/fat.c -+++ dosfstools-3.0.12/src/fat.c -@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) - DIR_ENT de; - loff_t offset; - files++; -- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); -+ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = CT_LE_W(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = CT_LE_W(i >> 16); diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index dec0ee61e..55280c720 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' 'mips64el') license=('GPL' 'LGPL' 'MIT') @@ -46,4 +46,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 1644130dc..b96a06cfb 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' 'mips64el') 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/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD new file mode 100755 index 000000000..2a42dea3a --- /dev/null +++ b/core/efibootmgr/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 188652 2013-06-17 10:52:28Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor : Murtuza Akhtari <inxsible at gmail dot com> +# Contributor: Keshav P R <skodabenz at rocketmail dot com> + +pkgname=efibootmgr +pkgver=0.6.0 +pkgrel=3 +pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." +arch=('i686' 'x86_64') +url="http://linux.dell.com/efibootmgr/" +license=('GPL2') +depends=('zlib' 'pciutils') +makedepends=() +provides=() +options=(strip purge docs zipman !emptydirs) + +source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz" + "efibootmgr-tilt_slashes-func.patch" +) + +build () { + rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true + + cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build + + cd ${srcdir}/efibootmgr-${pkgver}_build/ + patch -Np1 -i ${srcdir}/efibootmgr-tilt_slashes-func.patch + echo + + CFLAGS= make + echo + +} + + +package() { + + mkdir -p ${pkgdir}/usr/bin/ + mkdir -p ${pkgdir}/usr/share/man/man8/ + + cd ${srcdir}/efibootmgr-${pkgver}_build/ + + install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr + install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8 + +} +md5sums=('9e9a31d79e579644de83a14139b66d10' + '3622c0e978cf859cae60803a6b6a0c5e') diff --git a/core/efibootmgr/efibootmgr-tilt_slashes-func.patch b/core/efibootmgr/efibootmgr-tilt_slashes-func.patch new file mode 100644 index 000000000..ce857bb3c --- /dev/null +++ b/core/efibootmgr/efibootmgr-tilt_slashes-func.patch @@ -0,0 +1,61 @@ +diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c +index 236365a..9883961 100644 +--- a/src/efibootmgr/efibootmgr.c ++++ b/src/efibootmgr/efibootmgr.c +@@ -803,6 +803,7 @@ usage() + printf("\t-V | --version return version and exit\n"); + printf("\t-w | --write-signature write unique sig to MBR if needed\n"); + printf("\t-@ | --append-binary-args file append extra args from file (use \"-\" for stdin)\n"); ++ printf("\t | --help show help/usage\n"); + } + + static void +@@ -863,6 +864,7 @@ parse_opts(int argc, char **argv) + {"version", no_argument, 0, 'V'}, + {"write-signature", no_argument, 0, 'w'}, + {"append-binary-args", required_argument, 0, '@'}, ++ {"help", no_argument, 0, 2}, + {0, 0, 0, 0} + }; + +@@ -1014,6 +1016,10 @@ parse_opts(int argc, char **argv) + opts.write_signature = 1; + break; + ++ case 2: ++ usage(); ++ exit(1); ++ + default: + usage(); + exit(1); +diff --git a/src/lib/efi.c b/src/lib/efi.c +index a4ce5cf..8ef8be8 100644 +--- a/src/lib/efi.c ++++ b/src/lib/efi.c +@@ -70,6 +70,16 @@ efi_guid_unparse(efi_guid_t *guid, char *out) + return out; + } + ++char * ++tilt_slashes(char *s) ++{ ++ char *p; ++ for (p = s; *p; p++) ++ if (*p == '/') ++ *p = '\\'; ++ return s; ++} ++ + void + set_fs_kernel_calls() + { +@@ -535,7 +545,7 @@ char *make_disk_load_option(char *p, char *disk) + signature, + mbr_type, signature_type); + +- efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path)); ++ efichar_from_char(os_loader_path, tilt_slashes(opts.loader), sizeof(os_loader_path)); + p += make_file_path_device_path (p, os_loader_path); + p += make_end_device_path (p); + diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 28b61a605..c0e52bb76 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $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 @@ -9,9 +9,9 @@ if [ "${CARCH}" != "mips64el" ]; then else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi -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' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -20,9 +20,9 @@ makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen') [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada') 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 _basedir=gcc-${_snapshot} diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 70d8f6d24..be1301a9f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 185564 2013-05-15 07:54:44Z heftig $ +# $Id: PKGBUILD 188618 2013-06-17 01:21:11Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.36.2 -pkgrel=1 +pkgver=2.36.3 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64 mips64el) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80' +sha256sums=('5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716 - export CFLAGS+=" -Wall" - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 357f0ce46..63b7ca609 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' 'mips64el') url="http://www.gnu.org/software/libc" @@ -64,6 +64,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/} @@ -91,7 +93,7 @@ build() { make # remove harding in preparation to run test-suite - sed -i '2,4d' configparms + sed -i '4,6d' configparms } check() { @@ -125,9 +127,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' \ @@ -141,11 +140,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 affca856a..b8dc47e3e 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' 'mips64el') 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 cf06151aa..47e721da8 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' 'mips64el') 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 0bc1cb89e..3fba35fe2 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' 'mips64el') 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 4037121b5..fc4285ffe 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" 'mips64el') 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 94ac5ec54..c61218817 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' 'mips64el') 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" @@ -39,13 +39,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/krb5/PKGBUILD b/core/krb5/PKGBUILD index d1cc0c166..6866d9b3b 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186200 2013-05-22 00:37:41Z stephane $ +# $Id: PKGBUILD 188525 2013-06-15 07:57:25Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.11.2 -pkgrel=4 +pkgver=1.11.3 +pkgrel=1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -19,7 +19,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) -sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250' +sha1sums=('df708a530a22ed09c7825742c108180319b10463' '78ec307c2b5e32481a6da401013c428e0b867f36' '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' @@ -37,7 +37,7 @@ build() { patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch # Fix kpasswd UDP ping-pong (CVE-2002-2443) - patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch + #patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch rm lib/krb5/krb/deltat.c diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD index 1c6bf8162..3e51cfdb5 100644 --- a/core/libedit/PKGBUILD +++ b/core/libedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165851 2012-09-01 14:29:46Z bisson $ +# $Id: PKGBUILD 187329 2013-06-05 12:52:10Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Roman Cheplyaka <roma@ro-che.info> pkgname=libedit -pkgver=20120601_3.0 +pkgver=20130601_3.1 pkgrel=1 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' url='http://www.thrysoee.dk/editline/' @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses') options=('!libtool') source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") -sha1sums=('18ec27120f6abb222754e9f283d000fec0dcfc08') +sha1sums=('9c3fe7af5ba3d86c608872de3d6e8179add8cc88') build() { cd "${srcdir}/${pkgname}-${pkgver/_/-}" diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index 58f04dbf3..c26a9d129 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180905 2013-03-27 21:58:17Z stephane $ +# $Id: PKGBUILD 187810 2013-06-06 08:25:26Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libffi pkgver=3.0.13 -pkgrel=1 +pkgrel=3 pkgdesc="A portable, high level programming interface to various calling conventions" arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/libffi/" diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index 54583c02b..1116f7fea 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184997 2013-05-09 19:48:45Z andyrtr $ +# $Id: PKGBUILD 188248 2013-06-13 13:32:04Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('f4866aa3a84f2852c78f87ff619dfc60' +md5sums=('a98b07f6f487fa268d1ebd99806b85ff' 'SKIP') build() { diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index fc1aaba80..3e1cff6ad 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' 'mips64el') 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() { @@ -76,6 +74,7 @@ build() { ./configure --prefix=/usr \ --host=$CHOST \ --build=$CHOST \ + --sbin=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ @@ -133,7 +132,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 8fd4c182c..cbd07a628 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' 'mips64el') url="http://www.gnu.org/software/libtool" @@ -34,7 +34,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/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD deleted file mode 100644 index 569cb84c0..000000000 --- a/core/libusb-compat/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 169660 2012-10-25 08:23:04Z eric $ -# Maintainer: -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: arjan <arjan@archlinux.org> - -pkgname=libusb-compat -pkgver=0.1.4 -pkgrel=2 -pkgdesc="Library to enable user space application programs to communicate with USB devices" -arch=('i686' 'x86_64' 'mips64el') -url="http://libusb.sourceforge.net/" -license=('LGPL') -depends=('libusb' 'sh') -options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2ca521fffadd0c28fdf174e6ec73865b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index ac90e89a7..705e815c1 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' 'mips64el') 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 f9203aac7..819fc88ea 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 'mips64el') +arch=('i686' 'x86_64' 'mips64el') 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 4f9ca816a..6e2204bb5 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' 'mips64el') 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 081276a69..929a98c7f 100644 --- a/core/openvpn/PKGBUILD +++ b/core/openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184228 2013-05-04 14:17:41Z thomas $ +# $Id: PKGBUILD 188197 2013-06-12 15:53:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=openvpn -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" arch=(i686 x86_64 'mips64el') @@ -18,11 +18,11 @@ source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz.asc openvpn@.service openvpn-2.3.0-fix-systemd-ask-password-path.patch) -md5sums=('57a3b64597fc37b7842a3fde354d8bbe' +md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1' '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/pcre/PKGBUILD b/core/pcre/PKGBUILD index bf1bb10d2..0d96d3182 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172477 2012-12-03 21:23:28Z allan $ +# $Id: PKGBUILD 187186 2013-06-05 04:57:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.32 +pkgver=8.33 pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('BSD') depends=('gcc-libs') options=('!libtool') source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('62f02a76bb57a40bc66681760ed511d5' - '275ffe85e62565118756f8f3d08bb70f') +md5sums=('21514018448ac10062ece7a668fca949' + 'SKIP') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -26,7 +26,7 @@ build() { check() { cd "${srcdir}"/${pkgname}-${pkgver} - make check + make -j1 check } package() { diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 088366c7d..dcd2e72b8 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,22 +1,16 @@ -# $Id: PKGBUILD 169337 2012-10-19 21:33:57Z thomas $ +# $Id: PKGBUILD 188198 2013-06-12 15:53:29Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=5.1 +pkgrel=7 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64 'mips64el') url="http://www.samba.org/ppp/" license=('custom:GPL/BSD') -groups=('base') depends=('glibc' 'libpcap>=1.0.0') -backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down}) +backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh}) source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz options - pon - poff - ppp - plog - pon.1 ip-up ip-down ip-up.d.dns.sh @@ -27,19 +21,14 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ppp.systemd) md5sums=('4621bc56167b6953ec4071043fe0ec57' '7a9259a8f038073eeea7e4552ff1849f' - '48c024f73a80c8b69c4def22f86902cc' - '2d811f8470ccdea3b8c4505a438483e9' - '7561c73b557292d5ba1a9c5dbd270fde' - '86cdaf133f7a79fb464f02d83afc7734' - '44cc662ba9aa61dd9add3ddd4c5ded57' 'e4beb16ed600b61336d50b2bd2df7cd5' '529b924f644f80cf30d72a966abc7419' - '4a074d74c29625b254a1db720cb87b99' - '8d1be5af8e46393ba6eb273377831e38' + '0a79f6427e28426d42b76f7207c531e1' + '3a5d56ac23e36cdbf48187813c8ec981' '4cbd0a9af01c27067450ec7d3f5fa673' 'b75c2fbc4afa9f2d8108b680c88c7036' '9dde53aa5a931ebe1c7e3469199777c5' - 'fafead5c9d66d0574e6f0a2e5f4d4631') + '37401eb0c3dcccb87f5ac4716d0f9f2c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -81,14 +70,18 @@ package() { install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d" install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d" install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh" - install -D -m755 ../pon "${pkgdir}/usr/bin/pon" - install -D -m755 ../poff "${pkgdir}/usr/bin/poff" - install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" + install -D -m755 scripts/pon "${pkgdir}/usr/bin/pon" + install -D -m755 scripts/poff "${pkgdir}/usr/bin/poff" + install -D -m755 scripts/plog "${pkgdir}/usr/sbin/plog" + install -D -m644 scripts/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" - install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp" - install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" 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/ppp/ip-down.d.dns.sh b/core/ppp/ip-down.d.dns.sh index 9e19f7d1b..c9da47a63 100644 --- a/core/ppp/ip-down.d.dns.sh +++ b/core/ppp/ip-down.d.dns.sh @@ -1,3 +1,7 @@ #!/bin/sh -[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf +if [ -x /usr/bin/resolvconf ]; then + /usr/bin/resolvconf -fd ${IFNAME} +else + [ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf +fi diff --git a/core/ppp/ip-up.d.dns.sh b/core/ppp/ip-up.d.dns.sh index f9df543a4..47e4ca41f 100644 --- a/core/ppp/ip-up.d.dns.sh +++ b/core/ppp/ip-up.d.dns.sh @@ -1,7 +1,11 @@ #!/bin/sh if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then - [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} - mv /etc/ppp/resolv.conf /etc/resolv.conf - chmod 644 /etc/resolv.conf + if [ -x /usr/bin/resolvconf ]; then + /usr/bin/resolvconf -a ${IFNAME} </etc/ppp/resolv.conf + elif + [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} + mv /etc/ppp/resolv.conf /etc/resolv.conf + chmod 644 /etc/resolv.conf + fi fi diff --git a/core/ppp/plog b/core/ppp/plog deleted file mode 100644 index 84d2c7340..000000000 --- a/core/ppp/plog +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -s /var/log/ppp.log ]; then - exec tail "$@" /var/log/ppp.log -else - exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' -fi diff --git a/core/ppp/poff b/core/ppp/poff deleted file mode 100644 index 8b4dffc59..000000000 --- a/core/ppp/poff +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Written by John Hasler <john@dhh.gt.org> and based on work -# by Phil Hands <phil@hands.com>. Distributed under the GNU GPL - -if [ -x /usr/bin/kill ]; then - KILL="/usr/bin/kill" -else - KILL="/bin/kill" -fi -SIG=TERM -DONE="stopped" -MODE="" - -usage () -{ - cat <<!EOF! -usage: $0 [option] [provider] -options: - -r Cause pppd to drop the line and redial. - -d Toggle the state of pppd's debug option. - -c Cause pppd to renegotiate compression. - -a Stop all pppd's. 'provider' will be ignored. - -h Print this help summary and exit. - -v Print version and exit. - none Stop pppd. - -Options may not be combined. - -If 'provider' is omitted pppd will be stopped or signalled if and only if -there is exactly one running unless the '-a' option was given. If -'provider' is supplied the pppd controlling the connection to that -provider will be stopped or signalled. -!EOF! -} - -# Get option. If there are none replace the "?" that getopts puts in -# FLAG on error with "null". -getopts rdcavh FLAG -if [ "$?" -ne 0 ]; then - FLAG="null" -fi - -# Check for additional options. Should be none. -getopts :rdcavh DUMMY -if [ "$?" -eq 0 ]; then - echo "$0: Illegal option -- ${OPTARG}." - exit 1 -fi - -case $FLAG in - "r") SIG=HUP; DONE=signalled; shift ;; - "d") SIG=USR1; DONE=signalled; shift ;; - "c") SIG=USR2; DONE=signalled; shift ;; - "a") MODE="all"; shift ;; - "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;; - "h") usage; exit 0 ;; - "?") exit 1; -esac - -# Get the PIDs of all the pppds running. Could also get these from -# /var/run, but pppd doesn't create .pid files until ppp is up. -PIDS=`pidof pppd` - -# poff is pointless if pppd isn't running. -if test -z "$PIDS"; then - echo "$0: No pppd is running. None ${DONE}." - exit 1 -fi - -# Find out how many pppd's are running. -N=`echo "$PIDS" | wc -w` - -# If there are no arguments we can't do anything if there is more than one -# pppd running. -if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then - echo "$0: More than one pppd running and no "-a" option and -no arguments supplied. Nothing ${DONE}." - exit 1 -fi - -# If either there are no arguments or '-a' was specified kill all the -# pppd's. -if test "$#" -eq 0 -o "$MODE" = "all" ; then - $KILL -$SIG $PIDS || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } - exit 0 -fi - -# There is an argument, so kill the pppd started on that provider. -PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'` -if test -n "$PID" ; then - $KILL -$SIG $PID || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } -else - echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}." - exit 1 -fi -exit 0 diff --git a/core/ppp/pon b/core/ppp/pon deleted file mode 100644 index 36885050b..000000000 --- a/core/ppp/pon +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -case "$1" in - -*) echo " -Usage: pon [provider] [arguments] - -If you specify one argument, a PPP connection will be started using -settings from the appropriate file in the /etc/ppp/peers/ directory, and -any additional arguments supplied will be passed as extra arguments to -pppd. -" - exit 0 - ;; -esac - -if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then - echo " -Please configure /etc/ppp/peers/provider or use a command line argument to -use another file in /etc/ppp/peers/ directory. -" - exit 1 -fi - -if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then - echo " -The file /etc/ppp/peers/$1 does not exist. -" - exit 1 -fi - -exec /usr/sbin/pppd call ${@:-provider} - diff --git a/core/ppp/pon.1 b/core/ppp/pon.1 deleted file mode 100644 index bb3220564..000000000 --- a/core/ppp/pon.1 +++ /dev/null @@ -1,121 +0,0 @@ -.\" This manual is published under the GPL. -.\" All guidelines specified in the GPL apply here. -.\" To get an ascii file: -.\" groff -man -Tascii pon.1 > pon.txt -.\" -.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" -.SH NAME -pon, poff, plog \- starts up, shuts down or lists the log of PPP connections -.SH SYNOPSIS -.B pon -[ isp-name [ options ] ] -.br -.B poff -[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ] -.br -.B plog -[ arguments ] -.SH DESCRIPTION -This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP -scripts, which allow users to control PPP connections. -.. -.SS pon -\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP -file, if it exists and is executable. Otherwise, a PPP connection will be -started using configuration from \fI/etc/ppp/peers/provider\fP. -This is the default behaviour unless an \fBisp-name\fP argument is given. -.PP -For instance, to use ISP configuration "myisp" run: -.IP -pon myisp -.PP -\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. -You can pass additional \fBoptions\fP after the ISP name, too. -\fBpon\fP can be used to run multiple, simultaneous PPP connections. -.. -.SS poff -\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, -the one named in the argument to \fBpoff\fP will be killed, e.g. -.IP -poff myprovider2 -.PP -will terminate the connection to myprovider2, and leave the PPP connections -to e.g. "myprovider1" or "myprovider3" up and running. -.PP -\fBpoff\fP takes the following command line options: -.RS -.TP -.B "\-r" -causes the connection to be redialed after it is dropped. -.TP -.B "\-d" -toggles the state of pppd's debug option. -.TP -.B "\-c" -causes -.BR pppd (8) -to renegotiate compression. -.TP -.B "\-a" -stops all running ppp connections. If the argument \fBisp-name\fP -is given it will be ignored. -.TP -.B "\-h" -displays help information. -.TP -.B "\-v" -prints the version and exits. -.PP -If no argument is given, \fBpoff\fP will stop or signal pppd if and only -if there is exactly one running. If more than one connection is active, -it will exit with an error code of 1. -.. -.SS plog -\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that -file doesn't exist, it shows you the last few lines of your -\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. -This script makes use of the -.BR tail (1) -command, so arguments that can be passed to -.BR tail (1) -can also be passed to \fBplog\fP. -.PP -Note: the \fBplog\fP script can only be used by root or another system -administrator in group "adm", due to security reasons. Also, to have all -pppd-generated information in one logfile, that plog can show, you need the -following line in your \fI/etc/syslog.conf\fP file: -.PP -local2.* -/var/log/ppp.log -.RE -.SH FILES -.TP -.I /etc/ppp/options -PPPd system options file. -.TP -.I /etc/ppp/pap-secrets -System PAP passwords file. -.TP -.I /etc/ppp/chap-secrets -System CHAP passwords file. -.TP -.I /etc/ppp/peers/ -Directory holding the peer options files. The default file is called -\fIprovider\fP. -.TP -.I /etc/chatscripts/provider -The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. -.TP -.I /var/log/ppp.log -The default PPP log file. -.SH AUTHORS -The p-commands were written by Christoph Lameter <clameter@debian.org>. -Updated and revised by Philip Hands <phil@hands.com>. -.br -This manual was written by Othmar Pasteka <othmar@tron.at>. Modified -by Rob Levin <lilo@openprojects.net>, with some extensions taken from -the old p-commands manual written by John Hasler <jhasler@debian.org>. -.SH "SEE ALSO" -.BR pppd (8), -.BR chat (8), -.BR tail (1). - diff --git a/core/ppp/ppp b/core/ppp/ppp deleted file mode 100644 index 16e01bad7..000000000 --- a/core/ppp/ppp +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/pppd` -case "$1" in - start) - stat_busy "Starting PPP daemon" - [ -z "$PID" ] && /usr/bin/pon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ppp - stat_done - fi - ;; - stop) - stat_busy "Stopping PPP daemon" - [ ! -z "$PID" ] && poff -a &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ppp - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/ppp/ppp.systemd b/core/ppp/ppp.systemd index a5c490a73..8a963af74 100644 --- a/core/ppp/ppp.systemd +++ b/core/ppp/ppp.systemd @@ -3,7 +3,7 @@ Description=PPP link to %I Before=network.target [Service] -ExecStart=/usr/sbin/pppd call %I nodetach +ExecStart=/usr/sbin/pppd call %I nodetach nolog [Install] WantedBy=multi-user.target diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD index b20279bf3..c1b0441ea 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.1 +pkgrel=5 pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP." arch=('i686' 'x86_64' 'mips64el') 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/sdparm/PKGBUILD b/core/sdparm/PKGBUILD index b72eb2c23..8e9cb469c 100644 --- a/core/sdparm/PKGBUILD +++ b/core/sdparm/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 148461 2012-02-01 12:06:03Z stephane $ +# $Id: PKGBUILD 188486 2013-06-14 23:27:22Z eric $ # Maintainer: # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: grimi@poczta.fm pkgname=sdparm -pkgver=1.07 -pkgrel=1.1 +pkgver=1.08 +pkgrel=1 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://sg.danny.cz/sg/sdparm.html" license=('BSD') -depends=('glibc') -source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") -md5sums=('c807f9db3dd7af175214be0d7fece494') +depends=('glibc' 'bash') +source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz") +md5sums=('d290e6b45d690bfa2cc05700ec119073') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING \ diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index 4dcccd0e8..39288c7a0 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' 'mips64el') 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 4c057478f..8500e395a 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' 'mips64el') 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/sudo/PKGBUILD b/core/sudo/PKGBUILD index e822537e6..6e4193324 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185547 2013-05-14 21:53:57Z foutrelis $ +# $Id: PKGBUILD 188591 2013-06-16 17:14:27Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.6p8 +_sudover=1.8.7 pkgver=${_sudover/p/.p} -pkgrel=2 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64' 'mips64el') url="http://www.sudo.ws/sudo/" @@ -17,7 +17,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('c0baaa87f59153967b650a0dde2f7d4147d358fa15f3fdabb47e84d0282fe625' +sha256sums=('39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a' 'SKIP' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') 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 d26c533fb..ad695a979 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' 'mips64el') 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' '!distcc') 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 } @@ -103,10 +103,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" @@ -135,12 +131,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 e51f5baab..a576e6a05 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' 'mips64el') 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 240c5e292..4febb901d 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' 'mips64el') url="http://www.gnu.org/software/tar/tar.html" @@ -43,9 +43,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/usbutils/PKGBUILD b/core/usbutils/PKGBUILD index a28d19be6..c5cd7eb57 100644 --- a/core/usbutils/PKGBUILD +++ b/core/usbutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163502 2012-07-13 16:29:26Z tpowa $ +# $Id: PKGBUILD 188585 2013-06-16 16:11:16Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils -pkgver=006 +pkgver=007 pkgrel=1 pkgdesc="USB Device Utilities" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ optdepends=('python2: for lsusb.py usage' url="http://linux-usb.sourceforge.net/" source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz" fix-python2.patch) -md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8' +md5sums=('c9df5107ae9d26b10a1736a261250139' '45766196895b4cc50b53cd56e1bbf3d1') build() { diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 4f7e2c06e..0d33104f1 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' 'mips64el') @@ -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 34d3c2311..e7141a7a4 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' 'mips64el') 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 c9cc76b72..cc71f99c5 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' 'mips64el') @@ -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 } |