update docs

change building
This commit is contained in:
arcan1s 2014-08-20 21:16:31 +04:00
parent e9090ab4a9
commit 0a16364a7a
12 changed files with 110 additions and 91 deletions

View File

@ -12,8 +12,7 @@ url="http://arcanis.name/projects/netctl-gui"
license=('GPL3')
makedepends=('automoc4' 'cmake' 'kdelibs' 'qt5-base' 'qt5-tools')
source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
install="${pkgbase}.install"
md5sums=('65b6b2ff184de7e55a70645dc4e2f43a')
md5sums=('958d4639b8768407a70935cbc008f3a3')
prepare() {
@ -60,7 +59,7 @@ package_kdeplasma-applets-netctl-gui() {
'netctl-gui: graphical front-end'
'netctl-gui-qt4: graphical front-end'
'sudo: sudo support')
install="${pkgbase}.install"
install="kdeplasma-applets-netctl-gui.install"
cd "${srcdir}/build-plasmoid"
make DESTDIR="${pkgdir}" install
@ -87,6 +86,7 @@ package_netctlgui-helper() {
provides=('netctlgui-helper-qt4')
conflicts=('netctlgui-helper-qt4')
backup=('etc/netctlgui-helper.conf')
install="netctlgui-helper.install"
cd "${srcdir}/build-qt5/helper"
make DESTDIR="${pkgdir}" install
@ -100,7 +100,7 @@ package_netctl-gui() {
'netctlgui-helper: DBus helper daemon')
provides=('netctl-gui-qt4')
conflicts=('netctl-gui-qt4')
install="${pkgbase}.install"
install="netctl-gui.install"
cd "${srcdir}/build-qt5/gui"
make DESTDIR="${pkgdir}" install
@ -115,6 +115,7 @@ package_libnetctlgui-qt4() {
'wpa_supplicant: wifi support')
provides=('libnetctlgui')
conflicts=('libnetctlgui')
install=""
cd "${srcdir}/build-qt4/netctlgui"
make DESTDIR="${pkgdir}" install
@ -127,6 +128,7 @@ package_netctlgui-helper-qt4() {
provides=('netctlgui-helper')
conflicts=('netctlgui-helper')
backup=('etc/netctlgui-helper.conf')
install="netctlgui-helper.install"
cd "${srcdir}/build-qt4/helper"
make DESTDIR="${pkgdir}" install
@ -140,7 +142,7 @@ package_netctl-gui-qt4() {
'netctlgui-helper-qt4: DBus helper daemon')
provides=('netctl-gui')
conflicts=('netctl-gui')
install="${pkgbase}.install"
install="netctl-gui.install"
cd "${srcdir}/build-qt4/gui"
make DESTDIR="${pkgdir}" install

View File

@ -0,0 +1,14 @@
post_install() {
cat << EOF
Update plasmoids...
EOF
kbuildsycoca4 > /dev/null 2>&1
}
post_upgrade() {
post_install "$1"
}
post_remove() {
post_install "$1"
}

11
arch/libnetctlgui.install Normal file
View File

@ -0,0 +1,11 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
}
post_upgrade() {
post_install "$1"
}
post_remove() {
post_install "$1"
}

View File

@ -4,9 +4,9 @@ post_install() {
}
post_upgrade() {
post_install
post_install "$1"
}
post_remove() {
post_install
post_install "$1"
}

View File

@ -0,0 +1,7 @@
post_install() {
setcap cap_setuid=ep usr/bin/netctlgui-helper 2>/dev/null || chmod +s usr/bin/ping
}
post_upgrade() {
post_install "$1"
}

View File

@ -17,5 +17,5 @@ tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
rm -rf "${ARCHIVE}"
# update md5sum
MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD
sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD
sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" arch/PKGBUILD
sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" arch/PKGBUILD

View File

@ -49,7 +49,7 @@
<h2><a href="#helper" class="anchor" name="helper"></a>Helper</h2>
<p>First of all the helper <b>does not interact</b> with netctl directly, it uses the library to do it. So all library security notes are applicable here. To start the helper and to create DBus services user must be in <code>network</code> group by default (or must be root). But you may change it by editing <code>$DBUS_SYSTEMCONF_PATH/org.netctlgui.helper.conf</code> policy file (<code>/etc/dbus-1/system.d/org.netctlgui.helper.conf</code> by default). Please refer to DBus documentation to do it.</p>
<p>There are two binaries <code>netctgui-helper</code> and <code>netctlgui-helper-suid</code>. They are the same, but the second one has SUID bit, so it can be running by normal user without any password. Please note that <b>it is dangerous</b> and recommended way is to use systemd daemon. In this case you may not install <code>netctlgui-helper-suid</code> binary.</p>
<p>By default <code>netctgui-helper</code> binary has capabilities to set UID to the children processes (<code>CAP_SETUID</code>). If you do not want to get these capabilities you may use <code>-DUSE_CAPABILITIES</code> cmake flag. Please refer to <code>man 7 capabilities</code> for more details.</p>
<p>There are two configuration files <code>$HOME/.config/netctl-gui.conf</code> and <code>/etc/netctl-gui.conf</code>. The first one is a user configuration and the second one is a system-wide. Please note that by default user configuration has higher priority than system-wide, but running with <code>--system</code> flag user configuration will not be reading. The helper and GUI configurations are the same (although some keys aren't needed).</p>

View File

@ -211,8 +211,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>397</width>
<height>322</height>
<width>464</width>
<height>336</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
@ -296,16 +296,6 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_helperPathInfo">
<property name="text">
<string>There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="layout_helperPath">
<item>

View File

@ -53,5 +53,5 @@ target_link_libraries (${SUBPROJECT} ${PROJECT_LIBRARY} ${QT_NEEDED_LIBS})
# install properties
install (TARGETS ${SUBPROJECT} DESTINATION bin)
if (USE_CAPABILITIES)
install (CODE "exec_program (setcap ARGS \\\"cap_setuid+iep cap_setgid+iep\\\" \"$ENV{DESTDIR}/bin/${SUBPROJECT}\")")
install (CODE "exec_program (setcap ARGS \"cap_setuid=ep\" \"$ENV{DESTDIR}/bin/${SUBPROJECT}\")")
endif ()

View File

@ -1873,7 +1873,7 @@
</message>
<message>
<source>There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.</source>
<translation>There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.</translation>
<translation type="vanished">There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.</translation>
</message>
</context>
<context>

View File

@ -1845,267 +1845,262 @@
<context>
<name>SettingsWindow</name>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="789"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="782"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="794"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="787"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="807"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="800"/>
<source>Language</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="809"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="802"/>
<source>Select a language</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="798"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="791"/>
<source>netctl</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="833"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="825"/>
<source>netctl path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="835"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="827"/>
<source>Path to netctl</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="823"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="832"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="837"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="842"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="851"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="856"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="861"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="866"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="887"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="892"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="815"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="824"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="829"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="834"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="843"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="848"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="853"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="858"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="879"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="884"/>
<source>Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="847"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="839"/>
<source>Profile path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="849"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="841"/>
<source>Path to profile directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="800"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="793"/>
<source>sudo</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="852"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="844"/>
<source>sudo path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="854"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="846"/>
<source>Path to sudo</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="802"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="795"/>
<source>wpa_supplicant</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="796"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="789"/>
<source>Helper</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="811"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="804"/>
<source>Enable system tray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="812"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="805"/>
<source>Minimize to tray instead of closing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="813"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="806"/>
<source>Start minimized to tray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="814"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="807"/>
<source>It is recommended to use systemd integration. See `man 1 netctlgui-helper` for more details.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="815"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="808"/>
<source>Helper status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="818"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="811"/>
<source>Use helper</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="819"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="812"/>
<source>Force use sudo in helper</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="821"/>
<source>There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="822"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="814"/>
<source>Helper command</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="824"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="816"/>
<source>Helper service</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="826"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="818"/>
<source>Name of netctlgui-helper service</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="828"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="820"/>
<source>systemctl path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="830"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="822"/>
<source>Path to systemctl</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="838"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="830"/>
<source>netctl-auto path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="840"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="832"/>
<source>Path to netctl-auto</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="843"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="835"/>
<source>netctl-auto service</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="845"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="837"/>
<source>Name of netctl-auto systemd service</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="857"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="849"/>
<source>wpa_supplicant path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="859"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="851"/>
<source>Path to wpa_supplicant</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="862"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="854"/>
<source>wpa_cli path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="864"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="856"/>
<source>Path to wpa_cli</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="867"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="859"/>
<source>PID file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="869"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="861"/>
<source>wpa_supplicant PID file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="871"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="863"/>
<source>wpa_supplicant drivers</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="873"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="865"/>
<source>wpa_supplicant drivers comma separated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="875"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="867"/>
<source>ctrl_interface directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="877"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="869"/>
<source>Path to control directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="879"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="871"/>
<source>ctrl_interface group</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="881"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="873"/>
<source>Group of control directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="804"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="797"/>
<source>Other</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="820"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="813"/>
<source>Close helper after exit (doesn&apos;t work while systemd service is active)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="883"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="875"/>
<source>Path to interface list</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="885"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="877"/>
<source>Path to directory which contains network devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="888"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="880"/>
<source>Path to rfkill device list</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="890"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="882"/>
<source>Path to directory which contains rfkill devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="893"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="895"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="885"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="887"/>
<source>Prefered wireless interface</source>
<translation type="unfinished"></translation>
</message>
@ -2188,7 +2183,7 @@
</message>
<message>
<location filename="../../gui/src/settingswindow.cpp" line="430"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="817"/>
<location filename="../../../build/gui/src/ui_settingswindow.h" line="810"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1872,7 +1872,7 @@
</message>
<message>
<source>There are too binaries. `netctlgui-helper` should be running as root (for example from systemd), otherwise interface `/ctrl` will not be available. `netctlgui-helper-suid` may be running as normal user, but you should keep it in mind that it has SUID bit.</source>
<translation>Существует два бинарных файла. `netctlgui-helper` должен быть запущен от root&apos;а (например, через systemd), в противном случае интерфейс `/ctrl` не будет доступен. `netctlgui-helper-suid` может быть запущен от обычного пользователя, однако Вы должны иметь в виду, что он имеет SUID бит.</translation>
<translation type="vanished">Существует два бинарных файла. `netctlgui-helper` должен быть запущен от root&apos;а (например, через systemd), в противном случае интерфейс `/ctrl` не будет доступен. `netctlgui-helper-suid` может быть запущен от обычного пользователя, однако Вы должны иметь в виду, что он имеет SUID бит.</translation>
</message>
</context>
<context>