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
diff --git a/debian/changelog b/debian/changelog
index d0bdad9..a8bf88c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1berkeley-abc (1.01+20230625git01b1bd1+dfsg-3ubuntu1) noble; urgency=medium
2
3 * debian/patches/add-missing-include.patch: Add missing headers to
4 Glucose components. Closes LP: #2060873.
5
6 -- Zixing Liu <zixing.liu@canonical.com> Wed, 10 Apr 2024 14:45:54 -0600
7
1berkeley-abc (1.01+20230625git01b1bd1+dfsg-3build2) noble; urgency=medium8berkeley-abc (1.01+20230625git01b1bd1+dfsg-3build2) noble; urgency=medium
29
3 * No-change rebuild for CVE-2024-309410 * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/add-missing-include.patch b/debian/patches/add-missing-include.patch
4new file mode 10064411new file mode 100644
index 0000000..7084491
--- /dev/null
+++ b/debian/patches/add-missing-include.patch
@@ -0,0 +1,30 @@
1Description: Add missing headers to Glucose components
2Author: Zixing Liu <zixing.liu@canonical.com>
3Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/berkeley-abc/+bug/2060873
4Forwarded: no
5Last-Update: 2024-04-10
6Index: berkeley-abc/src/sat/glucose/Glucose.cpp
7===================================================================
8--- berkeley-abc.orig/src/sat/glucose/Glucose.cpp
9+++ berkeley-abc/src/sat/glucose/Glucose.cpp
10@@ -34,6 +34,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
11 #include "sat/glucose/Constants.h"
12 #include "sat/glucose/System.h"
13
14+#include "misc/util/abc_global.h"
15 ABC_NAMESPACE_IMPL_START
16
17 using namespace Gluco;
18Index: berkeley-abc/src/sat/glucose2/Glucose2.cpp
19===================================================================
20--- berkeley-abc.orig/src/sat/glucose2/Glucose2.cpp
21+++ berkeley-abc/src/sat/glucose2/Glucose2.cpp
22@@ -34,7 +34,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
23 #include "sat/glucose2/Solver.h"
24
25 #include "sat/glucose2/CGlucose.h"
26-
27+#include "misc/util/abc_global.h"
28 ABC_NAMESPACE_IMPL_START
29
30 using namespace Gluco2;
diff --git a/debian/patches/remove_bzlib_convenience.patch b/debian/patches/remove_bzlib_convenience.patch
index 9fabe87..69cbacd 100644
--- a/debian/patches/remove_bzlib_convenience.patch
+++ b/debian/patches/remove_bzlib_convenience.patch
@@ -12,10 +12,10 @@ Forwarded: doesn't make sense upstream
12 src/base/io/ioWriteAiger.c | 2 +-12 src/base/io/ioWriteAiger.c | 2 +-
13 3 files changed, 5 insertions(+), 3 deletions(-)13 3 files changed, 5 insertions(+), 3 deletions(-)
1414
15diff --git a/Makefile b/Makefile15Index: berkeley-abc/Makefile
16index 3976cf7..bb3fbc2 10064416===================================================================
17--- a/Makefile17--- berkeley-abc.orig/Makefile
18+++ b/Makefile18+++ berkeley-abc/Makefile
19@@ -22,7 +22,7 @@ MODULES := \19@@ -22,7 +22,7 @@ MODULES := \
20 src/map/mapper src/map/mio src/map/super src/map/if \20 src/map/mapper src/map/mio src/map/super src/map/if \
21 src/map/amap src/map/cov src/map/scl src/map/mpm \21 src/map/amap src/map/cov src/map/scl src/map/mpm \
@@ -25,7 +25,7 @@ index 3976cf7..bb3fbc2 100644
25 src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \25 src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
26 src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \26 src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
27 src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \27 src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
28@@ -145,6 +145,8 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin)28@@ -145,6 +145,8 @@ ifneq ($(findstring Darwin, $(shell unam
29 LIBS += -lrt29 LIBS += -lrt
30 endif30 endif
31 31
@@ -34,10 +34,10 @@ index 3976cf7..bb3fbc2 100644
34 ifdef ABC_USE_LIBSTDCXX34 ifdef ABC_USE_LIBSTDCXX
35 LIBS += -lstdc++35 LIBS += -lstdc++
36 $(info $(MSG_PREFIX)Using explicit -lstdc++)36 $(info $(MSG_PREFIX)Using explicit -lstdc++)
37diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c37Index: berkeley-abc/src/base/io/ioReadAiger.c
38index 9cf4141..8be6d21 10064438===================================================================
39--- a/src/base/io/ioReadAiger.c39--- berkeley-abc.orig/src/base/io/ioReadAiger.c
40+++ b/src/base/io/ioReadAiger.c40+++ berkeley-abc/src/base/io/ioReadAiger.c
41@@ -26,7 +26,7 @@41@@ -26,7 +26,7 @@
42 #include <string.h>42 #include <string.h>
43 #include <assert.h>43 #include <assert.h>
@@ -47,10 +47,10 @@ index 9cf4141..8be6d21 100644
47 #include "misc/zlib/zlib.h"47 #include "misc/zlib/zlib.h"
48 #include "ioAbc.h"48 #include "ioAbc.h"
49 49
50diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c50Index: berkeley-abc/src/base/io/ioWriteAiger.c
51index 0a68c7e..f0744c6 10064451===================================================================
52--- a/src/base/io/ioWriteAiger.c52--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
53+++ b/src/base/io/ioWriteAiger.c53+++ berkeley-abc/src/base/io/ioWriteAiger.c
54@@ -26,7 +26,7 @@54@@ -26,7 +26,7 @@
55 #include <string.h>55 #include <string.h>
56 #include <assert.h>56 #include <assert.h>
@@ -60,3 +60,16 @@ index 0a68c7e..f0744c6 100644
60 #include "misc/zlib/zlib.h"60 #include "misc/zlib/zlib.h"
61 #include "ioAbc.h"61 #include "ioAbc.h"
62 62
63Index: berkeley-abc/src/base/io/ioReadBlifMv.c
64===================================================================
65--- berkeley-abc.orig/src/base/io/ioReadBlifMv.c
66+++ berkeley-abc/src/base/io/ioReadBlifMv.c
67@@ -19,7 +19,7 @@
68 ***********************************************************************/
69
70 #include "misc/zlib/zlib.h"
71-#include "misc/bzlib/bzlib.h"
72+#include <bzlib.h>
73 #include "base/abc/abc.h"
74 #include "misc/vec/vecPtr.h"
75 #include "ioAbc.h"
diff --git a/debian/patches/remove_zlib_convenience.patch b/debian/patches/remove_zlib_convenience.patch
index 2245f72..be8b60f 100644
--- a/debian/patches/remove_zlib_convenience.patch
+++ b/debian/patches/remove_zlib_convenience.patch
@@ -13,10 +13,10 @@ Forwarded: doesn't make sense upstream
13 src/sat/cnf/cnfMan.c | 2 +-13 src/sat/cnf/cnfMan.c | 2 +-
14 4 files changed, 5 insertions(+), 4 deletions(-)14 4 files changed, 5 insertions(+), 4 deletions(-)
1515
16diff --git a/Makefile b/Makefile16Index: berkeley-abc/Makefile
17index bb3fbc2..8c58953 10064417===================================================================
18--- a/Makefile18--- berkeley-abc.orig/Makefile
19+++ b/Makefile19+++ berkeley-abc/Makefile
20@@ -22,7 +22,7 @@ MODULES := \20@@ -22,7 +22,7 @@ MODULES := \
21 src/map/mapper src/map/mio src/map/super src/map/if \21 src/map/mapper src/map/mio src/map/super src/map/if \
22 src/map/amap src/map/cov src/map/scl src/map/mpm \22 src/map/amap src/map/cov src/map/scl src/map/mpm \
@@ -26,7 +26,7 @@ index bb3fbc2..8c58953 100644
26 src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \26 src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
27 src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \27 src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
28 src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \28 src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
29@@ -146,6 +146,7 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin)29@@ -146,6 +146,7 @@ ifneq ($(findstring Darwin, $(shell unam
30 endif30 endif
31 31
32 LIBS += -lbz232 LIBS += -lbz2
@@ -34,10 +34,10 @@ index bb3fbc2..8c58953 100644
34 34
35 ifdef ABC_USE_LIBSTDCXX35 ifdef ABC_USE_LIBSTDCXX
36 LIBS += -lstdc++36 LIBS += -lstdc++
37diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c37Index: berkeley-abc/src/base/io/ioReadAiger.c
38index 8be6d21..73f1487 10064438===================================================================
39--- a/src/base/io/ioReadAiger.c39--- berkeley-abc.orig/src/base/io/ioReadAiger.c
40+++ b/src/base/io/ioReadAiger.c40+++ berkeley-abc/src/base/io/ioReadAiger.c
41@@ -27,7 +27,7 @@41@@ -27,7 +27,7 @@
42 #include <assert.h>42 #include <assert.h>
43 43
@@ -47,10 +47,10 @@ index 8be6d21..73f1487 100644
47 #include "ioAbc.h"47 #include "ioAbc.h"
48 48
49 ABC_NAMESPACE_IMPL_START49 ABC_NAMESPACE_IMPL_START
50diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c50Index: berkeley-abc/src/base/io/ioWriteAiger.c
51index f0744c6..d265104 10064451===================================================================
52--- a/src/base/io/ioWriteAiger.c52--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
53+++ b/src/base/io/ioWriteAiger.c53+++ berkeley-abc/src/base/io/ioWriteAiger.c
54@@ -27,7 +27,7 @@54@@ -27,7 +27,7 @@
55 #include <assert.h>55 #include <assert.h>
56 56
@@ -60,10 +60,10 @@ index f0744c6..d265104 100644
60 #include "ioAbc.h"60 #include "ioAbc.h"
61 61
62 62
63diff --git a/src/sat/cnf/cnfMan.c b/src/sat/cnf/cnfMan.c63Index: berkeley-abc/src/sat/cnf/cnfMan.c
64index f63cc63..b017985 10064464===================================================================
65--- a/src/sat/cnf/cnfMan.c65--- berkeley-abc.orig/src/sat/cnf/cnfMan.c
66+++ b/src/sat/cnf/cnfMan.c66+++ berkeley-abc/src/sat/cnf/cnfMan.c
67@@ -21,7 +21,7 @@67@@ -21,7 +21,7 @@
68 #include "cnf.h"68 #include "cnf.h"
69 #include "sat/bsat/satSolver.h"69 #include "sat/bsat/satSolver.h"
@@ -73,3 +73,82 @@ index f63cc63..b017985 100644
73 73
74 ABC_NAMESPACE_IMPL_START74 ABC_NAMESPACE_IMPL_START
75 75
76Index: berkeley-abc/src/base/io/ioReadBlifMv.c
77===================================================================
78--- berkeley-abc.orig/src/base/io/ioReadBlifMv.c
79+++ berkeley-abc/src/base/io/ioReadBlifMv.c
80@@ -18,7 +18,7 @@
81
82 ***********************************************************************/
83
84-#include "misc/zlib/zlib.h"
85+#include <zlib.h>
86 #include <bzlib.h>
87 #include "base/abc/abc.h"
88 #include "misc/vec/vecPtr.h"
89 #include "ioAbc.h"
90Index: berkeley-abc/src/sat/bsat2/MainSat.cpp
91===================================================================
92--- berkeley-abc.orig/src/sat/bsat2/MainSat.cpp
93+++ berkeley-abc/src/sat/bsat2/MainSat.cpp
94@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
95 #include <errno.h>
96
97 #include <signal.h>
98-#include "misc/zlib/zlib.h"
99+#include <zlib.h>
100
101 #include "System.h"
102 #include "ParseUtils.h"
103Index: berkeley-abc/src/sat/bsat2/MainSimp.cpp
104===================================================================
105--- berkeley-abc.orig/src/sat/bsat2/MainSimp.cpp
106+++ berkeley-abc/src/sat/bsat2/MainSimp.cpp
107@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
108 #include <errno.h>
109
110 #include <signal.h>
111-#include "misc/zlib/zlib.h"
112+#include <zlib.h>
113
114 #ifndef _WIN32
115 #include <sys/resource.h>
116Index: berkeley-abc/src/sat/bsat2/ParseUtils.h
117===================================================================
118--- berkeley-abc.orig/src/sat/bsat2/ParseUtils.h
119+++ berkeley-abc/src/sat/bsat2/ParseUtils.h
120@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
121 #include <stdlib.h>
122 #include <stdio.h>
123
124-#include "misc/zlib/zlib.h"
125+#include <zlib.h>
126
127 namespace Minisat {
128
129Index: berkeley-abc/src/sat/glucose/ParseUtils.h
130===================================================================
131--- berkeley-abc.orig/src/sat/glucose/ParseUtils.h
132+++ berkeley-abc/src/sat/glucose/ParseUtils.h
133@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
134 #include <stdio.h>
135 #include <math.h>
136
137-#include "misc/zlib/zlib.h"
138+#include <zlib.h>
139
140 ABC_NAMESPACE_CXX_HEADER_START
141
142Index: berkeley-abc/src/sat/glucose2/ParseUtils.h
143===================================================================
144--- berkeley-abc.orig/src/sat/glucose2/ParseUtils.h
145+++ berkeley-abc/src/sat/glucose2/ParseUtils.h
146@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
147 #include <stdio.h>
148 #include <math.h>
149
150-#include "misc/zlib/zlib.h"
151+#include <zlib.h>
152
153 ABC_NAMESPACE_CXX_HEADER_START
154
diff --git a/debian/patches/series b/debian/patches/series
index e6e00fd..ee04cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ writepla.patch
70007-Remove-build-date-time-reproducibility-hazard.patch70007-Remove-build-date-time-reproducibility-hazard.patch
80008-Fix-ioWriteVerilog-segfault.patch80008-Fix-ioWriteVerilog-segfault.patch
90009-Revert-Experiment-with-cost-functions.patch90009-Revert-Experiment-with-cost-functions.patch
10add-missing-include.patch

Subscribers

People subscribed via source and target branches

to all changes: