# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.PHONY: all clean realclean dist install distclean
+.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
-VERSION:=0.1.10
+VERSION:=0.3.0
@SET_MAKE@
INSTALL:=@INSTALL@
INSTALL_PROGRAM:=@INSTALL_PROGRAM@
-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
-LDFLAGS:=@LDFLAGS@
-LDLIBS:=@LIBS@
+CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
+ -W -Wno-unused \
+ -Wno-pointer-sign -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs -Wredundant-decls \
+ -Wpointer-arith -Wformat=2 -Winit-self \
+ -Wswitch-enum -Wunused-variable -Wbad-function-cast \
+ -Wno-strict-aliasing -fno-strict-aliasing
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
+LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
+LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
prefix:=@prefix@
exec_prefix:=@exec_prefix@
sbindir:=@sbindir@
sysconfdir:=@sysconfdir@
transform:=@program_transform_name@
+mandir:=@mandir@
TARGETS:=secnet
OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
- resolver.o random.o udp.o site.o transform.o netlink.o rsa.o dh.o \
- serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
- process.o @LIBOBJS@
-
-DISTFILES:=COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
- NEWS NOTES README TODO \
- alloca.c \
- conffile.c conffile.fl conffile.h conffile.y \
- conffile_internal.h config.h.bot \
- config.h.in config.h.top configure \
- configure.in debian dh.c \
- example.conf \
- getopt.c getopt1.c getopt.h \
- install.sh ipaddr.c ipaddr.h ipaddr.py linux log.c md5.c md5.h \
- make-secnet-sites \
- modules.c netlink.c netlink.h process.c process.h \
- random.c resolver.c rsa.c \
- secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
- snprintf.c snprintf.h \
- sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
- unaligned.h util.c util.h
+ resolver.o random.o udp.o site.o transform-cbcmac.o transform-eax.o \
+ netlink.o rsa.o dh.o serpent.o serpentbe.o \
+ md5.o sha512.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
+ process.o @LIBOBJS@ \
+ hackypar.o
+
+TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
+ eax-test.o aes.o
%.c: %.y
%.yy.c: %.fl
- flex -o$@ $<
+ flex --header=$*.yy.h -o$@ $<
-%.tab.c: %.y
+%.tab.c %.tab.h: %.y
bison -d -o $@ $<
+%.o: %.c
+ $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
-all: $(TARGETS)
+all: $(TARGETS) check
# Automatic remaking of configuration files, from autoconf documentation
${srcdir}/configure: configure.in
# autoheader might not change config.h.in, so touch a stamp file.
${srcdir}/config.h.in: stamp-h.in
-${srcdir}/stamp-h.in: configure.in config.h.top config.h.bot
+${srcdir}/stamp-h.in: configure.in
cd ${srcdir} && autoheader
echo timestamp > ${srcdir}/stamp-h.in
./config.status --recheck
# End of config file remaking rules
-# Manual dependencies section - XXX use autodep eventually
-$(OBJECTS): config.h secnet.h util.h
-conffile.o conffile.tab.o conffile.yy.o: conffile.h conffile_internal.h
-secnet.o: conffile.h process.h
-process.o: process.h
-log.o: process.h
-md5.o: md5.h
-serpent.o transform.o: serpent.h
-serpent.o: serpentsboxes.h
-conffile.o: ipaddr.h
-site.c util.c: unaligned.h
+# C and header file dependency rules
+SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
+DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
+
+$(DEPENDS): ${srcdir}/depend.sh
+
+%.d: %.c
+ ${srcdir}/depend.sh $(srcdir) $(CPPFLAGS) $(ALL_CFLAGS) $< > $@
+
+-include $(DEPENDS)
+
+# Manual dependencies section
conffile.yy.c: conffile.fl conffile.tab.c
+conffile.yy.h: conffile.yy.c
conffile.tab.c: conffile.y
-netlink.o tun.o slip.o: netlink.h
# End of manual dependencies section
secnet: $(OBJECTS)
+ $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
+
+check: eax-aes-test.confirm eax-serpent-test.confirm \
+ eax-serpentbe-test.confirm
version.c: Makefile
- echo "char version[]=\"secnet-$(VERSION)\";" >version.c
+ echo "#include \"secnet.h\"" >$@.new
+ echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
+ mv -f $@.new $@
+
+eax-%-test: eax-%-test.o eax-test.o %.o
+ $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+eax-%-test.confirm: eax-%-test eax-%-test.vectors
+ ./$< <$(srcdir)/eax-$*-test.vectors >$@.new
+ mv -f $@.new $@
+
+.PRECIOUS: eax-%-test
+
+installdirs:
+ $(INSTALL) -d $(prefix)/share/secnet $(sbindir)
+ $(INSTALL) -d $(mandir)/man8
-install: all
- $(INSTALL_PROGRAM) -D secnet $(sbindir)/`echo secnet|sed '$(transform)'`
- $(INSTALL_PROGRAM) -D make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
- $(INSTALL) -D ipaddr.py $(prefix)/share/secnet/ipaddr.py
+install: installdirs
+ $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
+ $(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
+ $(INSTALL) ${srcdir}/ipaddr.py $(prefix)/share/secnet/ipaddr.py
+ $(INSTALL) secnet.8 $(mandir)/man8/secnet.8
clean:
$(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
+ $(RM) -f *.d *~ eax-*-test.confirm eax-*-test
realclean: clean
- $(RM) -f *~ Makefile config.h \
+ $(RM) -f *~ Makefile config.h *.d \
config.log config.status config.cache \
stamp-h Makefile.bak
distclean: realclean
pfname:=$(PACKAGE)-$(VERSION)
+tarfname:=../$(pfname).tar
dist:
- $(RM) -rf $(pfname)
- mkdir $(pfname)
- for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
- tar hcf ../$(pfname).tar $(pfname)
- gzip -9f ../$(pfname).tar
- $(RM) -rf $(pfname)
+ $(RM) -rf $(tarfname) $(tarfname).gz
+ git archive --format=tar --prefix=$(pfname)/ HEAD -o $(tarfname)
+ gzip -9f $(tarfname)
+
+# Release checklist:
+# 1. Check that the tree has what you want
+#
+# 2. Update VERSION (above) and debian/changelog
+# but DO NOT COMMIT
+#
+# 3. Run
+# ./configure
+# make dist
+# and check that the resulting tarball looks OK.
+# Eg, untar it and build it, or have it reviewed.
+#
+# 3. Commit the updates to VERSION (above) and debian/changelog
+#
+# 4. git-tag -s v$VERSION
+#
+# 5. git-push origin
+#
+# 6. Run, again,
+# make dist
+#
+# 7. gpg --detach-sign ../secnet-$VERSION.tar.gz
+#
+# 8. rsync -v ../secnet-$VERSION.tar.gz* \
+# chiark:/home/ianmdlvl/public-html/secnet/download/
+#
+# 9. On chiark:
+# tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz
+# cd secnet-$VERSION
+# debian/rules build
+# fakeroot debian/rules binary
+# mv ../secnet_${VERSION}_i386.deb ~/public-html/secnet/download/
+#
+# 10. On chiark as user secnet:
+# cd ~secnet/
+# rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+#
+# 11. write and post a release announcement
~ian / secnet.git / blobdiff