forked from pool/util-linux
87 lines
2.6 KiB
Diff
87 lines
2.6 KiB
Diff
|
--- util-linux-2.12q/configure
|
||
|
|
+++ util-linux-2.12q/configure
|
||
|
|
@@ -59,7 +59,7 @@
|
||
|
|
|
||
|
|
CC=${CC-cc}
|
||
|
|
CFLAGS=${CFLAGS-"-O2"}
|
||
|
|
-LDFLAGS=${LDFLAGS-"-s"}
|
||
|
|
+LDFLAGS=${LDFLAGS-""}
|
||
|
|
echo CC=$CC >> make_include
|
||
|
|
echo CFLAGS=$CFLAGS >> make_include
|
||
|
|
echo LDFLAGS=$LDFLAGS >> make_include
|
||
|
|
--- util-linux-2.12q/MCONFIG
|
||
|
|
+++ util-linux-2.12q/MCONFIG
|
||
|
|
@@ -22,7 +22,7 @@
|
||
|
|
# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
|
||
|
|
# will use PAM for authentication. Additionally, passwd will not be
|
||
|
|
# installed as it is not PAM aware.
|
||
|
|
-HAVE_PAM=no
|
||
|
|
+HAVE_PAM=yes
|
||
|
|
|
||
|
|
# If HAVE_SELINUX is set to "yes", the login will make sure the user is
|
||
|
|
# logged into an appropriate security context
|
||
|
|
@@ -35,7 +35,7 @@
|
||
|
|
|
||
|
|
# If HAVE_PASSWD is set to "yes", then passwd will not be built or
|
||
|
|
# installed from the login-utils subdirectory.
|
||
|
|
-HAVE_PASSWD=no
|
||
|
|
+HAVE_PASSWD=yes
|
||
|
|
|
||
|
|
# If you use chfn and chsh from this package, REQUIRE_PASSWORD will require
|
||
|
|
# non-root users to enter the account password before updating /etc/passwd.
|
||
|
|
@@ -59,7 +59,7 @@
|
||
|
|
# not be built or installed from the login-utils subdirectory. (The
|
||
|
|
# shutdown and init from the SysVinit package do not depend on the last,
|
||
|
|
# mesg, and wall from that package.)
|
||
|
|
-HAVE_SYSVINIT_UTILS=yes
|
||
|
|
+HAVE_SYSVINIT_UTILS=no
|
||
|
|
|
||
|
|
# If HAVE_WRITE is set to "yes", then write will not be built or
|
||
|
|
# installed from the misc-utils subdirectory.
|
||
|
|
@@ -77,7 +77,7 @@
|
||
|
|
# user's tty to "tty" [The login in util-linux does this correctly, and
|
||
|
|
# xterm will do it correctly if X is compiled with USE_TTY_GROUP set
|
||
|
|
# properly.]
|
||
|
|
-USE_TTY_GROUP=yes
|
||
|
|
+USE_TTY_GROUP=no
|
||
|
|
|
||
|
|
# If HAVE_KILL is set to "yes", then kill will not be built or
|
||
|
|
# installed from the misc-utils subdirectory.
|
||
|
|
@@ -141,7 +141,7 @@
|
||
|
|
OPT= -pipe -O2 $(CPUOPT) -fomit-frame-pointer
|
||
|
|
else
|
||
|
|
ifeq "$(ARCH)" "arm"
|
||
|
|
- OPT= -pipe -O2 -fsigned-char -fomit-frame-pointer
|
||
|
|
+ OPT= -pipe -O2 -fomit-frame-pointer
|
||
|
|
else
|
||
|
|
OPT= -O2 -fomit-frame-pointer
|
||
|
|
endif
|
||
|
|
@@ -220,7 +220,7 @@
|
||
|
|
INSTALLBIN= $(INSTALL) -m $(BINMODE)
|
||
|
|
INSTALLMAN= $(INSTALL) -m $(MANMODE)
|
||
|
|
INSTALLDAT= $(INSTALL) -m $(DATMODE)
|
||
|
|
-INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root
|
||
|
|
+INSTALLSUID= $(INSTALL) -m $(SUIDMODE)
|
||
|
|
|
||
|
|
ifeq "$(DISABLE_NLS)" "yes"
|
||
|
|
NLSFLAGS = -DDISABLE_NLS
|
||
|
|
--- util-linux-2.12q/mount/filesystems
|
||
|
|
+++ util-linux-2.12q/mount/filesystems
|
||
|
|
@@ -0,0 +1,5 @@
|
||
|
|
+vfat
|
||
|
|
+hfs
|
||
|
|
+minix
|
||
|
|
+reiserfs
|
||
|
|
+*
|
||
|
|
--- util-linux-2.12q/mount/linux_fs.h
|
||
|
|
+++ util-linux-2.12q/mount/linux_fs.h
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
#define MINIX2_SUPER_MAGIC2 0x2478 /* minix v2, 30 char names */
|
||
|
|
struct minix_super_block {
|
||
|
|
u_char s_dummy[16];
|
||
|
|
- u_char s_magic[2];
|
||
|
|
+ short s_magic[2];
|
||
|
|
};
|
||
|
|
#define minixmagic(s) assemble2le(s.s_magic)
|
||
|
|
|