Update to gitea-1.1.0

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Update to gitea-1.1.0

Daniel Jakots-3
Hi,

Here's a diff to update gitea to 1.1.0. ChangeLog is quite long and it
says:

> BREAKING
>
>     The SSH keys can potentially break, make sure to regenerate the
>     authorized keys

https://github.com/go-gitea/gitea/releases

Lightly tested from a new install, it works fine.

Comments? OK?

Cheers,
Daniel

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 8 Jan 2017 19:20:32 -0000 1.1.1.1
+++ Makefile 18 Mar 2017 02:13:40 -0000
@@ -4,7 +4,7 @@ COMMENT = compact self-hosted Git servi
 
 GH_ACCOUNT = go-gitea
 GH_PROJECT = gitea
-GH_TAGNAME = v1.0.1
+GH_TAGNAME = v1.1.0
 
 CATEGORIES = www devel
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/gitea/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 8 Jan 2017 19:20:32 -0000 1.1.1.1
+++ distinfo 18 Mar 2017 02:13:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (gitea-1.0.1.tar.gz) = ed9jkb3514M90W8xLsirmY8YZx86PYiYdbT6gcwBChc=
-SIZE (gitea-1.0.1.tar.gz) = 13447434
+SHA256 (gitea-1.1.0.tar.gz) = uvNfW0kgSYyR5m1q+hP6QyCvmZfzMhsRdvrAsDhKTW8=
+SIZE (gitea-1.1.0.tar.gz) = 13014916
Index: patches/patch-conf_app_ini
===================================================================
RCS file: /cvs/ports/www/gitea/patches/patch-conf_app_ini,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-conf_app_ini
--- patches/patch-conf_app_ini 8 Jan 2017 19:20:33 -0000 1.1.1.1
+++ patches/patch-conf_app_ini 18 Mar 2017 02:13:40 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-conf_app_ini,v 1.1.1.1 2017/01/08 19:20:33 robert Exp $
---- conf/app.ini.orig Thu Jan  5 14:13:52 2017
-+++ conf/app.ini Sun Jan  8 13:22:47 2017
+--- conf/app.ini.orig Thu Mar  9 14:25:12 2017
++++ conf/app.ini Fri Mar 17 21:57:30 2017
 @@ -1,12 +1,12 @@
  ; App name that shows on every page title
  APP_NAME = Gitea: Git with a cup of tea
@@ -26,16 +26,16 @@ $OpenBSD: patch-conf_app_ini,v 1.1.1.1 2
  ; 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
-@@ -103,7 +103,7 @@ SSH_DOMAIN = %(DOMAIN)s
+@@ -105,7 +105,7 @@ SSH_DOMAIN = %(DOMAIN)s
  ; Network interface builtin SSH server listens on
- SSH_LISTEN_HOST =
+ 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'.
-@@ -125,13 +125,13 @@ DISABLE_ROUTER_LOG = false
+@@ -127,13 +127,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
@@ -52,7 +52,7 @@ $OpenBSD: patch-conf_app_ini,v 1.1.1.1 2
  ; Application level GZIP support
  ENABLE_GZIP = false
  ; Landing page for non-logged users, can be "home" or "explore"
-@@ -146,7 +146,7 @@ DSA     = 1024
+@@ -148,7 +148,7 @@ DSA     = 1024
 
  [database]
  ; Either "mysql", "postgres" or "sqlite3", it's your choice
@@ -61,16 +61,20 @@ $OpenBSD: patch-conf_app_ini,v 1.1.1.1 2
  HOST = 127.0.0.1:3306
  NAME = gitea
  USER = root
-@@ -154,7 +154,7 @@ PASSWD =
+@@ -156,10 +156,10 @@ 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
 
- [admin]
+ [indexer]
+-ISSUE_INDEXER_PATH = indexers/issues.bleve
++ISSUE_INDEXER_PATH = ${LOCALSTATEDIR}/gitea/indexers/issues.bleve
+ UPDATE_BUFFER_LEN = 20
 
-@@ -215,8 +215,8 @@ HELO_HOSTNAME =
+ [admin]
+@@ -235,8 +235,8 @@ HELO_HOSTNAME =
  SKIP_VERIFY =
  ; Use client certificate
  USE_CERTIFICATE = false
