Reenable bindata, merge some changes from the repo package

4 files changed, 26 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d0f31479020..6c259392239d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = Painless self-hosted Git service. Community managed fork of Gogs.
-	pkgver = v1.14.0_dev_371_g6074e13c8d
+	pkgver = v1.14.0_dev_445_gc236fe2f10
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -11,7 +11,7 @@ pkgbase = gitea-git
 	arch = armv7h
 	arch = aarch64
 	license = MIT
-	makedepends = go-pie
+	makedepends = go
 	makedepends = npm
 	depends = git
 	optdepends = mariadb: MariaDB support
@@ -31,9 +31,9 @@ pkgbase = gitea-git
 	source = gitea-arch-defaults.patch
 	sha512sums = SKIP
 	sha512sums = 89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103
-	sha512sums = 0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352
+	sha512sums = d65e053a98976423c6c1f3a4b6b0fd40f51e50a32d7afc651fc02414bb9f3bf574a58cc6a8c96760b85ab9f4f2bfcd0884bd7e9edcc2d71f07e7c1a548783c4c
 	sha512sums = 77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1
-	sha512sums = e498110c830e6a93fb2a003a4bfef376d30646a7589248ea04531f6cc27dae5d2a2e41ffa6153d2b30b63dcf4be729a14f18cf12dcdf521c170870eec65ba8da
+	sha512sums = 087264a388ba7296e8508a3da04ad4b5d43165ff289cc618f8a6396238080b46ee0cdc4ec67404750ad0a8c5f885fedf05926d93d11b7bd3e186375664d166d6
 
 pkgname = gitea-git
 
diff --git a/PKGBUILD b/PKGBUILD
index dd1c832ef246..61071fd845a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,14 @@
 
 _pkgname='gitea'
 pkgname=gitea-git
-pkgver=v1.14.0_dev_415_g4aabbacdfe
+pkgver=v1.14.0_dev_445_gc236fe2f10
 pkgrel=1
 pkgdesc='Painless self-hosted Git service. Community managed fork of Gogs.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://gitea.io/'
 license=('MIT')
 depends=('git')
-makedepends=('go-pie' 'npm')
+makedepends=('go' 'npm')
 optdepends=('mariadb: MariaDB support'
             'memcached: MemCached support'
             'openssh: GIT over SSH support'
@@ -34,9 +34,9 @@ source=(git+https://github.com/go-gitea/gitea.git
         gitea-arch-defaults.patch)
 sha512sums=('SKIP'
             '89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103'
-            '0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352'
+            'd65e053a98976423c6c1f3a4b6b0fd40f51e50a32d7afc651fc02414bb9f3bf574a58cc6a8c96760b85ab9f4f2bfcd0884bd7e9edcc2d71f07e7c1a548783c4c'
             '77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1'
-            'e498110c830e6a93fb2a003a4bfef376d30646a7589248ea04531f6cc27dae5d2a2e41ffa6153d2b30b63dcf4be729a14f18cf12dcdf521c170870eec65ba8da')
+            '087264a388ba7296e8508a3da04ad4b5d43165ff289cc618f8a6396238080b46ee0cdc4ec67404750ad0a8c5f885fedf05926d93d11b7bd3e186375664d166d6')
 install=gitea.install
 
 pkgver() {
@@ -48,28 +48,26 @@ prepare() {
   cd ${srcdir}/${_pkgname}
   # Change default repos path for ArchLinux and some additional settings
   patch -Np1 -i ../gitea-arch-defaults.patch
-
   # Be nice to people with read-only home
   GOCACHE="${srcdir}/cache" make vendor
 }
 
 build() {
+  cd ${srcdir}/${_pkgname}
   # Again, be nice to people with read-only home
   export GOCACHE="${srcdir}/cache"
-  cd ${srcdir}/${_pkgname}
-  make generate
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export CGO_LDFLAGS="${LDFLAGS}"
-  LDFLAGS="-linkmode external -extldflags \"${LDFLAGS}\" -X \"code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/\""
-  make TAGS="sqlite pam" EXTRA_GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" build
+  export LDFLAGS="-X 'code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/'"
+  export EXTRA_GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  export TAGS="bindata sqlite sqlite_unlock_notify pam"
+  make -j1 # building in parallel breaks the bindata target which relies on execution order
 }
 
 package() {
   install -Dm755 ${_pkgname}/${_pkgname} -t "${pkgdir}"/usr/bin/
-  install -dm755 "${pkgdir}"/usr/share/${_pkgname}/
-  cp -dr --no-preserve=ownership ${_pkgname}/{options,public,templates} "${pkgdir}"/usr/share/${_pkgname}/
   install -Dm644 ${_pkgname}/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
   install -Dm644 ${_pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm644 ${_pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${_pkgname}.conf
diff --git a/gitea-arch-defaults.patch b/gitea-arch-defaults.patch
index 9a914143989b..213e23a30700 100644
--- a/gitea-arch-defaults.patch
+++ b/gitea-arch-defaults.patch
@@ -18,15 +18,6 @@
  ; The script type this server supports. Usually this is `bash`, but some users report that only `sh` is available.
  SCRIPT_TYPE = bash
  ; DETECTED_CHARSETS_ORDER tie-break order for detected charsets.
-@@ -356,7 +356,7 @@
- KEY_FILE = https/key.pem
- ; Root directory containing templates and static files.
- ; default is the path where Gitea is executed
--STATIC_ROOT_PATH =
-+STATIC_ROOT_PATH = /usr/share/gitea
- ; Default path for App data
- APP_DATA_PATH = data
- ; Application level GZIP support
 @@ -426,7 +426,7 @@
  ; For iterate buffer, default is 50
  ITERATE_BUFFER_SIZE = 50
diff --git a/gitea.service b/gitea.service
index 5546a8c13925..11d1baa67677 100644
--- a/gitea.service
+++ b/gitea.service
@@ -14,26 +14,32 @@ Type=simple
 WorkingDirectory=~
 RuntimeDirectory=gitea
 LogsDirectory=gitea
+StateDirectory=gitea
 Environment=USER=gitea HOME=/var/lib/gitea GITEA_WORK_DIR=/var/lib/gitea
 ExecStart=/usr/bin/gitea web -c /etc/gitea/app.ini
 Restart=always
 RestartSec=2s
 CapabilityBoundingSet=
 NoNewPrivileges=True
-PrivateUsers=true
-PrivateDevices=true
-PrivateTmp=true
-ProtectHome=true
 ProtectSystem=strict
-ProtectControlGroups=yes
+ProtectHome=true
+ReadWritePaths=/etc/gitea/app.ini
+PrivateTmp=true
+PrivateDevices=true
+PrivateUsers=true
+ProtectHostname=true
+ProtectClock=true
 ProtectKernelTunables=true
-ProtectKernelModules=yes
-ReadWritePaths=/etc/gitea/app.ini /var/lib/gitea
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
 LockPersonality=true
 MemoryDenyWriteExecute=true
 RestrictRealtime=true
+RestrictSUIDSGID=true
 SystemCallArchitectures=native
 SystemCallFilter=@system-service
+SystemCallErrorNumber=EPERM
 
 [Install]
 WantedBy=multi-user.target