rpms/libevent
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c8
Branches Tags
rpms:c8
rpms:c9s
rpms:c10s
rpms:c10
rpms:c9
rpms:c8s
rpms:c9-beta
rpms:c8-beta
rpms:imports/c10/libevent-2.1.12-16.el10_0
rpms:imports/c10s/libevent-2.1.12-16.el10
rpms:imports/c9/libevent-2.1.12-8.el9_4
rpms:imports/c10s/libevent-2.1.12-15.el10
rpms:imports/c10s/libevent-2.1.12-14.el10
rpms:imports/c9/libevent-2.1.12-6.el9
rpms:imports/c9-beta/libevent-2.1.12-6.el9
rpms:imports/c8-beta/libevent-2.1.8-5.el8
rpms:imports/c8/libevent-2.1.8-5.el8
...
pull from: rpms:c9-beta
Branches Tags
rpms:c9s
rpms:c10s
rpms:c10
rpms:c9
rpms:c8s
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:imports/c10/libevent-2.1.12-16.el10_0
rpms:imports/c10s/libevent-2.1.12-16.el10
rpms:imports/c9/libevent-2.1.12-8.el9_4
rpms:imports/c10s/libevent-2.1.12-15.el10
rpms:imports/c10s/libevent-2.1.12-14.el10
rpms:imports/c9/libevent-2.1.12-6.el9
rpms:imports/c9-beta/libevent-2.1.12-6.el9
rpms:imports/c8-beta/libevent-2.1.8-5.el8
rpms:imports/c8/libevent-2.1.8-5.el8

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

7 changed files with 188 additions and 528 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libevent-2.1.8-stable.tar.gz
SOURCES/libevent-2.1.12-stable.tar.gz

2
.libevent.metadata
View File

@ -1 +1 @@
2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec SOURCES/libevent-2.1.8-stable.tar.gz
cd55656a9b5bed630b08f05495230affb7996b21 SOURCES/libevent-2.1.12-stable.tar.gz

43
SOURCES/0001-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch Normal file
View File

