Skip to content

Commit 6382ae8

Browse files
committed
License: cover contrib/pgcrypto/crypt-md5.c
crypt-md5.c is inherited from PostgreSQL and says only that it was imported from FreeBSD, written by Poul-Henning Kamp. LICENSE did not mention it. This was found while checking 2.2.0-incubating-rc3. The FreeBSD revision the file names, src/lib/libcrypt/crypt-md5.c 1.5, carried Kamp's beer-ware notice, which asks that the notice be retained. Reproduce that notice in licenses/LICENSE-beerware-crypt-md5.txt and list the file under it. FreeBSD's copy was later re-released under the 2-clause BSD license (FreeBSD commit d8e82636a47b), and LICENSE mentions that too. Exclude the new licence file from RAT like the other verbatim licence texts. Assisted-by: Claude Code
1 parent 333ba06 commit 6382ae8

3 files changed

Lines changed: 21 additions & 0 deletions

File tree

‎LICENSE‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,17 @@ The PostgreSQL software includes:
478478
notices; they are reproduced in:
479479
see licenses/LICENSE-dmetaphone.txt
480480

481+
----------------------------
482+
Beer-ware License (Revision 42)
483+
484+
MD5-based crypt() from FreeBSD, written by Poul-Henning Kamp:
485+
contrib/pgcrypto/crypt-md5.c
486+
The file keeps only a note that it was imported from FreeBSD. The
487+
notice that FreeBSD's copy carried is reproduced in:
488+
see licenses/LICENSE-beerware-crypt-md5.txt
489+
FreeBSD's version of the file was later re-released under the
490+
2-clause BSD license.
491+
481492
================================================================================
482493
This product contains significant parts that were originally based on software
483494
from VMware, Inc. or its affiliates.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
contrib/pgcrypto/crypt-md5.c was imported into PostgreSQL from FreeBSD's
2+
src/lib/libcrypt/crypt-md5.c, revision 1.5, which carried this notice:
3+
4+
----------------------------------------------------------------------------
5+
"THE BEER-WARE LICENSE" (Revision 42):
6+
<phk@login.dknet.dk> wrote this file. As long as you retain this notice you
7+
can do whatever you want with this stuff. If we meet some day, and you think
8+
this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
9+
----------------------------------------------------------------------------

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,6 +1884,7 @@ code or new licensing patterns.
18841884
they carry no license header of their own.
18851885
-->
18861886
<exclude>licenses/LICENSE-amalgamate.txt</exclude>
1887+
<exclude>licenses/LICENSE-beerware-crypt-md5.txt</exclude>
18871888
<exclude>licenses/LICENSE-boost.txt</exclude>
18881889
<exclude>licenses/LICENSE-erand48.txt</exclude>
18891890
<exclude>licenses/LICENSE-geqo.txt</exclude>

0 commit comments

Comments
 (0)