actually build summer

diff --git a/cprogs/.cvsignore b/cprogs/.cvsignore
index 54b3c7d1f4c9afbcaef8e645e94d5ed4bd3b3c68..865f25f12ed04b0d6131c6afce208a4ddad3fed1 100644 (file)
--- a/cprogs/.cvsignore
+++ b/cprogs/.cvsignore
@@ -5,3 +5,4 @@ really
 with-lock-ex
 xacpi-simple
 mcastsoundd
+summer

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 6f6a1ee9d4a3d98e8fc23f593d24b99f24a28ea7..dbfad383c34f918c14b97ecd197eecd7ca4d2f40 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -47,6 +47,9 @@ readbuffer.o writebuffer.o rwbuffer.o wrbufcore.o trivsoundd.o:       rwbuffer.h
 xacpi-simple:  xacpi-simple.o
                $(CC) -o $@ $< -L/usr/X11R6/lib -lX11 -lm
 
+summer:                summer.o
+               $(CC) -o $@ $< -lnettle
+
 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)
                $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)

diff --git a/cprogs/summer.c b/cprogs/summer.c
index 4f42e608a7774f3636c173690bd0641b8b3e0345..ca65fc684279ddfd08402a49e1f54bd9e195fe12 100644 (file)
--- a/cprogs/summer.c
+++ b/cprogs/summer.c
@@ -17,8 +17,9 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <assert.h>
+#include <stdlib.h>
 
-#include "md5.h"
+#include "nettle/md5-compat.h"
 
 #define MAXFN 2048
 #define MAXDEPTH 1024
@@ -79,7 +80,7 @@ static void problem(const char *path, int padto, const char *fmt, ...) {
 
 static void csum_file(const char *path) {
   FILE *f;
-  struct MD5Context mc;
+  MD5_CTX mc;
   char db[65536];
   unsigned char digest[16];
   size_t r;

diff --git a/debian/control b/debian/control
index 5d9214e67654eb7c17ce11c4da223b782eba66b5..8c40243a9187bc329c925c33744f0164091eaba3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: chiark-utils
 Section: admin
 Priority: extra
 Maintainer: Matthew Vernon <matthew-chiark-utils@debian.org>
+Build-Depends: libx11-dev, libnettle-dev
 Uploaders: matthew@debian.org
 Standards-Version: 3.2.1.0