From owner-svn-src-all@freebsd.org Fri Aug 23 17:40:58 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9E149CAA48; Fri, 23 Aug 2019 17:40:58 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46FTG24S8Rz41v8; Fri, 23 Aug 2019 17:40:58 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A4A920165; Fri, 23 Aug 2019 17:40:58 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7NHewpe048978; Fri, 23 Aug 2019 17:40:58 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7NHemrf047983; Fri, 23 Aug 2019 17:40:48 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201908231740.x7NHemrf047983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 23 Aug 2019 17:40:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r351432 - in stable/11/contrib/telnet: arpa libtelnet telnet telnetd X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/11/contrib/telnet: arpa libtelnet telnet telnetd X-SVN-Commit-Revision: 351432 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Aug 2019 17:40:58 -0000 Author: emaste Date: Fri Aug 23 17:40:47 2019 New Revision: 351432 URL: https://svnweb.freebsd.org/changeset/base/351432 Log: MFC r351070: telnet: remove 3rd clause from Berkeley copyrights Per the July 22, 1999 letter (in /COPYRIGHT) from William Hoskins Director, Office of Technology Licensing University of California, Berkeley Modified: stable/11/contrib/telnet/arpa/telnet.h stable/11/contrib/telnet/libtelnet/auth-proto.h stable/11/contrib/telnet/libtelnet/auth.c stable/11/contrib/telnet/libtelnet/auth.h stable/11/contrib/telnet/libtelnet/enc-proto.h stable/11/contrib/telnet/libtelnet/enc_des.c stable/11/contrib/telnet/libtelnet/encrypt.c stable/11/contrib/telnet/libtelnet/encrypt.h stable/11/contrib/telnet/libtelnet/genget.c stable/11/contrib/telnet/libtelnet/getent.c stable/11/contrib/telnet/libtelnet/kerberos.c stable/11/contrib/telnet/libtelnet/kerberos5.c stable/11/contrib/telnet/libtelnet/key-proto.h stable/11/contrib/telnet/libtelnet/krb4encpwd.c stable/11/contrib/telnet/libtelnet/misc-proto.h stable/11/contrib/telnet/libtelnet/misc.c stable/11/contrib/telnet/libtelnet/misc.h stable/11/contrib/telnet/libtelnet/read_password.c stable/11/contrib/telnet/libtelnet/rsaencpwd.c stable/11/contrib/telnet/telnet/authenc.c stable/11/contrib/telnet/telnet/commands.c stable/11/contrib/telnet/telnet/defines.h stable/11/contrib/telnet/telnet/externs.h stable/11/contrib/telnet/telnet/fdset.h stable/11/contrib/telnet/telnet/general.h stable/11/contrib/telnet/telnet/main.c stable/11/contrib/telnet/telnet/network.c stable/11/contrib/telnet/telnet/ring.c stable/11/contrib/telnet/telnet/ring.h stable/11/contrib/telnet/telnet/sys_bsd.c stable/11/contrib/telnet/telnet/telnet.1 stable/11/contrib/telnet/telnet/telnet.c stable/11/contrib/telnet/telnet/terminal.c stable/11/contrib/telnet/telnet/types.h stable/11/contrib/telnet/telnet/utilities.c stable/11/contrib/telnet/telnetd/authenc.c stable/11/contrib/telnet/telnetd/defs.h stable/11/contrib/telnet/telnetd/ext.h stable/11/contrib/telnet/telnetd/global.c stable/11/contrib/telnet/telnetd/pathnames.h stable/11/contrib/telnet/telnetd/slc.c stable/11/contrib/telnet/telnetd/state.c stable/11/contrib/telnet/telnetd/sys_term.c stable/11/contrib/telnet/telnetd/telnetd.8 stable/11/contrib/telnet/telnetd/telnetd.c stable/11/contrib/telnet/telnetd/telnetd.h stable/11/contrib/telnet/telnetd/termstat.c stable/11/contrib/telnet/telnetd/utility.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/telnet/arpa/telnet.h ============================================================================== --- stable/11/contrib/telnet/arpa/telnet.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/arpa/telnet.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/auth-proto.h ============================================================================== --- stable/11/contrib/telnet/libtelnet/auth-proto.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/auth-proto.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/auth.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/auth.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/auth.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/auth.h ============================================================================== --- stable/11/contrib/telnet/libtelnet/auth.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/auth.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/enc-proto.h ============================================================================== --- stable/11/contrib/telnet/libtelnet/enc-proto.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/enc-proto.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/enc_des.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/enc_des.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/enc_des.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/encrypt.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/encrypt.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/encrypt.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/encrypt.h ============================================================================== --- stable/11/contrib/telnet/libtelnet/encrypt.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/encrypt.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/genget.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/genget.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/genget.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/getent.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/getent.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/getent.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/kerberos.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/kerberos.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/kerberos.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/kerberos5.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/kerberos5.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/kerberos5.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/key-proto.h ============================================================================== --- stable/11/contrib/telnet/libtelnet/key-proto.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/key-proto.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/krb4encpwd.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/krb4encpwd.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/krb4encpwd.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/misc-proto.h ============================================================================== --- stable/11/contrib/telnet/libtelnet/misc-proto.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/misc-proto.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/misc.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/misc.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/misc.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/misc.h ============================================================================== --- stable/11/contrib/telnet/libtelnet/misc.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/misc.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/read_password.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/read_password.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/read_password.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/libtelnet/rsaencpwd.c ============================================================================== --- stable/11/contrib/telnet/libtelnet/rsaencpwd.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/libtelnet/rsaencpwd.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/authenc.c ============================================================================== --- stable/11/contrib/telnet/telnet/authenc.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/authenc.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/commands.c ============================================================================== --- stable/11/contrib/telnet/telnet/commands.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/commands.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/defines.h ============================================================================== --- stable/11/contrib/telnet/telnet/defines.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/defines.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/externs.h ============================================================================== --- stable/11/contrib/telnet/telnet/externs.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/externs.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/fdset.h ============================================================================== --- stable/11/contrib/telnet/telnet/fdset.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/fdset.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/general.h ============================================================================== --- stable/11/contrib/telnet/telnet/general.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/general.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/main.c ============================================================================== --- stable/11/contrib/telnet/telnet/main.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/main.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/network.c ============================================================================== --- stable/11/contrib/telnet/telnet/network.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/network.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/ring.c ============================================================================== --- stable/11/contrib/telnet/telnet/ring.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/ring.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/ring.h ============================================================================== --- stable/11/contrib/telnet/telnet/ring.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/ring.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/sys_bsd.c ============================================================================== --- stable/11/contrib/telnet/telnet/sys_bsd.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/sys_bsd.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/telnet.1 ============================================================================== --- stable/11/contrib/telnet/telnet/telnet.1 Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/telnet.1 Fri Aug 23 17:40:47 2019 (r351432) @@ -9,11 +9,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: stable/11/contrib/telnet/telnet/telnet.c ============================================================================== --- stable/11/contrib/telnet/telnet/telnet.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/telnet.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/terminal.c ============================================================================== --- stable/11/contrib/telnet/telnet/terminal.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/terminal.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/types.h ============================================================================== --- stable/11/contrib/telnet/telnet/types.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/types.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnet/utilities.c ============================================================================== --- stable/11/contrib/telnet/telnet/utilities.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnet/utilities.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/authenc.c ============================================================================== --- stable/11/contrib/telnet/telnetd/authenc.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/authenc.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/defs.h ============================================================================== --- stable/11/contrib/telnet/telnetd/defs.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/defs.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/ext.h ============================================================================== --- stable/11/contrib/telnet/telnetd/ext.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/ext.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/global.c ============================================================================== --- stable/11/contrib/telnet/telnetd/global.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/global.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/pathnames.h ============================================================================== --- stable/11/contrib/telnet/telnetd/pathnames.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/pathnames.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/slc.c ============================================================================== --- stable/11/contrib/telnet/telnetd/slc.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/slc.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/state.c ============================================================================== --- stable/11/contrib/telnet/telnetd/state.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/state.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/sys_term.c ============================================================================== --- stable/11/contrib/telnet/telnetd/sys_term.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/sys_term.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/telnetd.8 ============================================================================== --- stable/11/contrib/telnet/telnetd/telnetd.8 Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/telnetd.8 Fri Aug 23 17:40:47 2019 (r351432) @@ -9,11 +9,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" Modified: stable/11/contrib/telnet/telnetd/telnetd.c ============================================================================== --- stable/11/contrib/telnet/telnetd/telnetd.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/telnetd.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/telnetd.h ============================================================================== --- stable/11/contrib/telnet/telnetd/telnetd.h Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/telnetd.h Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/termstat.c ============================================================================== --- stable/11/contrib/telnet/telnetd/termstat.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/termstat.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: stable/11/contrib/telnet/telnetd/utility.c ============================================================================== --- stable/11/contrib/telnet/telnetd/utility.c Fri Aug 23 17:39:59 2019 (r351431) +++ stable/11/contrib/telnet/telnetd/utility.c Fri Aug 23 17:40:47 2019 (r351432) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. *