Make consistent with community/gitea

10 files changed, 162 insertions, 118 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74fd7151da60..d91503110126 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = gitea-git
-	pkgdesc = A painless self-hosted Git service.
-	pkgver = r6500.1675fc430
+	pkgdesc = Painless self-hosted Git service. Community managed fork of Gogs.
+	pkgver = v1.6.0_rc1_103_gd487a76ee284
 	pkgrel = 1
 	url = https://gitea.io/
-	install = gitea.install
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -11,28 +10,31 @@ pkgbase = gitea-git
 	arch = armv7h
 	arch = aarch64
 	license = MIT
+	makedepends = go
+	makedepends = go-bindata
 	depends = git
-	depends = go
-	optdepends = sqlite: SQLite support
 	optdepends = mariadb: MariaDB support
-	optdepends = postgresql: PostgreSQL support
-	optdepends = pam: Authentication via PAM support
-	optdepends = redis: Redis support
 	optdepends = memcached: MemCached support
 	optdepends = openssh: GIT over SSH support
+	optdepends = pam: Authentication via PAM support
+	optdepends = postgresql: PostgreSQL support
+	optdepends = redis: Redis support
+	optdepends = sqlite: SQLite support
 	provides = gitea
 	conflicts = gitea
-	options = !strip
-	options = emptydirs
 	backup = etc/gitea/app.ini
-	source = git://github.com/go-gitea/gitea.git
-	source = 01-adjust-config.patch
-	source = 02-adjust-service.patch
+	source = git+https://github.com/go-gitea/gitea.git
 	source = gitea.tmpfiles
+	source = gitea.service
+	source = gitea-repos.patch
+	source = gitea-ldflags.patch
+	source = gitea-disable-u2f.patch
 	sha512sums = SKIP
-	sha512sums = 3f96361a5135ea11b438e2cad29f2033221c63c11d1f260474d589c469e5db760fbf4da0718f9d015e106b72a13c02ad2899a8a90ac07365e20b935b59e95a6c
-	sha512sums = 01d5cfe3e2967b680cce1a3980db6460db1aada82718316886e92d2f9ef30b66d37c6dbb7da7bbc3026b2f6985b65e07e5f8fd58904443155a81a1533eef1bc1
-	sha512sums = 0c6c9729f8dfd5b5fe2badf998e89624b00800f87ae1b28a68acd52f2621f3434cc3930a578d2bb3e27005f8ffbb0f4a0e4e4d3d2e2371d0214d36c805d65573
+	sha512sums = 0c58381f38fff0d029fd1b32f65536a7f96d0daa4aa1ee7c1c483f818c822c0088bfa980991800775eaece272e9d995faf5cadb7cfe648c75b6da579f38f3ed6
+	sha512sums = 6487cd8a5de45e68bc842979197c442d1cbd8c79cf6781431e8965a2ef89cccadc20f75f3ee2e3403707ddb9f801ec782dec360fabc9d9dfc2ce2b1edd76482a
+	sha512sums = 7bed1338af9d44de55964b9cf98816109da45a43c07b3260f51b7d517cf2e2d0c496c8ba5df44d57c9a8aa6aea18614a619ea14600a8f62d72c79485a74e6ab0
+	sha512sums = 8d3024a17c8faae80b2af349457701c45695f70e2e5c5bf43f33c277bde8241f5e01ee08c534902fd5be976b49d85d0112bda7a2e6fb940179a99029d9e404fb
+	sha512sums = 779869c10bcb37581cde6df38f0905618099d604f29b0281abc4fa4c2302b8063063d0e8b0efdd99897b127c45103d376ba4a121e66edd51944abaf0235ab834
 
 pkgname = gitea-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..5b131483b4b1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+gitea/
