Menu
▾
▴
[commit] master: convert licensing to SPDX
|
From: Oswald B. <os...@us...> - 2022-06-19 14:36:17
|
commit 9356300952f128ee216536a15236daec082e6cfb
Author: Oswald Buddenhagen <os...@us...>
Date: Thu Jun 16 12:44:35 2022 +0200
convert licensing to SPDX
while at it, add/fix some licenses/copyrights/comments:
- it makes no sense to have a GPL exception in scripts
- ted did not contribute to the man page
- tst_timers is not part of the mbsync executable
- explicitly put the build system under GPL and add copyrights
COPYING | 341 +-------------------
COPYING => LICENSES/GPL-2.0-or-later.txt | 25 +-
LICENSES/LicenseRef-isync-GPL-exception.txt | 12 +
Makefile.am | 6 +-
configure.ac | 4 +
mbsync-get-cert | 18 +-
src/Makefile.am | 4 +
src/common.h | 21 +-
src/config.c | 21 +-
src/config.h | 21 +-
src/driver.c | 21 +-
src/driver.h | 21 +-
src/drv_imap.c | 23 +-
src/drv_maildir.c | 23 +-
src/drv_proxy.c | 19 +-
src/drv_proxy_gen.pl | 20 +-
src/main.c | 21 +-
src/mbsync.1 | 25 +-
src/mdconvert.1 | 17 +-
src/mdconvert.c | 16 +-
src/run-tests.pl | 16 +-
src/socket.c | 23 +-
src/socket.h | 21 +-
src/sync.c | 21 +-
src/sync.h | 21 +-
src/tst_timers.c | 25 +-
src/util.c | 21 +-
27 files changed, 115 insertions(+), 712 deletions(-)
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d60c31a9..00000000
--- a/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/COPYING b/COPYING
new file mode 120000
index 00000000..840ba126
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+LICENSES/GPL-2.0-or-later.txt
\ No newline at end of file
diff --git a/COPYING b/LICENSES/GPL-2.0-or-later.txt
similarity index 94%
copy from COPYING
copy to LICENSES/GPL-2.0-or-later.txt
index d60c31a9..ff0812fd 100644
--- a/COPYING
+++ b/LICENSES/GPL-2.0-or-later.txt
@@ -1,8 +1,27 @@
+Valid-License-Identifier: GPL-2.0
+Valid-License-Identifier: GPL-2.0-only
+Valid-License-Identifier: GPL-2.0+
+Valid-License-Identifier: GPL-2.0-or-later
+SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
+Usage-Guide:
+ To use this license in source code, put one of the following SPDX
+ tag/value pairs into a comment according to the placement
+ guidelines in the licensing rules documentation.
+ For 'GNU General Public License (GPL) version 2 only' use:
+ SPDX-License-Identifier: GPL-2.0
+ or
+ SPDX-License-Identifier: GPL-2.0-only
+ For 'GNU General Public License (GPL) version 2 or any later version' use:
+ SPDX-License-Identifier: GPL-2.0+
+ or
+ SPDX-License-Identifier: GPL-2.0-or-later
+License-Text:
+
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +324,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +332,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/LICENSES/LicenseRef-isync-GPL-exception.txt b/LICENSES/LicenseRef-isync-GPL-exception.txt
new file mode 100644
index 00000000..894d89ce
--- /dev/null
+++ b/LICENSES/LicenseRef-isync-GPL-exception.txt
@@ -0,0 +1,12 @@
+SPDX-Exception-Identifier: LicenseRef-isync-GPL-exception
+SPDX-Licenses: GPL-2.0-or-later
+Usage-Guide:
+ This exception is used together with the above SPDX-License to
+ allow linking the compiled version of code to non GPL compliant code.
+ To use this exception add it with the keyword WITH to one of the
+ identifiers in the SPDX-Licenses tag:
+ SPDX-License-Identifier: <SPDX-License> WITH LicenseRef-isync-GPL-exception
+License-Text:
+
+As a special exception, mbsync may be linked with the OpenSSL library,
+despite that library's more restrictive license.
diff --git a/Makefile.am b/Makefile.am
index 26de90a9..901b4a5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
+# SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+# SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+# SPDX-License-Identifier: GPL-2.0-or-later
+
SUBDIRS = src
bin_SCRIPTS = mbsync-get-cert
-EXTRA_DIST = debian isync.spec $(bin_SCRIPTS)
+EXTRA_DIST = LICENSES debian isync.spec $(bin_SCRIPTS)
LOG_PL = \
use POSIX qw(strftime); \
diff --git a/configure.ac b/configure.ac
index 8e5e186f..5922126b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+# SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+dnl SPDX-License-Identifier: GPL-2.0-or-later
+
AC_INIT([isync], [1.4.4])
AC_CONFIG_HEADERS([autodefs.h])
diff --git a/mbsync-get-cert b/mbsync-get-cert
index a7d10fba..19e14850 100755
--- a/mbsync-get-cert
+++ b/mbsync-get-cert
@@ -1,25 +1,13 @@
#!/bin/sh
#
+# SPDX-FileCopyrightText: 2003 Theodore Ts'o <ty...@al...>
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
# This script will extract the necessary certificate from the IMAP server
# It assumes that an attacker isn't trying to spoof you when you connect
# to the IMAP server! You're better off downloading the certificate
# from a trusted source.
#
-# Copyright (C) 2003 Theodore Ts'o <ty...@al...>
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-#
if [ $# != 1 ]; then
echo "Usage: $0 <host>" >&2
diff --git a/src/Makefile.am b/src/Makefile.am
index 76dff34f..30de3a0a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+# SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+# SPDX-License-Identifier: GPL-2.0-or-later
+
mbsync_SOURCES = main.c sync.c config.c util.c socket.c driver.c drv_imap.c drv_maildir.c drv_proxy.c
mbsync_LDADD = $(DB_LIBS) $(SSL_LIBS) $(SOCK_LIBS) $(SASL_LIBS) $(Z_LIBS) $(KEYCHAIN_LIBS)
noinst_HEADERS = common.h config.h driver.h sync.h socket.h
diff --git a/src/common.h b/src/common.h
index e57eb3ad..939c9e53 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#ifndef COMMON_H
diff --git a/src/config.c b/src/config.c
index 0bd994b5..f90133de 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "config.h"
diff --git a/src/config.h b/src/config.h
index e70af54b..bcc9c9aa 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#ifndef CONFIG_H
diff --git a/src/driver.c b/src/driver.c
index 6266a548..6eabb9b3 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "driver.h"
diff --git a/src/driver.h b/src/driver.h
index b6c1d2c9..46f3fb58 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#ifndef DRIVER_H
diff --git a/src/drv_imap.c b/src/drv_imap.c
index 91368f1e..dfce346b 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -1,24 +1,9 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-FileCopyrightText: 2004 Theodore Y. Ts'o <ty...@mi...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- * Copyright (C) 2004 Theodore Y. Ts'o <ty...@mi...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "driver.h"
diff --git a/src/drv_maildir.c b/src/drv_maildir.c
index 280e4ffb..99d24935 100644
--- a/src/drv_maildir.c
+++ b/src/drv_maildir.c
@@ -1,24 +1,9 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-FileCopyrightText: 2004 Theodore Y. Ts'o <ty...@mi...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- * Copyright (C) 2004 Theodore Y. Ts'o <ty...@mi...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "driver.h"
diff --git a/src/drv_proxy.c b/src/drv_proxy.c
index 2a93fb11..e4af9e5f 100644
--- a/src/drv_proxy.c
+++ b/src/drv_proxy.c
@@ -1,22 +1,7 @@
+// SPDX-FileCopyrightText: 2017-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2017-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "driver.h"
diff --git a/src/drv_proxy_gen.pl b/src/drv_proxy_gen.pl
index 79477121..de0a3f6f 100755
--- a/src/drv_proxy_gen.pl
+++ b/src/drv_proxy_gen.pl
@@ -1,23 +1,9 @@
#!/usr/bin/perl
#
-# mbsync - mailbox synchronizer
-# Copyright (C) 2017-2022 Oswald Buddenhagen <os...@us...>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# SPDX-FileCopyrightText: 2017-2022 Oswald Buddenhagen <os...@us...>
+# SPDX-License-Identifier: GPL-2.0-or-later
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception, mbsync may be linked with the OpenSSL library,
-# despite that library's more restrictive license.
+# mbsync - mailbox synchronizer
#
use strict;
diff --git a/src/main.c b/src/main.c
index 2dd77cca..f1e27c3b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "sync.h"
diff --git a/src/mbsync.1 b/src/mbsync.1
index 00afdedd..e39aa699 100644
--- a/src/mbsync.1
+++ b/src/mbsync.1
@@ -1,25 +1,10 @@
-.\" mbsync - mailbox synchronizer
-.\" Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
-.\" Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
-.\" Copyright (C) 2004 Theodore Y. Ts'o <ty...@mi...>
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
+.\" SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+.\" SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+.\" SPDX-License-Identifier: GPL-2.0-or-later
.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
-.\"
-.\" As a special exception, mbsync may be linked with the OpenSSL library,
-.\" despite that library's more restrictive license.
+.\" mbsync - mailbox synchronizer
.
-.TH mbsync 1 "2015 Mar 22"
+.TH mbsync 1 "2022 Jun 16"
.
.SH NAME
mbsync - synchronize IMAP4 and Maildir mailboxes
diff --git a/src/mdconvert.1 b/src/mdconvert.1
index 5c95e867..0ab7f074 100644
--- a/src/mdconvert.1
+++ b/src/mdconvert.1
@@ -1,19 +1,8 @@
.ig
-\" mdconvert - Maildir mailbox UID storage scheme converter
-\" Copyright (C) 2004-2022 Oswald Buddenhagen <os...@us...>
-\"
-\" This program is free software; you can redistribute it and/or modify
-\" it under the terms of the GNU General Public License as published by
-\" the Free Software Foundation; either version 2 of the License, or
-\" (at your option) any later version.
+\" SPDX-FileCopyrightText: 2004-2022 Oswald Buddenhagen <os...@us...>
+\" SPDX-License-Identifier: GPL-2.0-or-later
\"
-\" This program is distributed in the hope that it will be useful,
-\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-\" GNU General Public License for more details.
-\"
-\" You should have received a copy of the GNU General Public License
-\" along with this program. If not, see <http://www.gnu.org/licenses/>.
+\" mdconvert - Maildir mailbox UID storage scheme converter
..
.TH mdconvert 1 "2004 Mar 27"
..
diff --git a/src/mdconvert.c b/src/mdconvert.c
index f952c91a..aaf86854 100644
--- a/src/mdconvert.c
+++ b/src/mdconvert.c
@@ -1,19 +1,7 @@
+// SPDX-FileCopyrightText: 2004-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* mdconvert - Maildir UID scheme converter
- * Copyright (C) 2004-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <autodefs.h>
diff --git a/src/run-tests.pl b/src/run-tests.pl
index 7ec909a5..035706cb 100755
--- a/src/run-tests.pl
+++ b/src/run-tests.pl
@@ -1,19 +1,7 @@
#! /usr/bin/perl -w
#
-# Copyright (C) 2006-2022 Oswald Buddenhagen <os...@us...>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2006-2022 Oswald Buddenhagen <os...@us...>
+# SPDX-License-Identifier: GPL-2.0-or-later
#
use warnings;
diff --git a/src/socket.c b/src/socket.c
index 4c17caf2..77423627 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1,24 +1,9 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-FileCopyrightText: 2004 Theodore Y. Ts'o <ty...@mi...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- * Copyright (C) 2004 Theodore Y. Ts'o <ty...@mi...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "socket.h"
diff --git a/src/socket.h b/src/socket.h
index 6418a811..7a9e3d96 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#ifndef SOCKET_H
diff --git a/src/sync.c b/src/sync.c
index c280fe96..9de140e9 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "sync.h"
diff --git a/src/sync.h b/src/sync.h
index 1f9a68d9..6a2b5e8d 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#ifndef SYNC_H
diff --git a/src/tst_timers.c b/src/tst_timers.c
index f8ea7862..9b2e28d7 100644
--- a/src/tst_timers.c
+++ b/src/tst_timers.c
@@ -1,23 +1,8 @@
-/*
- * mbsync - mailbox synchronizer
- * Copyright (C) 2014-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
- */
+// SPDX-FileCopyrightText: 2014-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// isync test suite
+//
#include "common.h"
diff --git a/src/util.c b/src/util.c
index b7a05055..efe2376b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,23 +1,8 @@
+// SPDX-FileCopyrightText: 2000-2002 Michael R. Elkins <me...@mu...>
+// SPDX-FileCopyrightText: 2002-2022 Oswald Buddenhagen <os...@us...>
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-isync-GPL-exception
/*
* mbsync - mailbox synchronizer
- * Copyright (C) 2000-2002 Michael R. Elkins <me...@mu...>
- * Copyright (C) 2002-2022 Oswald Buddenhagen <os...@us...>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, mbsync may be linked with the OpenSSL library,
- * despite that library's more restrictive license.
*/
#include "common.h"
|
