Bug#786922: jessie-pu: package berkeley-abc/1.01+20140822hg4d547a5+dfsg-1+debu8u1
Of course the version is:
berkeley-abc/1.01+20140822hg4d547a5+dfsg-1+deb8u1
and not:
berkeley-abc/1.01+20140822hg4d547a5+dfsg-1+debu8u1
Ruben
2015-05-26 21:31 GMT+02:00 Ruben Undheim <ruben.undheim@gmail.com>:
> Package: release.debian.org
> Severity: normal
> Tags: jessie
> User: release.debian.org@packages.debian.org
> Usertags: pu
>
> Hi,
>
> I'd like to upload a fixed version of berkeley-abc. It fixes three
> bugs. One of them is a fix for reproducibility. The other two are related
> to malfunction on different architectures. All of them have been fixed in sid.
>
> Let me know if it's ok to include the fixes for all the three bugs.
>
> The full debdiff is below:
>
>
> diff -Nru berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/changelog berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/changelog
> --- berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/changelog 2014-09-19 16:21:45.000000000 +0200
> +++ berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/changelog 2015-05-26 21:13:47.000000000 +0200
> @@ -1,3 +1,14 @@
> +berkeley-abc (1.01+20140822hg4d547a5+dfsg-1+debu8u1) stable-proposed-updates; urgency=medium
> +
> + * Fixed "Broken on big-endian architectures" (Closes: #782027)
> + - (debian/patches/abc-bugfix-20150403.diff)
> + * Fixed memory alignment problem (Closes: #786916)
> + - (debian/patches/04_memory_alignment_fix.patch)
> + * Fixed FTBFS during reproducibility tests (Closes: 780449)
> + - (debian/patches/reproducibility.patch)
> +
> + -- Ruben Undheim <ruben.undheim@gmail.com> Tue, 26 May 2015 20:42:16 +0200
> +
> berkeley-abc (1.01+20140822hg4d547a5+dfsg-1) unstable; urgency=low
>
> * Initial release (Closes: #761364)
> diff -Nru berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/04_memory_alignment_fix.patch berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/04_memory_alignment_fix.patch
> --- berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/04_memory_alignment_fix.patch 1970-01-01 01:00:00.000000000 +0100
> +++ berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/04_memory_alignment_fix.patch 2015-05-26 20:38:00.000000000 +0200
> @@ -0,0 +1,55 @@
> +Description: Backporting a fix which causes crashes on certain architectures.
> + There were some memory alignment problems
> +Author: Clifford Wolf <clifford@clifford.at>
> +Forwarded: Came from upstream - therefore no need
> +Index: berkeley-abc/Makefile
> +===================================================================
> +--- berkeley-abc.orig/Makefile
> ++++ berkeley-abc/Makefile
> +@@ -45,6 +45,9 @@ ARCHFLAGS ?= $(shell $(CC) arch_flags.c
> + OPTFLAGS ?= -g -O #-DABC_NAMESPACE=xxx
> +
> + CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
> ++ifneq ($(findstring arm,$(shell uname -m)),)
> ++ CFLAGS += -DABC_MEMALIGN=4
> ++endif
> +
> + # Set -Wno-unused-bug-set-variable for GCC 4.6.0 and greater only
> + ifneq ($(or $(findstring gcc,$(CC)),$(findstring g++,$(CC))),)
> +Index: berkeley-abc/src/aig/aig/aigMem.c
> +===================================================================
> +--- berkeley-abc.orig/src/aig/aig/aigMem.c
> ++++ berkeley-abc/src/aig/aig/aigMem.c
> +@@ -366,6 +366,10 @@ void Aig_MmFlexStop( Aig_MmFlex_t * p, i
> + char * Aig_MmFlexEntryFetch( Aig_MmFlex_t * p, int nBytes )
> + {
> + char * pTemp;
> ++#ifdef ABC_MEMALIGN
> ++ // extend size to max alignment
> ++ nBytes += (ABC_MEMALIGN - nBytes % ABC_MEMALIGN) % ABC_MEMALIGN;
> ++#endif
> + // check if there are still free entries
> + if ( p->pCurrent == NULL || p->pCurrent + nBytes > p->pEnd )
> + { // need to allocate more entries
> +@@ -535,6 +539,10 @@ char * Aig_MmStepEntryFetch( Aig_MmStep_
> + {
> + if ( nBytes == 0 )
> + return NULL;
> ++#ifdef ABC_MEMALIGN
> ++ // extend size to max alignment
> ++ nBytes += (ABC_MEMALIGN - nBytes % ABC_MEMALIGN) % ABC_MEMALIGN;
> ++#endif
> + if ( nBytes > p->nMapSize )
> + {
> + if ( p->nChunks == p->nChunksAlloc )
> +@@ -564,6 +572,10 @@ void Aig_MmStepEntryRecycle( Aig_MmStep_
> + {
> + if ( nBytes == 0 )
> + return;
> ++#ifdef ABC_MEMALIGN
> ++ // extend size to max alignment
> ++ nBytes += (ABC_MEMALIGN - nBytes % ABC_MEMALIGN) % ABC_MEMALIGN;
> ++#endif
> + if ( nBytes > p->nMapSize )
> + {
> + // ABC_FREE( pEntry );
> diff -Nru berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/abc-bugfix-20150403.diff berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/abc-bugfix-20150403.diff
> --- berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/abc-bugfix-20150403.diff 1970-01-01 01:00:00.000000000 +0100
> +++ berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/abc-bugfix-20150403.diff 2015-05-26 20:38:00.000000000 +0200
> @@ -0,0 +1,15 @@
> +Comment: Fixes a segfault seen on Ubuntu 15.04
> +Author: Clifford Wolf <clifford@clifford.at>
> +Index: berkeley-abc/src/opt/ret/retIncrem.c
> +===================================================================
> +--- berkeley-abc.orig/src/opt/ret/retIncrem.c 2015-04-03 18:36:00.361381237 +0200
> ++++ berkeley-abc/src/opt/ret/retIncrem.c 2015-04-03 18:36:00.357383236 +0200
> +@@ -176,7 +176,7 @@
> + {
> + // this is an old latch
> + // get its number in the original order
> +- if ( ! st__lookup( tLatches, (char *)pLatch, (char **)&Index ) )
> ++ if ( ! st__lookup_int( tLatches, (char *)pLatch, &Index ) )
> + {
> + printf( "Abc_NtkRetimeFinalizeLatches(): Internal error.\n" );
> + return 0;
> diff -Nru berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/reproducibility.patch berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/reproducibility.patch
> --- berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/reproducibility.patch 1970-01-01 01:00:00.000000000 +0100
> +++ berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/reproducibility.patch 2015-05-26 20:38:00.000000000 +0200
> @@ -0,0 +1,29 @@
> +Description: Remove the __TIME__ etc macros
> + Otherwise the debian package checking complains...
> +Author: Johann Klammer <klammerj@a1.net>
> +Index: berkeley-abc/src/base/cmd/cmdUtils.c
> +===================================================================
> +--- berkeley-abc.orig/src/base/cmd/cmdUtils.c 2015-04-05 09:43:08.347781769 +0200
> ++++ berkeley-abc/src/base/cmd/cmdUtils.c 2015-04-05 09:43:08.343781769 +0200
> +@@ -581,7 +581,7 @@
> + nColumns = 79 / (LenghtMax + 2);
> +
> + // print the starting message
> +- fprintf( pAbc->Out, " Welcome to ABC compiled on %s %s!", __DATE__, __TIME__ );
> ++ fprintf( pAbc->Out, " Welcome to ABC!");
> +
> + // print the command by group
> + sGroupCur = NULL;
> +Index: berkeley-abc/src/base/main/mainUtils.c
> +===================================================================
> +--- berkeley-abc.orig/src/base/main/mainUtils.c 2015-04-05 09:43:08.347781769 +0200
> ++++ berkeley-abc/src/base/main/mainUtils.c 2015-04-05 09:43:08.343781769 +0200
> +@@ -52,7 +52,7 @@
> + char * Abc_UtilsGetVersion( Abc_Frame_t * pAbc )
> + {
> + static char Version[1000];
> +- sprintf(Version, "%s (compiled %s %s)", ABC_VERSION, __DATE__, __TIME__);
> ++ sprintf(Version, "%s", ABC_VERSION);
> + return Version;
> + }
> +
> diff -Nru berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/series berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/series
> --- berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/series 2014-09-19 16:21:45.000000000 +0200
> +++ berkeley-abc-1.01+20140822hg4d547a5+dfsg/debian/patches/series 2015-05-26 20:38:00.000000000 +0200
> @@ -1,3 +1,6 @@
> remove_bzlib_convenience.patch
> remove_zlib_convenience.patch
> cflags_ldflags.patch
> +04_memory_alignment_fix.patch
> +reproducibility.patch
> +abc-bugfix-20150403.diff
>
>
>
>
> Best regards,
> Ruben
Reply to: