From: ianmdlvl <ianmdlvl>
Date: Sat, 3 Jun 2006 00:38:48 +0000 (+0000)
Subject: actually build summer
X-Git-Tag: debian_version_4_1_0~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=dbc59f756cef8f25838f0b650be2314e539ce063;hp=ccf2492ad39c83534bc8174b8f6e741491c7b09b

actually build summer
---

diff --git a/cprogs/.cvsignore b/cprogs/.cvsignore
index 54b3c7d..865f25f 100644
--- 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 6f6a1ee..dbfad38 100644
--- 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 4f42e60..ca65fc6 100644
--- 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 5d9214e..8c40243 100644
--- 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