Make patches apply cleanly, add notice for changed 1.12 data loading

4 files changed, 14 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdc67796e070..ccf42426c2de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = Painless self-hosted Git service. Community managed fork of Gogs.
-	pkgver = v1.12.0_dev_36_gf2e6c4538
+	pkgver = v1.12.0_dev_37_gf69f5a9f1
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -35,7 +35,7 @@ pkgbase = gitea-git
 	sha512sums = 89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103
 	sha512sums = 0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352
 	sha512sums = 77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1
-	sha512sums = 6de71c0f3895764a227673fc8d96b6fd588150d9fe70652a4e62e9247ae654e2bd63de5d4b609e82941f6aa2d836f229ebb376c009ebc03296ae80526b9e5758
+	sha512sums = 968824b6c1ce4f3d9f82a208de476efc405e535a8f3a67cbba037e96228a261b0239ce8d73cd21f778528f81c180bf982e6f33031c85fc8e73712bd0f97274d5
 
 pkgname = gitea-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b55e368fa49f..17ec092e95d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 _pkgname='gitea'
 pkgname=gitea-git
-pkgver=v1.12.0_dev_36_gf2e6c4538
+pkgver=v1.12.0_dev_37_gf69f5a9f1
 pkgrel=1
 pkgdesc='Painless self-hosted Git service. Community managed fork of Gogs.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -39,7 +39,7 @@ sha512sums=('SKIP'
             '89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103'
             '0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352'
             '77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1'
-            '6de71c0f3895764a227673fc8d96b6fd588150d9fe70652a4e62e9247ae654e2bd63de5d4b609e82941f6aa2d836f229ebb376c009ebc03296ae80526b9e5758')
+            '968824b6c1ce4f3d9f82a208de476efc405e535a8f3a67cbba037e96228a261b0239ce8d73cd21f778528f81c180bf982e6f33031c85fc8e73712bd0f97274d5')
 install=gitea.install
 
 pkgver() {
diff --git a/gitea-arch-defaults.patch b/gitea-arch-defaults.patch
index 1379325acb54..112b1ecc9bbf 100644
--- a/gitea-arch-defaults.patch
+++ b/gitea-arch-defaults.patch
@@ -16,7 +16,7 @@
  SCRIPT_TYPE = bash
  ; Default ANSI charset
  ANSI_CHARSET =
-@@ -312,7 +312,7 @@
+@@ -341,7 +341,7 @@
  ; For iterate buffer, default is 50
  ITERATE_BUFFER_SIZE = 50
  ; Show the database generated SQL
@@ -25,7 +25,7 @@
  ; Maximum number of DB Connect retries
  DB_RETRIES = 10
  ; Backoff time per DB retry (time.Duration)
-@@ -615,10 +615,10 @@
+@@ -696,10 +696,10 @@
  DEFAULT_UI_LOCATION =
  
  [log]
@@ -38,7 +38,7 @@
  ; Buffer length of the channel, keep it as it is if you don't know what it is.
  BUFFER_LEN = 10000
  REDIRECT_MACARON_LOG = false
-@@ -643,7 +643,7 @@
+@@ -724,7 +724,7 @@
  
  ; For "console" mode only
  [log.console]
diff --git a/gitea.install b/gitea.install
index 08c702f5b133..6df0e4e41fe6 100644
--- a/gitea.install
+++ b/gitea.install
@@ -1,30 +1,12 @@
 post_upgrade() {
-    if [ $(vercmp $2 1.6.1-1) -lt 0 ] ; then
+    if [ $(vercmp $2 1.12) -eq -1 ] ; then
         cat << EOF
-
-gitea now uses its own user/group instead of the git ones.
-Ownership of /var/lib/gitea tree has been changed accordingly.
-You need to update your /etc/gitea/app.ini file to change the
-RUN_USER variable at the top.
-
-Next step is fixing the SSH configuration. If you have:
-    AllowUsers git
-in /etc/ssh/sshd_config, you need to change that to gitea.
-Then restart sshd.service.
-You will need to tell all your users that they have to change
-git@ to gitea@ in their repos clones using git remote set-url.
-
-If you use a PostgreSQL DB upon Unix socket, you need to fix
-your [database] configuration and switch USER to gitea.
-Then, you need to change it also in /var/lib/data/pg_hba.conf.
-Finally, as postgres user, run psql and inside it type:
-    ALTER USER git RENAME TO gitea;
-    \q
-Then restart postgresql.service.
-
-In all cases, you then need to reload systemd units and
-restart gitea.service.
-
+It seems that in 1.12, gitea has changed the data load behavior.
+If you’re using the default paths (/var/lib/gitea),
+no changes are necessary.
+If you’re using custom paths, you might have to set then with
+-w for working directory and/or -C for gitea/custom directory.
+Refer to gitea --help if you’re experiencing any issues.
 EOF
     fi
 }