This is an attempt by UW to enter us into a CONTRACT. Those terms

in that license are CONTRACT terms, and I absolutely will not accept
such bullshit anywhere near our tree.  Delete with prejudice.  This
should NEVER have entered our tree.  pine is not free software in ANY
SENSE.  People should stop using the non-free trash.
This commit is contained in:
deraadt 2007-10-20 22:09:06 +00:00
parent 8cdc309c6d
commit 4226b5e435
3 changed files with 7 additions and 163 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.70 2007/10/20 21:13:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.71 2007/10/20 22:09:06 deraadt Exp $
COMMENT-main= program for Internet E-mail and News
COMMENT-pico= small text editor
@ -12,11 +12,10 @@ VERSION= 4.64
PICO_VERSION= 4.10
PILOT_VERSION= 2.0
# N is appended to version to comply to the Distribution License
DISTNAME= pine${VERSION}
PKGNAME-main= pine-${VERSION}N
PKGNAME-pico= pico-${PICO_VERSION}N
PKGNAME-pilot= pilot-${PILOT_VERSION}N
PKGNAME-main= pine-${VERSION}p4
PKGNAME-pico= pico-${PICO_VERSION}p0
PKGNAME-pilot= pilot-${PILOT_VERSION}p0
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.sunet.se/pub/unix/mail/pine/
@ -25,11 +24,9 @@ HOMEPAGE= http://www.washington.edu/pine/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# Pine License
# cf. files/license.txt
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_CDROM= No
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_CDROM= No
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
@ -64,7 +61,6 @@ do-build:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pine
${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine
${INSTALL_DATA} ${FILESDIR}/license.txt ${PREFIX}/share/doc/pine
cd ${WRKSRC}/bin; ${INSTALL_PROGRAM} pico pilot pine rpdump rpload \
${PREFIX}/bin
cd ${WRKSRC}/doc; ${INSTALL_MAN} pico.1 pilot.1 pine.1 rpdump.1 rpload.1 \

View File

@ -1,151 +0,0 @@
The University of Washington
Pine MESSAGING SOFTWARE Distribution License
1. GRANT. Subject to the conditions stated below, the University of
Washington ("UW") grants permission to OpenBSD ("Licensee"): (1)
to modify Pine messaging software ("the Software") in the ways listed on
Appendix A solely in order to create a modified version of the Software
appropriate for inclusion and integration with Licensee's OpenBSD
distributions; and (2) to distribute the Software with OpenBSD
distributions.
2. CONDITIONS. This grant of license is contingent on the following
conditions:
2.1. The Pine and Pico copyright and trademark notices shall appear in all
copies.
2.2. Both the above copyright notice and this permission notice shall
appear in all supporting documentation.
2.3. The name of the University of Washington shall not be used in
advertising or publicity pertaining to distribution of the Software, or
any OpenBSD distributions containing the Software, without specific,
prior written permission from the University of Washington.
2.4. Licensee shall note that Licenseee is distributing a modified version
of the Software by appending the letter "N" to the current Pine software
version number.
2.5. Licensee shall enumerate the modifications in the integral release
notes and associated documentation.
2.6. Licensee shall distribute the Software only with the Pine User
Agreement, which is attached here as Appendix B. Alternatively, Licensee
may create Licensee's own license that includes all the clauses as
identified on the Pine User Agreement.
3. DISCLAIMER OF WARRANTIES. The Software is provided "as is." THE
UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, WITH
REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT
SHALL THE UNIVERSITY OF WASHINGTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT (INCLUDING
NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
USE OR PERFORMANCE OF THIS SOFTWARE.
4. TERMINATION RIGHTS ON BREACH. Should Licensee be in breach of this Pine
Distribution License, UW may terminate this license and all rights Licensee
holds to distribute Pine shall cease.
Appendix A
List of Authorized Changes
The modifications contained at
http://www.openbsd.org/cgi-bin/cvsweb/ports/mail/pine/patches
on October 12, 2007 consisting of:
patch-doc_pine_1
patch-doc_tech-notes_txt
patch-imap_src_osdep_unix_Makefile
patch-imap_src_osdep_unix_Makefile_gss
patch-imap_src_osdep_unix_env_unix_c
patch-imap_src_osdep_unix_env_unix_h
patch-imap_src_osdep_unix_kerb_mit_c
patch-pico_osdep_spell_unx
patch-pine_mailcap_c
patch-pine_mailview_c
patch-pine_pine_hlp
Appendix B
Pine License and Legal Notices
Pine and Pico are registered trademarks of the University of
Washington. No commercial use of these trademarks may be made without
prior written permission of the University of Washington.
Pine, Pico, and Pilot software and its included text are Copyright
1989-2007 by the University of Washington.
Use of Pine/Pico/Pilot: You may compile and execute these programs for
any purpose, including commercial, without paying anything to the
University of Washington, provided that the legal notices are
maintained intact and honored.
Local modification of this release is permitted as follows, or by
mutual agreement: In order to reduce confusion and facilitate
debugging, we request that locally modified versions be denoted by
appending the letter "L" to the current version number, and that the
local changes be enumerated in the integral release notes and
associated documentation.
Redistribution of this release is permitted as follows, or by mutual
agreement:
(a) In free-of-charge or at-cost distributions by non-profit concerns;
(b) In free-of-charge distributions by for-profit concerns;
(c) Inclusion in a CD-ROM collection of free-of-charge, shareware, or
non-proprietary software for which a fee may be charged for the
packaged distribution.
Redistribution of binary versions is further constrained by license
agreements for incorporated libraries from third parties, e.g. LDAP,
GSSAPI.
The University of Washington encourages unrestricted distribution of
individual patches to the Pine system. By "patches" we mean
"difference" files that can be applied to the University of Washington
Pine source distribution in order to accomplish bug fixes, minor
enhancements, or adaptation to new operating systems. Submission of
these patches to University of Washington for possible inclusion in
future Pine versions is also encouraged, with the understanding that
they would be treated the same as all other Pine code in terms of
licensing and the submission does not include any software which
infringes third party rights.
The above permissions are hereby granted, provided that the Pine and
Pico copyright and trademark notices appear in all copies and that
both the above copyright notice and this permission notice appear in
supporting documentation, and that the name of the University of
Washington not be used in advertising or publicity pertaining to
distribution of the software without specific, prior written
permission, and provided you acknowledge that pursuant to U.S. laws,
Pine, Pico & Pilot software may not be downloaded, acquired or
otherwise exported or re-exported (i) into, or to a national or
resident of any country to which the U.S. has embargoed goods; or
(ii) to anyone on the U.S. Treasury Department's list of Specially
Designated Nations or the U.S. Commerce Department's Table of Denial
Orders.
By downloading the software, you represent that: 1) you are not
located in or under the control of a national or resident of any such
country or on any such list; and 2) you will not export or re-export
the software to any prohibited country, or to any prohibited person,
entity, or end-user as specified by U.S. export controls.
This software is made available "as is", and
THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR
IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF WASHINGTON BE LIABLE
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
Other licensing terms are available by mutual agreement.
Please see the Pine FAQ for more information on Pine Legal Issues.
End of Pine License and Legal Notices

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2007/10/20 21:13:35 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2007/10/20 22:09:08 deraadt Exp $
@pkgpath ${BASE_PKGPATH}
@pkgpath ${BASE_PKGPATH},kerberos
bin/pine
@ -8,7 +8,6 @@ bin/rpload
@man man/man1/rpdump.1
@man man/man1/rpload.1
share/doc/pine/
share/doc/pine/license.txt
share/doc/pine/tech-notes.txt
@extra ${SYSCONFDIR}/pine.conf
@extra ${SYSCONFDIR}/pine.conf.fixed