fix status badge for 1.19 branch

.ci-make.sh

@@ -47,7 +47,7 @@ case "$1" in
 			CI_RELEASE_ASSETS=$(curl $CI_VERIFY_API/api/v1/repos/$CI_VERIFY_REPO/releases/tags/$CI_COMMIT_TAG | jq -c '.assets[]' | grep linux-amd64)
 			CI_RELEASE_BINARY_URL=$(echo "$CI_RELEASE_ASSETS" | grep linux-amd64\" | jq -r --jsonargs .browser_download_url)
 			CI_RELEASE_SHA256=$(curl $(echo "$CI_RELEASE_ASSETS" | grep linux-amd64.sha256\" | jq -r --jsonargs .browser_download_url) | cut -d ' ' -f1)
-			wget -nv --content-disposition $CI_RELEASE_BINARY_URL
+			wget --content-disposition $CI_RELEASE_BINARY_URL
 			DOWNLOAD_SHA256=$(sha256sum forgejo-*-linux-amd64 | cut -d ' ' -f1)
 			if [ $CI_RELEASE_SHA256 != $DOWNLOAD_SHA256 ] ; then
 				echo "ERROR: Downloaded file didn't match expected SHA256 sum"
@@ -103,7 +103,6 @@ case "$1" in
 		cp ./etc/systemd/system/forgejo.service.d/override.conf /etc/systemd/system/forgejo.service.d/override.conf
 		;;
 	"install-run-test")
-		export DEBIAN_FRONTEND=noninteractive
 		apt update
 		apt install -y ./"$2"
 		[ -f "/etc/default/forgejo" ] && . /etc/default/forgejo
@@ -111,60 +110,24 @@ case "$1" in
 		[ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo
 		sudo -u $FORGEJO_USER USER=$FORGEJO_USER \
 			HOME=$FORGEJO_HOME GITEA_WORK_DIR=$FORGEJO_HOME \
-			forgejo web -q --config /etc/forgejo/app.ini &
+			forgejo web --config /etc/forgejo/app.ini &
 		sleep 10
-		curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
+		curl http://localhost:3000/
 		exit $?
 		;;
 	"install-repo-test")
-		export DEBIAN_FRONTEND=noninteractive
+		apt update
-		apt update -qq
-		apt install -y apt-utils apt-listchanges
 		apt install -y ./"$2"
-		apt update -qq
+		apt update
 		apt upgrade -y
-		apt update -qq
+		apt update
-		apt install -y "$3"
+		apt install "$3"
 		sudo -u forgejo USER=forgejo \
 			HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo \
-			forgejo web -q --config /etc/fogejo/app.ini &
+			forgejo web --config /etc/fogejo/app.ini &
 		sleep 10
-		curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
+		curl http://localhost:3000/
 		exit $?
 		;;
-	"verify-data-dir-chmod")
-		DATA_DIR_CHMOD="$(stat -c %a /var/lib/forgejo)"
-		if [ "$DATA_DIR_CHMOD" = "750" ]; then
-			exit 0
-		else
-			exit 100
-		fi
-		;;
-	"force-clean-forgejo")
-		export DEBIAN_FRONTEND=noninteractive
-		apt install -y psmisc
-		killall forgejo
-		exit $?
-		;;
-	"forgejo-test-deps")
-		echo "deb http://deb.debian.org/debian/ bookworm-backports main contrib" > /etc/apt/sources.list.d/backports.list
-		export DEBIAN_FRONTEND=noninteractive
-		apt update -qq
-		apt install -qq --no-install-recommends -y git-lfs
-		apt install -qq -y -t bookworm-backports golang-$DEP_GOLANG_VER
-		ln -sf /usr/lib/go-$DEP_GOLANG_VER/bin/go /usr/local/bin/go
-		adduser --quiet --comment forgejo --disabled-password forgejo
-		chown -R forgejo:forgejo .
-		if [ "$DEP_GOLANG_NODEB_REV" ];then
-			su forgejo -c "./.ci-make.sh forgejo-test-deps_upgrade-go $DEP_GOLANG_VER $DEP_GOLANG_NODEB_REV"
-		fi
-		;;
-	"forgejo-test-deps_upgrade-go")
-		go install golang.org/dl/go$2.$3@latest
-		ln -s ~/go/bin/go$2.$3 ~/go/bin/go
-		export PATH="$HOME/go/bin:$PATH"
-		go download
-		go version
-		;;
 esac
 		

.crystalintegration.yml

@@ -1,4 +1,3 @@
-labels:
 platform: linux/amd64
 
 when:
