------------------------------------------------------------ revno: 13561 revision-id: squid3@treenet.co.nz-20140828050721-kthqpsi1faqkb4i1 parent: squid3@treenet.co.nz-20140828045201-8wtko8h0sbw0klss committer: Amos Jeffries branch nick: trunk timestamp: Wed 2014-08-27 22:07:21 -0700 message: Boilerplate: update copyright blurbs on lib/librfcnb * Add Squid Software Foundation blurb * Update CONTRIBUTORS with missing authors * Update CREDITS with missing license blurb ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140828050721-kthqpsi1faqkb4i1 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: de95b059d2e996cc76252e31ecbf32dbe1ff55f6 # timestamp: 2014-08-28 05:58:59 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140828045201-\ # 8wtko8h0sbw0klss # # Begin patch === modified file 'CONTRIBUTORS' --- CONTRIBUTORS 2014-08-28 04:45:04 +0000 +++ CONTRIBUTORS 2014-08-28 05:07:21 +0000 @@ -26,6 +26,7 @@ Andrew Beverley Andrew Hoying Andrey Shorin + Andrew Tridgell Anonymous Ansgar Hockmann Anthony Baxter @@ -210,6 +211,7 @@ Rene Geile Reuben Farrelly Richard Huveneers + Richard Sharpe Richard Wall Robert Collins Robert Collins === modified file 'CREDITS' --- CREDITS 2014-08-26 02:39:30 +0000 +++ CREDITS 2014-08-28 05:07:21 +0000 @@ -794,6 +794,24 @@ ============================================================================== +lib/rfcnb/: + + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +============================================================================== + lib/base64.c::base64_encode(): Adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c. === modified file 'lib/rfcnb/Makefile.am' --- lib/rfcnb/Makefile.am 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/Makefile.am 2014-08-28 05:07:21 +0000 @@ -1,3 +1,10 @@ +## Copyright (C) 1996-2014 The Squid Software Foundation and contributors +## +## Squid software is distributed under GPLv2+ license and includes +## contributions from numerous individuals and organizations. +## Please see the COPYING and CONTRIBUTORS files for details. +## + include $(top_srcdir)/src/Common.am AM_CPPFLAGS += -I$(top_srcdir)/lib === modified file 'lib/rfcnb/byteorder.h' --- lib/rfcnb/byteorder.h 2012-08-28 13:00:30 +0000 +++ lib/rfcnb/byteorder.h 2014-08-28 05:07:21 +0000 @@ -1,9 +1,19 @@ /* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ + +/* * Unix SMB/Netbios implementation. * Version 1.9. * SMB Byte handling * Copyright (C) Andrew Tridgell 1992-1995 - * + */ + +/* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or === modified file 'lib/rfcnb/rfcnb-common.h' --- lib/rfcnb/rfcnb-common.h 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/rfcnb-common.h 2014-08-28 05:07:21 +0000 @@ -1,10 +1,17 @@ +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ + /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * * Version 1.0 * RFCNB Common Structures etc Defines * * Copyright (C) Richard Sharpe 1996 - * */ /* === modified file 'lib/rfcnb/rfcnb-error.h' --- lib/rfcnb/rfcnb-error.h 2010-12-14 14:01:14 +0000 +++ lib/rfcnb/rfcnb-error.h 2014-08-28 05:07:21 +0000 @@ -1,10 +1,17 @@ +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ + /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * * Version 1.0 * RFCNB Error Response Defines * * Copyright (C) Richard Sharpe 1996 - * */ /* === modified file 'lib/rfcnb/rfcnb-io.c' --- lib/rfcnb/rfcnb-io.c 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/rfcnb-io.c 2014-08-28 05:07:21 +0000 @@ -1,4 +1,10 @@ -#include "squid.h" +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ /* UNIX RFCNB (RFC1001/RFC1002) NEtBIOS implementation * @@ -6,7 +12,6 @@ * RFCNB IO Routines ... * * Copyright (C) Richard Sharpe 1996 - * */ /* @@ -25,17 +30,18 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" #include "rfcnb/rfcnb-io.h" #include "rfcnb/rfcnb-priv.h" #include "rfcnb/rfcnb-util.h" #include "rfcnb/std-includes.h" + +#if HAVE_STRING_H +#include +#endif #include #include -#if HAVE_STRING_H -#include -#endif - int RFCNB_Timeout = 0; /* Timeout in seconds ... */ static int RFCNB_Discard_Rest(struct RFCNB_Con *con, int len); === modified file 'lib/rfcnb/rfcnb-io.h' --- lib/rfcnb/rfcnb-io.h 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/rfcnb-io.h 2014-08-28 05:07:21 +0000 @@ -1,5 +1,10 @@ -#ifndef _SQUID__LIB_RFCNB_RFCNB_IO_H -#define _SQUID__LIB_RFCNB_RFCNB_IO_H +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * @@ -7,7 +12,6 @@ * RFCNB IO Routines Defines * * Copyright (C) Richard Sharpe 1996 - * */ /* @@ -26,6 +30,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef _SQUID__LIB_RFCNB_RFCNB_IO_H +#define _SQUID__LIB_RFCNB_RFCNB_IO_H + #include "rfcnb/rfcnb.h" int RFCNB_Put_Pkt(struct RFCNB_Con *con, struct RFCNB_Pkt *pkt, int len); === modified file 'lib/rfcnb/rfcnb-priv.h' --- lib/rfcnb/rfcnb-priv.h 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/rfcnb-priv.h 2014-08-28 05:07:21 +0000 @@ -1,10 +1,17 @@ +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ + /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * * Version 1.0 * RFCNB Defines * * Copyright (C) Richard Sharpe 1996 - * */ /* === modified file 'lib/rfcnb/rfcnb-util.c' --- lib/rfcnb/rfcnb-util.c 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/rfcnb-util.c 2014-08-28 05:07:21 +0000 @@ -1,4 +1,10 @@ -#include "squid.h" +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * @@ -6,7 +12,6 @@ * RFCNB Utility Routines ... * * Copyright (C) Richard Sharpe 1996 - * */ /* @@ -25,6 +30,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" #include "rfcnb/rfcnb-io.h" #include "rfcnb/rfcnb-priv.h" #include "rfcnb/rfcnb-util.h" === modified file 'lib/rfcnb/rfcnb-util.h' --- lib/rfcnb/rfcnb-util.h 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/rfcnb-util.h 2014-08-28 05:07:21 +0000 @@ -1,5 +1,10 @@ -#ifndef _RFCNB_RFCNB_UTIL_H -#define _RFCNB_RFCNB_UTIL_H +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * @@ -7,7 +12,6 @@ * RFCNB Utility Defines * * Copyright (C) Richard Sharpe 1996 - * */ /* @@ -26,6 +30,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef _RFCNB_RFCNB_UTIL_H +#define _RFCNB_RFCNB_UTIL_H + #include "rfcnb/std-includes.h" void RFCNB_CvtPad_Name(char *name1, char *name2); === modified file 'lib/rfcnb/rfcnb.h' --- lib/rfcnb/rfcnb.h 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/rfcnb.h 2014-08-28 05:07:21 +0000 @@ -1,10 +1,17 @@ +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ + /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * * Version 1.0 * RFCNB Defines * * Copyright (C) Richard Sharpe 1996 - * */ /* === modified file 'lib/rfcnb/session.c' --- lib/rfcnb/session.c 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/session.c 2014-08-28 05:07:21 +0000 @@ -1,4 +1,10 @@ -#include "squid.h" +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation * @@ -6,7 +12,6 @@ * Session Routines ... * * Copyright (C) Richard Sharpe 1996 - * */ /* @@ -25,6 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" + int RFCNB_errno = 0; int RFCNB_saved_errno = 0; #define RFCNB_ERRNO === modified file 'lib/rfcnb/std-includes.h' --- lib/rfcnb/std-includes.h 2014-08-23 10:39:15 +0000 +++ lib/rfcnb/std-includes.h 2014-08-28 05:07:21 +0000 @@ -1,4 +1,11 @@ -/* RFCNB Standard includes ... */ +/* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + */ + /* * * RFCNB Standard Includes @@ -6,8 +13,6 @@ * Copyright (C) 1996, Richard Sharpe */ -/* One day we will conditionalize these on OS types ... */ - /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,9 +28,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #ifndef _RFCNB_STD_INCLUDES_H #define _RFCNB_STD_INCLUDES_H +/* RFCNB Standard includes ... */ +/* One day we will conditionalize these on OS types ... */ + #define BOOL int typedef short int16;