From 3a0439ec6aea4411ac6d11c90cd8220f8f12a660 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Jan 2012 23:14:45 +0000 Subject: Wed Jan 11 23:14:45 UTC 2012 --- core/ed/PKGBUILD | 18 ++--- ...mnt-support-alternative-location-of-fstab.patch | 77 ++++++++++++++++++++++ core/util-linux/PKGBUILD | 13 ++-- 3 files changed, 93 insertions(+), 15 deletions(-) create mode 100644 core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch (limited to 'core') diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 00971c5f7..dac07e317 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142294 2011-11-08 00:38:03Z dreisner $ +# $Id: PKGBUILD 146434 2012-01-11 04:50:27Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Andreas Radke pkgname=ed -pkgver=1.5 -pkgrel=4 +pkgver=1.6 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') @@ -12,10 +12,10 @@ 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=('e66c03d7e4c67b025d5b6093ec678267') +md5sums=('9a78593decccaa889523aa4bb555ed4b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/ \ --mandir=/usr/share/man \ @@ -27,15 +27,11 @@ build() { } check() { - cd "$srcdir/$pkgname-$pkgver" - - make check + make -C "$pkgname-$pkgver" check } package() { - cd "$srcdir/$pkgname-$pkgver" - - make "DESTDIR=$pkgdir" install + make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install # nuke info pages rm -r "$pkgdir/usr/share/info" diff --git a/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch b/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch new file mode 100644 index 000000000..993650b2c --- /dev/null +++ b/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch @@ -0,0 +1,77 @@ +From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Sun, 11 Dec 2011 13:58:05 -0500 +Subject: [PATCH] findmnt: support alternative location of fstab + +Signed-off-by: Dave Reisner +Signed-off-by: Karel Zak +--- + misc-utils/findmnt.8 | 6 ++++-- + misc-utils/findmnt.c | 9 +++++---- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8 +index 24e3a52..7f3dc6c 100644 +--- a/misc-utils/findmnt.8 ++++ b/misc-utils/findmnt.8 +@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default. + .SH OPTIONS + .IP "\fB\-h, \-\-help\fP" + Print help and exit. +-.IP "\fB\-s, \-\-fstab\fP" ++.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP" + Search in + .IR /etc/fstab + and + .IR /etc/fstab.d . +-The output is in the list format (see --list). ++The output is in the list format (see --list). Optionally, search the file ++specified by ++.IR fstab . + .IP "\fB\-m, \-\-mtab\fP" + Search in + .IR /etc/mtab . +diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c +index 4577dc6..5502a87 100644 +--- a/misc-utils/findmnt.c ++++ b/misc-utils/findmnt.c +@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) + + fprintf(out, _( + "\nOptions:\n" +- " -s, --fstab search in static table of filesystems\n" ++ " -s, --fstab[=] search in static table of filesystems\n" + " -m, --mtab search in table of mounted filesystems\n" + " -k, --kernel search in kernel table of mounted\n" + " filesystems (default)\n\n")); +@@ -839,7 +839,7 @@ int main(int argc, char *argv[]) + { "direction", 1, 0, 'd' }, + { "evaluate", 0, 0, 'e' }, + { "first-only", 0, 0, 'f' }, +- { "fstab", 0, 0, 's' }, ++ { "fstab", 2, 0, 's' }, + { "help", 0, 0, 'h' }, + { "invert", 0, 0, 'i' }, + { "kernel", 0, 0, 'k' }, +@@ -872,7 +872,8 @@ int main(int argc, char *argv[]) + tt_flags |= TT_FL_TREE; + + while ((c = getopt_long(argc, argv, +- "acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) { ++ "acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:", ++ longopts, NULL)) != -1) { + switch(c) { + case 'a': + tt_flags |= TT_FL_ASCII; +@@ -938,7 +939,7 @@ int main(int argc, char *argv[]) + case 's': /* fstab */ + if (tabfile) + errx_mutually_exclusive("--{fstab,mtab,kernel}"); +- tabfile = _PATH_MNTTAB; ++ tabfile = optarg ? optarg : _PATH_MNTTAB; + tt_flags &= ~TT_FL_TREE; + break; + case 'k': /* kernel (mountinfo) */ +-- +1.7.8.1 + diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 002fa77fb..26faab001 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141022 2011-10-21 21:39:17Z tomegun $ +# $Id: PKGBUILD 146393 2012-01-10 11:39:59Z tomegun $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux pkgver=2.20.1 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64') @@ -16,7 +16,8 @@ provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') #source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2 + 0001-findmnt-support-alternative-location-of-fstab.patch) optdepends=('perl: for chkdupexe support') build() { @@ -25,6 +26,9 @@ build() { # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h + # backport patch needed for usr support in initramfs + patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch + ./configure --enable-arch\ --enable-write\ --enable-raw\ @@ -42,4 +46,5 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('079b37517fd4e002a2e6e992e8b4e361') +md5sums=('079b37517fd4e002a2e6e992e8b4e361' + '823e2d87885b81f245b8c368e28f8cab') -- cgit v1.2.3-54-g00ecf