X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/d7ab1bab81155baa763449d5afa81e16df98dbe7..00a8b95ada5b1bf6d4dae66249c075a691c630b2:/setup.py

diff --git a/setup.py b/setup.py
index ad75776..8ff559d 100644
--- a/setup.py
+++ b/setup.py
@@ -40,10 +40,8 @@ def uniquify(l):
       u[i] = 1
   return o
 
-cflags = []
-libs = []
-libconfig('mLib', '2.0.3')
 libconfig('catacomb', '2.1.0')
+libconfig('mLib', '2.0.3')
 
 class SubprocessFailure (Exception):
   def __init__(me, file, rc):
@@ -80,34 +78,35 @@ for g in ['algorithms.h']:
     fnew = fout + '.new'
     if kid == 0:
       try:
-        out = file(fnew, 'w')
-        dup2(out.fileno(), stdout.fileno())
-        out.close()
-        execl(sys.executable, sys.executable, fin)
+	out = file(fnew, 'w')
+	dup2(out.fileno(), stdout.fileno())
+	out.close()
+	execl(sys.executable, sys.executable, fin)
       except:
-        stderr.write('error running %s -> %s: %s\n' %
-                     (fin, fout, sys.exc_info()[1]))
-        _exit(127)
+	stderr.write('error running %s -> %s: %s\n' %
+		     (fin, fout, sys.exc_info()[1]))
+	_exit(127)
     _, rc = waitpid(kid, 0)
     if rc:
       raise SubprocessFailure, (fin, rc)
     rename(fnew, fout)
 
 cat = Extension('catacomb._base',
-                ['catacomb.c', 'bytestring.c',
-                 'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',
-                 'mp.c', 'field.c', 'ec.c', 'group.c', 'passphrase.c'],
-                ##extra_compile_args = ['-O0'],
-                include_dirs = uniquify(incdirs),
-                library_dirs = uniquify(libdirs),
-                libraries = uniquify(libs))
+		['catacomb.c', 'bytestring.c', 'buffer.c',
+		 'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',
+		 'mp.c', 'field.c', 'ec.c', 'group.c', 'passphrase.c',
+		 'share.c', 'key.c', 'util.c'],
+		##extra_compile_args = ['-O0'],
+		include_dirs = uniquify(incdirs),
+		library_dirs = uniquify(libdirs),
+		libraries = uniquify(libs))
 
-setup(name = 'Catacomb',
-      version = '2.1.0',
+setup(name = 'catacomb-python',
+      version = '1.0.0',
       description = 'Interface to Catacomb cryptographic library',
-      url = 'http://tux.nsict.org/~mdw/Catacomb-2.1.0',
+      url = 'http://www.distorted.org.uk/~mdw/Catacomb-2.1.0',
       author = 'Straylight/Edgeware',
-      author_email = 'mdw@nsict.org',
+      author_email = 'mdw@distorted.org.uk',
       license = 'GNU General Public License',
       packages = ['catacomb'],
       scripts = ['pwsafe'],