summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gottinger <achim@gentoo.org>2000-12-11 19:03:38 +0000
committerAchim Gottinger <achim@gentoo.org>2000-12-11 19:03:38 +0000
commit09e76d7c029b39dc5cc9546f6ad5072fb5e51025 (patch)
treef3417c923db155eaff346d88b747c03f61cbfbaa
parent*** empty log message *** (diff)
downloadgentoo-2-09e76d7c029b39dc5cc9546f6ad5072fb5e51025.tar.gz
gentoo-2-09e76d7c029b39dc5cc9546f6ad5072fb5e51025.tar.bz2
gentoo-2-09e76d7c029b39dc5cc9546f6ad5072fb5e51025.zip
*** empty log message ***
-rw-r--r--sys-apps/bash/files/digest-bash-2.041
-rw-r--r--sys-apps/console-tools/console-tools-0.2.3-r1.ebuild33
-rw-r--r--sys-apps/console-tools/files/digest-console-tools-0.2.3-r11
-rw-r--r--sys-apps/file/file-3.32.ebuild29
-rw-r--r--sys-apps/file/files/digest-file-3.321
-rw-r--r--sys-apps/fileutils/files/digest-fileutils-4.0.291
-rw-r--r--sys-apps/fileutils/files/digest-fileutils-4.0.301
-rw-r--r--sys-apps/fileutils/files/digest-fileutils-4.0.311
-rw-r--r--sys-apps/fileutils/files/digest-fileutils-4.0.321
-rw-r--r--sys-apps/fileutils/files/digest-fileutils-4.0y1
-rw-r--r--sys-apps/fileutils/fileutils-4.0.32.ebuild28
-rw-r--r--sys-apps/fileutils/fileutils-4.0y.ebuild33
-rw-r--r--sys-apps/grub/files/digest-grub-0.5.96.11
-rw-r--r--sys-apps/hdparm/files/digest-hdparm-3.9-r11
-rw-r--r--sys-apps/ipchains/files/digest-ipchains-1.3.9-r11
-rw-r--r--sys-apps/ipchains/ipchains-1.3.9-r1.ebuild35
-rw-r--r--sys-apps/man-pages/files/digest-man-pages-1.312
-rw-r--r--sys-apps/man-pages/files/man2.tar.gzbin1982 -> 0 bytes
-rw-r--r--sys-apps/man-pages/files/netman-cvs.tar.gzbin48324 -> 0 bytes
-rw-r--r--sys-apps/man-pages/man-pages-1.31.ebuild49
-rw-r--r--sys-apps/modutils/files/digest-modutils-2.3.171
-rw-r--r--sys-apps/modutils/files/digest-modutils-2.3.191
-rw-r--r--sys-apps/modutils/modutils-2.3.17.ebuild31
-rw-r--r--sys-apps/shadow/files/digest-shadow-19990827-r11
-rw-r--r--sys-apps/shadow/files/digest-shadow-19990827-r21
-rw-r--r--sys-apps/shadow/files/digest-shadow-200009021
-rw-r--r--sys-apps/shadow/files/shadow-19990827-redhat.patch865
-rw-r--r--sys-apps/shadow/shadow-19990827-r2.ebuild62
-rw-r--r--sys-apps/tar/files/digest-tar-1.13.17-r11
-rw-r--r--sys-apps/tar/tar-1.13.17-r1.ebuild27
-rw-r--r--sys-apps/textutils/files/digest-textutils-2.0g1
-rw-r--r--sys-apps/textutils/textutils-2.0g.ebuild40
-rw-r--r--sys-apps/updated/files/digest-updated-2.11-r11
-rw-r--r--sys-apps/updated/updated-2.11-r1.ebuild30
-rw-r--r--sys-apps/util-linux/files/digest-util-linux-2.10m-r14
-rw-r--r--sys-apps/util-linux/files/digest-util-linux-2.10m-r24
-rw-r--r--sys-apps/util-linux/files/digest-util-linux-2.10o1
-rw-r--r--sys-apps/util-linux/files/digest-util-linux-2.10p1
-rw-r--r--sys-apps/util-linux/util-linux-2.10m-r1.ebuild55
-rw-r--r--sys-apps/util-linux/util-linux-2.10o.ebuild44
-rw-r--r--sys-apps/util-linux/util-linux-2.10p.ebuild40
-rw-r--r--sys-apps/which/files/digest-which-2.11-r11
-rw-r--r--sys-apps/which/which-2.11-r1.ebuild33
43 files changed, 0 insertions, 1466 deletions
diff --git a/sys-apps/bash/files/digest-bash-2.04 b/sys-apps/bash/files/digest-bash-2.04
deleted file mode 100644
index 2357c32167ec..000000000000
--- a/sys-apps/bash/files/digest-bash-2.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49b548a8b72a4c925ff26930e4c31c6c bash-2.04.tar.gz
diff --git a/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild b/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild
deleted file mode 100644
index c1283db6f21d..000000000000
--- a/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild,v 1.3 2000/09/15 20:09:17 drobbins Exp $
-
-P=console-tools-0.2.3
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Console and font utilities"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/keyboards/"${A}
-HOMEPAGE="http://altern.org/ydirson/en/lct/"
-
-src_compile() {
- try ./configure --prefix=/usr --host=${CHOST}
- mv Makefile Makefile.orig
- #building without documentation for now
- sed -e s/doc// Makefile.orig > Makefile
- try make all
-}
-
-src_install() {
- into /usr
- cd ${S}
- try make DESTDIR=${D} install
- strip ${D}/usr/bin/*
- strip --strip-unneeded ${D}/usr/lib/*.so.0.0.0
- dodoc BUGS COPYING* CREDITS ChangeLog NEWS README RELEASE TODO
- gzip -9 ${D}/usr/man/man8/*.8
- MOPREFIX="console-tools"
- domo ${S}/po/*.gmo
-}
-
-
diff --git a/sys-apps/console-tools/files/digest-console-tools-0.2.3-r1 b/sys-apps/console-tools/files/digest-console-tools-0.2.3-r1
deleted file mode 100644
index 7c2347441144..000000000000
--- a/sys-apps/console-tools/files/digest-console-tools-0.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 983d4586a791b3fdfa0fbeff76aadf43 console-tools-0.2.3.tar.gz
diff --git a/sys-apps/file/file-3.32.ebuild b/sys-apps/file/file-3.32.ebuild
deleted file mode 100644
index c9c4c1321855..000000000000
--- a/sys-apps/file/file-3.32.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.32.ebuild,v 1.3 2000/10/09 16:02:50 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Program to identify a file's format by scanning binary data for patters"
-#unfortunately, this ftp site doesn't support passive ftp
-#maybe we can find an alternative for those behind firewalls, or mirror
-#on cvs.gentoo.org
-SRC_URI="ftp://ftp.astron.com/pub/file/${A}"
-
-src_compile() {
- try ./configure --prefix=/usr --datadir=/etc --host=${CHOST}
- try make
-}
-
-src_install() {
- into /usr
- dobin file
- doman file.1 magic.4
- insinto /etc
- doins magic magic.mime
- dodoc LEGAL.NOTICE MAINT README
-}
-
-
-
diff --git a/sys-apps/file/files/digest-file-3.32 b/sys-apps/file/files/digest-file-3.32
deleted file mode 100644
index a9c4ebf3a363..000000000000
--- a/sys-apps/file/files/digest-file-3.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd32656c86565edbcc8510b2a59616cc file-3.32.tar.gz
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.0.29 b/sys-apps/fileutils/files/digest-fileutils-4.0.29
deleted file mode 100644
index 111ebd87fc82..000000000000
--- a/sys-apps/fileutils/files/digest-fileutils-4.0.29
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5266df2b133b34fb1d2dfb581d05501 fileutils-4.0.29.tar.gz
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.0.30 b/sys-apps/fileutils/files/digest-fileutils-4.0.30
deleted file mode 100644
index 981f7a321e43..000000000000
--- a/sys-apps/fileutils/files/digest-fileutils-4.0.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc6d2bb572cec5a1429f7216ea3c97dd fileutils-4.0.30.tar.gz
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.0.31 b/sys-apps/fileutils/files/digest-fileutils-4.0.31
deleted file mode 100644
index f8cb9049b1ae..000000000000
--- a/sys-apps/fileutils/files/digest-fileutils-4.0.31
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1065fe682f732a12f70d096060c1ed6 fileutils-4.0.31.tar.gz
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.0.32 b/sys-apps/fileutils/files/digest-fileutils-4.0.32
deleted file mode 100644
index 01bcaa7ab9f1..000000000000
--- a/sys-apps/fileutils/files/digest-fileutils-4.0.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bf7f110208df9bd488831761ec5f582 fileutils-4.0.32.tar.gz
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.0y b/sys-apps/fileutils/files/digest-fileutils-4.0y
deleted file mode 100644
index f3edff17cf46..000000000000
--- a/sys-apps/fileutils/files/digest-fileutils-4.0y
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93401e77220eb8bb319b58d6d7a4c380 fileutils-4.0y.tar.gz
diff --git a/sys-apps/fileutils/fileutils-4.0.32.ebuild b/sys-apps/fileutils/fileutils-4.0.32.ebuild
deleted file mode 100644
index a8b9184cb009..000000000000
--- a/sys-apps/fileutils/fileutils-4.0.32.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.0.32.ebuild,v 1.3 2000/11/30 23:14:32 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
-HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
-
-DEPEND=">=sys-libs/glibc-2.1.3"
-
-src_compile() {
- #we are waiting for GNU fileutils 4.0.30 which will become standard in Gentoo 1.0
- #until then, we wait.
- try ./configure --prefix=/usr
- try make ${MAKEOPTS}
-}
-
-src_install() {
- dodoc COPYING NEWS README* THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
- make prefix=${D}/usr install
- cd ${D}
- mv usr/bin .
-
-}
-
diff --git a/sys-apps/fileutils/fileutils-4.0y.ebuild b/sys-apps/fileutils/fileutils-4.0y.ebuild
deleted file mode 100644
index d742833fe1d8..000000000000
--- a/sys-apps/fileutils/fileutils-4.0y.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.0y.ebuild,v 1.2 2000/09/15 20:09:18 drobbins Exp $
-
-P=fileutils-4.0y
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
-HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
-
-src_compile() {
- try ./configure --prefix=/usr
- try make
-}
-
-src_install() {
- dodoc COPYING NEWS README* THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
- into /
- cd ${S}/src
- cp ginstall install
- dobin chgrp chmod chown cp dd df dir dircolors du install install ln ls mkdir mkfifo mknod mv rm rmdir shred sync touch vdir
- cd ${S}
- into /usr
- doman man/*.1
- doinfo doc/fileutils.info
- dodir /usr/share/locale
- MOPREFIX=fileutils
- domo po/*.po
-
-}
-
diff --git a/sys-apps/grub/files/digest-grub-0.5.96.1 b/sys-apps/grub/files/digest-grub-0.5.96.1
deleted file mode 100644
index 1c025eb54f63..000000000000
--- a/sys-apps/grub/files/digest-grub-0.5.96.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c078fa58deaf7ea3bdf3135b3b4e975 grub-0.5.96.1.tar.gz
diff --git a/sys-apps/hdparm/files/digest-hdparm-3.9-r1 b/sys-apps/hdparm/files/digest-hdparm-3.9-r1
deleted file mode 100644
index 5234b2f133f6..000000000000
--- a/sys-apps/hdparm/files/digest-hdparm-3.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0acf444f8d2fff2cb83cf080e1115e1 hdparm-3.9.tar.gz
diff --git a/sys-apps/ipchains/files/digest-ipchains-1.3.9-r1 b/sys-apps/ipchains/files/digest-ipchains-1.3.9-r1
deleted file mode 100644
index 7ea1e9d925ad..000000000000
--- a/sys-apps/ipchains/files/digest-ipchains-1.3.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad5786be3a7bb612e566f6b9c3a20f4f ipchains-1.3.9.tar.bz2
diff --git a/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild b/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild
deleted file mode 100644
index cea72e112a77..000000000000
--- a/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild,v 1.3 2000/09/15 20:09:19 drobbins Exp $
-
-P=ipchains-1.3.9
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="2.2 kernel equivalent of ipfwadm"
-SRC_URI="http://netfilter.kernelnotes.org/ipchains/${A}"
-HOMEPAGE="http://netfilter.filewatcher.org/ipchains/"
-
-
-src_compile() {
- try make
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- mv Makefile Makefile.orig
- sed -e "s/= -g -O/= ${CFLAGS}/" Makefile.orig > Makefile
- cd ${S}/libipfwc
- mv Makefile Makefile.orig
- sed -e "s/= -g -O/= ${CFLAGS}/" Makefile.orig > Makefile
-}
-
-src_install() {
- into /
- dosbin ipchains
- doman ipfw.4 ipchains.8
- dodoc COPYING README ipchains-quickref.ps
-}
-
-
diff --git a/sys-apps/man-pages/files/digest-man-pages-1.31 b/sys-apps/man-pages/files/digest-man-pages-1.31
deleted file mode 100644
index b0dd48a859be..000000000000
--- a/sys-apps/man-pages/files/digest-man-pages-1.31
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3536efbc1d5c5ab38de66771eab723c3 man-pages-1.31.tar.gz
-MD5 17135e48a2813766e2db94ccb7339168 netman-20000610.tgz
diff --git a/sys-apps/man-pages/files/man2.tar.gz b/sys-apps/man-pages/files/man2.tar.gz
deleted file mode 100644
index ee39df0325a3..000000000000
--- a/sys-apps/man-pages/files/man2.tar.gz
+++ /dev/null
Binary files differ
diff --git a/sys-apps/man-pages/files/netman-cvs.tar.gz b/sys-apps/man-pages/files/netman-cvs.tar.gz
deleted file mode 100644
index 17373ad15f94..000000000000
--- a/sys-apps/man-pages/files/netman-cvs.tar.gz
+++ /dev/null
Binary files differ
diff --git a/sys-apps/man-pages/man-pages-1.31.ebuild b/sys-apps/man-pages/man-pages-1.31.ebuild
deleted file mode 100644
index 9e31b0a43876..000000000000
--- a/sys-apps/man-pages/man-pages-1.31.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-1.31.ebuild,v 1.1 2000/12/11 04:57:39 drobbins Exp $
-
-P=man-pages-1.31
-A="${P}.tar.gz netman-20000610.tgz"
-S=${WORKDIR}/${P}
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-
-SRC_URI="ftp://ftp.kernel.org/pub/linux/docs/manpages/man-pages-1.31.tar.gz
- ftp://ftp.de.kernel.org/pub/linux/docs/manpages/man-pages-1.31.tar.gz
- ftp://ftp.uk.kernel.org/pub/linux/docs/manpages/man-pages-1.31.tar.gz
- ftp://ftp.suse.com/pub/people/ak/netman/netman-20000610.tgz"
-
-DEPEND=""
-
-src_compile() {
- echo
-}
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd ${S}
- unpack netman-20000610.tgz
- tar xzf ${O}/files/man2.tar.gz
- for x in 2 3 7
- do
- mv netman/*.$x man$x
- done
-}
-
-src_install() {
- for x in 1 2 3 4 5 6 7 8
- do
- doman man$x/*.[1-9]
- done
- dodoc man-pages-1.31.Announce README
- docinto netman
- dodoc netman/FIXME netman/README
-}
-
-
-
-
-
-
-
-
diff --git a/sys-apps/modutils/files/digest-modutils-2.3.17 b/sys-apps/modutils/files/digest-modutils-2.3.17
deleted file mode 100644
index ae43fa645fb6..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.3.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b3cb1d2e33cc351fd03b2f6a09c72de modutils-2.3.17.tar.bz2
diff --git a/sys-apps/modutils/files/digest-modutils-2.3.19 b/sys-apps/modutils/files/digest-modutils-2.3.19
deleted file mode 100644
index 220bc9292b62..000000000000
--- a/sys-apps/modutils/files/digest-modutils-2.3.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d303ace6de5ebec7ee86cd592b5b2fd3 modutils-2.3.19.tar.bz2
diff --git a/sys-apps/modutils/modutils-2.3.17.ebuild b/sys-apps/modutils/modutils-2.3.17.ebuild
deleted file mode 100644
index a5d4a233ff0e..000000000000
--- a/sys-apps/modutils/modutils-2.3.17.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.3.17.ebuild,v 1.1 2000/09/26 16:50:41 achim Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard kernel module utilities"
-SRC_URI="ftp://ftp.ocs.com.au/pub/modutils/v2.3/${A}"
-
-src_compile() {
- try ./configure --prefix=/ --host=${CHOST}
- try make
-}
-
-src_install() {
- cd ${S}
- dodir /sbin
- dodir /usr/man/man1
- dodir /usr/man/man8
- dodir /usr/man/man5
- dodir /usr/man/man2
- try make prefix=${D} mandir=${D}/usr/man install
- prepman
- strip ${D}/sbin/*
- dodoc COPYING CREDITS ChangeLog NEWS README TODO
-}
-
-
-
-
diff --git a/sys-apps/shadow/files/digest-shadow-19990827-r1 b/sys-apps/shadow/files/digest-shadow-19990827-r1
deleted file mode 100644
index 8e1c7e241675..000000000000
--- a/sys-apps/shadow/files/digest-shadow-19990827-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba5b76e7cb96c806a4bdb2797fc5c67d shadow-19990827.tar.gz
diff --git a/sys-apps/shadow/files/digest-shadow-19990827-r2 b/sys-apps/shadow/files/digest-shadow-19990827-r2
deleted file mode 100644
index 8e1c7e241675..000000000000
--- a/sys-apps/shadow/files/digest-shadow-19990827-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba5b76e7cb96c806a4bdb2797fc5c67d shadow-19990827.tar.gz
diff --git a/sys-apps/shadow/files/digest-shadow-20000902 b/sys-apps/shadow/files/digest-shadow-20000902
deleted file mode 100644
index d3297a795ea5..000000000000
--- a/sys-apps/shadow/files/digest-shadow-20000902
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23898244ab8d1358008ed68a26f9fe43 shadow-20000902.tar.gz
diff --git a/sys-apps/shadow/files/shadow-19990827-redhat.patch b/sys-apps/shadow/files/shadow-19990827-redhat.patch
deleted file mode 100644
index 75e332db2fd8..000000000000
--- a/sys-apps/shadow/files/shadow-19990827-redhat.patch
+++ /dev/null
@@ -1,865 +0,0 @@
---- shadow-19990827/man/shadowconfig.8.redhat Sat Sep 12 11:38:24 1998
-+++ shadow-19990827/man/shadowconfig.8 Wed Sep 22 15:56:41 1999
-@@ -19,6 +19,3 @@
- Turning shadow passwords on when they are already on, or off when they
- are already off, is harmless.
-
--Read
--.I /usr/doc/passwd/README.debian.gz
--for a brief introduction to shadow passwords and related features.
---- shadow-19990827/man/useradd.8.redhat Sun Mar 7 14:14:47 1999
-+++ shadow-19990827/man/useradd.8 Wed Sep 22 15:56:41 1999
-@@ -51,7 +51,7 @@
- .IR group [,...]]
- .br
- .RB [ -m " [" -k
--.IR skeleton_dir ]]
-+.IR skeleton_dir ] " |" " " -M ]
- .RB [ -p
- .IR passwd ]
- .br
-@@ -60,6 +60,8 @@
- .RB [ -u
- .IR uid " ["
- .BR -o ]]
-+.RB [ -n ]
-+.RB [ -r ]
- .I login
- .TP 8
- .B useradd
-@@ -79,6 +81,8 @@
- The new user account will be entered into the system files as needed,
- the home directory will be created, and initial files copied, depending
- on the command line options.
-+The version provided with Red Hat Linux will create a group for each
-+user added to the system, unless \fB-n\fR option is given.
- The options which apply to the \fBuseradd\fR command are
- .\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..."
- .\" The value of the user's authentication method.
-@@ -128,6 +132,21 @@
- option.
- The default is to not create the directory and to not copy any
- files.
-+.IP \fB-M\fR
-+The user home directory will not be created, even if the system
-+wide settings from \fI/etc/login.defs\fR is to create home dirs.
-+.IP \fB-n\fR
-+A group having the same name as the user being added to the system
-+will be created by default. This option will turn off this Red Hat
-+Linux specific behavior.
-+.IP \fB-r\fR
-+This flag is used to create a system account. That is, an user with an
-+UID lower than value of UID_MIN defined in \fI/etc/login.defs\fR. Note
-+that \fBuseradd\fR will not create a home directory for such an user,
-+regardless of the default setting in \fI/etc/login.defs\fR.
-+You have to specify \fB-m\fR option if you want a home directory
-+for a system account to be created.
-+This is an option added by Red Hat.
- .IP "\fB-p \fIpasswd\fR"
- The encrypted password, as returned by \fBcrypt\fR(3).
- The default is to disable the account.
-@@ -170,19 +189,24 @@
- .SH NOTES
- The system administrator is responsible for placing the default
- user files in the \fI/etc/skel\fR directory.
-+.br
-+This version of useradd was modified by Red Hat to suit Red Hat
-+user/group convention.
- .SH CAVEATS
- You may not add a user to an NIS group.
- This must be performed on the NIS server.
- .SH FILES
--/etc/passwd \- user account information
-+\fB/etc/passwd\fR \- user account information
-+.br
-+\fB/etc/shadow\fR \- secure user account information
- .br
--/etc/shadow \- secure user account information
-+\fB/etc/group\fR \- group information
- .br
--/etc/group \- group information
-+\fB/etc/default/useradd\fR \- default information
- .br
--/etc/default/useradd \- default information
-+\fB/etc/login.defs\fR \- system-wide settings
- .br
--/etc/skel \- directory containing default files
-+\fB/etc/skel\fR \- directory containing default files
- .SH SEE ALSO
- .BR chfn (1),
- .BR chsh (1),
---- shadow-19990827/man/groupadd.8.redhat Mon Dec 28 15:35:05 1998
-+++ shadow-19990827/man/groupadd.8 Wed Sep 22 15:56:41 1999
-@@ -32,7 +32,7 @@
- groupadd \- Create a new group
- .SH SYNOPSIS
- .B groupadd
--[\fB-g\fI gid \fR[\fB-o\fR]]
-+[\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR]
- .I group
- .SH DESCRIPTION
- The \fBgroupadd\fR command
-@@ -44,9 +44,29 @@
- The numerical value of the group's ID.
- This value must be unique, unless the \fB-o\fR option is used.
- The value must be non-negative.
--The default is to use the smallest ID value greater than 99 and
-+The default is to use the smallest ID value greater than 500 and
- greater than every other group.
--Values between 0 and 99 are typically reserved for system accounts.
-+Values between 0 and 499 are typically reserved for \fIsystem accounts\fR.
-+.IP \fB-r\fR
-+This flag instructs \fBgroupadd\fR to add a \fIsystem
-+account\fR. First available \fIgid\fR lower than 499 will be
-+automatically selected unless \fB-g\fR option is given also on the
-+command line.
-+.br
-+This is an option added by Red Hat Software.
-+.IP \fB-f\fR
-+This is \fIforce\fR flag. This will stop \fBgroupadd\fR exit with
-+error when the group about to be added already exists on the
-+system. If that is the case, the group won't be altered (or added
-+again, for that matter).
-+.br
-+This option also modifies the way \fB-g\fR option works. When you
-+request a \fIgid\fR that it is not unique and you don't give \fB-o\fR
-+option too, the group creation will fall back to the standard behavior
-+(adding a group as neither \fB-g\fR or \fB-o\fR options were
-+specified).
-+.br
-+This is an option added by Red Hat Software.
- .SH FILES
- /etc/group \- group account information
- .br
---- shadow-19990827/src/useradd.c.redhat Mon Jun 7 12:40:45 1999
-+++ shadow-19990827/src/useradd.c Wed Sep 22 15:56:41 1999
-@@ -61,7 +61,7 @@
- #define USER_DEFAULTS_FILE "/etc/default/useradd"
- #define NEW_USER_FILE "/etc/default/nuaddXXXXXX"
- #endif
--
-+
- /*
- * Needed for MkLinux DR1/2/2.1 - J.
- */
-@@ -75,7 +75,7 @@
- static gid_t def_group = 100;
- static const char *def_gname = "other";
- static const char *def_home = "/home";
--static const char *def_shell = "";
-+static const char *def_shell = "/dev/null";
- static const char *def_template = SKEL_DIR;
- #ifdef SHADOWPWD
- static long def_inactive = -1;
-@@ -87,7 +87,7 @@
- #define VALID(s) (strcspn (s, ":\n") == strlen (s))
-
- static const char *user_name = "";
--static const char *user_pass = "!";
-+static const char *user_pass = "!!";
- static uid_t user_id;
- static gid_t user_gid;
- static const char *user_comment = "";
-@@ -115,10 +115,13 @@
- sflg = 0, /* shell program for new account */
- cflg = 0, /* comment (GECOS) field for new account */
- mflg = 0, /* create user's home directory if it doesn't exist */
-- kflg = 0, /* specify a directory to fill new user directory */
-+ Mflg = 0, /* do NOT create user's home directory no matter what */
-+ kflg = 0, /* specify a directory to fill new user directory */
- fflg = 0, /* days until account with expired password is locked */
- eflg = 0, /* days since 1970-01-01 when account is locked */
-- Dflg = 0; /* set/show new user default values */
-+ Dflg = 0, /* set/show new user default values */
-+ nflg = 0, /* do not add a group for this user */
-+ rflg = 0; /* create a system account */
-
- #ifdef AUTH_METHODS
- static int Aflg = 0; /* specify authentication method for user */
-@@ -181,19 +184,19 @@
- #define E_HOMEDIR 12 /* can't create home directory */
-
- #ifdef SVR4
--#define DGROUP "defgroup="
--#define HOME "defparent="
--#define SHELL "defshell="
--#define INACT "definact="
--#define EXPIRE "defexpire="
--#define SKEL "defskel="
-+#define DGROUP "defgroup="
-+#define HOME "defparent="
-+#define SHELL "defshell="
-+#define INACT "definact="
-+#define EXPIRE "defexpire="
-+#define SKEL "defskel="
- #else
--#define DGROUP "GROUP="
--#define HOME "HOME="
--#define SHELL "SHELL="
--#define INACT "INACTIVE="
--#define EXPIRE "EXPIRE="
--#define SKEL "SKEL="
-+#define DGROUP "GROUP="
-+#define HOME "HOME="
-+#define SHELL "SHELL="
-+#define INACT "INACTIVE="
-+#define EXPIRE "EXPIRE="
-+#define SKEL "SKEL="
- #endif
-
- /* local function prototypes */
-@@ -711,7 +714,7 @@
- #ifdef AUTH_METHODS
- fprintf(stderr, _("[-A program] "));
- #endif
-- fprintf(stderr, _("[-p passwd] name\n"));
-+ fprintf(stderr, _("[-p passwd] [-n] [-r] name\n"));
-
- fprintf(stderr, _(" %s\t-D [-g group] [-b base] [-s shell]\n"),
- Prog);
-@@ -807,31 +810,7 @@
- struct sgrp *nsgrp;
- #endif
-
-- /*
-- * Lock and open the group file. This will load all of the group
-- * entries.
-- */
--
-- if (! gr_lock ()) {
-- fprintf(stderr, _("%s: error locking group file\n"), Prog);
-- fail_exit(E_GRP_UPDATE);
-- }
-- if (! gr_open (O_RDWR)) {
-- fprintf(stderr, _("%s: error opening group file\n"), Prog);
-- fail_exit(E_GRP_UPDATE);
-- }
--#ifdef SHADOWGRP
-- if (is_shadow_grp && ! sgr_lock ()) {
-- fprintf(stderr, _("%s: error locking shadow group file\n"),
-- Prog);
-- fail_exit(E_GRP_UPDATE);
-- }
-- if (is_shadow_grp && ! sgr_open (O_RDWR)) {
-- fprintf(stderr, _("%s: error opening shadow group file\n"),
-- Prog);
-- fail_exit(E_GRP_UPDATE);
-- }
--#endif
-+ /* Locking and opening of the group files moved to open_files() --gafton */
-
- /*
- * Scan through the entire group file looking for the groups that
-@@ -969,8 +948,13 @@
- const struct passwd *pwd;
- uid_t uid_min, uid_max;
-
-- uid_min = getdef_num("UID_MIN", 100);
-- uid_max = getdef_num("UID_MAX", 60000);
-+ if (!rflg) {
-+ uid_min = getdef_num("UID_MIN", 500);
-+ uid_max = getdef_num("UID_MAX", 60000);
-+ } else {
-+ uid_min = 1;
-+ uid_max = 499;
-+ }
-
- /*
- * Start with some UID value if the user didn't provide us with
-@@ -1036,6 +1020,88 @@
- }
- }
-
-+/*
-+ * find_new_gid - find the next available GID
-+ *
-+ * find_new_gid() locates the next highest unused GID in the group
-+ * file, or checks the given group ID against the existing ones for
-+ * uniqueness.
-+ */
-+
-+static void
-+find_new_gid()
-+{
-+ const struct group *grp;
-+ gid_t gid_min, gid_max;
-+
-+ if (!rflg) {
-+ gid_min = getdef_num("GID_MIN", 500);
-+ gid_max = getdef_num("GID_MAX", 60000);
-+ } else {
-+ gid_min = 1;
-+ gid_max = 499;
-+ }
-+
-+ /*
-+ * Start with some GID value if the user didn't provide us with
-+ * one already.
-+ */
-+
-+ user_gid = gid_min;
-+
-+ /*
-+ * Search the entire group file, either looking for this
-+ * GID (if the user specified one with -g) or looking for the
-+ * largest unused value.
-+ */
-+
-+#ifdef NO_GETGRENT
-+ gr_rewind();
-+ while ((grp = gr_next()))
-+#else
-+ setgrent();
-+ while ((grp = getgrent()))
-+#endif
-+ {
-+ if (strcmp(user_name, grp->gr_name) == 0) {
-+ user_gid = grp->gr_gid;
-+ return;
-+ }
-+ if (grp->gr_gid >= user_gid) {
-+ if (grp->gr_gid > gid_max)
-+ continue;
-+ user_gid = grp->gr_gid + 1;
-+ }
-+ }
-+#ifndef NO_GETGRENT /* RH Linux does have this, so ... */
-+ /* A quick test gets here: if the UID is available
-+ * as a GID, go ahead and use it */
-+ if (!getgrgid(user_id)) {
-+ user_gid = user_id;
-+ return;
-+ }
-+#endif
-+ if (user_gid == gid_max + 1) {
-+ for (user_gid = gid_min; user_gid < gid_max; user_gid++) {
-+#ifdef NO_GETGRENT
-+ gr_rewind();
-+ while ((grp = gr_next()) && grp->gr_gid != user_gid)
-+ ;
-+ if (!grp)
-+ break;
-+#else
-+ if (!getgrgid(user_gid))
-+ break;
-+#endif
-+ }
-+ if (user_gid == gid_max) {
-+ fprintf(stderr, "%s: can't get unique gid (run out of GIDs)\n",
-+ Prog);
-+ fail_exit(4);
-+ }
-+ }
-+}
-+
- #ifdef AUTH_METHODS
- /*
- * convert_auth - convert the argument list to a authentication list
-@@ -1126,9 +1192,9 @@
- char *cp;
-
- #ifdef SHADOWPWD
--#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:M"
-+#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:Mnr"
- #else
--#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:M"
-+#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:Mnr"
- #endif
- while ((arg = getopt(argc, argv, FLAGS)) != EOF) {
- #undef FLAGS
-@@ -1252,12 +1318,6 @@
- case 'm':
- mflg++;
- break;
-- case 'M':
-- /*
-- * don't create home dir - this is the default,
-- * ignored for RedHat/PLD adduser compatibility.
-- */
-- break;
- case 'o':
- oflg++;
- break;
-@@ -1302,6 +1362,15 @@
- user_id = get_number(optarg);
- uflg++;
- break;
-+ case 'n':
-+ nflg++;
-+ break;
-+ case 'r':
-+ rflg++;
-+ break;
-+ case 'M':
-+ Mflg++;
-+ break;
- default:
- usage();
- }
-@@ -1312,9 +1381,12 @@
- * Certain options are only valid in combination with others.
- * Check it here so that they can be specified in any order.
- */
-- if ((oflg && !uflg) || (kflg && !mflg))
-+ if (kflg && !mflg)
- usage();
-
-+ if (mflg && Mflg) /* the admin is not decided .. create or not ? */
-+ usage();
-+
- /*
- * Either -D or username is required. Defaults can be set with -D
- * for the -b, -e, -f, -g, -s options only.
-@@ -1435,6 +1507,31 @@
- exit(E_PW_UPDATE);
- }
- #endif
-+ /*
-+ * Lock and open the group file. This will load all of the group
-+ * entries.
-+ */
-+
-+ if (! gr_lock ()) {
-+ fprintf(stderr, _("%s: error locking group file\n"), Prog);
-+ fail_exit(E_GRP_UPDATE);
-+ }
-+ if (! gr_open (O_RDWR)) {
-+ fprintf(stderr, _("%s: error opening group file\n"), Prog);
-+ fail_exit(E_GRP_UPDATE);
-+ }
-+#ifdef SHADOWGRP
-+ if (is_shadow_grp && ! sgr_lock ()) {
-+ fprintf(stderr, _("%s: error locking shadow group file\n"),
-+ Prog);
-+ fail_exit(E_GRP_UPDATE);
-+ }
-+ if (is_shadow_grp && ! sgr_open (O_RDWR)) {
-+ fprintf(stderr, _("%s: error opening shadow group file\n"),
-+ Prog);
-+ fail_exit(E_GRP_UPDATE);
-+ }
-+#endif /* SHADOWGRP*/
- }
-
-
-@@ -1483,9 +1580,6 @@
- struct spwd spent;
- #endif
-
-- if (! oflg)
-- find_new_uid ();
--
- #ifdef AUTH_METHODS
- if (Aflg) {
- convert_auth(user_auth, auth_arg);
-@@ -1643,6 +1737,118 @@
- }
- }
-
-+/* a fake something */
-+static char *empty_list = NULL;
-+
-+/*
-+ * new_grent - initialize the values in a group file entry
-+ *
-+ * new_grent() takes all of the values that have been entered and
-+ * fills in a (struct group) with them.
-+ */
-+
-+static void
-+new_grent(grent)
-+ struct group *grent;
-+{
-+ bzero ((char *) grent, sizeof *grent);
-+ (const char *) (grent->gr_name) = user_name;
-+ grent->gr_passwd = "x";
-+ grent->gr_gid = user_gid;
-+ grent->gr_mem = &empty_list;
-+}
-+
-+#ifdef SHADOWGRP
-+/*
-+ * new_sgent - initialize the values in a shadow group file entry
-+ *
-+ * new_sgent() takes all of the values that have been entered and
-+ * fills in a (struct sgrp) with them.
-+ */
-+
-+static void
-+new_sgent(sgent)
-+ struct sgrp *sgent;
-+{
-+ bzero ((char *) sgent, sizeof *sgent);
-+ (const char *)(sgent->sg_name) = user_name;
-+ sgent->sg_passwd = "!";
-+ sgent->sg_adm = &empty_list;
-+ sgent->sg_mem = &empty_list;
-+}
-+#endif /* SHADOWGRP */
-+
-+/*
-+ * grp_update - add new group file entries
-+ *
-+ * grp_update() writes the new records to the group files.
-+ */
-+
-+static void grp_add()
-+{
-+ struct group grp;
-+#ifdef SHADOWGRP
-+ struct sgrp sgrp;
-+#endif /* SHADOWGRP */
-+
-+ /*
-+ * Create the initial entries for this new group.
-+ */
-+
-+ new_grent (&grp);
-+#ifdef SHADOWGRP
-+ new_sgent (&sgrp);
-+#endif /* SHADOWGRP */
-+
-+ /*
-+ * Write out the new group file entry.
-+ */
-+ if (! gr_update (&grp)) {
-+ fprintf (stderr, "%s: error adding new group entry\n", Prog);
-+ fail_exit (10);
-+ }
-+#ifdef NDBM
-+
-+ /*
-+ * Update the DBM group file with the new entry as well.
-+ */
-+
-+ if (gr_dbm_present() && ! gr_dbm_update (&grp)) {
-+ fprintf (stderr, "%s: cannot add new dbm group entry\n", Prog);
-+ fail_exit (10);
-+ }
-+ endgrent ();
-+#endif /* NDBM */
-+
-+#ifdef SHADOWGRP
-+
-+ /*
-+ * Write out the new shadow group entries as well.
-+ */
-+
-+ if (is_shadow_grp && ! sgr_update (&sgrp)) {
-+ fprintf (stderr, "%s: error adding new group entry\n", Prog);
-+ fail_exit (10);
-+ }
-+#ifdef NDBM
-+
-+ /*
-+ * Update the DBM group file with the new entry as well.
-+ */
-+
-+ if (is_shadow_grp && sg_dbm_present() && ! sg_dbm_update (&sgrp)) {
-+ fprintf (stderr, "%s: cannot add new dbm group entry\n", Prog);
-+ fail_exit (10);
-+ }
-+ endsgent ();
-+#endif /* NDBM */
-+#endif /* SHADOWGRP */
-+ SYSLOG((LOG_INFO, "new group: name=%s, gid=%d\n",
-+ user_name, user_gid));
-+ /* we need to remeber we have to close the group file... */
-+ do_grp_update++;
-+}
-+
- /*
- * main - useradd command
- */
-@@ -1688,6 +1894,14 @@
-
- process_flags(argc, argv);
-
-+ if (!rflg) /* for system accounts defaults are ignored and we
-+ * do not create a home dir -- gafton */
-+ if (getdef_bool("CREATE_HOME"))
-+ mflg = 1;
-+
-+ if (Mflg) /* absolutely sure that we do not create home dirs */
-+ mflg = 0;
-+
- /*
- * See if we are messing with the defaults file, or creating
- * a new user.
-@@ -1706,8 +1920,12 @@
- */
-
- if (getpwnam(user_name)) {
-+ if (!oflg) {
- fprintf(stderr, _("%s: user %s exists\n"), Prog, user_name);
- exit(E_NAME_IN_USE);
-+ } else {
-+ exit(E_SUCCESS);
-+ }
- }
-
- /*
-@@ -1717,28 +1935,33 @@
-
- open_files ();
-
-+ /* first, seek for a valid uid to use for this user.
-+ * We do this because later we can use the uid we found as
-+ * gid too ... --gafton */
-+ if (! uflg)
-+ find_new_uid ();
-+ /* do we have to add a group for that user? This is why we need to
-+ * open the group files in the open_files() function --gafton */
-+ if (! (nflg || gflg)) {
-+ find_new_gid();
-+ grp_add();
-+ }
-+
- usr_update ();
-
- if (mflg) {
- create_home ();
- copy_tree (def_template, user_home, user_id, user_gid);
-- } else if (getdef_str("CREATE_HOME")) {
-- /*
-- * RedHat added the CREATE_HOME option in login.defs in their
-- * version of shadow-utils (which makes -m the default, with
-- * new -M option to turn it off). Unfortunately, this
-- * changes the way useradd works (it can be run by scripts
-- * expecting some standard behaviour), compared to other
-- * Unices and other Linux distributions, and also adds a lot
-- * of confusion :-(.
-- * So we now recognize CREATE_HOME and give a warning here
-- * (better than "configuration error ... notify administrator"
-- * errors in every program that reads /etc/login.defs). -MM
-- */
-- fprintf(stderr,
-- _("%s: warning: CREATE_HOME not supported, please use -m instead.\n"),
-- Prog);
-- }
-+ } /* Stupid warning removed for the innocent's protection */
-+ /*
-+ * The whole idea about breaking some stupid scripts by creating a new
-+ * variable is crap - I could care less about the scripts. Historically
-+ * adduser type programs have always created the home directories and
-+ * I don't like the idea of providing a script when we can fix the binary
-+ * itself. And if the scripts are using the right options to the useradd
-+ * then they will not break. If not, they depend on unspecified behavior
-+ * and they will break, but they were broken anyway to beging with --gafton
-+ */
-
- close_files ();
- exit(E_SUCCESS);
---- shadow-19990827/src/groupadd.c.redhat Mon Jun 7 12:40:45 1999
-+++ shadow-19990827/src/groupadd.c Wed Sep 22 15:56:41 1999
-@@ -72,6 +72,10 @@
- static int oflg = 0; /* permit non-unique group ID to be specified with -g */
- static int gflg = 0; /* ID value for the new group */
- static int fflg = 0; /* if group already exists, do nothing and exit(0) */
-+static int rflg = 0; /* for adding system accounts (RedHat) */
-+
-+/* For adding "system" accounts */
-+#define MIN_GID 10
-
- #ifdef NDBM
- extern int gr_dbm_mode;
-@@ -103,7 +107,7 @@
- static void
- usage(void)
- {
-- fprintf(stderr, _("usage: groupadd [-g gid [-o]] group\n"));
-+ fprintf(stderr, _("usage: groupadd [-g gid [-o]] [-r] [-f] group\n"));
- exit(E_USAGE);
- }
-
-@@ -228,8 +232,13 @@
- const struct group *grp;
- gid_t gid_min, gid_max;
-
-- gid_min = getdef_num("GID_MIN", 100);
-- gid_max = getdef_num("GID_MAX", 60000);
-+ if (!rflg) {
-+ gid_min = getdef_num("GID_MIN", 500);
-+ gid_max = getdef_num("GID_MAX", 60000);
-+ } else {
-+ gid_min = MIN_GID;
-+ gid_max = getdef_num("GID_MIN", 499);
-+ }
-
- /*
- * Start with some GID value if the user didn't provide us with
-@@ -339,7 +348,7 @@
- char *cp;
- int arg;
-
-- while ((arg = getopt(argc, argv, "og:O:f")) != EOF) {
-+ while ((arg = getopt(argc, argv, "og:O:fr")) != EOF) {
- switch (arg) {
- case 'g':
- gflg++;
-@@ -384,7 +393,13 @@
- */
- fflg++;
- break;
-- default:
-+ case 'r':
-+ /*
-+ * create a system group
-+ */
-+ rflg++;
-+ break;
-+ default:
- usage();
- }
- }
---- shadow-19990827/src/userdel.c.redhat Mon Jun 7 12:40:45 1999
-+++ shadow-19990827/src/userdel.c Wed Sep 22 15:59:40 1999
-@@ -59,7 +59,9 @@
-
- static char *user_name;
- static uid_t user_id;
-+static gid_t user_gid;
- static char *user_home;
-+static char *user_group;
-
- static char *Prog;
- static int fflg = 0, rflg = 0;
-@@ -248,6 +250,100 @@
- #endif /* SHADOWGRP */
- }
-
-+/* remove_group()
-+ * remove the user's group unless it is not really a user-private group
-+ */
-+static void
-+remove_group ()
-+{
-+ char *glist_name;
-+ struct group *gr;
-+ struct passwd *pwd;
-+#ifdef NDBM
-+ struct group *ogrp;
-+#endif
-+
-+ if (user_group == NULL || user_name == NULL)
-+ return;
-+
-+ if (strcmp(user_name, user_group)) {
-+ return;
-+ }
-+
-+ glist_name = NULL;
-+ gr = getgrnam(user_group);
-+ if (gr)
-+ glist_name = *(gr->gr_mem);
-+ while (glist_name) {
-+ while (glist_name && *glist_name) {
-+ if (strncmp(glist_name, user_name, 16)) {
-+ return;
-+ }
-+ glist_name++;
-+ }
-+ }
-+
-+ setpwent();
-+ while ((pwd = getpwent())) {
-+ if (strcmp(pwd->pw_name, user_name) == 0)
-+ continue;
-+
-+ if (pwd->pw_gid == user_gid) {
-+ return;
-+ }
-+ }
-+
-+ /* now actually do the removal if we haven't already returned */
-+
-+ if (! gr_remove (user_group)) {
-+ fprintf (stderr, "%s: error removing group entry\n", Prog);
-+ }
-+#ifdef NDBM
-+
-+ /*
-+ * Update the DBM group file
-+ */
-+
-+ if (gr_dbm_present()) {
-+ if ((ogrp = getgrnam (user_group)) &&
-+ ! gr_dbm_remove (ogrp)) {
-+ fprintf (stderr, "%s: error removing group dbm entry\n",
-+ Prog);
-+ }
-+ }
-+ endgrent ();
-+#endif /* NDBM */
-+
-+#ifdef SHADOWGRP
-+
-+ /*
-+ * Delete the shadow group entries as well.
-+ */
-+
-+ if (is_shadow_grp && ! sgr_remove (user_group)) {
-+ fprintf (stderr, "%s: error removing shadow group entry\n",
-+ Prog);
-+ }
-+#ifdef NDBM
-+
-+ /*
-+ * Update the DBM shadow group file
-+ */
-+
-+ if (is_shadow_grp && sg_dbm_present()) {
-+ if (! sg_dbm_remove (user_group)) {
-+ fprintf (stderr,
-+ "%s: error removing shadow group dbm entry\n",
-+ Prog);
-+ }
-+ }
-+ endsgent ();
-+#endif /* NDBM */
-+#endif /* SHADOWGRP */
-+ SYSLOG((LOG_INFO, "remove group `%s'\n", user_group));
-+ return;
-+}
-+
- /*
- * close_files - close all of the files that were opened
- *
-@@ -512,7 +608,8 @@
-
- fprintf(stderr, _("%s: user %s is currently logged in\n"),
- Prog, name);
-- exit(E_USER_BUSY);
-+ if (!fflg)
-+ exit(E_USER_BUSY);
- }
- }
-
-@@ -647,6 +744,7 @@
- main(int argc, char **argv)
- {
- struct passwd *pwd;
-+ struct group *gr;
- int arg;
- int errors = 0;
-
-@@ -736,6 +834,9 @@
- #endif
- user_id = pwd->pw_uid;
- user_home = xstrdup(pwd->pw_dir);
-+ user_gid = pwd->pw_gid;
-+ gr = getgrgid(pwd->pw_gid);
-+ if (gr) user_group = xstrdup(gr->gr_name);
-
- /*
- * Check to make certain the user isn't logged in.
-@@ -792,6 +893,9 @@
- }
- }
- #endif
-+
-+ /* remove user's group if appropriate */
-+ remove_group ();
-
- if (rflg) {
- if (remove_tree(user_home) || rmdir(user_home)) {
diff --git a/sys-apps/shadow/shadow-19990827-r2.ebuild b/sys-apps/shadow/shadow-19990827-r2.ebuild
deleted file mode 100644
index f03e670f5c8f..000000000000
--- a/sys-apps/shadow/shadow-19990827-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-19990827-r2.ebuild,v 1.1 2000/11/05 06:11:58 drobbins Exp $
-
-P="shadow-19990827"
-A=${P}.tar.gz
-A0=shadow-19990827-redhat.patch
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities to deal with user accounts"
-SRC_URI="ftp://piast.t19.ds.pwr.wroc.pl/pub/linux/shadow/shadow-19990827.tar.gz"
-
-src_compile() {
- try ./configure --disable-desrpc --with-libcrypt --with-catgets \
- --with-libcrack \
- --with-libpam --disable-shared --host=${CHOST}
- try make
-}
-
-src_unpack() {
- unpack ${A}
- einfo "Applying patch from RedHat 6.1..."
- patch -p0 < ${O}/files/${A0}
-}
-
-src_install() {
- cd ${S}
- try make install prefix=${D}/usr exec_prefix=${D}
- cd ${D}/usr/sbin
- ln -s useradd ${D}/usr/sbin/adduser
- gzip -9 ${D}/usr/man/man?/*.[1-9]
- cd ${D}/usr/man/man8
- ln -s useradd.8.gz adduser.8.gz
- ln -s pwconv.8.gz pwuconv.8.gz
- ln -s pwconv.8.gz grpconv.8.gz
- ln -s pwconv.8.gz grpunconv.8.gz
- dodir /etc
- cp ${O}/files/login.defs ${D}/etc
-
- dodir /etc/defaults
- cp ${O}/files/useradd ${D}/etc/defaults
- chmod 0600 ${D}/etc/defaults/useradd
- dodir /etc/skel
- cd ${S}/etc
- cp shells shells.orig
- echo "# /etc/shells: valid login shells" > shells
- echo "/bin/sh" >> shells
- echo "/bin/bash" >> shells
- echo "/bin/tcsh" >> shells
- insinto /etc
- doins limits shells
- insopts -m0600
- doins suauth login.access
- cd ${S}
- dodoc ABOUT-NLS
- cd ${S}/doc
- dodoc ANNOUNCE CHANGES HOWTO INSTALL LICENSE LSM README* WISHLIST *.txt
-
-}
-
-
-
diff --git a/sys-apps/tar/files/digest-tar-1.13.17-r1 b/sys-apps/tar/files/digest-tar-1.13.17-r1
deleted file mode 100644
index 54b23affd34c..000000000000
--- a/sys-apps/tar/files/digest-tar-1.13.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4704d86de59410d8687cf2857ffd2f48 tar-1.13.17.tar.gz
diff --git a/sys-apps/tar/tar-1.13.17-r1.ebuild b/sys-apps/tar/tar-1.13.17-r1.ebuild
deleted file mode 100644
index 22ce4b1ab791..000000000000
--- a/sys-apps/tar/tar-1.13.17-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.17-r1.ebuild,v 1.3 2000/09/15 20:09:23 drobbins Exp $
-
-P=tar-1.13.17
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Use this to try make tarballs :)"
-SRC_URI="ftp://alpha.gnu.org/gnu/tar/"${A}
-
-src_compile() {
- try ./configure --prefix=/usr --with-catgets --host=${CHOST}
- cp lib/fnmatch.hin lib/fnmatch.h
- try make
- cd ${S}
-}
-
-src_install() {
- cd ${S}
- try make prefix=${D}/usr install
- prepinfo
- dodoc COPYING NEWS README THANKS AUTHORS
-}
-
-
diff --git a/sys-apps/textutils/files/digest-textutils-2.0g b/sys-apps/textutils/files/digest-textutils-2.0g
deleted file mode 100644
index 793ef574c0cb..000000000000
--- a/sys-apps/textutils/files/digest-textutils-2.0g
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d0788841c0b2ebf6347a5377625d73d textutils-2.0g.tar.gz
diff --git a/sys-apps/textutils/textutils-2.0g.ebuild b/sys-apps/textutils/textutils-2.0g.ebuild
deleted file mode 100644
index d3769599ced0..000000000000
--- a/sys-apps/textutils/textutils-2.0g.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0g.ebuild,v 1.4 2000/11/30 23:14:35 achim Exp $
-
-P=textutils-2.0g
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Standard GNU text utilities"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
-DEPEND=">=sys-libs/glibc-2.1.3"
-
-src_compile() {
- try ./configure --prefix=/usr --host=${CHOST} --build=${CHOST} \
- --without-included-regex
- try make ${MAKEOPTS}
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}/src
-# mv tr.c tr.c.orig
-# sed -e "234d" tr.c.orig > tr.c
-# cp sys2.h sys2.h.orig
-# sed -e "s:^char \*strndup://:" sys2.h.orig > sys2.h
-}
-
-src_install() {
- cd ${S}
- try make prefix=${D}/usr install
- dodoc AUTHORS COPYING ChangeLog NEWS README* THANKS TODO
- dodir /bin
- dosym /usr/bin/cat /bin/cat
- rmdir ${D}/usr/lib
-}
-
-
-
-
diff --git a/sys-apps/updated/files/digest-updated-2.11-r1 b/sys-apps/updated/files/digest-updated-2.11-r1
deleted file mode 100644
index 609b681042bd..000000000000
--- a/sys-apps/updated/files/digest-updated-2.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6328b9b044bd0a3653d703ebbd8b80fd updated-2.11.tar.gz
diff --git a/sys-apps/updated/updated-2.11-r1.ebuild b/sys-apps/updated/updated-2.11-r1.ebuild
deleted file mode 100644
index 8bc9a6d1eba5..000000000000
--- a/sys-apps/updated/updated-2.11-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/updated/updated-2.11-r1.ebuild,v 1.4 2000/10/03 16:02:06 achim Exp $
-
-P=updated-2.11
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Update flushes filesystem buffers at regular intervals"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${A}"
-
-src_compile() {
- try make
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- mv Makefile Makefile.orig
- sed -e "s/-O3/${CFLAGS}/" Makefile.orig > Makefile
-}
-
-src_install() {
- into /
- dosbin update
- doman update.8
- dodoc COPYING update.lsm debian/*
-}
-
-
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.10m-r1 b/sys-apps/util-linux/files/digest-util-linux-2.10m-r1
deleted file mode 100644
index 778059423a73..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.10m-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 bf2f4616594ce04208efe833bbb24a89 util-linux-2.10m.tar.bz2
-MD5 571b7c1e5b81ff386fb5e5f6cb73aeb8 util-linux-2.10m-mount-compat.patch
-MD5 9b70160a2227035def45e25f793b6e5a util-linux-2.10m-mount-nfsv3.patch
-MD5 0e529f499a33c42b06f169f05c98427f util-linux-2.10m-mount-rpc.patch
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.10m-r2 b/sys-apps/util-linux/files/digest-util-linux-2.10m-r2
deleted file mode 100644
index 778059423a73..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.10m-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 bf2f4616594ce04208efe833bbb24a89 util-linux-2.10m.tar.bz2
-MD5 571b7c1e5b81ff386fb5e5f6cb73aeb8 util-linux-2.10m-mount-compat.patch
-MD5 9b70160a2227035def45e25f793b6e5a util-linux-2.10m-mount-nfsv3.patch
-MD5 0e529f499a33c42b06f169f05c98427f util-linux-2.10m-mount-rpc.patch
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.10o b/sys-apps/util-linux/files/digest-util-linux-2.10o
deleted file mode 100644
index ff3bdb905999..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.10o
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef812942db05703a6a85ead4e2d8d051 util-linux-2.10o.tar.bz2
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.10p b/sys-apps/util-linux/files/digest-util-linux-2.10p
deleted file mode 100644
index 30b08f194fa2..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.10p
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e275a161b903db65fa742b410c1a43b util-linux-2.10p.tar.bz2
diff --git a/sys-apps/util-linux/util-linux-2.10m-r1.ebuild b/sys-apps/util-linux/util-linux-2.10m-r1.ebuild
deleted file mode 100644
index ccd95ff61d6e..000000000000
--- a/sys-apps/util-linux/util-linux-2.10m-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.10m-r1.ebuild,v 1.5 2000/11/19 12:17:29 achim Exp $
-
-P="util-linux-2.10m"
-A="${P}.tar.bz2
- ${P}-mount-compat.patch
- ${P}-mount-nfsv3.patch
- ${P}-mount-rpc.patch"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/util-linux/${A}
- ftp://ftp.uk.kernel.org/pub/linux/utils/util-linux/${A}
- ftp://ftp.de.kernel.org/pub/linux/utils/util-linux/${A}
- ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/${P}-mount-compat.patch
- ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/${P}-mount-nfsv3.patch
- ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/${P}-mount-rpc.patch"
-
-DEPEND="sys-libs/test"
-
-src_compile() {
- try ./configure
- try make
-}
-
-src_unpack() {
- unpack ${P}.tar.bz2
- cd ${S}
- patch -p1 < ${DISTDIR}/${P}-mount-compat.patch
- patch -p1 < ${DISTDIR}/${P}-mount-nfsv3.patch
- patch -p1 < ${DISTDIR}/${P}-mount-rpc.patch
- cp MCONFIG MCONFIG.orig
- sed -e "s/-pipe -O2 -m486 -fomit-frame-pointer/${CFLAGS}/" \
- -e "s/HAVE_PAM=no/HAVE_PAM=yes/" \
- -e "s/HAVE_SLN=no/HAVE_SLN=yes/" \
- -e "s/HAVE_TSORT=no/HAVE_TSORT=yes/" \
- -e "s/# HAVE_SLANG/HAVE_SLANG/" \
- -e "s/# SLANGFLAGS/SLANGSFLAGS/" \
- MCONFIG.orig > MCONFIG
-}
-
-src_install() {
- cd ${S}
- try make DESTDIR=${D} install
- cd ${S}
- dodoc licenses/* HISTORY
- prepman
- prepinfo
- docinto examples
- dodoc example.files/*
-}
-
-
diff --git a/sys-apps/util-linux/util-linux-2.10o.ebuild b/sys-apps/util-linux/util-linux-2.10o.ebuild
deleted file mode 100644
index 0be4338bf8cb..000000000000
--- a/sys-apps/util-linux/util-linux-2.10o.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.10o.ebuild,v 1.3 2000/10/29 20:37:00 achim Exp $
-
-P="util-linux-2.10o"
-A="${P}.tar.bz2"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="ftp://ftp.de.kernel.org/pub/linux/utils/util-linux/${P}.tar.bz2"
-
-src_compile() {
- try ./configure
- try make
-}
-
-src_unpack() {
- unpack ${P}.tar.bz2
- cd ${S}
- gzip -dc ../../../linux-UP-2.2.17-r3/work/linux/Documentation/crypto/util-linux-2.10o* | patch -p1
- cp MCONFIG MCONFIG.orig
- sed -e "s/-pipe -O2 -m486 -fomit-frame-pointer/${CFLAGS}/" \
- -e "s/HAVE_PAM=no/HAVE_PAM=yes/" \
- -e "s/HAVE_SLN=no/HAVE_SLN=yes/" \
- -e "s/HAVE_TSORT=no/HAVE_TSORT=yes/" \
- -e "s/# HAVE_SLANG/HAVE_SLANG/" \
- -e "s/# SLANGFLAGS/SLANGSFLAGS/" \
- MCONFIG.orig > MCONFIG
-
-}
-
-src_install() {
- cd ${S}
- try make DESTDIR=${D} install
- cd ${S}
- dodoc licenses/* HISTORY
- prepman
- prepinfo
- docinto examples
- dodoc example.files/*
-}
-
-
diff --git a/sys-apps/util-linux/util-linux-2.10p.ebuild b/sys-apps/util-linux/util-linux-2.10p.ebuild
deleted file mode 100644
index 1dbf6e17938d..000000000000
--- a/sys-apps/util-linux/util-linux-2.10p.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.10p.ebuild,v 1.1 2000/11/20 20:30:33 drobbins Exp $
-
-A="${P}.tar.bz2"
-S=${WORKDIR}/${P}
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/util-linux/${P}.tar.bz2"
-
-src_compile() {
- try ./configure
- try make
-}
-
-src_unpack() {
- unpack ${P}.tar.bz2
- cd ${S}
- cp MCONFIG MCONFIG.orig
- sed -e "s/-pipe -O2 -m486 -fomit-frame-pointer/${CFLAGS}/" \
- -e "s/HAVE_PAM=no/HAVE_PAM=yes/" \
- -e "s/HAVE_SLN=no/HAVE_SLN=yes/" \
- -e "s/HAVE_TSORT=no/HAVE_TSORT=yes/" \
- -e "s/# HAVE_SLANG/HAVE_SLANG/" \
- -e "s/# SLANGFLAGS/SLANGSFLAGS/" \
- MCONFIG.orig > MCONFIG
-}
-
-src_install() {
- cd ${S}
- try make DESTDIR=${D} install
- cd ${S}
- dodoc licenses/* HISTORY
- prepman
- prepinfo
- docinto examples
- dodoc example.files/*
-}
-
-
diff --git a/sys-apps/which/files/digest-which-2.11-r1 b/sys-apps/which/files/digest-which-2.11-r1
deleted file mode 100644
index 3b5ad0af2dca..000000000000
--- a/sys-apps/which/files/digest-which-2.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4f245abb6cf848ba3642d7da57be905 which-2.11.tar.gz
diff --git a/sys-apps/which/which-2.11-r1.ebuild b/sys-apps/which/which-2.11-r1.ebuild
deleted file mode 100644
index 36e0b71dca72..000000000000
--- a/sys-apps/which/which-2.11-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.11-r1.ebuild,v 1.4 2000/10/03 16:02:06 achim Exp $
-
-P=which-2.11
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Prints out location of specified executables that are in your path"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/which/${A}
- ftp://prep.ai.mit.edu/gnu/which/${A}"
-
-src_compile() {
- try ./configure --prefix=/usr
- try make
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}/tilde
- cp shell.c shell.c.orig
- echo "#define NULL ( 0L )" > shell.c
- cat shell.c.orig >> shell.c
-}
-
-src_install() {
- into /usr
- dobin which
- doman which.1
- doinfo which.info
- dodoc AUTHORS COPYING EXAMPLES NEWS README*
-}
-