Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitea: update to 1.14.1 #30282

Merged
merged 1 commit into from May 20, 2021
Merged

gitea: update to 1.14.1 #30282

merged 1 commit into from May 20, 2021

Conversation

folliehiyuki
Copy link
Contributor

General

Have the results of the proposed changes been tested?

  • I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
  • I generally don't use the affected packages but briefly tested this PR

Don't know why the patch fails to apply, but the package builds.

@ericonr
Copy link
Member

ericonr commented Apr 18, 2021

Don't know why the patch fails to apply, but the package builds.

Locally, you mean?

@folliehiyuki
Copy link
Contributor Author

Sorry that was misleading. What I meant was I could build and install the package without the patch. The patch fails locally too.
But I can apply it within gitea repo with no problem (it is generated from git anyways)

@folliehiyuki
Copy link
Contributor Author

Don't know why that hunk fails

❯ patch -Np0 < config.patch 
patching file custom/conf/app.example.ini
Hunk #2 FAILED at 20.
Hunk #3 succeeded at 87 (offset -2 lines).
Hunk #4 succeeded at 282 (offset -6 lines).
Hunk #5 succeeded at 303 (offset -6 lines).
Hunk #6 succeeded at 368 (offset -6 lines).
Hunk #7 succeeded at 385 (offset -6 lines).
Hunk #8 succeeded at 415 (offset -6 lines).
Hunk #9 succeeded at 432 (offset -6 lines).
Hunk #10 succeeded at 458 (offset -6 lines).
Hunk #11 succeeded at 806 (offset -32 lines).
Hunk #12 succeeded at 871 (offset -32 lines).
Hunk #13 succeeded at 1181 (offset -32 lines).

Here is the rej:

@@ -20,7 +20,7 @@
 
 [repository]
 ; Root path for storing all repository data. It must be an absolute path. By default, it is stored in a sub-directory of `APP_DATA_PATH`.
-ROOT =
+ROOT = /var/lib/gitea/repositories
 ; The script type this server supports. Usually this is `bash`, but some users report that only `sh` is available.
 SCRIPT_TYPE = bash
 ; DETECTED_CHARSETS_ORDER tie-break order for detected charsets.

@folliehiyuki
Copy link
Contributor Author

The patch now magically works even though it is still the same :) so ready for reviewing.

@Gottox Gottox merged commit 78b484d into void-linux:master May 20, 2021
@folliehiyuki folliehiyuki deleted the gitea-update branch May 20, 2021 17:16
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants