From 804bc3e9d7ac42de961a74547ca2566f1dcf9f52 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Thu, 29 Mar 2018 22:32:22 +0200 Subject: [PATCH] gitea: update to 1.4.0 --- srcpkgs/gitea/patches/daemon_config.patch | 56 +++++++++++------------ srcpkgs/gitea/template | 6 +-- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/srcpkgs/gitea/patches/daemon_config.patch b/srcpkgs/gitea/patches/daemon_config.patch index 4281dcb4c0..41f6a0888b 100644 --- a/srcpkgs/gitea/patches/daemon_config.patch +++ b/srcpkgs/gitea/patches/daemon_config.patch @@ -1,6 +1,6 @@ ---- conf/app.ini.orig 2018-01-31 19:52:51.508685405 -0800 -+++ conf/app.ini 2018-01-31 20:00:47.790142769 -0800 -@@ -1,12 +1,12 @@ +--- custom/conf/app.ini.sample.orig 2018-03-29 22:07:58.349893121 +0200 ++++ custom/conf/app.ini.sample 2018-03-29 22:14:52.677957272 +0200 +@@ -5,12 +5,12 @@ ; App name that shows on every page title APP_NAME = Gitea: Git with a cup of tea ; Change it if you run locally @@ -16,12 +16,15 @@ SCRIPT_TYPE = bash ; Default ANSI charset ANSI_CHARSET = -@@ -36,13 +36,13 @@ +@@ -42,15 +42,15 @@ [repository.local] - ; Path for uploads. Defaults to `tmp/local-repo` + ; Path for local repository copy. Defaults to `tmp/local-repo` -LOCAL_COPY_PATH = tmp/local-repo +LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo + ; Path for local wiki copy. Defaults to `tmp/local-wiki` +-LOCAL_WIKI_PATH = tmp/local-wiki ++LOCAL_WIKI_PATH = /var/lib/gitea/tmp/local-wiki [repository.upload] ; Whether repository file uploads are enabled. Defaults to `true` @@ -32,16 +35,16 @@ ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type ALLOWED_TYPES = ; Max size of each file in MB. Defaults to 3MB -@@ -104,7 +104,7 @@ - HTTP_ADDR = 0.0.0.0 - HTTP_PORT = 3000 +@@ -118,7 +118,7 @@ + REDIRECT_OTHER_PORT = false + PORT_TO_REDIRECT = 80 ; Permission for unix socket -UNIX_SOCKET_PERMISSION = 666 +UNIX_SOCKET_PERMISSION = 660 ; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service. ; In most cases you do not need to change the default value. ; Alter it only if your SSH server node is not the same as HTTP node. -@@ -120,7 +120,7 @@ +@@ -134,7 +134,7 @@ ; Network interface builtin SSH server listens on SSH_LISTEN_HOST = ; Port number to be exposed in clone URL @@ -50,7 +53,7 @@ ; Port number builtin SSH server listens on SSH_LISTEN_PORT = %(SSH_PORT)s ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'. -@@ -146,7 +146,7 @@ +@@ -160,7 +160,7 @@ ; Indicate whether to check minimum key size with corresponding type MINIMUM_KEY_SIZE_CHECK = false ; Disable CDN even in "prod" mode @@ -59,7 +62,7 @@ DISABLE_ROUTER_LOG = false ; Generate steps: ; $ ./gitea cert -ca=true -duration=8760h0m0s -host=myhost.example.com -@@ -155,13 +155,13 @@ +@@ -169,13 +169,13 @@ ; not forget to export the private key): ; $ openssl pkcs12 -in cert.pfx -out cert.pem -nokeys ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes @@ -75,17 +78,17 @@ +APP_DATA_PATH = /var/lib/gitea/data ; Application level GZIP support ENABLE_GZIP = false - ; Landing page for non-logged users, can be "home" or "explore" -@@ -169,7 +169,7 @@ + ; Landing page, can be "home", "explore", or "organizations" +@@ -183,7 +183,7 @@ ; Enables git-lfs support. true or false, default is false. LFS_START_SERVER = false ; Where your lfs files put on, default is data/lfs. -LFS_CONTENT_PATH = data/lfs +LFS_CONTENT_PATH = /var/lib/gitea/data/lfs ; LFS authentication secret, changed this to yourself. - LFS_JWT_SECRET = + LFS_JWT_SECRET = -@@ -182,7 +182,7 @@ +@@ -196,7 +196,7 @@ [database] ; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice @@ -94,7 +97,7 @@ HOST = 127.0.0.1:3306 NAME = gitea USER = root -@@ -190,17 +190,17 @@ +@@ -205,17 +205,17 @@ ; For "postgres" only, either "disable", "require" or "verify-full" SSL_MODE = disable ; For "sqlite3" and "tidb", use absolute path when you start as service @@ -115,7 +118,7 @@ UPDATE_BUFFER_LEN = 20 MAX_FILE_SIZE = 1048576 -@@ -212,7 +212,7 @@ +@@ -227,7 +227,7 @@ ; Whether the installer is disabled INSTALL_LOCK = false ; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!! @@ -124,7 +127,7 @@ ; Auto-login remember days LOGIN_REMEMBER_DAYS = 7 COOKIE_USERNAME = gitea_awesome -@@ -324,8 +324,8 @@ +@@ -339,8 +339,8 @@ SKIP_VERIFY = ; Use client certificate USE_CERTIFICATE = false @@ -135,7 +138,7 @@ ; Mail from address, RFC 5322. This can be just an email address, or the `"Name" ` format FROM = ; Mailer user name and password -@@ -355,13 +355,13 @@ +@@ -371,13 +371,13 @@ [session] ; Either "memory", "file", or "redis", default is "memory" @@ -151,7 +154,7 @@ ; Session cookie name COOKIE_NAME = i_like_gitea ; If you use session in https only, default is false -@@ -374,12 +374,12 @@ +@@ -390,12 +390,12 @@ SESSION_LIFE_TIME = 86400 [picture] @@ -166,7 +169,7 @@ ; Federated avatar lookup uses DNS to discover avatar associated ; with emails, see https://www.libravatar.org ; This value will be forced to be false in offline mode or Gravatar is disabled. -@@ -389,7 +389,7 @@ +@@ -405,7 +405,7 @@ ; Whether attachments are enabled. Defaults to `true` ENABLE = true ; Path for attachments. Defaults to `data/attachments` @@ -175,7 +178,7 @@ ; One or more allowed types, e.g. image/jpeg|image/png ALLOWED_TYPES = image/jpeg|image/png|application/zip|application/gzip ; Max size of each file. Defaults to 32MB -@@ -404,10 +404,10 @@ +@@ -420,10 +420,10 @@ FORMAT = [log] @@ -188,7 +191,7 @@ ; Buffer length of channel, keep it as it is if you don't know what it is. BUFFER_LEN = 10000 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace" -@@ -419,7 +419,7 @@ +@@ -435,7 +435,7 @@ ; For "file" mode only [log.file] @@ -197,10 +200,3 @@ ; This enables automated log rotate(switch of following options), default is true LOG_ROTATE = true ; Max line number of single file, default is 1000000 -@@ -581,4 +581,4 @@ - ; External command to render all matching extensions - RENDER_COMMAND = "asciidoc --out-file=- -" - ; Input is not a standard input but a file --IS_INPUT_FILE = false -\ No newline at end of file -+IS_INPUT_FILE = false diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index 94a043bb3e..6d2d2ca400 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,6 +1,6 @@ # Template file for 'gitea' pkgname=gitea -version=1.3.3 +version=1.4.0 revision=1 build_style=go go_import_path="code.gitea.io/gitea" @@ -28,7 +28,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="http://gitea.io" distfiles="https://github.com/go-gitea/gitea/archive/v${version}.tar.gz" -checksum=998da8ef24487b455641cb544717a6fac8f8e58fa2f392426b3211d02b1462e3 +checksum=8244a4b6385156275ffd70921d2562661c1ad96e580b4ca2ef52e7395b810f13 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" @@ -45,5 +45,5 @@ pre_build() { post_install() { vlicense LICENSE vsv gitea - vinstall conf/app.ini 0640 /etc gitea.conf + vinstall custom/conf/app.ini.sample 0640 /etc gitea.conf }