From e091830a49cde683162c27878fddb8f8f3551627 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Feb 07 2017 13:40:32 +0000 Subject: Avoid potential aliasing issues in zencoding plugin --- diff --git a/bluefish-2.2.10-strict-aliasing.patch b/bluefish-2.2.10-strict-aliasing.patch new file mode 100644 index 0000000..fa6a28c --- /dev/null +++ b/bluefish-2.2.10-strict-aliasing.patch @@ -0,0 +1,72 @@ +--- src/plugin_zencoding/Makefile.am ++++ src/plugin_zencoding/Makefile.am +@@ -56,6 +56,7 @@ zencoding_la_SOURCES = \ + zeneditor-interface.c \ + zeneditor-interface.h + ++zencoding_la_CFLAGS = -fno-strict-aliasing + zencoding_la_LDFLAGS = -module -avoid-version + + if OS_WIN32 +--- src/plugin_zencoding/Makefile.in ++++ src/plugin_zencoding/Makefile.in +@@ -132,15 +132,16 @@ am__uninstall_files_from_dir = { \ + am__installdirs = "$(DESTDIR)$(zencodingdir)" "$(DESTDIR)$(plugindir)" + LTLIBRARIES = $(zencoding_LTLIBRARIES) + zencoding_la_LIBADD = +-am_zencoding_la_OBJECTS = zencoding.lo zeneditor-interface.lo ++am_zencoding_la_OBJECTS = zencoding_la-zencoding.lo \ ++ zencoding_la-zeneditor-interface.lo + zencoding_la_OBJECTS = $(am_zencoding_la_OBJECTS) + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent + am__v_lt_1 = + zencoding_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(zencoding_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(zencoding_la_CFLAGS) \ ++ $(CFLAGS) $(zencoding_la_LDFLAGS) $(LDFLAGS) -o $@ + @ENABLE_ZENCODING_PLUGIN_TRUE@am_zencoding_la_rpath = -rpath \ + @ENABLE_ZENCODING_PLUGIN_TRUE@ $(zencodingdir) + AM_V_P = $(am__v_P_@AM_V@) +@@ -487,6 +487,7 @@ zencoding_la_SOURCES = \ + zeneditor-interface.c \ + zeneditor-interface.h + ++zencoding_la_CFLAGS = -fno-strict-aliasing + zencoding_la_LDFLAGS = -module -avoid-version $(am__append_1) + all: all-recursive + +@@ -566,8 +567,8 @@ mostlyclean-compile: + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zencoding.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zeneditor-interface.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zencoding_la-zencoding.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zencoding_la-zeneditor-interface.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -590,6 +591,20 @@ distclean-compile: + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + ++zencoding_la-zencoding.lo: zencoding.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zencoding_la_CFLAGS) $(CFLAGS) -MT zencoding_la-zencoding.lo -MD -MP -MF $(DEPDIR)/zencoding_la-zencoding.Tpo -c -o zencoding_la-zencoding.lo `test -f 'zencoding.c' || echo '$(srcdir)/'`zencoding.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zencoding_la-zencoding.Tpo $(DEPDIR)/zencoding_la-zencoding.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='zencoding.c' object='zencoding_la-zencoding.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zencoding_la_CFLAGS) $(CFLAGS) -c -o zencoding_la-zencoding.lo `test -f 'zencoding.c' || echo '$(srcdir)/'`zencoding.c ++ ++zencoding_la-zeneditor-interface.lo: zeneditor-interface.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zencoding_la_CFLAGS) $(CFLAGS) -MT zencoding_la-zeneditor-interface.lo -MD -MP -MF $(DEPDIR)/zencoding_la-zeneditor-interface.Tpo -c -o zencoding_la-zeneditor-interface.lo `test -f 'zeneditor-interface.c' || echo '$(srcdir)/'`zeneditor-interface.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zencoding_la-zeneditor-interface.Tpo $(DEPDIR)/zencoding_la-zeneditor-interface.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='zeneditor-interface.c' object='zencoding_la-zeneditor-interface.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zencoding_la_CFLAGS) $(CFLAGS) -c -o zencoding_la-zeneditor-interface.lo `test -f 'zeneditor-interface.c' || echo '$(srcdir)/'`zeneditor-interface.c ++ + mostlyclean-libtool: + -rm -f *.lo + diff --git a/bluefish.spec b/bluefish.spec index a88ea09..9ee3991 100644 --- a/bluefish.spec +++ b/bluefish.spec @@ -1,6 +1,6 @@ %global pkgver 2.2.10 #global prerel rc1 -%global rpmrel 1 +%global rpmrel 2 Name: bluefish Version: %{pkgver} @@ -9,6 +9,7 @@ Summary: Web development application for experienced users License: GPLv3+ URL: http://bluefish.openoffice.nl/ Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2 +Patch0: bluefish-2.2.10-strict-aliasing.patch BuildRequires: coreutils BuildRequires: desktop-file-utils BuildRequires: enchant-devel >= 1.4.2 @@ -76,6 +77,9 @@ Files common to every architecture version of %{name}. %prep %setup -q -n %{name}-%{version}%{?prerel:-%{prerel}} +# Avoid potential aliasing issues in zencoding plugin +%patch0 + %build %configure --disable-dependency-tracking \ --disable-static \ @@ -177,6 +181,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_mandir}/man1/%{name}.1* %changelog +* Tue Feb 7 2017 Paul Howarth - 2.2.10-2 +- Avoid potential aliasing issues in zencoding plugin + * Mon Jan 30 2017 Paul Howarth - 2.2.10-1 - Update to 2.2.10 - This is a maintenance release @@ -700,7 +707,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : * Thu May 2 2002 Matthias Saou - Rebuilt against Red Hat Linux 7.3. -- Added the %{?_smp_mflags} expansion. +- Added the %%{?_smp_mflags} expansion. * Mon Nov 19 2001 Matthias Saou - Update to 0.7.