+pkg/
+src/
+*.tar.gz
+*.tar.xz
+*.zip
diff --git a/01-adjust-config.patch b/01-adjust-config.patch
deleted file mode 100644
index 5a0a262f8677..000000000000
--- a/01-adjust-config.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- app.ini.sample
-+++ app.ini.sample
-@@ -7,12 +7,12 @@
- ; App name that shows in 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
- 
- [repository]
--ROOT =
-+ROOT = /home/gitea/gitea-repositories/
- SCRIPT_TYPE = bash
- ; Default ANSI charset
- ANSI_CHARSET =
-@@ -141,7 +141,7 @@
- ; The port number the builtin SSH server should listen on
- SSH_LISTEN_PORT = %(SSH_PORT)s
- ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
--SSH_ROOT_PATH =
-+SSH_ROOT_PATH = /home/gitea/.ssh
- ; For the built-in SSH server, choose the ciphers to support for SSH connections,
- ; for system SSH this setting has no effect
- SSH_SERVER_CIPHERS = aes128-ctr, aes192-ctr, aes256-ctr, aes128-gcm@openssh.com, arcfour256, arcfour128
-@@ -176,7 +176,7 @@
- KEY_FILE = custom/https/key.pem
- ; Root directory containing templates and static files.
- ; default is the path where Gitea is executed
--STATIC_ROOT_PATH =
-+STATIC_ROOT_PATH = /var/lib/gitea
- ; Default path for App data
- APP_DATA_PATH = data
- ; Application level GZIP support
-@@ -431,7 +431,7 @@
- FORMAT =
- 
- [log]
--ROOT_PATH =
-+ROOT_PATH = /var/log/gitea
- ; Either "console", "file", "conn", "smtp" or "database", default is "console"
- ; Use comma to separate multiple modes, e.g. "console, file"
- MODE = console
diff --git a/PKGBUILD b/PKGBUILD
index 24cdac541b23..8996f3598c99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Francois Menning <f.menning@pm.me>
+# Maintainer: Sam Whited <sam@samwhited.com>
+# Contributor: Francois Menning <f.menning@pm.me>
 # Contributor: Anton Kudryavtsev <anton@anibit.ru>
 # Contributor: Frederik Schwan <frederik dot schwan at linux dot com>
 # Contributor: Thomas Fanninger <thomas@fanninger.at>
@@ -6,66 +7,68 @@
 # Contributor: Thomas Laroche <tho.laroche@gmail.com>
 
 _pkgname='gitea'
-_gourl='code.gitea.io'
 pkgname=gitea-git
+pkgver=v1.6.0_rc1_103_gd487a76ee284
 pkgrel=1
-pkgver=r6500.1675fc430
-pkgdesc='A painless self-hosted Git service.'
+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')
-arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
-depends=('git' 'go')
-optdepends=('sqlite: SQLite support'
-            'mariadb: MariaDB support'
-            'postgresql: PostgreSQL support'
+depends=('git')
+makedepends=('go' 'go-bindata')
+optdepends=('mariadb: MariaDB support'
+            'memcached: MemCached support'
+            'openssh: GIT over SSH support'
             'pam: Authentication via PAM support'
+            'postgresql: PostgreSQL support'
             'redis: Redis support'
-            'memcached: MemCached support'
-            'openssh: GIT over SSH support')
+            'sqlite: SQLite support')
+backup=('etc/gitea/app.ini')
 conflicts=('gitea')
 provides=('gitea')
-options=('!strip' 'emptydirs')
-backup=('etc/gitea/app.ini')
-install=gitea.install
-source=('git://github.com/go-gitea/gitea.git'
-        '01-adjust-config.patch'
-        '02-adjust-service.patch'
-        'gitea.tmpfiles'
-)
+source=("git+https://github.com/go-gitea/gitea.git"
+        gitea.tmpfiles
+        gitea.service
+        gitea-repos.patch
+        gitea-ldflags.patch
+        gitea-disable-u2f.patch)
 sha512sums=('SKIP'
-            '3f96361a5135ea11b438e2cad29f2033221c63c11d1f260474d589c469e5db760fbf4da0718f9d015e106b72a13c02ad2899a8a90ac07365e20b935b59e95a6c'
-            '01d5cfe3e2967b680cce1a3980db6460db1aada82718316886e92d2f9ef30b66d37c6dbb7da7bbc3026b2f6985b65e07e5f8fd58904443155a81a1533eef1bc1'
-            '0c6c9729f8dfd5b5fe2badf998e89624b00800f87ae1b28a68acd52f2621f3434cc3930a578d2bb3e27005f8ffbb0f4a0e4e4d3d2e2371d0214d36c805d65573')
+            '0c58381f38fff0d029fd1b32f65536a7f96d0daa4aa1ee7c1c483f818c822c0088bfa980991800775eaece272e9d995faf5cadb7cfe648c75b6da579f38f3ed6'
+            '6487cd8a5de45e68bc842979197c442d1cbd8c79cf6781431e8965a2ef89cccadc20f75f3ee2e3403707ddb9f801ec782dec360fabc9d9dfc2ce2b1edd76482a'
+            '7bed1338af9d44de55964b9cf98816109da45a43c07b3260f51b7d517cf2e2d0c496c8ba5df44d57c9a8aa6aea18614a619ea14600a8f62d72c79485a74e6ab0'
+            '8d3024a17c8faae80b2af349457701c45695f70e2e5c5bf43f33c277bde8241f5e01ee08c534902fd5be976b49d85d0112bda7a2e6fb940179a99029d9e404fb'
+            '779869c10bcb37581cde6df38f0905618099d604f29b0281abc4fa4c2302b8063063d0e8b0efdd99897b127c45103d376ba4a121e66edd51944abaf0235ab834')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --tags --long | sed s/-/_/g
 }
 
 prepare() {
-  sed -i -e "s/\"main.Version.*$/\"main.Version=$(pkgver)\"/" "${srcdir}/${_pkgname}/Makefile"
-  patch -Np1 -i "${srcdir}/01-adjust-config.patch" "${srcdir}/${_pkgname}/custom/conf/app.ini.sample"
-  patch -Np1 -i "${srcdir}/02-adjust-service.patch" "${srcdir}/${_pkgname}/contrib/systemd/${_pkgname}.service"
+  cd ${srcdir}/${_pkgname}
+  # Change default repos path for ArchLinux
+  patch -Np1 -i ../../gitea-repos.patch
+  # Fix LDFLAGS not being respected by Go
+  patch -Np1 -i ../../gitea-ldflags.patch
+  # https://github.com/go-gitea/gitea/issues/4692
+  patch -Np1 -i ../../gitea-disable-u2f.patch
 
-  mkdir -p "${srcdir}/src/${_gourl}/${_pkgname}"
-  cp -r "${srcdir}/${_pkgname}" "${srcdir}/src/${_gourl}"
+  go mod init || true
 }
 
 build() {
-  cd "${srcdir}/src/${_gourl}/${_pkgname}"
-  PATH="${srcdir}/bin:$PATH" GOPATH="${srcdir}" make DESTDIR="${pkgdir}/" TAGS="sqlite pam" clean generate build
+  cd ${srcdir}/${_pkgname}
+  make generate
+  EXTRA_GOFLAGS="-gcflags all=-trimpath=${srcdir}/${_pkgname} -asmflags all=-trimpath=${srcdir}/${_pkgname}" \
+  make GOFLAGS="-v" TAGS="bindata sqlite pam" build
 }
 
 package() {
-  cd "${srcdir}/src/${_gourl}/${_pkgname}"
-
-  install -dm0750 "${pkgdir}/"{etc,var/log,var/lib}/${_pkgname}
-
-  cp -r {custom,public,options,templates} "${pkgdir}/var/lib/${_pkgname}"
-
-  install -Dm0755 "${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
-  install -Dm0644 "custom/conf/app.ini.sample" "${pkgdir}/etc/${_pkgname}/app.ini"
-  install -Dm0644 "contrib/systemd/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
-  install -Dm0644 "${srcdir}/${_pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
-  install -Dm0644 "LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}"
+  install -Dm755 ${_pkgname}/${_pkgname} -t "${pkgdir}"/usr/bin/
+  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
+  install -D ${_pkgname}/custom/conf/app.ini.sample "${pkgdir}"/etc/gitea/app.ini
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/gitea-disable-u2f.patch b/gitea-disable-u2f.patch
new file mode 100644
index 000000000000..c87913121cd4
--- /dev/null
+++ b/gitea-disable-u2f.patch
@@ -0,0 +1,16 @@
+--- a/custom/conf/app.ini.sample
++++ b/custom/conf/app.ini.sample
+@@ -628,13 +628,6 @@ sr-SP = sr
+ sv-SE = sv
+ ko-KR = ko
+ 
+-[U2F]
+-; Two Factor authentication with security keys
+-; https://developers.yubico.com/U2F/App_ID.html
+-APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
+-; Comma seperated list of truisted facets
+-TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
+-
+ ; Extension mapping to highlight class
+ ; e.g. .toml=ini
+ [highlight.mapping]
diff --git a/gitea-ldflags.patch b/gitea-ldflags.patch
new file mode 100644
index 000000000000..b9aefcda289a
--- /dev/null
+++ b/gitea-ldflags.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -33,6 +33,7 @@ else
+ 	GITEA_VERSION := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
+ endif
+ 
++EXTLDFLAGS := ${LDFLAGS}
+ LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
+ 
+ PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))
+@@ -240,7 +241,7 @@ install: $(wildcard *.go)
+ build: $(EXECUTABLE)
+ 
+ $(EXECUTABLE): $(SOURCES)
+-	$(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
++	$(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-linkmode external -extldflags "$(EXTLDFLAGS)" -s -w $(LDFLAGS)' -o $@
+ 
+ .PHONY: release
+ release: release-dirs release-windows release-linux release-darwin release-copy release-compress release-check
diff --git a/gitea-repos.patch b/gitea-repos.patch
new file mode 100644
index 000000000000..d505dcc56098
--- /dev/null
+++ b/gitea-repos.patch
@@ -0,0 +1,11 @@
+--- a/custom/conf/app.ini.sample
++++ b/custom/conf/app.ini.sample
+@@ -12,7 +12,7 @@ RUN_USER = git
+ RUN_MODE = dev
+ 
+ [repository]
+-ROOT =
++ROOT = /var/lib/gitea/repos
+ SCRIPT_TYPE = bash
+ ; Default ANSI charset
+ ANSI_CHARSET =
diff --git a/gitea.install b/gitea.install
deleted file mode 100644
index 429fcef3c7fc..000000000000
--- a/gitea.install
+++ /dev/null
@@ -1,14 +0,0 @@
-pre_install() {
-  useradd -d /home/gitea -m -r -U -s /bin/bash gitea
-}
-
-post_install() {
-  chown -R gitea:gitea /var/lib/gitea
-  chown -R gitea:gitea /var/log/gitea
-  chown -R gitea:gitea /etc/gitea
-  systemctl daemon-reload
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/gitea.service b/gitea.service
new file mode 100644
index 000000000000..04b27030dc90
--- /dev/null
+++ b/gitea.service
@@ -0,0 +1,39 @@
+[Unit]
+Description=Gitea (Git with a cup of tea)
+After=syslog.target
+After=network.target
+After=mysqld.service
+After=postgresql.service
+After=memcached.service
+After=redis.service
+
+[Service]
+User=git
+Group=git
+Type=simple
+WorkingDirectory=/var/lib/gitea
+RuntimeDirectory=gitea
+LogsDirectory=gitea
+Environment=USER=git 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
+ProtectKernelTunables=true
+ProtectKernelModules=yes
+ReadWritePaths=/etc/gitea/app.ini /var/lib/gitea
+LockPersonality=true
+MemoryDenyWriteExecute=true
+RestrictRealtime=true
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/gitea.tmpfiles b/gitea.tmpfiles
index c18942eff504..51f45bcd4a65 100644
--- a/gitea.tmpfiles
+++ b/gitea.tmpfiles
@@ -1,3 +1,9 @@
-d /var/lib/gitea 0750 gitea gitea -
-d /var/log/gitea 0750 gitea gitea -
-d /etc/gitea 0750 gitea gitea -
+d /var/lib/gitea 0750 git git
+d /var/lib/gitea/attachments 0750 git git
+d /var/lib/gitea/data 0750 git git
+d /var/lib/gitea/indexers 0750 git git
+d /var/lib/gitea/repos 0750 git git
+d /var/lib/gitea/tmp 0750 git git
+d /var/log/gitea 0750 git git
+z /etc/gitea 0755 root git
+z /etc/gitea/app.ini 0660 root git