Hello community, here is the log from the commit of package vte for openSUSE:Factory checked in at 2012-02-28 19:26:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vte (Old) and /work/SRC/openSUSE:Factory/.vte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vte", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/vte/vte.changes 2012-01-09 15:42:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vte.new/vte.changes 2012-02-28 19:26:17.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Feb 24 10:31:27 UTC 2012 - vu...@opensuse.org + +- Add vte-suid_flags.patch: respect SUID_CFLAGS/SUID_LDFLAGS when + building the suid binary gnome-pty-helper. +- Set SUID_CFLAGS to -fPIE and SUID_LDFLAGS to -pie in %build. This + fixes bnc#743135. +- Add autoconf and automake BuildRequires, and call autoreconf in + gnome-pty-helper subdirectory, for the new patch. + +------------------------------------------------------------------- New: ---- vte-suid_flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vte.spec ++++++ --- /var/tmp/diff_new_pack.4B7rCP/_old 2012-02-28 19:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.4B7rCP/_new 2012-02-28 19:26:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package vte # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _sover 2_90-9 %define _apiver 2.90 %define _binver 2_90 @@ -29,6 +30,12 @@ License: GPL-2.0+ Group: Development/Libraries/GNOME Source: http://download.gnome.org/sources/vte/0.31/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM vte-suid_flags.patch bnc#743135 bgo#670732 vu...@opensuse.org -- Respect SUID_CFLAGS/SUID_LDFLAGS +Patch0: vte-suid_flags.patch +# needed for patch0 +BuildRequires: autoconf +# needed for patch0 +BuildRequires: automake BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk3-devel @@ -128,8 +135,15 @@ %prep %setup -q -n %{_name}-%{version} translation-update-upstream +%patch0 -p1 %build +# needed for patch0 +pushd gnome-pty-helper +autoreconf -fi +popd +export SUID_CFLAGS="-fPIE" +export SUID_LDFLAGS="-pie" %configure --with-pic\ --with-gtk=%{_gtkver}\ --disable-static \ ++++++ vte-suid_flags.patch ++++++ commit 56875204c0faaa4a42fc843c31132a94a8dc0cdf Author: Vincent Untz <vu...@gnome.org> Date: Fri Feb 24 11:28:38 2012 +0100 gnome-pty-helper: Respect SUID_CFLAGS and SUID_LDFLAGS This is a good way for distributors to use -fPIE/-pie when building vte. https://bugzilla.gnome.org/show_bug.cgi?id=670732 diff --git a/gnome-pty-helper/Makefile.am b/gnome-pty-helper/Makefile.am index bb54503..10a1c89 100644 --- a/gnome-pty-helper/Makefile.am +++ b/gnome-pty-helper/Makefile.am @@ -7,6 +7,9 @@ gnome_pty_helper_SOURCES = \ gnome-pty-helper.c \ gnome-utmp.c +gnome_pty_helper_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) +gnome_pty_helper_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) + install-exec-hook: chown root.utmp $(DESTDIR)$(libexecdir)/gnome-pty-helper || true chmod g+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true diff --git a/gnome-pty-helper/configure.in b/gnome-pty-helper/configure.in index 73a400e..16940ea 100644 --- a/gnome-pty-helper/configure.in +++ b/gnome-pty-helper/configure.in @@ -45,6 +45,11 @@ case $host in ;; esac +AC_ARG_VAR([SUID_CFLAGS], + [CFLAGS used for binaries which are usually with the suid bit]) +AC_ARG_VAR([SUID_LDFLAGS], + [LDFLAGS used for binaries which are usually with the suid bit]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
