Date: Friday, November 2, 2018 @ 16:40:56 Author: archange Revision: 401241
archrelease: copy trunk to community-x86_64 Added: gitea/repos/community-x86_64/PKGBUILD (from rev 401240, gitea/trunk/PKGBUILD) gitea/repos/community-x86_64/gitea-disable-u2f.patch (from rev 401240, gitea/trunk/gitea-disable-u2f.patch) gitea/repos/community-x86_64/gitea-ldflags.patch (from rev 401240, gitea/trunk/gitea-ldflags.patch) gitea/repos/community-x86_64/gitea-repos.patch (from rev 401240, gitea/trunk/gitea-repos.patch) gitea/repos/community-x86_64/gitea.service (from rev 401240, gitea/trunk/gitea.service) gitea/repos/community-x86_64/gitea.tmpfiles (from rev 401240, gitea/trunk/gitea.tmpfiles) Deleted: gitea/repos/community-x86_64/PKGBUILD gitea/repos/community-x86_64/gitea-disable-u2f.patch gitea/repos/community-x86_64/gitea-ldflags.patch gitea/repos/community-x86_64/gitea-repos.patch gitea/repos/community-x86_64/gitea.service gitea/repos/community-x86_64/gitea.tmpfiles -------------------------+ PKGBUILD | 131 ++++++++++++++++++++++------------------------ gitea-disable-u2f.patch | 32 +++++------ gitea-ldflags.patch | 38 ++++++------- gitea-repos.patch | 22 +++---- gitea.service | 78 +++++++++++++-------------- gitea.tmpfiles | 16 +++-- 6 files changed, 159 insertions(+), 158 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-11-02 16:40:38 UTC (rev 401240) +++ PKGBUILD 2018-11-02 16:40:56 UTC (rev 401241) @@ -1,66 +0,0 @@ -# Maintainer: Bruno Pagani <archa...@archlinux.org> -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Frederik Schwan <frederik dot schwan at linux dot com> - -pkgname=gitea -pkgver=1.5.3 -pkgrel=2 -pkgdesc="Painless self-hosted Git service. Community managed fork of Gogs." -arch=('x86_64') -url="https://gitea.io" -license=('MIT') -depends=('git') -makedepends=('go-pie' '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' - 'sqlite: SQLite support' -) -backup=('etc/gitea/app.ini') -_commit=8733384e20b31f887cb8d8d4196cab939d49ab4b # tags/1.5.3^0 -source=("git+https://github.com/go-gitea/gitea.git#commit=${_commit}" - gitea.tmpfiles - gitea.service - gitea-repos.patch - gitea-ldflags.patch - gitea-disable-u2f.patch) -sha256sums=('SKIP' - 'da04ca25b76bcfc443c49da056393240d94d8c7e3b4bd63d4cf10e5aea001239' - '98339795107f1979c6aff6a8a5255d4d368cbabd4e8760867b789646d749b3ae' - '66c5a84fbbe56dd8b3bca3a779aaaf5d4855573f0dd2b273018a8983d7951a72' - 'f062d395b3122edcbcb51f6bac59da70ef57bfcf4693c17bde14ee35b1ef5e92' - 'd6842efd13b6971b77d233ff3ac2bd3d81c5d26c348ae1f2a2b19b0e7237726e') - -prepare() { - mkdir -p gopath/src/code.gitea.io - ln -rTsf ${pkgname} gopath/src/code.gitea.io/${pkgname} - - cd ${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 -} - -build() { - export GOPATH="${srcdir}"/gopath - cd gopath/src/code.gitea.io/gitea - make generate - EXTRA_GOFLAGS="-gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH}" \ - make GOFLAGS="-v" TAGS="bindata sqlite pam" build -} - -package() { - 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 -dm755 -o root -g git "${pkgdir}"/etc/gitea - install -m 660 -o root -g git ${pkgname}/custom/conf/app.ini.sample "${pkgdir}"/etc/gitea/app.ini -} Copied: gitea/repos/community-x86_64/PKGBUILD (from rev 401240, gitea/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-11-02 16:40:56 UTC (rev 401241) @@ -0,0 +1,65 @@ +# Maintainer: Bruno Pagani <archa...@archlinux.org> +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Frederik Schwan <frederik dot schwan at linux dot com> + +pkgname=gitea +pkgver=1.5.3 +pkgrel=3 +pkgdesc="Painless self-hosted Git service. Community managed fork of Gogs." +arch=('x86_64') +url="https://gitea.io" +license=('MIT') +depends=('git') +makedepends=('go-pie' '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' + 'sqlite: SQLite support' +) +backup=('etc/gitea/app.ini') +_commit=8733384e20b31f887cb8d8d4196cab939d49ab4b # tags/1.5.3^0 +source=("git+https://github.com/go-gitea/gitea.git#commit=${_commit}" + gitea.tmpfiles + gitea.service + gitea-repos.patch + gitea-ldflags.patch + gitea-disable-u2f.patch) +sha256sums=('SKIP' + 'f6829347594d424d63bcc211f85effaea90b677960593fe3ca978b3b5a3d12a7' + '98339795107f1979c6aff6a8a5255d4d368cbabd4e8760867b789646d749b3ae' + '66c5a84fbbe56dd8b3bca3a779aaaf5d4855573f0dd2b273018a8983d7951a72' + 'f062d395b3122edcbcb51f6bac59da70ef57bfcf4693c17bde14ee35b1ef5e92' + 'd6842efd13b6971b77d233ff3ac2bd3d81c5d26c348ae1f2a2b19b0e7237726e') + +prepare() { + mkdir -p gopath/src/code.gitea.io + ln -rTsf ${pkgname} gopath/src/code.gitea.io/${pkgname} + + cd ${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 +} + +build() { + export GOPATH="${srcdir}"/gopath + cd gopath/src/code.gitea.io/gitea + make generate + EXTRA_GOFLAGS="-gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH}" \ + make GOFLAGS="-v" TAGS="bindata sqlite pam" build +} + +package() { + 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 +} Deleted: gitea-disable-u2f.patch =================================================================== --- gitea-disable-u2f.patch 2018-11-02 16:40:38 UTC (rev 401240) +++ gitea-disable-u2f.patch 2018-11-02 16:40:56 UTC (rev 401241) @@ -1,16 +0,0 @@ ---- 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] Copied: gitea/repos/community-x86_64/gitea-disable-u2f.patch (from rev 401240, gitea/trunk/gitea-disable-u2f.patch) =================================================================== --- gitea-disable-u2f.patch (rev 0) +++ gitea-disable-u2f.patch 2018-11-02 16:40:56 UTC (rev 401241) @@ -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] Deleted: gitea-ldflags.patch =================================================================== --- gitea-ldflags.patch 2018-11-02 16:40:38 UTC (rev 401240) +++ gitea-ldflags.patch 2018-11-02 16:40:56 UTC (rev 401241) @@ -1,19 +0,0 @@ ---- 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 Copied: gitea/repos/community-x86_64/gitea-ldflags.patch (from rev 401240, gitea/trunk/gitea-ldflags.patch) =================================================================== --- gitea-ldflags.patch (rev 0) +++ gitea-ldflags.patch 2018-11-02 16:40:56 UTC (rev 401241) @@ -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 Deleted: gitea-repos.patch =================================================================== --- gitea-repos.patch 2018-11-02 16:40:38 UTC (rev 401240) +++ gitea-repos.patch 2018-11-02 16:40:56 UTC (rev 401241) @@ -1,11 +0,0 @@ ---- 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 = Copied: gitea/repos/community-x86_64/gitea-repos.patch (from rev 401240, gitea/trunk/gitea-repos.patch) =================================================================== --- gitea-repos.patch (rev 0) +++ gitea-repos.patch 2018-11-02 16:40:56 UTC (rev 401241) @@ -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 = Deleted: gitea.service =================================================================== --- gitea.service 2018-11-02 16:40:38 UTC (rev 401240) +++ gitea.service 2018-11-02 16:40:56 UTC (rev 401241) @@ -1,39 +0,0 @@ -[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 Copied: gitea/repos/community-x86_64/gitea.service (from rev 401240, gitea/trunk/gitea.service) =================================================================== --- gitea.service (rev 0) +++ gitea.service 2018-11-02 16:40:56 UTC (rev 401241) @@ -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 Deleted: gitea.tmpfiles =================================================================== --- gitea.tmpfiles 2018-11-02 16:40:38 UTC (rev 401240) +++ gitea.tmpfiles 2018-11-02 16:40:56 UTC (rev 401241) @@ -1,7 +0,0 @@ -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 Copied: gitea/repos/community-x86_64/gitea.tmpfiles (from rev 401240, gitea/trunk/gitea.tmpfiles) =================================================================== --- gitea.tmpfiles (rev 0) +++ gitea.tmpfiles 2018-11-02 16:40:56 UTC (rev 401241) @@ -0,0 +1,9 @@ +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