From 0e23f5384ba0b5f5edcb6ea31da11dfd247d162a Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Wed, 11 May 2011 14:00:37 +0200 Subject: [PATCH] Switch license from Intranator license to GPLv2 + linking exception (ACKed by Steffen) --- CMakeLists.txt | 2 +- LICENSE | 346 --------------------------------------- configlib/i2n_global_config.cpp | 23 +++- configlib/i2n_global_config.hpp | 23 +++- libi2ncommon.spec | 10 +- src/cron.cpp | 20 ++- src/cron.hpp | 21 ++- src/daemonfunc.cpp | 21 ++- src/daemonfunc.hpp | 21 ++- src/exception.hxx | 23 +++- src/filefunc.cpp | 20 ++- src/filefunc.hxx | 20 ++- src/i18n.cpp | 20 ++- src/i18n.h | 20 ++- src/i2n_configdata.hpp | 24 +++- src/i2n_configfile.cpp | 24 +++- src/i2n_configfile.hpp | 24 +++- src/insocketstream.hxx | 20 ++- src/ip_type.hxx | 20 ++- src/ipfunc.cpp | 20 ++- src/ipfunc.hxx | 20 ++- src/log_macros.hpp | 24 +++- src/logfunc.cpp | 22 ++- src/logfunc.hpp | 22 ++- src/logread.cpp | 19 ++ src/logread.hxx | 22 +++- src/oftmpstream.cpp | 19 ++ src/oftmpstream.hxx | 19 ++ src/pidfile.cpp | 20 ++- src/pidfile.hpp | 20 ++- src/pipestream.hxx | 20 ++- src/pointer_func.cpp | 24 +++- src/pointer_func.hpp | 23 +++- src/source_track_basics.cpp | 22 ++- src/source_track_basics.hpp | 22 ++- src/stringfunc.cpp | 21 ++- src/stringfunc.hxx | 21 ++- src/timefunc.cpp | 22 ++- src/timefunc.hxx | 22 ++- src/tmpfstream.cpp | 23 ++- src/tmpfstream.hpp | 23 ++- src/tmpfstream_impl.hpp | 23 ++- src/tracefunc.cpp | 22 ++- src/tracefunc.hpp | 25 +++- src/tribool.cpp | 21 ++- src/tribool.hpp | 21 ++- src/userfunc.cpp | 22 ++- src/userfunc.hpp | 22 ++- src/week.cpp | 19 ++ src/week.hpp | 22 ++- test/ip_range.cpp | 20 ++- test/stringfunc.cpp | 20 ++- test/test_containerfunc.cpp | 21 ++- test/test_cron_interval.cpp | 21 ++- test/test_cron_point.cpp | 21 ++- test/test_filefunc.cpp | 21 ++- test/test_global_config.cpp | 21 ++- test/test_logging.cpp | 21 ++- test/test_pidfile.cpp | 20 ++- test/test_timefunc.cpp | 21 ++- test/test_tmpfstream.cpp | 21 ++- utils/containerfunc.cpp | 2 - utils/containerfunc.hpp | 4 +- utils/signalfunc.cpp | 2 - utils/signalfunc.hpp | 1 - xmllib/xmlcommon.cpp | 20 ++- xmllib/xmlcommon.hpp | 20 ++- 67 files changed, 1157 insertions(+), 489 deletions(-) delete mode 100644 LICENSE diff --git a/CMakeLists.txt b/CMakeLists.txt index 989055a..15e3347 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ set(CPACK_CMAKE_GENERATOR "Unix Makefiles") set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${PACK_ARCH}) -set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) +set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING.GPL) set(CPACK_SOURCE_GENERATOR TGZ) set(CPACK_SOURCE_IGNORE_FILES diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 591792d..0000000 --- a/LICENSE +++ /dev/null @@ -1,346 +0,0 @@ -Falls nicht anders angegeben steht diese Bibliothek unter dem -unten stehenden Intranator Software Lizenzvertrag. - -Die Bibliothek "libi2ncommon-utils" im "utils" Verzeichnis -steht unter GPL version 2 + linking exception. Siehe COPYING.GPL -sowie diesen Text: - -*************** Linking exception begin *************** -As a special exception, if other files instantiate templates or use macros -or inline functions from this file, or you compile this file and link it -with other works to produce a work based on this file, this file -does not by itself cause the resulting work to be covered -by the GNU General Public License. - -However the source code for this file must still be made available -in accordance with section (3) of the GNU General Public License. - -This exception does not invalidate any other reasons why a work based -on this file might be covered by the GNU General Public License. -*************** Linking exception end *************** - ------------------------------------------------------------------------- -WICHTIG - BITTE SORGFÄLTIG LESEN BEVOR SIE DIE SOFTWARE INSTALLIEREN - -Intranator Software Lizenzvertrag - -Version 1.2 vom 17.07.2007 - -Dieser Lizenzvertrag räumt ein nicht ausschließliches Nutzungsrecht an dem von -der Intra2net AG entwickelten "Intranator System Manager" unter den -nachfolgenden Lizenzbedingungen ein. Mit der Installation der Software erklären -Sie sich mit folgenden Lizenzbedingungen einverstanden. - -§ 1 Vertragsgegenstand - -1) Die "Intranator Software" besteht aus dem "Intranator System Manager", der -"Linux Open-Source Distribution" sowie dem Virenscanner. Gegenstand dieses -Lizenzvertrages ist - vorbehaltlich der Regelung in § 2 dieses Vertrags - nur -der "Intranator System Manager". Die "Linux Open-Source Distribution" und der -Virenscanner unterliegen eigenen Lizenzbedingungen, die den entsprechenden -RPM-Paketen beigefügt sind. - -2) Der "Intranator System Manager" besteht aus komprimierten Dateien zzgl. -Installationsprogramm (RPM-Paket), die den lauffähigen Code der von der -Intra2net AG programmierten Software enthalten. Der "Intranator System Manager" -wird nicht als Open-Source Software vertrieben. Das Copyright und alle Rechte -verbleiben bei der Intra2net AG. Die Bestandteile des "Intranator System -Manager" sind in den RPM Paketen entsprechend gekennzeichnet. - -§ 2 andere Lizenzen - -1) Zusammen mit dem "Intranator System Manager" erhalten Sie sowohl einen -Virenscanner, als auch eine Programmkopie einer "Linux Open-Source -Distribution". Die Intra2net AG überlässt Ihnen die Programmkopie der "Linux -Open-Source Distribution" unentgeltlich, weshalb sich eine Haftung der Intra2net -AG nach §§ 521 ff. BGB richtet und folglich auf Vorsatz oder grobe -Fahrlässigkeit beschränkt ist. - -2) Die für eine Benutzung der "Linux Open-Source Distribution" zwingend -erforderlichen urheberrechtlichen Nutzungsrechte an der Distribution, bekommen -Sie nicht von der Intra2net AG eingeräumt, sondern direkt von den jeweiligen -Autoren der entsprechenden Programmteile. Der Umfang Ihrer Nutzungsrechte -bestimmt sich folglich ausschließlich nach den der "Linux Open-Source -Distribution" beigefügten Lizenzbedingungen und nicht nach diesem Vertrag. - -3) Die Lizenzbedingungen, die den Open-Source Programmpaketen von den jeweiligen -Autoren zugeordneten wurden, sind vom Nutzer bei der Nutzung der gesamten -"Intranator Software", neben den Vorschriften dieses Lizenzvertrages, im Rahmen -eines direkten Nutzungsvertrages mit den jeweiligen Softwareherstellers ohne -Zwischenschaltung der Intra2net AG zu beachten. Die entsprechenden -Lizenzbedingungen sind in elektronischer Form der zugehörigen Software -beigefügt. - -4) Soweit Quelltexte der unentgeltlich überlassenen "Linux Open-Source -Distribution" der GNU General Public License (GPL) oder der GNU Lesser General -Public License (LGPL) unterliegen, bietet Ihnen die Intra2net AG (Intra2net AG, -Mömpelgarder Weg 8, 72072 Tübingen, Deutschland) hiermit an, diese Quelltexte -gegen einen Selbstkostenersatz von 10,- EUR zzgl. MwSt. und Porto auf CD an Sie -zu liefern. Dieses Angebot gilt für 3 Jahre ab Auslieferung der Software durch -Intra2net. - -5) Soweit innerhalb der überlassenen Programme Libraries genutzt werden, die -unter der LGPL lizenziert sind, werden diese entweder als shared libraries -verwendet, oder Sie können - entsprechend der hierfür vorgesehenen Regelungen in -der LGPL - die jeweiligen Quellen zu den in 4) genannten Konditionen anfordern. - -§ 3 Installation - -1) Die "Intranator Software" läuft nicht parallel mit anderen Betriebssystemen -auf einem System. Insbesondere formatiert die "Intranator Software" bei -Installation die gesamte Festplatte und löscht alle bestehenden Daten. - -2) Die "Intranator Software" arbeitet nur mit dafür vom Lizenzgeber -freigegebenen Hardwarekomponenten zusammen. Diese sind in der Dokumentation -sowie auf der Webseite www.intranator.com aufgeführt und werden regelmäßig -aktualisiert. Der Lizenzgeber hat das Recht, die Freigabe für -Hardwarekomponenten für zukünftige Versionen zurückzuziehen, z.B. wenn diese von -zukünftigen Basissystemen nicht mehr mit Gerätetreibern unterstützt werden . -Alle beim Lizenzgeber registrierten Kunden werden per Email mindestens 3 Monate -vorher darüber in Kenntnis gesetzt (Abkündigung). - -§ 4 Vervielfältigungsrechte und Zugriffsschutz - -1) Der Lizenznehmer darf einen nicht modifizierten Originaldatenträger beliebig -vervielfältigen. Lizenzcodes und Lizenzdateien dürfen nicht vervielfältigt -werden. - -2) Eine Vervielfältigung der installierten Programme und Daten ist nur -gestattet, soweit die jeweilige Vervielfältigung für die Benutzung des Programms -notwendig ist. Zu den notwendigen Vervielfältigungen zählen die Installation des -Programms vom Originaldatenträger auf den Massenspeicher der eingesetzten -Hardware sowie das Laden des Programms in den Arbeitsspeicher. - -3) Ist aus Gründen der Datensicherheit oder der Sicherstellung einer schnellen -Reaktivierung des Computersystems nach einem Totalausfall die turnusmäßige -Sicherung des gesamten Datenbestands einschließlich der eingesetzten -Computerprogramme unerlässlich, darf der Lizenznehmer Sicherungskopien in der -zwingend erforderlichen Anzahl herstellen. Die betreffenden Datenträger sind -entsprechend zu kennzeichnen. Die Sicherungskopien dürfen nur zu rein -archivarischen Zwecken verwendet werden. - -4) Der Lizenznehmer ist verpflichtet, den unbefugten Zugriff Dritter auf die -installierten Programme und Daten durch geeignete Vorkehrungen zu verhindern. -Die gelieferten Lizenzcodes sind an einem gegen den unberechtigten Zugriff -Dritter gesicherten Ort aufzubewahren. - -5) Die Mitarbeiter des Lizenznehmers sind nachdrücklich auf die Einhaltung der -vorliegenden Vertragsbedingungen sowie der Bestimmungen des Urheberrechts -hinzuweisen. - -6) Der Lizenzgeber ist berechtigt, Lizenzcodes bei Verdacht auf Verstoß gegen -diese Lizenz zu sperren, nachdem der rechtmäßige Eigentümer gegen Vorlage des -Kaufbelegs kostenfrei einen neuen Lizenzcode ausgestellt bekommen hat oder -innerhalb von 2 Wochen nach entsprechender Information kein Kaufbeleg vorgelegt -wird. - -§ 5 Nutzungsbeschränkungen - -1) Der Lizenznehmer darf die Software auf einer ihm zur Verfügung stehenden -Hardware einsetzen. Wechselt der Lizenznehmer jedoch die Hardware, muss er die -Software von der bisher verwendeten Hardware löschen. - -2) Ein zeitgleiches Einspeichern, Vorrätighalten oder Benutzen ist nur in der -Zahl der im Lizenzschein angegebenen Anzahl von Instanzen zulässig. Möchte der -Lizenznehmer die Software in mehr Instanzen zeitgleich einsetzen, muss er eine -entsprechende Anzahl von weiteren Lizenzen erwerben. - -3) Der Lizenznehmer muss eine zeitgleiche Mehrfachnutzung über die Anzahl der -erworbenen Lizenzen hinaus durch Zugriffsschutzmechanismen unterbinden. - -4) Handelt es sich um eine Lizenz mit einer Beschränkung der Benutzeranzahl, -darf das System nur von der entsprechenden Anzahl an Benutzern genutzt werden. - -5) Die Anzahl der Benutzer errechnet sich aus der Summe der Anzahlen von den im -Menüpunkt "Benutzermanager" angelegten Benutzer, den Benutzerkonten auf -Zielservern, die für durch das System weitergeleitete Emails genutzt werden, -sowie den Benutzern, die nicht im Benutzermanager angelegt sind, aber die -Möglichkeit haben, den Proxy-Server des Systems zu nutzen. - -§ 6 Begleitende Dienstleistungen - -1) Wurde mit der Lizenz das Recht auf zeitlich beschränkte Dienstleistungen -(z.B. Update-Service) erworben, so beginnt deren Laufzeit mit Eingabe des -Lizenzcodes, Registrieren der Software oder der Prüfung auf vorhandene Updates. - -2) Wird das Recht auf diese Dienstleistungen verlängert, so beginnt die Laufzeit -der Verlängerung rückwirkend zum letzten Ablauftermin. - -§ 7 Evaluationslizenz - -1) Wurde von einem Endkunden keine Lizenz käuflich erworben, erhält er eine -Evaluationslizenz, d.h. für 30 Tage das Recht, die "Intranator Software" auf -einer Hardware zu installieren und zu Testzwecken unter diesen Lizenzbedingungen -zu nutzen. Mit der Eingabe eines nicht selbst erworbenen Lizenzkeys erlischt die -Evaluationslizenz sofort. - -2) Die Evaluationslizenz oder eine andere, zeitlich beschränkte Lizenz darf nur -für den entsprechenden Zeitraum ab Installation genutzt werden. Die verbleibende -Zeit wird auf der Bedienungsoberfläche der Software angezeigt. - -3) Nach Ablauf dieses Zeitraums stellt die Software die Funktion ein. Der Kunde -ist dafür verantwortlich, seine Daten rechtzeitig vorher zu sichern. - -4) Eine Evaluationslizenz berechtigt nicht zu Gewährleistungsansprüchen, außer -wenn etwaige Mängel durch die Intra2net AG vorsätzlich oder grob fahrlässig -verursacht wurden.. - -§ 8 Dekompilierung und Programmänderungen - -1) Die Rückübersetzung des überlassenen Programmcodes in andere Codeformen -(Dekompilierung) sowie sonstige Arten der Rückerschließung der verschiedenen -Herstellungsstufen der Software (Reverse-Engineering) einschließlich einer -Programmänderung sind nur in den nachfolgend genannten Fällen zulässig. - -2) Die Zustimmung des Rechtsinhabers ist nicht erforderlich, wenn die -Vervielfältigung des Codes oder die Übersetzung der Codeform unerlässlich ist, -um entweder a) die Bedingungen der LGPL zu erfüllen oder b) die erforderlichen -Informationen zur Herstellung der Interoperabilität eines unabhängig -geschaffenen Computerprogramms mit anderen Programmen zu erhalten, sofern -folgende Bedingungen erfüllt sind: - - 1. Die Handlungen werden von dem Lizenznehmer oder von einer anderen zur - Verwendung eines Vervielfältigungsstücks des Programms berechtigten Person oder - in deren Namen von einer hierzu ermächtigten Person vorgenommen; - 2. die für die Herstellung der Interoperabilität notwendigen Informationen sind - für die in Nummer 1 genannten Personen noch nicht ohne weiteres zugänglich - gemacht; - 3. die Handlungen beschränken sich auf die Teile des ursprünglichen Programms, - die zur Herstellung der Interoperabilität notwendig sind. - -Bei unter a) und b) genannten derartigen Handlungen gewonnene Informationen -dürfen nicht - - 1. zu anderen Zwecken als zur Herstellung der Interoperabilität des unabhängig - geschaffenen Programms verwendet werden, - 2. an Dritte weitergegeben werden, es sei denn, dass dies für die - Interoperabilität des unabhängig geschaffenen Programms notwendig ist, - 3. für die Entwicklung, Herstellung oder Vermarktung eines Programms mit im - Wesentlichen ähnlicher Ausdrucksform oder für irgendwelche anderen das - Urheberrecht verletzenden Handlungen verwendet werden. - -3) Urhebervermerke, Lizenzcodes, Seriennummern sowie sonstige der -Programmidentifikation dienende Merkmale dürfen auf keinen Fall entfernt oder -verändert werden. - -4) Wird auf dem System Software installiert, die nicht ausdrücklich vom -Lizenzgeber dafür freigegeben ist, oder wird die installierte Software -modifiziert, können Gewährleistungs- oder Garantieansprüche nur geltend gemacht -werden, wenn der Kunde nachweisen kann, dass die Mängel nicht mit den -Modifikationen in Zusammenhang stehen. - -§ 9 Weiterveräußerung und Weitervermietung - -1) Der Lizenznehmer darf die Software einschließlich des Benutzerhandbuchs und -des sonstigen Begleitmaterials auf Dauer an Dritte veräußern oder verschenken, -vorausgesetzt der erwerbende Dritte erklärt sich mit der Weitergeltung der -vorliegenden Vertragsbedingungen auch ihm gegenüber einverstanden. Im Falle der -Weitergabe muss der Lizenznehmer dem neuen Lizenznehmer sämtliche Programmkopien -einschließlich gegebenenfalls vorhandener Sicherheitskopien übergeben oder die -nicht übergebenen Kopien vernichten. Infolge der Weitergabe erlischt das Recht -des alten Lizenznehmers zur Programmnutzung. - -2) Der Lizenznehmer darf die Software einschließlich des Begleitmaterials -Dritten nicht vermieten. - -3) Der Lizenznehmer darf die Software Dritten nicht überlassen, wenn der -begründete Verdacht besteht, der Dritte werde die Vertragsbedingungen verletzen, -insbesondere unerlaubte Vervielfältigungen herstellen. Dies gilt auch im -Hinblick auf Mitarbeiter des Lizenznehmers. - -§ 10 Gewährleistung - -1) Mängel der von der Intra2net AG programmierten Software einschließlich -zugehöriger Unterlagen werden vom Lizenzgeber innerhalb der Gewährleistungsfrist -von 24 Monaten gegenüber Verbrauchern bzw. 12 Monaten gegenüber Unternehmern ab -Lieferung nach entsprechender Mitteilung durch den Lizenznehmer behoben. Dies -geschieht nach Wahl des Lizenzgebers durch Nachbesserung oder Ersatzlieferung. - -2) Bei einem zweimaligen Fehlschlagen der Nachbesserung oder Ersatzlieferung -kann der Lizenznehmer Wandelung oder Minderung geltend machen. - -§ 11 Haftung - -1) Für Schäden wegen Rechtsmängeln und Beschaffenheitsgarantien haftet der -Lizenzgeber unbeschränkt. Die Haftung für anfängliches Unvermögen wird auf das -Fünffache des Überlassungsentgelts sowie auf solche Schäden begrenzt, mit deren -Entstehung im Rahmen einer Softwareüberlassung typischerweise gerechnet werden -muss. - -2) Im Übrigen haftet der Lizenzgeber unbeschränkt nur für Vorsatz und grobe -Fahrlässigkeit auch seiner gesetzlichen Vertreter und Erfüllungsgehilfen. - -3) Für leichte Fahrlässigkeit haftet der Lizenzgeber nur, sofern eine Pflicht -verletzt wird, deren Einhaltung für die Erreichung des Vertragszwecks von -besonderer Bedeutung ist (Kardinalpflicht). Bei Verletzung einer Kardinalpflicht -ist die Haftungsbeschränkung für anfängliches Unvermögen nach Abs. 1 dieser -Haftungsreglung entsprechend heranzuziehen. - -4) Die Haftung für Datenverlust wird auf den typischen Wiederherstellungsaufwand -beschränkt, der bei regelmäßiger und gefahrentsprechender Anfertigung von -Sicherungskopien eingetreten wäre. - -5) Die vorstehenden Regelungen gelten auch zugunsten der Mitarbeiter des -Lizenzgebers. - -6) Die Haftung nach dem Produkthaftungsgesetz bleibt unberührt (§ 14 ProdHG). - -7) Für Mängel zusätzlich installierter Software wird eine Haftung nur bei -Lieferung und Installation durch die Intra2net AG übernommen. Auch dann ist -diese Haftung auf Vorsatz oder grobe Fahrlässigkeit des Lizenzgebers gemäß § 521 -BGB beschränkt. - -§ 12 Untersuchungs- und Rügepflicht - -1) Der Lizenznehmer wird die gelieferte Software einschließlich der -Dokumentation innerhalb von 8 Werktagen nach Lieferung untersuchen, insbesondere -im Hinblick auf die Vollständigkeit der Datenträger und Handbücher sowie der -Funktionsfähigkeit grundlegender Programmfunktionen. Mängel, die hierbei -festgestellt werden oder feststellbar sind, müssen dem Lizenzgeber innerhalb -weiterer 8 Werktage gemeldet werden. Die Mängelrüge muss eine nach Kräften zu -detaillierende Beschreibung der Mängel beinhalten. - -2) Mängel, die im Rahmen der beschriebenen ordnungsgemäßen Untersuchung nicht -feststellbar sind, müssen innerhalb von 8 Werktagen nach Entdeckung unter -Einhaltung der dargelegten Rügeanforderungen gerügt werden. - -3) Bei einer Verletzung der Untersuchungs- und Rügepflicht gilt die Software in -Ansehung des betreffenden Mangels als genehmigt. - -§ 13 Rücknahmepflicht nach dem ElektroG - -Der Kunde übernimmt die Pflicht, die gelieferte Ware nach Nutzungsbeendigung auf -eigene Kosten nach den gesetzlichen Vorschriften ordnungsgemäß zu entsorgen. -Insbesondere stellt der Kunde die Intra2net AG von den Verpflichtungen nach § 10 -Abs. 2 ElektroG (Rücknahmepflicht der Hersteller) und damit im Zusammenhang -stehenden Ansprüchen Dritter frei. - -§ 14 Schriftform - -Sämtliche Vereinbarungen, die eine Änderung, Ergänzung oder Konkretisierung -dieser Vertragsbedingungen beinhalten, sowie besondere Zusicherungen und -Abmachungen sind schriftlich niederzulegen. Werden sie von Vertretern oder -Hilfspersonen des Lizenzgebers erklärt, sind sie nur dann verbindlich, wenn der -Lizenzgeber hierfür seine schriftliche Zustimmung erteilt. - -§ 15 Rechtswahl - -Die Parteien vereinbaren im Hinblick auf sämtliche Rechtsbeziehungen aus diesem -Vertragsverhältnis die Anwendung des Rechts der Bundesrepublik Deutschland unter -Ausschluss des UN-Kaufrechts. - -§ 16 Gerichtsstand - -Sofern der Lizenznehmer Vollkaufmann im Sinne des Handelsgesetzbuchs, -juristische Person des öffentlichen Rechts oder öffentlich-rechtliches -Sondervermögen ist, wird für sämtliche Streitigkeiten, die im Rahmen der -Abwicklung dieses Vertragsverhältnisses entstehen, Tübingen als Gerichtsstand -vereinbart. - -§ 17 Schlussbestimmungen - -Sollten einzelne Bestimmungen nichtig, unwirksam oder anfechtbar sein oder -werden, sind sie so auszulegen bzw. zu ergänzen, dass der beabsichtigte -wirtschaftliche Zweck in rechtlich zulässiger Weise möglichst genau erreicht -wird; die übrigen Bestimmungen bleiben davon unberührt. Sinngemäß gilt dies auch -für ergänzungsbedürftige Lücken. diff --git a/configlib/i2n_global_config.cpp b/configlib/i2n_global_config.cpp index 332ecfb..564c5e6 100644 --- a/configlib/i2n_global_config.cpp +++ b/configlib/i2n_global_config.cpp @@ -1,10 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2008 by Intra2net AG - * @license commercial - * @contact info@intra2net.com */ #include "i2n_global_config.hpp" diff --git a/configlib/i2n_global_config.hpp b/configlib/i2n_global_config.hpp index 82a03ac..f61d099 100644 --- a/configlib/i2n_global_config.hpp +++ b/configlib/i2n_global_config.hpp @@ -1,11 +1,28 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief provides config file reading and automatic propagation of the values. * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2008 by Intra2net AG - * @license commercial - * @contact info@intra2net.com * * Basic idea of this module is that one need only to declare its config vars of * the type Config::Var\< T \> and pass the desired section and key from the diff --git a/libi2ncommon.spec b/libi2ncommon.spec index 81607ea..583b1f9 100644 --- a/libi2ncommon.spec +++ b/libi2ncommon.spec @@ -2,7 +2,7 @@ Summary: library with functions common in Intra2net programs Name: libi2ncommon Version: ##VERSION## Release: 1 -License: Intranator License +License: GPLv2 + linking exception Group: Intranator Vendor: Intra2net AG Source: %{name}-%{version}.tar.gz @@ -86,7 +86,7 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc LICENSE COPYING.GPL +%doc COPYING.GPL %{prefix}/lib/libi2ncommon.so* %files devel @@ -98,15 +98,15 @@ rm -fr $RPM_BUILD_ROOT %files config %defattr(-,root,root) -%doc LICENSE +%doc COPYING.GPL %{prefix}/lib/libi2ncommon_config.so* %files xml %defattr(-,root,root) -%doc LICENSE +%doc COPYING.GPL %{prefix}/lib/libi2ncommon_xml.so* %files utils %defattr(-,root,root) -%doc LICENSE COPYING.GPL +%doc COPYING.GPL %{prefix}/lib/libi2ncommon_utils.so* diff --git a/src/cron.cpp b/src/cron.cpp index 0b2e8fc..e2d3508 100644 --- a/src/cron.cpp +++ b/src/cron.cpp @@ -1,10 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief repeating time-points and intervals * * @copyright Copyright © 2009 by Intra2net AG - * @license commercial - * @contact info@intra2net.com * */ #include diff --git a/src/cron.hpp b/src/cron.hpp index 22595f8..9e392fe 100644 --- a/src/cron.hpp +++ b/src/cron.hpp @@ -1,9 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief repeating time-points and intervals * * @copyright Copyright © 2009 by Intra2net AG - * @license commercial - * @contact info@intra2net.com * */ diff --git a/src/daemonfunc.cpp b/src/daemonfunc.cpp index 170bf67..ab541cd 100644 --- a/src/daemonfunc.cpp +++ b/src/daemonfunc.cpp @@ -1,7 +1,24 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** * Copyright (C) 2008 by Intra2net AG - Thomas Jarosch * - * thomas.jarosch@intra2net.com * - * http://www.intra2net.com * ***************************************************************************/ #include #include diff --git a/src/daemonfunc.hpp b/src/daemonfunc.hpp index 8d402bf..f6f77a3 100644 --- a/src/daemonfunc.hpp +++ b/src/daemonfunc.hpp @@ -1,7 +1,24 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** * Copyright (C) 2008 by Intra2net AG - Thomas Jarosch * - * thomas.jarosch@intra2net.com * - * http://www.intra2net.com * ***************************************************************************/ #ifndef DAEMONFUNC_H #define DAEMONFUNC_H diff --git a/src/exception.hxx b/src/exception.hxx index cd4f441..b372977 100644 --- a/src/exception.hxx +++ b/src/exception.hxx @@ -1,9 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** exception.hxx - exception classes ------------------- - begin : Sat Oct 30 1999 - copyright : (C) 1999 by STYLETEC - email : service@styletec.de + copyright : (C) 2001 by Intra2net AG ***************************************************************************/ #ifndef __EXCEPTION diff --git a/src/filefunc.cpp b/src/filefunc.cpp index b43ef48..6e10ccc 100644 --- a/src/filefunc.cpp +++ b/src/filefunc.cpp @@ -1,9 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** escape.cpp - escaping of strings ------------------- begin : Sun Nov 14 1999 copyright : (C) 1999 by Intra2net AG - email : info@intra2net.com ***************************************************************************/ #include diff --git a/src/filefunc.hxx b/src/filefunc.hxx index f236246..795b3f2 100644 --- a/src/filefunc.hxx +++ b/src/filefunc.hxx @@ -1,6 +1,24 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** * Copyright (C) 2004-2008 by Intra2net AG * - * info@intra2net.com * * * ***************************************************************************/ diff --git a/src/i18n.cpp b/src/i18n.cpp index c495464..392e8d3 100644 --- a/src/i18n.cpp +++ b/src/i18n.cpp @@ -1,9 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** i18n.cpp - description ------------------- begin : Wed Apr 25 2001 copyright : (C) 2001-2004 by Intra2net AG - email : info@intra2net.com ***************************************************************************/ #include diff --git a/src/i18n.h b/src/i18n.h index 073e202..5d1a699 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -1,9 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** i18n.h - description ------------------- begin : Wed Apr 25 2001 copyright : (C) 2001-2004 by Intra2net AG - email : info@intra2net.com ***************************************************************************/ #ifndef intranator_i18n_H diff --git a/src/i2n_configdata.hpp b/src/i2n_configdata.hpp index 8db82ba..9a56deb 100644 --- a/src/i2n_configdata.hpp +++ b/src/i2n_configdata.hpp @@ -1,11 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com */ #ifndef __I2N_CONFIGDATA_HPP__ diff --git a/src/i2n_configfile.cpp b/src/i2n_configfile.cpp index 5e74417..c246ebc 100644 --- a/src/i2n_configfile.cpp +++ b/src/i2n_configfile.cpp @@ -1,11 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com */ //#define NOISEDEBUG diff --git a/src/i2n_configfile.hpp b/src/i2n_configfile.hpp index e4dbb61..afbfc85 100644 --- a/src/i2n_configfile.hpp +++ b/src/i2n_configfile.hpp @@ -1,13 +1,29 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * contains stuff for simple config files. * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com */ #ifndef __I2N_CONFIGFILE_HPP__ diff --git a/src/insocketstream.hxx b/src/insocketstream.hxx index bbd58c6..6405647 100644 --- a/src/insocketstream.hxx +++ b/src/insocketstream.hxx @@ -1,9 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** insocketstream.hxx - C++ streambuffer wrapper ------------------- begin : Sun Nov 10 2002 copyright : (C) 2002 by Intra2net AG - email : intranator@intra2net.com ***************************************************************************/ #ifndef _INSOCKETSTREAM diff --git a/src/ip_type.hxx b/src/ip_type.hxx index d13d87d..ec46f95 100644 --- a/src/ip_type.hxx +++ b/src/ip_type.hxx @@ -1,6 +1,24 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** * Copyright (C) 2004 by Intra2net AG * - * info@intra2net.com * ***************************************************************************/ #ifndef __IP_TYPE diff --git a/src/ipfunc.cpp b/src/ipfunc.cpp index 6d43bf7..7c917ec 100644 --- a/src/ipfunc.cpp +++ b/src/ipfunc.cpp @@ -1,9 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** ip_functions.cpp - description ------------------- begin : Sat Feb 07 2004 copyright : (C) 2004 by Intra2net AG - email : info@intra2net.com ***************************************************************************/ #include diff --git a/src/ipfunc.hxx b/src/ipfunc.hxx index 06cef4c..a52cae5 100644 --- a/src/ipfunc.hxx +++ b/src/ipfunc.hxx @@ -1,9 +1,27 @@ + /* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** ip_functions.hxx - description ------------------- begin : Sat Feb 07 2004 copyright : (C) 2004 by Intra2net AG - email : info@intra2net.com ***************************************************************************/ #ifndef __IPFUNC_HXX diff --git a/src/log_macros.hpp b/src/log_macros.hpp index 931990f..09665a5 100644 --- a/src/log_macros.hpp +++ b/src/log_macros.hpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief macros to ease some common logging cases. * @@ -6,12 +25,9 @@ * (Not everyone like macros...) * * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com * */ diff --git a/src/logfunc.cpp b/src/logfunc.cpp index 1a719a2..0975130 100644 --- a/src/logfunc.cpp +++ b/src/logfunc.cpp @@ -1,10 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief implementaton of logging functions. * * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com * * @note This module is not thread safe! * @todo make this module thread safe (only useful when we can use threads...) diff --git a/src/logfunc.hpp b/src/logfunc.hpp index 563775e..1073f38 100644 --- a/src/logfunc.hpp +++ b/src/logfunc.hpp @@ -1,10 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief provides logging functions. * * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com */ #ifndef __I2N_COMMON_LOGFUNC_HPP__ diff --git a/src/logread.cpp b/src/logread.cpp index ba32035..6e5d822 100644 --- a/src/logread.cpp +++ b/src/logread.cpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #include #include #include diff --git a/src/logread.hxx b/src/logread.hxx index 7f796d2..389aaa5 100644 --- a/src/logread.hxx +++ b/src/logread.hxx @@ -1,6 +1,24 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** - * Copyright (C) 2006 by Thomas Jarosch * - * info@intra2net.com * + * Copyright (C) 2006 by Intra2net AG * * * ***************************************************************************/ diff --git a/src/oftmpstream.cpp b/src/oftmpstream.cpp index 4d764e3..bf4dda9 100644 --- a/src/oftmpstream.cpp +++ b/src/oftmpstream.cpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #include #include #include diff --git a/src/oftmpstream.hxx b/src/oftmpstream.hxx index 6bdd49a..a1feeb7 100644 --- a/src/oftmpstream.hxx +++ b/src/oftmpstream.hxx @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #ifndef _OFTMPSTREAM_HXX #define _OFTMPSTREAM_HXX diff --git a/src/pidfile.cpp b/src/pidfile.cpp index c4bf1f2..87efd5b 100644 --- a/src/pidfile.cpp +++ b/src/pidfile.cpp @@ -1,8 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** Pid file handling @copyright Intra2net AG - @license commerical */ #include "pidfile.hpp" #include diff --git a/src/pidfile.hpp b/src/pidfile.hpp index 1941598..b9ae852 100644 --- a/src/pidfile.hpp +++ b/src/pidfile.hpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #ifndef PIDFILE_H #define PIDFILE_H @@ -7,7 +26,6 @@ /// Pid file handling /** @copyright Intra2net AG - @license commerical */ class PidFile { diff --git a/src/pipestream.hxx b/src/pipestream.hxx index 3dad8b6..211ee5d 100644 --- a/src/pipestream.hxx +++ b/src/pipestream.hxx @@ -1,9 +1,27 @@ + /* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** inpipestream.hxx - C++ streambuffer wrapper ------------------- begin : Thu Dec 27 2001 copyright : (C) 2001 by Intra2net AG - email : intranator@intra2net.com ***************************************************************************/ #ifndef _PIPESTREAM diff --git a/src/pointer_func.cpp b/src/pointer_func.cpp index eee9f5d..56cbc26 100644 --- a/src/pointer_func.cpp +++ b/src/pointer_func.cpp @@ -1,12 +1,28 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2008 Intra2Net AG - * @license commercial - * @contact info@intra2net.com - * * */ diff --git a/src/pointer_func.hpp b/src/pointer_func.hpp index 0902ba7..1e394be 100644 --- a/src/pointer_func.hpp +++ b/src/pointer_func.hpp @@ -1,11 +1,28 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief provides a little base class for classes wich are used in conjunction with shared pointer. * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * @copyright © Copyright 2008 Intra2Net AG - * @license commercial - * @contact info@intra2net.com * */ diff --git a/src/source_track_basics.cpp b/src/source_track_basics.cpp index eb947a6..25ad139 100644 --- a/src/source_track_basics.cpp +++ b/src/source_track_basics.cpp @@ -1,9 +1,25 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com */ #include "source_track_basics.hpp" diff --git a/src/source_track_basics.hpp b/src/source_track_basics.hpp index 9b06f72..d109e69 100644 --- a/src/source_track_basics.hpp +++ b/src/source_track_basics.hpp @@ -1,9 +1,25 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * @copyright © Copyright 2007-2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com */ #ifndef __I2N_COMMON_SOURCE_TRACK_BASICS_HPP__ diff --git a/src/stringfunc.cpp b/src/stringfunc.cpp index 995b71f..1b48adf 100644 --- a/src/stringfunc.cpp +++ b/src/stringfunc.cpp @@ -1,8 +1,25 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com */ #include diff --git a/src/stringfunc.hxx b/src/stringfunc.hxx index 3ee7a0b..8b7afab 100644 --- a/src/stringfunc.hxx +++ b/src/stringfunc.hxx @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief collection of string tools (/ functions). * @@ -10,8 +29,6 @@ * * * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com */ #ifndef __STRINGFUNC_HXX diff --git a/src/timefunc.cpp b/src/timefunc.cpp index 327de6c..4f89c58 100644 --- a/src/timefunc.cpp +++ b/src/timefunc.cpp @@ -1,13 +1,29 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief time related functions. * * @copyright Copyright © 2001-2008 by Intra2net AG - * @license commercial - * @contact info@intra2net.com * */ - #include #include #include diff --git a/src/timefunc.hxx b/src/timefunc.hxx index 308ff80..55eab30 100644 --- a/src/timefunc.hxx +++ b/src/timefunc.hxx @@ -1,10 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief time related functions. * * @copyright Copyright © 2001-2008 by Intra2net AG - * @license commercial - * @contact info@intra2net.com - * */ #ifndef __TIMEFUNC_HXX diff --git a/src/tmpfstream.cpp b/src/tmpfstream.cpp index d574bff..5d9e2b2 100644 --- a/src/tmpfstream.cpp +++ b/src/tmpfstream.cpp @@ -1,13 +1,28 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief fstream which creates files with mkstemp. * * @author Gerd v. Egidy * * @copyright © Copyright 2010 by Intra2net AG - * @license commercial - * - * info@intra2net.com - * */ #include diff --git a/src/tmpfstream.hpp b/src/tmpfstream.hpp index f73924a..6760ccd 100644 --- a/src/tmpfstream.hpp +++ b/src/tmpfstream.hpp @@ -1,13 +1,28 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief fstream which creates files with mkstemp. * * @author Gerd v. Egidy * * @copyright © Copyright 2010 by Intra2net AG - * @license commercial - * - * info@intra2net.com - * */ #ifndef __I2N_TMPFSTREAM_HPP__ diff --git a/src/tmpfstream_impl.hpp b/src/tmpfstream_impl.hpp index 514369b..a87e693 100644 --- a/src/tmpfstream_impl.hpp +++ b/src/tmpfstream_impl.hpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief fstream which creates files with mkstemp. * @@ -8,10 +27,6 @@ * @author Gerd v. Egidy * * @copyright © Copyright 2010 by Intra2net AG - * @license commercial - * - * info@intra2net.com - * */ #ifndef __I2N_TMPFSTREAM_IMPL_HPP__ diff --git a/src/tracefunc.cpp b/src/tracefunc.cpp index c356030..ab1ec5e 100644 --- a/src/tracefunc.cpp +++ b/src/tracefunc.cpp @@ -1,10 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief implementation of tracing functionality. * * @copyright © Copyright 2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com * * @note This module is not thread safe! * @todo make this module thread safe (only useful when we can use threads...) diff --git a/src/tracefunc.hpp b/src/tracefunc.hpp index a110313..0d41f0d 100644 --- a/src/tracefunc.hpp +++ b/src/tracefunc.hpp @@ -1,14 +1,29 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief provides tracing funtionality. * * Provides a scope tracker * * @copyright © Copyright 2008 by Intra2net AG - * @license commercial - * - * info@intra2net.com - */ - +*/ #ifndef __I2N_COMMON_TRACEFUNC_HPP__ #define __I2N_COMMON_TRACEFUNC_HPP__ diff --git a/src/tribool.cpp b/src/tribool.cpp index f69e545..403d3c8 100644 --- a/src/tribool.cpp +++ b/src/tribool.cpp @@ -1,10 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief Implementation of intuitive tristate logic * * (c) Copyright 2011 by Intra2net AG * Written by Erich Willems and Thomas Jarosch - * - * info@intra2net.com */ #include diff --git a/src/tribool.hpp b/src/tribool.hpp index adc3dba..a6469ae 100644 --- a/src/tribool.hpp +++ b/src/tribool.hpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief Implementation of intuitive tristate logic * @@ -6,8 +25,6 @@ * * After we had serious trouble with the current boost::logic::tribool implementation * overloading the comparison operators, we rolled our own class. - * - * info@intra2net.com */ namespace I2n diff --git a/src/userfunc.cpp b/src/userfunc.cpp index 9b6196e..eeeeab5 100644 --- a/src/userfunc.cpp +++ b/src/userfunc.cpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief provides wrapper and tools for (system) user and group information. * @@ -6,9 +25,6 @@ * @license commercial * * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com - * */ #include "userfunc.hpp" diff --git a/src/userfunc.hpp b/src/userfunc.hpp index 12e6297..a076d9a 100644 --- a/src/userfunc.hpp +++ b/src/userfunc.hpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief provides wrapper and tools for (system) user and group information. * @@ -6,9 +25,6 @@ * @license commercial * * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com - * */ #ifndef _I2N_USERFUNC_HPP_ diff --git a/src/week.cpp b/src/week.cpp index 4ba244f..ce8a0f6 100644 --- a/src/week.cpp +++ b/src/week.cpp @@ -1,3 +1,22 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ #include #include diff --git a/src/week.hpp b/src/week.hpp index a377ac6..f5363bd 100644 --- a/src/week.hpp +++ b/src/week.hpp @@ -1,10 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief time related functions. Week module * * @copyright Copyright © 2001-2009 by Intra2net AG - * @license commercial - * @contact info@intra2net.com - * */ #ifndef __WEEK_HPP diff --git a/test/ip_range.cpp b/test/ip_range.cpp index dce227e..cce628b 100644 --- a/test/ip_range.cpp +++ b/test/ip_range.cpp @@ -1,6 +1,24 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** * Copyright (C) 2004 by Intra2net AG * - * info@intra2net.com * * * ***************************************************************************/ diff --git a/test/stringfunc.cpp b/test/stringfunc.cpp index 749db12..f363bb2 100644 --- a/test/stringfunc.cpp +++ b/test/stringfunc.cpp @@ -1,6 +1,24 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** * Copyright (C) 2006 by Intra2net AG * - * info@intra2net.com * * * ***************************************************************************/ diff --git a/test/test_containerfunc.cpp b/test/test_containerfunc.cpp index 5ec6041..9539ae6 100644 --- a/test/test_containerfunc.cpp +++ b/test/test_containerfunc.cpp @@ -1,10 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * tests for the module "containerfunc" * * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com */ //#define NOISEDEBUG diff --git a/test/test_cron_interval.cpp b/test/test_cron_interval.cpp index 2fb7450..afcbade 100644 --- a/test/test_cron_interval.cpp +++ b/test/test_cron_interval.cpp @@ -1,9 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief unit test for cron functions. * * @copyright Copyright © 2009 by Intra2net AG - * @license commercial - * @contact info@intra2net.com * */ diff --git a/test/test_cron_point.cpp b/test/test_cron_point.cpp index 687ca12..3816670 100644 --- a/test/test_cron_point.cpp +++ b/test/test_cron_point.cpp @@ -1,9 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief unit test for cron functions. * * @copyright Copyright © 2009 by Intra2net AG - * @license commercial - * @contact info@intra2net.com * */ diff --git a/test/test_filefunc.cpp b/test/test_filefunc.cpp index a345c66..0dc1b3a 100644 --- a/test/test_filefunc.cpp +++ b/test/test_filefunc.cpp @@ -1,10 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * tests for the modules "filefunc", "daemonfunc" * * (c) Copyright 2007-2008 by Intra2net AG - * - * info@intra2net.com */ //#define NOISEDEBUG diff --git a/test/test_global_config.cpp b/test/test_global_config.cpp index 95781c2..7b14b04 100644 --- a/test/test_global_config.cpp +++ b/test/test_global_config.cpp @@ -1,8 +1,25 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * (c) Copyright 2008 by Intra2net AG - * - * info@intra2net.com */ #include diff --git a/test/test_logging.cpp b/test/test_logging.cpp index a45ba46..8708fb6 100644 --- a/test/test_logging.cpp +++ b/test/test_logging.cpp @@ -1,9 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * test cases for loggin module. * * (c) Copyright 2007 by Intra2net AG - * - * info@intra2net.com */ //#define NOISEDEBUG diff --git a/test/test_pidfile.cpp b/test/test_pidfile.cpp index 198c3ec..50d6843 100644 --- a/test/test_pidfile.cpp +++ b/test/test_pidfile.cpp @@ -1,8 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** Pid file handling unit tests @copyright Intra2net AG - @license commerical */ #include diff --git a/test/test_timefunc.cpp b/test/test_timefunc.cpp index 900d587..4a2a04e 100644 --- a/test/test_timefunc.cpp +++ b/test/test_timefunc.cpp @@ -1,9 +1,26 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * @brief unit test for time related functions. * * @copyright Copyright © 2001-2008 by Intra2net AG - * @license commercial - * @contact info@intra2net.com * */ diff --git a/test/test_tmpfstream.cpp b/test/test_tmpfstream.cpp index 3bc8a28..e7df227 100644 --- a/test/test_tmpfstream.cpp +++ b/test/test_tmpfstream.cpp @@ -1,10 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /** @file * * tests for the module tmpfstream * * (c) Copyright 2010 by Intra2net AG - * - * info@intra2net.com */ //#define NOISEDEBUG diff --git a/utils/containerfunc.cpp b/utils/containerfunc.cpp index 80e3bce..b2a275e 100644 --- a/utils/containerfunc.cpp +++ b/utils/containerfunc.cpp @@ -20,8 +20,6 @@ on this file might be covered by the GNU General Public License. /** @file * * (c) Copyright 2007-2008 by Intra2net AG - * - * opensource@intra2net.com */ #include "containerfunc.hpp" diff --git a/utils/containerfunc.hpp b/utils/containerfunc.hpp index 2e61e54..d5b7dbe 100644 --- a/utils/containerfunc.hpp +++ b/utils/containerfunc.hpp @@ -20,11 +20,9 @@ on this file might be covered by the GNU General Public License. /** @file * @brief some helper for handling (STL) data structures. * - * @author Reinhard Pfau \ + * @author Reinhard Pfau * * (c) Copyright 2007-2008 by Intra2net AG - * - * opensource@intra2net.com */ #ifndef _I2N_CONTAINERFUNC_HPP_ diff --git a/utils/signalfunc.cpp b/utils/signalfunc.cpp index 8cad55e..bee98b6 100644 --- a/utils/signalfunc.cpp +++ b/utils/signalfunc.cpp @@ -21,8 +21,6 @@ on this file might be covered by the GNU General Public License. * @brief implementation of wrapper and tools for signal related stuff. * * @copyright © Copyright 2007-2008 by Intra2net AG - * - * opensource@intra2net.com */ #include "signalfunc.hpp" diff --git a/utils/signalfunc.hpp b/utils/signalfunc.hpp index 00ebd2c..95982fc 100644 --- a/utils/signalfunc.hpp +++ b/utils/signalfunc.hpp @@ -22,7 +22,6 @@ on this file might be covered by the GNU General Public License. * * * @copyright © Copyright 2007-2008 by Intra2net AG - * @contact opensource@intra2net.com * * @bug * Although most stuff should work under most POSIX like systems; diff --git a/xmllib/xmlcommon.cpp b/xmllib/xmlcommon.cpp index 6f53be1..2661b8c 100644 --- a/xmllib/xmlcommon.cpp +++ b/xmllib/xmlcommon.cpp @@ -1,9 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** xmlcommon.cpp - Common XML functions ------------------- begin : Tue Apr 27 2004 copyright : (C) 2004 by Intra2net AG - email : info@intra2net.com ***************************************************************************/ #include diff --git a/xmllib/xmlcommon.hpp b/xmllib/xmlcommon.hpp index b345ff4..3ecab13 100644 --- a/xmllib/xmlcommon.hpp +++ b/xmllib/xmlcommon.hpp @@ -1,9 +1,27 @@ +/* +The software in this package is distributed under the GNU General +Public License version 2 (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING.GPL. + +As a special exception, if other files instantiate templates or use macros +or inline functions from this file, or you compile this file and link it +with other works to produce a work based on this file, this file +does not by itself cause the resulting work to be covered +by the GNU General Public License. + +However the source code for this file must still be made available +in accordance with section (3) of the GNU General Public License. + +This exception does not invalidate any other reasons why a work based +on this file might be covered by the GNU General Public License. +*/ /*************************************************************************** xmlcommon.hxx - Common XML functions ------------------- begin : Tue Apr 27 2004 copyright : (C) 2004 by Intra2net AG - email : info@intra2net.com ***************************************************************************/ #ifndef __XMLCOMMON -- 1.7.1