| 1 |
commit: b6a93415bdb253c924b8c9d31c3cf15b8dbeaf9d |
| 2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 13 22:47:06 2022 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 13 22:51:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a93415 |
| 7 |
|
| 8 |
app-office/libreoffice: add user/group for headless server |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/24938 |
| 11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/files/soffice.confd | 5 +++++ |
| 14 |
app-office/libreoffice/files/soffice.initd | 14 ++++++++++++++ |
| 15 |
...ice-7.3.3.2-r2.ebuild => libreoffice-7.3.3.2-r3.ebuild} | 5 +++++ |
| 16 |
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 5 +++++ |
| 17 |
app-office/libreoffice/libreoffice-9999.ebuild | 5 +++++ |
| 18 |
5 files changed, 34 insertions(+) |
| 19 |
|
| 20 |
diff --git a/app-office/libreoffice/files/soffice.confd b/app-office/libreoffice/files/soffice.confd |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..df1a26969158 |
| 23 |
--- /dev/null |
| 24 |
+++ b/app-office/libreoffice/files/soffice.confd |
| 25 |
@@ -0,0 +1,5 @@ |
| 26 |
+# Copyright 1999-2022 Gentoo Authors |
| 27 |
+# Distributed under the terms of the GNU General Public License v2 |
| 28 |
+ |
| 29 |
+# Default options for the soffice daemon |
| 30 |
+libreoffice_opts="--accept=\"socket,host=localhost,port=8100,tcpNoDelay=1;urp;\"" |
| 31 |
|
| 32 |
diff --git a/app-office/libreoffice/files/soffice.initd b/app-office/libreoffice/files/soffice.initd |
| 33 |
new file mode 100644 |
| 34 |
index 000000000000..ecd650145735 |
| 35 |
--- /dev/null |
| 36 |
+++ b/app-office/libreoffice/files/soffice.initd |
| 37 |
@@ -0,0 +1,14 @@ |
| 38 |
+#!/sbin/openrc-run |
| 39 |
+# Copyright 1999-2022 Gentoo Authors |
| 40 |
+# Distributed under the terms of the GNU General Public License v2 |
| 41 |
+ |
| 42 |
+description="LibreOffice headless daemon for generating documents" |
| 43 |
+name="LibreOffice headless daemon" |
| 44 |
+pidfile="/run/soffice.pid" |
| 45 |
+soffice_args="${libreoffice_opts}" |
| 46 |
+ |
| 47 |
+command="/usr/bin/soffice" |
| 48 |
+command_args="--nodefault --nofirststartwizard --nolockcheck --nologo --norestore --headless ${soffice_args}" |
| 49 |
+command_background="true" |
| 50 |
+command_group="libreoffice" |
| 51 |
+command_user="libreoffice" |
| 52 |
|
| 53 |
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild |
| 54 |
similarity index 99% |
| 55 |
rename from app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild |
| 56 |
rename to app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild |
| 57 |
index 22d36d585f5f..e03a37669e72 100644 |
| 58 |
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild |
| 59 |
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild |
| 60 |
@@ -250,6 +250,8 @@ DEPEND="${COMMON_DEPEND} |
| 61 |
) |
| 62 |
" |
| 63 |
RDEPEND="${COMMON_DEPEND} |
| 64 |
+ acct-group/libreoffice |
| 65 |
+ acct-user/libreoffice |
| 66 |
!app-office/libreoffice-bin |
| 67 |
!app-office/libreoffice-bin-debug |
| 68 |
media-fonts/liberation-fonts |
| 69 |
@@ -654,6 +656,9 @@ EOF |
| 70 |
dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} |
| 71 |
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) |
| 72 |
done |
| 73 |
+ |
| 74 |
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice |
| 75 |
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice |
| 76 |
} |
| 77 |
|
| 78 |
pkg_postinst() { |
| 79 |
|
| 80 |
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 81 |
index 68cf55317be3..67730f9d7995 100644 |
| 82 |
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 83 |
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 84 |
@@ -250,6 +250,8 @@ DEPEND="${COMMON_DEPEND} |
| 85 |
) |
| 86 |
" |
| 87 |
RDEPEND="${COMMON_DEPEND} |
| 88 |
+ acct-group/libreoffice |
| 89 |
+ acct-user/libreoffice |
| 90 |
!app-office/libreoffice-bin |
| 91 |
!app-office/libreoffice-bin-debug |
| 92 |
media-fonts/liberation-fonts |
| 93 |
@@ -649,6 +651,9 @@ EOF |
| 94 |
dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} |
| 95 |
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) |
| 96 |
done |
| 97 |
+ |
| 98 |
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice |
| 99 |
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice |
| 100 |
} |
| 101 |
|
| 102 |
pkg_postinst() { |
| 103 |
|
| 104 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 105 |
index b155f2f2f525..7fe70e573e21 100644 |
| 106 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 107 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 108 |
@@ -250,6 +250,8 @@ DEPEND="${COMMON_DEPEND} |
| 109 |
) |
| 110 |
" |
| 111 |
RDEPEND="${COMMON_DEPEND} |
| 112 |
+ acct-group/libreoffice |
| 113 |
+ acct-user/libreoffice |
| 114 |
!app-office/libreoffice-bin |
| 115 |
!app-office/libreoffice-bin-debug |
| 116 |
media-fonts/liberation-fonts |
| 117 |
@@ -649,6 +651,9 @@ EOF |
| 118 |
dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} |
| 119 |
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) |
| 120 |
done |
| 121 |
+ |
| 122 |
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice |
| 123 |
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice |
| 124 |
} |
| 125 |
|
| 126 |
pkg_postinst() { |
Archives