www/forgejo: Update 11.0.1 => 11.0.2
Release notes: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/11.0.2.md Also "fast-fix" rc script: Command error: stat /usr/local/sbin/custom/conf/app.ini: no such file or directory cannot start forgejo because of configuration errors. Run su -m git -c 'forgejo doctor check' for further details PR: 287010
This commit is contained in:
Stefan Bethke
committed by
Vladimir Druzenko
Vladimir Druzenko
parent
14102a0178
commit
25356383b9
@@ -1,7 +1,6 @@
|
||||
PORTNAME= forgejo
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 11.0.1
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 11.0.2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
|
||||
DISTNAME= forgejo-src-${DISTVERSION}
|
||||
@@ -56,8 +55,8 @@ DAEMONARGS= -f
|
||||
SUB_LIST+= DAEMONARGS="${DAEMONARGS}"
|
||||
|
||||
SSP_UNSAFE= true
|
||||
LDFLAGS+= "'-X "code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'"
|
||||
LDFLAGS+= "'-X "code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'"
|
||||
LDFLAGS+= "'-X "forgejo.org/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'" \
|
||||
"'-X "forgejo.org/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'"
|
||||
MAKE_ARGS= GOPATH=${WRKDIR} \
|
||||
TAGS="${GO_TAGS}" \
|
||||
GOFLAGS="-buildvcs=false"
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1746741570
|
||||
SHA256 (forgejo-src-11.0.1.tar.gz) = b8ae645099821e978d096888d17d7e969b05b2b7576ae1d0f4850238305fedd6
|
||||
SIZE (forgejo-src-11.0.1.tar.gz) = 55352620
|
||||
TIMESTAMP = 1750496838
|
||||
SHA256 (forgejo-src-11.0.2.tar.gz) = de6646704769ae69e80feeb8aef0ae6fffad84602fc2d003a49c903e36f9d06d
|
||||
SIZE (forgejo-src-11.0.2.tar.gz) = 55477978
|
||||
|
||||
@@ -11,8 +11,9 @@
|
||||
# choosing, INTERNAL_TOKEN is a 64-byte random number in BASE64 encoding,
|
||||
# JWT_SECRET is a 32-byte random number in BASE64 encoding.
|
||||
#
|
||||
# You can generate the token using for example:
|
||||
# openssl rand -base64 64
|
||||
# You can generate appropriate values using:
|
||||
# gitea generate secret [INTERNAL_TOKEN|JWT_SECRET|LFS_JWT_SECRET|SECRET_KEY]
|
||||
# and then copy that output to the appropriate place in this file.
|
||||
#
|
||||
# You can let Forgejo add these to the config for you; you need to make
|
||||
# app.ini writeable by the git user.
|
||||
|
||||
@@ -52,7 +52,8 @@ forgejo_start() {
|
||||
|
||||
forgejo_prestart() {
|
||||
if checkyesno forgejo_configcheck_enable; then
|
||||
if su -m ${forgejo_user} -c "%%PREFIX%%/sbin/${name} doctor check >/dev/null"; then
|
||||
if su -m ${forgejo_user} -c "FORGEJO_CUSTOM=${forgejo_custom} \
|
||||
%%PREFIX%%/sbin/${name} doctor check >/dev/null"; then
|
||||
else
|
||||
echo "cannot start ${name} because of configuration errors. Run" >&2
|
||||
echo " su -m git -c '${name} doctor check'" >&2
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
--- vendor/github.com/msteinert/pam/v2/errors.go.orig 2025-05-02 07:02:58 UTC
|
||||
+++ vendor/github.com/msteinert/pam/v2/errors.go
|
||||
@@ -77,15 +77,6 @@ const (
|
||||
ErrAuthtokExpired Error = C.PAM_AUTHTOK_EXPIRED
|
||||
// ErrModuleUnknown indicates a module is not known.
|
||||
ErrModuleUnknown Error = C.PAM_MODULE_UNKNOWN
|
||||
- // ErrBadItem indicates a bad item passed to pam_*_item().
|
||||
- ErrBadItem Error = C.PAM_BAD_ITEM
|
||||
- // ErrConvAgain indicates a conversation function is event driven and data
|
||||
- // is not available yet.
|
||||
- ErrConvAgain Error = C.PAM_CONV_AGAIN
|
||||
- // ErrIncomplete indicates to please call this function again to complete
|
||||
- // authentication stack. Before calling again, verify that conversation
|
||||
- // is completed.
|
||||
- ErrIncomplete Error = C.PAM_INCOMPLETE
|
||||
)
|
||||
|
||||
// Error returns the error message for the given status.
|
||||
--- vendor/github.com/msteinert/pam/v2/errors_linux.go.orig 1970-01-01 00:00:00 UTC
|
||||
+++ vendor/github.com/msteinert/pam/v2/errors_linux.go
|
||||
@@ -0,0 +1,21 @@
|
||||
+//go:build linux
|
||||
+
|
||||
+package pam
|
||||
+
|
||||
+/*
|
||||
+#include <security/pam_appl.h>
|
||||
+*/
|
||||
+import "C"
|
||||
+
|
||||
+// Pam Return types
|
||||
+const (
|
||||
+ // ErrBadItem indicates a bad item passed to pam_*_item().
|
||||
+ ErrBadItem Error = C.PAM_BAD_ITEM
|
||||
+ // ErrConvAgain indicates a conversation function is event driven and data
|
||||
+ // is not available yet.
|
||||
+ ErrConvAgain Error = C.PAM_CONV_AGAIN
|
||||
+ // ErrIncomplete indicates to please call this function again to complete
|
||||
+ // authentication stack. Before calling again, verify that conversation
|
||||
+ // is completed.
|
||||
+ ErrIncomplete Error = C.PAM_INCOMPLETE
|
||||
+)
|
||||
--- vendor/github.com/msteinert/pam/v2/transaction.c.orig 2025-05-02 07:02:58 UTC
|
||||
+++ vendor/github.com/msteinert/pam/v2/transaction.c
|
||||
@@ -47,15 +47,30 @@ void init_pam_conv(struct pam_conv *conv, uintptr_t ap
|
||||
conv->appdata_ptr = (void *)appdata;
|
||||
}
|
||||
|
||||
+#ifdef OPENPAM
|
||||
+int pam_start_confdir(const char *service_name, const char *user, const struct pam_conv *pam_conversation,
|
||||
+ const char *confdir, pam_handle_t **pamh)
|
||||
+{
|
||||
+ if (pamh != NULL)
|
||||
+ *pamh = NULL;
|
||||
+
|
||||
+ return PAM_SYSTEM_ERR;
|
||||
+}
|
||||
+#else
|
||||
// pam_start_confdir is a recent PAM api to declare a confdir (mostly for
|
||||
// tests) weaken the linking dependency to detect if it’s present.
|
||||
int pam_start_confdir(const char *service_name, const char *user, const struct pam_conv *pam_conversation,
|
||||
const char *confdir, pam_handle_t **pamh) __attribute__((weak));
|
||||
+#endif
|
||||
|
||||
int check_pam_start_confdir(void)
|
||||
{
|
||||
+#ifdef OPENPAM
|
||||
+ return 1;
|
||||
+#else
|
||||
if (pam_start_confdir == NULL)
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
+#endif
|
||||
}
|
||||
--- vendor/github.com/msteinert/pam/v2/transaction.go.orig 2025-05-02 07:02:58 UTC
|
||||
+++ vendor/github.com/msteinert/pam/v2/transaction.go
|
||||
@@ -257,14 +257,6 @@ const (
|
||||
Ruser Item = C.PAM_RUSER
|
||||
// UserPrompt is the string use to prompt for a username.
|
||||
UserPrompt Item = C.PAM_USER_PROMPT
|
||||
- // FailDelay is the app supplied function to override failure delays.
|
||||
- FailDelay Item = C.PAM_FAIL_DELAY
|
||||
- // Xdisplay is the X display name
|
||||
- Xdisplay Item = C.PAM_XDISPLAY
|
||||
- // Xauthdata is the X server authentication data.
|
||||
- Xauthdata Item = C.PAM_XAUTHDATA
|
||||
- // AuthtokType is the type for pam_get_authtok
|
||||
- AuthtokType Item = C.PAM_AUTHTOK_TYPE
|
||||
)
|
||||
|
||||
// SetItem sets a PAM information item.
|
||||
--- vendor/github.com/msteinert/pam/v2/transaction_linux.go.orig 1970-01-01 00:00:00 UTC
|
||||
+++ vendor/github.com/msteinert/pam/v2/transaction_linux.go
|
||||
@@ -0,0 +1,20 @@
|
||||
+//go:build linux
|
||||
+
|
||||
+package pam
|
||||
+
|
||||
+/*
|
||||
+#include <security/pam_appl.h>
|
||||
+*/
|
||||
+import "C"
|
||||
+
|
||||
+// PAM Item types.
|
||||
+const (
|
||||
+ // FailDelay is the app supplied function to override failure delays.
|
||||
+ FailDelay Item = C.PAM_FAIL_DELAY
|
||||
+ // Xdisplay is the X display name
|
||||
+ Xdisplay Item = C.PAM_XDISPLAY
|
||||
+ // Xauthdata is the X server authentication data.
|
||||
+ Xauthdata Item = C.PAM_XAUTHDATA
|
||||
+ // AuthtokType is the type for pam_get_authtok
|
||||
+ AuthtokType Item = C.PAM_AUTHTOK_TYPE
|
||||
+)
|
||||
Reference in New Issue
Block a user