diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-07-28 00:38:51 -0500 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-07-28 00:38:51 -0500 |
commit | 3c5694e2fc30a846f438b05579ba827725e04c11 (patch) | |
tree | 30f5e5c14fee09d77dc2c54e1c87bcbe40002232 /pcr/gophernicus/xinetd-respect-custom-server-root.patch | |
parent | e4e3858e06dcaf7bf037aa0840a2db43133f5c52 (diff) | |
parent | 2187e3ffefad9f0133cede7f90cdda88c955b44d (diff) | |
download | abslibre-wip-linux-libre-64.tar.gz abslibre-wip-linux-libre-64.tar.bz2 abslibre-wip-linux-libre-64.zip |
Merge branch 'wip-linux-libre-64' of git://git.parabola.nu/abslibre/abslibre into wip-linux-libre-64wip-linux-libre-64
Diffstat (limited to 'pcr/gophernicus/xinetd-respect-custom-server-root.patch')
-rw-r--r-- | pcr/gophernicus/xinetd-respect-custom-server-root.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/pcr/gophernicus/xinetd-respect-custom-server-root.patch b/pcr/gophernicus/xinetd-respect-custom-server-root.patch new file mode 100644 index 000000000..b0106639b --- /dev/null +++ b/pcr/gophernicus/xinetd-respect-custom-server-root.patch @@ -0,0 +1,34 @@ +diff --git a/configure b/configure +index 067affe..c78a9f6 100755 +--- a/configure ++++ b/configure +@@ -340,12 +340,14 @@ sed -i -e "s:@XINETD_CONF@:${XINETD_CONF}:" Makefile + + printf "done\\n" + +-# Also sub in $HOSTNAME to the various init systems (whether or not we really +-# use them, its just easier) ++# Also sub in $GOPHERROOT and $HOSTNAME to the various init systems ++# (whether or not we really use them, its just easier) + for f in gophernicus.env haiku_snippet org.gophernicus.server.plist \ + gophernicus.xinetd; do + printf "creating init/${f}... " +- sed -e "s:@HOSTNAME@:${HOSTNAME}:" "init/${f}.in" > "init/${f}" ++ cp init/${f}{.in,} ++ sed -i -e "s:@GOPHERROOT@:${GOPHERROOT}:" init/${f} ++ sed -i -e "s:@HOSTNAME@:${HOSTNAME}:" init/${f} + printf "done\\n" + done + +diff --git a/init/gophernicus.xinetd.in b/init/gophernicus.xinetd.in +index 4f2c921..a052375 100644 +--- a/init/gophernicus.xinetd.in ++++ b/init/gophernicus.xinetd.in +@@ -6,6 +6,6 @@ service gopher + wait = no + user = nobody + server = @BINARY@ +- server_args = -r/var/gopher -h@HOSTNAME@ ++ server_args = -r@GOPHERROOT@ -h@HOSTNAME@ + disable = no + } |