@@ -6,9 +5,9 @@ when:
 
 variables:
   - &ci_verify_image 'sc.cryxtal.org/ci-img/git-curl-jq:latest'
-  - &golang_image 'golang:1.22-bullseye'
+  - &golang_image 'golang:1.20-bullseye'
-  - &forgejo_test_image 'docker.io/node:20-bookworm'
+  - &forgejo_test_image 'codeberg.org/forgejo/test_env:1.19'
-  - &nodejs_image 'docker.io/node:20-bookworm'
+  - &nodejs_image 'node:lts'
   - &bin_dl_image 'sc.cryxtal.org/ci-img/bin-dl:latest'
   - &deb_build_image 'sc.cryxtal.org/ci-img/dh:bullseye'
   - &deb_test_image_bullseye 'sc.cryxtal.org/ci-img/deb-test:bullseye'
@@ -17,10 +16,8 @@ variables:
   - &deb_test_image_sid 'sc.cryxtal.org/ci-img/deb-test:sid'
   - &deb_test_image_jammy 'sc.cryxtal.org/ci-img/deb-test-ubuntu:jammy'
   - &deb_test_image_focal 'sc.cryxtal.org/ci-img/deb-test-ubuntu:focal'
-  - &deb_test_image_mantic 'sc.cryxtal.org/ci-img/deb-test-ubuntu:mantic'
+  - &deb_test_image_kinetic 'sc.cryxtal.org/ci-img/deb-test-ubuntu:kinetic'
   - &deb_test_image_lunar 'sc.cryxtal.org/ci-img/deb-test-ubuntu:lunar'
-  - &forgejo_test_golang_ver '1.22'
-  - &forgejo_test_golang_nodeb_rev '2'
   - &build_submodule 'forgejo'
   - &goproxy_override ''
   - &goproxy_setup |-
@@ -40,12 +37,12 @@ workspace:
   path: src/cryxtal/forgejo-deb
 
 clone:
-  git:
+  clone-recursive:
     image: woodpeckerci/plugin-git
     settings:
       recursive: true
 
-steps:
+pipeline:
   fetch-tags:
     image: *ci_verify_image
     pull: true
@@ -54,15 +51,6 @@ steps:
       - git fetch --tags --force
       - git submodule foreach 'git fetch --tags --force'
 
