Hello community, here is the log from the commit of package gnokii for openSUSE:Factory checked in at 2012-02-28 14:12:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnokii (Old) and /work/SRC/openSUSE:Factory/.gnokii.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnokii", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gnokii/gnokii.changes 2012-01-05 19:11:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnokii.new/gnokii.changes 2012-02-28 14:12:52.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 24 10:56:08 UTC 2012 - vu...@opensuse.org + +- Add gnokii-suid_flags.patch: respect SUID_CFLAGS/SUID_LDFLAGS + when building the suid binary mkgnokiidev. +- Set SUID_CFLAGS to -fPIE and SUID_LDFLAGS to -pie in %build. This + fixes bnc#743142. +- Add libX11-devel and libXpm-devel BuildRequires: they used to be + implicitly brought in, but are needed after the xorg-x11 + packaging change. Only do this for 12.2 and later, though, to not + break build on older systems. + +------------------------------------------------------------------- New: ---- gnokii-suid_flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnokii.spec ++++++ --- /var/tmp/diff_new_pack.qKbBEp/_old 2012-02-28 14:12:53.000000000 +0100 +++ /var/tmp/diff_new_pack.qKbBEp/_new 2012-02-28 14:12:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnokii # -# 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 @@ -16,26 +16,31 @@ # - Name: gnokii Version: 0.6.31 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Nokia Connectivity Program -Url: http://www.gnokii.org/ +License: GPL-2.0+ Group: Hardware/Mobile +Url: http://www.gnokii.org/ Source: http://www.gnokii.org/download/gnokii/%{name}-%{version}.tar.bz2 Source1: xgnokii.desktop Source2: gnokii.xpm Source3: README.SUSE # PATCH-FIX-UPSTREAM gnokii-xgnokii.patch dims...@opensuse.org -- Fix typo which results in xgnokii not being built and installed. Patch0: gnokii-xgnokii.patch +# PATCH-FIX-UPSTREAM gnokii-suid_flags.patch bnc#743142 vu...@opensuse.org -- Respect SUID_CFLAGS/SUID_LDFLAGS; sent upstream by mail on 2012-02-24 +Patch1: gnokii-suid_flags.patch BuildRequires: bluez-devel BuildRequires: coreutils BuildRequires: gtk2-devel BuildRequires: intltool +%if 0%{?suse_version} > 1210 +BuildRequires: libX11-devel +BuildRequires: libXpm-devel +%endif BuildRequires: libical-devel -# Needed for patch0 +# Needed for patch0 and patch1 BuildRequires: libtool BuildRequires: libusb-devel BuildRequires: mysql-devel @@ -97,11 +102,14 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -# Needed by patch0 +# Needed by patch0 and patch1 autoreconf -fi export CFLAGS="%{optflags} -D_GNU_SOURCE -fPIC -Wall -Wno-unused -fstack-protector -fno-strict-aliasing" +export SUID_CFLAGS="-fPIE" +export SUID_LDFLAGS="-pie" %configure \ --enable-nls \ --enable-security \ ++++++ gnokii-suid_flags.patch ++++++ commit 5eba8b6150b37fb229c0f9ad54d8b555e5e3225c Author: Vincent Untz <vu...@opensuse.org> Date: Fri Feb 24 11:54:39 2012 +0100 mgnokiidev: Respect SUID_CFLAGS and SUID_LDFLAGS This is a good way for distributors to use -fPIE/-pie when building gnokii. diff --git a/configure.in b/configure.in index ab0bb50..958b5aa 100644 --- a/configure.in +++ b/configure.in @@ -998,6 +998,11 @@ AC_DEFINE_UNQUOTED(SBINDIR, "$mgnokiidev_bindir", [Where mgnokiidev gets install AC_EXPAND_DIR(prefix_dir, "${prefix}") AC_DEFINE_UNQUOTED(PREFIX, "$prefix_dir", [Root dir for gnokii, xgnokii and smsd]) +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_HEADERS([include/config.h]) AC_SUBST(PACKAGE) diff --git a/utils/Makefile.am b/utils/Makefile.am index b28b873..763d020 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -3,7 +3,8 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" sbin_PROGRAMS = mgnokiidev mgnokiidev_SOURCES = mgnokiidev.c mgnokiidev_LDADD = $(INTLLIBS) $(TCP_LIBS) -mgnokiidev_CFLAGS = -I$(top_srcdir)/include +mgnokiidev_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) +mgnokiidev_CFLAGS = -I$(top_srcdir)/include $(SUID_CFLAGS) $(AM_CFLAGS) scripts_DATA = sendsms scriptsdir = $(bindir) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
