Hello community, here is the log from the commit of package polkit for openSUSE:Factory checked in at 2012-02-25 07:31:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit (Old) and /work/SRC/openSUSE:Factory/.polkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "polkit", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/polkit/polkit.changes 2012-02-15 16:17:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.polkit.new/polkit.changes 2012-02-25 07:31:15.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Feb 24 12:11:04 UTC 2012 - [email protected] + +- Change the way we pass -fpie/-pie: + + Drop polkit-pie.patch: this was not upstreamable. + + Add polkit-suid_flags.patch: respect SUID_CFLAGS/SUID_LDFLAGS + when building the suid binaries (pkexec and + polkit-agent-helper-1). + + Add autoconf, automake and libtool BuildRequires, and call + autoreconf, for the new patch. + + Set SUID_CFLAGS to -fPIE and SUID_LDFLAGS to -pie in %build. + + Pass --with-pic to configure instead of changing CFLAGS to + contain -fPIC. + +------------------------------------------------------------------- Old: ---- polkit-pie.patch New: ---- polkit-suid_flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit.spec ++++++ --- /var/tmp/diff_new_pack.tspCMz/_old 2012-02-25 07:31:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tspCMz/_new 2012-02-25 07:31:16.000000000 +0100 @@ -30,7 +30,12 @@ Source99: baselibs.conf # PATCH-FIX-OPENSUSE polkit-no-wheel-group.patch [email protected] -- In openSUSE, there's no special meaning for the wheel group, so we shouldn't allow it to be admin Patch0: polkit-no-wheel-group.patch -Patch1: polkit-pie.patch +# PATCH-FIX-UPSTREAM polkit-suid_flags.patch bnc#743145 fdo#46569 [email protected] -- Respect SUID_CFLAGS/SUID_LDFLAGS +Patch1: polkit-suid_flags.patch +# needed for patch1 +BuildRequires: autoconf +# needed for patch1 +BuildRequires: automake BuildRequires: glib2-devel >= 2.25.12 BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: gtk-doc @@ -38,6 +43,8 @@ #!BuildIgnore: ruby BuildRequires: intltool BuildRequires: libexpat-devel +# needed for patch1 +BuildRequires: libtool BuildRequires: pam-devel %if 0%{?with_systemd} BuildRequires: systemd-devel @@ -108,14 +115,19 @@ %build export V=1 +# needed for patch1 +autoreconf -fi +export SUID_CFLAGS="-fPIE" +export SUID_LDFLAGS="-pie" %configure \ --with-os-type=suse \ --enable-gtk-doc \ + --with-pic \ --disable-static \ --enable-introspection \ --enable-examples \ --libexecdir=%{_prefix}/lib/polkit-1 -make CFLAGS="-fPIC" %{?_smp_mflags} +make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT ++++++ polkit-suid_flags.patch ++++++ commit 1d2f40178c8b3ba39c25de25530c998c3591fab8 Author: Vincent Untz <[email protected]> Date: Fri Feb 24 13:13:17 2012 +0100 polkitagent, pkexec: Respect SUID_CFLAGS and SUID_LDFLAGS This is a good way for distributors to use -fPIE/-pie. diff --git a/configure.ac b/configure.ac index f4a0c41..42da974 100644 --- a/configure.ac +++ b/configure.ac @@ -429,6 +429,11 @@ AC_SUBST([GETTEXT_PACKAGE]) AM_GLIB_GNU_GETTEXT AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) +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_OUTPUT([ Makefile actions/Makefile diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am index e8c9fb1..f0f8419 100644 --- a/src/polkitagent/Makefile.am +++ b/src/polkitagent/Makefile.am @@ -92,6 +92,7 @@ endif polkit_agent_helper_1_CFLAGS = \ -D_POLKIT_COMPILATION \ + $(SUID_CFLAGS) \ $(GLIB_CFLAGS) \ $(NULL) @@ -101,6 +102,11 @@ polkit_agent_helper_1_LDADD = \ $(top_builddir)/src/polkit/libpolkit-gobject-1.la \ $(NULL) +polkit_agent_helper_1_LDFLAGS = \ + $(SUID_LDFLAGS) \ + $(AM_LDFLAGS) \ + $(NULL) + if HAVE_INTROSPECTION girdir = $(INTROSPECTION_GIRDIR) gir_DATA = PolkitAgent-1.0.gir diff --git a/src/programs/Makefile.am b/src/programs/Makefile.am index c260dee..6aac06b 100644 --- a/src/programs/Makefile.am +++ b/src/programs/Makefile.am @@ -24,6 +24,7 @@ bin_PROGRAMS = pkexec pkcheck pkaction pkexec_SOURCES = pkexec.c pkexec_CFLAGS = \ + $(SUID_CFLAGS) \ $(GLIB_CFLAGS) \ $(AUTH_LIBS) \ $(NULL) @@ -34,6 +35,11 @@ pkexec_LDADD = \ $(top_builddir)/src/polkitagent/libpolkit-agent-1.la \ $(NULL) +pkexec_LDFLAGS = \ + $(SUID_LDFLAGS) \ + $(AM_LDFLAGS) \ + $(NULL) + # ---------------------------------------------------------------------------------------------------- pkcheck_SOURCES = pkcheck.c -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