@ -0,0 +1,43 @@
From 7905dba8cf136574b87c972cf1f91a8f95b9df8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Tue, 29 Sep 2020 17:37:18 +0200
Subject: [PATCH] Revert "Fix checking return value of the
evdns_base_resolv_conf_parse()"
This reverts commit fc51bf2c5b686f623c9a2906ddad4042d5c3b39a.
---
evdns.c | 2 +-
sample/dns-example.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/evdns.c b/evdns.c
index a5b31a3c..4aef28ec 100644
--- a/evdns.c
+++ b/evdns.c
@@ -4035,7 +4035,7 @@ evdns_base_new(struct event_base *event_base, int flags)
#else
r = evdns_base_resolv_conf_parse(base, opts, "/etc/resolv.conf");
#endif
- if (r) {
+ if (r == -1) {
evdns_base_free_and_unlock(base, 0);
return NULL;
}
diff --git a/sample/dns-example.c b/sample/dns-example.c
index 2d07c387..21a75de8 100644
--- a/sample/dns-example.c
+++ b/sample/dns-example.c
@@ -225,8 +225,8 @@ main(int c, char **v) {
res = evdns_base_resolv_conf_parse(evdns_base,
DNS_OPTION_NAMESERVERS, o.resolv_conf);
- if (res) {
- fprintf(stderr, "Couldn't configure nameservers\n");
+ if (res < 0) {
+ fprintf(stderr, "Couldn't configure nameservers");
return 1;
}
}
--
2.25.4

26
SOURCES/0001-build-add-doxygen-to-all.patch Normal file
View File

@ -0,0 +1,26 @@
From e3e7bb212ea17aa8a9d5a30163487342e6ebb350 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <azat@libevent.org>
Date: Tue, 11 Aug 2020 02:12:23 +0300
Subject: [PATCH] build: add doxygen to all
Fixes: 7e6c5fb4 ("build: do not try install doxygen man pages if they were not requested")
Fixes: #1075
Fixes: #886
---
doxygen.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/doxygen.am b/doxygen.am
index 53da8d24..1377aacd 100644
--- a/doxygen.am
+++ b/doxygen.am
@@ -53,5 +53,6 @@ uninstall-local:
rmdir "$(DESTDIR)$(htmldir)/" || true
doxygen: doxygen-doc
+all: doxygen
endif ENABLE_DOXYGEN
--
2.25.4

43
SOURCES/0001-build-do-not-try-install-doxygen-man-pages-if-they-w.patch Normal file
View File

@ -0,0 +1,43 @@
From 7e6c5fb46ae9d0f135cdcdb4f8d0376cf25320fd Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <azat@libevent.org>
Date: Thu, 6 Aug 2020 10:24:55 +0300
Subject: [PATCH] build: do not try install doxygen man pages if they were not
requested
Fixes: #1075
---
doxygen.am | 2 ++
m4/ax_prog_doxygen.m4 | 1 +
2 files changed, 3 insertions(+)
diff --git a/doxygen.am b/doxygen.am
index 916d7c40..53da8d24 100644
--- a/doxygen.am
+++ b/doxygen.am
@@ -17,9 +17,11 @@ if ENABLE_DOXYGEN
clean-local:
-rm -rf $(DX_CLEANFILES)
+if ENABLE_DOXYGEN_MAN
# integrate doxygen with automake targets
man3_MANS = @DX_DOCDIR@/man/man3/*
$(man3_MANS): doxygen-doc
+endif ENABLE_DOXYGEN_MAN
# Docs will be installed. It may be one or more docs supported
# by doxygen, but does not include 'man'.
diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4
index e5bdeb59..338e4646 100644
--- a/m4/ax_prog_doxygen.m4
+++ b/m4/ax_prog_doxygen.m4
@@ -574,6 +574,7 @@ DX_INSTALL_DOCS = \\
\$(DX_CLEAN_HTML) \\
\$(DX_CLEAN_CHM) \\
\$(DX_CLEAN_CHI) \\
+ \$(DX_CLEAN_MAN) \\
\$(DX_CLEAN_RTF) \\
\$(DX_CLEAN_XML) \\
\$(DX_CLEAN_PS) \\
--
2.25.4

502
SOURCES/port-scripts-to-python3.patch
View File

@ -1,502 +0,0 @@
diff --git a/event_rpcgen.py b/event_rpcgen.py
index 9baf730..2004090 100755
--- a/event_rpcgen.py
+++ b/event_rpcgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
#
# Copyright (c) 2005-2007 Niels Provos <provos@citi.umich.edu>
# Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -36,10 +36,10 @@ QUIETLY = 0
def declare(s):
if not QUIETLY:
- print s
+ print(s)
def TranslateList(mylist, mydict):
- return map(lambda x: x % mydict, mylist)
+ return [x % mydict for x in mylist]
# Exception class for parse errors
class RpcGenError(Exception):
@@ -57,7 +57,7 @@ class Struct:
declare(' Created struct: %s' % name)
def AddEntry(self, entry):
- if self._tags.has_key(entry.Tag()):
+ if entry.Tag() in self._tags:
raise RpcGenError(
'Entry "%s" duplicates tag number %d from "%s" '
'around line %d' % (entry.Name(), entry.Tag(),
@@ -78,7 +78,7 @@ class Struct:
def PrintIndented(self, file, ident, code):
"""Takes an array, add indentation to each entry and prints it."""
for entry in code:
- print >>file, '%s%s' % (ident, entry)
+ file.write('%s%s\n' % (ident, entry))
class StructCCode(Struct):
""" Knows how to generate C code for a struct """
@@ -88,20 +88,19 @@ class StructCCode(Struct):
def PrintTags(self, file):
"""Prints the tag definitions for a structure."""
- print >>file, '/* Tag definition for %s */' % self._name
- print >>file, 'enum %s_ {' % self._name.lower()
+ file.write('/* Tag definition for %s */\n' % self._name)
+ file.write('enum %s_ {\n' % self._name.lower())
for entry in self._entries:
- print >>file, ' %s=%d,' % (self.EntryTagName(entry),
- entry.Tag())
- print >>file, ' %s_MAX_TAGS' % (self._name.upper())
- print >>file, '};\n'
+ file.write(' %s=%d,\n' % (self.EntryTagName(entry), entry.Tag()))
+ file.write(' %s_MAX_TAGS\n' % (self._name.upper()))
+ file.write('};\n\n')
def PrintForwardDeclaration(self, file):
- print >>file, 'struct %s;' % self._name
+ file.write('struct %s;\n' % self._name)
def PrintDeclaration(self, file):
- print >>file, '/* Structure declaration for %s */' % self._name
- print >>file, 'struct %s_access_ {' % self._name
+ file.write('/* Structure declaration for %s */\n' % self._name)
+ file.write('struct %s_access_ {\n' % self._name)
for entry in self._entries:
dcl = entry.AssignDeclaration('(*%s_assign)' % entry.Name())
dcl.extend(
@@ -110,20 +109,19 @@ class StructCCode(Struct):
dcl.extend(
entry.AddDeclaration('(*%s_add)' % entry.Name()))
self.PrintIndented(file, ' ', dcl)
- print >>file, '};\n'
+ file.write('};\n\n')
- print >>file, 'struct %s {' % self._name
- print >>file, ' struct %s_access_ *base;\n' % self._name
+ file.write('struct %s {\n' % self._name)
+ file.write(' struct %s_access_ *base;\n\n' % self._name)
for entry in self._entries:
dcl = entry.Declaration()
self.PrintIndented(file, ' ', dcl)
- print >>file, ''
+ file.write('\n')
for entry in self._entries:
- print >>file, ' ev_uint8_t %s_set;' % entry.Name()
- print >>file, '};\n'
+ file.write(' ev_uint8_t %s_set;\n' % entry.Name())
+ file.write('};\n\n')
- print >>file, \
-"""struct %(name)s *%(name)s_new(void);
+ file.write("""struct %(name)s *%(name)s_new(void);
struct %(name)s *%(name)s_new_with_arg(void *);
void %(name)s_free(struct %(name)s *);
void %(name)s_clear(struct %(name)s *);
@@ -133,7 +131,7 @@ int %(name)s_complete(struct %(name)s *);
void evtag_marshal_%(name)s(struct evbuffer *, ev_uint32_t,
const struct %(name)s *);
int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
- struct %(name)s *);""" % { 'name' : self._name }
+ struct %(name)s *);\n""" % { 'name' : self._name })
# Write a setting function of every variable
@@ -146,22 +144,21 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
self.PrintIndented(file, '', entry.AddDeclaration(
entry.AddFuncName()))
- print >>file, '/* --- %s done --- */\n' % self._name
+ file.write('/* --- %s done --- */\n\n' % self._name)
def PrintCode(self, file):
- print >>file, ('/*\n'
+ file.write(('/*\n'
' * Implementation of %s\n'
- ' */\n') % self._name
+ ' */\n\n') % self._name)
- print >>file, \
- 'static struct %(name)s_access_ %(name)s_base__ = {' % \
- { 'name' : self._name }
+ file.write('static struct %(name)s_access_ %(name)s_base__ = {\n' % \
+ { 'name' : self._name })
for entry in self._entries:
self.PrintIndented(file, ' ', entry.CodeBase())
- print >>file, '};\n'
+ file.write('};\n\n')
# Creation
- print >>file, (
+ file.write((
'struct %(name)s *\n'
'%(name)s_new(void)\n'
'{\n'
@@ -176,77 +173,77 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
' event_warn("%%s: malloc", __func__);\n'
' return (NULL);\n'
' }\n'
- ' tmp->base = &%(name)s_base__;\n') % { 'name' : self._name }
+ ' tmp->base = &%(name)s_base__;\n\n') % { 'name' : self._name })
for entry in self._entries:
self.PrintIndented(file, ' ', entry.CodeInitialize('tmp'))
- print >>file, ' tmp->%s_set = 0;\n' % entry.Name()
+ file.write(' tmp->%s_set = 0;\n\n' % entry.Name())
- print >>file, (
+ file.write((
' return (tmp);\n'
- '}\n')
+ '}\n\n'))
# Adding
for entry in self._entries:
if entry.Array():
self.PrintIndented(file, '', entry.CodeAdd())
- print >>file, ''
+ file.write('\n')
# Assigning
for entry in self._entries:
self.PrintIndented(file, '', entry.CodeAssign())
- print >>file, ''
+ file.write('\n')
# Getting
for entry in self._entries:
self.PrintIndented(file, '', entry.CodeGet())
- print >>file, ''
+ file.write('\n')
# Clearing
- print >>file, ( 'void\n'
+ file.write(( 'void\n'
'%(name)s_clear(struct %(name)s *tmp)\n'
'{'
- ) % { 'name' : self._name }
+ '\n') % { 'name' : self._name })
for entry in self._entries:
self.PrintIndented(file, ' ', entry.CodeClear('tmp'))
- print >>file, '}\n'
+ file.write('}\n\n')
# Freeing
- print >>file, ( 'void\n'
+ file.write(( 'void\n'
'%(name)s_free(struct %(name)s *tmp)\n'
'{'
- ) % { 'name' : self._name }
+ '\n') % { 'name' : self._name })
for entry in self._entries:
self.PrintIndented(file, ' ', entry.CodeFree('tmp'))
- print >>file, (' free(tmp);\n'
- '}\n')
+ file.write((' free(tmp);\n'
+ '}\n\n'))
# Marshaling
- print >>file, ('void\n'
+ file.write(('void\n'
'%(name)s_marshal(struct evbuffer *evbuf, '
'const struct %(name)s *tmp)'
- '{') % { 'name' : self._name }
+ '{\n') % { 'name' : self._name })
for entry in self._entries:
indent = ' '
# Optional entries do not have to be set
if entry.Optional():
indent += ' '
- print >>file, ' if (tmp->%s_set) {' % entry.Name()
+ file.write(' if (tmp->%s_set) {\n' % entry.Name())
self.PrintIndented(
file, indent,
entry.CodeMarshal('evbuf', self.EntryTagName(entry),
entry.GetVarName('tmp'),
entry.GetVarLen('tmp')))
if entry.Optional():
- print >>file, ' }'
+ file.write(' }\n')
- print >>file, '}\n'
+ file.write('}\n\n')
# Unmarshaling
- print >>file, ('int\n'
+ file.write(('int\n'
'%(name)s_unmarshal(struct %(name)s *tmp, '
' struct evbuffer *evbuf)\n'
'{\n'
@@ -255,14 +252,14 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
' if (evtag_peek(evbuf, &tag) == -1)\n'
' return (-1);\n'
' switch (tag) {\n'
- ) % { 'name' : self._name }
+ '\n') % { 'name' : self._name })
for entry in self._entries:
- print >>file, ' case %s:\n' % self.EntryTagName(entry)
+ file.write(' case %s:\n' % self.EntryTagName(entry))
if not entry.Array():
- print >>file, (
+ file.write((
' if (tmp->%s_set)\n'
' return (-1);'
- ) % (entry.Name())
+ '\n') % (entry.Name()))
self.PrintIndented(
file, ' ',
@@ -271,26 +268,26 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
entry.GetVarName('tmp'),
entry.GetVarLen('tmp')))
- print >>file, ( ' tmp->%s_set = 1;\n' % entry.Name() +
- ' break;\n' )
- print >>file, ( ' default:\n'
+ file.write(( ' tmp->%s_set = 1;\n' % entry.Name() +
+ ' break;\n' ))
+ file.write(( ' default:\n'
' return -1;\n'
' }\n'
- ' }\n' )
+ ' }\n\n' ))
# Check if it was decoded completely
- print >>file, ( ' if (%(name)s_complete(tmp) == -1)\n'
+ file.write(( ' if (%(name)s_complete(tmp) == -1)\n'
' return (-1);'
- ) % { 'name' : self._name }
+ '\n') % { 'name' : self._name })
# Successfully decoded
- print >>file, ( ' return (0);\n'
- '}\n')
+ file.write(( ' return (0);\n'
+ '}\n\n'))
# Checking if a structure has all the required data
- print >>file, (
+ file.write((
'int\n'
'%(name)s_complete(struct %(name)s *msg)\n'
- '{' ) % { 'name' : self._name }
+ '{\n' ) % { 'name' : self._name })
for entry in self._entries:
if not entry.Optional():
code = [
@@ -303,12 +300,12 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
self.PrintIndented(
file, ' ',
entry.CodeComplete('msg', entry.GetVarName('msg')))
- print >>file, (
+ file.write((
' return (0);\n'
- '}\n' )
+ '}\n\n' ))
# Complete message unmarshaling
- print >>file, (
+ file.write((
'int\n'
'evtag_unmarshal_%(name)s(struct evbuffer *evbuf, '
'ev_uint32_t need_tag, struct %(name)s *msg)\n'
@@ -330,10 +327,10 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
' error:\n'
' evbuffer_free(tmp);\n'
' return (res);\n'
- '}\n' ) % { 'name' : self._name }
+ '}\n\n' ) % { 'name' : self._name })
# Complete message marshaling
- print >>file, (
+ file.write((
'void\n'
'evtag_marshal_%(name)s(struct evbuffer *evbuf, ev_uint32_t tag, '
'const struct %(name)s *msg)\n'
@@ -343,7 +340,7 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
' %(name)s_marshal(buf_, msg);\n'
' evtag_marshal_buffer(evbuf, tag, buf_);\n '
' evbuffer_free(buf_);\n'
- '}\n' ) % { 'name' : self._name }
+ '}\n\n' ) % { 'name' : self._name })
class Entry:
def __init__(self, type, name, tag):
@@ -420,7 +417,7 @@ class Entry:
"optaddarg" :
self._optaddarg and ", const %s value" % self._ctype or ""
}
- for (k, v) in extradict.items():
+ for (k, v) in list(extradict.items()):
mapping[k] = v
return mapping
@@ -1127,7 +1124,7 @@ class EntryArray(Entry):
codearrayassign = self._entry.CodeArrayAssign(
'msg->%(name)s_data[off]' % self.GetTranslation(), 'value')
- code += map(lambda x: ' ' + x, codearrayassign)
+ code += [' ' + x for x in codearrayassign]
code += TranslateList([
' }',
@@ -1168,7 +1165,7 @@ class EntryArray(Entry):
code = TranslateList(code, self.GetTranslation())
- code += map(lambda x: ' ' + x, codearrayadd)
+ code += [' ' + x for x in codearrayadd]
code += TranslateList([
' msg->%(name)s_set = 1;',
@@ -1196,7 +1193,7 @@ class EntryArray(Entry):
code = TranslateList(code, translate)
- code += map(lambda x: ' ' + x, tmp)
+ code += [' ' + x for x in tmp]
code += [
' }',
@@ -1261,7 +1258,7 @@ class EntryArray(Entry):
code = TranslateList(code, translate)
if codearrayfree:
- code += map(lambda x: ' ' + x, codearrayfree)
+ code += [' ' + x for x in codearrayfree]
code += [
' }' ]
@@ -1687,23 +1684,23 @@ class CommandLine:
declare('... creating "%s"' % header_file)
header_fp = open(header_file, 'w')
- print >>header_fp, factory.HeaderPreamble(filename)
+ header_fp.write(factory.HeaderPreamble(filename))
# Create forward declarations: allows other structs to reference
# each other
for entry in entities:
entry.PrintForwardDeclaration(header_fp)
- print >>header_fp, ''
+ header_fp.write('\n')
for entry in entities:
entry.PrintTags(header_fp)
entry.PrintDeclaration(header_fp)
- print >>header_fp, factory.HeaderPostamble(filename)
+ header_fp.write(factory.HeaderPostamble(filename))
header_fp.close()
declare('... creating "%s"' % impl_file)
impl_fp = open(impl_file, 'w')
- print >>impl_fp, factory.BodyPreamble(filename, header_file)
+ impl_fp.write(factory.BodyPreamble(filename, header_file))
for entry in entities:
entry.PrintCode(impl_fp)
impl_fp.close()
@@ -1713,16 +1710,16 @@ if __name__ == '__main__':
CommandLine(sys.argv).run()
sys.exit(0)
- except RpcGenError, e:
- print >>sys.stderr, e
+ except RpcGenError as e:
+ sys.stderr.write(e)
sys.exit(1)
- except EnvironmentError, e:
+ except EnvironmentError as e:
if e.filename and e.strerror:
- print >>sys.stderr, "%s: %s" % (e.filename, e.strerror)
+ sys.stderr.write("%s: %s" % (e.filename, e.strerror))
sys.exit(1)
elif e.strerror:
- print >> sys.stderr, e.strerror
+ sys.stderr.write(e.strerror)
sys.exit(1)
else:
raise
diff --git a/test/check-dumpevents.py b/test/check-dumpevents.py
index 16fe9bc..3e1df30 100755
--- a/test/check-dumpevents.py
+++ b/test/check-dumpevents.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
#
# Post-process the output of test-dumpevents and check it for correctness.
#
@@ -15,12 +15,12 @@ try:
got_inserted_pos = text.index("Inserted events:\n")
got_active_pos = text.index("Active events:\n")
except ValueError:
- print >>sys.stderr, "Missing expected dividing line in dumpevents output"
+ sys.stderr.write("Missing expected dividing line in dumpevents output")
sys.exit(1)
if not (expect_inserted_pos < expect_active_pos <
got_inserted_pos < got_active_pos):
- print >>sys.stderr, "Sections out of order in dumpevents output"
+ sys.stderr.write("Sections out of order in dumpevents output")
sys.exit(1)
now,T= text[1].split()
@@ -45,10 +45,10 @@ cleaned_inserted = set( pat.sub(replace_time, s) for s in got_inserted
if "Internal" not in s)
if cleaned_inserted != want_inserted:
- print >>sys.stderr, "Inserted event lists were not as expected!"
+ sys.stderr.write("Inserted event lists were not as expected!")
sys.exit(1)
if set(got_active) != set(want_active):
- print >>sys.stderr, "Active event lists were not as expected!"
+ sys.stderr.write("Active event lists were not as expected!")
sys.exit(1)
diff --git a/test/rpcgen_wrapper.sh b/test/rpcgen_wrapper.sh
index aaa0303..fe582d5 100755
--- a/test/rpcgen_wrapper.sh
+++ b/test/rpcgen_wrapper.sh
@@ -25,19 +25,10 @@ exit_failed() {
echo "Could not generate regress.gen.\[ch\] using event_rpcgen.sh" >&2
exit 1
}
-
-if [ -x /usr/bin/python2 ] ; then
- PYTHON2=/usr/bin/python2
-elif [ "x`which python2`" != x ] ; then
- PYTHON2=python2
-else
- PYTHON2=python
-fi
-
srcdir=$1
srcdir=${srcdir:-.}
-${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc \
+${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc \
test/regress.gen.h test/regress.gen.c
case "$?" in
diff --git a/test/test.sh b/test/test.sh
index dd3d986..8a76529 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -82,8 +82,8 @@ run_tests () {
fi
done
announce_n " test-dumpevents: "
- if python2 -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null && test -f $TEST_SRC_DIR/check-dumpevents.py; then
- if $TEST_DIR/test-dumpevents | python2 $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
+ if python -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null && test -f $TEST_SRC_DIR/check-dumpevents.py; then
+ if $TEST_DIR/test-dumpevents | $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
then
announce OKAY ;
else

98
SPECS/libevent.spec
View File

@ -1,8 +1,8 @@
%global develdocdir %{_docdir}/%{name}-devel
Name: libevent
Version: 2.1.8
Release: 5%{?dist}
Version: 2.1.12
Release: 6%{?dist}
Summary: Abstract asynchronous event notification library
# arc4random.c, which is used in build, is ISC. The rest is BSD.
@ -10,6 +10,10 @@ License: BSD and ISC
URL: http://libevent.org/
Source0: https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz
BuildRequires: make
BuildRequires: gcc
# Needed for ./autogen.sh:
BuildRequires: automake libtool
%if ! 0%{?_module_build}
BuildRequires: doxygen
%endif
@ -18,9 +22,15 @@ BuildRequires: python3-devel
# Disable network tests
Patch01: libevent-nonettests.patch
# Port the python scripts to Python 3
# Fixed upstream: https://github.com/libevent/libevent/commit/8b0aa7b36a3250fad4953f194c8a94ab25032583
Patch02: port-scripts-to-python3.patch
# Upstream patch:
Patch02: 0001-build-do-not-try-install-doxygen-man-pages-if-they-w.patch
# Upstream patch:
Patch03: 0001-build-add-doxygen-to-all.patch
# Temporary downstream change: revert a problematic upstream change
# until Transmission is fixed. Please drop the patch when the Transmission
# issue is fixed.
# https://github.com/transmission/transmission/issues/1437
Patch04: 0001-Revert-Fix-checking-return-value-of-the-evdns_base_r.patch
%description
The libevent API provides a mechanism to execute a callback function
@ -52,24 +62,32 @@ This package contains the development documentation for %{name}.
%prep
%setup -q -n libevent-%{version}-stable
%patch01 -p1 -b .nonettests
%patch02 -p1 -b .py3port
%patch02 -p1 -b .fix-install
%patch03 -p1 -b .fix-install-2
%patch04 -p1 -b .revert-problematic-change
pathfix.py -i %{__python3} -pn test/check-dumpevents.py \
event_rpcgen.py
event_rpcgen.py
%build
# We're patching doxygen.am, so regenerate the autotools stuff to be
# safe
./autogen.sh
%configure \
--disable-dependency-tracking --disable-static
make %{?_smp_mflags} all
%if ! 0%{?_module_build}
# Create the docs
make doxygen
--enable-doxygen-doc \
%endif
--disable-dependency-tracking --disable-static
%make_build all
%install
make DESTDIR=$RPM_BUILD_ROOT install
%make_install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# Maintain the Fedora-specific location of libevent documentation, at
# least for now
mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{develdocdir}
# Fix multilib install of devel (bug #477685)
mv $RPM_BUILD_ROOT%{_includedir}/event2/event-config.h \
$RPM_BUILD_ROOT%{_includedir}/event2/event-config-%{__isa_bits}.h
@ -85,12 +103,6 @@ cat > $RPM_BUILD_ROOT%{_includedir}/event2/event-config.h << EOF
#endif
EOF
%if ! 0%{?_module_build}
mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/html
(cd doxygen/html; \
install -p -m 644 *.* $RPM_BUILD_ROOT/%{develdocdir}/html)
%endif
mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/sample
(cd sample; \
install -p -m 644 *.c *.am $RPM_BUILD_ROOT/%{develdocdir}/sample)
@ -136,16 +148,54 @@ mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/sample
%doc %{develdocdir}/
%changelog
* Wed Oct 10 2018 Ondřej Lysoněk <olysonek@redhat.com> - 2.1.8-5
- Install documentation files to an unversioned directory
- Resolves: rhbz#1638032
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.12-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.12-5
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.12-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Sep 29 2020 Ondřej Lysoněk <olysonek@redhat.com> - 2.1.12-2
- Temporarily revert a problematic upstream change
* Mon Sep 14 2020 Ondřej Lysoněk <olysonek@redhat.com> - 2.1.12-1
- new version
- Resolves: rhbz#1713942
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 2.1.8-9
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Aug 15 2019 Ondřej Lysoněk <olysonek@redhat.com> - 2.1.8-7
- Port python scripts to Python 3
- Resolves: rhbz#1738022
- Resolves: rhbz#1655232
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Sep 03 2018 Ondřej Lysoněk <olysonek@redhat.com> - 2.1.8-4
- Corrected the License tag
- Resolves: rhbz#1624851
* Thu Jul 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 2.1.8-3
- Port the python scripts to Python 3
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 15 2018 Steve Dickson <steved@redhat.com> - 2.1.8-2
- Explicitly express SONAME in the %%file section