%n util-linux
%v 2.5
%c *
%l *
%b *
%d *
%f *
%t util-linux-2.5.tgz
%w Linux
%%
%setup
patch -u -p1 <<'ENDPATCH'
diff -ru2N util-linux-2.5/MCONFIG util-linux-MCC/MCONFIG
--- util-linux-2.5/MCONFIG	Thu Oct 12 15:47:09 1995
+++ util-linux-MCC/MCONFIG	Thu Aug 22 19:55:46 1996
@@ -33,5 +33,5 @@
 # and halt that come with the SysVinit package should be used with the init
 # found in that package.)
-HAVE_SYSVINIT=no
+HAVE_SYSVINIT=yes
 #HAVE_SYSVINIT=yes
 
@@ -40,5 +40,5 @@
 # shutdown and init from the SysVinit package do not depend on the last,
 # mesg, and wall from that package.)
-HAVE_SYSVINIT_UTILS=no
+HAVE_SYSVINIT_UTILS=yes
 #HAVE_SYSVINIT_UTILS=yes
 
@@ -46,5 +46,5 @@
 # installed from the login-utils subdirectory.  Note that agetty can
 # co-exist with other gettys, so this option should never be used.
-HAVE_GETTY=no
+HAVE_GETTY=yes
 #HAVE_GETTY=yes
 
@@ -61,15 +61,15 @@
 # is the quick fix until the strings in GNU binutils is in wide use and has
 # internationalization support.
-HAVE_STRINGS=no
+HAVE_STRINGS=yes
 #HAVE_STRINGS=yes
 
 # If HAVE_CLEAR is set to "yes", then clear won't be installed, since a
 # version of clear comes with the ncurses package.
-HAVE_CLEAR=no
+HAVE_CLEAR=yes
 #HAVE_CLEAR=yes
 
 # If HAVE_SYSLOGD is set to "yes", then syslogd will not be built or
 # installed from the syslogd subdirectory.
-HAVE_SYSLOGD=no
+HAVE_SYSLOGD=yes
 #HAVE_SYSLOGD=yes
 
@@ -82,6 +82,6 @@
 
 CC=		gcc
-OPT=		-pipe -O2 -m486 -fomit-frame-pointer
-LDFLAGS=	-s -N
+OPT=		-O6 -fomit-frame-pointer
+LDFLAGS=
 CFLAGS=		$(OPT) -I. -I$(BSD) \
 			-DSBINDIR=\"$(SBINDIR)\" \
@@ -94,7 +94,7 @@
 SBINDIR=	$(DESTDIR)/sbin
 USRSBINDIR=	$(DESTDIR)/usr/sbin
-USRLIBDIR=      $(DESTDIR)/usr/lib
+USRLIBDIR=      $(DESTDIR)/usr/share/misc
 USRBINDIR=      $(DESTDIR)/usr/bin
-USRGAMESDIR=    $(DESTDIR)/usr/games
+USRGAMESDIR=    $(DESTDIR)/usr/bin
 BINDIR=         $(DESTDIR)/bin
 VARPATH=	$(DESTDIR)/var
@@ -118,10 +118,10 @@
 
 # Modes
-DIRMODE=	755
-BINMODE=	755
-MANMODE=	644
-DATMODE=	644
-INFOMODE=	644
-SUIDMODE=      4755
+DIRMODE=	555
+BINMODE=	555 -s
+MANMODE=	444
+DATMODE=	444
+INFOMODE=	444
+SUIDMODE=      4555 -s
 
 CHMOD=		chmod
diff -ru2N util-linux-2.5/Makefile util-linux-MCC/Makefile
--- util-linux-2.5/Makefile	Sat Oct  7 02:38:32 1995
+++ util-linux-MCC/Makefile	Thu Aug 22 19:52:11 1996
@@ -15,5 +15,4 @@
 	login-utils \
 	misc-utils \
-	mount \
 	sys-utils \
 	text-utils
diff -ru2N util-linux-2.5/bsd/pathnames.h util-linux-MCC/bsd/pathnames.h
--- util-linux-2.5/bsd/pathnames.h	Thu Oct 12 17:36:51 1995
+++ util-linux-MCC/bsd/pathnames.h	Thu Aug 22 19:52:11 1996
@@ -67,5 +67,5 @@
 #define	_PATH_HUSHLOGIN		".hushlogin"
 #define	_PATH_LASTLOG		LOGDIR "/lastlog"
