ok for me
On 01/04/18 14:16 +0300, Pavel Korovin wrote:
> Dear all,
>
> Please see the diff for the latest www/gitea port attached.
> Changes: https://github.com/go-gitea/gitea/releases/tag/v1.4.0
> OK to commmit?
>
> --
> With best regards,
> Pavel Korovin
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/gitea/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 17 Jan 2018 21:05:38 -0000 1.8
> +++ Makefile 1 Apr 2018 11:01:21 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = compact self-hosted Git service
>
> -VERSION = 1.3.2
> +VERSION = 1.4.0
> GH_ACCOUNT = go-gitea
> GH_PROJECT = gitea
> GH_TAGNAME = v${VERSION}
> @@ -32,13 +32,17 @@ WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_T
> SUBST_VARS += VERSION
>
> pre-configure:
> - ${SUBST_CMD} ${WRKDIST}/{conf/app.ini,main.go}
> + ${SUBST_CMD} ${WRKDIST}/{custom/conf/app.ini.sample,main.go}
>
> do-install:
> ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/gitea ${PREFIX}/sbin
> ${INSTALL_DATA_DIR} ${PREFIX}/share/gitea
> -.for _d in conf options public templates
> +.for _d in custom/conf options public templates
> cp -Rp ${WRKSRC}/${_d} ${PREFIX}/share/gitea
> .endfor
> +
> +post-install:
> + @find ${WRKINST} -type f -name '*.beforesubst' -exec rm {} \;
> + @find ${WRKINST} -type f -name '*.orig' -exec rm {} \;
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/gitea/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 17 Jan 2018 21:05:38 -0000 1.3
> +++ distinfo 1 Apr 2018 11:01:21 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (gitea-1.3.2.tar.gz) = mjUeQaq8CHDUNcry8J0qdmUuZ8kBygFW4p5Lh+zMFf8=
> -SIZE (gitea-1.3.2.tar.gz) = 14784167
> +SHA256 (gitea-1.4.0.tar.gz) = gkSktjhRVidf/XCSHSViZhwa2W5YC0yi71LnOVuBDxM=
> +SIZE (gitea-1.4.0.tar.gz) = 14983167
> Index: patches/patch-conf_app_ini
> ===================================================================
> RCS file: patches/patch-conf_app_ini
> diff -N patches/patch-conf_app_ini
> --- patches/patch-conf_app_ini 17 Jan 2018 21:05:38 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,144 +0,0 @@
> -$OpenBSD: patch-conf_app_ini,v 1.3 2018/01/17 21:05:38 landry Exp $
> -Index: conf/app.ini
> ---- conf/app.ini.orig
> -+++ conf/app.ini
> -@@ -1,12 +1,12 @@
> - ; App name that shows on every page title
> - APP_NAME = Gitea: Git with a cup of tea
> - ; Change it if you run locally
> --RUN_USER = git
> -+RUN_USER = _gitea
> - ; Either "dev", "prod" or "test", default is "dev"
> --RUN_MODE = dev
> -+RUN_MODE = prod
> -
> - [repository]
> --ROOT =
> -+ROOT = ${LOCALSTATEDIR}/gitea/gitea-repositories
> - SCRIPT_TYPE = bash
> - ; Default ANSI charset
> - ANSI_CHARSET =
> -@@ -42,7 +42,7 @@ LOCAL_COPY_PATH = tmp/local-repo
> - ; Whether repository file uploads are enabled. Defaults to `true`
> - ENABLED = true
> - ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on
> gitea restart)
> --TEMP_PATH = data/tmp/uploads
> -+TEMP_PATH = ${LOCALSTATEDIR}/gitea/data/tmp/uploads
> - ; 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
> -@@ -120,7 +120,7 @@ SSH_DOMAIN = %(DOMAIN)s
> - ; Network interface builtin SSH server listens on
> - SSH_LISTEN_HOST =
> - ; Port number to be exposed in clone URL
> --SSH_PORT = 22
> -+SSH_PORT = 2222
> - ; 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'.
> -@@ -155,13 +155,13 @@ DISABLE_ROUTER_LOG = false
> - ; 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
> --CERT_FILE = custom/https/cert.pem
> --KEY_FILE = custom/https/key.pem
> -+CERT_FILE = ${LOCALSTATEDIR}/gitea/custom/https/cert.pem
> -+KEY_FILE = ${LOCALSTATEDIR}/gitea/custom/https/key.pem
> - ; Upper level of template and static file path
> - ; default is the path where Gitea is executed
> - STATIC_ROOT_PATH =
> - ; Default path for App data
> --APP_DATA_PATH = data
> -+APP_DATA_PATH = ${LOCALSTATEDIR}/gitea/data
> - ; Application level GZIP support
> - ENABLE_GZIP = false
> - ; Landing page for non-logged users, can be "home" or "explore"
> -@@ -182,7 +182,7 @@ DSA = 1024
> -
> - [database]
> - ; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice
> --DB_TYPE = mysql
> -+DB_TYPE = sqlite3
> - HOST = 127.0.0.1:3306
> - NAME = gitea
> - USER = root
> -@@ -190,14 +190,14 @@ PASSWD =
> - ; For "postgres" only, either "disable", "require" or "verify-full"
> - SSL_MODE = disable
> - ; For "sqlite3" and "tidb", use absolute path when you start as service
> --PATH = data/gitea.db
> -+PATH = ${LOCALSTATEDIR}/gitea/data/gitea.db
> - ; For "sqlite3" only. Query timeout
> - SQLITE_TIMEOUT = 500
> - ; For iterate buffer, default is 50
> - ITERATE_BUFFER_SIZE = 50
> -
> - [indexer]
> --ISSUE_INDEXER_PATH = indexers/issues.bleve
> -+ISSUE_INDEXER_PATH = ${LOCALSTATEDIR}/gitea/indexers/issues.bleve
> - ; repo indexer by default disabled, since it uses a lot of disk space
> - REPO_INDEXER_ENABLED = false
> - REPO_INDEXER_PATH = indexers/repos.bleve
> -@@ -324,8 +324,8 @@ HELO_HOSTNAME =
> - SKIP_VERIFY =
> - ; Use client certificate
> - USE_CERTIFICATE = false
> --CERT_FILE = custom/mailer/cert.pem
> --KEY_FILE = custom/mailer/key.pem
> -+CERT_FILE = ${LOCALSTATEDIR}/gitea/custom/mailer/cert.pem
> -+KEY_FILE = ${LOCALSTATEDIR}/gitea/custom/mailer/key.pem
> - ; Mail from address, RFC 5322. This can be just an email address, or the
> `"Name" <em...@example.com>` format
> - FROM =
> - ; Mailer user name and password
> -@@ -355,13 +355,13 @@ ITEM_TTL = 16h
> -
> - [session]
> - ; Either "memory", "file", or "redis", default is "memory"
> --PROVIDER = memory
> -+PROVIDER = file
> - ; Provider config options
> - ; memory: not have any config yet
> - ; file: session file path, e.g. `data/sessions`
> - ; redis:
> network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
> - ; mysql: go-sql-driver/mysql dsn config string, e.g.
> `root:password@/session_table`
> --PROVIDER_CONFIG = data/sessions
> -+PROVIDER_CONFIG = ${LOCALSTATEDIR}/gitea/data/sessions
> - ; Session cookie name
> - COOKIE_NAME = i_like_gitea
> - ; If you use session in https only, default is false
> -@@ -374,7 +374,7 @@ GC_INTERVAL_TIME = 86400
> - SESSION_LIFE_TIME = 86400
> -
> - [picture]
> --AVATAR_UPLOAD_PATH = data/avatars
> -+AVATAR_UPLOAD_PATH = ${LOCALSTATEDIR}/gitea/data/avatars
> - ; Chinese users can choose "duoshuo"
> - ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
> - GRAVATAR_SOURCE = gravatar
> -@@ -389,7 +389,7 @@ ENABLE_FEDERATED_AVATAR = false
> - ; Whether attachments are enabled. Defaults to `true`
> - ENABLE = true
> - ; Path for attachments. Defaults to `data/attachments`
> --PATH = data/attachments
> -+PATH = ${LOCALSTATEDIR}/gitea/data/attachments
> - ; 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,14 +404,14 @@ MAX_FILES = 5
> - FORMAT =
> -
> - [log]
> --ROOT_PATH =
> -+ROOT_PATH = ${LOCALSTATEDIR}/gitea/log
> - ; Either "console", "file", "conn", "smtp" or "database", default is
> "console"
> - ; Use comma to separate multiple modes, e.g. "console, file"
> --MODE = console
> -+MODE = file
> - ; 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"
> --LEVEL = Trace
> -+LEVEL = Info
> -
> - ; For "console" mode only
> - [log.console]
> Index: patches/patch-custom_conf_app_ini_sample
> ===================================================================
> RCS file: patches/patch-custom_conf_app_ini_sample
> diff -N patches/patch-custom_conf_app_ini_sample
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-custom_conf_app_ini_sample 1 Apr 2018 11:01:21 -0000
> @@ -0,0 +1,145 @@
> +$OpenBSD$
> +
> +Index: custom/conf/app.ini.sample
> +--- custom/conf/app.ini.sample.orig
> ++++ custom/conf/app.ini.sample
> +@@ -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
> +-RUN_USER = git
> ++RUN_USER = _gitea
> + ; Either "dev", "prod" or "test", default is "dev"
> +-RUN_MODE = dev
> ++RUN_MODE = prod
> +
> + [repository]
> +-ROOT =
> ++ROOT = ${LOCALSTATEDIR}/gitea/gitea-repositories
> + SCRIPT_TYPE = bash
> + ; Default ANSI charset
> + ANSI_CHARSET =
> +@@ -50,7 +50,7 @@ LOCAL_WIKI_PATH = tmp/local-wiki
> + ; Whether repository file uploads are enabled. Defaults to `true`
> + ENABLED = true
> + ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on
> gitea restart)
> +-TEMP_PATH = data/tmp/uploads
> ++TEMP_PATH = ${LOCALSTATEDIR}/gitea/data/tmp/uploads
> + ; 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
> +@@ -134,7 +134,7 @@ SSH_DOMAIN = %(DOMAIN)s
> + ; Network interface builtin SSH server listens on
> + SSH_LISTEN_HOST =
> + ; Port number to be exposed in clone URL
> +-SSH_PORT = 22
> ++SSH_PORT = 2222
> + ; 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'.
> +@@ -169,13 +169,13 @@ DISABLE_ROUTER_LOG = false
> + ; 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
> +-CERT_FILE = custom/https/cert.pem
> +-KEY_FILE = custom/https/key.pem
> ++CERT_FILE = ${LOCALSTATEDIR}/gitea/custom/https/cert.pem
> ++KEY_FILE = ${LOCALSTATEDIR}/gitea/custom/https/key.pem
> + ; Upper level of template and static file path
> + ; default is the path where Gitea is executed
> + STATIC_ROOT_PATH =
> + ; Default path for App data
> +-APP_DATA_PATH = data
> ++APP_DATA_PATH = ${LOCALSTATEDIR}/gitea/data
> + ; Application level GZIP support
> + ENABLE_GZIP = false
> + ; Landing page, can be "home", "explore", or "organizations"
> +@@ -196,7 +196,7 @@ DSA = 1024
> +
> + [database]
> + ; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice
> +-DB_TYPE = mysql
> ++DB_TYPE = sqlite3
> + HOST = 127.0.0.1:3306
> + NAME = gitea
> + USER = root
> +@@ -205,14 +205,14 @@ PASSWD =
> + ; For "postgres" only, either "disable", "require" or "verify-full"
> + SSL_MODE = disable
> + ; For "sqlite3" and "tidb", use absolute path when you start as service
> +-PATH = data/gitea.db
> ++PATH = ${LOCALSTATEDIR}/gitea/data/gitea.db
> + ; For "sqlite3" only. Query timeout
> + SQLITE_TIMEOUT = 500
> + ; For iterate buffer, default is 50
> + ITERATE_BUFFER_SIZE = 50
> +
> + [indexer]
> +-ISSUE_INDEXER_PATH = indexers/issues.bleve
> ++ISSUE_INDEXER_PATH = ${LOCALSTATEDIR}/gitea/indexers/issues.bleve
> + ; repo indexer by default disabled, since it uses a lot of disk space
> + REPO_INDEXER_ENABLED = false
> + REPO_INDEXER_PATH = indexers/repos.bleve
> +@@ -339,8 +339,8 @@ HELO_HOSTNAME =
> + SKIP_VERIFY =
> + ; Use client certificate
> + USE_CERTIFICATE = false
> +-CERT_FILE = custom/mailer/cert.pem
> +-KEY_FILE = custom/mailer/key.pem
> ++CERT_FILE = ${LOCALSTATEDIR}/gitea/custom/mailer/cert.pem
> ++KEY_FILE = ${LOCALSTATEDIR}/gitea/custom/mailer/key.pem
> + ; Mail from address, RFC 5322. This can be just an email address, or the
> `"Name" <em...@example.com>` format
> + FROM =
> + ; Mailer user name and password
> +@@ -371,13 +371,13 @@ ITEM_TTL = 16h
> +
> + [session]
> + ; Either "memory", "file", or "redis", default is "memory"
> +-PROVIDER = memory
> ++PROVIDER = file
> + ; Provider config options
> + ; memory: not have any config yet
> + ; file: session file path, e.g. `data/sessions`
> + ; redis:
> network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
> + ; mysql: go-sql-driver/mysql dsn config string, e.g.
> `root:password@/session_table`
> +-PROVIDER_CONFIG = data/sessions
> ++PROVIDER_CONFIG = ${LOCALSTATEDIR}/gitea/data/sessions
> + ; Session cookie name
> + COOKIE_NAME = i_like_gitea
> + ; If you use session in https only, default is false
> +@@ -390,7 +390,7 @@ GC_INTERVAL_TIME = 86400
> + SESSION_LIFE_TIME = 86400
> +
> + [picture]
> +-AVATAR_UPLOAD_PATH = data/avatars
> ++AVATAR_UPLOAD_PATH = ${LOCALSTATEDIR}/gitea/data/avatars
> + ; Chinese users can choose "duoshuo"
> + ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
> + GRAVATAR_SOURCE = gravatar
> +@@ -405,7 +405,7 @@ ENABLE_FEDERATED_AVATAR = false
> + ; Whether attachments are enabled. Defaults to `true`
> + ENABLE = true
> + ; Path for attachments. Defaults to `data/attachments`
> +-PATH = data/attachments
> ++PATH = ${LOCALSTATEDIR}/gitea/data/attachments
> + ; 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
> +@@ -420,14 +420,14 @@ MAX_FILES = 5
> + FORMAT =
> +
> + [log]
> +-ROOT_PATH =
> ++ROOT_PATH = ${LOCALSTATEDIR}/gitea/log
> + ; Either "console", "file", "conn", "smtp" or "database", default is
> "console"
> + ; Use comma to separate multiple modes, e.g. "console, file"
> +-MODE = console
> ++MODE = file
> + ; 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"
> +-LEVEL = Trace
> ++LEVEL = Info
> +
> + ; For "console" mode only
> + [log.console]
> Index: patches/patch-main_go
> ===================================================================
> RCS file: /cvs/ports/www/gitea/patches/patch-main_go,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-main_go
> --- patches/patch-main_go 17 Jan 2018 21:05:38 -0000 1.1
> +++ patches/patch-main_go 1 Apr 2018 11:01:21 -0000
> @@ -9,7 +9,7 @@ Index: main.go
> )
>
> // Version holds the current Gitea version
> --var Version = "1.3.0-dev"
> +-var Version = "1.4.0-dev"
> +var Version = "${VERSION}"
>
> // Tags holds the build tags used
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/gitea/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 17 Jan 2018 21:05:38 -0000 1.4
> +++ pkg/PLIST 1 Apr 2018 11:01:22 -0000
> @@ -10,14 +10,12 @@ share/gitea/conf/
> @sample ${SYSCONFDIR}/gitea/conf/
> @owner
> @group
> -share/gitea/conf/app.ini
> +share/gitea/conf/app.ini.sample
> @owner _gitea
> @group _gitea
> @sample ${SYSCONFDIR}/gitea/conf/app.ini
> @owner
> @group
> -@comment share/gitea/conf/app.ini.beforesubst
> -@comment share/gitea/conf/app.ini.orig
> share/gitea/options/
> share/gitea/options/gitignore/
> share/gitea/options/gitignore/Actionscript
> @@ -529,6 +527,7 @@ share/gitea/options/locale/locale_es-ES.
> share/gitea/options/locale/locale_fi-FI.ini
> share/gitea/options/locale/locale_fr-FR.ini
> share/gitea/options/locale/locale_hu-HU.ini
> +share/gitea/options/locale/locale_id-ID.ini
> share/gitea/options/locale/locale_it-IT.ini
> share/gitea/options/locale/locale_ja-JP.ini
> share/gitea/options/locale/locale_ko-KR.ini
> @@ -541,9 +540,11 @@ share/gitea/options/locale/locale_no-NO.
> share/gitea/options/locale/locale_pl-PL.ini
> share/gitea/options/locale/locale_pt-BR.ini
> share/gitea/options/locale/locale_ru-RU.ini
> +share/gitea/options/locale/locale_ru-UA.ini
> share/gitea/options/locale/locale_sr-SP.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
> share/gitea/options/locale/locale_zh-CN.ini
> share/gitea/options/locale/locale_zh-HK.ini
> share/gitea/options/locale/locale_zh-TW.ini
> @@ -566,6 +567,7 @@ share/gitea/public/img/auth/openid_conne
> share/gitea/public/img/auth/twitter.png
> share/gitea/public/img/avatar_default.png
> share/gitea/public/img/checkmark.png
> +share/gitea/public/img/dingtalk.ico
> share/gitea/public/img/discord.png
> share/gitea/public/img/favicon.ico
> share/gitea/public/img/favicon.png
> @@ -2098,6 +2100,9 @@ share/gitea/public/vendor/plugins/simple
> share/gitea/public/vendor/plugins/simplemde/LICENSE
> share/gitea/public/vendor/plugins/simplemde/simplemde.min.css
> share/gitea/public/vendor/plugins/simplemde/simplemde.min.js
> +share/gitea/public/vendor/plugins/tribute/
> +share/gitea/public/vendor/plugins/tribute/tribute.css
> +share/gitea/public/vendor/plugins/tribute/tribute.min.js
> share/gitea/public/vendor/plugins/vue/
> share/gitea/public/vendor/plugins/vue/LICENSE
> share/gitea/public/vendor/plugins/vue/vue.min.js
> @@ -2133,6 +2138,15 @@ share/gitea/templates/base/delete_modal_
> share/gitea/templates/base/footer.tmpl
> share/gitea/templates/base/head.tmpl
> share/gitea/templates/base/paginate.tmpl
> +share/gitea/templates/custom/
> +share/gitea/templates/custom/body_inner_post.tmpl
> +share/gitea/templates/custom/body_inner_pre.tmpl
> +share/gitea/templates/custom/body_outer_post.tmpl
> +share/gitea/templates/custom/body_outer_pre.tmpl
> +share/gitea/templates/custom/extra_links.tmpl
> +share/gitea/templates/custom/extra_tabs.tmpl
> +share/gitea/templates/custom/footer.tmpl
> +share/gitea/templates/custom/header.tmpl
> share/gitea/templates/explore/
> share/gitea/templates/explore/navbar.tmpl
> share/gitea/templates/explore/organizations.tmpl
> @@ -2210,8 +2224,10 @@ share/gitea/templates/repo/issue/search.
> share/gitea/templates/repo/issue/view.tmpl
> share/gitea/templates/repo/issue/view_content/
> share/gitea/templates/repo/issue/view_content.tmpl
> +share/gitea/templates/repo/issue/view_content/add_reaction.tmpl
> share/gitea/templates/repo/issue/view_content/comments.tmpl
> share/gitea/templates/repo/issue/view_content/pull.tmpl
> +share/gitea/templates/repo/issue/view_content/reactions.tmpl
> share/gitea/templates/repo/issue/view_content/sidebar.tmpl
> share/gitea/templates/repo/issue/view_title.tmpl
> share/gitea/templates/repo/migrate.tmpl
> @@ -2232,6 +2248,7 @@ share/gitea/templates/repo/settings/depl
> share/gitea/templates/repo/settings/githook_edit.tmpl
> share/gitea/templates/repo/settings/githooks.tmpl
> share/gitea/templates/repo/settings/hook_delete_modal.tmpl
> +share/gitea/templates/repo/settings/hook_dingtalk.tmpl
> share/gitea/templates/repo/settings/hook_discord.tmpl
> share/gitea/templates/repo/settings/hook_gitea.tmpl
> share/gitea/templates/repo/settings/hook_gogs.tmpl
