commit
19c259cf11
@ -0,0 +1 @@
|
||||
SOURCES/libevent-2.1.8-stable.tar.gz
|
@ -0,0 +1 @@
|
||||
2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec SOURCES/libevent-2.1.8-stable.tar.gz
|
@ -0,0 +1,11 @@
|
||||
diff -up libevent-2.0.21-stable/test/regress_main.c.orig libevent-2.0.21-stable/test/regress_main.c
|
||||
--- libevent-2.0.21-stable/test/regress_main.c.orig 2012-11-02 11:57:00.000000000 -0400
|
||||
+++ libevent-2.0.21-stable/test/regress_main.c 2013-08-21 10:16:26.714288000 -0400
|
||||
@@ -370,7 +370,6 @@ struct testgroup_t testgroups[] = {
|
||||
{ "util/", util_testcases },
|
||||
{ "bufferevent/", bufferevent_testcases },
|
||||
{ "http/", http_testcases },
|
||||
- { "dns/", dns_testcases },
|
||||
{ "evtag/", evtag_testcases },
|
||||
{ "rpc/", rpc_testcases },
|
||||
{ "thread/", thread_testcases },
|
@ -0,0 +1,502 @@
|
||||
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
|
@ -0,0 +1,323 @@
|
||||
%global develdocdir %{_docdir}/%{name}-devel
|
||||
|
||||
Name: libevent
|
||||
Version: 2.1.8
|
||||
Release: 5%{?dist}
|
||||
Summary: Abstract asynchronous event notification library
|
||||
|
||||
# arc4random.c, which is used in build, is ISC. The rest is BSD.
|
||||
License: BSD and ISC
|
||||
URL: http://libevent.org/
|
||||
Source0: https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz
|
||||
|
||||
%if ! 0%{?_module_build}
|
||||
BuildRequires: doxygen
|
||||
%endif
|
||||
BuildRequires: openssl-devel
|
||||
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
|
||||
|
||||
%description
|
||||
The libevent API provides a mechanism to execute a callback function
|
||||
when a specific event occurs on a file descriptor or after a timeout
|
||||
has been reached. libevent is meant to replace the asynchronous event
|
||||
loop found in event driven network servers. An application just needs
|
||||
to call event_dispatch() and can then add or remove events dynamically
|
||||
without having to change the event loop.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
License: BSD
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This package contains the header files and libraries for developing
|
||||
with %{name}.
|
||||
|
||||
%package doc
|
||||
Summary: Development documentation for %{name}
|
||||
# The files sample/openssl_hostname_validation.{c,h} and sample/hostcheck.{c,h}
|
||||
# are MIT. The rest is BSD.
|
||||
License: BSD and MIT
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
This package contains the development documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n libevent-%{version}-stable
|
||||
%patch01 -p1 -b .nonettests
|
||||
%patch02 -p1 -b .py3port
|
||||
pathfix.py -i %{__python3} -pn test/check-dumpevents.py \
|
||||
event_rpcgen.py
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-dependency-tracking --disable-static
|
||||
make %{?_smp_mflags} all
|
||||
|
||||
%if ! 0%{?_module_build}
|
||||
# Create the docs
|
||||
make doxygen
|
||||
%endif
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
|
||||
# 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
|
||||
cat > $RPM_BUILD_ROOT%{_includedir}/event2/event-config.h << EOF
|
||||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include <event2/event-config-32.h>
|
||||
#elif __WORDSIZE == 64
|
||||
#include <event2/event-config-64.h>
|
||||
#else
|
||||
#error "Unknown word size"
|
||||
#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)
|
||||
|
||||
%check
|
||||
# Tests fail due to nameserver not running locally
|
||||
# [msg] Nameserver 127.0.0.1:38762 has failed: request timed out.
|
||||
# On some architects this error is ignored on others it is not.
|
||||
#make check
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc ChangeLog
|
||||
%{_libdir}/libevent-2.1.so.*
|
||||
%{_libdir}/libevent_core-2.1.so.*
|
||||
%{_libdir}/libevent_extra-2.1.so.*
|
||||
%{_libdir}/libevent_openssl-2.1.so.*
|
||||
%{_libdir}/libevent_pthreads-2.1.so.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/event.h
|
||||
%{_includedir}/evdns.h
|
||||
%{_includedir}/evhttp.h
|
||||
%{_includedir}/evrpc.h
|
||||
%{_includedir}/evutil.h
|
||||
%dir %{_includedir}/event2
|
||||
%{_includedir}/event2/*.h
|
||||
%{_libdir}/libevent.so
|
||||
%{_libdir}/libevent_core.so
|
||||
%{_libdir}/libevent_extra.so
|
||||
%{_libdir}/libevent_openssl.so
|
||||
%{_libdir}/libevent_pthreads.so
|
||||
%{_libdir}/pkgconfig/libevent.pc
|
||||
%{_libdir}/pkgconfig/libevent_core.pc
|
||||
%{_libdir}/pkgconfig/libevent_extra.pc
|
||||
%{_libdir}/pkgconfig/libevent_openssl.pc
|
||||
%{_libdir}/pkgconfig/libevent_pthreads.pc
|
||||
%{_bindir}/event_rpcgen.*
|
||||
|
||||
%files doc
|
||||
%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 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
|
||||
|
||||
* Thu Feb 15 2018 Steve Dickson <steved@redhat.com> - 2.1.8-2
|
||||
- Explicitly express SONAME in the %%file section
|
||||
|
||||
* Thu Feb 15 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.1.8-1
|
||||
- Fix ownership of pkg-config files
|
||||
- Remove unneeded Group tag
|
||||
|
||||
* Wed Feb 14 2018 Steve Dickson <steved@redhat.com> - 2.1.8-0
|
||||
- Updated to the latest upstream release 2.1.8 (bz 1418488)
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.22-7
|
||||
- Switch to %%ldconfig_scriptlets
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Apr 12 2017 Nils Philippsen <nils@redhat.com> - 2.0.22-4
|
||||
- don't build doxygen documentation during modular build
|
||||
|
||||
* Mon Mar 27 2017 Tomáš Mráz <tmraz@redhat.com> - 2.0.22-3
|
||||
- Make it build with OpenSSL-1.1.0, cherry-picked from upstream git
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Jun 24 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.22-1
|
||||
- Update to 2.0.22
|
||||
- Spec cleanup, new URL
|
||||
- Support multilib devel (bug #477685)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.21-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.21-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.21-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.21-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Dec 21 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 2.0.21-4
|
||||
- Fix -doc package for F20 UnversionedDocDirs (#993956)
|
||||
- Add missing directory /usr/include/event2
|
||||
- Fix directory ownership in -doc package
|
||||
- Correct summary and description of -devel and -doc packages
|
||||
- Set -doc package Group tag to "Documentation"
|
||||
- Add %%?_isa to -devel package base dependency
|
||||
- Remove %%defattr
|
||||
|
||||
* Wed Aug 21 2013 Steve Dickson <steved@redhat.com> 2.0.21-3
|
||||
- Removed rpmlint warnings
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.21-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu May 2 2013 Orion Poplawski <orion@cora.nwra.com> - 2.0.21-1
|
||||
- Update to 2.0.21
|
||||
- Add %%check
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.18-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Wed Apr 4 2012 Steve Dickson <steved@redhat.com> 2.0.18-1
|
||||
- Updated to latest stable upstream version: 2.0.18-stable
|
||||
- Moved documentation into its own rpm (bz 810138)
|
||||
|
||||
* Mon Mar 12 2012 Steve Dickson <steved@redhat.com> 2.0.17-1
|
||||
- Updated to latest stable upstream version: 2.0.17-stable
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Wed Aug 10 2011 Steve Dickson <steved@redhat.com> 2.0.14-1
|
||||
- Updated to latest stable upstream version: 2.0.14-stable (bz 727129)
|
||||
- Removed the installion of the outdate man pages and the latex raw docs.
|
||||
- Corrected where the other doc are installed.
|
||||
|
||||
* Wed Aug 10 2011 Steve Dickson <steved@redhat.com> 2.0.13-1
|
||||
- Updated to latest stable upstream version: 2.0.13-stable (bz 727129)
|
||||
|
||||
* Tue Aug 2 2011 Steve Dickson <steved@redhat.com> 2.0.12-1
|
||||
- Updated to latest stable upstream version: 2.0.12-stable
|
||||
|
||||
* Wed Feb 09 2011 Rahul Sundaram <sundaram@fedoraproject.org> - 2.0.10-2
|
||||
- Fix build
|
||||
- Update spec to match current guidelines
|
||||
- drop no longer needed patch
|
||||
|
||||
* Tue Feb 8 2011 Steve Dickson <steved@redhat.com> 2.0.10-1
|
||||
- Updated to latest stable upstream version: 2.0.10-stable
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.14b-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Tue Jun 22 2010 Steve Dickson <steved@redhat.com> 1.4.14b-1
|
||||
- Updated to latest stable upstream version: 1.4.14b
|
||||
|
||||
* Fri May 21 2010 Tom "spot" Callaway <tcallawa@redhat.com> 1.4.13-2
|
||||
- disable static libs (bz 556067)
|
||||
|
||||
* Tue Dec 15 2009 Steve Dickson <steved@redhat.com> 1.4.13-1
|
||||
- Updated to latest stable upstream version: 1.4.13
|
||||
|
||||
* Tue Aug 18 2009 Steve Dickson <steved@redhat.com> 1.4.12-1
|
||||
- Updated to latest stable upstream version: 1.4.12
|
||||
- API documentation is now installed (bz 487977)
|
||||
- libevent-devel multilib conflict (bz 477685)
|
||||
- epoll backend allocates too much memory (bz 517918)
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Mon Apr 20 2009 Steve Dickson <steved@redhat.com> 1.4.10-1
|
||||
- Updated to latest stable upstream version: 1.4.10
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Tue Jul 1 2008 Steve Dickson <steved@redhat.com> 1.4.5-1
|
||||
- Updated to latest stable upstream version 1.4.5-stable
|
||||
|
||||
* Mon Jun 2 2008 Steve Dickson <steved@redhat.com> 1.4.4-1
|
||||
- Updated to latest stable upstream version 1.4.4-stable
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.3e-2
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Tue Jan 22 2008 Steve Dickson <steved@redhat.com> 1.3e-1
|
||||
- Updated to latest stable upstream version 1.3e
|
||||
|
||||
* Fri Mar 9 2007 Steve Dickson <steved@redhat.com> 1.3b-1
|
||||
- Updated to latest upstream version 1.3b
|
||||
- Incorporated Merge Review comments (bz 226002)
|
||||
- Increased the polling timeout (bz 204990)
|
||||
|
||||
* Tue Feb 20 2007 Steve Dickson <steved@redhat.com> 1.2a-1
|
||||
- Updated to latest upstream version 1.2a
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuild
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.1a-3.2
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.1a-3.1
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Tue Jan 24 2006 Warren Togami <wtogami@redhat.com> - 1.1a-3
|
||||
- rebuild (#177697)
|
||||
|
||||
* Mon Jul 04 2005 Ralf Ertzinger <ralf@skytale.net> - 1.1a-2
|
||||
- Removed unnecessary -r from rm
|
||||
|
||||
* Fri Jun 17 2005 Ralf Ertzinger <ralf@skytale.net> - 1.1a-1
|
||||
- Upstream update
|
||||
|
||||
* Wed Jun 08 2005 Ralf Ertzinger <ralf@skytale.net> - 1.1-2
|
||||
- Added some docs
|
||||
- Moved "make verify" into %%check
|
||||
|
||||
* Mon Jun 06 2005 Ralf Ertzinger <ralf@skytale.net> - 1.1-1
|
||||
- Initial build for Fedora Extras, based on the package
|
||||
by Dag Wieers
|
Loading…
Reference in new issue