---- util-linux-2.9v/MCONFIG.MCONFIG Tue Jul 20 02:53:55 1999
-+++ util-linux-2.9v/MCONFIG Tue Jul 27 11:34:38 1999
+diff -urN util-linux-2.11d.org/MCONFIG util-linux-2.11d/MCONFIG
+--- util-linux-2.11d.org/MCONFIG Sun Jun 3 21:42:36 2001
++++ util-linux-2.11d/MCONFIG Sun Jun 3 21:42:47 2001
@@ -16,17 +16,17 @@
# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
# will use PAM for authentication. Additionally, passwd will not be
# 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.
-@@ -72,7 +72,7 @@
+@@ -83,7 +83,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
- CC= gcc
-
-@@ -111,7 +111,7 @@
+ # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
+ HAVE_FDUTILS=no
+@@ -117,7 +117,7 @@
# SLANGFLAGS=-I/usr/include/slang
# No such subdirectory - slcurses.h lives in /usr/include
# (no extra definition required).
-LIBSLANG=-lslang
+# LIBSLANG=-lslang
-
- DEVDIR= $(DESTDIR)/dev
-@@ -124,13 +124,13 @@
- BINDIR= $(DESTDIR)/bin
- VARPATH= $(DESTDIR)/var
- LOGDIR= $(DESTDIR)/var/log
--MANDIR= $(DESTDIR)/usr/man
-+MANDIR= $(DESTDIR)/usr/share/man
- MAN1DIR= $(MANDIR)/man1
- MAN3DIR= $(MANDIR)/man3
- MAN5DIR= $(MANDIR)/man5
- MAN6DIR= $(MANDIR)/man6
- MAN8DIR= $(MANDIR)/man8
--INFODIR= $(DESTDIR)/usr/info
-+INFODIR= $(DESTDIR)/usr/share/info
-
- # Directory for shutdown, halt, reboot, etc.
- SHUTDOWNDIR= $(SBINDIR)
-@@ -147,7 +147,7 @@
+ #
+ # Paths used for compilation (not all are actually used, see CFLAGS below)
+@@ -175,7 +175,7 @@
MANMODE= 644
DATMODE= 644
INFOMODE= 644
CHMOD= chmod
INSTALL= install
-@@ -155,7 +155,7 @@
+@@ -183,7 +183,7 @@
INSTALLBIN= $(INSTALL) -m $(BINMODE)
INSTALLMAN= $(INSTALL) -m $(MANMODE)
INSTALLDAT= $(INSTALL) -m $(DATMODE)
-INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root
+INSTALLSUID= $(INSTALL) -m $(SUIDMODE)
- %.o: %.c
- $(CC) -c $(CFLAGS) $< -o $@
+ CFLAGS := $(CFLAGS) $(OPT) -I$(LIB) $(WARNFLAGS) \
+ $(CURSESFLAGS) $(SLANGFLAGS) \
---- util-linux-2.10a/lib/pathnames.h.wiget Fri Nov 12 00:24:49 1999
-+++ util-linux-2.10a/lib/pathnames.h Fri Nov 12 00:47:51 1999
+diff -urN util-linux-2.11d.org/lib/pathnames.h util-linux-2.11d/lib/pathnames.h
+--- util-linux-2.11d.org/lib/pathnames.h Sun Jun 3 21:48:00 2001
++++ util-linux-2.11d/lib/pathnames.h Sun Jun 3 21:48:47 2001
@@ -86,6 +86,10 @@
#define LOGDIR "/var/log"
#endif
#define _PATH_UTMP "/var/run/utmpx"
#define _PATH_WTMP LOGDIR "/wtmpx"
-#define _PATH_WTMPLOCK "/etc/wtmplock"
-+#define _PATH_WTMPLOCK "/var/log/wtmpxlock"
++#define _PATH_WTMPLOCK VARPATH "/lock/wtmplock"
/* no more . in DEFPATH */
#define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
#endif
#define _PATH_MOTDFILE "/etc/motd"
#define _PATH_NOLOGIN "/etc/nologin"
-@@ -142,5 +146,5 @@
- #define _PATH_GTMPTMP "/etc/gtmptmp"
-
- /* used in misc-utils/look.c */
--#define _PATH_WORDS "/usr/dict/words"
--#define _PATH_WORDS_ALT "/usr/dict/web2"
-+#define _PATH_WORDS "/usr/share/dict/words"
-+#define _PATH_WORDS_ALT "/usr/share/dict/web2"
+diff -urN util-linux-2.11d.org/lib/pathnames.h.orig util-linux-2.11d/lib/pathnames.h.orig
+--- util-linux-2.11d.org/lib/pathnames.h.orig Sun Jun 3 21:48:00 2001
++++ util-linux-2.11d/lib/pathnames.h.orig Thu Jan 1 01:00:00 1970
+@@ -1,152 +0,0 @@
+-/*
+- * Vaguely based on
+- * @(#)pathnames.h 5.3 (Berkeley) 5/9/89
+- * This code is in the public domain.
+- */
+-#include <paths.h>
+-
+-#ifndef __STDC__
+-# error "we need an ANSI compiler"
+-#endif
+-
+-/* The paths for some of these are wrong in /usr/include/paths.h,
+- but we re-define them here. */
+-
+-/* Used in login.c, agetty.c, simpleinit.c, shutdown.c, write.c */
+-#undef _PATH_UTMP
+-/* Used in login.c, agetty.c, simpleinit.c, shutdown.c, last.c */
+-#undef _PATH_WTMP
+-/* These four are used in login.c only */
+-#undef _PATH_DEFPATH
+-#undef _PATH_DEFPATH_ROOT
+-#undef _PATH_LASTLOG
+-
+-/*
+- * HISTORY
+- *
+-What is the history of these six, and related defines?
+-------------------------------------------------------------------------
+-_PATH_UTMP and UTMP_FILE and UTMP_FILENAME
+- /etc/utmp > /var/adm/utmp > /var/run/utmp.
+-Traditionally we have /etc/utmp.
+-In <paths.h> we have /etc/utmp, but since 4.6.0 /var/adm/utmp
+-and since 5.0.9 (and in glibc2) /var/run/utmp.
+-In login/pathnames.h we have /etc/utmp, but since 4.6.6 /var/adm/utmp.
+-In <utmp.h> UTMP_FILE is defined as /etc/utmp, but in 4.6.* as _PATH_UTMP.
+-
+-_PATH_WTMP and WTMP_FILE and WTMP_FILENAME
+- /etc/wtmp > /usr/adm/wtmp > /var/adm/wtmp > /var/log/wtmp.
+-Traditionally we have /etc/wtmp.
+-In <paths.h> we have /usr/adm/wtmp, but since 4.5.13 /var/adm/wtmp,
+-and since 5.0.9 (and in glibc2) /var/log/wtmp.
+-In login/pathnames.h. we have /etc/wtmp, but since 4.6.6 /var/adm/wtmp.
+-In <utmp.h> WTMP_FILE is defined as /usr/adm/wtmp, but in 4.5.* as
+-/var/adm/wtmp, and in 4.6.* as _PATH_WTMP.
+-
+-_PATH_DEFPATH
+-Long ago this was ".:/bin:/usr/bin".
+-In <paths.h> libc 4.4.1-4.4.4 have "/usr/bin:/bin"
+-and libc 4.5.21-5.4.23 have "/usr/local/bin:/usr/bin:/bin:."
+-and libc 5.4.38-5.4.46 have "/usr/local/bin:/usr/bin:/bin".
+-In login/pathnames.h libc4 and libc5 have "/usr/local/bin:/bin:/usr/bin:."
+-
+-_PATH_DEFPATH_ROOT
+-Long ago this was identical to _PATH_DEFPATH.
+-In <paths.h> no definition is present before libc 4.5.13.
+-Libc 4.5.13 has "/bin:/usr/bin:/etc"
+-Libc 4.5.14-5.4.46 have "/sbin:/bin:/usr/sbin:/usr/bin"
+-In login/pathnames.h libc4 and libc5 have "/bin:/usr/bin:/etc"
+-
+-_PATH_LASTLOG
+- /etc/lastlog > /usr/adm/lastlog > /var/adm/lastlog > /var/log/lastlog.
+-Traditionally we have /etc/lastlog.
+-In <bsd/utmp.h> libc 4.4.1-4.5.12 have /usr/adm/lastlog, 4.5.13 and
+-later have /var/adm/lastlog.
+-In paths.h all libc5 and glibc2 versions have /var/log/lastlog.
+-In login/pathnames.h all libc4 and libc5 versions have /usr/adm/lastlog.
+-
+-_PATH_MAILDIR
+- /usr/spool/mail > /var/spool/mail > /var/mail.
+-Traditionally we have /usr/spool/mail.
+-In <paths.h> we have /usr/spool/mail, but since libc 4.5.13 /var/spool/mail.
+-In login/pathnames.h all libc4 versions have /var/spool/mail.
+-Libc5 and glibc 2.0-2.1 have /var/spool/mail, but glibc 2.1.1 has /var/mail.
+-------------------------------------------------------------------------*/
+-
+-
+-#ifndef SBINDIR
+-#define SBINDIR "/sbin"
+-#endif
+-
+-#ifndef USRSBINDIR
+-#define USRSBINDIR "/usr/sbin"
+-#endif
+-
+-#ifndef LOGDIR
+-#define LOGDIR "/var/log"
+-#endif
+-
+-#ifndef VARPATH
+-#define VARPATH "/var"
+-#endif
+-
+-#ifndef UT_NAMESIZE
+-#define UT_NAMESIZE 8
+-#endif
+-
+-#define _PATH_BSHELL "/bin/sh"
+-#define _PATH_CSHELL "/bin/csh"
+-#define _PATH_TTY "/dev/tty"
+-#define TTYTYPES "/etc/ttytype"
+-#define SECURETTY "/etc/securetty"
+-#define _PATH_UTMP "/var/run/utmp"
+-#define _PATH_WTMP LOGDIR "/wtmp"
+-#define _PATH_WTMPLOCK "/etc/wtmplock"
+-
+-/* no more . in DEFPATH */
+-#define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
+-#define _PATH_DEFPATH_ROOT SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
+-#define _PATH_HUSHLOGIN ".hushlogin"
+-#define _PATH_LASTLOG LOGDIR "/lastlog"
+-
+-#ifndef _PATH_MAILDIR
+-#define _PATH_MAILDIR VARPATH "/spool/mail"
+-#endif
+-#define _PATH_MOTDFILE "/etc/motd"
+-#define _PATH_NOLOGIN "/etc/nologin"
+-
+-#define _PATH_LOGIN "/bin/login"
+-#define _PATH_INITTAB "/etc/inittab"
+-#define _PATH_RC "/etc/rc"
+-#define _PATH_REBOOT SBINDIR "/reboot"
+-#define _PATH_SINGLE "/etc/singleboot"
+-#define _PATH_SHUTDOWN_CONF "/etc/shutdown.conf"
+-
+-#define _PATH_SECURE "/etc/securesingle"
+-#define _PATH_USERTTY "/etc/usertty"
+-
+-/* used in login-utils/shutdown.c */
+-#define _PATH_MTAB "/etc/mtab"
+-#define _PATH_UMOUNT "/bin/umount"
+-#define UMOUNT_ARGS "umount", "-a", "-t", "nodevfs"
+-#define SWAPOFF_ARGS "swapoff", "-a"
+-
+-/* used in login-utils/setpwnam.h and login-utils/islocal.c */
+-#define _PATH_PASSWD "/etc/passwd"
+-
+-/* used in login-utils/setpwnam.h */
+-#define _PATH_PTMP "/etc/ptmp"
+-#define _PATH_PTMPTMP "/etc/ptmptmp"
+-#define _PATH_GROUP "/etc/group"
+-#define _PATH_GTMP "/etc/gtmp"
+-#define _PATH_GTMPTMP "/etc/gtmptmp"
+-#define _PATH_SHADOW_PASSWD "/etc/shadow"
+-#define _PATH_SHADOW_PTMP "/etc/sptmp"
+-#define _PATH_SHADOW_PTMPTMP "/etc/sptmptmp"
+-#define _PATH_SHADOW_GROUP "/etc/gshadow"
+-#define _PATH_SHADOW_GTMP "/etc/sgtmp"
+-#define _PATH_SHADOW_GTMPTMP "/etc/sgtmptmp"
+-
+-/* used in misc-utils/look.c */
+-#define _PATH_WORDS "/usr/share/dict/words"
+-#define _PATH_WORDS_ALT "/usr/share/dict/web2"
-diff -Nru util-linux-2.10l/sys-utils/ipc.texi util-linux-2.10l.new/sys-utils/ipc.texi
---- util-linux-2.10l/sys-utils/ipc.texi Thu May 4 23:25:42 2000
-+++ util-linux-2.10l.new/sys-utils/ipc.texi Thu May 4 23:26:00 2000
-@@ -31,6 +31,14 @@
- @end titlepage
-
+diff -urN util-linux-2.11d.org/sys-utils/ipc.texi util-linux-2.11d/sys-utils/ipc.texi
+--- util-linux-2.11d.org/sys-utils/ipc.texi Sun Jun 3 21:54:08 2001
++++ util-linux-2.11d/sys-utils/ipc.texi Sun Jun 3 21:54:17 2001
+@@ -103,6 +103,14 @@
+ the creator, owner, access perms ..etc.., for the resource.
+ These structures are detailed in the following sections.@refill
+@ifinfo
+@format
+@end format
+@end ifinfo
- @node top, Overview, Notes, (dir)
- @chapter System V IPC.
-@@ -91,8 +99,8 @@
- There are system and implementation defined limits on the number and
- sizes of resources of any given type. Some of these are imposed by the
- implementation and others by the system administrator
--when configuring the kernel (@xref{msglimits}, @xref{semlimits},
--@xref{shmlimits}).@refill
-+when configuring the kernel
-+@xref{msglimits}, @xref{semlimits}, @xref{shmlimits}.@refill
- There is an @code{msqid_ds}, @code{semid_ds} or @code{shmid_ds} struct
- associated with each message queue, semaphore array or shared segment.
-@@ -355,7 +363,7 @@
+ @node example, perms, Overview, Overview
+@@ -358,7 +366,7 @@
@example
struct msgbuf
char mtext[1]; message text .. why is this not a ptr?
@end example
-@@ -558,7 +566,7 @@
+@@ -561,7 +569,7 @@
@item
buf : allocated by user for reading/writing info.
@item
@end itemize
IPC_STAT results in the copy of the queue data structure
-@@ -1149,7 +1157,7 @@
+@@ -1152,7 +1160,7 @@
@item
shmid : id got from call to shmget.
@item
---- util-linux-2.10l/lib/pathnames.h.wiget Wed Apr 26 20:17:29 2000
-+++ util-linux-2.10l/lib/pathnames.h Wed Apr 26 20:17:29 2000
-@@ -105,7 +105,7 @@
- #define SECURETTY "/etc/securetty"
- #define _PATH_UTMP "/var/run/utmpx"
- #define _PATH_WTMP LOGDIR "/wtmpx"
--#define _PATH_WTMPLOCK "/var/log/wtmpxlock"
-+#define _PATH_WTMPLOCK "/var/lock/wtmpxlock"
-
- /* no more . in DEFPATH */
- #define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
---- util-linux-2.10l/login-utils/login.c.wiget Tue Mar 21 00:18:38 2000
-+++ util-linux-2.10l/login-utils/login.c Wed Apr 26 20:22:32 2000
-@@ -154,7 +154,7 @@
+diff -urN util-linux-2.11d.org/login-utils/login.c util-linux-2.11d/login-utils/login.c
+--- util-linux-2.11d.org/login-utils/login.c Sun May 20 22:27:44 2001
++++ util-linux-2.11d/login-utils/login.c Sun Jun 3 21:49:55 2001
+@@ -156,7 +156,7 @@
#define SLEEP_EXIT_TIMEOUT 5
#define DO_PS_FIDDLING
#endif
-@@ -300,6 +300,40 @@
- return 0;
- }
-
-+#if USE_PAM
-+#define _PATH_BTMPX "/var/log/btmpx"
-+static void logbtmp(const char *line, const char *username, const char *hostname)
-+{
-+ struct utmp ut;
-+
-+ memset(&ut, 0, sizeof(ut));
-+
-+ strncpy(ut.ut_user, username, sizeof(ut.ut_user));
-+
-+ strncpy(ut.ut_id, line + 3, sizeof(ut.ut_id));
-+ strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-+ ut.ut_line[sizeof(ut.ut_line)-1] = 0;
-+
-+#if defined(_HAVE_UT_TV)
-+ gettimeofday(&ut.ut_tv, NULL);
-+#else
-+ time(&t) ;
-+ ut.ut_time = t; /* ut_time is not always a time_t */
-+#endif
-+
-+ ut.ut_type = LOGIN_PROCESS; /* XXX doesn't matter */
-+ ut.ut_pid = getpid();
-+ if (hostname) {
-+ strncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
-+ ut.ut_host[sizeof(ut.ut_host)-1] = 0;
-+ if (hostaddress.h_addr_list)
-+ memcpy(&ut.ut_addr, hostaddress.h_addr_list[0],
-+ sizeof(ut.ut_addr));
-+ }
-+
-+ updwtmp(_PATH_BTMPX, &ut);
-+}
-+#endif /* USE_PAM */
-
- int
- main(int argc, char **argv)
-@@ -485,8 +519,6 @@
- else
- tty = ttyn;
+@@ -515,8 +515,6 @@
+ tcsetattr(0,TCSAFLUSH,&tt);
+ }
- openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
-
#if 0
/* other than iso-8859-1 */
printf("\033(K");
-@@ -555,7 +587,8 @@
- (retcode == PAM_AUTHINFO_UNAVAIL))) {
- pam_get_item(pamh, PAM_USER, (const void **) &username);
- syslog(LOG_NOTICE,_("FAILED LOGIN %d FROM %s FOR %s, %s"),
-- failcount, hostname, username, pam_strerror(pamh, retcode));
-+ failcount, hostname, username, pam_strerror(pamh, retcode));
-+ logbtmp(ttyn + 5, username, hostname);
- fprintf(stderr,_("Login incorrect\n\n"));
- pam_set_item(pamh,PAM_USER,NULL);
- retcode = pam_authenticate(pamh, 0);
-@@ -564,13 +597,16 @@
- if (retcode != PAM_SUCCESS) {
- pam_get_item(pamh, PAM_USER, (const void **) &username);
-
-- if (retcode == PAM_MAXTRIES)
-+ if (retcode == PAM_MAXTRIES) {
- syslog(LOG_NOTICE,_("TOO MANY LOGIN TRIES (%d) FROM %s FOR "
- "%s, %s"), failcount, hostname, username,
- pam_strerror(pamh, retcode));
-- else
-+ logbtmp(ttyn + 5, username, hostname);
-+ } else {
- syslog(LOG_NOTICE,_("FAILED LOGIN SESSION FROM %s FOR %s, %s"),
- hostname, username, pam_strerror(pamh, retcode));
-+ logbtmp(ttyn + 5, username, hostname);
-+ }
-
- fprintf(stderr,_("\nLogin incorrect\n"));
- pam_end(pamh, retcode);
-@@ -600,8 +636,12 @@
- retcode = pam_open_session(pamh, 0);
+@@ -646,8 +644,12 @@
+ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED);
PAM_FAIL_CHECK;
+ openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
for (cnt = 0;; ask = 1) {
# ifndef __linux__
ioctlval = 0;
-@@ -880,7 +920,9 @@
+@@ -866,7 +868,9 @@
/* If we can't find a pre-existing entry by pid, try by line.
BSD network daemons may rely on this. (anonymous) */
if (utp == NULL) {
+ setutent();
+ memset(&ut, 0, sizeof(ut));
ut.ut_type = LOGIN_PROCESS;
- strncpy(ut.ut_id, ttyn + 8, sizeof(ut.ut_id));
- strncpy(ut.ut_line, ttyn + 5, sizeof(ut.ut_line));
-@@ -1127,6 +1169,8 @@
+ strncpy(ut.ut_id, tty_number, sizeof(ut.ut_id));
+ strncpy(ut.ut_line, tty_name, sizeof(ut.ut_line));
+@@ -1103,6 +1107,8 @@
#endif
signal(SIGINT, SIG_DFL);
+++ /dev/null
-diff -urN util-linux-2.11b.org/mount/nfsmount.c util-linux-2.11b/mount/nfsmount.c
---- util-linux-2.11b.org/mount/nfsmount.c Wed Mar 21 10:07:38 2001
-+++ util-linux-2.11b/mount/nfsmount.c Wed Mar 21 10:13:29 2001
-@@ -724,6 +724,16 @@
- server_addr.sin_port = PMAPPORT;
- port = pmap_getport(&server_addr, nfsprog, nfsvers,
- tcp ? IPPROTO_TCP : IPPROTO_UDP);
-+ /* Here we check to see if user is mounting with the tcp
-+ * option. If so, and if the portmap returns a '0' for
-+ * port (service unavailable), we then exit out notifying
-+ * the user, rather than hanging up mount. */
-+
-+ if (port == 0 && tcp == 1) {
-+ perror(_("nfs server reported service unavailable"));
-+ goto fail;
-+ }
-+
- if (port == 0)
- port = NFS_PORT;
- #ifdef NFS_MOUNT_DEBUG
+++ /dev/null
---- util-linux-2.10k/fdisk/fdisksunlabel.c.sparcraid Fri Mar 24 13:47:53 2000
-+++ util-linux-2.10k/fdisk/fdisksunlabel.c Mon Apr 17 10:50:12 2000
-@@ -52,6 +52,9 @@
- {LINUX_SWAP, N_("Linux swap")},
- {LINUX_NATIVE, N_("Linux native")},
- {0x8e, N_("Linux LVM")},
-+ {0xfd, N_("Linux raid autodetect")},/* New (2.2.x) raid partition
-+ with autodetect using
-+ persistent superblock */
- { 0, NULL }
- };
-
projects / packages / util-linux.git / commitdiff