From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 25 Sep 2024 07:57:51 +0000 (+0200)
Subject: Update bsmtp copyright information
X-Git-Tag: Release-15.0.3~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=318e3a0d41a8955e0c95fb90b6ea6c20884b2ff6;p=thirdparty%2Fbacula.git

Update bsmtp copyright information

As part of an ongoing license audit in Fedora, I reached out to Wietse Venema regarding the licensing of his smtp client code, which makes up the original core of bsmtp.c. Wietse wietse@porcupine.org replied quickly and attached a GPG signed license text consisting of a permissive license grant for that work.

Tom Callaway
@spotrh
---

diff --git a/bacula/LICENSE-FOSS b/bacula/LICENSE-FOSS
index f9c9405b9..ce99a8a6c 100644
--- a/bacula/LICENSE-FOSS
+++ b/bacula/LICENSE-FOSS
@@ -1,6 +1,6 @@
        
               FOSS Licenses used in Bacula
-                Update 21 May 2017
+                Update 25 Sep 2024
 
 Note: This file corresponds to the Bacula Community (bacula.org) license.
 
@@ -424,3 +424,35 @@ xxhash.c xxhash.h xxh_x86dispatch.c xxh_x86dispatch.h
  *   - xxHash source repository: https://github.com/Cyan4973/xxHash
  */
 
+src/tools/bsmtp.c
+=================
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+As of August 4, 2023, the text below constitutes the smtp client license.
+
+ /*
+  * Copyright 1993-1995 by Wietse Venema. All rights reserved. Some
+  * individual files may be covered by other copyrights.
+  * 
+  * This material was originally written and compiled by Wietse Venema at
+  * Eindhoven University of Technology, The Netherlands, in 1993, 1994, and
+  * 1995. Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that this entire copyright notice is
+  * duplicated in all such copies.
+  * 
+  * This software is provided "as is" and without any expressed or implied
+  * warranties, including, without limitation, the implied warranties of
+  * merchantibility and fitness for any particular purpose.
+  */
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (FreeBSD)
+
+iFcDBQFkzQzdDAtZDoDKFacRCniJAQCD4/yydZfb/I0LVdoZgWMQNvrefKvmzWF8
+HG3tJvfy/AD9EVq+QWEEwHANMg9fzHGz8ILWfIJPtVMfLp0rgqZKkVU=
+=tybd
+-----END PGP SIGNATURE-----
+=======
+
diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index 7e84f0f1e..fe2c702c1 100644
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -29,19 +29,20 @@
    LAST UPDATE
      Fri Aug 11 12:29:23 MET DST 1995
    COPYRIGHT
-     None specified.
 
-   Kern Sibbald, July 2001
+   Copyright 1993-1995 by Wietse Venema. All rights reserved. Some
+   individual files may be covered by other copyrights.
 
-     Note, the original W.Z. Venema smtp.c had no license and no
-     copyright.
-     See:
-        http://archives.neohapsis.com/archives/postfix/2000-05/1520.html
+   This material was originally written and compiled by Wietse Venema at
+   Eindhoven University of Technology, The Netherlands, in 1993, 1994, and
+   1995. Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that this entire copyright notice is
+   duplicated in all such copies.
 
-    In previous versions, I mistakenly believed that this code came from
-     Ralf S. Engelshall's smtpclient_main.c, but in fact 99% was
-     Wietse Venema's code, and the rest was mine.
- */
+   This software is provided "as is" and without any expressed or implied
+   warranties, including, without limitation, the implied warranties of
+   merchantibility and fitness for any particular purpose.
+*/
 
 #include "bacula.h"
 #include "jcr.h"