From 9c3d5acd8e6b9cb608411fcf97689fdf0daa9b37 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 10 Nov 2018 17:40:34 +0100 Subject: [PATCH] fixed license in libretroshare --- libretroshare/src/libretroshare.pro | 2 + libretroshare/src/retroshare/rstypes.h | 2 +- libretroshare/src/rsserver/p3face-config.cc | 47 +++++++++---------- libretroshare/src/rsserver/p3face-info.cc | 46 +++++++++--------- libretroshare/src/rsserver/p3face-server.cc | 47 +++++++++---------- libretroshare/src/rsserver/rsloginhandler.cc | 22 +++++++++ libretroshare/src/rsserver/rsloginhandler.h | 22 +++++++++ libretroshare/src/rsserver/rstypes.cc | 47 +++++++++---------- libretroshare/src/tcponudp/rsudpstack.h | 49 +++++++++----------- libretroshare/src/upnp/UPnPBase.cpp | 48 +++++++++---------- libretroshare/src/upnp/UPnPBase.h | 48 +++++++++---------- libretroshare/src/util/argstream.h | 42 ++++++++--------- libretroshare/src/util/rsexpr.cc | 46 +++++++++--------- 13 files changed, 241 insertions(+), 227 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 703557cb7..6212dab30 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -101,6 +101,7 @@ HEADERS += tcponudp/udppeer.h \ tcponudp/tcpstream.h \ tcponudp/tou.h \ tcponudp/udprelay.h \ + tcponudp/rsudpstack.h \ pqi/pqissludp.h \ SOURCES += tcponudp/udppeer.cc \ @@ -493,6 +494,7 @@ HEADERS += util/folderiterator.h \ util/rsmemory.h \ util/smallobject.h \ util/rsdir.h \ + util/argstream.h \ util/rsdiscspace.h \ util/rsnet.h \ util/extaddrfinder.h \ diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index 137939fc8..1221f806c 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -1,5 +1,5 @@ /******************************************************************************* - * libretroshare/src/retroshare: rsturtle.h * + * libretroshare/src/rsserver: rstypes.h * * * * libretroshare: retroshare core library * * * diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc index da998a16a..8e4bf64cb 100644 --- a/libretroshare/src/rsserver/p3face-config.cc +++ b/libretroshare/src/rsserver/p3face-config.cc @@ -1,29 +1,24 @@ - -/* - * "$Id: p3face-config.cc,v 1.4 2007-05-05 16:10:05 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/rsserver: p3face-config.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2004-2006 by Robert Fernie. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "rsserver/p3face.h" diff --git a/libretroshare/src/rsserver/p3face-info.cc b/libretroshare/src/rsserver/p3face-info.cc index a94368a93..e3478aa4e 100644 --- a/libretroshare/src/rsserver/p3face-info.cc +++ b/libretroshare/src/rsserver/p3face-info.cc @@ -1,28 +1,24 @@ - -/* - * "$Id: p3face-info.cc,v 1.5 2007-04-15 18:45:23 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2015 by RetroShare Team. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * libretroshare/src/rsserver: p3face-info.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2015 by RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "rsserver/p3face.h" #include diff --git a/libretroshare/src/rsserver/p3face-server.cc b/libretroshare/src/rsserver/p3face-server.cc index a66be6aa5..6d9581bc7 100644 --- a/libretroshare/src/rsserver/p3face-server.cc +++ b/libretroshare/src/rsserver/p3face-server.cc @@ -1,29 +1,24 @@ - -/* - * "$Id: p3face-server.cc,v 1.5 2007-04-15 18:45:23 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/rsserver: p3face-server.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2015 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "util/rstime.h" #include "rsserver/p3face.h" diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc index 263d62ce3..96c72bf4d 100644 --- a/libretroshare/src/rsserver/rsloginhandler.cc +++ b/libretroshare/src/rsserver/rsloginhandler.cc @@ -1,3 +1,25 @@ +/******************************************************************************* + * libretroshare/src/rsserver: rsloginhandler.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2018 retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include #include #include diff --git a/libretroshare/src/rsserver/rsloginhandler.h b/libretroshare/src/rsserver/rsloginhandler.h index f3c6a5928..1c95a741b 100644 --- a/libretroshare/src/rsserver/rsloginhandler.h +++ b/libretroshare/src/rsserver/rsloginhandler.h @@ -1,3 +1,25 @@ +/******************************************************************************* + * libretroshare/src/rsserver: rsloginhandler.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2018 retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once #include diff --git a/libretroshare/src/rsserver/rstypes.cc b/libretroshare/src/rsserver/rstypes.cc index d804bf6e9..1e6ec33ab 100644 --- a/libretroshare/src/rsserver/rstypes.cc +++ b/libretroshare/src/rsserver/rstypes.cc @@ -1,29 +1,24 @@ - -/* - * "$Id: rstypes.cc,v 1.2 2007-04-07 08:41:00 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/rsserver: rstypes.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2004-2006 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ /* Insides of RetroShare interface. * only prints stuff out at the moment diff --git a/libretroshare/src/tcponudp/rsudpstack.h b/libretroshare/src/tcponudp/rsudpstack.h index ac1408a05..e72e67f5e 100644 --- a/libretroshare/src/tcponudp/rsudpstack.h +++ b/libretroshare/src/tcponudp/rsudpstack.h @@ -1,33 +1,28 @@ +/******************************************************************************* + * libretroshare/src/tcponudp: rsudpstack.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2012-2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #ifndef RS_UDP_STACK_RECEIVER_H #define RS_UDP_STACK_RECEIVER_H -/* - * tcponudp/rsudpstack.h - * - * libretroshare. - * - * Copyright 2010 by Robert Fernie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 3 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -/*******************************************************/ #ifdef RS_USE_BITDHT #include "udp/udpstack.h" diff --git a/libretroshare/src/upnp/UPnPBase.cpp b/libretroshare/src/upnp/UPnPBase.cpp index dd99a4bc8..75421b2f7 100644 --- a/libretroshare/src/upnp/UPnPBase.cpp +++ b/libretroshare/src/upnp/UPnPBase.cpp @@ -1,28 +1,26 @@ -// -// This file is part of the aMule Project. -// -// Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) -// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org ) -// Copyright (c) 2009-2010 Retroshare Team -// -// -// 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. -// You are also granted to use it with the LGPL License -// -// 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 or the LGPL -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -// - -//This file uses libupnp +/******************************************************************************* + * libretroshare/src/upnp: UPnPBase.cpp * + * * + * libretroshare: retroshare core library * + * * + * Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) * + * Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org)* + * Copyright (c) 2009-2010 Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #define UPNP_C diff --git a/libretroshare/src/upnp/UPnPBase.h b/libretroshare/src/upnp/UPnPBase.h index 8fed1014b..59057c7e1 100644 --- a/libretroshare/src/upnp/UPnPBase.h +++ b/libretroshare/src/upnp/UPnPBase.h @@ -1,28 +1,26 @@ -// -// This file is part of the aMule Project. -// -// Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) -// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org ) -// Copyright (c) 2009-2010 Retroshare Team -// -// -// 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. -// You are also granted to use it with the LGPL License -// -// 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 or the LGPL -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -// - -//This file uses libupnp +/******************************************************************************* + * libretroshare/src/upnp: UPnPBase.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) * + * Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org)* + * Copyright (c) 2009-2010 Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/libretroshare/src/util/argstream.h b/libretroshare/src/util/argstream.h index 1044effbd..ede11ec2e 100644 --- a/libretroshare/src/util/argstream.h +++ b/libretroshare/src/util/argstream.h @@ -1,24 +1,24 @@ -/* Copyright (C) 2004 Xavier Decoret - * - * argstream is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * This licence has been changed from GPL to LPGL, with permission - * of the original author. (August 2013). - * - */ +/******************************************************************************* + * libretroshare/src/util: argstream.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2004 Xavier Decoret * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef ARGSTREAM_H #define ARGSTREAM_H diff --git a/libretroshare/src/util/rsexpr.cc b/libretroshare/src/util/rsexpr.cc index 801e4fcb0..dff5a5fa5 100644 --- a/libretroshare/src/util/rsexpr.cc +++ b/libretroshare/src/util/rsexpr.cc @@ -1,28 +1,24 @@ -/* - * rs-core/src/dbase: rsexpr.cc - * - * RetroShare C++ Interface. - * - * Copyright 2007-2008 by Kashif Kaleem. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/retroshare: rsexpr.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2007-2008 by Kashif Kaleem * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "retroshare/rsexpr.h" #include "retroshare/rstypes.h"