-  git-push-codeberg:
-    image: *ci_verify_image
-    secrets: [ cb_git_auth ]
-    commands:
-      - git remote add codeberg https://$CB_GIT_AUTH@codeberg.org/forgejo-contrib/forgejo-deb
-      - if ( $(git rev-parse --is-shallow-repository) == "true" );then git fetch --unshallow origin ;fi
-      - git fetch codeberg
-      - git push codeberg --tags refs/remotes/origin/*:refs/heads/*
-
   ci-verify:
     image: *ci_verify_image
     group: deps
@@ -85,6 +73,8 @@ steps:
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
+    secrets:
+      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" deps-backend
@@ -103,30 +93,31 @@ steps:
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
+    secrets:
+      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" security-check
 
+  build-frontend:
+    image: *nodejs_image
+    group: checks
+    environment:
+      BUILD_SUBMODULE: *build_submodule
+    commands:
+      - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" frontend
+
   checks-backend:
     image: *forgejo_test_image
     group: checks
     environment:
+      BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
-      DEP_GOLANG_VER: *forgejo_test_golang_ver
+    secrets:
-      DEP_GOLANG_NODEB_REV: *forgejo_test_golang_nodeb_rev
+      - goproxy_default
     commands:
       - *goproxy_setup
-      - ./.ci-make.sh forgejo-test-deps
+      - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" checks-backend
-      - su forgejo -c './.ci-make.sh submodule-make forgejo checks-backend'
-      - chown -R root:root .
-
-  build-frontend:
-    image: *nodejs_image
-    group: pre-build
-    environment:
-      BUILD_SUBMODULE: *build_submodule
-    commands:
-      - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" frontend
 
   download-bin-amd64:
     image: *bin_dl_image
@@ -144,6 +135,8 @@ steps:
       GOSUMDB: sum.golang.org
       TAGS: bindata
       GOPROXY_OVERRIDE: *goproxy_override
+    secrets:
+      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-build "$BUILD_SUBMODULE" forgejo-bin
@@ -155,6 +148,8 @@ steps:
       GOSUMDB: sum.golang.org
       TAGS: bindata sqlite sqlite_unlock_notify
       GOPROXY_OVERRIDE: *goproxy_override
+    secrets:
+      - goproxy_default
     commands:
       - *goproxy_setup
       - ./.ci-make.sh submodule-build "$BUILD_SUBMODULE" forgejo-sqlite-bin
@@ -229,8 +224,8 @@ steps:
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
-  test-inst-mantic-sqlite:
+  test-inst-kinetic-sqlite:
-    image: *deb_test_image_mantic
+    image: *deb_test_image_kinetic
     group: pkg-test-3
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
@@ -289,8 +284,8 @@ steps:
     when:
       event: [ tag ]
 
-  test-inst-mantic-bin:
+  test-inst-kinetic-bin:
-    image: *deb_test_image_mantic
+    image: *deb_test_image_kinetic
     group: pkg-test-5
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
@@ -310,9 +305,6 @@ steps:
     group: pkg-test-5
     commands:
       - ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-sqlite
-      - ./.ci-make.sh force-clean-forgejo
-      - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
-      - ./.ci-make.sh verify-data-dir-chmod
 
   upload-crystalcommit:
     image: woodpeckerci/plugin-gitea-release
@@ -349,7 +341,7 @@ steps:
     group: upload
     environment:
       FORGEJO_SITE: https://code.forgejo.org
-      FORGEJO_OWNER: forgejo-contrib
+      FORGEJO_OWNER: crystal
       DEBIAN_DIST: bullseye
       DEBIAN_COMPONENT: forgejo
     secrets: [ cfo_api_key ]

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "forgejo"]
 	path = forgejo
-	url = https://sc.cryxtal.org/forgejo/forgejo
+	url = https://sc.cryxtal.org/mirror/forgejo

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 The Forgejo Community
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,10 +1,10 @@
 # Debian Packages for Forgejo
 Hello! If you want to run Forgejo on Debian/Ubuntu and you're looking for packages to install it to your system, you've come to the right place!
 
-### Build test: [![ci-status](https://ci.cryxtal.org/api/badges/forgejo-contrib/forgejo-deb/status.svg)](https://ci.cryxtal.org/forgejo-contrib/forgejo-deb)
+### Build test: [![ci-status](https://ci.cryxtal.org/api/badges/forgejo-contrib/forgejo-deb/status.svg?branch=1.19)](https://ci.cryxtal.org/forgejo-contrib/forgejo-deb)
 
 ## Download info
-You can find the latest release downloads in [the releases tab](https://codeberg.org/forgejo-contrib/forgejo-deb/releases). There are currently 3 packages built by this script.
+You can find the latest release downloads in [the releases tab](https://codeberg.org/crystal/forgejo-deb/releases). There are currently 3 packages built by this script.
 - `forgejo`: A basic production-ready Forgejo build without SQLite support
 - `forgejo-sqlite`: A Forgejo build with SQLite support, best way to get started fast
 - `forgejo-bin`: A Debian package with the official Forgejo binary, in case you don't trust my builds
@@ -14,17 +14,6 @@ These packages are easy to use! Just download your preferred package, install it
 
 The default username for Forgejo's user is `forgejo`, but it can easily be changed prior to installation, for example if you would rather run Forgejo as user `git`. All you need to do is download the files from the `etc` folder in this repository, put them in the respective places on your system, and customize them to your liking. When you use apt to install the Forgejo package, it will create a new user with the specified settings.
 
-## Updates through apt
-You can install updates for this package along with all the other software on your system with `apt` thanks to the Debian package registry added in Forgejo v1.20. Run the following commands to set up the repository on your system:
-```sh
-sudo apt install wget apt-transport-https
-wget --content-disposition https://code.forgejo.org/forgejo-contrib/-/packages/debian/forgejo-deb-repo/0-0/files/2890
-sudo apt install ./forgejo-deb-repo_0-0_all.deb
-sudo apt update
-sudo apt upgrade
-```
-If you already installed Forgejo using a package from the releases tab, it will now be automatically updated along with the rest of your system packages. If you have not yet installed Forgejo, you can now install it with `apt install forgejo(-sqlite|-bin)`
-
 ## Removal
 Removing Forgejo itself from your system is simple, just `sudo apt remove forgejo(-sqlite|-bin)`. If you use `sudo apt purge`, the related configuration files will also be removed from `/etc/forgejo`. To avoid accidentally destroying user data, other things including the Forgejo user will be left behind. The following commands will remove everything from your system.
 ```sh
@@ -34,5 +23,3 @@ sudo rm -rf /etc/forgejo /etc/default/forgejo /etc/systemd/system/forgejo.servic
 sudo deluser forgejo
 ```
 If you customized the user or home directory before installing Forgejo, make sure to adjust the commands accordingly. If you get an error saying the files you are trying to delete do not exist, don't worry about it.
-
-If you installed the `apt` repository and you would like to remove it, use `sudo apt purge forgejo-deb-repo forgejo-deb-repokey`

deb/debian/NEWS

@@ -1,14 +0,0 @@
-forgejo (1.21.4.0-2) unstable; urgency=medium
-
-  WARNING: Forgejo will be upgraded to v1.21.4-0
-
-  Please read the Forgejo v1.21 release announcement and the release notes
-  for all v1.21.x-x versions and make any necessary adjustments to your
-  configuration before proceeding with the upgrade.
-
-  You may need to manually restart Forgejo after the upgrade is complete.
-
-  https://forgejo.org/2023-11-release-v1211-0/
-  https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-4-0
-
- -- crystal <crystal@noreply.codeberg.org>  Wed, 17 Jan 2024 00:00:00 +0000

deb/debian/changelog

@@ -1,132 +1,3 @@
-forgejo (7.0.0-1) unstable; urgency=medium
-
-  * Forgejo version 7.0.0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-0
-
- -- crystal <crystal@noreply.codeberg.org>  Tue, 23 Apr 2024 17:18:00 +0000
-
-forgejo (1.21.11.1-1) unstable; urgency=medium
-
-  * Forgejo version 1.21.11-1
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-1
-
- -- crystal <crystal@noreply.codeberg.org>  Fri, 19 Apr 2024 15:46:00 +0000
-
-forgejo (1.21.11.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.21.11-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-0
-
- -- crystal <crystal@noreply.codeberg.org>  Thu, 18 Apr 2024 23:36:00 +0000
-
-forgejo (1.21.10.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.21.10-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-10-0
-
- -- crystal <crystal@noreply.codeberg.org>  Tue, 9 Apr 2024 11:27:00 +0000
-
-forgejo (1.21.8.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.21.8-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-8-0
-
- -- crystal <crystal@noreply.codeberg.org>  Sat, 23 Mar 2024 18:15:00 +0000
-
-forgejo (1.21.7.0-2) unstable; urgency=medium
-
-  * Forgejo version 1.21.7-0
-  * Add git dependency
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-7-0
-
- -- crystal <crystal@noreply.codeberg.org>  Fri, 22 Mar 2024 21:35:00 +0000
-
-forgejo (1.21.6.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.21.6-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-6-0
-
- -- crystal <crystal@noreply.codeberg.org>  Sun, 25 Feb 2024 12:10:00 +0000
-
-forgejo (1.21.5.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.21.5-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-5-0
-
- -- crystal <crystal@noreply.codeberg.org>  Wed, 31 Jan 2024 22:22:00 +0000
-
-forgejo (1.21.4.0-2) unstable; urgency=medium
-
-  * Fix NEWS.Debian changelog
-
- -- crystal <crystal@noreply.codeberg.org>  Wed, 17 Jan 2024 00:00:00 +0000
-
-forgejo (1.21.4.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.21.4-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-4-0
-
- -- crystal <crystal@noreply.codeberg.org>  Tue, 16 Jan 2024 23:03:00 +0000
-
-forgejo (1.20.6.1-0) unstable; urgency=medium
-
-  * Forgejo version 1.20.6-1~deb0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-6-1
-  * Additional commits: https://codeberg.org/forgejo/forgejo/compare/v1.20.6-1...496b0acd22
-
- -- crystal <crystal@noreply.codeberg.org>  Wed, 10 Jan 2024 00:02:00 +0000
-
-forgejo (1.20.5.1-1) unstable; urgency=medium
-
-  * Forgejo version 1.20.5-1
-  * app.ini: Replaced example with blank default
-  * Change data directory mode to 750
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-5-1
-
- -- crystal <crystal@noreply.codeberg.org>  Sun, 26 Nov 2023 01:57:00 +0000
-
-forgejo (1.20.5.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.20.5-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-5-0
-
- -- crystal <crystal@noreply.codeberg.org>  Sat, 7 Oct 2023 23:03:00 +0000
-
-forgejo (1.20.4.1-1) unstable; urgency=medium
-
-  * Forgejo version 1.20.4-1
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-4-1
-
- -- crystal <crystal@noreply.codeberg.org>  Wed, 20 Sep 2023 20:03:00 +0000
-
-forgejo (1.20.4.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.20.4-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-4-0
-
- -- crystal <crystal@noreply.codeberg.org>  Sat, 9 Sep 2023 11:00:00 +0000
-
-forgejo (1.20.3.0-1) unstable; urgency=medium
-
-  * Forgejo version 1.20.3-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-3-0
-
- -- crystal <crystal@noreply.codeberg.org>  Tue, 21 Aug 2023 15:27:00 +0000
-
-forgejo (1.20.2.0-2) unstable; urgency=medium
-
-  * Forgejo version 1.20.2-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-2-0
-
- -- crystal <crystal@noreply.codeberg.org>  Sun, 30 Jul 2023 15:30:00 +0000
-
-forgejo (1.20.1.0-2) unstable; urgency=medium
-
-  * Forgejo version 1.20.1-0
-  * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-1-0
-
- -- crystal <crystal@noreply.codeberg.org>  Tue, 25 Jul 2023 08:00:00 +0000
-
 forgejo (1.19.4.0-1) unstable; urgency=medium
 
   * Forgejo version 1.19.4-0

deb/debian/control

@@ -8,7 +8,7 @@ Package: forgejo
 Architecture: amd64
 Priority: optional
 Provides: gitea
-Depends: adduser (>= 3.11),git
+Depends: adduser (>= 3.11)
 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 +17,7 @@ Package: forgejo-sqlite
 Architecture: amd64
 Priority: optional
 Provides: forgejo,gitea
-Depends: adduser (>= 3.11),git
+Depends: adduser (>= 3.11)
 Conflicts: forgejo,forgejo-bin
 Description: Forgejo: Beyond Coding. We Forge. (SQLite)
  Forgejo with bindata and SQLite support - Use this package to get started immediately

deb/debian/forgejo.preinst

@@ -29,6 +29,6 @@ case "$1" in
              $FORGEJO_USER
   if ! dpkg-statoverride --list $FORGEJO_HOME >/dev/null ; then
     chown -R $FORGEJO_USER:$FORGEJO_GROUP $FORGEJO_HOME
-    chmod u=rwx,g=rx,o= $FORGEJO_HOME
+    chmod u=rwx,g=rwx,o= $FORGEJO_HOME
   fi
 esac

forgejo

@@ -1 +1 @@
-Subproject commit 73c190af4c13a09453b878e255c31cd70ddd5ab9
+Subproject commit daf0fa06af10cdc91dc4ba93c0766a280c008c3c

repo-deb/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-cp code-forgejo-org-forgejo-contrib.asc stub/
+cp code-forgejo-org-crystal.asc stub/
-cp code-forgejo-org-forgejo-contrib.asc main/
+cp code-forgejo-org-crystal.asc main/
 cp forgejo-deb.list stub/
 cp forgejo-deb.list main/
 cd stub
@@ -10,4 +10,7 @@ cd ..
 cd main
 dpkg-buildpackage -b
 cd ..
+cd experimental
+dpkg-buildpackage -b
+cd ..
 exit 0

repo-deb/code-forgejo-org-crystal.asc

@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGSVbecBCADSrwa9TMkPb5LMC7Ts/6wDRUDkmO63uJLJ8eSTz2iurmN/gUuE
+GG65Pgkv+zqNENFga+nAJz4sTeAEMbUxxgPFKKdM5pdkYoSZ2iqsnH8/3nGeeNne
+7sE5i2ZbUKJwRFwBW8Oi8aecBcR7bxYPi2sdMcz93zYebrc23xhUEUA1tNdXU0SR
++H7Wepq6MafWKYWpAWeAbRSGzB/jkc7rEur9CwvgEfuvKIpn6dvjbPVZdC8gUzJb
++nBAqCWvzU28+ByWioRpmMmPwCVjxDlwhZNZfNkme3i9PuIHDqWCID+kfPMqDxLe
+BX4lJhrIBkzNXEyrCBxI6f00fstMblx05QqhABEBAAHNM0Zvcmdlam86IEJleW9u
+ZCBjb2RpbmcuIFdlIGZvcmdlLiAoRGViaWFuIFJlZ2lzdHJ5KcLAYgQTAQgAFgUC
+ZJVt5wkQFppua1ziWCACGwMCGQEAAC3YCAAIfjy3U2+OX1QWB2hYnuF1eRtrJhwu
+oioH0gVoyOfwqMG3bJhN0iKZ2kDAUwMWe9QdneRIvZPYtVQqn52QB0tIljeZDwHA
+c+62pNu4227pR51gF34CDguMMZuzLFMFmaASfP/7Ygb+Q1upSCKq++K9ZKgitlcz
+zGp4Sp6RBG8ELh3wNrSNYs1ZYWw6NdA+ayy+P7P5Hy9JSVjL1qlttE8Zn1WQFm5L
+LuGnhu0fTrtSKZa7+yIv6q4eNyKauJlcllANr51lgujcLjob8T7TLPrIpjLODGB3
+dRqF6Mdn3UXNXv2twVqLVKuzaRSwT9H/J4oaFpuvOv2EJpECawNOe8PIzsBNBGSV
+becBCACpoCecK1oT++JiFuRloEgpGQW2QiD6IWk0kpqCSt5qzPAGu1CCyRoQUTfX
+jS/ClwIM0YRdowgeuLcNRk+0jFjFGKPa5zRXXxuq1ZBMUKLQ7I0VUGKN4UqLQ6OU
+kIrSknL75IiwnOsMoKXU9QPr/fzQlh0lLNfjL3FOmh16/QoWcTnSWZjhGvwkFFx4
+4T3mpeD2Y+Lsx8Psi4ZORv+ODxsb0piRUEIe2nq2Uav9Qj9YLd+rzenG0qcTN46A
+oqwumuUBRxGn2WWkTf1ZnTWS36WDw1bWEzgwvvlz7NRwEXg16SBwbR/9bnWx359h
+AaWBy3A1c3hBaQLPXzCpQnasbMAdABEBAAHCwF8EGAEIABMFAmSVbecJEBaabmtc
+4lggAhsMAACWcwgALSpBKXv4SX2VAVCo1GKUO8FT/dpgAP6u788fdorQBlS7TUTz
+wqEB/wVuSjOER04DdOOXH5up9ikZhaTa03uL4UXeHsPL9qaUQ+Y1Avn8FHpR3647
+O+f0+iEiROtNfLuNWNYISHwJB644m2xsMG9bohLU2h78yS0ToZlt5hvoTpTNKO1g
+9lUM7u2i5DBDBQnUBfp6nKou9gMH2CHgB4W4Gc36b7sgU7AQt095yfbfdIjaHl7a
+wikaAx/cMShI0lJudDs60qUfxfKfEQBcexJMiEiZbF6dPzQ6OQm9lcmkuhNAX6MP
+zuNnZsilht/BDYeKWqmwdfXFxcdZ/BX/oitwkA==
+=hNbH
+-----END PGP PUBLIC KEY BLOCK-----

repo-deb/code-forgejo-org-forgejo-contrib.asc

@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsBNBGS/s68BCACv7kWy8EHmOHzQ0hjZ9far6U16/9egyJ1amCXHJj755glbuFD0
-aXeCjnp8p6Dghjz2a4fNkmeJhpgQGW7aN7SUFXa7TDW6/aoeNuvHl9ll7ZjUrovV
-jihPkPFrSAfbDIsXnM75psaxWnRgVhNtQ/qdFoTtYgsKmExKmBN0wgs6MV3355i5
-/WwgADDJHFFaCcx+0+kG8ilXr3DiVeKmdXG8bp89MZ1s2CR1uiHbR7AQkJ+DFiRV
-xW4IOAsSy06xTHAYHf0G3N+BkBJEJfo76cS3auaz5PiggRKcXdPo77MietCJjtLW
-Y9Tln5ZJrHydXRAePjD89vpukhG/LHCc2cl7ABEBAAHNM0Zvcmdlam86IEJleW9u
-ZCBjb2RpbmcuIFdlIGZvcmdlLiAoRGViaWFuIFJlZ2lzdHJ5KcLAYgQTAQgAFgUC
-ZL+zrwkQfJzSyuVhN4wCGwMCGQEAAEcLCAABj/QKDy/RbyUpkjbIxFXOfmIVf/vF
-RalgSONoT7e6MH48WwvJP7ggThMZwUjYYKSwFHJ86bcrxOX9fX81ZzZDzKzoplFy
-HvnNgqBuZt30P4C60Q+VzeiRagMMJSqzZR3ZBPa7KxMr0QJBM9aA6fUKxYiPxwfr
-D/R4alUb1J4Wyt3i/ioXurLP4L3cM5yb5PIXkQOd6NA9rH2WdkC971pen8c3tQF9
-da1W/XVOQ7OvBs556cm/1o0xurMcKiDnfUBiVWQLEZWTSsBclaFBEACaHEnj/vVs
-uhRKoxqmKTuq6yXvpNeOrUkpPb3rVCqNZ4UutT5nHdi1zc9gTJ3F7dSTzsBNBGS/
-s68BCADmfx9KS69mCFtX7wPD4NLYebjwz/fWfc+X1l7k/VsfMGNGQGM2qkQ44pKa
-EG0oG8mXtjUhFYEdQfXeSFZFg1ROIruBGNYAcAj3LUqXpQy3Ojjiq2L+OYH92uCF
-hiGI1TNA5LY9zITfmmNWVDsi8u/Ip4+OBn8MBZ+iYE373PEr0jkddH6ShORWehyO
-77/4ogpkei6b6kU3AEV+PTZgz1xrbiqDz5FSgY+niJMb+7MoYIC8doew1Ak5UdMv
-1b7vVmfre/frSCb8EO68eli0tosuaXV/7jwsLyXItxuqxjm8l3F3exOa8GiueruR
-l/12DYXs7vN2KYw6L0N/dexorYWRABEBAAHCwF8EGAEIABMFAmS/s68JEHyc0srl
-YTeMAhsMAABkNwgABNfuGkB/mqcMgLL/FLe+7PlBdngRUdCYD+ZbkgCk7npWP7sI
-t7bxQhYJtQwpbRW6pdhqM6M19sUT53SaZH1VbY4dOxV4ju5PGPdmJxxWNP6ZyvQF
-locHN8m9ROHdYixBTbhuNAUseUfz3EoQrvXpi6WUAqUfDgpRbV5AGqi0AfQaRkX3
-wyQowc3SYk8U1NtnEKLOFu7o+eR4Qh317BrBc9Ve0+GWTMbm9XaqCiVcz9iGtXQe
-cQsoKZHldRieBdNo0yg0hBu/PUl9rRNdG9LDFQ/uRksJ0rzJDG65U6LF1QfueuQo
-p2Ly49Vic8/G6sacJE02M1oEB1YvrqRKbe3Y5Q==
-=rsSQ
------END PGP PUBLIC KEY BLOCK-----

repo-deb/experimental/code-forgejo-org-crystal-experimental.asc

@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGSibUwBCADQRY7uvgMrUHYCHhtj9bPfe8aHFtfJlSH7dKyndJ1vBEVMwLmr
+MFicY+42waSR8wQezfrX6f4u7YIDtmNf87VXXL2SW2B5vlDsBgjBBNaYBZ5I21gL
+HOR53XPc9rjUMTbGuec7FOZ25FOYEuaG9BmaUtkCPHyrijLyy6eXweH3OWardwQs
+lkT4gfPD/uGzg8BhQWlKdgrhkGETtq9sRqYiJ+r61UwL/ei+R7kTrOo3Ru2JOr0y
+HD9zzJlNk9cGUOfHWy+5DoaByoBN4biLRtPJk/NnNxJ0NDQprKMHJh0NYmfn6Gwr
+naaAoxNYp+WYsrT0QXVNtrgXdfiYe4LH2tE7ABEBAAHNM0Zvcmdlam86IEJleW9u
+ZCBjb2RpbmcuIFdlIGZvcmdlLiAoRGViaWFuIFJlZ2lzdHJ5KcLAYgQTAQgAFgUC
+ZKJtTAkQcY4SiaXuU7ACGwMCGQEAANj1CAAhKjY+RMYXzqoaBZ5OOehGXHcar2Lf
+8PWIzX7TEXPPeCH2C6QOIeeHDQQ6BDhqIukUqzadgz0CdeaO2newf2HvEBF3beLD
+B20hpqX9rPc+rSR/XqRJ/uFMZwK0fBRVqnzM9Oj5FhQfAbVEFYjHhwiPYrS21X2l
+aDVw+PwSC6GTqgDKotQzwo66Iy5zxbu4dzibur8VOrVOQzKO0G5X4ihDjHi54ajJ
+G7mXKuwjP/VaWYY3UalxRDqTZiZNPaVw4uPjOvcJbHA/Ox+pXIjYHlREzOBqnN71
+91hPt4MXGxWUMy4QBVLx3XWxWAJzMPJBP+mTM5FZI4woOn+IH/0gk7LqzsBNBGSi
+bUwBCADdSRfcBpSPqtzHIUkpbPoldvMWvaXJPWDRw6cgzMUuUq9a/bs5ZCkxs1WA
+YjWj51klUCzKyttdg9EKOnHGM0tJ/96OTOMQ1LByftq57QWlKnShWRHXqnx4WMJd
+Ad383e4kcY8WzmCT7ggZ5AeXYR0MtE0nxMlMGVELR6CLEKrkq749Gwcu29hfO9JG
+sAelD0QV3Bto7dQuGo+ywNqH+0CZYBL6qh3gETm1p3BAGVfABTuScw30VvjreHGK
+2dIHjWKUUXTtmzkC2pdjMhNOphAYSmF/PxzMVgpM0EpKOR48qtc3LKvHMWjJbd3k
+OkRMtptX7CJasT7g6r8y4wg40ijZABEBAAHCwF8EGAEIABMFAmSibUwJEHGOEoml
+7lOwAhsMAAB3hAgArpnm2fgZOaA15yp1Mh5GiAjrzXGScmgJuAKRXq9N4pDVRRJx
+ABlytuxlCLmeOKb+q9Lpj4G4y+rpK/EozGdTi04Vfg2ij8kMEJsqGKE0YrYYfsX7
+sAfpr9Cz3Hn7Q/7Z7QnhkVBhJvw+2XCWCXA63THC1oSEzBYuveWUX/BOlykXYXQT
+A0pTJDe/iSaBrY15klehr7TFTtU3GNuP71a8gsvEXH0I9lbvuteQszI5S2eUlKIz
+y+qMwiEeNdX6MTKQa6QFPxs20iz32vYzxvnahOhFKYdpgGsEhGH0df/ZdKNYNuv9
+ZdoaZeBwshMaOQlGR/POYyEr99Q9eJZY5QH8kg==
+=ixNu
+-----END PGP PUBLIC KEY BLOCK-----

repo-deb/experimental/debian/changelog

@@ -0,0 +1,5 @@
+forgejo-deb-experimental (0-0) unstable; urgency=medium
+
+  * Initial version
+
+ -- crystal <crystal@noreply.codeberg.org>  Mon, 3 Jul 2023 06:30:00 +0000

repo-deb/experimental/debian/compat

@@ -0,0 +1 @@
+10

repo-deb/experimental/debian/control

@@ -0,0 +1,18 @@
+Source: forgejo-deb-experimental
+Section: admin
+Priority: optional
+Maintainer: crystal <crystal@noreply.codeberg.org>
+Build-Depends: debhelper (>= 10)
+
+Package: forgejo-deb-experimental
+Architecture: all
+Priority: optional
+Depends: crystal-experimental-repokey, apt-transport-https
+Description: APT Repository for experimental forgejo-deb builds
+ Add the "crystal-experimental" repository to your system for release candidates and test builds
+
+Package: crystal-experimental-repokey
+Architecture: all
+Priority: optional
+Description: APT Repository signing key for crystal-experimental
+ Debian Package Registry key for https://code.forgejo.org/crystal-experimental

repo-deb/experimental/debian/crystal-experimental-repokey.install

@@ -0,0 +1 @@
+code-forgejo-org-crystal-experimental.asc /etc/apt/trusted.gpg.d

repo-deb/experimental/debian/forgejo-deb-experimental.install

@@ -0,0 +1 @@
+forgejo-deb-experimental.list /etc/apt/sources.list.d

repo-deb/experimental/debian/rules

@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with=systemd

repo-deb/experimental/forgejo-deb-experimental.list

@@ -0,0 +1 @@
+deb https://code.forgejo.org/api/packages/crystal-experimental/debian bullseye forgejo

repo-deb/forgejo-deb.list

@@ -1 +1 @@
-deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo
+deb https://code.forgejo.org/api/packages/crystal/debian bullseye forgejo

repo-deb/main/debian/changelog

@@ -1,9 +1,3 @@
-forgejo-deb-repo (2-1) unstable; urgency=medium
-
-  * Move to https://code.forgejo.org/forgejo-contrib/-/packages
-
- -- crystal <crystal@noreply.codeberg.org>  Tue, 25 Jul 2023 12:00:00 +0000
-
 forgejo-deb-repo (1-1) unstable; urgency=medium
 
   * Split key and repo package

repo-deb/main/debian/control

@@ -16,4 +16,4 @@ Architecture: all
 Priority: optional
 Replaces: forgejo-deb-repo
 Description: APT Repository signing key for forgejo-deb
- Debian Package Registry key for https://code.forgejo.org/forgejo-contrib
+ Debian Package Registry key for https://code.forgejo.org/crystal

repo-deb/main/debian/forgejo-deb-repokey.install

@@ -1 +1 @@
-code-forgejo-org-forgejo-contrib.asc /etc/apt/trusted.gpg.d
+code-forgejo-org-crystal.asc /etc/apt/trusted.gpg.d

repo-deb/stub/debian/changelog

@@ -2,4 +2,4 @@ forgejo-deb-repo (0-0) unstable; urgency=medium
 
   * forgejo-deb APT repository stub
 
- -- crystal <crystal@noreply.codeberg.org>  Tue, 25 Jul 2023 10:50:00 +0000
+ -- crystal <crystal@noreply.codeberg.org>  Sun, 2 Jul 2023 20:30:00 +0000

repo-deb/stub/debian/forgejo-deb-repo.install

@@ -1,2 +1,2 @@
-code-forgejo-org-forgejo-contrib.asc /etc/apt/trusted.gpg.d
+code-forgejo-org-crystal.asc /etc/apt/trusted.gpg.d
 forgejo-deb.list /etc/apt/sources.list.d