commit e482a8f18911bc05ca3cba7a9e468f7a68fd0e1c Author: Robert Hogan robert@roberthogan.net Date: Mon Feb 14 20:11:51 2011 +0000
Tidy up the file copyrights --- src/common.c | 11 ++--------- src/common.h | 12 +++--------- src/darwin_warts.c | 20 ++++++++++++++++++++ src/dead_pool.c | 12 ++---------- src/dead_pool.h | 12 ++---------- src/parser.c | 11 ++--------- src/torsocks.c | 31 ++----------------------------- src/tsocks.h | 11 ++--------- src/usewithtor.in | 5 +---- 9 files changed, 36 insertions(+), 89 deletions(-)
diff --git a/src/common.c b/src/common.c index 2f7e233..53a60b2 100644 --- a/src/common.c +++ b/src/common.c @@ -1,9 +1,7 @@ /*************************************************************************** * * - * $Id: common.c,v 1.2 2008-07-06 15:17:35 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by Robert Hogan * - * robert@roberthogan.net * + * Copyright (C) 2000-2008 Shaun Clowes delius@progsoc.org * + * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * * * * 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 * @@ -25,11 +23,6 @@ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. * * Copyright (c) 2007-2008, The Tor Project, Inc. * * * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * * ***************************************************************************/ /*
diff --git a/src/common.h b/src/common.h index 811e7fa..656aefb 100644 --- a/src/common.h +++ b/src/common.h @@ -1,9 +1,7 @@ /*************************************************************************** * * - * $Id: common.h,v 1.2 2008-07-06 15:17:35 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by Robert Hogan * - * robert@roberthogan.net * + * Copyright (C) 2000-2008 Shaun Clowes delius@progsoc.org * + * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * * * * 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 * @@ -19,12 +17,8 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * * ***************************************************************************/ + /* Common functions provided in common.c */ /* GCC has several useful attributes. */ #include <sys/types.h> diff --git a/src/darwin_warts.c b/src/darwin_warts.c index c35ed8b..2222cf2 100644 --- a/src/darwin_warts.c +++ b/src/darwin_warts.c @@ -1,3 +1,23 @@ +/*************************************************************************** + * * + * Copyright (C) 2010 Alex Rosenberg alex@ohmantics.net * + * * + * 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., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + /* Mac OS X 10.6 forces any function named "select" to be named "_select$1050" * in the output to the assembler. We need to patch select as well, so this * isolated code exists without tripping over the Darwin header that causes the diff --git a/src/dead_pool.c b/src/dead_pool.c index 13fadc7..3a6f243 100644 --- a/src/dead_pool.c +++ b/src/dead_pool.c @@ -1,9 +1,7 @@ /*************************************************************************** * * - * $Id: dead_pool.c,v 1.3 2008-07-07 20:04:49 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by Robert Hogan * - * robert@roberthogan.net * + * Copyright (C) 2005 Total Information Security Ltd. * + * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * * * * 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 * @@ -19,12 +17,6 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * * - * This is a modified version of a source file from the TIA tor-dns . * - * patch for tsocks. (See the patches directory for more info.) * - * The original source file contained no copyright notice. * - * * ***************************************************************************/
#include <stdio.h> diff --git a/src/dead_pool.h b/src/dead_pool.h index 9c1d453..d6e3e10 100644 --- a/src/dead_pool.h +++ b/src/dead_pool.h @@ -1,9 +1,7 @@ /*************************************************************************** * * - * $Id: dead_pool.h,v 1.4 2008-07-06 15:29:10 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by Robert Hogan * - * robert@roberthogan.net * + * Copyright (C) 2005 Total Information Security Ltd. * + * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * * * * 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 * @@ -19,12 +17,6 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * * - * This is a modified version of a source file from the TIA tor-dns . * - * patch for tsocks. (See the patches directory for more info.) * - * The original source file contained no copyright notice. * - * * ***************************************************************************/
#ifndef _DEAD_POOL_H diff --git a/src/parser.c b/src/parser.c index 5619ed2..fe4af0f 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,9 +1,7 @@ /*************************************************************************** * * - * $Id: parser.c,v 1.3 2008-07-06 15:17:35 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by Robert Hogan * - * robert@roberthogan.net * + * Copyright (C) 2000-2008 Shaun Clowes delius@progsoc.org * + * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * * * * 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 * @@ -19,11 +17,6 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * (Source file contained no copyright information.) * ***************************************************************************/ /*
diff --git a/src/torsocks.c b/src/torsocks.c index a227469..538a182 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -1,9 +1,8 @@ /*************************************************************************** * * - * $Id: tsocks.c,v 1.5 2008-07-06 15:17:35 hoganrobert Exp $ * * * - * Copyright (C) 2008 by Robert Hogan * - * robert@roberthogan.net * + * Copyright (C) 2000-2008 Shaun Clowes delius@progsoc.org * + * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * * * * 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 * @@ -19,33 +18,7 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * * ***************************************************************************/ -/* - - TSOCKS - Wrapper library for transparent SOCKS - - Copyright (C) 2000 Shaun Clowes - - 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. - -*/
/* PreProcessor Defines */ #include <config.h> diff --git a/src/tsocks.h b/src/tsocks.h index 392bccf..b637331 100644 --- a/src/tsocks.h +++ b/src/tsocks.h @@ -1,9 +1,7 @@ /*************************************************************************** * * - * $Id: tsocks.h,v 1.2 2008-07-06 15:17:35 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by Robert Hogan * - * robert@roberthogan.net * + * Copyright (C) 2000-2008 Shaun Clowes delius@progsoc.org * + * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * * * * 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 * @@ -19,11 +17,6 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * (Original file contained no copyright information) * ***************************************************************************/ /* tsocks.h - Structures used by tsocks to form SOCKS requests */
diff --git a/src/usewithtor.in b/src/usewithtor.in index ac25fe9..0a1e42d 100644 --- a/src/usewithtor.in +++ b/src/usewithtor.in @@ -1,10 +1,7 @@ #! /bin/sh # *************************************************************************** # * * -# * $Id: usewithtor.in,v 1.3 2008-07-06 15:17:35 hoganrobert Exp $* -# * * -# * Copyright (C) 2008 by Robert Hogan * -# * robert@roberthogan.net * +# * Copyright (C) 2008-2011 Robert Hogan robert@roberthogan.net * # * * # * 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 *