Merge branch 'main' into correctly-fallback-mailer-configuration

Author: zeripath

cmd/hook.go

@@ -218,9 +218,9 @@ Gitea or set your environment appropriately.`, "")
 		}
 	}
 
-	supportProcRecive := false
+	supportProcReceive := false
 	if git.CheckGitVersionAtLeast("2.29") == nil {
-		supportProcRecive = true
+		supportProcReceive = true
 	}
 
 	for scanner.Scan() {
@@ -241,9 +241,9 @@ Gitea or set your environment appropriately.`, "")
 		lastline++
 
 		// If the ref is a branch or tag, check if it's protected
-		// if supportProcRecive all ref should be checked because
+		// if supportProcReceive all ref should be checked because
 		// permission check was delayed
-		if supportProcRecive || strings.HasPrefix(refFullName, git.BranchPrefix) || strings.HasPrefix(refFullName, git.TagPrefix) {
+		if supportProcReceive || strings.HasPrefix(refFullName, git.BranchPrefix) || strings.HasPrefix(refFullName, git.TagPrefix) {
 			oldCommitIDs[count] = oldCommitID
 			newCommitIDs[count] = newCommitID
 			refFullNames[count] = refFullName

modules/base/tool.go

@@ -43,7 +43,7 @@ func EncodeSha1(str string) string {
 	return hex.EncodeToString(h.Sum(nil))
 }
 
-// EncodeSha256 string to sha1 hex value.
+// EncodeSha256 string to sha256 hex value.
 func EncodeSha256(str string) string {
 	h := sha256.New()
 	_, _ = h.Write([]byte(str))

options/license/Knuth-CTAN

@@ -0,0 +1,5 @@
+This software is copyrighted. Unlimited copying and redistribution
+of this package and/or its individual files are permitted
+as long as there are no modifications. Modifications, and
+redistribution of modifications, are also permitted, but
+only if the resulting package and/or files are renamed.

options/license/libutil-David-Nugent

@@ -0,0 +1,15 @@
+Copyright (c) 1995 David Nugent <[email protected]>
+All rights reserved.
+
+
+Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met:
+
+1.	Redistributions of source code must retain the above copyright notice immediately at the beginning of the file, without modification, this list of conditions, and the following disclaimer.
+
+2.	Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3.	This work was done expressly for inclusion into FreeBSD. Other use is permitted provided this notation is included.
+
+4.	Absolutely no warranty of function or purpose is made by the author David Nugent.
+
+5.	Modifications may be freely made to this file providing the above conditions are met.