On Mon, Oct 28, 2019 at 08:23:59AM +0100, Paul de Weerd wrote: > On Mon, Oct 28, 2019 at 04:31:50PM +1100, Jonathan Gray wrote: > | On Mon, Oct 28, 2019 at 06:09:54AM +0100, Paul de Weerd wrote: > | > ping > | > | Why are you hosting this yourself? ftp.idsoftware.com has been widely > | mirrored for a long time. > > That would work well for me too, is probably even better. > > ftp.idsoftware.com is no more, my fear is that other mirrors will fade > away too over time. I didn't look very hard for other mirrors though, > just mirrored the zip myself and carried on. > > | > https://salsa.debian.org/games-team/game-data-packager/blob/master/etc/idstuff-mirrors > | > https://salsa.debian.org/games-team/game-data-packager/blob/master/etc/idgames-mirrors > | https://www.doomworld.com/idgames/idstuff/doom/doom19s > | http://mirror.internode.on.net/pub/idstuff/doom/ > > I've picked one of the mirrors listed at the first debian URL. See > updated diff below. > > Thanks Jonathan! > > Paul
Perhaps include the email and the original license text as files which are installed? LICENSE.DOC and VENDOR.DOC from http://cd.textfiles.com/doomkdd/DOOM/ with \r removed. "Doom: Knee Deep in the Dead Straight Rip of Original from Gold Medallian Software (March 1994)" These files seem to have been included in cds with the shareware but not the idstuff zip file. Debian package a file with LICENSE.DOC and the email which alludes to VENDOR.DOC. https://metadata.ftp-master.debian.org/changelogs//non-free/d/doom-wad-shareware/doom-wad-shareware_1.9.fixed-2_copyright Index: Makefile =================================================================== RCS file: /cvs/ports/games/doomdata/shareware/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile 12 Jul 2019 20:46:16 -0000 1.4 +++ Makefile 28 Oct 2019 08:55:15 -0000 @@ -4,21 +4,18 @@ COMMENT = DOOM I Shareware data files DISTNAME = doom19s PKGNAME = doomdata-1.9 -REVISION = 0 +REVISION = 1 EXTRACT_SUFX = .zip CATEGORIES = games -HOMEPAGE = http://www.idsoftware.com/games/doom/doom-collectors/ - MAINTAINER = Paul de Weerd <[email protected]> PKG_ARCH = * # John Carmack says "freely distributable" : -# http://sinusforschung.com/cgi-bin/dwww/usr/share/doc/doom-wad-shareware/copyright PERMIT_PACKAGE = Yes -MASTER_SITES = ftp://ftp.idsoftware.com/idstuff/doom/ +MASTER_SITES = http://www.gamers.org/pub/idgames/idstuff/doom/ WRKSRC = ${WRKDIR} @@ -29,5 +26,8 @@ do-build: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/ ${INSTALL_DATA} ${WRKBUILD}/DOOM1.WAD ${PREFIX}/share/doom/doom1.wad + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/doomdata/ + ${INSTALL_DATA} ${FILESDIR}/{LICENSE.DOC,VENDOR.DOC,distribution.txt} \ + ${PREFIX}/share/doc/doomdata/ .include <bsd.port.mk> Index: files/LICENSE.DOC =================================================================== RCS file: files/LICENSE.DOC diff -N files/LICENSE.DOC --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/LICENSE.DOC 28 Oct 2019 09:02:41 -0000 @@ -0,0 +1,101 @@ + LIMITED USE SOFTWARE LICENSE AGREEMENT + +This Limited Use Software License Agreement (the "Agreement") is a legal +agreement between you, the end-user, and Id Software, Inc. ("ID"). By +continuing the installation of this game program, by loading or running +the game, or by placing or copying the game program onto your computer +hard drive, you are agreeing to be bound by the terms of this Agreement. + +ID SOFTWARE LICENSE + + 1. Grant of License. ID grants to you the right to use the +Id Software game program (the "Software"), which is the shareware version +or episode one of the game program. For purposes of this section, "use" +means loading the Software into RAM, as well as installation on a hard disk +or other storage device. You may not: modify, translate, disassemble, +decompile, reverse engineer, or create derivative works based upon the +Software. You agree thatd the Software will not be shipped, transferred or +exported into any country in violation of the U.S. Export Administration Act +and that you will not utilize, in any other manner, the Software in violation +of any applicable law. + + 2. Copyright. The Software is owned by ID and is protected by United +States copyright laws and international treaty provisions. You must treat +the Software like any other copyrighted material, except that you may make +copies of the Software to give to other persons. You may not charge or +receive any consideration from any other person for the receipt or use of +the Software without receiving ID's prior written consent as specified in the +VENDOR.DOC file. You agree to use your best efforts to see that any user of +the Software licensed hereunder complies with this Agreement. + + 3. Limited Warranty. ID warrants that if properly installed and +operated on a computer for which it is designed, the Software will perform +substantially in accordance with its designed purpose for a period of ninety +(90) days from the date the Software is first obtained by an end-user. ID's +entire liability and your exclusive remedy shall be, at ID's option, either +(a) return of the retail price paid, if any, or (b) repair or replacement of +the Software that does not meet ID's Limited Warranty. To make a warranty +claim, return the Software to the point of purchase, accompanied by proof of +purchase, your name, your address, and a statement of defect, or return the +Software with the above information to ID. This Limited Warranty is void if +failure of the Software has resulted in whole or in part from accident, +abuse, misapplication or violation of this Agreement. Any replacement +Software will be warranted for the remainder of the original warranty period +or thirty (30) days, whichever is longer. This warranty allocates risks of +product failure between Licensee and ID. ID's product pricing reflects this +allocation of risk and the limitations of liability contained in this +warranty. + + 4. NO OTHER WARRANTIES. ID DISCLAIMS ALL OTHER WARRANTIES, EITHER +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE +SOFTWARE AND THE ACCOMPANYING WRITTEN MATERIALS, IF ANY. THIS LIMITED +WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS. YOU MAY HAVE OTHERS WHICH VARY +FROM JURISDICTION TO JURISDICTION. ID DOES NOT WARRANT THAT THE OPERATION +OF THE SOFTWARE WILL BE UNINTERRUPTED, ERROR FREE OR MEET LICENSEE'S +SPECIFIC REQUIREMENTS. THE WARRANTY SET FORTH ABOVE IS IN LIEU OF ALL OTHER +EXPRESS WARRANTIES WHETHER ORAL OR WRITTEN. THE AGENTS, EMPLOYEES, +DISTRIBUTORS, AND DEALERS OF ID ARE NOT AUTHORIZED TO MAKE MODIFICATIONS TO +THIS WARRANTY, OR ADDITIONAL WARRANTIES ON BEHALF OF ID. ADDITIONAL +STATEMENTS SUCH AS DEALER ADVERTISING OR PRESENTATIONS, WHETHER ORAL OR +WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON. + + 5. Exclusive Remedies. You agree that your exclusive remedy against +ID, its affiliates, contractors, suppliers, and agents for loss or damage +caused by any defect or failure in the Software regardless of the form of +action, whether in contract, tort, including negligence, strict liability or +otherwise, shall be the return of the retail purchase price paid, if any, or +replacement of the Software. This Agreement shall be construed in +accordance with and governed by the laws of the State of Texas. Copyright +and other proprietary matters will be governed by United States laws and +international treaties. IN ANY CASE, ID SHALL NOT BE LIABLE FOR LOSS OF +DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, +INDIRECT OR OTHER SIMILAR DAMAGES ARISING FROM BREACH OF WARRANTY, BREACH OF +CONTRACT, NEGLIGENCE, OR OTHER LEGAL THEORY EVEN IF ID OR ITS AGENT HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER +PARTY. Some jurisdictions do not allow the exclusion or limitation of +incidental or consequential damages, so the above limitation or exclusion +may not apply to you. + + 6. General Provisions. Neither this Agreement nor any part or portion +hereof shall be assigned or sublicensed, except as described herein. Should +any provision of this Agreement be held to be void, invalid, unenforceable or +illegal by a court, the validity and enforceability of the other provisions +shall not be affected thereby. If any provision is determined to be +unenforceable, you agree to a modification of such provision to provide for +enforcement of the provision's intent, to the extent permitted by applicable +law. Failure of a party to enforce any provision of this Agreement shall not +constitute or be construed as a waiver of such provision or of the right to +enforce such provision. If you fail to comply with any terms of this +Agreement, YOUR LICENSE IS AUTOMATICALLY TERMINATED. + + YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS +AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE +SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE +SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, YOU AGREE TO BE BOUND BY THIS +AGREEMENT'S TERMS AND CONDITIONS. YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN +SEPARATE AGREEMENTS BETWEEN ID AND YOU, THIS AGREEMENT IS A COMPLETE AND +EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES. THIS +AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, +AND ANY OTHER COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT +MATTER OF THIS AGREEMENT. Index: files/VENDOR.DOC =================================================================== RCS file: files/VENDOR.DOC diff -N files/VENDOR.DOC --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/VENDOR.DOC 28 Oct 2019 09:03:06 -0000 @@ -0,0 +1,8 @@ +NOTICE TO VENDORS: IN ORDER TO COMMERCIALLY DISTRIBUTE OR IN +ANY WAY DISTRIBUTE THIS PROGRAM, YOU MUST FIRST EXECUTE ID +SOFTWARE, INC.'S VENDOR'S LICENSE. YOU MAY OBTAIN A COPY OF THE +VENDOR'S LICENSE BY WRITING TO: ID SOFTWARE, INC., 18601 LBJ +FRWY., SUITE 615, MESQUITE, TEXAS 75150. DO NOT CALL! + +Note: This does not apply to electronic forms (BBS, FTP, +etc.) of distribution. Index: files/distribution.txt =================================================================== RCS file: files/distribution.txt diff -N files/distribution.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/distribution.txt 28 Oct 2019 08:50:06 -0000 @@ -0,0 +1,21 @@ +The license does not appear to grant distribution permission. Email +from John Carmack of ID Software provided this clarification: + +X-Sender: [email protected] +X-Mailer: Windows Eudora Pro Version 3.0 (32) +Date: Sat, 23 Oct 1999 20:01:30 -0500 +To: Joe Drew <[email protected]> +From: [email protected] (John Carmack) +Subject: Re: Doom shareware WAD license + +At 08:02 PM 10/23/99 -0400, you wrote: +>Can you give me a definite license on the doom 1 shareware wad? I find certain +>things that say "freely distribute" and others that say "get vendor's license" +>... All I need to have is a license so I can package it up for Debian. +>Thanks. +>Joe + +The DOOM shareware wad is freely distributable. No Quake data is freely +distributable. + +John Carmack Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/doomdata/shareware/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 23 Mar 2012 09:05:23 -0000 1.2 +++ pkg/PLIST 28 Oct 2019 08:55:34 -0000 @@ -1,3 +1,7 @@ @comment $OpenBSD: PLIST,v 1.2 2012/03/23 09:05:23 rfreeman Exp $ +share/doc/doomdata/ +share/doc/doomdata/LICENSE.DOC +share/doc/doomdata/VENDOR.DOC +share/doc/doomdata/distribution.txt share/doom/ share/doom/doom1.wad
