Hello community, here is the log from the commit of package colm for openSUSE:Factory checked in at 2020-05-01 11:13:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colm (Old) and /work/SRC/openSUSE:Factory/.colm.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "colm" Fri May 1 11:13:50 2020 rev:6 rq:799165 version:0.13.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/colm/colm.changes 2019-08-23 11:09:24.290460898 +0200 +++ /work/SRC/openSUSE:Factory/.colm.new.2738/colm.changes 2020-05-01 11:13:54.783920500 +0200 @@ -1,0 +2,5 @@ +Thu Apr 30 08:13:44 UTC 2020 - Jan Engelhardt <[email protected]> + +- Add reproducible.diff + +------------------------------------------------------------------- New: ---- reproducible.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colm.spec ++++++ --- /var/tmp/diff_new_pack.Gmn2KM/_old 2020-05-01 11:13:57.015925354 +0200 +++ /var/tmp/diff_new_pack.Gmn2KM/_new 2020-05-01 11:13:57.019925363 +0200 @@ -1,7 +1,7 @@ # # spec file for package colm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ #Git-Clone: git://colm.net/colm Source: https://www.colm.net/files/colm/%name-%version.tar.gz Patch1: shadow.diff +Patch2: reproducible.diff BuildRequires: asciidoc BuildRequires: gcc-c++ BuildRequires: libtool ++++++ reproducible.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2020-04-30 09:54:51.189316671 +0200 Pointers are subject to ASLR. Since colm already uses a global counter, just extend the idea to all emitted pointer values. --- src/compiler.cc | 2 +- src/declare.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) Index: colm-0.13.0.7/src/compiler.cc =================================================================== --- colm-0.13.0.7.orig/src/compiler.cc +++ colm-0.13.0.7/src/compiler.cc @@ -960,7 +960,7 @@ void Compiler::initEmptyScanner( RegionS reg->impl->wasEmpty = true; static int def = 1; - String name( 64, "__%p_DEF_PAT_%d", reg, def++ ); + String name(64, "__0_DEF_PAT_%d", def++); LexJoin *join = LexJoin::cons( LexExpression::cons( BT_Any ) ); Index: colm-0.13.0.7/src/declare.cc =================================================================== --- colm-0.13.0.7.orig/src/declare.cc +++ colm-0.13.0.7/src/declare.cc @@ -503,7 +503,8 @@ void Compiler::makeIgnoreCollectors() { for ( RegionSetList::Iter regionSet = regionSetList; regionSet.lte(); regionSet++ ) { if ( regionSet->collectIgnore->zeroLel == 0 ) { - String name( 128, "_ign_%p", regionSet->tokenIgnore ); + static unsigned long ctr; + String name(128, "_ign_%lu", ctr++); LangEl *zeroLel = new LangEl( rootNamespace, name, LangEl::Term ); langEls.append( zeroLel ); zeroLel->isZero = true;
