since the manpage has never changed, it now resides in files/ rather than in files/1.0.blah. Additionally, the REAL author of this script is now mentioned in the manpage (Stuart Winter). Finally, 1.0.9 is simply an identical version to 1.0.8, except that it has a clear license -- BSD. We had screwed up with prior versions and assumed them to be GPL-2. This was our fault entirely, as the actual implied license was BSD (Slackware's predominant license -- we should have known). This fixes bug #53337 by Mike Valstar <mikevalstar@gentoo-portage.com>

8 files changed, 57 insertions, 32 deletions

diff --git a/app-admin/superadduser/ChangeLog b/app-admin/superadduser/ChangeLog
index 7f759b6d7be9..77c3af34d48d 100644
--- a/app-admin/superadduser/ChangeLog
+++ b/app-admin/superadduser/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-admin/superadduser
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/ChangeLog,v 1.24 2004/06/01 21:11:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/ChangeLog,v 1.25 2004/06/09 08:43:51 seemant Exp $
+
+*superadduser-1.0.9 (09 Jun 2004)
+
+  09 Jun 2004; Seemant Kulleen <seemant@gentoo.org> +files/superadduser.8,
+  -files/1.0.7/superadduser.8, -files/1.0.8/superadduser,
+  -files/1.0.8/superadduser.8, +files/1.0.9/superadduser,
+  superadduser-1.0.7.ebuild, -superadduser-1.0.8.ebuild,
+  +superadduser-1.0.9.ebuild:
+  since the manpage has never changed, it now resides in files/ rather than in
+  files/1.0.blah. Additionally, the REAL author of this script is now mentioned
+  in the manpage (Stuart Winter). Finally, 1.0.9 is simply an identical version
+  to 1.0.8, except that it has a clear license -- BSD. We had screwed up with
+  prior versions and assumed them to be GPL-2. This was our fault entirely, as
+  the actual implied license was BSD (Slackware's predominant license -- we
+  should have known). This fixes bug #53337 by Mike Valstar
+  <mikevalstar@gentoo-portage.com>
 
 *superadduser-1.0.8 (01 Jun 2004)
 
diff --git a/app-admin/superadduser/Manifest b/app-admin/superadduser/Manifest
index 4a15872bbbc0..3f1b38eddfa8 100644
--- a/app-admin/superadduser/Manifest
+++ b/app-admin/superadduser/Manifest
@@ -1,10 +1,14 @@
-MD5 cc15325893434ce6d2fc7609f981f4bc superadduser-1.0.8.ebuild 581
-MD5 d762cb4b5427c87c16d861c1e4e9d786 superadduser-1.0.7.ebuild 540
+MD5 682fab4bf79ec40bb0c83a202feadd54 superadduser-1.0.8.ebuild 577
+MD5 25b480abc8cd1240730c33fea5b0d03b superadduser-1.0.7.ebuild 537
 MD5 bbaeb8b7035da9b857f8a4139fd56774 ChangeLog 3304
+MD5 682fab4bf79ec40bb0c83a202feadd54 superadduser-1.0.9.ebuild 577
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-superadduser-1.0.7 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-superadduser-1.0.8 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-superadduser-1.0.9 0
 MD5 602e98c0b5014d28a71d33c9ed2744ed files/1.0.7/superadduser 12302
 MD5 2fb629d8e8eb75d7640613f05b4a5240 files/1.0.7/superadduser.8 518
 MD5 c95c8479110dd8c7ae720ada7f6b76c0 files/1.0.8/superadduser 12594
 MD5 2fb629d8e8eb75d7640613f05b4a5240 files/1.0.8/superadduser.8 518
+MD5 0365b9983675df485280fe5f570411f1 files/1.0.9/superadduser 13900
+MD5 0d5686d1a7f9fd1035ca0cb455864559 files/1.0.9/superadduser.8 517
diff --git a/app-admin/superadduser/files/1.0.8/superadduser.8 b/app-admin/superadduser/files/1.0.8/superadduser.8
deleted file mode 100644
index f83cb22b04fc..000000000000
--- a/app-admin/superadduser/files/1.0.8/superadduser.8
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH superadduser "8" "April 2002" "superadduser 1.0" 
-.SH NAME
-superadduser \- manual page for the superadduser program, an interactive 
-version of adduser.
-.SH SYNOPSIS
-.B superadduser
-.SH DESCRIPTION
-Superadduser interactively asks the user to fill in the necessary parameters to
-the 
-.I shadow
-package's useradd program.
-.PP
-.SH AUTHOR
-Man page by Karl Trygve Kalleberg <karltk@gentoo.org>
-.br
-Script by Hrvoje Dogan <hdogan@student.math.hr>
-.SH "SEE ALSO"
-useradd(8) 
-.TP
-The \fI/usr/sbin/superadduser\fR script. 
diff --git a/app-admin/superadduser/files/1.0.8/superadduser b/app-admin/superadduser/files/1.0.9/superadduser
index 802e727b5b81..25f70989ba9f 100644
--- a/app-admin/superadduser/files/1.0.8/superadduser
+++ b/app-admin/superadduser/files/1.0.9/superadduser
@@ -1,17 +1,42 @@
 #!/bin/bash
-
+#
+# Copyright 1995  Hrvoje Dogan, Croatia.
+# Copyright 2002, 2003, 2004  Stuart Winter, West Midlands, England, UK.
+# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
 ##########################################################################
 # Program: /usr/sbin/adduser
 # Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
 # Author : Stuart Winter <stuart@polplex.co.uk>
 #          Based on the original Slackware adduser by Hrvoje Dogan
 #          with modifications by Patrick Volkerding
-# Version: 1.08
+# Version: 1.09
 ##########################################################################
 # Usage..: adduser [<new_user_name>]
 ##########################################################################
 # History #
 ###########
+# v1.09 - 07/06/04 
+#       * Added standard Slackware script licence to the head of this file.
 # v1.08 - 25/04/04
 #       * Disallow user names that begin with a numeric because useradd 
 #         (from shadow v4.03) does not allow them. <sw>
diff --git a/app-admin/superadduser/files/digest-superadduser-1.0.8 b/app-admin/superadduser/files/digest-superadduser-1.0.9
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/superadduser/files/digest-superadduser-1.0.8
+++ b/app-admin/superadduser/files/digest-superadduser-1.0.9
diff --git a/app-admin/superadduser/files/1.0.7/superadduser.8 b/app-admin/superadduser/files/superadduser.8
index f83cb22b04fc..efefadcd14d6 100644
--- a/app-admin/superadduser/files/1.0.7/superadduser.8
+++ b/app-admin/superadduser/files/superadduser.8
@@ -13,7 +13,7 @@ package's useradd program.
 .SH AUTHOR
 Man page by Karl Trygve Kalleberg <karltk@gentoo.org>
 .br
-Script by Hrvoje Dogan <hdogan@student.math.hr>
+Script by Stuart Winter <stuart@polplex.co.uk>
 .SH "SEE ALSO"
 useradd(8) 
 .TP
diff --git a/app-admin/superadduser/superadduser-1.0.7.ebuild b/app-admin/superadduser/superadduser-1.0.7.ebuild
index 3eccc7336bab..2a98525a7f60 100644
--- a/app-admin/superadduser/superadduser-1.0.7.ebuild
+++ b/app-admin/superadduser/superadduser-1.0.7.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/superadduser-1.0.7.ebuild,v 1.7 2004/06/01 21:02:50 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/superadduser-1.0.7.ebuild,v 1.8 2004/06/09 08:43:51 seemant Exp $
 
 DESCRIPTION="Interactive adduser script"
 SRC_URI=""
 HOMEPAGE="http://www.gentoo.org/"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="x86 ppc sparc alpha hppa ~mips amd64 ~ia64 ~ppc64"
 
 RDEPEND="sys-apps/shadow"
 
 src_install() {
 	dosbin ${FILESDIR}/${PV}/superadduser
-	doman ${FILESDIR}/${PV}/superadduser.8
+	doman ${FILESDIR}/superadduser.8
 }
diff --git a/app-admin/superadduser/superadduser-1.0.8.ebuild b/app-admin/superadduser/superadduser-1.0.9.ebuild
index b4cf06f224b2..418575db7c49 100644
--- a/app-admin/superadduser/superadduser-1.0.8.ebuild
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/superadduser-1.0.8.ebuild,v 1.1 2004/06/01 21:11:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/superadduser-1.0.9.ebuild,v 1.1 2004/06/09 08:43:51 seemant Exp $
 
 DESCRIPTION="Interactive adduser script from Slackware"
 SRC_URI=""
 HOMEPAGE="http://www.interlude.org.uk/unix/slackware/"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
 
 RDEPEND="sys-apps/shadow"
 
 src_install() {
 	dosbin ${FILESDIR}/${PV}/superadduser
-	doman ${FILESDIR}/${PV}/superadduser.8
+	doman ${FILESDIR}/superadduser.8
 }