From 8b525d282684bb260aac6b0743bd34d199cd0d08 Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Thu, 14 Mar 2024 16:07:10 -0400 Subject: [PATCH] works for FHS, fix debian dependency and still this package needs improvements * LDFLAGS here https://codeberg.org/forgejo/forgejo/src/commit/cd7cdf06ed7a55e929e8c68a0ab9c5a3d812f306/Makefile#L107 * pam auth is not documented, so not enabled yet * sqlite separate pacakge is unuseless but leave as is until we decided --- .ci-make.sh | 5 +++++ deb/.forgejo-bin.control | 3 ++- deb/debian/changelog | 7 +++++++ deb/debian/control | 6 ++++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.ci-make.sh b/.ci-make.sh index 52d48df..17f70a1 100755 --- a/.ci-make.sh +++ b/.ci-make.sh @@ -8,6 +8,11 @@ CI_VERIFY_RETRY_COUNT=30 # How many times to retry before giving up if the pipel case "$1" in "submodule-build") cd "$2" + LDFLAGS="$LDFLAGS -X code.gitea.io/gitea/cmd.PIDFile=/run/forgejo.pid" + LDFLAGS="$LDFLAGS -X code.gitea.io/gitea/modules/setting.CustomConf=/etc/forgejo/app.ini" + LDFLAGS="$LDFLAGS -X code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/forgejo/" + LDFLAGS="$LDFLAGS -X code.gitea.io/gitea/modules/setting.StaticRootPath=/usr/share/forgejo/" # this is necesary to be HFS by example opensuse raise error if you install files nonarch outside of sahred dir + export LDFLAGS make build EXIT_STATUS=$? mv gitea ../"$3" diff --git a/deb/.forgejo-bin.control b/deb/.forgejo-bin.control index 3f2de6f..ba95cd3 100644 --- a/deb/.forgejo-bin.control +++ b/deb/.forgejo-bin.control @@ -2,7 +2,8 @@ Package: forgejo-bin Architecture: amd64 Priority: optional Provides: forgejo,gitea -Depends: adduser (>= 3.11) +Depends: adduser (>= 3.11), git, file-rc | sysv-rc | init-system-helpers | systemd +Recommends: postgresql | mysql-server | sqlite3, libcap2-bin Conflicts: forgejo,forgejo-bin Description: Forgejo: Beyond Coding. We Forge. (binary) The official Forgejo release binary in a Debian package diff --git a/deb/debian/changelog b/deb/debian/changelog index 0656edb..ac5fd6f 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,3 +1,10 @@ +forgejo (1.21.7.0-2) unstable; urgency=medium + + * Forgejo version 1.21.7-0 + * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-7-0 + + -- PICCORO Lenz McKAY Wed, 13 Mar 2024 23:14:00 -0400 + forgejo (1.21.7.0-1) unstable; urgency=medium * Forgejo version 1.21.7-0 diff --git a/deb/debian/control b/deb/debian/control index d77bbe4..e4efb2c 100644 --- a/deb/debian/control +++ b/deb/debian/control @@ -8,7 +8,8 @@ Package: forgejo Architecture: amd64 Priority: optional Provides: gitea -Depends: adduser (>= 3.11) +Depends: adduser (>= 3.11), git, file-rc | sysv-rc | init-system-helpers | systemd +Recommends: postgresql | mysql-server, libcap2-bin Conflicts: forgejo-sqlite,forgejo-bin Description: Forgejo: Beyond Coding. We Forge. Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup @@ -17,7 +18,8 @@ Package: forgejo-sqlite Architecture: amd64 Priority: optional Provides: forgejo,gitea -Depends: adduser (>= 3.11) +Depends: adduser (>= 3.11), git, file-rc | sysv-rc | init-system-helpers | systemd +Recommends: postgresql | mysql-server | sqlite3, libcap2-bin Conflicts: forgejo,forgejo-bin Description: Forgejo: Beyond Coding. We Forge. (SQLite) Forgejo with bindata and SQLite support - Use this package to get started immediately