From ac903c87522ce47acbbce82f015720554b5f5dab Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sun, 6 May 2018 00:19:12 +0100
Subject: Revert "security.d: Update install paths for swaybar and swaybg"
This reverts commit b4249166f309a46c15dd3a5734594aee961b723b.
---
meson.build | 1 -
security.d/00-defaults.in | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index e40dc33c..bd20ca99 100644
--- a/meson.build
+++ b/meson.build
@@ -121,7 +121,6 @@ config = configuration_data()
config.set('sysconfdir', join_paths(prefix, sysconfdir))
config.set('datadir', join_paths(prefix, datadir))
config.set('prefix', prefix)
-config.set('sway_libexecdir', sway_libexecdir)
configure_file(
configuration: config,
diff --git a/security.d/00-defaults.in b/security.d/00-defaults.in
index b5ae1149..e4626477 100644
--- a/security.d/00-defaults.in
+++ b/security.d/00-defaults.in
@@ -11,9 +11,9 @@
# Configures enabled compositor features for specific programs
permit * fullscreen keyboard mouse
permit @prefix@/bin/swaylock lock
+permit @prefix@/bin/swaybg background
permit @prefix@/bin/swaygrab screenshot
-permit @sway_libexecdir@/swaybg background
-permit @sway_libexecdir@/swaybar panel
+permit @prefix@/bin/swaybar panel
# Configures enabled IPC features for specific programs
ipc @prefix@/bin/swaymsg {
@@ -24,7 +24,7 @@ ipc @prefix@/bin/swaymsg {
}
}
-ipc @sway_libexecdir@/swaybar {
+ipc @prefix@/bin/swaybar {
bar-config enabled
outputs enabled
workspaces enabled
--
cgit v1.2.3
From cf602687c6c77b3292370d0639ab5080b7fd611b Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sun, 6 May 2018 00:19:29 +0100
Subject: Revert "command/exec_always: Use wlr_log for logging errors in the
child process"
This reverts commit 177c67e6b89404d9d477b82c00c1353cd4696096.
---
sway/commands/exec_always.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index f631d7d8..1d95dc96 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -11,7 +11,6 @@
#include "log.h"
#include "stringop.h"
-
struct cmd_results *cmd_exec_always(int argc, char **argv) {
struct cmd_results *error = NULL;
if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL);
@@ -63,8 +62,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
size_t n = confstr(_CS_PATH, NULL, 0);
path = malloc(n + extra_size);
if (!path) {
- wlr_log(L_ERROR, "exec_always: Unable to allocate PATH");
- exit(EXIT_FAILURE);
+ return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
}
confstr(_CS_PATH, path, n);
@@ -72,8 +70,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
size_t n = strlen(path) + 1;
char *tmp = malloc(n + extra_size);
if (!tmp) {
- wlr_log(L_ERROR, "exec_always: Unable to allocate PATH");
- exit(EXIT_FAILURE);
+ return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
}
strncpy(tmp, path, n);
@@ -84,8 +81,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
strcat(path, extra_path);
if (setenv("PATH", path, 1) == -1) {
free(path);
- wlr_log(L_ERROR, "exec_always: Unable to set PATH");
- exit(EXIT_FAILURE);
+ return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH");
}
free(path);
--
cgit v1.2.3
From 0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65 Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sun, 6 May 2018 00:19:43 +0100
Subject: Revert "Meson: Replace option `instlibdir` with `libexecdir`"
This reverts commit 830c4ef74c00dbe448da46cdbc576178abc5728e.
---
meson.build | 9 ++++-----
meson_options.txt | 1 +
sway/commands/exec_always.c | 4 ++--
swaybar/meson.build | 2 +-
swaybg/meson.build | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meson.build b/meson.build
index bd20ca99..57dbea02 100644
--- a/meson.build
+++ b/meson.build
@@ -19,13 +19,12 @@ is_freebsd = host_machine.system().startswith('freebsd')
datadir = get_option('datadir')
sysconfdir = get_option('sysconfdir')
prefix = get_option('prefix')
-libexecdir = get_option('libexecdir')
+instlibdir = get_option('instlibdir')
-if libexecdir == ''
- libexecdir = 'lib'
+if instlibdir == ''
+ instlibdir = join_paths(prefix, 'lib/sway')
endif
-sway_libexecdir = join_paths(prefix, libexecdir, 'sway')
-add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c')
+add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c')
jsonc = dependency('json-c', version: '>=0.13')
diff --git a/meson_options.txt b/meson_options.txt
index 541ccf13..6c3dcd58 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)')
option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.')
option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 1d95dc96..8483cf26 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if ((*child = fork()) == 0) {
// Acquire the current PATH
char *path = getenv("PATH");
- const char *extra_path = ":" SWAY_LIBEXECDIR;
- const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 1;
+ const char *extra_path = ":" INSTLIBDIR;
+ const size_t extra_size = sizeof(INSTLIBDIR) + 1;
if (!path) {
size_t n = confstr(_CS_PATH, NULL, 0);
diff --git a/swaybar/meson.build b/swaybar/meson.build
index 41c81a88..ad7ed5fe 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -25,5 +25,5 @@ executable(
],
link_with: [lib_sway_common, lib_sway_client],
install: true,
- install_dir: sway_libexecdir
+ install_dir: instlibdir
)
diff --git a/swaybg/meson.build b/swaybg/meson.build
index 716178d2..e994da8f 100644
--- a/swaybg/meson.build
+++ b/swaybg/meson.build
@@ -15,5 +15,5 @@ executable(
],
link_with: [lib_sway_common, lib_sway_client],
install: true,
- install_dir: sway_libexecdir
+ install_dir: instlibdir
)
--
cgit v1.2.3
From 2c0c3dc7cc3599a79fa464e1c093dead86f3cb65 Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sun, 6 May 2018 00:19:52 +0100
Subject: Revert "Make the LIBDIR path configurable"
This reverts commit 1670b46bf6e56d37e69ab0fa32c6799e83397020.
---
meson.build | 7 -------
meson_options.txt | 1 -
sway/commands/exec_always.c | 4 ++--
swaybar/meson.build | 2 +-
swaybg/meson.build | 2 +-
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/meson.build b/meson.build
index 57dbea02..bf266e5f 100644
--- a/meson.build
+++ b/meson.build
@@ -19,13 +19,6 @@ is_freebsd = host_machine.system().startswith('freebsd')
datadir = get_option('datadir')
sysconfdir = get_option('sysconfdir')
prefix = get_option('prefix')
-instlibdir = get_option('instlibdir')
-
-if instlibdir == ''
- instlibdir = join_paths(prefix, 'lib/sway')
-endif
-add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c')
-
jsonc = dependency('json-c', version: '>=0.13')
pcre = dependency('libpcre')
diff --git a/meson_options.txt b/meson_options.txt
index 6c3dcd58..541ccf13 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)')
option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.')
option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 8483cf26..16bbcb61 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if ((*child = fork()) == 0) {
// Acquire the current PATH
char *path = getenv("PATH");
- const char *extra_path = ":" INSTLIBDIR;
- const size_t extra_size = sizeof(INSTLIBDIR) + 1;
+ const char *extra_path = ":/usr/lib/sway";
+ const size_t extra_size = sizeof("/usr/lib/sway") + 1;
if (!path) {
size_t n = confstr(_CS_PATH, NULL, 0);
diff --git a/swaybar/meson.build b/swaybar/meson.build
index ad7ed5fe..f115ffa2 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -25,5 +25,5 @@ executable(
],
link_with: [lib_sway_common, lib_sway_client],
install: true,
- install_dir: instlibdir
+ install_dir: 'usr/lib/sway'
)
diff --git a/swaybg/meson.build b/swaybg/meson.build
index e994da8f..c1bb7d18 100644
--- a/swaybg/meson.build
+++ b/swaybg/meson.build
@@ -15,5 +15,5 @@ executable(
],
link_with: [lib_sway_common, lib_sway_client],
install: true,
- install_dir: instlibdir
+ install_dir: 'usr/lib/sway'
)
--
cgit v1.2.3
From b592351eeff55a0a95f9b65d403fcfda9cf02957 Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sun, 6 May 2018 00:20:49 +0100
Subject: Revert "exec_always: Search for executables in /usr/lib/sway"
This reverts commit 7709340727fe2834f87b43aeeaef878694d5acd6.
---
sway/commands/exec_always.c | 34 ----------------------------------
1 file changed, 34 deletions(-)
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 16bbcb61..af4e4965 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -51,41 +51,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if ((pid = fork()) == 0) {
// Fork child process again
setsid();
-
if ((*child = fork()) == 0) {
- // Acquire the current PATH
- char *path = getenv("PATH");
- const char *extra_path = ":/usr/lib/sway";
- const size_t extra_size = sizeof("/usr/lib/sway") + 1;
-
- if (!path) {
- size_t n = confstr(_CS_PATH, NULL, 0);
- path = malloc(n + extra_size);
- if (!path) {
- return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
- }
- confstr(_CS_PATH, path, n);
-
- } else {
- size_t n = strlen(path) + 1;
- char *tmp = malloc(n + extra_size);
- if (!tmp) {
- return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
- }
-
- strncpy(tmp, path, n);
- path = tmp;
- }
-
- // Append /usr/lib/sway to PATH
- strcat(path, extra_path);
- if (setenv("PATH", path, 1) == -1) {
- free(path);
- return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH");
- }
- free(path);
-
- // Execute the command
execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
// Not reached
}
--
cgit v1.2.3
From 3b6629af3c268fd0dd6f42feaf3429bb25cfcb6f Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sun, 6 May 2018 00:20:57 +0100
Subject: Revert "Install swaybar and swaybg under /usr/lib/sway"
This reverts commit f2c209c299889ad965ac995049704b1c46176c6d.
---
swaybar/meson.build | 3 +--
swaybg/meson.build | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/swaybar/meson.build b/swaybar/meson.build
index f115ffa2..d65edb11 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -24,6 +24,5 @@ executable(
wlroots,
],
link_with: [lib_sway_common, lib_sway_client],
- install: true,
- install_dir: 'usr/lib/sway'
+ install: true
)
diff --git a/swaybg/meson.build b/swaybg/meson.build
index c1bb7d18..8704de6d 100644
--- a/swaybg/meson.build
+++ b/swaybg/meson.build
@@ -14,6 +14,5 @@ executable(
wlroots,
],
link_with: [lib_sway_common, lib_sway_client],
- install: true,
- install_dir: 'usr/lib/sway'
+ install: true
)
--
cgit v1.2.3