From 8d437013082988ce7306902138f8bfe16610d6c3 Mon Sep 17 00:00:00 2001 From: pvk Date: Mon, 9 Jan 2023 17:39:56 +0000 Subject: [PATCH] Update gitea 1.17.4 -> 1.18.0 Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.18.0 Configuration fix and pkg README update from sdk@ and kn@, thanks! --- www/gitea/Makefile | 6 ++-- www/gitea/distinfo | 4 +-- www/gitea/pkg/PLIST | 70 ++++++++++++++++++++++++-------------------- www/gitea/pkg/README | 3 ++ 4 files changed, 46 insertions(+), 37 deletions(-) diff --git a/www/gitea/Makefile b/www/gitea/Makefile index e022612b86e..12f6ee4d9d5 100644 --- a/www/gitea/Makefile +++ b/www/gitea/Makefile @@ -1,9 +1,8 @@ COMMENT = compact self-hosted Git service -VERSION = 1.17.4 +VERSION = 1.18.0 DISTNAME = gitea-src-${VERSION} PKGNAME = gitea-${VERSION} -REVISION = 0 MASTER_SITES = https://github.com/go-gitea/gitea/releases/download/v${VERSION}/ @@ -28,8 +27,7 @@ MODGO_LDFLAGS += -X code.gitea.io/gitea/modules/setting.StaticRootPath=${LOCALBA MODGO_LDFLAGS += -X main.Version=${VERSION} MODGO_LDFLAGS += -X 'main.Tags=${GO_TAGS}' -RUN_DEPENDS = devel/git \ - shells/bash +RUN_DEPENDS = devel/git ALL_TARGET = code.gitea.io/gitea WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_TARGET} diff --git a/www/gitea/distinfo b/www/gitea/distinfo index 029a9c64fdd..e5ac27f15c0 100644 --- a/www/gitea/distinfo +++ b/www/gitea/distinfo @@ -1,2 +1,2 @@ -SHA256 (gitea-src-1.17.4.tar.gz) = koZEr89QhxCf2Dd/7SWiS/ZZoRIBfyu0mbxKknjXPK4= -SIZE (gitea-src-1.17.4.tar.gz) = 52844862 +SHA256 (gitea-src-1.18.0.tar.gz) = X0KvIB2JvSoh2MR9FcwKObQzod2GxhKeGqIKU5CKTEM= +SIZE (gitea-src-1.18.0.tar.gz) = 55508056 diff --git a/www/gitea/pkg/PLIST b/www/gitea/pkg/PLIST index 562d1b88756..72a5874a129 100644 --- a/www/gitea/pkg/PLIST +++ b/www/gitea/pkg/PLIST @@ -285,7 +285,6 @@ share/gitea/options/license/AFL-1.2 share/gitea/options/license/AFL-2.0 share/gitea/options/license/AFL-2.1 share/gitea/options/license/AFL-3.0 -share/gitea/options/license/AGPL-1.0 share/gitea/options/license/AGPL-1.0-only share/gitea/options/license/AGPL-1.0-or-later share/gitea/options/license/AGPL-3.0-only @@ -319,8 +318,6 @@ share/gitea/options/license/Autoconf-exception-2.0 share/gitea/options/license/Autoconf-exception-3.0 share/gitea/options/license/BSD-1-Clause share/gitea/options/license/BSD-2-Clause -share/gitea/options/license/BSD-2-Clause-FreeBSD -share/gitea/options/license/BSD-2-Clause-NetBSD share/gitea/options/license/BSD-2-Clause-Patent share/gitea/options/license/BSD-2-Clause-Views share/gitea/options/license/BSD-3-Clause @@ -361,6 +358,7 @@ share/gitea/options/license/CC-BY-2.5-AU share/gitea/options/license/CC-BY-3.0 share/gitea/options/license/CC-BY-3.0-AT share/gitea/options/license/CC-BY-3.0-DE +share/gitea/options/license/CC-BY-3.0-IGO share/gitea/options/license/CC-BY-3.0-NL share/gitea/options/license/CC-BY-3.0-US share/gitea/options/license/CC-BY-4.0 @@ -498,6 +496,8 @@ share/gitea/options/license/GPL-3.0-linking-source-exception share/gitea/options/license/GPL-3.0-only share/gitea/options/license/GPL-3.0-or-later share/gitea/options/license/GPL-CC-1.0 +share/gitea/options/license/GStreamer-exception-2005 +share/gitea/options/license/GStreamer-exception-2008 share/gitea/options/license/Giftware share/gitea/options/license/Glide share/gitea/options/license/Glulxe @@ -541,6 +541,8 @@ share/gitea/options/license/LPPL-1.1 share/gitea/options/license/LPPL-1.2 share/gitea/options/license/LPPL-1.3a share/gitea/options/license/LPPL-1.3c +share/gitea/options/license/LZMA-SDK-9.11-to-9.20 +share/gitea/options/license/LZMA-SDK-9.22 share/gitea/options/license/LZMA-exception share/gitea/options/license/Latex2e share/gitea/options/license/Leptonica @@ -565,10 +567,12 @@ share/gitea/options/license/MPL-1.0 share/gitea/options/license/MPL-1.1 share/gitea/options/license/MPL-2.0 share/gitea/options/license/MPL-2.0-no-copyleft-exception +share/gitea/options/license/MS-LPL share/gitea/options/license/MS-PL share/gitea/options/license/MS-RL share/gitea/options/license/MTLL share/gitea/options/license/MakeIndex +share/gitea/options/license/Minpack share/gitea/options/license/MirOS share/gitea/options/license/Motosoto share/gitea/options/license/MulanPSL-1.0 @@ -581,6 +585,7 @@ share/gitea/options/license/NBPL-1.0 share/gitea/options/license/NCGL-UK-2.0 share/gitea/options/license/NCSA share/gitea/options/license/NGPL +share/gitea/options/license/NICTA-1.0 share/gitea/options/license/NIST-PD share/gitea/options/license/NIST-PD-fallback share/gitea/options/license/NLOD-1.0 @@ -656,6 +661,7 @@ share/gitea/options/license/PolyForm-Noncommercial-1.0.0 share/gitea/options/license/PolyForm-Small-Business-1.0.0 share/gitea/options/license/PostgreSQL share/gitea/options/license/Python-2.0 +share/gitea/options/license/Python-2.0.1 share/gitea/options/license/QPL-1.0 share/gitea/options/license/Qhull share/gitea/options/license/Qt-GPL-exception-1.0 @@ -714,7 +720,6 @@ share/gitea/options/license/Universal-FOSS-exception-1.0 share/gitea/options/license/Unlicense share/gitea/options/license/VOSTROM share/gitea/options/license/VSL-1.0 -share/gitea/options/license/Verbatim-man-pages share/gitea/options/license/Vim share/gitea/options/license/W3C share/gitea/options/license/W3C-19980720 @@ -740,6 +745,7 @@ share/gitea/options/license/Zimbra-1.3 share/gitea/options/license/Zimbra-1.4 share/gitea/options/license/Zlib share/gitea/options/license/blessing +share/gitea/options/license/checkmk share/gitea/options/license/copyleft-next-0.3.0 share/gitea/options/license/copyleft-next-0.3.1 share/gitea/options/license/curl @@ -758,6 +764,7 @@ share/gitea/options/license/libpng-2.0 share/gitea/options/license/libselinux-1.0 share/gitea/options/license/libtiff share/gitea/options/license/mif-exception +share/gitea/options/license/mpi-permissive share/gitea/options/license/mpich2 share/gitea/options/license/mplus share/gitea/options/license/openvpn-openssl-exception @@ -792,6 +799,7 @@ share/gitea/options/locale/locale_pt-BR.ini share/gitea/options/locale/locale_pt-PT.ini share/gitea/options/locale/locale_ru-RU.ini share/gitea/options/locale/locale_si-LK.ini +share/gitea/options/locale/locale_sk-SK.ini share/gitea/options/locale/locale_sv-SE.ini share/gitea/options/locale/locale_tr-TR.ini share/gitea/options/locale/locale_uk-UA.ini @@ -803,6 +811,9 @@ share/gitea/options/readme/Default share/gitea/public share/gitea/templates/ share/gitea/templates/admin/ +share/gitea/templates/admin/applications/ +share/gitea/templates/admin/applications/list.tmpl +share/gitea/templates/admin/applications/oauth2_edit.tmpl share/gitea/templates/admin/auth/ share/gitea/templates/admin/auth/edit.tmpl share/gitea/templates/admin/auth/list.tmpl @@ -856,6 +867,9 @@ share/gitea/templates/base/head.tmpl share/gitea/templates/base/head_navbar.tmpl share/gitea/templates/base/head_script.tmpl share/gitea/templates/base/paginate.tmpl +share/gitea/templates/code/ +share/gitea/templates/code/searchform.tmpl +share/gitea/templates/code/searchresults.tmpl share/gitea/templates/custom/ share/gitea/templates/custom/body_inner_post.tmpl share/gitea/templates/custom/body_inner_pre.tmpl @@ -890,6 +904,7 @@ share/gitea/templates/mail/notify/ share/gitea/templates/mail/notify/collaborator.tmpl share/gitea/templates/mail/notify/repo_transfer.tmpl share/gitea/templates/mail/release.tmpl +share/gitea/templates/mail/team_invite.tmpl share/gitea/templates/org/ share/gitea/templates/org/create.tmpl share/gitea/templates/org/header.tmpl @@ -898,6 +913,8 @@ share/gitea/templates/org/member/ share/gitea/templates/org/member/members.tmpl share/gitea/templates/org/menu.tmpl share/gitea/templates/org/settings/ +share/gitea/templates/org/settings/applications.tmpl +share/gitea/templates/org/settings/applications_oauth2_edit.tmpl share/gitea/templates/org/settings/delete.tmpl share/gitea/templates/org/settings/hook_new.tmpl share/gitea/templates/org/settings/hooks.tmpl @@ -905,6 +922,7 @@ share/gitea/templates/org/settings/labels.tmpl share/gitea/templates/org/settings/navbar.tmpl share/gitea/templates/org/settings/options.tmpl share/gitea/templates/org/team/ +share/gitea/templates/org/team/invite.tmpl share/gitea/templates/org/team/members.tmpl share/gitea/templates/org/team/navbar.tmpl share/gitea/templates/org/team/new.tmpl @@ -923,9 +941,11 @@ share/gitea/templates/package/content/maven.tmpl share/gitea/templates/package/content/npm.tmpl share/gitea/templates/package/content/npm_dependencies.tmpl share/gitea/templates/package/content/nuget.tmpl +share/gitea/templates/package/content/pub.tmpl share/gitea/templates/package/content/pypi.tmpl share/gitea/templates/package/content/rubygems.tmpl share/gitea/templates/package/content/rubygems_dependencies.tmpl +share/gitea/templates/package/content/vagrant.tmpl share/gitea/templates/package/metadata/ share/gitea/templates/package/metadata/composer.tmpl share/gitea/templates/package/metadata/conan.tmpl @@ -935,8 +955,10 @@ share/gitea/templates/package/metadata/helm.tmpl share/gitea/templates/package/metadata/maven.tmpl share/gitea/templates/package/metadata/npm.tmpl share/gitea/templates/package/metadata/nuget.tmpl +share/gitea/templates/package/metadata/pub.tmpl share/gitea/templates/package/metadata/pypi.tmpl share/gitea/templates/package/metadata/rubygems.tmpl +share/gitea/templates/package/metadata/vagrant.tmpl share/gitea/templates/package/settings.tmpl share/gitea/templates/package/shared/ share/gitea/templates/package/shared/list.tmpl @@ -968,10 +990,12 @@ share/gitea/templates/repo/diff/comments.tmpl share/gitea/templates/repo/diff/compare.tmpl share/gitea/templates/repo/diff/conversation.tmpl share/gitea/templates/repo/diff/csv_diff.tmpl +share/gitea/templates/repo/diff/escape_title.tmpl share/gitea/templates/repo/diff/image_diff.tmpl share/gitea/templates/repo/diff/new_comment.tmpl share/gitea/templates/repo/diff/new_review.tmpl share/gitea/templates/repo/diff/options_dropdown.tmpl +share/gitea/templates/repo/diff/section_code.tmpl share/gitea/templates/repo/diff/section_split.tmpl share/gitea/templates/repo/diff/section_unified.tmpl share/gitea/templates/repo/diff/stats.tmpl @@ -1000,6 +1024,13 @@ share/gitea/templates/repo/issue/ share/gitea/templates/repo/issue/branch_selector_field.tmpl share/gitea/templates/repo/issue/choose.tmpl share/gitea/templates/repo/issue/comment_tab.tmpl +share/gitea/templates/repo/issue/fields/ +share/gitea/templates/repo/issue/fields/checkboxes.tmpl +share/gitea/templates/repo/issue/fields/dropdown.tmpl +share/gitea/templates/repo/issue/fields/header.tmpl +share/gitea/templates/repo/issue/fields/input.tmpl +share/gitea/templates/repo/issue/fields/markdown.tmpl +share/gitea/templates/repo/issue/fields/textarea.tmpl share/gitea/templates/repo/issue/label_precolors.tmpl share/gitea/templates/repo/issue/labels/ share/gitea/templates/repo/issue/labels.tmpl @@ -1147,6 +1178,7 @@ share/gitea/templates/user/auth/twofa.tmpl share/gitea/templates/user/auth/twofa_scratch.tmpl share/gitea/templates/user/auth/webauthn.tmpl share/gitea/templates/user/auth/webauthn_error.tmpl +share/gitea/templates/user/code.tmpl share/gitea/templates/user/dashboard/ share/gitea/templates/user/dashboard/dashboard.tmpl share/gitea/templates/user/dashboard/feeds.tmpl @@ -1158,6 +1190,7 @@ share/gitea/templates/user/heatmap.tmpl share/gitea/templates/user/notification/ share/gitea/templates/user/notification/notification.tmpl share/gitea/templates/user/notification/notification_div.tmpl +share/gitea/templates/user/notification/notification_subscriptions.tmpl share/gitea/templates/user/overview/ share/gitea/templates/user/overview/header.tmpl share/gitea/templates/user/overview/package_versions.tmpl @@ -1170,6 +1203,8 @@ share/gitea/templates/user/settings/appearance.tmpl share/gitea/templates/user/settings/applications.tmpl share/gitea/templates/user/settings/applications_oauth2.tmpl share/gitea/templates/user/settings/applications_oauth2_edit.tmpl +share/gitea/templates/user/settings/applications_oauth2_edit_form.tmpl +share/gitea/templates/user/settings/applications_oauth2_list.tmpl share/gitea/templates/user/settings/grants_oauth2.tmpl share/gitea/templates/user/settings/keys.tmpl share/gitea/templates/user/settings/keys_gpg.tmpl @@ -1202,12 +1237,10 @@ gitea/public/css/ gitea/public/css/dropzone.0142b04d.css gitea/public/css/index.css gitea/public/css/minicolors.6d617d3d.css -gitea/public/css/monaco.6c9803a7.css gitea/public/css/swagger.css gitea/public/css/theme-arc-green.css gitea/public/css/theme-auto.css gitea/public/fonts/ -gitea/public/fonts/codicon.ade70576.ttf gitea/public/fonts/fontawesome-webfont.20fd1704.woff2 gitea/public/fonts/icons.9451d5fe.woff2 gitea/public/fonts/outline-icons.c5240512.woff2 @@ -1557,16 +1590,11 @@ gitea/public/img/webpack/jquery.minicolors.0e614115.png gitea/public/img/wechatwork.png gitea/public/js/ gitea/public/js/dropzone.b77e7ea6.js -gitea/public/js/easymde.0d7ad9ea.js gitea/public/js/eventsource.sharedworker.js gitea/public/js/index.js gitea/public/js/licenses.txt -gitea/public/js/mermaid.7e28b562.js gitea/public/js/minicolors.42d0e10a.js -gitea/public/js/monaco-css.b88e577d.worker.js gitea/public/js/monaco-editor.a85ce25e.worker.js -gitea/public/js/monaco-html.c89a6fc8.worker.js -gitea/public/js/monaco-json.45f3c3ad.worker.js gitea/public/js/monaco-language-abap.c5cad4be.js gitea/public/js/monaco-language-apex.baaeb3b2.js gitea/public/js/monaco-language-azcli.50450f16.js @@ -1578,30 +1606,20 @@ gitea/public/js/monaco-language-coffee.8b2fca99.js gitea/public/js/monaco-language-cpp.db942ffd.js gitea/public/js/monaco-language-csharp.686a53fc.js gitea/public/js/monaco-language-csp.dc8e087f.js -gitea/public/js/monaco-language-css.fd7032f5.js -gitea/public/js/monaco-language-cssmode.000c29fd.js gitea/public/js/monaco-language-dart.1d2776fe.js gitea/public/js/monaco-language-dockerfile.ba5d6355.js gitea/public/js/monaco-language-ecl.88ca23a0.js gitea/public/js/monaco-language-elixir.335fcdbf.js gitea/public/js/monaco-language-flow9.66d56dbe.js -gitea/public/js/monaco-language-freemarker2.e161e268.js gitea/public/js/monaco-language-fsharp.58d8c2cd.js gitea/public/js/monaco-language-go.9f2bba6c.js gitea/public/js/monaco-language-graphql.53b54aa3.js -gitea/public/js/monaco-language-handlebars.6a31f315.js gitea/public/js/monaco-language-hcl.93aa7031.js -gitea/public/js/monaco-language-html.3f4e413d.js -gitea/public/js/monaco-language-htmlmode.19c2f141.js gitea/public/js/monaco-language-ini.975203ba.js gitea/public/js/monaco-language-java.eb37f0d5.js -gitea/public/js/monaco-language-javascript.a42e04b3.js -gitea/public/js/monaco-language-jsonmode.155ea31e.js gitea/public/js/monaco-language-julia.139ea024.js gitea/public/js/monaco-language-kotlin.95b7cc03.js -gitea/public/js/monaco-language-less.75eb9849.js gitea/public/js/monaco-language-lexon.8a8ffe86.js -gitea/public/js/monaco-language-liquid.e541464a.js gitea/public/js/monaco-language-lua.76269f02.js gitea/public/js/monaco-language-m3.381dacb6.js gitea/public/js/monaco-language-markdown.3e456b5f.js @@ -1620,10 +1638,7 @@ gitea/public/js/monaco-language-powerquery.e1b5c939.js gitea/public/js/monaco-language-powershell.986d17fa.js gitea/public/js/monaco-language-protobuf.eb7795fc.js gitea/public/js/monaco-language-pug.a07a81a3.js -gitea/public/js/monaco-language-python.7081c2e5.js -gitea/public/js/monaco-language-qsharp.5c88e57a.js gitea/public/js/monaco-language-r.22ed335c.js -gitea/public/js/monaco-language-razor.5fe83147.js gitea/public/js/monaco-language-redis.51aba187.js gitea/public/js/monaco-language-redshift.dca4aaa6.js gitea/public/js/monaco-language-restructuredtext.052e193d.js @@ -1632,7 +1647,6 @@ gitea/public/js/monaco-language-rust.2879dd02.js gitea/public/js/monaco-language-sb.676f2916.js gitea/public/js/monaco-language-scala.2be8473f.js gitea/public/js/monaco-language-scheme.978fadb1.js -gitea/public/js/monaco-language-scss.77abc15e.js gitea/public/js/monaco-language-shell.be3eb562.js gitea/public/js/monaco-language-solidity.36abbcbb.js gitea/public/js/monaco-language-sophia.d6bb115d.js @@ -1642,14 +1656,8 @@ gitea/public/js/monaco-language-st.88c6c88a.js gitea/public/js/monaco-language-swift.c93b49e8.js gitea/public/js/monaco-language-systemverilog.ddac36c7.js gitea/public/js/monaco-language-tcl.f56dddac.js -gitea/public/js/monaco-language-tsmode.8e043b8c.js gitea/public/js/monaco-language-twig.cd80df58.js -gitea/public/js/monaco-language-typescript.e7b47815.js gitea/public/js/monaco-language-vb.95b807bd.js -gitea/public/js/monaco-language-xml.4af5f38a.js -gitea/public/js/monaco-language-yaml.2248fd10.js -gitea/public/js/monaco-ts.bcc30825.worker.js -gitea/public/js/monaco.659f0d05.js gitea/public/js/sortable.b26f479a.js gitea/public/js/swagger.js gitea/public/js/theme-arc-green.js diff --git a/www/gitea/pkg/README b/www/gitea/pkg/README index 2ef456fd8d3..b68b5de92b5 100644 --- a/www/gitea/pkg/README +++ b/www/gitea/pkg/README @@ -55,6 +55,9 @@ Relevant configuration directives in ${SYSCONFDIR}/gitea/app.ini: HTTP_ADDR = /var/www/run/gitea/gitea.sock LOCAL_ROOT_URL = %(ROOT_URL)s +Create the directory for gitea socket with the following command: + # install -d -o _gitea /var/www/run/gitea + Customizing gitea ================= For custom public files, templates, gitignores, labels, licenses and READMEs,