-#define	_PATH_MAILDIR		VARPATH "/spool/mail"
+#define	_PATH_MAILDIR		VARPATH "/mail"
 #define	_PATH_MOTDFILE		"/etc/motd"
 #define	_PATH_NOLOGIN		"/etc/nologin"
@@ -88,4 +88,4 @@
 #define _PATH_PTMPTMP           "/etc/ptmptmp"
 
-#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 -ru2N util-linux-2.5/disk-utils/Makefile util-linux-MCC/disk-utils/Makefile
--- util-linux-2.5/disk-utils/Makefile	Sat Oct  7 02:31:48 1995
+++ util-linux-MCC/disk-utils/Makefile	Thu Aug 22 19:54:27 1996
@@ -19,5 +19,5 @@
 SBIN= 		cfdisk fsck.minix mkfs mkfs.minix mkswap
 
-SBIN.FDISK=	fdisk
+SBIN.FDISK=
 
 USRBIN=		fdformat setfdprm
@@ -32,8 +32,8 @@
 endif
 
-all: $(SBIN) $(USRBIN) 
+all: $(SBIN) $(USRBIN) fdisk
 
 cfdisk: cfdisk.o llseek.o
-	$(CC) $(LDFLAGS) $^ -o $@ -lcurses -ltermcap -lm
+	$(CC) $(LDFLAGS) $^ -o $@ -lcurses -lm
 
 # Rules for everything else
@@ -52,8 +52,10 @@
 	$(INSTALLDIR) $(SBINDIR) $(USRBINDIR) $(ETCDIR)
 	$(INSTALLBIN) $(SBIN) $(SBINDIR)
+	$(INSTALLBIN) fdisk $(SBINDIR)/fdisk.old
 	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
 	$(INSTALLDAT) $(ETC) $(ETCDIR)
 	$(INSTALLDIR) $(MAN8DIR)
 	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
+	(cd $(MAN8DIR);mv fdisk.8 fdisk.old.8;gzip -9f *8)
 
 .PHONY:	clean
diff -ru2N util-linux-2.5/disk-utils/fdisk.c util-linux-MCC/disk-utils/fdisk.c
--- util-linux-2.5/disk-utils/fdisk.c	Sat Oct  7 02:31:49 1995
+++ util-linux-MCC/disk-utils/fdisk.c	Thu Sep 11 21:09:52 1996
@@ -929,8 +929,13 @@
 			last[i] = 0;
 		}
-		else {
+		else if (i < 4) {
 			first[i] = rounded(calculate(p->head, p->sector,
 				p->cyl), p->start_sect + offsets[i]);
 			last[i] = p->start_sect + offsets[i] + p->nr_sects - 1;
+		}
+		else {
+			first[i] = p->start_sect + offsets[i];
+			last[i] = p->start_sect + offsets[i] +
+				p->nr_sects - (p->nr_sects ? 1: 0);
 		}
 }
diff -ru2N util-linux-2.5/disk-utils/mkfs.c util-linux-MCC/disk-utils/mkfs.c
--- util-linux-2.5/disk-utils/mkfs.c	Sun Jun  4 02:46:21 1995
+++ util-linux-MCC/disk-utils/mkfs.c	Thu Aug 22 19:52:11 1996
@@ -21,9 +21,8 @@
 
 #ifndef DEFAULT_FSTYPE
-# define DEFAULT_FSTYPE		"minix"
+# define DEFAULT_FSTYPE		"ext2"
 #endif
 
-#define SEARCH_PATH	"PATH=/sbin:/sbin/fs.d:/sbin/fs:/etc/fs:/etc"
-#define PROGNAME	"mkfs.%s"
+#define PROGNAME	"/sbin/mkfs.%s"
 
 
@@ -59,5 +58,4 @@
 
   /* Set PATH and program name */
-  putenv(SEARCH_PATH);
   sprintf(progname, PROGNAME, fstype);
   argv[--optind] = progname;
@@ -74,5 +72,5 @@
 
   /* Execute the program */
-  execvp(progname, argv+optind);
+  execv(progname, argv+optind);
   perror(progname);
   return 1;
diff -ru2N util-linux-2.5/games/Makefile util-linux-MCC/games/Makefile
--- util-linux-2.5/games/Makefile	Sat Oct  7 02:31:53 1995
+++ util-linux-MCC/games/Makefile	Thu Sep 12 01:09:13 1996
@@ -29,4 +29,5 @@
 	$(INSTALLDIR) $(MAN6DIR)
 	$(INSTALLMAN) $(MAN6) $(MAN6DIR)
