CVS commit: [pkgsrc-2022Q3] pkgsrc/www/gitea

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Nov 16 19:14:36 UTC 2022

Modified Files:
        pkgsrc/www/gitea [pkgsrc-2022Q3]: Makefile distinfo
        pkgsrc/www/gitea/patches [pkgsrc-2022Q3]: patch-Makefile

Log Message:
Pullup ticket #6704 - requested by khorben
www/gitea: security fix, build fix

Revisions pulled up:
- www/gitea/Makefile                                            1.81
- www/gitea/distinfo                                            1.32-1.33
- www/gitea/patches/patch-Makefile                              1.4

---
   Module Name:    pkgsrc
   Committed By:   khorben
   Date:           Wed Nov  9 23:26:15 UTC 2022

   Modified Files:
           pkgsrc/www/gitea: Makefile distinfo

   Log Message:
   gitea: update to 1.16.9

   Changes since 1.16.8:

   SECURITY

   * Add write check for creating Commit status (#20332) (#20334)
   * Check for permission when fetching user controlled issues (#20133) (#20196)

   BUGFIXES

   * Hide notify mail setting ui if not enabled (#20138) (#20337)
   * Add write check for creating Commit status (#20332) (#20334)
   * Only show Followers that current user can access (#20220) (#20253)
   * Release page show all tags in compare dropdown (#20070) (#20071)
   * Fix permission check for delete tag (#19985) (#20001)
   * Only log non ErrNotExist errors in git.GetNote (#19884) (#19905)
   * Use exact search instead of fuzzy search for branch filter dropdown (#19885) (#19893)
   * Set Setpgid on child git processes (#19865) (#19881)
   * Import git from alpine 3.16 repository as 2.30.4 is needed for safe.directory = '*' to work but alpine 3.13 has 2.30.3 (#19876)
   * Ensure responses are context.ResponseWriters (#19843) (#19859)
   * Fix incorrect usage of Count function (#19850)
   * Fix raw endpoint PDF file headers (#19825) (#19826)
   * Make WIP prefixes case insensitive, e.g. allow Draft as a WIP prefix (#19780) (#19811)
   * Don’t return 500 on NotificationUnreadCount (#19802)
   * Prevent NPE when cache service is disabled (#19703) (#19783)
   * Detect truncated utf-8 characters at the end of content as still representing utf-8 (#19773) (#19774)
   * Fix doctor pq: syntax error at or near “.” quote user table name (#19765) (#19770)
   * Fix bug with assigneees (#19757)

---
   Module Name:    pkgsrc
   Committed By:   khorben
   Date:           Thu Nov 10 21:12:54 UTC 2022

   Modified Files:
           pkgsrc/www/gitea: distinfo
           pkgsrc/www/gitea/patches: patch-Makefile

   Log Message:
   gitea: use find(1) in a more portable way

   Verified on NetBSD, Linux (Debian 10.13), and macOS (all amd64).

   No changes to the package observed, so no revision bump.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.77.2.1 pkgsrc/www/gitea/Makefile
cvs rdiff -u -r1.31 -r1.31.4.1 pkgsrc/www/gitea/distinfo
cvs rdiff -u -r1.3 -r1.3.6.1 pkgsrc/www/gitea/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/gitea/Makefile
diff -u pkgsrc/www/gitea/Makefile:1.77 pkgsrc/www/gitea/Makefile:1.77.2.1
--- pkgsrc/www/gitea/Makefile:1.77      Wed Sep  7 09:32:20 2022
+++ pkgsrc/www/gitea/Makefile   Wed Nov 16 19:14:36 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2022/09/07 09:32:20 bsiegert Exp $
+# $NetBSD: Makefile,v 1.77.2.1 2022/11/16 19:14:36 bsiegert Exp $
 
-DISTNAME=      gitea-1.16.8
+DISTNAME=      gitea-1.16.9
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=go-gitea/}
-PKGREVISION=   4
 CATEGORIES=    www
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
@@ -11,9 +10,6 @@ HOMEPAGE=     https://gitea.io/
 COMMENT=       Compact self-hosted Git service
 LICENSE=       mit
 
-GO_DIST_BASE=          ${DISTNAME}
-GO_SRCPATH=            code.gitea.io/gitea
-
 #
 # The front-end files do not change every release, so only bump this when
 # necessary to avoid excessive uploads to LOCAL_PORTS.

Index: pkgsrc/www/gitea/distinfo
diff -u pkgsrc/www/gitea/distinfo:1.31 pkgsrc/www/gitea/distinfo:1.31.4.1
--- pkgsrc/www/gitea/distinfo:1.31      Wed May 18 18:38:33 2022
+++ pkgsrc/www/gitea/distinfo   Wed Nov 16 19:14:36 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2022/05/18 18:38:33 khorben Exp $
+$NetBSD: distinfo,v 1.31.4.1 2022/11/16 19:14:36 bsiegert Exp $
 
 BLAKE2s (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = ff8095283662ae2d2a1968bf429516c54586b1a6c4dc744657162e6781aa8ece
 SHA512 (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
@@ -258,9 +258,9 @@ Size (dmitri.shuralyov.com_gpu_mtl_@v_v0
 BLAKE2s (gitea-1.16.1-frontend.tar.gz) = 7b6ab37fc8e58d58cc76b5f5fb4a837e90b6c3e71e7a924aa8bc9fd1ab4e042a
 SHA512 (gitea-1.16.1-frontend.tar.gz) = efca0fcbd024cb8254d78e027c0df9d407e1102108f51c62b0139e2b9a99909d83a9c6766bf90c5186e7e3928c6a38531776d9c7c51f8dcff391566fdd395599
 Size (gitea-1.16.1-frontend.tar.gz) = 8802148 bytes
-BLAKE2s (gitea-1.16.8.tar.gz) = 0c7f64d63c6a50b1327f8d21815ef4776b908fec822d106c7ccccdf44aace4da
-SHA512 (gitea-1.16.8.tar.gz) = a8006662994083cbb35e83fefa716bff36b6f964030806b5c67a42cb4648262ca49c77947ea99be245ecd121a5f393451f5fe049ebee4fde99bfe96487113aa1
-Size (gitea-1.16.8.tar.gz) = 11123248 bytes
+BLAKE2s (gitea-1.16.9.tar.gz) = d45878ce7d26075da3777000bb903067634a87da5f0a31f42a878a2a30f3a2b2
+SHA512 (gitea-1.16.9.tar.gz) = 8f4395bfcf8a5dbf23079553e2e749fec4fb0e07026811061e4e5995d293ea18dc290b02b321e6aa00136215484dc29b4baf4ca49a417aafb0c8da39113b79e1
+Size (gitea-1.16.9.tar.gz) = 11130133 bytes
 BLAKE2s (gitea.com_go-chi_binding_@v_v0.0.0-20220309004920-114340dabecb.mod) = 51eb458bbeb0cbc60b6fd7c36a4f6d76e136fa3495fc9c93c690479bb266d460
 SHA512 (gitea.com_go-chi_binding_@v_v0.0.0-20220309004920-114340dabecb.mod) = 
c7a8315434e69e8e3bd221dc2930d0043d5636a528c05b0ad4929bddb60e901b6043116bd444847c98b2783cbb40b8e53f0dcbe54ae846c0c64f611cb16252fe
 Size (gitea.com_go-chi_binding_@v_v0.0.0-20220309004920-114340dabecb.mod) = 215 bytes
@@ -8049,4 +8049,4 @@ Size (xorm.io_xorm_@v_v1.2.5.mod) = 486 
 BLAKE2s (xorm.io_xorm_@v_v1.2.5.zip) = 03755a7c8b10da3dd1ab496969dbf0e54a528749fed1d3bdaeb26237235ff0a7
 SHA512 (xorm.io_xorm_@v_v1.2.5.zip) = e136f8c50d41c46b83cb17b82e6865967105f404a886d93834793c13fa4c9e0ef6c841e9eed19ba5fecf068670650b01a1648303614ed97ff2d046992479d357
 Size (xorm.io_xorm_@v_v1.2.5.zip) = 307259 bytes
-SHA1 (patch-Makefile) = e412ed02de0c2b4e7ea711b829168551bf6f8839
+SHA1 (patch-Makefile) = 289ec07884b772dac8f79dfd89b498c55df9cf83

Index: pkgsrc/www/gitea/patches/patch-Makefile
diff -u pkgsrc/www/gitea/patches/patch-Makefile:1.3 pkgsrc/www/gitea/patches/patch-Makefile:1.3.6.1
--- pkgsrc/www/gitea/patches/patch-Makefile:1.3 Wed Feb 16 16:06:21 2022
+++ pkgsrc/www/gitea/patches/patch-Makefile     Wed Nov 16 19:14:36 2022
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile,v 1.3 2022/02/16 16:06:21 tm Exp $
+$NetBSD: patch-Makefile,v 1.3.6.1 2022/11/16 19:14:36 bsiegert Exp $
 
 Exclude LDFLAGS, this is not C.
+Use find(1) in a more portable way.
 
---- Makefile.orig      2022-02-06 12:35:24.000000000 +0000
+--- Makefile.orig      2022-07-12 18:26:27.000000000 +0000
 +++ Makefile
-@@ -88,7 +88,7 @@ else
+@@ -95,7 +95,7 @@ else
        endif
  endif
  
@@ -13,3 +14,12 @@ Exclude LDFLAGS, this is not C.
  
  LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
  
+@@ -126,7 +126,7 @@ TAR_EXCLUDES := .git data indexers queue
+ GO_DIRS := cmd integrations models modules routers build services tools
+ 
+ GO_SOURCES := $(wildcard *.go)
+-GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go)
++GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -and ! -path modules/options/bindata.go -and ! -path modules/public/bindata.go -and ! -path modules/templates/bindata.go)
+ 
+ ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
+       GO_SOURCES += $(BINDATA_DEST)