Files
termux-packages/packages/algernon/fix-hardcoded-paths.patch
termux-pacman-bot f4d2ba75ed upgpkg(main/algernon): update to 1.14.0
Signed-off-by: 2096779623 <admin@utermux.dev>
2022-08-20 11:07:15 +00:00

84 lines
3.9 KiB
Diff

diff -uNr algernon-1.14.0/engine/config.go algernon-1.14.0.mod/engine/config.go
--- algernon-1.14.0/engine/config.go 2022-08-05 01:16:22.000000000 +0800
+++ algernon-1.14.0.mod/engine/config.go 2022-08-19 13:24:12.361899812 +0800
@@ -158,7 +158,7 @@
// New creates a new server configuration based using the default values
func New(versionString, description string) (*Config, error) {
- tmpdir := env.Str("TMPDIR", "/tmp")
+ tmpdir := env.Str("TMPDIR", "@TERMUX_PREFIX@/tmp")
ac := &Config{
curlSupport: true,
@@ -191,7 +191,7 @@
defaultLuaDataFilename: "data.lua",
// List of configuration filenames to check
- serverConfigurationFilenames: []string{"/etc/algernon/serverconf.lua", "/etc/algernon/server.lua"},
+ serverConfigurationFilenames: []string{"@TERMUX_PREFIX@/etc/algernon/serverconf.lua", "@TERMUX_PREFIX@/etc/algernon/server.lua"},
// Compression speed over compactness
cacheCompressionSpeed: true,
diff -uNr algernon-1.14.0/engine/flags.go algernon-1.14.0.mod/engine/flags.go
--- algernon-1.14.0/engine/flags.go 2022-08-05 01:16:22.000000000 +0800
+++ algernon-1.14.0.mod/engine/flags.go 2022-08-19 13:26:06.321899768 +0800
@@ -210,9 +210,9 @@
switch {
case ac.productionMode:
// Use system directories
- ac.serverDirOrFilename = "/srv/algernon"
- ac.serverCert = "/etc/algernon/cert.pem"
- ac.serverKey = "/etc/algernon/key.pem"
+ ac.serverDirOrFilename = "@TERMUX_PREFIX@/var/lib/algernon"
+ ac.serverCert = "@TERMUX_PREFIX@/etc/algernon/cert.pem"
+ ac.serverKey = "@TERMUX_PREFIX@/etc/algernon/key.pem"
ac.cacheMode = cachemode.Production
ac.serverMode = true
case ac.devMode:
diff -uNr algernon-1.14.0/engine/mime.go algernon-1.14.0.mod/engine/mime.go
--- algernon-1.14.0/engine/mime.go 2022-08-05 01:16:22.000000000 +0800
+++ algernon-1.14.0.mod/engine/mime.go 2022-08-19 13:28:10.601899721 +0800
@@ -6,5 +6,5 @@
func (ac *Config) initializeMime() {
// Read in the mimetype information from the system. Set UTF-8 when setting Content-Type.
- ac.mimereader = mime.New("/etc/mime.types", true)
+ ac.mimereader = mime.New("@TERMUX_PREFIX@/etc/mime.types", true)
}
diff -uNr algernon-1.14.0/engine/serve.go algernon-1.14.0.mod/engine/serve.go
--- algernon-1.14.0/engine/serve.go 2022-08-05 01:16:22.000000000 +0800
+++ algernon-1.14.0.mod/engine/serve.go 2022-08-19 13:37:48.681899500 +0800
@@ -169,7 +169,7 @@
// If $XDG_CONFIG_DIR is not set, use $HOME.
// If $HOME is not set, use $TMPDIR.
// If $TMPDIR is not set, use /tmp.
- certStorageDir := env.Str("XDG_CONFIG_DIR", env.Str("HOME", env.Str("TMPDIR", "/tmp")))
+ certStorageDir := env.Str("XDG_CONFIG_DIR", env.Str("HOME", env.Str("TMPDIR", "@TERMUX_PREFIX@/tmp")))
defaultEmail := env.Str("LOGNAME", "root") + "@localhost"
if len(ac.certMagicDomains) > 0 {
diff -uNr algernon-1.14.0/vendor/github.com/go-sql-driver/mysql/dsn.go algernon-1.14.0.mod/vendor/github.com/go-sql-driver/mysql/dsn.go
--- algernon-1.14.0/vendor/github.com/go-sql-driver/mysql/dsn.go 2022-08-05 01:16:22.000000000 +0800
+++ algernon-1.14.0.mod/vendor/github.com/go-sql-driver/mysql/dsn.go 2022-08-19 13:29:33.841899689 +0800
@@ -111,7 +111,7 @@
case "tcp":
cfg.Addr = "127.0.0.1:3306"
case "unix":
- cfg.Addr = "/tmp/mysql.sock"
+ cfg.Addr = "@TERMUX_PREFIX@/tmp/mysql.sock"
default:
return errors.New("default addr for network '" + cfg.Net + "' unknown")
}
diff -uNr algernon-1.14.0/vendor/github.com/xyproto/gopher-lua/utils.go algernon-1.14.0.mod/vendor/github.com/xyproto/gopher-lua/utils.go
--- algernon-1.14.0/vendor/github.com/xyproto/gopher-lua/utils.go 2022-08-05 01:16:22.000000000 +0800
+++ algernon-1.14.0.mod/vendor/github.com/xyproto/gopher-lua/utils.go 2022-08-19 13:30:29.971899668 +0800
@@ -156,7 +156,7 @@
}
func popenArgs(arg string) (string, []string) {
- cmd := "/bin/sh"
+ cmd := "@TERMUX_PREFIX@/bin/sh"
args := []string{"-c"}
if LuaOS == "windows" {
cmd = "C:\\Windows\\system32\\cmd.exe"