Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2012-02-28 14:12:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-1", Maintainer is "THoenig@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2012-02-25 07:30:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2012-02-28 14:12:20.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 27 10:18:53 UTC 2012 - vuntz@opensuse.org + +- Revert my last change completely, and go back to using -fpie in + CFLAGS and -pie in LDFLAGS for the whole build: after discussion + upstream in fdo#46570, it appears that this is the recommended + way to harden the build. + +------------------------------------------------------------------- dbus-1.changes: same change Old: ---- dbus-1-suid_flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.MgM80f/_old 2012-02-28 14:12:22.000000000 +0100 +++ /var/tmp/diff_new_pack.MgM80f/_new 2012-02-28 14:12:22.000000000 +0100 @@ -56,8 +56,6 @@ Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -# PATCH-FIX-UPSTREAM dbus-1-suid_flags.patch bnc#743149 fdo#46570 vuntz@opensuse.org -- Respect SUID_CFLAGS/SUID_LDFLAGS -Patch2: dbus-1-suid_flags.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else @@ -81,14 +79,14 @@ %setup -n %{_name}-%{version} -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build autoreconf -fi -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" +# We use -fpie/-pie for the whole build; this is the recommended way to harden +# the build upstream, see discussion in fdo#46570 +export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie" +export LDFLAGS="-pie" export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" -export SUID_CFLAGS="-fPIE" -export SUID_LDFLAGS="-pie" %if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" export CXXFLAGS="$CXXFLAGS -fstack-protector" ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.MgM80f/_old 2012-02-28 14:12:22.000000000 +0100 +++ /var/tmp/diff_new_pack.MgM80f/_new 2012-02-28 14:12:22.000000000 +0100 @@ -54,8 +54,6 @@ Patch0: dbus-log-deny.patch # PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires Patch1: dbus-do-autolaunch.patch -# PATCH-FIX-UPSTREAM dbus-1-suid_flags.patch bnc#743149 fdo#46570 vuntz@opensuse.org -- Respect SUID_CFLAGS/SUID_LDFLAGS -Patch2: dbus-1-suid_flags.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else @@ -114,14 +112,14 @@ %setup -n %{_name}-%{version} -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build autoreconf -fi -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" +# We use -fpie/-pie for the whole build; this is the recommended way to harden +# the build upstream, see discussion in fdo#46570 +export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie" +export LDFLAGS="-pie" export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" -export SUID_CFLAGS="-fPIE" -export SUID_LDFLAGS="-pie" %if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" export CXXFLAGS="$CXXFLAGS -fstack-protector" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org