summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2016-05-03 15:20:26 +0200
committerErich Eckner <git@eckner.net>2016-05-03 15:22:31 +0200
commit6907ef64f2bfe2c2a72fe403f2a626e714ecf98f (patch)
treec15c10a0358f420f68da0fa467b2617843e9a335
parent558eb3ebdd9f6b8f1256d514b455defbc6ab09a0 (diff)
downloadsendmailadvanced-6907ef64f2bfe2c2a72fe403f2a626e714ecf98f.tar.xz
Makefile, manpage neu, neue Versionv1.0.6
-rw-r--r--.gitignore2
-rw-r--r--Makefile47
-rw-r--r--sendmailadvanced.8.in37
-rwxr-xr-xsendmailadvanced.in (renamed from sendmailadvanced)10
4 files changed, 92 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5432e49
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+sendmailadvanced
+sendmailadvanced.8
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..be9bc04
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,47 @@
+#
+# sendmailadvanced - wrapper for sendmail which encrypts and generates stamps
+#
+# Copyright (c) 2013-2016 Erich Eckner <opensource at eckner dot net>
+#
+# 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 of the License, 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.
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+#
+
+DESTDIR =
+ETCDIR = /etc
+BINDIR = /usr/bin
+MANDIR = /usr/share/man
+
+VERSION = 1.0.6
+
+all: sendmailadvanced sendmailadvanced.8
+
+%: %.in
+ sed "s/#VERSION#/$(VERSION)/; s@#BINDIR#@$(BINDIR)@; s@#ETCDIR#@$(ETCDIR)@" $< > $@
+
+.PHONY: install dist clean
+
+install: all
+ install -D -m0755 sendmailadvanced $(DESTDIR)$(BINDIR)/sendmailadvanced
+ install -D -m0644 sendmailadvanced.8 $(DESTDIR)$(MANDIR)/man8/sendmailadvanced.8
+ install -D -m0644 sendmailadvanced.conf $(DESTDIR)$(ETCDIR)/sendmailadvanced.conf
+
+dist: clean
+ (cd .. && tar czvf sendmailadvanced-$(VERSION).tar.gz sendmailadvanced-$(VERSION))
+
+clean:
+ rm -f sendmailadvanced{,.8}
+
+# End of file
diff --git a/sendmailadvanced.8.in b/sendmailadvanced.8.in
new file mode 100644
index 0000000..bf7f475
--- /dev/null
+++ b/sendmailadvanced.8.in
@@ -0,0 +1,37 @@
+.TH sendmailadvanced 8 "" "sendmailadvanced #VERSION#" ""
+.SH NAME
+sendmailadvanced \- wrapper for sendmail which encrypts and generates stamps
+.SH SYNOPSIS
+\fBsendmailadvanced [options]\fP
+.SH DESCRIPTION
+\fBsendmailadvanced\fP encrypts emails and generates stamps either in situ or in a pipe. For that it uses \fBhashcash\fP and \fBgnupg\fP.
+.SH OPTIONS
+.TP
+.B "\-h, \-\-hook"
+Activate specified hook.
+.TP
+.B "\-i, \-\-inline"
+Enhance email file in situ.
+\fB\-\-inline \-\fP has the same effect as option \fB\-t\fP.
+Conflicts with \fB\-t, \-\-no\-inline\fP.
+.TP
+.B "\-t, \-\-no\-inline"
+Enhance email from stdin to stdout.
+Conflicts with \fB\-i, \-\-inline\fP.
+.TP
+.B "\-e, \-\-[no\-]encrypt"
+Do (not) encrypt.
+.TP
+.B "\-s, \-\-[no\-]stamp"
+Do (not) stamp.
+.SH FILES
+.TP
+.B "#BINDIR#/sendmailadvanced"
+program file
+.TP
+.B "#ETCDIR#/sendmailadvanced.conf"
+contains configuration
+.SH AUTHOR
+.nf
+Erich Eckner <opensource at eckner dot net>
+.fi
diff --git a/sendmailadvanced b/sendmailadvanced.in
index c1a6ef0..e5a7f3e 100755
--- a/sendmailadvanced
+++ b/sendmailadvanced.in
@@ -1,7 +1,9 @@
#!/bin/bash
verwendung() {
- >&2 echo 'sendmailadvanced [(-h|--hook) hook] [(-i|--inline) file | -t|--no-inline] [-e|--[no-]encrypt] [-s|--[no-]stamp]'
+ >&2 echo 'This is sendmailadvanced version #VERSION#'
+ >&2 echo ''
+ >&2 echo 'usage: sendmailadvanced [(-h|--hook) hook] [(-i|--inline) file | -t|--no-inline] [-e|--[no-]encrypt] [-s|--[no-]stamp]'
>&2 echo ' -h|--hook: activate hook'
>&2 echo ' -i|--inline: enhance email file in situ'
>&2 echo ' "--inline -" has the same effect as "-t"'
@@ -45,9 +47,9 @@ dForced=false
eForced=false
sForced=false
-if [ -x /etc/sendmailadvanced.conf ]
+if [ -x #ETCDIR#/sendmailadvanced.conf ]
then
- . /etc/sendmailadvanced.conf
+ . #ETCDIR#/sendmailadvanced.conf
else
for konfig in $(readlink -f "$0").conf $(find . -name sendmailadvanced.conf 2> /dev/null)
do
@@ -118,7 +120,7 @@ done
MAILER="cantfind"
for executable in sendmail msmtp
do
- for prefix in /usr/bin /usr/sbin /bin /sbin
+ for prefix in #BINDIR# /usr/bin /usr/sbin /bin /sbin
do
[ "${MAILER}" == "cantfind" ] && [ -x ${prefix}/${executable} ] && MAILER="${prefix}/${executable}"
done