@@ -81,7 +85,7 @@ $OpenBSD: patch-conf_app_ini,v 1.1.1.1 2
  ; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <[hidden email]>` format
  FROM =
  ; Mailer user name and password
-@@ -237,13 +237,13 @@ HOST =
+@@ -261,13 +261,13 @@ HOST =
 
  [session]
  ; Either "memory", "file", or "redis", default is "memory"
@@ -95,9 +99,9 @@ $OpenBSD: patch-conf_app_ini,v 1.1.1.1 2
 -PROVIDER_CONFIG = data/sessions
 +PROVIDER_CONFIG = ${LOCALSTATEDIR}/gitea/data/sessions
  ; Session cookie name
- COOKIE_NAME = i_like_gogits
+ COOKIE_NAME = i_like_gitea
  ; If you use session in https only, default is false
-@@ -256,7 +256,7 @@ GC_INTERVAL_TIME = 86400
+@@ -280,7 +280,7 @@ GC_INTERVAL_TIME = 86400
  SESSION_LIFE_TIME = 86400
 
  [picture]
@@ -106,16 +110,16 @@ $OpenBSD: patch-conf_app_ini,v 1.1.1.1 2
  ; Chinese users can choose "duoshuo"
  ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
  GRAVATAR_SOURCE = gravatar
-@@ -271,7 +271,7 @@ ENABLE_FEDERATED_AVATAR = false
+@@ -295,7 +295,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
+ ALLOWED_TYPES = image/jpeg|image/png|application/zip|application/gzip
  ; Max size of each file. Defaults to 32MB
-@@ -286,14 +286,14 @@ MAX_FILES = 5
+@@ -310,14 +310,14 @@ MAX_FILES = 5
  FORMAT =
 
  [log]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/gitea/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 8 Jan 2017 19:20:33 -0000 1.1.1.1
+++ pkg/PLIST 18 Mar 2017 02:13:41 -0000
@@ -15,6 +15,8 @@ share/gitea/conf/app.ini
 @sample ${SYSCONFDIR}/gitea/conf/app.ini
 @owner
 @group
+share/gitea/conf/app.ini.beforesubst
+share/gitea/conf/app.ini.orig
 share/gitea/options/
 share/gitea/options/gitignore/
 share/gitea/options/gitignore/Actionscript
@@ -37,6 +39,7 @@ share/gitea/options/gitignore/CUDA
 share/gitea/options/gitignore/CVS
 share/gitea/options/gitignore/CakePHP
 share/gitea/options/gitignore/ChefCookbook
+share/gitea/options/gitignore/Clojure
 share/gitea/options/gitignore/Cloud9
 share/gitea/options/gitignore/CodeIgniter
 share/gitea/options/gitignore/CodeKit
@@ -63,6 +66,7 @@ share/gitea/options/gitignore/Erlang
 share/gitea/options/gitignore/Espresso
 share/gitea/options/gitignore/ExpressionEngine
 share/gitea/options/gitignore/ExtJs
+share/gitea/options/gitignore/FSharp
 share/gitea/options/gitignore/Fancy
 share/gitea/options/gitignore/Finale
 share/gitea/options/gitignore/FlexBuilder
@@ -264,6 +268,7 @@ share/gitea/public/assets/octicons-4.3.0
 share/gitea/public/assets/octicons-4.3.0/octicons.woff
 share/gitea/public/assets/octicons-4.3.0/octicons.woff2
 share/gitea/public/css/
+share/gitea/public/css/gitgraph.css
 share/gitea/public/css/github.min.css
 share/gitea/public/css/index.css
 share/gitea/public/css/semantic-2.2.1.min.css
@@ -1183,13 +1188,17 @@ share/gitea/public/img/emoji/zzz.png
 share/gitea/public/img/favicon.png
 share/gitea/public/img/gitea-large-resize.png
 share/gitea/public/img/gitea-lg.png
+share/gitea/public/img/github.png
 share/gitea/public/img/slack.png
 share/gitea/public/js/
+share/gitea/public/js/draw.js
 share/gitea/public/js/index.js
 share/gitea/public/js/jquery-1.11.3.min.js
 share/gitea/public/js/libs/
+share/gitea/public/js/libs/autolink.js
 share/gitea/public/js/libs/clipboard-1.5.9.min.js
 share/gitea/public/js/libs/emojify-1.1.0.min.js
+share/gitea/public/js/libs/gitgraph.js
 share/gitea/public/js/libs/jquery.are-you-sure.js
 share/gitea/public/js/semantic-2.2.1.min.js
 share/gitea/public/less/
@@ -1816,6 +1825,7 @@ share/gitea/templates/repo/editor/diff_p
 share/gitea/templates/repo/editor/edit.tmpl
 share/gitea/templates/repo/editor/upload.tmpl
 share/gitea/templates/repo/forks.tmpl
+share/gitea/templates/repo/graph.tmpl
 share/gitea/templates/repo/header.tmpl
 share/gitea/templates/repo/home.tmpl
 share/gitea/templates/repo/issue/
@@ -1828,6 +1838,7 @@ share/gitea/templates/repo/issue/milesto
 share/gitea/templates/repo/issue/navbar.tmpl
 share/gitea/templates/repo/issue/new.tmpl
 share/gitea/templates/repo/issue/new_form.tmpl
+share/gitea/templates/repo/issue/search.tmpl
 share/gitea/templates/repo/issue/view.tmpl
 share/gitea/templates/repo/issue/view_content.tmpl
 share/gitea/templates/repo/issue/view_title.tmpl
@@ -1842,6 +1853,7 @@ share/gitea/templates/repo/release/
 share/gitea/templates/repo/release/list.tmpl
 share/gitea/templates/repo/release/new.tmpl
 share/gitea/templates/repo/settings/
+share/gitea/templates/repo/settings/branches.tmpl
 share/gitea/templates/repo/settings/collaboration.tmpl
 share/gitea/templates/repo/settings/deploy_keys.tmpl
 share/gitea/templates/repo/settings/githook_edit.tmpl
@@ -1873,10 +1885,15 @@ share/gitea/templates/user/
 share/gitea/templates/user/auth/
 share/gitea/templates/user/auth/activate.tmpl
 share/gitea/templates/user/auth/forgot_passwd.tmpl
+share/gitea/templates/user/auth/link_account.tmpl
 share/gitea/templates/user/auth/prohibit_login.tmpl
 share/gitea/templates/user/auth/reset_passwd.tmpl
 share/gitea/templates/user/auth/signin.tmpl
+share/gitea/templates/user/auth/signin_inner.tmpl
 share/gitea/templates/user/auth/signup.tmpl
+share/gitea/templates/user/auth/signup_inner.tmpl
+share/gitea/templates/user/auth/twofa.tmpl
+share/gitea/templates/user/auth/twofa_scratch.tmpl
 share/gitea/templates/user/dashboard/
 share/gitea/templates/user/dashboard/dashboard.tmpl
 share/gitea/templates/user/dashboard/feeds.tmpl
@@ -1886,8 +1903,11 @@ share/gitea/templates/user/meta/
 share/gitea/templates/user/meta/followers.tmpl
 share/gitea/templates/user/meta/header.tmpl
 share/gitea/templates/user/meta/stars.tmpl
+share/gitea/templates/user/notification/
+share/gitea/templates/user/notification/notification.tmpl
 share/gitea/templates/user/profile.tmpl
 share/gitea/templates/user/settings/
+share/gitea/templates/user/settings/account_link.tmpl
 share/gitea/templates/user/settings/applications.tmpl
 share/gitea/templates/user/settings/avatar.tmpl
 share/gitea/templates/user/settings/delete.tmpl
@@ -1896,6 +1916,8 @@ share/gitea/templates/user/settings/navb
 share/gitea/templates/user/settings/password.tmpl
 share/gitea/templates/user/settings/profile.tmpl
 share/gitea/templates/user/settings/sshkeys.tmpl
+share/gitea/templates/user/settings/twofa.tmpl
+share/gitea/templates/user/settings/twofa_enroll.tmpl
 @mode 750
 @owner _gitea
 @group _gitea

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Update to gitea-1.1.0

Pavel Korovin-2
On 03/17, Daniel Jakots wrote:
>
> Here's a diff to update gitea to 1.1.0. ChangeLog is quite long and it
> says:
>

Hi Daniel,
Works fine for me as well, thank you!

You forgot to allocate the user/group id for _gitea user in
$PORTSDIR/infrastructure/db/user.list, and 787 is already allocated:

787 _dnsdist            _dnsdist        net/dnsdist

Please consider adding _gitea entry in user.list and change the gitea userid
in PLIST so there's no clash.

Do you use it with ssh? If not, do you consider the default configuration
should allow ssh connections?
I found the defaults quite misleading with system's default sshd, gitea's SSH
port set to 2222, _gitea home set to /nonexistent and shell set to
/sbin/nologin. ssh won't work this way.

Maybe we'd better use OpenBSD's default port 22 and
@newgroup _gitea:788
@newuser _gitea:788:_gitea:daemon:Gitea Account:/var/gitea:/usr/local/bin/bash

?

--
With best regards,
Pavel Korovin

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Update to gitea-1.1.0

Juan Francisco Cantero Hurtado
On Tue, Mar 21, 2017 at 02:46:48PM +0300, Pavel Korovin wrote:

> On 03/17, Daniel Jakots wrote:
> >
> > Here's a diff to update gitea to 1.1.0. ChangeLog is quite long and it
> > says:
> >
>
> Hi Daniel,
> Works fine for me as well, thank you!
>
> You forgot to allocate the user/group id for _gitea user in
> $PORTSDIR/infrastructure/db/user.list, and 787 is already allocated:
>
> 787 _dnsdist            _dnsdist        net/dnsdist
>
> Please consider adding _gitea entry in user.list and change the gitea userid
> in PLIST so there's no clash.
>
> Do you use it with ssh? If not, do you consider the default configuration
> should allow ssh connections?
> I found the defaults quite misleading with system's default sshd, gitea's SSH
> port set to 2222, _gitea home set to /nonexistent and shell set to
> /sbin/nologin. ssh won't work this way.
>
> Maybe we'd better use OpenBSD's default port 22 and
> @newgroup _gitea:788
> @newuser _gitea:788:_gitea:daemon:Gitea Account:/var/gitea:/usr/local/bin/bash
>
> ?

No, the port 2222 is used by the builtin SSH server (for git). If the
program doesn't need a shell, then nologin the correct there.

--
Juan Francisco Cantero Hurtado http://juanfra.info

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Update to gitea-1.1.0

Daniel Jakots-3
In reply to this post by Pavel Korovin-2
On Tue, 21 Mar 2017 14:46:48 +0300, Pavel Korovin <[hidden email]> wrote:

> On 03/17, Daniel Jakots wrote:
> >
> > Here's a diff to update gitea to 1.1.0. ChangeLog is quite long and
> > it says:
> >  
>
> Hi Daniel,
> Works fine for me as well, thank you!

Thanks for your report.

> You forgot to allocate the user/group id for _gitea user in
> $PORTSDIR/infrastructure/db/user.list, and 787 is already allocated:
>
> 787 _dnsdist            _dnsdist        net/dnsdist
>
> Please consider adding _gitea entry in user.list and change the gitea
> userid in PLIST so there's no clash.

Nice catch! _dnsdist was moved to another uid as it was easier to
change dnsdist than gitea.

> Do you use it with ssh? If not, do you consider the default
> configuration should allow ssh connections?
> I found the defaults quite misleading with system's default sshd,
> gitea's SSH port set to 2222, _gitea home set to /nonexistent and
> shell set to /sbin/nologin. ssh won't work this way.

I'm not the maintainer so I don't have the last word. That said, IMHO
the current state is fine but I don't have a strong opinion about it.
 
> Maybe we'd better use OpenBSD's default port 22 and
> @newgroup _gitea:788
> @newuser _gitea:788:_gitea:daemon:Gitea
> Account:/var/gitea:/usr/local/bin/bash

The thing is that it's less secure that way. Maybe adding a README about
how to change to this ^, and leave the current state as is, is maybe a
good compromise.

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Update to gitea-1.1.0

Pavel Korovin-2
On 03/23, Daniel Jakots wrote:
> I'm not the maintainer so I don't have the last word. That said, IMHO
> the current state is fine but I don't have a strong opinion about it.

Oops. Daniel, Robert, I'm sorry.
I missed the real MAINTAINER because of the update Daniel have sent to ports@.
 
--
With best regards,
Pavel Korovin

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Update to gitea-1.1.0

Robert Nagy
ok for me

On (2017-03-23 15:56), Pavel Korovin wrote:

> On 03/23, Daniel Jakots wrote:
> > I'm not the maintainer so I don't have the last word. That said, IMHO
> > the current state is fine but I don't have a strong opinion about it.
>
> Oops. Daniel, Robert, I'm sorry.
> I missed the real MAINTAINER because of the update Daniel have sent to ports@.
>  
> --
> With best regards,
> Pavel Korovin
>

Loading...