diff options
| author | root <root@rshg054.dnsready.net> | 2012-12-01 01:52:00 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-12-01 01:52:00 -0800 |
| commit | c31ace4c6175db330d7e4aac1e7388fe5ca5d4f3 (patch) | |
| tree | 305ea12a2bf8d2d9c7a36e52f68dba9fdb801548 /core | |
| parent | 51867161079ab52d5152105142a3bc965c63ca03 (diff) | |
Sat Dec 1 01:48:48 PST 2012
Diffstat (limited to 'core')
| -rw-r--r-- | core/ed/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/mkinitcpio-nfs-utils/PKGBUILD | 15 | ||||
| -rw-r--r-- | core/mkinitcpio-nfs-utils/initcpio-install-net | 1 | ||||
| -rw-r--r-- | core/mkinitcpio-nfs-utils/nfsmount-fix-wrong-umount-path.patch | 14 |
4 files changed, 29 insertions, 7 deletions
diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index dac07e317..8c8ec44c7 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146434 2012-01-11 04:50:27Z dreisner $ +# $Id: PKGBUILD 172178 2012-12-01 00:07:10Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed -pkgver=1.6 +pkgver=1.7 pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.gnu.org/software/ed/ed.html" depends=('glibc' 'sh') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) -md5sums=('9a78593decccaa889523aa4bb555ed4b') +md5sums=('0aa4e2428e325203d0d7c3e86c961b1c') build() { cd "$pkgname-$pkgver" diff --git a/core/mkinitcpio-nfs-utils/PKGBUILD b/core/mkinitcpio-nfs-utils/PKGBUILD index 70166e1db..b2132b07d 100644 --- a/core/mkinitcpio-nfs-utils/PKGBUILD +++ b/core/mkinitcpio-nfs-utils/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 160392 2012-06-01 13:21:36Z dreisner $ +# $Id: PKGBUILD 172177 2012-12-01 00:07:08Z dreisner $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-nfs-utils pkgver=0.3 -pkgrel=3 +pkgrel=4 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" arch=('i686' 'x86_64') url="http://www.archlinux.org/" license=('GPL2') depends=('glibc') source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz" + 'nfsmount-fix-wrong-umount-path.patch' 'initcpio-install-net' 'initcpio-hook-net') sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939' - '8e5ddaacb0e5751e432f95870958c5fa2e01e1ab3f55b5eca2b8b2d030b5d861' + '6edb239f3d541b8ddee816e2d18bfb3ee1d3f5f8827769674cc8bf2a7ce38f21' + 'ce9f021763c020b9b62a761974437fd1e9e894df3effc58e71671bf83b061255' '29a5a4a9ebd61bfa1afbb8dcaf2187e487ee1f34b1979a85a853fa2acbeb510e') build() { - make -C "$pkgname-$pkgver" + cd "$pkgname-$pkgver" + + # upstream commit 029622dfbfe25203275a385a5bf33d44c2409b00 + patch -Np1 < "$srcdir/nfsmount-fix-wrong-umount-path.patch" + + make } package() { diff --git a/core/mkinitcpio-nfs-utils/initcpio-install-net b/core/mkinitcpio-nfs-utils/initcpio-install-net index 7030e2d64..79b678949 100644 --- a/core/mkinitcpio-nfs-utils/initcpio-install-net +++ b/core/mkinitcpio-nfs-utils/initcpio-install-net @@ -2,6 +2,7 @@ build() { add_checked_modules '/drivers/net/' + add_module nfsv3? add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig" add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount" diff --git a/core/mkinitcpio-nfs-utils/nfsmount-fix-wrong-umount-path.patch b/core/mkinitcpio-nfs-utils/nfsmount-fix-wrong-umount-path.patch new file mode 100644 index 000000000..0f62fea82 --- /dev/null +++ b/core/mkinitcpio-nfs-utils/nfsmount-fix-wrong-umount-path.patch @@ -0,0 +1,14 @@ +--- a/nfsmount/mount.c 2012-11-10 20:16:31.894540497 -0500 ++++ b/nfsmount/mount.c 2012-11-10 20:16:39.957369011 -0500 +@@ -358,9 +358,9 @@ + bail: + if (mounted) { + if (data->flags & NFS_MOUNT_VER3) { +- umount_v3(path, clnt); ++ umount_v3(rem_path, clnt); + } else { +- umount_v2(path, clnt); ++ umount_v2(rem_path, clnt); + } + } + |