new packeg version

6 files changed, 53 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5db4d817a71..8c53ee985fcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gogs-git
 	pkgdesc = Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch master.
-	pkgver = 2952.e0aab4a
+	pkgver = 3076.951037c
 	pkgrel = 1
 	epoch = 1
 	url = http://gogs.io/
@@ -32,8 +32,8 @@ pkgbase = gogs-git
 	source = helper.sh
 	source = gogs::git+https://github.com/gogits/gogs.git#branch=master
 	sha512sums = c7abbe4af438a8a1db44537a16dbd40b82d50c921d53002c083071c4cd16644769e9d5dabbccedc1bd4ba563324186da4b4378365e098cc45df76402a657be90
-	sha512sums = ea000611134a2a794d75ec71bb18991e5b51117042522cdcfee17827ccd71c33003231ff19bff33e36d52cdff4799df88ca0a98937e3e1834a831a8d8744b739
-	sha512sums = e746dbdafc4c8d0b15a224dba95ae3151611ba9ff468ee6f0b1789e489955e4d7eaac0dbdf28a22e5b8211559af5950726f4a37d699a2490fd349f034401028c
+	sha512sums = d4f6518c644b76e4d1688cd5756c9eea7a89d0abad68a14638ccc6f0d1006c164c1ae3b3f89efd903def7398a3dabce7299100303808ad7a1937407a9eb13a39
+	sha512sums = 5dde38b286b2a27624e4c2f5c87c7eb279c6c5fc71dad818762b7100a8d20d5b16c14695624107e21b361ab662b90e769717325ba5f276067aa1ead38ae44e47
 	sha512sums = SKIP
 
 pkgname = gogs-git
diff --git a/PKGBUILD b/PKGBUILD
index 2360c9d7df2b..381c33d238ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=gogs-git
 _pkgname=gogs
 _branch=master
-pkgver=2952.e0aab4a
+pkgver=3076.951037c
 pkgrel=1
 epoch=1
 pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch ${_branch}."
@@ -33,8 +33,8 @@ source=('gogs.service'
         "$_pkgname::git+https://${_gourl}.git#branch=${_branch}")
 
 sha512sums=(c7abbe4af438a8a1db44537a16dbd40b82d50c921d53002c083071c4cd16644769e9d5dabbccedc1bd4ba563324186da4b4378365e098cc45df76402a657be90
-            ea000611134a2a794d75ec71bb18991e5b51117042522cdcfee17827ccd71c33003231ff19bff33e36d52cdff4799df88ca0a98937e3e1834a831a8d8744b739
-            e746dbdafc4c8d0b15a224dba95ae3151611ba9ff468ee6f0b1789e489955e4d7eaac0dbdf28a22e5b8211559af5950726f4a37d699a2490fd349f034401028c
+            d4f6518c644b76e4d1688cd5756c9eea7a89d0abad68a14638ccc6f0d1006c164c1ae3b3f89efd903def7398a3dabce7299100303808ad7a1937407a9eb13a39
+            5dde38b286b2a27624e4c2f5c87c7eb279c6c5fc71dad818762b7100a8d20d5b16c14695624107e21b361ab662b90e769717325ba5f276067aa1ead38ae44e47
             'SKIP')
 
 _goroot="/usr/lib/go"
diff --git a/app.ini.patch b/app.ini.patch
index 8fbcdc140d03..876a7691b225 100644
--- a/app.ini.patch
+++ b/app.ini.patch
@@ -6,31 +6,27 @@
 < ROOT =
 ---
 > ROOT = /srv/gogs/repo
-24c24
-< ; Number of users that are showed in one page
----
-> ; Numer of users that are showed in one page
-61c61
+69c69
 < STATIC_ROOT_PATH =
 ---
 > STATIC_ROOT_PATH = /usr/share/themes/gogs/default
-77c77
+85c85
 < PATH = data/gogs.db
 ---
 > PATH = /srv/gogs/sqlite/gogs.db
-168c168
+186c186
 < PROVIDER_CONFIG = data/sessions
 ---
 > PROVIDER_CONFIG = /srv/gogs/sessions
-183c183
+201c201
 < AVATAR_UPLOAD_PATH = data/avatars
 ---
 > AVATAR_UPLOAD_PATH = /srv/gogs/data/avatars
