summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/nfs-utils/PKGBUILD10
-rw-r--r--core/nfs-utils/rpc-gssd.service1
-rw-r--r--core/nfs-utils/rpc-idmapd.service1
-rw-r--r--core/nfs-utils/rpc-statd.service1
-rw-r--r--core/pam/PKGBUILD24
-rw-r--r--core/pam/pam_namespace-build-1.1.6.patch11
-rw-r--r--core/pam/pam_unix2-glibc216.patch20
-rw-r--r--core/util-linux/PKGBUILD39
-rw-r--r--core/wpa_supplicant/PKGBUILD7
-rw-r--r--core/wpa_supplicant/config14
10 files changed, 83 insertions, 45 deletions
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index a6ac7ff9d..caf4229c1 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160027 2012-05-28 10:26:22Z tpowa $
+# $Id: PKGBUILD 168765 2012-10-15 19:16:00Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,7 +7,7 @@
pkgname=nfs-utils
pkgver=1.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64')
url='http://nfs.sourceforge.net'
@@ -48,11 +48,11 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
'f5e7bba09a46c5c5d7007cac6eff9df5'
'7674106eaaa4c149bccd4f05fe3604e9'
'4f4827dfc93008dfadd0a530ad0872b2'
- '38855936dc55a5afe37d84edc0f11066'
+ '3694619813cebc5b4502b58f1992b442'
'965311784d49a7d126d512cadbe91deb'
'e05705d9ccccaeaeb1ecaee20adc05bc'
- 'd7df7bc311fd95c5b80017dd1741570d'
- '2e72ee082cba5d3ec6f51d2a105664da'
+ '359d84a85f8781dc3f45f4cf1dbe4b53'
+ 'c82ef7b238efe62af3d5e263e1ba1c5c'
'5d33d2e754fd37280365b287603bac90'
'1cd65909fa0983047f3f06a3ab352401'
'02a34835aa077146a90eb7d191e612d0'
diff --git a/core/nfs-utils/rpc-gssd.service b/core/nfs-utils/rpc-gssd.service
index 446864d18..da4c71307 100644
--- a/core/nfs-utils/rpc-gssd.service
+++ b/core/nfs-utils/rpc-gssd.service
@@ -2,6 +2,7 @@
Description=RPC GSS-API client-side daemon
After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
[Service]
Type=forking
diff --git a/core/nfs-utils/rpc-idmapd.service b/core/nfs-utils/rpc-idmapd.service
index 72cd26a93..7785c1bd5 100644
--- a/core/nfs-utils/rpc-idmapd.service
+++ b/core/nfs-utils/rpc-idmapd.service
@@ -2,6 +2,7 @@
Description=NFSv4 ID-name mapping daemon
After=var-lib-nfs-rpc_pipefs.mount nfsd.service
Requires=var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
[Service]
Type=forking
diff --git a/core/nfs-utils/rpc-statd.service b/core/nfs-utils/rpc-statd.service
index 983b4044f..97d397faf 100644
--- a/core/nfs-utils/rpc-statd.service
+++ b/core/nfs-utils/rpc-statd.service
@@ -2,6 +2,7 @@
Description=NFSv2/3 Network Status Monitor Daemon
After=rpcbind.service
Requires=rpcbind.service
+Before=remote-fs-pre.service
[Service]
Type=forking
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 42c6663c9..1e7c611b7 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161792 2012-06-14 10:14:53Z tpowa $
+# $Id: PKGBUILD 168736 2012-10-15 05:13:56Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=pam
-pkgver=1.1.5
-pkgrel=4
+pkgver=1.1.6
+pkgrel=1
pkgdesc="PAM (Pluggable Authentication Modules) library"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -14,28 +14,34 @@ makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
#http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
- ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2)
+ ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
+ pam_unix2-glibc216.patch
+ pam_namespace-build-1.1.6.patch)
options=('!libtool' '!emptydirs')
-md5sums=('927ee5585bdec5256c75117e9348aa47'
- 'e2788389a6c59224110a45fcff30e02b')
+md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
+ 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
+ 'dac109f68e04a4df37575fda6001ea17'
+ '440a510164ba5eb69bf41e129746ff44')
build() {
cd $srcdir/Linux-PAM-$pkgver
./configure --libdir=/usr/lib
+ patch -Np0 -i ../pam_namespace-build-1.1.6.patch
make
- cd $srcdir/pam_unix2-2.6
+ cd $srcdir/pam_unix2-2.9.1
+ patch -Np1 -i ../pam_unix2-glibc216.patch
./configure --libdir=/usr/lib
make
}
package() {
cd $srcdir/Linux-PAM-$pkgver
- make DESTDIR=$pkgdir install
+ make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
# build pam_unix2 module
# source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
- cd $srcdir/pam_unix2-2.6
+ cd $srcdir/pam_unix2-2.9.1
make DESTDIR=$pkgdir install
# add the realtime permissions for audio users
diff --git a/core/pam/pam_namespace-build-1.1.6.patch b/core/pam/pam_namespace-build-1.1.6.patch
new file mode 100644
index 000000000..aeabc234c
--- /dev/null
+++ b/core/pam/pam_namespace-build-1.1.6.patch
@@ -0,0 +1,11 @@
+--- modules/pam_namespace/Makefile~ 2012-10-12 10:59:13.557550706 +0200
++++ modules/pam_namespace/Makefile 2012-10-12 10:59:13.564217270 +0200
+@@ -869,7 +869,7 @@
+
+
+ install-data-local:
+- mkdir -p $(namespaceddir)
++ mkdir -p $(DESTDIR)$(namespaceddir)
+ README: pam_namespace.8.xml namespace.conf.5.xml
+ -include $(top_srcdir)/Make.xml.rules
+
diff --git a/core/pam/pam_unix2-glibc216.patch b/core/pam/pam_unix2-glibc216.patch
new file mode 100644
index 000000000..faa6a235f
--- /dev/null
+++ b/core/pam/pam_unix2-glibc216.patch
@@ -0,0 +1,20 @@
+Index: pam_unix2-2.9.1/src/read-files.c
+===================================================================
+--- pam_unix2-2.9.1.orig/src/read-files.c
++++ pam_unix2-2.9.1/src/read-files.c
+@@ -30,8 +30,14 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <nss.h>
+-#include <bits/libc-lock.h>
++#include <pthread.h>
+ #define __libc_lock_t pthread_mutex_t
++#define __libc_lock_define_initialized(CLASS,NAME) \
++ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
++#define __libc_lock_lock(NAME) \
++ pthread_mutex_lock, (&(NAME))
++#define __libc_lock_unlock(NAME) \
++ pthread_mutex_unlock, (&(NAME))
+
+ #include "read-files.h"
+
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index deba92866..4280c06fa 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168016 2012-10-05 10:13:37Z tomegun $
+# $Id: PKGBUILD 168750 2012-10-15 14:14:40Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
-pkgver=2.22
-pkgrel=7
+pkgver=2.22.1
+pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
@@ -16,12 +16,10 @@ provides=("util-linux-ng=${pkgver}" 'eject')
license=('GPL2')
options=('!libtool')
source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
- su.1
uuidd.tmpfiles
pam-login
pam-common
- pam-su
- hwclock-systz.patch)
+ pam-su)
backup=(etc/pam.d/chfn
etc/pam.d/chsh
etc/pam.d/login
@@ -32,13 +30,6 @@ install=util-linux.install
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../hwclock-systz.patch
-
- # unbreak --localstatedir
- # TODO(dreisner): find out what sami had in mind with these heuristics
- sed -i '71,75d' configure.ac
- ./autogen.sh
-
./configure --prefix=/usr \
--libdir=/usr/lib \
--localstatedir=/run \
@@ -52,15 +43,16 @@ build() {
--enable-socket-activation
# --enable-reset \ # part of ncurses
-# --enable-last \ # not part of any package
-# --enable-line \ # not compat
+# --enable-line \ # not part of any package
+# --enable-last \ # not compat
make
}
-check() {
- make -C "$pkgname-$pkgver" check
-}
+#check() {
+# fails for some reason in chroot, works outside
+# make -C "$pkgname-$pkgver" check
+#}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -79,19 +71,12 @@ package() {
install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su"
install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l"
- # broken buildsys doesn't include su(1), which means it
- # isn't even in the dist tarball
- # TODO(dreisner): patched upstream
- install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1"
-
# include tmpfiles fragment for uuidd
# TODO(dreisner): offer this upstream?
install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
}
-md5sums=('ba2d8cc12a937231c80a04f7f7149303'
- '7f524538dcf57284a86f03a98e624f04'
+md5sums=('730cf9932531ed09b53a04ca30fcb4c9'
'a39554bfd65cccfd8254bb46922f4a67'
'4368b3f98abd8a32662e094c54e7f9b1'
'a31374fef2cba0ca34dfc7078e2969e4'
- 'fa85e5cce5d723275b14365ba71a8aad'
- '19eaa197a0cfb046661dede2e991120b')
+ 'fa85e5cce5d723275b14365ba71a8aad')
diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD
index 5a7db187f..83ced8ab1 100644
--- a/core/wpa_supplicant/PKGBUILD
+++ b/core/wpa_supplicant/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 162909 2012-07-03 19:16:48Z dreisner $
+# $Id: PKGBUILD 168766 2012-10-15 19:16:03Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wpa_supplicant
pkgver=1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A utility providing key negotiation for WPA wireless networks"
url="http://hostap.epitest.fi/wpa_supplicant"
arch=('i686' 'x86_64')
depends=('openssl' 'dbus-core' 'readline' 'libnl')
optdepends=('wpa_supplicant_gui: wpa_gui program')
license=('GPL')
-groups=('base')
backup=('etc/wpa_supplicant/wpa_supplicant.conf')
source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz"
config hostap_allow-linking-with-libnl-3.2.patch)
md5sums=('8650f6aa23646ef634402552d0669640'
- '380d8d1fe24bccb2a2636cb2a6038c39'
+ 'c035e45e8e240239eecd7402f235fb3b'
'473fb6b77909ec5a50b6f4d91370e86b')
build() {
diff --git a/core/wpa_supplicant/config b/core/wpa_supplicant/config
index 59da1e27e..5e6dfedc8 100644
--- a/core/wpa_supplicant/config
+++ b/core/wpa_supplicant/config
@@ -466,3 +466,17 @@ CONFIG_NO_RANDOM_POOL=y
#CONFIG_INTERWORKING=y
CONFIG_LIBNL32=y
+
+# More options that are not in defconfig:
+
+# Lightweight AP mode
+CONFIG_AP=y
+
+# P2P (WiFi Direct)
+CONFIG_P2P=y
+
+# RSN IBSS/AdHoc support
+CONFIG_IBSS_RSN=y
+
+# Simple background scan
+CONFIG_BGSCAN_SIMPLE=y