Update to current commit

7 files changed, 34 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f7e5f8b08ed4..583cd7289b99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=gogs-git
 _pkgname=gogs
 _branch=master
-pkgver=3834.d6b09c3
+pkgver=3879.3c0c7a9
 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}."
@@ -32,8 +32,8 @@ source=('gogs.service.patch'
         'helper.sh'
         "$_pkgname::git+https://${_gourl}.git#branch=${_branch}")
 
-sha512sums=(834e95fe9bcfa291a573ad1fa43f41bbed844658a918ff4fcf53ab8a44a296206ee4003eab1d9a2785c9126be077022f4907846d2eb6c5d64050b5e81ce47f44
-            bd378fac1c9a37e9d96d84529fce5b95351e631e0ac0f461c4d9ca3e2d9903400d03f83fcfbf701a93d5531e0d9fa0061d877a226cceb36387db76061533bdf6
+sha512sums=(db36fd44c29de387b066e52a71a61214aa876a27574eb054ec9517a175b5a47db9a7de01be2dd635023a11d5e1224772a66accc4b63b6936f7c58e6314555a66
+            43c8971b0b4e8ea8d5aa0ed15610e9737605dc46a626d3d578bb1c97c9f90912966f59b452e9f4ea7974e4e3beaa5dd40bc597b03319afed3358432ab6e59c7d
             e45775adafeecad5deaf24a98cd85b25a8383cb0e89905b2927c13fe7f0ec9918a42071ce43eabc429d8a826db93bb75ffb1927dce9c431ed88b0b5c619fd60d
             'SKIP')
 
@@ -94,7 +94,7 @@ build() {
 
   msg2 "Build program"
   go fix
-  go build -x -tags='sqlite'
+  go build -x -tags='sqlite pam cert'
 }
 
 package() {
diff --git a/app.ini.patch b/app.ini.patch
index 1952500b929d..f695409d1b18 100644
--- a/app.ini.patch
+++ b/app.ini.patch
@@ -6,29 +6,31 @@
 < ROOT =
 ---
 > ROOT = /srv/gogs/repo
-95,97c95
+95c95
 < STATIC_ROOT_PATH =
-< ; Default path for App data
-< APP_DATA_PATH = data
 ---
 > STATIC_ROOT_PATH = /usr/share/themes/gogs/default
-120c118
+97c97
+< APP_DATA_PATH = data
+---
+> APP_DATA_PATH = /srv/gogs/data
+120c120
 < PATH = data/gogs.db
 ---
 > PATH = /srv/gogs/sqlite/gogs.db
-207c205
+207c207
 < PROVIDER_CONFIG = data/sessions
 ---
 > PROVIDER_CONFIG = /srv/gogs/sessions
-220c218
+220c220
 < AVATAR_UPLOAD_PATH = data/avatars
 ---
 > AVATAR_UPLOAD_PATH = /srv/gogs/data/avatars
-230c228
+230c230
 < PATH = data/attachments
 ---
 > PATH = /srv/gogs/data/attachments
-245c243
+245c245
 < ROOT_PATH =
 ---
 > ROOT_PATH = /var/log/gogs
diff --git a/app_new.ini b/app_new.ini
index 964ca0b78ea0..55666bf48a7e 100644
--- a/app_new.ini
+++ b/app_new.ini
@@ -93,6 +93,8 @@ KEY_FILE = custom/https/key.pem
 ; Upper level of template and static file path
 ; default is the path where Gogs is executed
 STATIC_ROOT_PATH = /usr/share/themes/gogs/default
+; Default path for App data
+APP_DATA_PATH = /srv/gogs/data
 ; Application level GZIP support
 ENABLE_GZIP = false
 ; Landing page for non-logged users, can be "home" or "explore"
@@ -337,8 +339,8 @@ CLONE = 300
 PULL = 300
 
 [i18n]
-LANGS = en-US,zh-CN,zh-HK,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI
-NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen
+LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR
+NAMES = English,简体中文,繁體中文（香港）,繁體中文（台湾）,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türk
 
 ; Used for datetimepicker
 [i18n.datelang]
diff --git a/app_old.ini b/app_old.ini
index 3d5ef38e85a3..8f83e8cf470b 100644
--- a/app_old.ini
+++ b/app_old.ini
@@ -339,8 +339,8 @@ CLONE = 300
 PULL = 300
 
 [i18n]
-LANGS = en-US,zh-CN,zh-HK,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI
-NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen
+LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR
+NAMES = English,简体中文,繁體中文（香港）,繁體中文（台湾）,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türk
 
 ; Used for datetimepicker
 [i18n.datelang]
diff --git a/gogs.service.patch b/gogs.service.patch
index 519d02c19a48..862e0e888503 100644
--- a/gogs.service.patch
+++ b/gogs.service.patch
@@ -1,4 +1,4 @@
-12,15c12,15
+18,21c18,21
 < User=git
 < Group=git
 < WorkingDirectory=/home/git/gogs
@@ -8,7 +8,7 @@
 > Group=gogs
 > WorkingDirectory=/srv/gogs/
 > ExecStart=/usr/share/gogs/gogs web --config /srv/gogs/conf/app.ini
-17c17
+23c23
 < Environment=USER=git HOME=/home/git
 ---
 > Environment=USER=gogs HOME=/home/gogs
diff --git a/gogs_new.service b/gogs_new.service
index 574d74973a45..ec68c13e46d3 100644
--- a/gogs_new.service
+++ b/gogs_new.service
@@ -8,6 +8,12 @@ After=network.target
 #After=redis.service
 
 [Service]
+# Modify these two values and uncomment them if you have
+# repos with lots of files and get an HTTP error 500 because
+# of that
+###
+#LimitMEMLOCK=infinity
+#LimitNOFILE=65535
 Type=simple
 User=gogs
 Group=gogs
diff --git a/gogs_old.service b/gogs_old.service
index 3d375b945b9f..9ae9209c24fd 100644
--- a/gogs_old.service
+++ b/gogs_old.service
@@ -8,6 +8,12 @@ After=network.target
 #After=redis.service
 
 [Service]
+# Modify these two values and uncomment them if you have
+# repos with lots of files and get an HTTP error 500 because
+# of that
+###
+#LimitMEMLOCK=infinity
+#LimitNOFILE=65535
 Type=simple
 User=git
 Group=git