Ubuntu
berkeley-abc package

Merge ~liushuyu-011/ubuntu/+source/berkeley-abc:ubuntu/devel into ubuntu/+source/berkeley-abc:ubuntu/devel

  1. Git
  2. lp:~liushuyu-011/ubuntu/+source/berkeley-abc
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Zixing Liu
Status: Merged
Merged at revision: af4e889a979c693e6ea3edea1a16329ff52ea617
Proposed branch: ~liushuyu-011/ubuntu/+source/berkeley-abc:ubuntu/devel
Merge into: ubuntu/+source/berkeley-abc:ubuntu/devel
Diff against target: 291 lines (+160/-30)
5 files modified
debian/changelog (+7/-0)
debian/patches/add-missing-include.patch (+30/-0)
debian/patches/remove_bzlib_convenience.patch (+26/-13)
debian/patches/remove_zlib_convenience.patch (+96/-17)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Steve Langasek (community) Approve
Review via email: mp+464051@code.launchpad.net

Description of the change

This MP fixes incorrect gzip definitions by refreshing the de-vendoring patches to fully de-vendor the included gzip and bzip sources.

To post a comment you must log in.
Revision history for this message
Zixing Liu (liushuyu-011) wrote :

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15925424/+listing-archive-extra

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index d0bdad9..a8bf88c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+berkeley-abc (1.01+20230625git01b1bd1+dfsg-3ubuntu1) noble; urgency=medium
7+
8+ * debian/patches/add-missing-include.patch: Add missing headers to
9+ Glucose components. Closes LP: #2060873.
10+
11+ -- Zixing Liu <zixing.liu@canonical.com> Wed, 10 Apr 2024 14:45:54 -0600
12+
13 berkeley-abc (1.01+20230625git01b1bd1+dfsg-3build2) noble; urgency=medium
14
15 * No-change rebuild for CVE-2024-3094
16diff --git a/debian/patches/add-missing-include.patch b/debian/patches/add-missing-include.patch
17new file mode 100644
18index 0000000..7084491
19--- /dev/null
20+++ b/debian/patches/add-missing-include.patch
21@@ -0,0 +1,30 @@
22+Description: Add missing headers to Glucose components
23+Author: Zixing Liu <zixing.liu@canonical.com>
24+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/berkeley-abc/+bug/2060873
25+Forwarded: no
26+Last-Update: 2024-04-10
27+Index: berkeley-abc/src/sat/glucose/Glucose.cpp
28+===================================================================
29+--- berkeley-abc.orig/src/sat/glucose/Glucose.cpp
30++++ berkeley-abc/src/sat/glucose/Glucose.cpp
31+@@ -34,6 +34,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
32+ #include "sat/glucose/Constants.h"
33+ #include "sat/glucose/System.h"
34+
35++#include "misc/util/abc_global.h"
36+ ABC_NAMESPACE_IMPL_START
37+
38+ using namespace Gluco;
39+Index: berkeley-abc/src/sat/glucose2/Glucose2.cpp
40+===================================================================
41+--- berkeley-abc.orig/src/sat/glucose2/Glucose2.cpp
42++++ berkeley-abc/src/sat/glucose2/Glucose2.cpp
43+@@ -34,7 +34,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
44+ #include "sat/glucose2/Solver.h"
45+
46+ #include "sat/glucose2/CGlucose.h"
47+-
48++#include "misc/util/abc_global.h"
49+ ABC_NAMESPACE_IMPL_START
50+
51+ using namespace Gluco2;
52diff --git a/debian/patches/remove_bzlib_convenience.patch b/debian/patches/remove_bzlib_convenience.patch
53index 9fabe87..69cbacd 100644
54--- a/debian/patches/remove_bzlib_convenience.patch
55+++ b/debian/patches/remove_bzlib_convenience.patch
56@@ -12,10 +12,10 @@ Forwarded: doesn't make sense upstream
57 src/base/io/ioWriteAiger.c | 2 +-
58 3 files changed, 5 insertions(+), 3 deletions(-)
59
60-diff --git a/Makefile b/Makefile
61-index 3976cf7..bb3fbc2 100644
62---- a/Makefile
63-+++ b/Makefile
64+Index: berkeley-abc/Makefile
65+===================================================================
66+--- berkeley-abc.orig/Makefile
67++++ berkeley-abc/Makefile
68 @@ -22,7 +22,7 @@ MODULES := \
69 src/map/mapper src/map/mio src/map/super src/map/if \
70 src/map/amap src/map/cov src/map/scl src/map/mpm \
71@@ -25,7 +25,7 @@ index 3976cf7..bb3fbc2 100644
72 src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
73 src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
74 src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
75-@@ -145,6 +145,8 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin)
76+@@ -145,6 +145,8 @@ ifneq ($(findstring Darwin, $(shell unam
77 LIBS += -lrt
78 endif
79
80@@ -34,10 +34,10 @@ index 3976cf7..bb3fbc2 100644
81 ifdef ABC_USE_LIBSTDCXX
82 LIBS += -lstdc++
83 $(info $(MSG_PREFIX)Using explicit -lstdc++)
84-diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c
85-index 9cf4141..8be6d21 100644
86---- a/src/base/io/ioReadAiger.c
87-+++ b/src/base/io/ioReadAiger.c
88+Index: berkeley-abc/src/base/io/ioReadAiger.c
89+===================================================================
90+--- berkeley-abc.orig/src/base/io/ioReadAiger.c
91++++ berkeley-abc/src/base/io/ioReadAiger.c
92 @@ -26,7 +26,7 @@
93 #include <string.h>
94 #include <assert.h>
95@@ -47,10 +47,10 @@ index 9cf4141..8be6d21 100644
96 #include "misc/zlib/zlib.h"
97 #include "ioAbc.h"
98
99-diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c
100-index 0a68c7e..f0744c6 100644
101---- a/src/base/io/ioWriteAiger.c
102-+++ b/src/base/io/ioWriteAiger.c
103+Index: berkeley-abc/src/base/io/ioWriteAiger.c
104+===================================================================
105+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
106++++ berkeley-abc/src/base/io/ioWriteAiger.c
107 @@ -26,7 +26,7 @@
108 #include <string.h>
109 #include <assert.h>
110@@ -60,3 +60,16 @@ index 0a68c7e..f0744c6 100644
111 #include "misc/zlib/zlib.h"
112 #include "ioAbc.h"
113
114+Index: berkeley-abc/src/base/io/ioReadBlifMv.c
115+===================================================================
116+--- berkeley-abc.orig/src/base/io/ioReadBlifMv.c
117++++ berkeley-abc/src/base/io/ioReadBlifMv.c
118+@@ -19,7 +19,7 @@
119+ ***********************************************************************/
120+
121+ #include "misc/zlib/zlib.h"
122+-#include "misc/bzlib/bzlib.h"
123++#include <bzlib.h>
124+ #include "base/abc/abc.h"
125+ #include "misc/vec/vecPtr.h"
126+ #include "ioAbc.h"
127diff --git a/debian/patches/remove_zlib_convenience.patch b/debian/patches/remove_zlib_convenience.patch
128index 2245f72..be8b60f 100644
129--- a/debian/patches/remove_zlib_convenience.patch
130+++ b/debian/patches/remove_zlib_convenience.patch
131@@ -13,10 +13,10 @@ Forwarded: doesn't make sense upstream
132 src/sat/cnf/cnfMan.c | 2 +-
133 4 files changed, 5 insertions(+), 4 deletions(-)
134
135-diff --git a/Makefile b/Makefile
136-index bb3fbc2..8c58953 100644
137---- a/Makefile
138-+++ b/Makefile
139+Index: berkeley-abc/Makefile
140+===================================================================
141+--- berkeley-abc.orig/Makefile
142++++ berkeley-abc/Makefile
143 @@ -22,7 +22,7 @@ MODULES := \
144 src/map/mapper src/map/mio src/map/super src/map/if \
145 src/map/amap src/map/cov src/map/scl src/map/mpm \
146@@ -26,7 +26,7 @@ index bb3fbc2..8c58953 100644
147 src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
148 src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
149 src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
150-@@ -146,6 +146,7 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin)
151+@@ -146,6 +146,7 @@ ifneq ($(findstring Darwin, $(shell unam
152 endif
153
154 LIBS += -lbz2
155@@ -34,10 +34,10 @@ index bb3fbc2..8c58953 100644
156
157 ifdef ABC_USE_LIBSTDCXX
158 LIBS += -lstdc++
159-diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c
160-index 8be6d21..73f1487 100644
161---- a/src/base/io/ioReadAiger.c
162-+++ b/src/base/io/ioReadAiger.c
163+Index: berkeley-abc/src/base/io/ioReadAiger.c
164+===================================================================
165+--- berkeley-abc.orig/src/base/io/ioReadAiger.c
166++++ berkeley-abc/src/base/io/ioReadAiger.c
167 @@ -27,7 +27,7 @@
168 #include <assert.h>
169
170@@ -47,10 +47,10 @@ index 8be6d21..73f1487 100644
171 #include "ioAbc.h"
172
173 ABC_NAMESPACE_IMPL_START
174-diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c
175-index f0744c6..d265104 100644
176---- a/src/base/io/ioWriteAiger.c
177-+++ b/src/base/io/ioWriteAiger.c
178+Index: berkeley-abc/src/base/io/ioWriteAiger.c
179+===================================================================
180+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
181++++ berkeley-abc/src/base/io/ioWriteAiger.c
182 @@ -27,7 +27,7 @@
183 #include <assert.h>
184
185@@ -60,10 +60,10 @@ index f0744c6..d265104 100644
186 #include "ioAbc.h"
187
188
189-diff --git a/src/sat/cnf/cnfMan.c b/src/sat/cnf/cnfMan.c
190-index f63cc63..b017985 100644
191---- a/src/sat/cnf/cnfMan.c
192-+++ b/src/sat/cnf/cnfMan.c
193+Index: berkeley-abc/src/sat/cnf/cnfMan.c
194+===================================================================
195+--- berkeley-abc.orig/src/sat/cnf/cnfMan.c
196++++ berkeley-abc/src/sat/cnf/cnfMan.c
197 @@ -21,7 +21,7 @@
198 #include "cnf.h"
199 #include "sat/bsat/satSolver.h"
200@@ -73,3 +73,82 @@ index f63cc63..b017985 100644
201
202 ABC_NAMESPACE_IMPL_START
203
204+Index: berkeley-abc/src/base/io/ioReadBlifMv.c
205+===================================================================
206+--- berkeley-abc.orig/src/base/io/ioReadBlifMv.c
207++++ berkeley-abc/src/base/io/ioReadBlifMv.c
208+@@ -18,7 +18,7 @@
209+
210+ ***********************************************************************/
211+
212+-#include "misc/zlib/zlib.h"
213++#include <zlib.h>
214+ #include <bzlib.h>
215+ #include "base/abc/abc.h"
216+ #include "misc/vec/vecPtr.h"
217+ #include "ioAbc.h"
218+Index: berkeley-abc/src/sat/bsat2/MainSat.cpp
219+===================================================================
220+--- berkeley-abc.orig/src/sat/bsat2/MainSat.cpp
221++++ berkeley-abc/src/sat/bsat2/MainSat.cpp
222+@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
223+ #include <errno.h>
224+
225+ #include <signal.h>
226+-#include "misc/zlib/zlib.h"
227++#include <zlib.h>
228+
229+ #include "System.h"
230+ #include "ParseUtils.h"
231+Index: berkeley-abc/src/sat/bsat2/MainSimp.cpp
232+===================================================================
233+--- berkeley-abc.orig/src/sat/bsat2/MainSimp.cpp
234++++ berkeley-abc/src/sat/bsat2/MainSimp.cpp
235+@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
236+ #include <errno.h>
237+
238+ #include <signal.h>
239+-#include "misc/zlib/zlib.h"
240++#include <zlib.h>
241+
242+ #ifndef _WIN32
243+ #include <sys/resource.h>
244+Index: berkeley-abc/src/sat/bsat2/ParseUtils.h
245+===================================================================
246+--- berkeley-abc.orig/src/sat/bsat2/ParseUtils.h
247++++ berkeley-abc/src/sat/bsat2/ParseUtils.h
248+@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
249+ #include <stdlib.h>
250+ #include <stdio.h>
251+
252+-#include "misc/zlib/zlib.h"
253++#include <zlib.h>
254+
255+ namespace Minisat {
256+
257+Index: berkeley-abc/src/sat/glucose/ParseUtils.h
258+===================================================================
259+--- berkeley-abc.orig/src/sat/glucose/ParseUtils.h
260++++ berkeley-abc/src/sat/glucose/ParseUtils.h
261+@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
262+ #include <stdio.h>
263+ #include <math.h>
264+
265+-#include "misc/zlib/zlib.h"
266++#include <zlib.h>
267+
268+ ABC_NAMESPACE_CXX_HEADER_START
269+
270+Index: berkeley-abc/src/sat/glucose2/ParseUtils.h
271+===================================================================
272+--- berkeley-abc.orig/src/sat/glucose2/ParseUtils.h
273++++ berkeley-abc/src/sat/glucose2/ParseUtils.h
274+@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
275+ #include <stdio.h>
276+ #include <math.h>
277+
278+-#include "misc/zlib/zlib.h"
279++#include <zlib.h>
280+
281+ ABC_NAMESPACE_CXX_HEADER_START
282+
283diff --git a/debian/patches/series b/debian/patches/series
284index e6e00fd..ee04cb7 100644
285--- a/debian/patches/series
286+++ b/debian/patches/series
287@@ -7,3 +7,4 @@ writepla.patch
288 0007-Remove-build-date-time-reproducibility-hazard.patch
289 0008-Fix-ioWriteVerilog-segfault.patch
290 0009-Revert-Experiment-with-cost-functions.patch
291+add-missing-include.patch

Subscribers

People subscribed via source and target branches

to all changes: