Fix debian build rules and add hardening.

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..39ff011
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+DESTDIR=
+sysconfdir=/etc
+
+INSTALL_DATA = install -m644
+
+MAKE=make
+
+all clean:
+       $(MAKE) -C tor-smtp $@
+install:
+       for f in $$(cd exim4-conf.d; find . -type f); do \
+               $(INSTALL_DATA) -D exim4-conf.d/$$f $(DESTDIR)$(sysconfdir)/exim4/conf.d/$$f; \
+       done
+       $(INSTALL_DATA) -D xinetd $(DESTDIR)$(sysconfdir)/xinet.d/exim4-smtorp

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..fdd3e6c
--- /dev/null
+++ b/README
@@ -0,0 +1,9 @@
+Exim4 setup for SMTorP, SMTP over Tor
+=====================================
+
+Based on the recipies found on.
+
+http://johannes.sipsolutions.net/Projects/exim-tor-hidden-mail/FAQ
+http://johannes.sipsolutions.net/Projects/exim-tor-hidden-mail
+
+Contact Petter Reinholdtsen <pere@hungry.com> if you have comments or improvements.

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644 (file)
index 0000000..0f7e058
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,5 @@
+/files
+/*.debhelper
+/*.debhelper.log
+/*.substvars
+/exim4-smtorp/

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..7dae065
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+exim4-smtorp (0.1) UNRELEASED; urgency=low
+
+  * Initial release. (Closes: #722093)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 09 Nov 2014 23:10:45 +0100

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..52d756c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,17 @@
+Source: exim4-smtorp
+Section: python
+Priority: optional
+Maintainer: Petter Reinholdtsen <pere@debian.org>
+Build-Depends: debhelper (>= 9)
+ , dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/collab-maint/exim4-smtorp.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/exim4-smtorp.git;a=summary
+
+Package: exim4-smtorp
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: exim4, tor, xinetd
+Description: exim4 setup for SMTorP
+ Set up Exim to accept email via SMTP over Tor, and to send email to
+ username@*.onion via Tor.

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..69c2170
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,14 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://johannes.sipsolutions.net/Projects/exim-tor-hidden-mail/FAQ
+
+Files: *
+Copyright: 2006 Johannes Berg
+License: BSD
+
+Files: tor-smtp/*
+Copyright: 2005 Anil Madhavapeddy, 1995,1999 Theo de Raadt, 2006 Johannes Berg, 2001 Eric Jackson
+License: BSD
+
+Files: debian/*
+Copyright: 2014 Petter Reinholdtsen
+License: BSD

diff --git a/debian/exim4-smtorp.install b/debian/exim4-smtorp.install
new file mode 100644 (file)
index 0000000..61bbf5c
--- /dev/null
+++ b/debian/exim4-smtorp.install
@@ -0,0 +1 @@
+tor-smtp/tor-smtp /usr/lib/exim4-smtorp/tor-smtp

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..da33fd2
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+%:
+       dh $@

diff --git a/tor-smtp/Makefile b/tor-smtp/Makefile
index 3338248f97e62a2d32653bb6b7829c62ee918460..cf41cea7e6cc43ced00042a5dcb4ac1e7989ee0e 100644 (file)
--- a/tor-smtp/Makefile
+++ b/tor-smtp/Makefile
@@ -1,6 +1,6 @@
-CFLAGS = -Wall
+CFLAGS += -Wextra -Wall

 
 

-all: tor-smtp strip
+all: tor-smtp # strip

 
 tor-smtp: atomicio.o tor-smtp.o
 
 
 tor-smtp: atomicio.o tor-smtp.o