packages/libpcap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete -S git from %autosetup,and delete Buildrequires git

Browse Source
This commit is contained in:
yangl777 2021-08-09 17:29:44 +08:00 committed by yangl777
parent df7f3ef192
commit e1b5990528
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0875-optimize-make-some-variables-unsigned.patch
View File

@ -6,11 +6,11 @@ Subject: [PATCH 875/977] optimize: make some variables unsigned.
That should avoid some overflow failure modes, and allow saner overflow
checking.
---
optimize.c | 92 ++++++++++++++++++++++++++++++++++++++------------------------
optimize.c | 92 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 57 insertions(+), 35 deletions(-)
diff --git a/optimize.c b/optimize.c
index 325d4ff..bea8cdc 100644
index a70dfc5..d90b463 100644
--- a/optimize.c
+++ b/optimize.c
@@ -115,7 +115,7 @@ pcap_set_print_dot_graph(int value)
@ -70,7 +70,7 @@ index 325d4ff..bea8cdc 100644
0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
};
@@ -257,17 +257,17 @@ typedef struct {
@@ -244,17 +244,17 @@ typedef struct {
*/
int done;
@ -92,7 +92,7 @@ index 325d4ff..bea8cdc 100644
struct block **levels;
bpf_u_int32 *space;
@@ -292,32 +292,35 @@ typedef struct {
@@ -279,32 +279,35 @@ typedef struct {
/*
* a := a intersect b
@ -134,7 +134,7 @@ index 325d4ff..bea8cdc 100644
}
uset all_dom_sets;
@@ -414,7 +417,8 @@ find_levels(opt_state_t *opt_state, struct icode *ic)
@@ -401,7 +404,8 @@ find_levels(opt_state_t *opt_state, struct icode *ic)
static void
find_dom(opt_state_t *opt_state, struct block *root)
{
@ -144,7 +144,7 @@ index 325d4ff..bea8cdc 100644
struct block *b;
bpf_u_int32 *x;
@@ -422,16 +426,25 @@ find_dom(opt_state_t *opt_state, struct block *root)
@@ -409,16 +413,25 @@ find_dom(opt_state_t *opt_state, struct block *root)
* Initialize sets to contain all nodes.
*/
x = opt_state->all_dom_sets;
@ -174,7 +174,7 @@ index 325d4ff..bea8cdc 100644
SET_INSERT(b->dom, b->id);
if (JT(b) == 0)
continue;
@@ -458,19 +471,28 @@ propedom(opt_state_t *opt_state, struct edge *ep)
@@ -445,19 +458,28 @@ propedom(opt_state_t *opt_state, struct edge *ep)
static void
find_edom(opt_state_t *opt_state, struct block *root)
{
@ -207,7 +207,7 @@ index 325d4ff..bea8cdc 100644
propedom(opt_state, &b->et);
propedom(opt_state, &b->ef);
}
@@ -487,7 +509,7 @@ find_edom(opt_state_t *opt_state, struct block *root)
@@ -474,7 +496,7 @@ find_edom(opt_state_t *opt_state, struct block *root)
static void
find_closure(opt_state_t *opt_state, struct block *root)
{
@ -216,7 +216,7 @@ index 325d4ff..bea8cdc 100644
struct block *b;
/*
@@ -497,8 +519,8 @@ find_closure(opt_state_t *opt_state, struct block *root)
@@ -484,8 +506,8 @@ find_closure(opt_state_t *opt_state, struct block *root)
opt_state->n_blocks * opt_state->nodewords * sizeof(*opt_state->all_closure_sets));
/* root->level is the highest level no found. */
@ -227,7 +227,7 @@ index 325d4ff..bea8cdc 100644
SET_INSERT(b->closure, b->id);
if (JT(b) == 0)
continue;
@@ -1674,6 +1696,6 @@ fold_edge(struct block *child, struct edge *ep)
@@ -1555,7 +1577,7 @@ fold_edge(struct block *child, struct edge *ep)
static void
opt_j(opt_state_t *opt_state, struct edge *ep)
{
@ -235,7 +235,8 @@ index 325d4ff..bea8cdc 100644
+ register u_int i, k;
register struct block *target;
@@ -2116,17 +2138,16 @@ link_inedge(struct edge *parent, struct block *child)
if (JT(ep->succ) == 0)
@@ -1839,17 +1861,16 @@ link_inedge(struct edge *parent, struct block *child)
static void
find_inedges(opt_state_t *opt_state, struct block *root)
{
@ -255,7 +256,7 @@ index 325d4ff..bea8cdc 100644
for (b = opt_state->levels[i]; b != 0; b = b->link) {
link_inedge(&b->et, JT(b));
link_inedge(&b->ef, JF(b));
@@ -2336,7 +2357,7 @@ static void
@@ -2005,7 +2026,7 @@ static void
intern_blocks(opt_state_t *opt_state, struct icode *ic)
{
struct block *p;
@ -264,7 +265,7 @@ index 325d4ff..bea8cdc 100644
int done1; /* don't shadow global */
top:
done1 = 1;
@@ -2345,7 +2366,8 @@ intern_blocks(opt_state_t *opt_state, struct icode *ic)
@@ -2014,7 +2035,8 @@ intern_blocks(opt_state_t *opt_state, struct icode *ic)
mark_code(ic);
@ -275,5 +276,5 @@ index 325d4ff..bea8cdc 100644
continue;
for (j = i + 1; j < opt_state->n_blocks; ++j) {
--
1.8.3.1
2.27.0

9
libpcap.spec
View File

@ -1,7 +1,7 @@
Name: libpcap
Epoch: 14
Version: 1.9.1
Release: 7
Release: 8
Summary: A system-independent interface for user-level packet capture
License: BSD with advertising
URL: http://www.tcpdump.org
@ -15,7 +15,7 @@ Patch4: 0875-optimize-make-some-variables-unsigned.patch
Patch5: 0876-optimize-fix-some-of-those-changes.patch
Patch6: pcap-config-mitigate-multilib-conflict.patch
BuildRequires: bison bluez-libs-devel flex gcc git glibc-kernheaders >= 2.2.0
BuildRequires: bison bluez-libs-devel flex gcc glibc-kernheaders >= 2.2.0
%description
This is the official web site of tcpdump, a powerful command-line
@ -32,7 +32,7 @@ header files for libpcap
%package_help
%prep
%autosetup -n %{name}-%{version} -S git
%autosetup -n %{name}-%{version} -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@ -64,6 +64,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%{_mandir}/man*
%changelog
* Mon Aug 09 2021 yanglu <yanglu72@huawei.com> - 14:1.9.1-8
- DESC:delete -S git from %autosetup,and delete Buildrequires git
* Sat Nov 28 2020 xiaqirong <xiaqirong1@huawei.com> - 14:1.9.1-7
- Type:bugfix
- ID:NA