Bug#840378: another stable update
On Sun, Nov 13, 2016 at 05:42:57PM +0000, Adam D. Barratt wrote:
> On Mon, 2016-10-17 at 10:16 +0200, Salvatore Bonaccorso wrote:
> > JFTR, I'm perfectly fine if -- in case accepted by the SRM -- my
> > proposed debdiff just get squashed in in Mateusz upload, or if he
> > want's to do the upload. In fact I have X-Debbug-CC'ed on my first
> > request, just in case he would like to take over.
>
> That sounds good, thanks; sorry for the delay in getting back to you
> both.
>
> Please could someone prepare and test a package including both fixes,
> and send the debdiff to this report.
Mateusz already prepared a debdiff, it's in #841017; I've attached a copy.
It looks sane, and does build successfully on amd64, i386 and armhf.
I don't know anything about either bug so I don't know if the upload fixes
them, but as it's a simple merge I have no reason to suspect otherwise.
It's up to maintainer to do such tests, and I suspect it's already done.
--
A true bird-watcher waves his tail while doing so.
diff -Nru openbox-3.5.2/debian/changelog openbox-3.5.2/debian/changelog
--- openbox-3.5.2/debian/changelog 2014-10-25 14:39:18.000000000 +0200
+++ openbox-3.5.2/debian/changelog 2016-10-23 18:36:47.000000000 +0200
@@ -1,3 +1,17 @@
+openbox (3.5.2-8+deb8u1) jessie; urgency=medium
+
+ [ Mateusz Łukasik ]
+ * debian/control:
+ + Add libxcursor-dev to B-D for fix load startup notifications.
+ (Closes: #838326)
+
+ [ Salvatore Bonaccorso ]
+ * Add 808138_Replace-getgrent-with-getgroups.patch patch.
+ Replace getgrent with getgroups for not enumerate all groups at startup.
+ Thanks to Simon <simondobbss@gmail.com> (Closes: #808138)
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl> Sun, 23 Oct 2016 18:36:47 +0200
+
openbox (3.5.2-8) unstable; urgency=high
* debian/openbox.install:
diff -Nru openbox-3.5.2/debian/control openbox-3.5.2/debian/control
--- openbox-3.5.2/debian/control 2014-09-23 11:08:38.000000000 +0200
+++ openbox-3.5.2/debian/control 2016-10-15 13:59:38.000000000 +0200
@@ -6,7 +6,7 @@
libxrender-dev, pkg-config, libglib2.0-dev, libxml2-dev (>= 2.6.0), perl,
libxt-dev, libxinerama-dev, libxrandr-dev, libpango1.0-dev, libx11-dev,
autoconf, automake (>= 1:1.11), python-xdg, libimlib2-dev, dh-autoreconf,
- autopoint, librsvg2-dev, libxi-dev
+ autopoint, librsvg2-dev, libxi-dev, libxcursor-dev
Standards-Version: 3.9.6
Homepage: http://www.openbox.org
Vcs-Browser: https://github.com/mati75/openbox-debian
diff -Nru openbox-3.5.2/debian/patches/808138_Replace-getgrent-with-getgroups.patch openbox-3.5.2/debian/patches/808138_Replace-getgrent-with-getgroups.patch
--- openbox-3.5.2/debian/patches/808138_Replace-getgrent-with-getgroups.patch 1970-01-01 01:00:00.000000000 +0100
+++ openbox-3.5.2/debian/patches/808138_Replace-getgrent-with-getgroups.patch 2016-10-23 18:36:04.000000000 +0200
@@ -0,0 +1,63 @@
+>From e0cb404f53c9b21a521ea2f14c8cd66fdfb68ea7 Mon Sep 17 00:00:00 2001
+From: Simon <simondobbss@gmail.com>
+Date: Tue, 15 Dec 2015 15:46:18 +0100
+Subject: [PATCH] Replace getgrent with getgroups. Fixes #5978.
+
+---
+ obt/paths.c | 34 +++++++++++++++++++++-------------
+ 1 file changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/obt/paths.c b/obt/paths.c
+index 25cb6b0..d526936 100644
+--- a/obt/paths.c
++++ b/obt/paths.c
+@@ -108,25 +108,33 @@ static void find_uid_gid(uid_t *u, gid_t **g, guint *n)
+ const gchar *name;
+ struct group *gr;
+
++ gid_t gmain;
++ unsigned int maininc;
++ int i;
++
+ *u = getuid();
+ pw = getpwuid(*u);
+ name = pw->pw_name;
+
+- *g = g_new(gid_t, *n=1);
+- (*g)[0] = getgid();
+-
+- while ((gr = getgrent())) {
+- if (gr->gr_gid != (*g)[0]) { /* skip the main group */
+- gchar **c;
+- for (c = gr->gr_mem; *c; ++c)
+- if (strcmp(*c, name) == 0) {
+- *g = g_renew(gid_t, *g, ++(*n)); /* save the group */
+- (*g)[*n-1] = gr->gr_gid;
+- break;
+- }
++ gmain = getgid();
++
++ *n = getgroups(0, *g);
++ *g = g_new(gid_t, *n);
++ *n = getgroups(*n, *g);
++
++ /* Check if the effective group ID of the calling process is already
++ included in the returned list. Add it otherwise. */
++ maininc = 0;
++ for (i = 0; i < *n; i++) {
++ if ( (*g)[i] == gmain ) {
++ maininc = 1;
++ break;
+ }
+ }
+- endgrent();
++ if (!maininc) {
++ *g = g_renew(gid_t, *g, ++(*n));
++ (*g)[*n-1] = gmain;
++ }
+
+ qsort(*g, *n, sizeof(gid_t), gid_cmp);
+ }
+--
+2.1.4
+
diff -Nru openbox-3.5.2/debian/patches/series openbox-3.5.2/debian/patches/series
--- openbox-3.5.2/debian/patches/series 2014-08-22 22:32:09.000000000 +0200
+++ openbox-3.5.2/debian/patches/series 2016-10-23 18:36:04.000000000 +0200
@@ -11,3 +11,4 @@
fix_rsvg_missing_include.patch
update_pl_po.patch
754207_use-scrot.patch
+808138_Replace-getgrent-with-getgroups.patch
Reply to: