ports/core
4
3
Fork 0
Code Issues 4 Pull Requests Activity

util-linux: updated to 2.13-pre7

Browse Source
This commit is contained in:
Simone Rota 2006-11-20 18:49:25 +00:00
parent fda7133c6c
commit 0234ff8a79
5 changed files with 38 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util-linux/.footprint
View File

@ -1,5 +1,4 @@
drwxr-xr-x root/root bin/
-rwxr-xr-x root/root bin/arch
-rwxr-xr-x root/root bin/dmesg
-rwxr-xr-x root/root bin/kill
-rwxr-xr-x root/root bin/more
@ -7,7 +6,6 @@ drwxr-xr-x root/root bin/
-rwsr-xr-x root/root bin/umount
drwxr-xr-x root/root etc/
-rw-r--r-- root/root etc/adjtime (EMPTY)
-rw-r--r-- root/root etc/fdprm
drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/agetty
-rwxr-xr-x root/root sbin/blockdev
@ -28,6 +26,7 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/cal
-rwxr-xr-x root/root usr/bin/chkdupexe
-rwxr-xr-x root/root usr/bin/chrt
-rwxr-xr-x root/root usr/bin/col
-rwxr-xr-x root/root usr/bin/colcrt
-rwxr-xr-x root/root usr/bin/colrm
@ -38,6 +37,7 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/flock
-rwxr-xr-x root/root usr/bin/getopt
-rwxr-xr-x root/root usr/bin/hexdump
-rwxr-xr-x root/root usr/bin/ionice
-rwxr-xr-x root/root usr/bin/ipcrm
-rwxr-xr-x root/root usr/bin/ipcs
-rwxr-xr-x root/root usr/bin/isosize
@ -52,18 +52,20 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/renice
-rwxr-xr-x root/root usr/bin/rev
-rwxr-xr-x root/root usr/bin/script
-rwxr-xr-x root/root usr/bin/setfdprm
-rwxr-xr-x root/root usr/bin/scriptreplay
-rwxr-xr-x root/root usr/bin/setsid
-rwxr-xr-x root/root usr/bin/setterm
-rwxr-xr-x root/root usr/bin/tailf
-rwxr-xr-x root/root usr/bin/taskset
-rwxr-xr-x root/root usr/bin/ul
-rwxr-sr-x root/tty usr/bin/wall
-rwxr-xr-x root/root usr/bin/whereis
-rwxr-sr-x root/tty usr/bin/write
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/arch.1.gz
-rw-r--r-- root/root usr/man/man1/cal.1.gz
-rw-r--r-- root/root usr/man/man1/chkdupexe.1.gz
-rw-r--r-- root/root usr/man/man1/chrt.1.gz
-rw-r--r-- root/root usr/man/man1/col.1.gz
-rw-r--r-- root/root usr/man/man1/colcrt.1.gz
-rw-r--r-- root/root usr/man/man1/colrm.1.gz
@ -72,6 +74,7 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/flock.1.gz
-rw-r--r-- root/root usr/man/man1/getopt.1.gz
-rw-r--r-- root/root usr/man/man1/hexdump.1.gz
-rw-r--r-- root/root usr/man/man1/ionice.1.gz
-rw-r--r-- root/root usr/man/man1/kill.1.gz
-rw-r--r-- root/root usr/man/man1/line.1.gz
-rw-r--r-- root/root usr/man/man1/logger.1.gz
@ -86,7 +89,9 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/script.1.gz
-rw-r--r-- root/root usr/man/man1/setterm.1.gz
-rw-r--r-- root/root usr/man/man1/tailf.1.gz
-rw-r--r-- root/root usr/man/man1/taskset.1.gz
-rw-r--r-- root/root usr/man/man1/ul.1.gz
-rw-r--r-- root/root usr/man/man1/wall.1.gz
-rw-r--r-- root/root usr/man/man1/whereis.1.gz
-rw-r--r-- root/root usr/man/man1/write.1.gz
drwxr-xr-x root/root usr/man/man5/
@ -115,7 +120,6 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/rdev.8.gz
-rw-r--r-- root/root usr/man/man8/renice.8.gz
-rw-r--r-- root/root usr/man/man8/rootflags.8.gz
-rw-r--r-- root/root usr/man/man8/setfdprm.8.gz
-rw-r--r-- root/root usr/man/man8/setsid.8.gz
-rw-r--r-- root/root usr/man/man8/sfdisk.8.gz
-rw-r--r-- root/root usr/man/man8/swapoff.8.gz

4
util-linux/.md5sum
View File

@ -1,2 +1,2 @@
ea870835f5b871772581283a01ddb864 util-linux-2.12r.patch
c261230b27fc0fbcc287c76884caf2d3 util-linux-2.12r.tar.gz
fc53382fd0701f5b026e5ff95e825a0c util-linux-2.13-pre7-nls.patch
3a62bb4bde07a1d4e2cd8ed5f1e2b8a2 util-linux-2.13-pre7.tar.gz

25
util-linux/Pkgfile
View File