+	gzip -9f $(MAN6DIR)/$(MAN6)
 
 clean:
diff -ru2N util-linux-2.5/login-utils/Makefile util-linux-MCC/login-utils/Makefile
--- util-linux-2.5/login-utils/Makefile	Thu Oct 12 15:46:34 1995
+++ util-linux-MCC/login-utils/Makefile	Thu Aug 22 19:52:11 1996
@@ -120,4 +120,5 @@
 
 install: all $(WHAT_TO_INSTALL)
+	gzip -9f /usr/man/man1/*.1 /usr/man/man8/*.8
 
 install-putils: $(BIN.PUTILS) $(USRBIN.PUTILS) $(USRSBIN.PUTILS)
diff -ru2N util-linux-2.5/login-utils/login.c util-linux-MCC/login-utils/login.c
--- util-linux-2.5/login-utils/login.c	Tue Sep 26 17:24:28 1995
+++ util-linux-MCC/login-utils/login.c	Thu Aug 22 19:52:11 1996
@@ -150,6 +150,4 @@
 void timedout P_((void));
 int rootterm P_((char *ttyn));
-void motd P_((void));
-void sigint P_((void));
 void checknologin P_((void));
 void dolastlog P_((int quiet));
@@ -724,5 +722,4 @@
 		struct stat st;
 
-		motd();
 		(void)sprintf(tbuf, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
 		if (stat(tbuf, &st) == 0 && st.st_size != 0)
@@ -873,28 +870,4 @@
 }
 #endif
-
-jmp_buf motdinterrupt;
-
-void
-motd()
-{
-	register int fd, nchars;
-	void (*oldint)(), sigint();
-	char tbuf[8192];
-
-	if ((fd = open(_PATH_MOTDFILE, O_RDONLY, 0)) < 0)
-		return;
-	oldint = signal(SIGINT, sigint);
-	if (setjmp(motdinterrupt) == 0)
-		while ((nchars = read(fd, tbuf, sizeof(tbuf))) > 0)
-			(void)write(fileno(stdout), tbuf, nchars);
-	(void)signal(SIGINT, oldint);
-	(void)close(fd);
-}
-
-void sigint()
-{
-	longjmp(motdinterrupt, 1);
-}
 
 void
diff -ru2N util-linux-2.5/misc-utils/Makefile util-linux-MCC/misc-utils/Makefile
--- util-linux-2.5/misc-utils/Makefile	Sat Oct  7 02:31:58 1995
+++ util-linux-MCC/misc-utils/Makefile	Thu Aug 22 19:54:53 1996
@@ -12,5 +12,5 @@
 MAN1= 		cal.1 chkdupexe.1 ddate.1 dnsdomainname.1 domainname.1 \
 		dsplit.1 hostid.1 hostname.1 kill.1 logger.1 look.1 mcookie.1 \
-		namei.1 reset.1 script.1 setterm.1 tsort.1 \
+		namei.1 script.1 setterm.1 tsort.1 \
 		whereis.1 write.1
 
@@ -25,5 +25,5 @@
 
 USRBIN=		cal chkdupexe ddate dsplit hostid logger look mcookie \
-		namei reset script setterm tsort whereis write
+		namei script setterm tsort whereis write
 
 ifeq "$(HAVE_CLEAR)" "no"
@@ -38,5 +38,5 @@
 
 $(NEEDS_TERMCAP):
-	$(CC) $(LDFLAGS) $^ -o $@ -ltermcap
+	$(CC) $(LDFLAGS) $^ -o $@ -lcurses
 
 %: %.sh
@@ -74,5 +74,5 @@
 	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
 	$(INSTALLBIN) getoptprog $(USRBINDIR)/getopt
-	(cd $(BINDIR); ln -sf hostname dnsdomainname)
+	(cd $(BINDIR); ln -f hostname dnsdomainname)
 	$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR)
 	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
@@ -82,4 +82,5 @@
 	chmod g+s $(USRBINDIR)/write
 endif
+	gzip -9f /usr/man/man1/*.1
 
 .PHONY:	clean
diff -ru2N util-linux-2.5/sys-utils/Makefile util-linux-MCC/sys-utils/Makefile
--- util-linux-2.5/sys-utils/Makefile	Thu Oct 12 15:46:11 1995
+++ util-linux-MCC/sys-utils/Makefile	Thu Aug 22 19:52:11 1996
@@ -13,5 +13,5 @@
 MAN8= 		chroot.8 clock.8 ctrlaltdel.8 cytune.8 dmesg.8 \
 		ipcrm.8 ipcs.8 kbdrate.8 ramsize.8 rdev.8 renice.8 \
-		rootflags.8 setserial.8 setsid.8 swapdev.8 sync.8 tunelp.8 \
+		rootflags.8 setsid.8 swapdev.8 tunelp.8 \
 		vidmode.8
 
@@ -19,9 +19,9 @@
 # See the "install" rule for the links. . .
 
-SBIN= 		clock ctrlaltdel kbdrate sln
+SBIN= 		clock kbdrate
 
-BIN=            arch dmesg setserial sync
+BIN=            arch dmesg
 
-USRSBIN=	chroot
+USRSBIN=	chroot ctrlaltdel
 
 USRBIN=		cytune ipcrm ipcs rdev renice readprofile setsid tunelp
@@ -60,12 +60,12 @@
 	$(INSTALLBIN) $(USRSBIN) $(USRSBINDIR)
 	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
-	(cd $(USRBINDIR); ln -sf rdev swapdev)
-	(cd $(USRBINDIR); ln -sf rdev ramsize)
-	(cd $(USRBINDIR); ln -sf rdev vidmode)
-	(cd $(USRBINDIR); ln -sf rdev rootflags)
-	$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR) $(INFODIR)
+	(cd $(USRBINDIR); ln -f rdev swapdev)
+	(cd $(USRBINDIR); ln -f rdev ramsize)
+	(cd $(USRBINDIR); ln -f rdev vidmode)
+	(cd $(USRBINDIR); ln -f rdev rootflags)
+	$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR)
 	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
 	$(INSTALLMAN) $(MAN8) $(MAN8DIR)
-	$(INSTALLMAN) $(USRINFO) $(INFODIR)
+	gzip -9f /usr/man/man1/*.1 /usr/man/man8/*.8
 
 clean:
diff -ru2N util-linux-2.5/sys-utils/clock.c util-linux-MCC/sys-utils/clock.c
--- util-linux-2.5/sys-utils/clock.c	Sun Mar 12 01:38:53 1995
+++ util-linux-MCC/sys-utils/clock.c	Sun Oct 13 04:10:39 1996
@@ -154,5 +154,5 @@
 #endif
 
-static inline unsigned char cmos_read(unsigned char reg)
+static unsigned char cmos_read(unsigned char reg)
 {
   register unsigned char ret;
@@ -164,5 +164,5 @@
 }
 
-static inline void cmos_write(unsigned char reg, unsigned char val)
+static void cmos_write(unsigned char reg, unsigned char val)
 {
   outb (reg | 0x80, 0x70);
diff -ru2N util-linux-2.5/text-utils/Makefile util-linux-MCC/text-utils/Makefile
--- util-linux-2.5/text-utils/Makefile	Sun Jun  4 02:47:17 1995
+++ util-linux-MCC/text-utils/Makefile	Thu Aug 22 19:55:02 1996
@@ -38,5 +38,5 @@
 
 $(NEEDS_TERMCAP):
-	$(CC) $(LDFLAGS) $^ -o $@ -ltermcap
+	$(CC) $(LDFLAGS) $^ -o $@ -lcurses
 
 # Rules for hexdump
@@ -69,4 +69,5 @@
 	$(INSTALLDAT) $(USRLIB) $(USRLIBDIR)
 	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
+	gzip -9f /usr/man/man1/*.1
 
 .PHONY: clean distclean
diff -ru2N util-linux-2.5/text-utils/more.c util-linux-MCC/text-utils/more.c
--- util-linux-2.5/text-utils/more.c	Sun Mar 12 01:39:29 1995
+++ util-linux-MCC/text-utils/more.c	Thu Aug 22 19:52:12 1996
@@ -48,6 +48,7 @@
 #include <varargs.h>
 #include <termcap.h>
+#define savetty msavetty
 
-#define HELPFILE	"/usr/lib/more.help"
+#define HELPFILE	"/usr/share/misc/more.help"
 #define VI		"/usr/bin/vi"
 
ENDPATCH
make

* make install
%%