-193c193
+211c211
 < PATH = data/attachments
 ---
 > PATH = /srv/gogs/data/attachments
-208c208
+226c226
 < ROOT_PATH =
 ---
 > ROOT_PATH = /var/log/gogs
diff --git a/app_new.ini b/app_new.ini
index ef40eab7b0f6..4d7cb553180a 100644
--- a/app_new.ini
+++ b/app_new.ini
@@ -11,6 +11,12 @@ RUN_MODE = dev
 [repository]
 ROOT = /srv/gogs/repo
 SCRIPT_TYPE = bash
+; Default ANSI charset
+ANSI_CHARSET = 
+; Force every new repository to be private
+FORCE_PRIVATE = false
+; Patch test queue length, make it as large as possible
+PULL_REQUEST_QUEUE_LENGTH = 10000
 
 [ui]
 ; Number of repositories that are showed in one explore page
@@ -21,7 +27,7 @@ ISSUE_PAGING_NUM = 10
 FEED_MAX_COMMIT_NUM = 5
 
 [ui.admin]
-; Numer of users that are showed in one page
+; Number of users that are showed in one page
 USER_PAGING_NUM = 50
 ; Number of repos that are showed in one page
 REPO_PAGING_NUM = 50
@@ -42,6 +48,8 @@ HTTP_ADDR =
 HTTP_PORT = 3000
 ; Disable SSH feature when not available
 DISABLE_SSH = false
+; Whether use builtin SSH server or not.
+START_SSH_SERVER = false
 SSH_PORT = 22
 ; Disable CDN even in "prod" mode
 OFFLINE_MODE = false
@@ -110,6 +118,16 @@ DISABLE_MINIMUM_KEY_SIZE_CHECK = false
 ; Enable captcha validation for registration
 ENABLE_CAPTCHA = true
 
+; used to filter keys which are too short
+[service.minimum_key_sizes]
+ED25519 = 256
+ECDSA   = 256
+NTRU    = 1087
+MCE     = 1702
+McE     = 1702
+RSA     = 1024
+DSA     = 1024
+
 [webhook]
 ; Hook task queue length
 QUEUE_LENGTH = 1000
diff --git a/app_old.ini b/app_old.ini
index 615154193279..bbbd5fc1afe8 100644
--- a/app_old.ini
+++ b/app_old.ini
@@ -11,6 +11,12 @@ RUN_MODE = dev
 [repository]
 ROOT =
 SCRIPT_TYPE = bash
+; Default ANSI charset
+ANSI_CHARSET = 
+; Force every new repository to be private
+FORCE_PRIVATE = false
+; Patch test queue length, make it as large as possible
+PULL_REQUEST_QUEUE_LENGTH = 10000
 
 [ui]
 ; Number of repositories that are showed in one explore page
@@ -42,6 +48,8 @@ HTTP_ADDR =
 HTTP_PORT = 3000
 ; Disable SSH feature when not available
 DISABLE_SSH = false
+; Whether use builtin SSH server or not.
+START_SSH_SERVER = false
 SSH_PORT = 22
 ; Disable CDN even in "prod" mode
 OFFLINE_MODE = false
@@ -110,6 +118,16 @@ DISABLE_MINIMUM_KEY_SIZE_CHECK = false
 ; Enable captcha validation for registration
 ENABLE_CAPTCHA = true
 
+; used to filter keys which are too short
+[service.minimum_key_sizes]
+ED25519 = 256
+ECDSA   = 256
+NTRU    = 1087
+MCE     = 1702
+McE     = 1702
+RSA     = 1024
+DSA     = 1024
+
 [webhook]
 ; Hook task queue length
 QUEUE_LENGTH = 1000
diff --git a/helper.sh b/helper.sh
index b32164d31d6b..18425b5bb086 100644
--- a/helper.sh
+++ b/helper.sh
@@ -58,6 +58,10 @@ function get_golang {
   then
     echo $1 $2 $3
     get_git "github.com/golang/text" $2
+  elif [[ $1 == "golang.org/x/crypto" ]]
+  then
+    echo $1 $2 $3
+    get_git "github.com/golang/crypto" $2
   else
     echo $1 $2 $3
   fi