@ -1,22 +1,31 @@
# Description: Miscellaneous system utilities
# URL: http://freshmeat.net/projects/util-linux/
# Maintainer: Per Lidén, core-ports at crux dot nu
# Maintainer: Johannes Winkelmann, jw at smts dot ch
# Depends on: e2fsprogs, ncurses, zlib
name=util-linux
version=2.12r
version=2.13-pre7
release=1
source=(http://www.kernel.org/pub/linux/utils/util-linux/$name-$version.tar.gz \
$name-$version.patch)
source=(http://www.kernel.org/pub/linux/utils/util-linux/testing/$name-$version.tar.gz \
$name-$version-nls.patch)
build() {
cd $name-$version
patch -p1 < ../$name-$version.patch
./configure
patch -p1 -i $SRC/$name-$version-nls.patch
./configure --prefix=/ \
--disable-nls \
--disable-elvtune \
--enable-write --enable-rdev --enable-raw --enable-kill
make
make DESTDIR=$PKG install
mkdir -p $PKG/etc
touch $PKG/etc/adjtime
# --mandir didn't work
mv $PKG/usr/share/man $PKG/usr
rm -rf $PKG/usr/{share,man/man6,share/misc/getopt}
rm $PKG/sbin/{mkfs.bfs,mkfs.minix,fsck.minix,elvtune}
rm $PKG/usr/man/man8/{fsck.minix,mkfs.bfs,mkfs.minix,sln,elvtune}.8
rm $PKG/sbin/{mkfs.bfs,mkfs.minix,fsck.minix}
rm $PKG/usr/man/man8/{fsck.minix,mkfs.bfs,mkfs.minix}.8
}

68
util-linux/util-linux-2.12r.patch
View File

@ -1,68 +0,0 @@
diff -ru util-linux-2.12q/MCONFIG util-linux-2.12q-new/MCONFIG
--- util-linux-2.12q/MCONFIG 2004-12-13 00:15:48.000000000 +0100
+++ util-linux-2.12q-new/MCONFIG 2005-02-03 22:28:59.585754816 +0100
@@ -102,7 +102,7 @@
# If HAVE_SLN is set to "yes", then sln won't be installed
# (but the man page sln.8 will be installed anyway).
# sln also comes with libc and glibc.
-HAVE_SLN=no
+HAVE_SLN=yes
# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
HAVE_FDUTILS=no
@@ -114,7 +114,7 @@
# If configure decides that Native Language Support (NLS) is available,
# it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
# DISABLE_NLS to "yes".
-DISABLE_NLS=no
+DISABLE_NLS=yes
# Different optimizations for different cpus.
# Before gcc 2.8.0 only -m486
@@ -177,7 +177,7 @@
BIN_DIR= /bin
VAR_PATH= /var
LOG_DIR= /var/log
-MAN_DIR= /usr/share/man
+MAN_DIR= /usr/man
INFO_DIR= /usr/share/info
#
diff -ru util-linux-2.12q/disk-utils/fsck.cramfs.c util-linux-2.12q-new/disk-utils/fsck.cramfs.c
--- util-linux-2.12q/disk-utils/fsck.cramfs.c 2004-12-11 15:53:16.000000000 +0100
+++ util-linux-2.12q-new/disk-utils/fsck.cramfs.c 2005-02-03 22:28:59.584754968 +0100
@@ -76,7 +76,6 @@
#define PAD_SIZE 512
-#include <asm/page.h>
#ifdef PAGE_SIZE
#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
#elif defined __ia64__
diff -ru util-linux-2.12q/login-utils/agetty.c util-linux-2.12q-new/login-utils/agetty.c
--- util-linux-2.12q/login-utils/agetty.c 2002-07-29 09:36:42.000000000 +0200
+++ util-linux-2.12q-new/login-utils/agetty.c 2005-02-03 22:28:59.586754664 +0100
@@ -72,7 +72,7 @@
#include <time.h>
#endif
-#define LOGIN " login: " /* login prompt */
+#define LOGIN "login: " /* login prompt */
/* Some shorthands for control characters. */
@@ -951,14 +951,6 @@
(void) fclose(fd);
}
#endif
-#ifdef __linux__
- {
- char hn[MAXHOSTNAMELEN+1];
-
- (void) gethostname(hn, MAXHOSTNAMELEN);
- write(1, hn, strlen(hn));
- }
-#endif
(void) write(1, LOGIN, sizeof(LOGIN) - 1); /* always show login prompt */
}

10
util-linux/util-linux-2.13-pre7-nls.patch Normal file
View File

@ -0,0 +1,10 @@
--- util-linux-2.13-pre7/include/nls.h.orig 2005-07-29 00:51:05.000000000 +0200
+++ util-linux-2.13-pre7/include/nls.h 2006-10-02 13:20:20.000000000 +0200
@@ -1,5 +1,7 @@
int main(int argc, char *argv[]);
+#include <locale.h>
+
#ifndef LOCALEDIR
#define LOCALEDIR "/usr/share/locale"
#endif