diff options
Diffstat (limited to 'core')
32 files changed, 294 insertions, 174 deletions
diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index 3470d882a..358600e04 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 186207 2013-05-22 04:47:50Z foutrelis $ +# $Id: PKGBUILD 203561 2014-01-13 17:11:37Z andyrtr $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda pkgver=1.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') -depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw') +depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw') makedepends=('python2-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index e0c0c2c79..279a4ee3a 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 202619 2013-12-22 13:44:39Z thomas $ +# $Id: PKGBUILD 203562 2014-01-13 17:11:38Z andyrtr $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD index b006303e0..f9f76c2ed 100644 --- a/core/dirmngr/PKGBUILD +++ b/core/dirmngr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184781 2013-05-08 13:18:15Z tpowa $ +# $Id: PKGBUILD 203563 2014-01-13 17:11:39Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=dirmngr pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A daemon to handle CRL and certificate requests" arch=('i686' 'x86_64') license=('GPL') diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD index b4f592739..9ae79e6cb 100644 --- a/core/gdbm/PKGBUILD +++ b/core/gdbm/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 197797 2013-10-30 10:37:51Z allan $ +# $Id: PKGBUILD 203669 2014-01-13 20:48:15Z eric $ +# Maintainer: # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gdbm -pkgver=1.10 -pkgrel=3 +pkgver=1.11 +pkgrel=1 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" -license=('GPL') +license=('GPL3') arch=('i686' 'x86_64') depends=('glibc' 'sh') -source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz{,.sig} gdbm-1.10-zeroheaders.patch) options=('!makeflags') install=gdbm.install -md5sums=('88770493c2559dc80b561293e39d3570' +md5sums=('72c832680cf0999caedbe5b265c8c1bd' + 'SKIP' 'ac255b10452005237836cd2d3a470733') prepare() { @@ -32,13 +34,8 @@ prepare() { build() { cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --enable-libgdbm-compat - - make prefix=/usr + ./configure --prefix=/usr --enable-libgdbm-compat + make } check() { @@ -48,12 +45,8 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}"/usr \ - manprefix="${pkgdir}"/usr/share/man \ - man3dir="${pkgdir}"/usr/share/man/man3 \ - infodir="${pkgdir}"/usr/share/info \ - install - + make DESTDIR="${pkgdir}" install + # create symlinks for compatibility install -dm755 "${pkgdir}"/usr/include/gdbm ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index f54c859f5..fc1d8973c 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197811 2013-10-30 11:03:28Z allan $ +# $Id: PKGBUILD 203560 2014-01-13 16:35:40Z tpowa $ # Maintainer: pkgname=gettext -pkgver=0.18.3.1 -pkgrel=2 +pkgver=0.18.3.2 +pkgrel=1 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gettext/" @@ -14,7 +14,7 @@ optdepends=('cvs: for autopoint tool') options=(!docs) install=gettext.install source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('3fc808f7d25487fc72b5759df7419e02' +md5sums=('241aba309d07aa428252c74b40a818ef' 'SKIP') build() { diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 9ac8772f7..c045ebc26 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195927 2013-10-05 17:40:59Z bisson $ +# $Id: PKGBUILD 203564 2014-01-13 17:11:40Z andyrtr $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gnupg pkgver=2.0.22 -pkgrel=1 +pkgrel=2 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 04ca6df34..18d1c94c6 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 199763 2013-11-15 21:24:40Z ronald $ +# $Id: PKGBUILD 203666 2014-01-13 18:57:04Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.11.0 +pkgver=3.12.0 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -depends=('glibc' 'db' 'iptables') +depends=('glibc' 'iptables') makedepends=('linux-atm') optdepends=('linux-atm: ATM support') groups=('base') @@ -22,7 +22,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch unwanted-link-help.patch) -sha1sums=('efb5ca0688e28967ec146ac37cc728c4f53c9d8f' +sha1sums=('9397376e5d4dcbb1182745cd58625895fcdb868d' '35b8cf2dc94b73eccad427235c07596146cd6f6c' '3b1335f4025f657f388fbf4e5a740871e3129c2a') diff --git a/core/iptables/0503-extension_cppflags.patch b/core/iptables/0503-extension_cppflags.patch deleted file mode 100644 index 0eb645731..000000000 --- a/core/iptables/0503-extension_cppflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/extensions/GNUmakefile.in -=================================================================== ---- a/extensions/GNUmakefile.in 2012-03-27 12:14:05.000000000 -0400 -+++ b/extensions/GNUmakefile.in 2012-03-27 16:03:48.378790221 -0400 -@@ -21,7 +21,7 @@ - kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ - - AM_CFLAGS = ${regular_CFLAGS} --AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} -+AM_CPPFLAGS = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} - AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ - AM_LDFLAGS = @noundef_LDFLAGS@ - diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 0c65bd132..6f7334042 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199764 2013-11-15 21:24:41Z ronald $ +# $Id: PKGBUILD 203667 2014-01-13 18:57:06Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.20 +pkgver=1.4.21 pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') @@ -20,11 +20,10 @@ source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-nat.rules empty-raw.rules empty-security.rules - 0503-extension_cppflags.patch iptables.service ip6tables.service iptables-flush) -sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c' +sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8' 'SKIP' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec' @@ -33,18 +32,19 @@ sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' - '44626980a52e49f345a0b1e1ca03060f3a35763c' '9306cba67dbeaa004af084a816f66920a6a10faf' '38fa2ffe7965e63b494d333f69193029c1258c28' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # use system one rm include/linux/types.h +} - patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index dc1771d1d..fabc45ca3 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197821 2013-10-30 11:04:40Z allan $ +# $Id: PKGBUILD 203657 2014-01-13 17:30:34Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt -pkgver=1.5.3 +pkgver=1.6.0 pkgrel=1 pkgdesc="General purpose cryptographic library based on the code from GnuPG" arch=(i686 x86_64) @@ -11,13 +11,11 @@ license=('LGPL') depends=('libgpg-error>=1.10-2') options=('!emptydirs') install=$pkgname.install -source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 -) -sha1sums=('2c6553cc17f2a1616d512d6870fe95edf6b0e26e') +source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('43283c0b41c41e3d3bc13c2d8f937dfe2aaa1a77') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-static \ --disable-padlock-support @@ -25,11 +23,11 @@ build() { } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index b1f4d1607..2aeaf23f8 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $ +# $Id: PKGBUILD 203559 2014-01-13 16:35:26Z tpowa $ # 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.9 -pkgrel=1 +pkgrel=5 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -20,7 +20,6 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn nfs-server.conf exports idmapd.conf - nfs nfs-utils-1.1.4-mtab-sym.patch nfs-utils-1.1.4-no-exec.patch rpc-gssd.service @@ -31,32 +30,34 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn nfsd.service var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount + nfs-client.target + nfs-server.target blkmapd.service nfs-utils.conf id_resolver.conf start-statd.patch) install=nfs-utils.install optdepends=('sqlite: for nfsdcltrack usage') - md5sums=('18869d16db3f49c053f8c68eba3fe2e0' 'f73f197a16b02c3e248488ec35c4cf43' '9cef69bc686cc5dcac23fbb51450747d' - 'ff585faf410a62c4333a027c50b56bae' + 'e6ad3c7a59c7e4c24965a0e7da35026c' 'eb4f4027fab6fc1201f1ca04f5954c76' - 'f5e7bba09a46c5c5d7007cac6eff9df5' '7674106eaaa4c149bccd4f05fe3604e9' '4f4827dfc93008dfadd0a530ad0872b2' - '6aeb4a80b2a5162f5951438474ea22f3' - 'ff95ad9275ef774e0a2ea8adfe55ee66' - '2e991f0e440b4809e22b6c7689544fc0' - '42d0088add3beab0284be1379391382b' - '60d82e2d2d19d21ceb72665e54bf913e' - '3bcc9901478f4f9ea0a03b67171c13e3' - '1cd65909fa0983047f3f06a3ab352401' - '8f1b5282795895c9b8ce8430d20cdda6' - '8f03e708b230619ffc2a799a48bffb53' + 'b9329c9d4a6b4a72ab2a04aac9229171' + '656ac433c4443eba6b47744a53a3c7d9' + '295ec0c9c049e146992561650fec9d52' + '6ff4f297df4e90440b8bdbc6b1a78480' + '20d5b8120d1049b27dd44dc4c57f667d' + '01a1dd533382630ccecc9b882c47aa2f' + 'f48da2fb07b1d5f016d63c16b0979ebb' + '972eb80ff8c94c647b977a8a3cdd985f' + 'a13e9f388cd939d68fa6ada205eb4e25' + '1ee3eea917131f04bb08f2f858be7724' + 'f513ab0eae74918df08f329b0c6a9b6f' '8ac484023d786766d287ccbe878ae4ba' - 'bed57f7c3911af695ec7b469248c104a' + 'a43aabf0b8d02406b1babc3a206d952a' 'f8bb29c2ca1ce178e6371091a3e1090d') prepare() { @@ -83,29 +84,22 @@ build() { package() { cd $srcdir/${pkgname}-${pkgver} - # fix make install - make DESTDIR=$pkgdir install - # support python2 (FS#25120) + make DESTDIR="$pkgdir" install sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats} + install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf - # Configuration - install -D -m 644 ../exports "$pkgdir/"etc/exports - install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf - install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf - install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf - install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs - install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf - # keyutils id_resolver #35463 - install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf - # systemd files - for i in ${srcdir}/*.{service,mount}; do - install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" + cd .. + install -D -m 644 nfs-common.conf "$pkgdir"/etc/conf.d/nfs-common.conf + install -D -m 644 nfs-server.conf "$pkgdir"/etc/conf.d/nfs-server.conf + install -D -m 644 exports "$pkgdir"/etc/exports + install -D -m 644 idmapd.conf "$pkgdir"/etc/idmapd.conf + install -D -m 644 id_resolver.conf "$pkgdir"/etc/request-key.d/id_resolver.conf + install -D -m 644 nfs-utils.conf "$pkgdir"/usr/lib/modules-load.d/nfs-utils.conf + for i in *.service *.mount *.target; do + install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$i done - install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf - # directories - mkdir "$pkgdir/"etc/exports.d - mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs - mkdir "$pkgdir/"var/lib/nfs/v4recovery + mkdir "$pkgdir"/etc/exports.d + mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs + mkdir "$pkgdir"/var/lib/nfs/v4recovery } - diff --git a/core/nfs-utils/blkmapd.service b/core/nfs-utils/blkmapd.service index fa7ce394b..04711d09c 100644 --- a/core/nfs-utils/blkmapd.service +++ b/core/nfs-utils/blkmapd.service @@ -1,5 +1,6 @@ [Unit] -Description=pNFS block layout mapping daemon +Description=pNFS Block Layout Client Mapping Daemon +Documentation=man:blkmapd(8) After=var-lib-nfs-rpc_pipefs.mount nfsd.service Requires=var-lib-nfs-rpc_pipefs.mount diff --git a/core/nfs-utils/exports b/core/nfs-utils/exports index 8f4aac598..59dfa2e7c 100644 --- a/core/nfs-utils/exports +++ b/core/nfs-utils/exports @@ -1,15 +1,12 @@ -# /etc/exports -# -# List of directories exported to NFS clients. See exports(5). -# Use exportfs -arv to reread. +# /etc/exports - exports(5) - directories exported to NFS clients # # Example for NFSv2 and NFSv3: -# /srv/home hostname1(rw,sync) hostname2(ro,sync) -# +# /srv/home hostname1(rw,sync) hostname2(ro,sync) # Example for NFSv4: -# /srv/nfs4 hostname1(rw,sync,fsid=0) +# /srv/nfs4 hostname1(rw,sync,fsid=0) # /srv/nfs4/home hostname1(rw,sync,nohide) # Using Kerberos and integrity checking: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) -# /srv/nfs4/home gss/krb5i(rw,sync,nohide) +# /srv/nfs4 *(rw,sync,sec=krb5i,fsid=0) +# /srv/nfs4/home *(rw,sync,sec=krb5i,nohide) # +# Use `exportfs -arv` to reload. diff --git a/core/nfs-utils/id_resolver.conf b/core/nfs-utils/id_resolver.conf index 9c0fee337..92f78281f 100644 --- a/core/nfs-utils/id_resolver.conf +++ b/core/nfs-utils/id_resolver.conf @@ -1 +1,2 @@ -create id_resolver * * /usr/bin/nfsidmap %k %d
\ No newline at end of file +create id_resolver * * /usr/bin/nfsidmap %k %d + diff --git a/core/nfs-utils/nfs b/core/nfs-utils/nfs deleted file mode 100644 index 2d33cf3d4..000000000 --- a/core/nfs-utils/nfs +++ /dev/null @@ -1,40 +0,0 @@ -# -# Optinal options passed to rquotad -RPCRQUOTADOPTS="" -# -# Optional arguments passed to in-kernel lockd -#LOCKDARG= -# TCP port rpc.lockd should listen on. -#LOCKD_TCPPORT=32803 -# UDP port rpc.lockd should listen on. -#LOCKD_UDPPORT=32769 -# -# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) -RPCNFSDARGS="" -# Number of nfs server processes to be started. -# The default is 8. -RPCNFSDCOUNT=8 -# Set V4 grace period in seconds -#NFSD_V4_GRACE=90 -# -# Optional arguments passed to rpc.mountd. See rpc.mountd(8) -RPCMOUNTDOPTS="" -# -# Optional arguments passed to rpc.statd. See rpc.statd(8) -STATDARG="" -# -# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) -RPCIDMAPDARGS="" -# -# Optional arguments passed to rpc.gssd. See rpc.gssd(8) -RPCGSSDARGS="" -# -# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) -RPCSVCGSSDARGS="" -# -# To enable RDMA support on the server by setting this to -# the port the server should listen on -#RDMA_PORT=20049 -# -# Optional arguments passed to blkmapd. See blkmapd(8) -BLKMAPDARGS="" diff --git a/core/nfs-utils/nfs-client.target b/core/nfs-utils/nfs-client.target new file mode 100644 index 000000000..1bec662ab --- /dev/null +++ b/core/nfs-utils/nfs-client.target @@ -0,0 +1,8 @@ +[Unit] +Description=NFS Client Daemons +Before=remote-fs-pre.target +Wants=rpc-statd.service +Wants=rpc-gssd.service + +[Install] +WantedBy=multi-user.target diff --git a/core/nfs-utils/nfs-server.target b/core/nfs-utils/nfs-server.target new file mode 100644 index 000000000..52f0f04a4 --- /dev/null +++ b/core/nfs-utils/nfs-server.target @@ -0,0 +1,10 @@ +[Unit] +Description=NFS File Server Daemons +Wants=rpc-mountd.service +Wants=rpc-idmapd.service +Wants=rpc-rquotad.service +Wants=rpc-statd.service +Wants=rpc-svcgssd.service + +[Install] +WantedBy=multi-user.target diff --git a/core/nfs-utils/nfsd.service b/core/nfs-utils/nfsd.service index d63e49016..83db80657 100644 --- a/core/nfs-utils/nfsd.service +++ b/core/nfs-utils/nfsd.service @@ -1,13 +1,17 @@ [Unit] -Description=NFS server +Description=NFS Server Daemon +Documentation=man:rpc.nfsd(8) After=rpcbind.service Requires=rpcbind.service +Before=nfs-server.target +PartOf=nfs-server.target [Service] Type=oneshot EnvironmentFile=/etc/conf.d/nfs-server.conf ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT ExecStartPost=/usr/bin/exportfs -a +ExecReload=/usr/bin/exportfs -a -r ExecStop=/usr/bin/rpc.nfsd 0 ExecStopPost=/usr/bin/exportfs -a -u RemainAfterExit=yes diff --git a/core/nfs-utils/proc-fs-nfsd.mount b/core/nfs-utils/proc-fs-nfsd.mount index e5ee6fbf6..26b58b968 100644 --- a/core/nfs-utils/proc-fs-nfsd.mount +++ b/core/nfs-utils/proc-fs-nfsd.mount @@ -1,5 +1,5 @@ [Unit] -Description=RPC Pipe File System +Description=NFS Configuration File System DefaultDependencies=no [Mount] diff --git a/core/nfs-utils/rpc-gssd.service b/core/nfs-utils/rpc-gssd.service index 182d9b72c..8674fb2e5 100644 --- a/core/nfs-utils/rpc-gssd.service +++ b/core/nfs-utils/rpc-gssd.service @@ -1,8 +1,10 @@ [Unit] -Description=RPC GSS-API client-side daemon +Description=RPC GSS-API Client Daemon +Documentation=man:rpc.gssd(8) After=rpcbind.service var-lib-nfs-rpc_pipefs.mount Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target +Before=nfs-client.target remote-fs-pre.target +PartOf=nfs-client.target [Service] Type=forking diff --git a/core/nfs-utils/rpc-idmapd.service b/core/nfs-utils/rpc-idmapd.service index 1167daf36..609cde6ed 100644 --- a/core/nfs-utils/rpc-idmapd.service +++ b/core/nfs-utils/rpc-idmapd.service @@ -1,8 +1,10 @@ [Unit] -Description=NFSv4 ID-name mapping daemon +Description=NFS v4 ID-Name Mapping Daemon +Documentation=man:rpc.idmapd(8) man:idmapd.conf(5) After=var-lib-nfs-rpc_pipefs.mount nfsd.service Requires=var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target +Before=nfs-server.target +PartOf=nfs-server.target [Service] Type=forking diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service index 7528884c2..2969ee6b0 100644 --- a/core/nfs-utils/rpc-mountd.service +++ b/core/nfs-utils/rpc-mountd.service @@ -1,7 +1,10 @@ [Unit] -Description=NFS Mount Daemon +Description=NFS Mount Server Daemon +Documentation=man:rpc.mountd(8) After=rpcbind.service nfsd.service Requires=rpcbind.service nfsd.service +Before=nfs-server.target +PartOf=nfs-server.target [Service] Type=forking diff --git a/core/nfs-utils/rpc-statd.service b/core/nfs-utils/rpc-statd.service index c2fd63b3d..c5a1c359a 100644 --- a/core/nfs-utils/rpc-statd.service +++ b/core/nfs-utils/rpc-statd.service @@ -1,8 +1,11 @@ [Unit] -Description=NFSv2/3 Network Status Monitor Daemon +Description=NFS v2/3 Network Status Monitor Daemon +Documentation=man:rpc.statd(8) After=rpcbind.service Requires=rpcbind.service -Before=remote-fs-pre.target +Before=nfs-server.target +PartOf=nfs-server.target +Wants=remote-fs-pre.target [Service] Type=forking diff --git a/core/nfs-utils/rpc-svcgssd.service b/core/nfs-utils/rpc-svcgssd.service index 876bad38c..f52f26aec 100644 --- a/core/nfs-utils/rpc-svcgssd.service +++ b/core/nfs-utils/rpc-svcgssd.service @@ -1,7 +1,10 @@ [Unit] -Description=RPC GSS-API server-side daemon +Description=RPC GSS-API Server Daemon +Documentation=man:rpc.svcgssd(8) After=rpcbind.service Requires=rpcbind.service +Before=nfs-server.target +PartOf=nfs-server.target [Service] Type=forking diff --git a/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount index 4bd440f24..c41665822 100644 --- a/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount +++ b/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount @@ -1,5 +1,5 @@ [Unit] -Description=RPC pipe filesystem +Description=RPC Pipe File System [Mount] What=rpc_pipefs diff --git a/core/pth/PKGBUILD b/core/pth/PKGBUILD index 96f3c09b4..5ca69241e 100644 --- a/core/pth/PKGBUILD +++ b/core/pth/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 197839 2013-10-30 11:06:47Z allan $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 203545 2014-01-13 14:20:07Z dan $ pkgname=pth pkgver=2.0.7 -pkgrel=4 +pkgrel=5 pkgdesc="The GNU Portable Threads." arch=('i686' 'x86_64') url="http://www.gnu.org/software/pth/" diff --git a/core/systemd/0001-Make-hibernation-test-work-for-swap-files.patch b/core/systemd/0001-Make-hibernation-test-work-for-swap-files.patch new file mode 100644 index 000000000..e780e01b6 --- /dev/null +++ b/core/systemd/0001-Make-hibernation-test-work-for-swap-files.patch @@ -0,0 +1,28 @@ +From 0c6f1f4ea4980ff719979d36f10bd6ea3e464c02 Mon Sep 17 00:00:00 2001 +From: Jan Janssen <medhefgo@web.de> +Date: Thu, 31 Oct 2013 17:22:03 +0100 +Subject: [PATCH] Make hibernation test work for swap files + +Suspend to disk works for swap files too (even if it is located +on an ecrypted file system): +https://www.kernel.org/doc/Documentation/power/swsusp-and-swap-files.txt +--- + src/shared/sleep-config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c +index d068bfc..2bb0493 100644 +--- a/src/shared/sleep-config.c ++++ b/src/shared/sleep-config.c +@@ -206,7 +206,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) { + if (!d) + return -ENOMEM; + +- if (!streq(type, "partition")) { ++ if (!streq(type, "partition") && !streq(type, "file")) { + log_debug("Partition %s has type %s, ignoring.", d, type); + continue; + } +-- +1.8.5.2 + diff --git a/core/systemd/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch b/core/systemd/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch new file mode 100644 index 000000000..2594d5066 --- /dev/null +++ b/core/systemd/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch @@ -0,0 +1,26 @@ +From f576cd2092bc40f9998415cdc3caf10035d4743a Mon Sep 17 00:00:00 2001 +From: Pavel Holica <conscript89@gmail.com> +Date: Wed, 6 Nov 2013 23:24:16 +0100 +Subject: [PATCH] acpi-fpdt: break on zero or negative length read + +https://bugzilla.redhat.com/show_bug.cgi?id=1027478 +--- + src/shared/acpi-fpdt.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c +index 75648b4..7bae47f 100644 +--- a/src/shared/acpi-fpdt.c ++++ b/src/shared/acpi-fpdt.c +@@ -109,6 +109,8 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) { + for (rec = (struct acpi_fpdt_header *)(buf + sizeof(struct acpi_table_header)); + (char *)rec < buf + l; + rec = (struct acpi_fpdt_header *)((char *)rec + rec->length)) { ++ if (rec->length <= 0) ++ break; + if (rec->type != ACPI_FPDT_TYPE_BOOT) + continue; + if (rec->length != sizeof(struct acpi_fpdt_header)) +-- +1.8.5.2 + diff --git a/core/systemd/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch b/core/systemd/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch new file mode 100644 index 000000000..e0f3d4ce3 --- /dev/null +++ b/core/systemd/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch @@ -0,0 +1,33 @@ +From 92e94a2b145eb3bee7035907cd8482285bb680ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> +Date: Sun, 22 Dec 2013 09:17:14 +0100 +Subject: [PATCH] fstab-generator: Do not try to fsck non-devices + +This fixes a regression introduced in 64e70e4 where the mount fails +when fstab is misconfigured with fs_passno > 0 on a virtual file +system like nfs, and the type is specified as "auto". + +This is a backport of e2f123b97, but it since not all fsck-related patches +have been backported to this version, the implementation is a bit different. +--- + src/fstab-generator/fstab-generator.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c +index c0c2992..cf8b371 100644 +--- a/src/fstab-generator/fstab-generator.c ++++ b/src/fstab-generator/fstab-generator.c +@@ -210,7 +210,9 @@ static int add_mount( + post); + + if (passno > 0) { +- if (streq(where, "/")) { ++ if(!is_device_path(what)) { ++ log_warning("Checking was requested for \"%s\", but it is not a device.", what); ++ } else if (streq(where, "/")) { + lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL); + if (!lnk) + return log_oom(); +-- +1.8.5.2 + diff --git a/core/systemd/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch b/core/systemd/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch new file mode 100644 index 000000000..6e7f37bfe --- /dev/null +++ b/core/systemd/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch @@ -0,0 +1,41 @@ +From 77009452cfd25208509b14ea985e81fdf9f7d40e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Thu, 3 Oct 2013 22:15:08 -0400 +Subject: [PATCH] systemd: order remote mounts from mountinfo before + remote-fs.target + +Usually the network is stopped before filesystems are umounted. +Ordering network filesystems before remote-fs.target means that their +unmounting will be performed earlier, and can terminate sucessfully. + +https://bugs.freedesktop.org/show_bug.cgi?id=70002 +--- + src/core/mount.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 3d46557..93bfa99 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -1440,6 +1440,9 @@ static int mount_add_one( + + u = manager_get_unit(m, e); + if (!u) { ++ const char* const target = ++ fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET; ++ + delete = true; + + u = unit_new(m, sizeof(Mount)); +@@ -1466,7 +1469,7 @@ static int mount_add_one( + goto fail; + } + +- r = unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_LOCAL_FS_TARGET, NULL, true); ++ r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true); + if (r < 0) + goto fail; + +-- +1.8.5.2 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index a109f375d..a194968ef 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,10 +4,10 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=208 -pkgrel=3 +pkgrel=10 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" -makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' +makedepends=('acl' 'cryptsetup' 'libdbus' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('strip' 'debug') @@ -15,6 +15,8 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' + '0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch' + '0001-Make-hibernation-test-work-for-swap-files.patch' '0001-fix-lingering-references-to-var-lib-backlight-random.patch' '0001-mount-check-for-NULL-before-reading-pm-what.patch' '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch' @@ -25,11 +27,15 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch' '0005-mount-service-drop-FsckPassNo-support.patch' '0006-efi-boot-generator-hookup-to-fsck.patch' - '0007-fsck-root-only-run-when-requested-in-fstab.patch') + '0007-fsck-root-only-run-when-requested-in-fstab.patch' + '0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch' + '0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch') md5sums=('df64550d92afbffb4f67a434193ee165' '29245f7a240bfba66e2b1783b63b6b40' '8b68b0218a3897d4d37a6ccf47914774' 'bde43090d4ac0ef048e3eaee8202a407' + '8f1182afa1156f0076a912b23e761e02' + 'a5c6564d5435ee99814effd2aa9baf93' '1b191c4e7a209d322675fd199e3abc66' 'a693bef63548163ffc165f4c4801ebf7' 'ccafe716d87df9c42af0d1960b5a4105' @@ -40,10 +46,13 @@ md5sums=('df64550d92afbffb4f67a434193ee165' '2096f33bd36dfa0a7f0431d0a429787a' 'd2481a6ea199b581e243a950125b0ca6' 'c2aee634a3a6c50778968f0d5c756f40' - 'ef8b8212d504bb73c10bf4e85f0703b2') + 'ef8b8212d504bb73c10bf4e85f0703b2' + '4ba2317bf4d7708fca406f49482b1bf3' + '078f10d6fc315b329844cd20fa742eee') prepare() { cd "$pkgname-$pkgver" + patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch @@ -59,6 +68,14 @@ prepare() { patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch + # Fix FS#38210 (result of the previous backport) + patch -Np1 < "$srcdir"/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch + # Fix FS#38123 + patch -Np1 < "$srcdir"/0001-Make-hibernation-test-work-for-swap-files.patch + # Fix FS#35671 + patch -Np1 <"$srcdir"/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch + # Fix FS#38403 + patch -Np1 <"$srcdir"/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch autoreconf } @@ -117,8 +134,6 @@ package_systemd() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - # fix .so links in manpage stubs find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} + diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index 1e79585d7..38a28f2c9 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -1,7 +1,7 @@ #!/bin/sh sd_booted() { - [ -e sys/fs/cgroup/systemd ] + [[ -d /run/systemd/systemd/ ]] } add_privs() { @@ -11,6 +11,12 @@ add_privs() { fi } +add_journal_acls() { + # ignore errors, since the filesystem might not support ACLs + setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ 2>/dev/null + : +} + post_common() { systemd-machine-id-setup @@ -54,6 +60,8 @@ _208_changes() { post_install() { post_common + add_journal_acls + # enable getty@tty1 by default, but don't track the file systemctl enable getty@tty1.service @@ -115,6 +123,10 @@ post_upgrade() { if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then _208_changes fi + + if [ "$(vercmp 208-8 "$2")" -eq 1 ]; then + add_journal_acls + fi } # vim:set ts=2 sw=2 et: |