# Makefile for secnet
-# Copyright (C) 1995-2001 Stephen Early <steve@greenend.org.uk>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
+#
+# This file is part of secnet.
+# See README for full list of copyright holders.
+#
+# secnet is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version d of the License, or
+# (at your option) any later version.
+#
+# secnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# version 3 along with secnet; if not, see
+# https://www.gnu.org/licenses/gpl.html.
.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
-VERSION:=0.3.0~beta2
+VERSION:=0.4.0
@SET_MAKE@
CC:=@CC@
INSTALL:=@INSTALL@
INSTALL_PROGRAM:=@INSTALL_PROGRAM@
+INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+INSTALL_DATA:=@INSTALL_DATA@
+
+prefix:=$(DESTDIR)@prefix@
+exec_prefix:=@exec_prefix@
+sbindir:=@sbindir@
+sysconfdir:=$(DESTDIR)@sysconfdir@
+datarootdir:=@datarootdir@
+transform:=@program_transform_name@
+mandir:=@mandir@
CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
- -W -Wno-unused \
+ -W -Wno-unused -Wno-unused-parameter \
-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
+ -Wswitch-enum -Wunused-variable -Wunused-function -Wbad-function-cast \
+ -Wno-strict-aliasing -fno-strict-aliasing \
+ -MMD
ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
-CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
+CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(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-cbcmac.o transform-eax.o \
+ comm-common.o polypath.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 \
+ md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.o \
process.o @LIBOBJS@ \
hackypar.o
+# version.o is handled specially below and in the link rule for secnet.
TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
eax-test.o aes.o
+ifeq (version.o,$(MAKECMDGOALS))
+OBJECTS:=version.o
+TEST_OBJECTS:=
+endif
+
+STALE_PYTHON_FILES= $(foreach e, py pyc, \
+ $(foreach p, /usr /usr/local, \
+ $(foreach l, ipaddr, \
+ $(DESTDIR)$p/share/secnet/$l.$e \
+ )))
+
%.c: %.y
%.yy.c: %.fl
%.tab.c %.tab.h: %.y
bison -d -o $@ $<
-%.o: %.c
+%.o: %.c conffile.yy.h
$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
all: $(TARGETS) check
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)
+-include *.d
# Manual dependencies section
conffile.yy.c: conffile.fl conffile.tab.c
# End of manual dependencies section
secnet: $(OBJECTS)
- $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
+ $(MAKE) version.o # *.o $(filter-out %.o, $^)
+ $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
+# We (always) regenerate the version, but only if we regenerate the
+# binary. (This is necessary as the version string is can depend on
+# any of the source files, eg to see whether "+" is needed.)
+
+ifneq (,$(wildcard .git/HEAD))
+# If we have (eg) committed, relink and thus regenerate the version
+# with the new info from git describe.
+secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
+secnet: $(wildcard .git/packed-refs)
+endif
check: eax-aes-test.confirm eax-serpent-test.confirm \
- eax-serpentbe-test.confirm
+ eax-serpentbe-test.confirm check-ipaddrset
version.c: Makefile
echo "#include \"secnet.h\"" >$@.new
- echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
+ @set -ex; if test -e .git; then \
+ v=$$(git describe --match 'v*'); v=$${v#v}; \
+ if ! git diff --quiet HEAD; then v="$$v+"; fi; \
+ else \
+ v="$(VERSION)"; \
+ fi; \
+ echo "char version[]=\"secnet $$v\";" >>$@.new
mv -f $@.new $@
eax-%-test: eax-%-test.o eax-test.o %.o
./$< <$(srcdir)/eax-$*-test.vectors >$@.new
mv -f $@.new $@
+check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
+ $(srcdir)/ipaddrset-test.py >ipaddrset-test.new
+ diff -u ipaddrset-test.expected ipaddrset-test.new
+
.PRECIOUS: eax-%-test
installdirs:
$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
$(INSTALL) -d $(mandir)/man8
+ $(INSTALL) -d $(datarootdir)/secnet
install: installdirs
+ set -e; ok=true; for f in $(STALE_PYTHON_FILES); do \
+ if test -e $$f; then \
+ echo >&2 "ERROR: $$f still exists "\
+ "- try \`make install-force'"; \
+ ok=false; \
+ fi; \
+ done; \
+ $$ok
$(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
+ $(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
+ $(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
+ $(datarootdir)/secnet/.
+ $(INSTALL_DATA) secnet.8 $(mandir)/man8/secnet.8
+
+install-force:
+ rm -f $(STALE_PYTHON_FILES)
+ $(MAKE) install
clean:
- $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
- $(RM) -f *.d *~ eax-*-test.confirm eax-*-test
+ $(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
+ $(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
realclean: clean
$(RM) -f *~ Makefile config.h *.d \
#
# 3. Commit the updates to VERSION (above) and debian/changelog
#
-# 4. git-tag -s v$(VERSION)
+# 4. git-tag -m "secnet $VERSION" -s v${VERSION//\~/_}
#
-# 5. git-push origin
+# 5. git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master
#
# 6. Run, again,
# make dist
#
-# 7. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+# 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_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+# 9. In zealot's squeeze chroot:
+# rm -rf ../d; mkdir ../d; cd ../d
+# tar zxf ../secnet-$VERSION.tar.gz
+# cd secnet-$VERSION
+# dpkg-buildpackage -a -uc -us -rfakeroot
+# rsync -vP ../secnet_${VERSION}_i386.deb ianmdlvl@chiark:public-html/secnet/download/
+#
+# 9a. On chiark as ianmdlvl:
+# cd ~ianmdlvl/secnet-build/
+# tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz
+# cd secnet-$VERSION
+# dpkg-buildpackage -a -uc -us -rfakeroot
+# mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/backport/
#
# 10. On chiark as user secnet:
-# cd ~secnet/
-# rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+# cd ~secnet/public-html/release/
+# mkdir $VERSION
+# cd $VERSION
+# ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* .
+# mkdir polypath-backport
+# ln -s /home/ianmdlvl/public-html/secnet/download/backport/secnet?$VERSION* polypath-backport/.
+# ln -s /home/ianmdlvl/public-html/secnet/download/backport/*adns* polypath-backport/.
#
# 11. write and post a release announcement
+# find -type l | sort | xargs sha256sum
~ianmdlvl / secnet.git / blobdiff