From 585e43ae66ac49e6271a2eba5b167c4add171354 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 12 Dec 2011 16:22:11 +0200 Subject: [PATCH] core cleanup: the final chapter Copyright notices from sipe.c have been moved to sipe-core.c to preserve them for the future. Removed sipe.c. It's done. Finally... Updated AUTHORS & ChangeLog. --- AUTHORS | 6 +++--- ChangeLog | 17 ++++++++++++++-- src/core/sipe-core.c | 40 ++++++++++++++++++++++++++++++++++++++ src/core/sipe.c | 55 ---------------------------------------------------- 4 files changed, 58 insertions(+), 60 deletions(-) delete mode 100644 src/core/sipe.c diff --git a/AUTHORS b/AUTHORS index 30349a68..dcbb175d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,19 +2,19 @@ Maintainers: Anibal Avelar Stefan Becker -pier11 Jakub Adam -Tomáš Hrabčík +Jochen De Smet (Miranda port) Retired Maintainers: +Tomáš Hrabčík +pier11 Gabriel Burt Daniel Beichl Crazy Patch Writers: Jakub 'jimmac' Steiner (icon artwork) -Jochen De Smet (Miranda port) Matt Meissner (Adium port) Michael Steffens Carl Seutter diff --git a/ChangeLog b/ChangeLog index 90c8ebae..b44a0549 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,23 @@ -version 1.XX.0 "TLSDSK" (201X-XX-XX) +version 1.13.0 "Lync & Office365" (2012-XX-XX) + - added TLS-DSK authentication scheme support (Stefan Becker) + * TLS-DSK has been introduced in Lync + * it is mandatory for Office365 accounts + * it has also been verified for non-public Lync installation + - added experimental media TCP transport (Jakub Adam) + - completed cleanup: core no longer requires libpurple (Stefan Becker) + - refactored crypto code, ie. NSS can replaced if necessary (Stefan Becker) + - sipe-domino.c is no longer built under UNIX to remove dead code (Stefan Becker) + - restricted XXX_CFLAGS to modules that need them (Stefan Becker) - NSS is now a mandatory build requirement (Stefan Becker) + - decoupled SSPI from HAVE_LIBKRB5 flag. New flag is HAVE_SSPI (Stefan Becker) + - OBS mingw packages now use SSPI instead of NTLM (Stefan Becker) + - added NSIS package generation to OBS mingw packages (Stefan Becker) + - removed kopete backend. KDE is moving to telepathy (Stefan Becker) version 1.12.0 "Group Chat" (2011-08-29) - Feature #3064877: Add support for OCS2007R2 Group Chat (Stefan Becker) - Feature #3311026: Support for HTTP/1.1 Transfer-Encoding: chunked (Stefan Becker) - - Fixed #2834758: First NTLM signature check after startup fails (Stefan Becker) + - Fixed #2834758: First NTLM signature check after startup fails (Stefan Becker) - Fixed #3082602: Crash on Autodiscover (Stefan Becker) - Fixed #3090663: Re-authentication fails (Stefan Becker) - Fixed #3092324: Core dump in "make check" (psfales) diff --git a/src/core/sipe-core.c b/src/core/sipe-core.c index 795c3e6d..5c2a1123 100644 --- a/src/core/sipe-core.c +++ b/src/core/sipe-core.c @@ -18,6 +18,46 @@ * 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 + * + * + * Some notes on the history of this project/code/copyrights: + * + * - the project is called SIPE, but originally the code was only written + * for the libpurple framework, i.e. Pidgin. Hence the package name is + * "pidgin-sipe". + * + * - in the beginning almost all of the code was located in a module + * called "sipe.c". During the effort to remove the libpurple + * dependencies from the SIPE core, thousands of lines of code got + * shifted out of sipe.c, mostly to newly created modules and sipe.c + * ceased to exist. + * + * - it would have been tedious to track down the original author or + * copyright and preserve them for each line of code that was moved. + * Therefore the new modules started with a fresh copyright notice + * (like the one above). + * + * - the original copyright notices from sipe.c have been moved to this + * file (see below) and *MUST* be preserved! + * + * - if necessary the author of a line of code in question can still be + * reconstructed from the git repository information. + * See also "man git-blame" + * + * - if you think your copyright should be restored for a piece of code, + * then please contact the SIPE project to fix the source files ASAP. + * + *------------------- Copyright notices from "sipe.c" --------------- + * Copyright (C) 2010-11 SIPE Project + * Copyright (C) 2009-10 pier11 + * Copyright (C) 2008 Novell, Inc. + * Copyright (C) 2007-09 Anibal Avelar + * Copyright (C) 2005 Thomas Butter + * + * *** + * Thanks to Google's Summer of Code Program and the helpful mentors + * *** + *------------------- Copyright notices from "sipe.c" --------------- */ #ifdef HAVE_CONFIG_H diff --git a/src/core/sipe.c b/src/core/sipe.c deleted file mode 100644 index bcdf013a..00000000 --- a/src/core/sipe.c +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file sipe.c - * - ***************************************************************************** - *** !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! *** - *** *** - *** THIS MODULE IS NO LONGER COMPILED *** - *** *** - *** YES, IT IS INTENTIONALLY BROKEN.... *** - *** *** - *** DO NOT ADD ANY NEW CODE TO THIS MODULE *** - *** *** - *** !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! *** - ***************************************************************************** - * - * pidgin-sipe - * - * Copyright (C) 2010-11 SIPE Project - * Copyright (C) 2010 pier11 - * Copyright (C) 2009 Anibal Avelar - * Copyright (C) 2009 pier11 - * Copyright (C) 2008 Novell, Inc., Anibal Avelar - * Copyright (C) 2007 Anibal Avelar - * Copyright (C) 2005 Thomas Butter - * - * *** - * Thanks to Google's Summer of Code Program and the helpful mentors - * *** - * - * Session-based SIP MESSAGE documentation: - * http://tools.ietf.org/html/draft-ietf-simple-im-session-00 - * - * 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 - */ - -/* - Local Variables: - mode: c - c-file-style: "bsd" - indent-tabs-mode: t - tab-width: 8 - End: -*/ -- 2.11.4.GIT