diff options
Diffstat (limited to 'source/l')
9 files changed, 186 insertions, 581 deletions
diff --git a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild index ea604833..ccea00b2 100755 --- a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild +++ b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild @@ -27,10 +27,11 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ConsoleKit2 -VERSION=${VERSION:-1.0.0} -BUILD=${BUILD:-4} +VERSION=${VERSION:-1.2.1} +BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} +# Maximum storage quota for XDG_RUNTIME_DIR: +XDG_RUNTIME_QUOTA=${XDG_RUNTIME_QUOTA:-size=100M} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -54,6 +55,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS="" @@ -88,10 +91,8 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 -zcat $CWD/patches/0001-Revert-Minor-code-refactoring.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0003-Filter-out-the-kdm-user.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch.gz | patch -p1 --verbose || exit 1 +# Apply a reasonable maximum size for the user's XDG_RUNTIME_DIR: +sed -i "s/mode=0700,uid=%d/mode=0700,$XDG_RUNTIME_QUOTA,uid=%d/g" src/ck-sysdeps-linux.c chown -R root:root . find . \ @@ -100,8 +101,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -autoreconf -vif - # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then PAM_OPTIONS="--enable-pam-module=yes" diff --git a/source/l/ConsoleKit2/patches/0001-Revert-Minor-code-refactoring.patch b/source/l/ConsoleKit2/patches/0001-Revert-Minor-code-refactoring.patch deleted file mode 100644 index b6cadb3f..00000000 --- a/source/l/ConsoleKit2/patches/0001-Revert-Minor-code-refactoring.patch +++ /dev/null @@ -1,477 +0,0 @@ -From 1e3f7f9862dceec3fa11ee4205c343ed64ce5b63 Mon Sep 17 00:00:00 2001 -From: Eric Koegel <eric.koegel@gmail.com> -Date: Sat, 22 Aug 2015 10:51:20 +0300 -Subject: [PATCH 1/5] Revert "Minor code refactoring" - -This reverts commit bee63889f4a0b8f57807a61d8396346cec8cd5b1. - -There are some cases where ConsoleKit2 would crash after successfully -suspending so revert this commit. ---- - src/ck-manager.c | 160 ++++++++++++++++++++++++++++++++++---------------- - src/ck-session.c | 56 +++++++++++++++++- - src/ck-sysdeps-unix.c | 59 ------------------- - src/ck-sysdeps.h | 6 -- - tools/Makefile.am | 3 - - 5 files changed, 163 insertions(+), 121 deletions(-) - -diff --git a/src/ck-manager.c b/src/ck-manager.c -index db5f906..66da8b2 100644 ---- a/src/ck-manager.c -+++ b/src/ck-manager.c -@@ -960,11 +960,13 @@ logind_ready_cb (PolkitAuthority *authority, - g_object_unref (ret); - } - -+/* We use this to avoid breaking API compability with ConsoleKit1 for -+ * CanStop and CanRestart, but this method emulates how logind -+ * presents it's API */ - static void --get_polkit_permissions_for_callback (CkManager *manager, -- const char *action, -- GDBusMethodInvocation *context, -- GAsyncReadyCallback callback) -+get_polkit_logind_permissions (CkManager *manager, -+ const char *action, -+ GDBusMethodInvocation *context) - { - const char *sender; - PolkitSubject *subject; -@@ -980,37 +982,96 @@ get_polkit_permissions_for_callback (CkManager *manager, - NULL, - 0, - NULL, -- callback, -+ (GAsyncReadyCallback) logind_ready_cb, - context); - g_object_unref (subject); - } - --/* We use this to avoid breaking API compability with ConsoleKit1 for -- * CanStop and CanRestart, but this method emulates how logind -- * presents it's API */ --static void --get_polkit_logind_permissions (CkManager *manager, -- const char *action, -- GDBusMethodInvocation *context) --{ -- get_polkit_permissions_for_callback (manager, -- action, -- context, -- (GAsyncReadyCallback) logind_ready_cb); --} -- - static void - get_polkit_permissions (CkManager *manager, - const char *action, - GDBusMethodInvocation *context) - { -- get_polkit_permissions_for_callback (manager, -- action, -- context, -- (GAsyncReadyCallback) ready_cb); -+ const char *sender; -+ PolkitSubject *subject; -+ -+ g_debug ("get permissions for action %s", action); -+ -+ sender = g_dbus_method_invocation_get_sender (context); -+ subject = polkit_system_bus_name_new (sender); -+ -+ polkit_authority_check_authorization (manager->priv->pol_ctx, -+ subject, -+ action, -+ NULL, -+ 0, -+ NULL, -+ (GAsyncReadyCallback) ready_cb, -+ context); -+ g_object_unref (subject); - } - #endif - -+/* adapted from PolicyKit */ -+static gboolean -+get_caller_info (CkManager *manager, -+ const char *sender, -+ uid_t *calling_uid, -+ pid_t *calling_pid) -+{ -+ gboolean res = FALSE; -+ GVariant *value = NULL; -+ GError *error = NULL; -+ -+ if (sender == NULL) { -+ g_debug ("sender == NULL"); -+ goto out; -+ } -+ -+ if (manager->priv->bus_proxy == NULL) { -+ g_debug ("manager->priv->bus_proxy == NULL"); -+ goto out; -+ } -+ -+ value = g_dbus_proxy_call_sync (manager->priv->bus_proxy, "GetConnectionUnixUser", -+ g_variant_new ("(s)", sender), -+ G_DBUS_CALL_FLAGS_NONE, -+ 2000, -+ NULL, -+ &error); -+ -+ if (value == NULL) { -+ g_warning ("GetConnectionUnixUser() failed: %s", error->message); -+ g_error_free (error); -+ goto out; -+ } -+ g_variant_get (value, "(u)", calling_uid); -+ g_variant_unref (value); -+ -+ value = g_dbus_proxy_call_sync (manager->priv->bus_proxy, "GetConnectionUnixProcessID", -+ g_variant_new ("(s)", sender), -+ G_DBUS_CALL_FLAGS_NONE, -+ 2000, -+ NULL, -+ &error); -+ -+ if (value == NULL) { -+ g_warning ("GetConnectionUnixProcessID() failed: %s", error->message); -+ g_error_free (error); -+ goto out; -+ } -+ g_variant_get (value, "(u)", calling_pid); -+ g_variant_unref (value); -+ -+ res = TRUE; -+ -+ g_debug ("uid = %d", *calling_uid); -+ g_debug ("pid = %d", *calling_pid); -+ -+out: -+ return res; -+} -+ - static char * - get_user_name (uid_t uid) - { -@@ -1118,7 +1179,7 @@ check_rbac_permissions (CkManager *manager, - - username = NULL; - sender = g_dbus_method_invocation_get_sender (context); -- res = get_caller_info (manager->priv->bus_proxy, -+ res = get_caller_info (manager, - sender, - &uid, - &pid); -@@ -2055,7 +2116,7 @@ dbus_inhibit (ConsoleKitManager *ckmanager, - priv = CK_MANAGER_GET_PRIVATE (CK_MANAGER (ckmanager)); - - sender = g_dbus_method_invocation_get_sender (context); -- res = get_caller_info (priv->bus_proxy, -+ res = get_caller_info (CK_MANAGER (ckmanager), - sender, - &uid, - &pid); -@@ -2698,7 +2759,7 @@ create_session_for_sender (CkManager *manager, - - g_debug ("CkManager: create session for sender: %s", sender); - -- res = get_caller_info (manager->priv->bus_proxy, -+ res = get_caller_info (manager, - sender, - &uid, - &pid); -@@ -2767,7 +2828,7 @@ dbus_get_session_for_cookie (ConsoleKitManager *ckmanager, - - sender = g_dbus_method_invocation_get_sender (context); - -- res = get_caller_info (manager->priv->bus_proxy, -+ res = get_caller_info (manager, - sender, - &calling_uid, - &calling_pid); -@@ -2852,7 +2913,7 @@ dbus_get_session_for_unix_process (ConsoleKitManager *ckmanager, - TRACE (); - g_debug ("pid: %u", pid); - -- res = get_caller_info (manager->priv->bus_proxy, -+ res = get_caller_info (manager, - sender, - &calling_uid, - &calling_pid); -@@ -2900,7 +2961,7 @@ dbus_get_current_session (ConsoleKitManager *ckmanager, - - g_debug ("CkManager: get current session"); - -- res = get_caller_info (manager->priv->bus_proxy, -+ res = get_caller_info (manager, - sender, - &calling_uid, - &calling_pid); -@@ -3100,7 +3161,7 @@ dbus_close_session (ConsoleKitManager *ckmanager, - manager = CK_MANAGER (ckmanager); - - sender = g_dbus_method_invocation_get_sender (context); -- res = get_caller_info (manager->priv->bus_proxy, -+ res = get_caller_info (manager, - sender, - &calling_uid, - &calling_pid); -@@ -3443,17 +3504,6 @@ create_seats (CkManager *manager) - } - - static void --cancel_timeout_and_call_system_action (CkManagerPrivate *priv) --{ -- /* The inhibit lock for this action was removed. -- * Stop the timeout and call the system action now. -- */ -- g_source_remove (priv->system_action_idle_id); -- priv->system_action_idle_id = 0; -- system_action_idle_cb (priv->system_action_data); --} -- --static void - on_inhibit_manager_changed_event (CkInhibitManager *manager, gint inhibit_mode, gint event, gboolean enabled, gpointer user_data) - { - CkManagerPrivate *priv; -@@ -3472,6 +3522,17 @@ on_inhibit_manager_changed_event (CkInhibitManager *manager, gint inhibit_mode, - return; - } - -+ /* this system action must be for a sleep or shutdown operation */ -+ if (priv->system_action_data->signal != PREPARE_FOR_SLEEP && -+ priv->system_action_data->signal != PREPARE_FOR_SHUTDOWN) { -+ return; -+ } -+ -+ /* the inhibit change must be for sleep or shutdown */ -+ if (event != CK_INHIBIT_EVENT_SUSPEND && event != CK_INHIBIT_EVENT_SHUTDOWN) { -+ return; -+ } -+ - /* must be a delay inhibitor */ - if (inhibit_mode != CK_INHIBIT_MODE_DELAY) { - return; -@@ -3482,17 +3543,12 @@ on_inhibit_manager_changed_event (CkInhibitManager *manager, gint inhibit_mode, - return; - } - -- /* Did we stop inhibiting sleep? */ -- if (priv->system_action_data->signal == PREPARE_FOR_SLEEP && -- event == CK_INHIBIT_EVENT_SUSPEND) { -- cancel_timeout_and_call_system_action (priv); -- } -- -- /* Did we stop inhibiting shutdown? */ -- if (priv->system_action_data->signal == PREPARE_FOR_SHUTDOWN && -- event == CK_INHIBIT_EVENT_SHUTDOWN) { -- cancel_timeout_and_call_system_action (priv); -- } -+ /* The inhibit lock for this action was removed. -+ * Stop the timeout and call the system action now. -+ */ -+ g_source_remove (priv->system_action_idle_id); -+ priv->system_action_idle_id = 0; -+ system_action_idle_cb (priv->system_action_data); - } - - static void -diff --git a/src/ck-session.c b/src/ck-session.c -index 478dce2..ca0f8ca 100644 ---- a/src/ck-session.c -+++ b/src/ck-session.c -@@ -248,6 +248,60 @@ dbus_unlock (ConsoleKitSession *cksession, - return TRUE; - } - -+/* adapted from PolicyKit */ -+static gboolean -+get_caller_info (CkSession *session, -+ const char *sender, -+ uid_t *calling_uid, -+ pid_t *calling_pid) -+{ -+ gboolean res = FALSE; -+ GVariant *value = NULL; -+ GError *error = NULL; -+ -+ if (sender == NULL) { -+ goto out; -+ } -+ -+ value = g_dbus_proxy_call_sync (session->priv->bus_proxy, "GetConnectionUnixUser", -+ g_variant_new ("(s)", sender), -+ G_DBUS_CALL_FLAGS_NONE, -+ 2000, -+ NULL, -+ &error); -+ -+ if (value == NULL) { -+ g_warning ("GetConnectionUnixUser() failed: %s", error->message); -+ g_error_free (error); -+ goto out; -+ } -+ g_variant_get (value, "(u)", calling_uid); -+ g_variant_unref (value); -+ -+ value = g_dbus_proxy_call_sync (session->priv->bus_proxy, "GetConnectionUnixProcessID", -+ g_variant_new ("(s)", sender), -+ G_DBUS_CALL_FLAGS_NONE, -+ 2000, -+ NULL, -+ &error); -+ -+ if (value == NULL) { -+ g_warning ("GetConnectionUnixProcessID() failed: %s", error->message); -+ g_error_free (error); -+ goto out; -+ } -+ g_variant_get (value, "(u)", calling_pid); -+ g_variant_unref (value); -+ -+ res = TRUE; -+ -+ g_debug ("uid = %d", *calling_uid); -+ g_debug ("pid = %d", *calling_pid); -+ -+out: -+ return res; -+} -+ - static gboolean - session_set_idle_hint_internal (CkSession *session, - gboolean idle_hint) -@@ -326,7 +380,7 @@ dbus_set_idle_hint (ConsoleKitSession *cksession, - - sender = g_dbus_method_invocation_get_sender (context); - -- res = get_caller_info (session->priv->bus_proxy, -+ res = get_caller_info (session, - sender, - &calling_uid, - &calling_pid); -diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c -index 87333d1..0f751b9 100644 ---- a/src/ck-sysdeps-unix.c -+++ b/src/ck-sysdeps-unix.c -@@ -132,65 +132,6 @@ ck_get_socket_peer_credentials (int socket_fd, - return ret; - } - --/* adapted from PolicyKit */ --gboolean --get_caller_info (GDBusProxy *bus_proxy, -- const char *sender, -- uid_t *calling_uid, -- pid_t *calling_pid) --{ -- gboolean res = FALSE; -- GVariant *value = NULL; -- GError *error = NULL; -- -- if (sender == NULL) { -- g_debug ("sender == NULL"); -- goto out; -- } -- -- if (bus_proxy == NULL) { -- g_debug ("bus_proxy == NULL"); -- goto out; -- } -- -- value = g_dbus_proxy_call_sync (bus_proxy, "GetConnectionUnixUser", -- g_variant_new ("(s)", sender), -- G_DBUS_CALL_FLAGS_NONE, -- 2000, -- NULL, -- &error); -- -- if (value == NULL) { -- g_warning ("GetConnectionUnixUser() failed: %s", error->message); -- g_error_free (error); -- goto out; -- } -- g_variant_get (value, "(u)", calling_uid); -- g_variant_unref (value); -- -- value = g_dbus_proxy_call_sync (bus_proxy, "GetConnectionUnixProcessID", -- g_variant_new ("(s)", sender), -- G_DBUS_CALL_FLAGS_NONE, -- 2000, -- NULL, -- &error); -- -- if (value == NULL) { -- g_warning ("GetConnectionUnixProcessID() failed: %s", error->message); -- g_error_free (error); -- goto out; -- } -- g_variant_get (value, "(u)", calling_pid); -- g_variant_unref (value); -- -- res = TRUE; -- -- g_debug ("uid = %d", *calling_uid); -- g_debug ("pid = %d", *calling_pid); -- --out: -- return res; --} - - /* - * getfd.c -diff --git a/src/ck-sysdeps.h b/src/ck-sysdeps.h -index 66df581..bc32631 100644 ---- a/src/ck-sysdeps.h -+++ b/src/ck-sysdeps.h -@@ -24,7 +24,6 @@ - #include "config.h" - - #include <glib.h> --#include <gio/gio.h> - - G_BEGIN_DECLS - -@@ -55,11 +54,6 @@ gboolean ck_get_socket_peer_credentials (int socket_fd, - uid_t *uid, - GError **error); - --gboolean get_caller_info (GDBusProxy *bus_proxy, -- const char *sender, -- uid_t *calling_uid, -- pid_t *calling_pid); -- - int ck_get_a_console_fd (void); - - gboolean ck_fd_is_a_console (int fd); -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 69dd1eb..81f4d1f 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -131,7 +131,6 @@ ck_collect_session_info_SOURCES = \ - $(NULL) - - ck_collect_session_info_LDADD = \ -- $(CONSOLE_KIT_LIBS) \ - $(TOOLS_LIBS) \ - $(top_builddir)/src/libck.la \ - $(NULL) -@@ -141,7 +140,6 @@ ck_get_x11_server_pid_SOURCES = \ - $(NULL) - - ck_get_x11_server_pid_LDADD = \ -- $(CONSOLE_KIT_LIBS) \ - $(TOOLS_LIBS) \ - $(XLIB_LIBS) \ - $(top_builddir)/src/libck.la \ -@@ -152,7 +150,6 @@ ck_get_x11_display_device_SOURCES = \ - $(NULL) - - ck_get_x11_display_device_LDADD = \ -- $(CONSOLE_KIT_LIBS) \ - $(TOOLS_LIBS) \ - $(top_builddir)/src/libck.la \ - $(NULL) --- -2.5.1 - diff --git a/source/l/ConsoleKit2/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch b/source/l/ConsoleKit2/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch deleted file mode 100644 index 2c46bbd8..00000000 --- a/source/l/ConsoleKit2/patches/0002-Fix-some-libdir-scripts-stuff-missed-in-4d87a25ea0af.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b045a4245199b12dfc04f03b22bc1e9b1f80aae9 Mon Sep 17 00:00:00 2001 -From: Robby Workman <rworkman@slackware.com> -Date: Sun, 23 Aug 2015 16:53:52 -0500 -Subject: [PATCH 2/5] Fix some libdir/scripts stuff missed in 4d87a25ea0af - ---- - src/ck-seat.c | 2 +- - tools/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ck-seat.c b/src/ck-seat.c -index ead6425..47e6933 100644 ---- a/src/ck-seat.c -+++ b/src/ck-seat.c -@@ -1443,7 +1443,7 @@ ck_seat_run_programs (CkSeat *seat, - g_assert(n <= G_N_ELEMENTS(extra_env)); - - ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env); -- ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env); -+ ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env); - - for (n = 0; extra_env[n] != NULL; n++) { - g_free (extra_env[n]); -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 69dd1eb..d61b845 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -171,9 +171,9 @@ udev_acl_CFLAGS = \ - $(NULL) - - install-exec-hook: -- mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d -+ mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d - mkdir -p $(DESTDIR)$(UDEVDIR) -- ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck -+ ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck - ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(UDEVDIR)/udev-acl - endif - --- -2.5.1 - diff --git a/source/l/ConsoleKit2/patches/0003-Filter-out-the-kdm-user.patch b/source/l/ConsoleKit2/patches/0003-Filter-out-the-kdm-user.patch deleted file mode 100644 index c0ec63d8..00000000 --- a/source/l/ConsoleKit2/patches/0003-Filter-out-the-kdm-user.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f848c1de94ef2f5ae7d53358d30e26400a69d3d4 Mon Sep 17 00:00:00 2001 -From: Ivailo Monev <xakepa10@gmail.com> -Date: Mon, 24 Aug 2015 20:18:50 +0300 -Subject: [PATCH 5/5] Filter out the kdm user - ---- - src/ck-manager.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/ck-manager.c b/src/ck-manager.c -index 66da8b2..4a6e511 100644 ---- a/src/ck-manager.c -+++ b/src/ck-manager.c -@@ -1111,9 +1111,10 @@ session_is_real_user (CkSession *session, - - username = get_user_name (uid); - -- /* filter out GDM/SDDM user */ -+ /* filter out GDM/SDDM/KDM user */ - if (g_strcmp0 (username, "gdm") == 0 || -- g_strcmp0 (username, "sddm") == 0) { -+ g_strcmp0 (username, "sddm") == 0 || -+ g_strcmp0 (username, "kdm") == 0) { - ret = FALSE; - goto out; - } --- -2.5.1 - diff --git a/source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch b/source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch deleted file mode 100644 index ee3b1e23..00000000 --- a/source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-substitution.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 22958330535c9e26ed537d1568925f64e3bafe4d Mon Sep 17 00:00:00 2001 -From: Eric Hameleers <alien@slackware.com> -Date: Thu, 10 Sep 2015 14:19:43 +0200 -Subject: [PATCH] Apply overlooked PREFIX/lib -> LIBDIR substitution - ---- - src/ck-session.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ck-session.c b/src/ck-session.c -index ca0f8ca..1b58889 100644 ---- a/src/ck-session.c -+++ b/src/ck-session.c -@@ -1273,7 +1273,7 @@ ck_session_run_programs (CkSession *session, - g_assert(n <= G_N_ELEMENTS(extra_env)); - - ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env); -- ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env); -+ ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env); - - for (n = 0; extra_env[n] != NULL; n++) { - g_free (extra_env[n]); diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 1963cad1..7be3b07b 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.49.2} -NSPR=${NSPR:-4.24} +VERSION=${VERSION:-3.50} +NSPR=${NSPR:-4.25} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/l/readline/readline-8.0-patches/readline80-002 b/source/l/readline/readline-8.0-patches/readline80-002 new file mode 100644 index 00000000..7923d9d1 --- /dev/null +++ b/source/l/readline/readline-8.0-patches/readline80-002 @@ -0,0 +1,60 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.0 +Patch-ID: readline80-002 + +Bug-Reported-by: lessbug@qq.com +Bug-Reference-ID: <tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com> +Bug-Reference-URL: + +Bug-Description: + +When using previous-history to go back beyond the beginning of the history list, +it's possible to move to an incorrect partial line. + +Patch (apply with `patch -p0'): + +*** ../readline-8.0-patched/misc.c 2017-07-07 17:30:12.000000000 -0400 +--- misc.c 2019-05-16 11:43:46.000000000 -0400 +*************** +*** 577,580 **** +--- 590,594 ---- + { + HIST_ENTRY *old_temp, *temp; ++ int had_saved_line; + + if (count < 0) +*************** +*** 589,592 **** +--- 603,607 ---- + + /* If we don't have a line saved, then save this one. */ ++ had_saved_line = _rl_saved_line_for_history != 0; + rl_maybe_save_line (); + +*************** +*** 612,616 **** + if (temp == 0) + { +! rl_maybe_unsave_line (); + rl_ding (); + } +--- 627,632 ---- + if (temp == 0) + { +! if (had_saved_line == 0) +! _rl_free_saved_history_line (); + rl_ding (); + } +*** ../readline-8.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 1 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 2 diff --git a/source/l/readline/readline-8.0-patches/readline80-003 b/source/l/readline/readline-8.0-patches/readline80-003 new file mode 100644 index 00000000..b3714581 --- /dev/null +++ b/source/l/readline/readline-8.0-patches/readline80-003 @@ -0,0 +1,69 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.0 +Patch-ID: readline80-003 + +Bug-Reported-by: HIROSE Masaaki <hirose31@gmail.com> +Bug-Reference-ID: <CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html + +Bug-Description: + +Reading history entries with timestamps can result in history entries joined +by linefeeds. + +Patch (apply with `patch -p0'): + +*** ../readline-8.0-patched/histfile.c 2018-06-11 09:14:52.000000000 -0400 +--- histfile.c 2019-05-16 15:55:57.000000000 -0400 +*************** +*** 370,376 **** + + has_timestamps = HIST_TIMESTAMP_START (buffer); +! history_multiline_entries += has_timestamps && history_write_timestamps; + + /* Skip lines until we are at FROM. */ + for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) + if (*line_end == '\n') +--- 370,378 ---- + + has_timestamps = HIST_TIMESTAMP_START (buffer); +! history_multiline_entries += has_timestamps && history_write_timestamps; + + /* Skip lines until we are at FROM. */ ++ if (has_timestamps) ++ last_ts = buffer; + for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) + if (*line_end == '\n') +*************** +*** 381,385 **** +--- 383,398 ---- + if (HIST_TIMESTAMP_START(p) == 0) + current_line++; ++ else ++ last_ts = p; + line_start = p; ++ /* If we are at the last line (current_line == from) but we have ++ timestamps (has_timestamps), then line_start points to the ++ text of the last command, and we need to skip to its end. */ ++ if (current_line >= from && has_timestamps) ++ { ++ for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++) ++ ; ++ line_start = (*line_end == '\n') ? line_end + 1 : line_end; ++ } + } + + +*** ../readline-8.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 2 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 3 diff --git a/source/l/readline/readline-8.0-patches/readline80-004 b/source/l/readline/readline-8.0-patches/readline80-004 new file mode 100644 index 00000000..8a40ebe9 --- /dev/null +++ b/source/l/readline/readline-8.0-patches/readline80-004 @@ -0,0 +1,47 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.0 +Patch-ID: readline80-004 + +Bug-Reported-by: auroralanes@protonmail.ch +Bug-Reference-ID: <WikEDKluAyoha9IDLp83rbN7_Uinr2rrpvSV_z4wmt9qur9piN-FNOn17P0cAizEVah1Fvc9d641vIIWX_7SC6EUTz0CatnOH-C-UK3rPYc=@protonmail.ch> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2020-01/msg00008.html + +Bug-Description: + +If writing the history file fails, and renaming the backup history file fails, +it's possible for readline's history code to return the wrong error to its +caller. + +Patch (apply with `patch -p0'): + +*** ../bash-20200124/lib/readline/histfile.c 2019-11-19 10:31:58.000000000 -0500 +--- histfile.c 2020-02-01 16:28:29.000000000 -0500 +*************** +*** 621,624 **** +--- 621,625 ---- + if (rv != 0) + { ++ rv = errno; + if (tempname) + unlink (tempname); +*************** +*** 768,771 **** +--- 769,773 ---- + if (rv != 0) + { ++ rv = errno; + if (tempname) + unlink (tempname); +*** ../readline-8.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 3 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 4 |