* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libgksu/files/, x11-libs/libgksu/
@ 2017-09-03 16:15 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2017-09-03 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 03f83461cb459de29dae1ee9f8f37aff480b872b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 16:12:51 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 16:15:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f83461
x11-libs/libgksu: fix build with format-security, bug #517614
Bump to EAPI=6. Fix .desktop file validation, bug #512364. Apply select Debian patches.
Closes: https://bugs.gentoo.org/show_bug.cgi?id=512364
Closes: https://bugs.gentoo.org/show_bug.cgi?id=517614
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../libgksu-2.0.12-correct_colormap_get.patch | 12 ++++
.../files/libgksu-2.0.12-desktop-validation.patch | 16 +++++
.../files/libgksu-2.0.12-fix-make-3.82.patch | 6 +-
.../files/libgksu-2.0.12-format_security.patch | 28 ++++++++
...u-2.0.12-g_markup_escape_text_for_command.patch | 21 ++++++
.../files/libgksu-2.0.12-missing-libs.patch | 22 ++++++
.../files/libgksu-2.0.12-sudo_keep_env.patch | 15 ++++
x11-libs/libgksu/libgksu-2.0.12-r3.ebuild | 81 ++++++++++++++++++++++
8 files changed, 199 insertions(+), 2 deletions(-)
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch b/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch
new file mode 100644
index 00000000000..5c34cae5613
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch
@@ -0,0 +1,12 @@
+=== modified file 'libgksu/libgksu.c'
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -426,7 +426,7 @@
+ attr.height = fadeout->area.height;
+ attr.wclass = GDK_INPUT_OUTPUT;
+ attr.visual = gdk_screen_get_system_visual (fadeout->screen);
+- attr.colormap = gdk_screen_get_default_colormap (fadeout->screen);
++ attr.colormap = gdk_screen_get_system_colormap (fadeout->screen);
+ attr.override_redirect = TRUE;
+ attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR;
+
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch b/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch
new file mode 100644
index 00000000000..15de910474b
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch
@@ -0,0 +1,16 @@
+Fix validation
+
+--- a/gksu-properties/gksu-properties.desktop.in 2017-09-03 16:41:57.872594752 +0200
++++ b/gksu-properties/gksu-properties.desktop.in 2017-09-03 16:44:40.835919489 +0200
+@@ -3,9 +3,9 @@
+ _Name=Privilege granting
+ _Comment=Configure behavior of the privilege-granting tool
+ Exec=gksu-properties
+-Icon=gksu.png
++Icon=gksu
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Application;Settings;AdvancedSettings;
++Categories=GNOME;GTK;Settings;
+ OnlyShowIn=GNOME;XFCE;
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
index 0a7c5f14289..05ff3e0b0ad 100644
--- a/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
@@ -1,5 +1,7 @@
---- Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500
-+++ Makefile.am 2010-08-22 16:11:55.289599110 -0500
+Fix indentation of Makefile.am
+
+--- a/Makefile.am 2010-08-22 16:11:19.872577459 -0500
++++ b/Makefile.am 2010-08-22 16:11:55.289599110 -0500
@@ -17,11 +17,11 @@
if GCONF_SCHEMAS_INSTALL
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch b/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch
new file mode 100644
index 00000000000..d39bbafd67a
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch
@@ -0,0 +1,28 @@
+Description: Fix build failure with [-Werror=format-security]
+Author: Michael Biebl <biebl@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643423
+
+Let chunk stripped due to Gentoo revert-forkpty patch.
+
+Index: libgksu-2.0.13~pre1/libgksu/libgksu.c
+===================================================================
+--- libgksu-2.0.13~pre1.orig/libgksu/libgksu.c 2011-12-07 11:01:18.351654566 +0100
++++ libgksu-2.0.13~pre1/libgksu/libgksu.c 2011-12-07 11:01:41.231654725 +0100
+@@ -1276,7 +1276,7 @@
+ context->dir = g_strdup (mkdtemp(template));
+ if (!context->dir)
+ {
+- fprintf (stderr, strerror(errno));
++ fprintf (stderr, "%s", strerror(errno));
+ return FALSE;
+ }
+
+@@ -2247,7 +2247,7 @@
+ " %s"), converted_str, "gksu: waiting");
+ g_free (converted_str);
+
+- g_set_error (error, gksu_quark, GKSU_ERROR_HELPER, emsg);
++ g_set_error_literal (error, gksu_quark, GKSU_ERROR_HELPER, emsg);
+ g_free (emsg);
+
+ if (context->debug)
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch b/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch
new file mode 100644
index 00000000000..de3ab6806ee
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch
@@ -0,0 +1,21 @@
+Escape text for display in password prompt.
+
+From the Debian patch stack.
+
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -994,12 +994,12 @@
+ "The application '%s' lets you "
+ "modify essential parts of your "
+ "system."),
+- command);
++ g_markup_escape_text(command, -1));
+ else
+ msg = g_strdup_printf (_("<b><big>Enter your password to run "
+ "the application '%s' as user %s"
+ "</big></b>"),
+- command, context->user);
++ g_markup_escape_text(command, -1), context->user);
+ }
+ else
+ {
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch
new file mode 100644
index 00000000000..955f455b9f8
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch
@@ -0,0 +1,22 @@
+Add missing libs to relevant targets
+
+--- a/configure.ac 2017-09-03 17:10:57.552216900 +0200
++++ b/configure.ac 2017-09-03 17:16:39.674036975 +0200
+@@ -4,7 +4,7 @@
+ AC_PREREQ(2.57)
+
+ AC_INIT(libgksu, 2.0.12, kov@debian.org)
+-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
++AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_SRCDIR(libgksu/libgksu.c)
+ AC_CONFIG_HEADERS(config.h)
+
+@@ -44,7 +44,7 @@
+ PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.12, gconf-2.0])
+
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
+-PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0 x11])
+
+ # Checks for library functions.
+ ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl th zh_CN"
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch b/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch
new file mode 100644
index 00000000000..a51a1623deb
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch
@@ -0,0 +1,15 @@
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -2704,6 +2704,12 @@
+ cmd[argcount] = g_strdup("-H");
+ argcount++;
+ }
++ else
++ {
++ /* Preserve the environment, if sudo will let us */
++ cmd[argcount] = g_strdup("-E");
++ argcount++;
++ }
+
+ /* Make sudo read from stdin */
+ cmd[argcount] = g_strdup("-S");
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
new file mode 100644
index 00000000000..0568909e0b6
--- /dev/null
+++ b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library for integration of su into applications"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static-libs"
+
+COMMON_DEPEND="
+ >=x11-libs/gtk+-2.12:2
+ x11-libs/libX11
+ >=gnome-base/gconf-2
+ gnome-base/libgnome-keyring
+ x11-libs/startup-notification
+ >=gnome-base/libgtop-2:2=
+ nls? ( >=sys-devel/gettext-0.14.1 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35.5
+ virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ app-admin/sudo
+"
+
+PATCHES=(
+ # Fix compilation on bsd
+ "${FILESDIR}"/${PN}-2.0.0-fbsd.patch
+
+ # Fix wrong usage of LDFLAGS, bug #226837
+ "${FILESDIR}"/${PN}-2.0.7-libs.patch
+
+ # Use po/LINGUAS
+ "${FILESDIR}"/${PN}-2.0.7-polinguas.patch
+
+ # Don't forkpty; bug #298289
+ "${FILESDIR}"/${P}-revert-forkpty.patch
+
+ # Make this gmake-3.82 compliant, bug #333961
+ "${FILESDIR}"/${P}-fix-make-3.82.patch
+
+ # Do not build test programs that are never executed; also fixes bug
+ # #367397 (underlinking issues).
+ "${FILESDIR}"/${P}-notests.patch
+
+ # Fix automake-1.11.2 compatibility, bug #397411
+ "${FILESDIR}"/${P}-automake-1.11.2.patch
+ "${FILESDIR}"/${P}-missing-libs.patch
+
+ # Fix build with format-security, bug #517614
+ "${FILESDIR}"/${P}-format_security.patch
+
+ # Fix .desktop file validation, bug #512364
+ "${FILESDIR}"/${P}-desktop-validation.patch
+
+ # Collection of patches from Debian
+ "${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch
+ "${FILESDIR}"/${P}-sudo_keep_env.patch
+ "${FILESDIR}"/${P}-correct_colormap_get.patch
+)
+
+src_prepare() {
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable nls) \
+ $(use_enable static-libs static)
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libgksu/files/, x11-libs/libgksu/
@ 2018-04-02 17:50 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2018-04-02 17:50 UTC (permalink / raw
To: gentoo-commits
commit: b2bad0a1c4b45c2ca46cfbeed3848d7dc5dcf7fc
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 16:33:36 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 2 17:50:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bad0a1
x11-libs/libgksu: merge gksu-run-helper patch in automake 1.11 patch
These patches are actually tied together.
Package-Manager: Portage-2.3.27, Repoman-2.3.9
.../files/libgksu-2.0.12-automake-1.11.2-v2.patch | 55 ++++++++++++++++++----
.../libgksu-2.0.12-gksu-run-helper_path.patch | 23 ---------
x11-libs/libgksu/libgksu-2.0.12-r4.ebuild | 6 +--
3 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
index c69715af8c3..cd24235a05e 100644
--- a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
@@ -1,26 +1,61 @@
-Due to the following change, pkglib_PROGRAMS is invalid:
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+From 8137cbfa13954b10cf349eb392166c677cb78ff6 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 2 Apr 2018 18:27:33 +0200
+Subject: [PATCH] Fix build with automake 1.11+
-https://savannah.nongnu.org/bugs/index.php?35241
-https://bugs.gentoo.org/397411
-https://bugs.gentoo.org/640772
+Initial patch from AlphatPC at gmail dot com.
+
+Due to a change in automake [1], pkglib_PROGRAMS is invalid and we must now
+use pkglibexec_PROGRAMS. Fix hardcoded location to gksu-run-helper to reflect
+this.
+
+[1] http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+Gentoo-Bug-URL: https://bugs.gentoo.org/397411
+Gentoo-Bug-URL: https://bugs.gentoo.org/640772
+Project-Bug-URL: https://savannah.nongnu.org/bugs/index.php?35241
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
---
- libgksu/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ libgksu/Makefile.am | 5 ++---
+ libgksu/libgksu.c | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
-index 49362f9..3cb1090 100644
+index 4a37305..3ddde5b 100644
--- a/libgksu/Makefile.am
+++ b/libgksu/Makefile.am
-@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
+@@ -1,6 +1,6 @@
+ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${LIBGKSU_CFLAGS}
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
++AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\"
+
+ lib_LTLIBRARIES = libgksu2.la
+ libgksu2_la_SOURCES = libgksu.c libgksu.h
+@@ -22,8 +22,7 @@ includedir = ${prefix}/include/${PACKAGE}
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = libgksu2.pc
-pkglibdir = ${libdir}/${PACKAGE}
-pkglib_PROGRAMS = gksu-run-helper
-+pkglibexecdir = ${libexecdir}/${PACKAGE}
+pkglibexec_PROGRAMS = gksu-run-helper
gksu_run_helper_LDADD = ${GLIB_LIBS}
gksu_run_helper_SOURCES = gksu-run-helper.c
+diff --git a/libgksu/libgksu.c b/libgksu/libgksu.c
+index 7203549..612e712 100644
+--- a/libgksu/libgksu.c
++++ b/libgksu/libgksu.c
+@@ -1937,7 +1937,7 @@ gksu_su_fuller (GksuContext *context,
+ GQuark gksu_quark;
+ int i = 0;
+
+- gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
++ gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper";
+
+ int fdpty;
+ pid_t pid;
+--
+2.16.2
+
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch b/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch
deleted file mode 100644
index 3c6774b1d2f..00000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-gksu-run-helper_path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
---- libgksu-2.0.12.orig/libgksu/libgksu.c 2018-03-06 15:39:34.594733354 +0300
-+++ libgksu-2.0.12/libgksu/libgksu.c 2018-03-06 16:03:11.812213290 +0300
-@@ -1937,7 +1937,7 @@
- GQuark gksu_quark;
- int i = 0;
-
-- gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
-+ gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper";
-
- int fdpty;
- pid_t pid;
-diff -urN libgksu-2.0.12.orig/libgksu/Makefile.am libgksu-2.0.12/libgksu/Makefile.am
---- libgksu-2.0.12.orig/libgksu/Makefile.am 2018-03-06 15:39:34.545736138 +0300
-+++ libgksu-2.0.12/libgksu/Makefile.am 2018-03-06 16:01:23.700033494 +0300
-@@ -1,6 +1,6 @@
- AM_CFLAGS = -g -O2 -Wall
- INCLUDES = ${LIBGKSU_CFLAGS}
--AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
-+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\"
-
- lib_LTLIBRARIES = libgksu2.la
- libgksu2_la_SOURCES = libgksu.c libgksu.h
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
index 2d24958e35d..d143ddc533c 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}"/${P}-notests.patch
# Fix automake-1.11.2 compatibility, bug #397411
+ # Fix gksu-run-helper path, bug #640772
"${FILESDIR}"/${P}-automake-1.11.2-v2.patch
"${FILESDIR}"/${P}-missing-libs.patch
@@ -67,9 +68,6 @@ PATCHES=(
"${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch
"${FILESDIR}"/${P}-sudo_keep_env.patch
"${FILESDIR}"/${P}-correct_colormap_get.patch
-
- # Fix gksu-run-helper path
- "${FILESDIR}"/${P}-gksu-run-helper_path.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-02 17:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-02 17:50 [gentoo-commits] repo/gentoo:master commit in: x11-libs/libgksu/files/, x11-libs/libgksu/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2017-09-03 16:15 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox