From c26ab6454fd90b640fc3b42b67cf506b5f9ab938 Mon Sep 17 00:00:00 2001 From: tastytea Date: Wed, 14 Aug 2019 19:23:31 +0200 Subject: [PATCH] www-apps/gitea: Version bump 1.9.1-r1. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07 --- www-apps/gitea/Manifest | 14 ++- www-apps/gitea/files/gitea-mod-vendor.patch | 46 ++++++++ www-apps/gitea/files/gitea.confd-r1 | 14 +++ www-apps/gitea/files/gitea.initd-r1 | 22 ++++ www-apps/gitea/files/gitea.service-r1 | 34 ++++++ www-apps/gitea/gitea-1.9.1-r1.ebuild | 112 ++++++++++++++++++++ www-apps/gitea/gitea-1.9.1.ebuild | 71 ------------- 7 files changed, 237 insertions(+), 76 deletions(-) create mode 100644 www-apps/gitea/files/gitea-mod-vendor.patch create mode 100644 www-apps/gitea/files/gitea.confd-r1 create mode 100644 www-apps/gitea/files/gitea.initd-r1 create mode 100644 www-apps/gitea/files/gitea.service-r1 create mode 100644 www-apps/gitea/gitea-1.9.1-r1.ebuild delete mode 100644 www-apps/gitea/gitea-1.9.1.ebuild diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest index dc7fc4264..a010bda50 100644 --- a/www-apps/gitea/Manifest +++ b/www-apps/gitea/Manifest @@ -2,19 +2,23 @@ Hash: SHA256 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108 +AUX gitea-mod-vendor.patch 1273 BLAKE2B 3067b17a972b92d0c402af4336ee41daa2f09d389a6e8bf218d33b103230bf8bb4b7003977447cc00293f8941f5002676398d4d755548e114e59cbb3840af8cc SHA512 12d8e0d2cb0998d31f8077f1498205bfee07e0df74926251f1ca38b9824c11246c07e413fc20beaed9ae49cac3d329468432f3fd2d5b25292c5bd656a88c7cc8 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25 +AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836 AUX gitea.initd 764 BLAKE2B 5162535625a926d9d94ea50fd892bc423170913d38cb00a2782a04e5dc2b096689ee4b5bce8ced48fd5ecd0e7b5900c4346aeb3ec93e6405ebd17416f9d5f316 SHA512 9acfcc7fbb63feac97d5e9da0d629ef82473bc840097fd1d496f716e49746c14d999915a124d99defb6c4b62c108251fad78e5ff738d8119f2d9f4bbb1cd311f +AUX gitea.initd-r1 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1 AUX gitea.logrotated 87 BLAKE2B 373830ddd6eed0ce2f0f7b1dab14e4a253e5a56a73f477cfadbc6deec373846d4df2d697735391581771699d5a6513acb0e14a446873de01eba10d19e3a6bd88 SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4 AUX gitea.service 553 BLAKE2B d5081600bd7a9d8446029f7c40186b064ce6af29eb93e1e360e1523c460d8a8d3b409a54383434cf5b55fa77a0706b8e30f137fe734c6345ce59b996e8b2c195 SHA512 e2535cefaef4e890dc2a99ef204e6fb375f59c849df64f1be18d4dbf29abd7679c8cfc197c1124c9094f8b866d029b778f73a8d27554a0ab1870600f5d6420a5 +AUX gitea.service-r1 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39 DIST gitea-1.8.3.tar.gz 24320679 BLAKE2B 9ef901ef7e1cb6ffa9a2aa082798b7a18ac2a6fdb4379082df3f942d767a27fd3915c7a4d2cb1af6f502a8cde3c1c98557c42d4c0ef60be7bdad78d8931035e0 SHA512 f6019fbfc056e4c7176222ccaca1cf638bd1f52323de54fcddc618129aeb778674f6e305de60e7d17b69505ad65439445ee6b5e368afdf0a6fbace7407acb495 DIST gitea-1.9.1.tar.gz 24074441 BLAKE2B 597463b8fcaff0b4b4edbf69ba2ab48cdce5e79ae113fab8b36bb614c1226a5e5513e9e165ae4189efe100c8acfff2f4598f10999d974ed39eb7810403b108db SHA512 6be868415eeb82722c9b3a1341ddc432bc20acba247839b81c38ebb27642b8e8089b6a285042e8e386dfc909c4716194cd17f44598efed25b26773524630458e EBUILD gitea-1.8.3.ebuild 2111 BLAKE2B 0b276a4b0902a398b5ac3c34a744ac2464e796cf73682b88eac603db49032fd3ff0dc989d1710a99b240616628c6739b06e8e92222c939edc8d61a331ed96e6d SHA512 665ff73ea3a26d9274dfeb95c98c58876782ae5a99491f591ed4cb6b93de3312dad411e0775c0d3e988dadaa9d76164495268e114c4e0b1c944443afa161c1bd -EBUILD gitea-1.9.1.ebuild 2100 BLAKE2B fa71c387e522fbb7c1ee116c7c85b17b2009b85dd7d1952dc75f518bfb25fd74ffcb0ff5affc8b0013748483d1a8d8cac48d86f0cc96506918256ae76c3d9082 SHA512 a33d443518b1101797217125cad37857f2442bd56706e548b897ea686363cf841476fde75b4d8983a48c19d35fec98022f0acd03107b6e4fc49505b7707c5264 +EBUILD gitea-1.9.1-r1.ebuild 3315 BLAKE2B b3afc6dd788c7af96f93ac1dd3a7bd263a8b81c6400b007b4743e43b159587051a0ba1f49520b80907900a8b401b3d698427f3ffb91d0664509aff290f0e0a1f SHA512 c30fd831170cc250b8902b863db1bd7ac29f83a727f42ccdd8eae14a7943f4696900900355e4784a9b68d569c2dcc007277b2a0fcfefd0bfcdfbd079f01c50ab MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXVQwyQAKCRDPw5SX8bJu -By2nAP48SrHSLblaPlocZ1uZ46OA1UuZGIH/qePy9I9/Ka/tpAD/TBx6Run3CvYg -KHtyROsKriOPiu9I8N9LUUJZd3e9bwY= -=IQDF +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXVRDkwAKCRDPw5SX8bJu +B9zFAP9irb2OqMonzk1MA30T5ukyB1e9I6yhSDhPioxW5kheYQD6A7eg5n5SkGSA +P+ynAX8POL0cLddlfzZh2KMaMkbaK+k= +=qieA -----END PGP SIGNATURE----- diff --git a/www-apps/gitea/files/gitea-mod-vendor.patch b/www-apps/gitea/files/gitea-mod-vendor.patch new file mode 100644 index 000000000..c501e20ad --- /dev/null +++ b/www-apps/gitea/files/gitea-mod-vendor.patch @@ -0,0 +1,46 @@ +diff --git a/Makefile b/Makefile +index 796a0e3..2c6a6ef 100644 +--- a/Makefile ++++ b/Makefile +@@ -97,7 +97,7 @@ vet: + + .PHONY: generate + generate: +- GO111MODULE=on $(GO) generate $(PACKAGES) ++ GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES) + + .PHONY: generate-swagger + generate-swagger: +diff --git a/modules/options/options.go b/modules/options/options.go +index 723dd54..62e8c04 100644 +--- a/modules/options/options.go ++++ b/modules/options/options.go +@@ -5,7 +5,6 @@ + package options + + //go:generate go run -mod=vendor main.go +-//go:generate go fmt bindata.go + + type directorySet map[string][]string + +diff --git a/modules/public/public.go b/modules/public/public.go +index 8362b42..df70275 100644 +--- a/modules/public/public.go ++++ b/modules/public/public.go +@@ -18,7 +18,6 @@ import ( + ) + + //go:generate go run -mod=vendor main.go +-//go:generate go fmt bindata.go + + // Options represents the available options to configure the macaron handler. + type Options struct { +diff --git a/modules/templates/templates.go b/modules/templates/templates.go +index e7fe3b2..af6bf01 100644 +--- a/modules/templates/templates.go ++++ b/modules/templates/templates.go +@@ -5,4 +5,3 @@ + package templates + + //go:generate go run -mod=vendor main.go +-//go:generate go fmt bindata.go diff --git a/www-apps/gitea/files/gitea.confd-r1 b/www-apps/gitea/files/gitea.confd-r1 new file mode 100644 index 000000000..19018c1c6 --- /dev/null +++ b/www-apps/gitea/files/gitea.confd-r1 @@ -0,0 +1,14 @@ +# Gitea configuration +GITEA_CONF="/etc/gitea/app.ini" + +# Gitea user +GITEA_USER="git" + +# Gitea group +GITEA_GROUP="git" + +# Gitea working directory +GITEA_WORK_DIR="/var/lib/gitea" + +# Gitea custom directory +GITEA_CUSTOM="${GITEA_WORK_DIR}/custom" diff --git a/www-apps/gitea/files/gitea.initd-r1 b/www-apps/gitea/files/gitea.initd-r1 new file mode 100644 index 000000000..680ae834e --- /dev/null +++ b/www-apps/gitea/files/gitea.initd-r1 @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 2016-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Gitea, a self-hosted Git service" + +: ${GITEA_CONF:=/etc/gitea/app.ini} +: ${GITEA_USER:=git} +: ${GITEA_GROUP:=git} +: ${GITEA_WORK_DIR:=/var/lib/gitea} +: ${GITEA_CUSTOM:=${GITEA_WORK_DIR}/custom} + +command="/usr/bin/gitea web" +command_args="--config ${GITEA_CONF}" +command_background="true" +command_user="${GITEA_USER}:${GITEA_GROUP}" +error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err" +pidfile="/run/${RC_SVCNAME}.pid" +required_files="${GITEA_CONF}" +start_stop_daemon_args="-d ${GITEA_WORK_DIR}" +start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_WORK_DIR=${GITEA_WORK_DIR}" +start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_CUSTOM=${GITEA_CUSTOM}" diff --git a/www-apps/gitea/files/gitea.service-r1 b/www-apps/gitea/files/gitea.service-r1 new file mode 100644 index 000000000..1931b46c7 --- /dev/null +++ b/www-apps/gitea/files/gitea.service-r1 @@ -0,0 +1,34 @@ +[Unit] +Description=Gitea service +Documentation=https://docs.gitea.io/ + +AssertPathIsDirectory=/var/lib/gitea +AssertPathIsReadWrite=/var/lib/gitea + +After=network.target +Requires=network.target +After=mysqld.service +After=postgresql-9.3.service +After=postgresql-9.4.service +After=postgresql-9.5.service +After=postgresql-9.6.service +After=postgresql-10.service +After=postgresql-11.service +After=postgresql-12.service +After=memcached.service +After=redis.service + +[Service] +User=git +Group=git + +Environment="GITEA_WORK_DIR=/var/lib/gitea" "GITEA_CUSTOM=/var/lib/gitea/custom" +WorkingDirectory=/var/lib/gitea +ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini + +Restart=always +PrivateTmp=true +Nice=5 + +[Install] +WantedBy=multi-user.target diff --git a/www-apps/gitea/gitea-1.9.1-r1.ebuild b/www-apps/gitea/gitea-1.9.1-r1.ebuild new file mode 100644 index 000000000..f5d7a86b8 --- /dev/null +++ b/www-apps/gitea/gitea-1.9.1-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit fcaps golang-vcs-snapshot systemd user + +EGO_PN="code.gitea.io/gitea" + +DESCRIPTION="A painless self-hosted Git service" +HOMEPAGE="https://gitea.io/" +SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="" +IUSE="pam sqlite" + +COMMON_DEPEND="pam? ( sys-libs/pam )" +DEPEND=" + ${COMMON_DEPEND} + dev-go/go-bindata +" +RDEPEND=" + ${COMMON_DEPEND} + dev-vcs/git[curl,threads] +" + +FILECAPS=( cap_net_bind_service+ep usr/bin/gitea ) +DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md ) +S="${WORKDIR}/${P}/src/${EGO_PN}" + +PATCHES=( "${FILESDIR}/gitea-mod-vendor.patch" ) + +pkg_setup() { + enewgroup git + enewuser git -1 /bin/bash /var/lib/gitea git +} + +src_prepare() { + default + sed -i \ + -e "s#^RUN_MODE = dev#RUN_MODE = prod#" \ + -e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#" \ + -e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" \ + -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#" \ + -e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#" \ + -e "s#^MODE = console#MODE = file#" \ + -e "s#^LEVEL = Trace#LEVEL = Info#" \ + -e "s#^LOG_SQL = true#LOG_SQL = false#" \ + -e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#" \ + -e "s#^APP_ID =#;APP_ID =#" \ + -e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#" \ + custom/conf/app.ini.sample || die + if use sqlite ; then + sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die + fi + + gitea_make generate +} + +gitea_make() { + local my_tags=( + bindata + $(usev pam) + $(usex sqlite 'sqlite sqlite_unlock_notify' '') + ) + local my_makeopt=( + DRONE_TAG=${PV} + TAGS="${my_tags[@]}" + ) + GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake "${my_makeopt[@]}" "$@" +} + +src_compile() { + gitea_make build +} + +src_test() { + gitea_make test +} + +src_install() { + dobin gitea + + einstalldocs + + newconfd "${FILESDIR}"/gitea.confd-r1 gitea + newinitd "${FILESDIR}"/gitea.initd-r1 gitea + systemd_newunit "${FILESDIR}"/gitea.service-r1 gitea.service + + insinto /etc/gitea + newins custom/conf/app.ini.sample app.ini + fowners root:git /etc/gitea/{,app.ini} + fperms g+w,o-rwx /etc/gitea/{,app.ini} + + diropts -m0750 -o git -g git + keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data + keepdir /var/log/gitea +} + +pkg_postinst() { + fcaps_pkg_postinst + if [[ -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then + ewarn "The configuration path has been changed to ${EROOT}/etc/gitea/app.ini." + ewarn "Please move your configuration from ${EROOT}/var/lib/gitea/conf/app.ini" + ewarn "and adapt the gitea-repositories hooks and ssh authorized_keys." + ewarn "Depending on your configuration you should run something like:" + ewarn "sed -i -e 's#${EROOT}/var/lib/gitea/conf/app.ini#${EROOT}/etc/gitea/app.ini#' \\" + ewarn " /var/lib/gitea/gitea-repositories/*/*/hooks/*/* \\" + ewarn " /var/lib/gitea/.ssh/authorized_keys" + fi +} diff --git a/www-apps/gitea/gitea-1.9.1.ebuild b/www-apps/gitea/gitea-1.9.1.ebuild deleted file mode 100644 index f6ea294fd..000000000 --- a/www-apps/gitea/gitea-1.9.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit fcaps golang-build golang-vcs-snapshot systemd user - -EGO_PN="code.gitea.io/gitea" -KEYWORDS="" - -DESCRIPTION="A painless self-hosted Git service, written in Go" -HOMEPAGE="https://gitea.io/" -SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" - -DEPEND=" - dev-go/go-bindata - sys-libs/pam -" -RDEPEND=" - dev-vcs/git[curl,threads] - sys-libs/pam -" - -FILECAPS=( cap_net_bind_service+ep usr/bin/gitea ) - -pkg_setup() { - enewgroup git - enewuser git -1 /bin/bash /var/lib/gitea git -} - -src_prepare() { - default - sed -i -e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\ - -e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die -} - -src_compile() { - GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate - TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build -} - -src_install() { - diropts -m0750 -o git -g git - keepdir /var/log/gitea /var/lib/gitea /var/lib/gitea/data - pushd src/${EGO_PN} || die - dobin gitea - insinto /var/lib/gitea/conf - newins custom/conf/app.ini.sample app.ini.example - popd || die - newinitd "${FILESDIR}"/gitea.initd gitea - newconfd "${FILESDIR}"/gitea.confd gitea - keepdir /var/log/gitea /var/lib/gitea/data - systemd_dounit "${FILESDIR}/gitea.service" -} - -pkg_postinst() { - fcaps_pkg_postinst - if [[ ! -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then - elog "No app.ini found, copying initial config over" - cp "${FILESDIR}"/app.ini "${EROOT}"/var/lib/gitea/conf/ || die - chown git:git /var/lib/gitea/conf/app.ini - elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitea)." - else - elog "app.ini found, please check example file for possible changes" - ewarn "Please note that environment variables have been changed:" - ewarn "GITEA_WORK_DIR is set to /var/lib/gitea (previous value: unset)" - ewarn "GITEA_CUSTOM is set to '\$GITEA_WORK_DIR/custom' (previous: /var/lib/gitea)" - fi -}