[2019-01-20 18:00] Philipp Takacs <phil...@bureaucracy.de>
> [2019-01-08 12:37] Dmitry Bogatov <kact...@debian.org>
> > [2019-01-06 20:40] Philipp Takacs <phil...@bureaucracy.de>
> > > After more then a year I can announce the release of mmh-0.4
> > >
> > > http://marmaro.de/prog/mmh/files/mmh-0.4.tar.gz
> >
> > Good news. You seems to forgot to upload signature (mmh-0.4.tar.gz.asc).
> > Would you be so kind to do it?
>
> Hi sorry for the delay. The signature is attached. My new pgp key is
> availibel at the keyservers and on my website:
>
> https://www.bureaucracy.de/philipp/key.asc
Thank you. Packaged and upload. Please, consider following patches I
maintain in Debian, you may wish to apply them upstream.
1. Spelling errors in manpages
2. Hyphen usage in manpage
3. Install manpages as show.1mh, not show.1 to avoid conflicts with
other programs.
4. Currently, if LOCKTYPE=dot, ./configure script forces Makefile to
setgid installed `inc' binary. I patch it out, but you may want to
add option to /not/ use setgid. It is headache for two-stage
installation, used by most package managers (dpkg, rpm, ...)
--
Note, that I send and fetch email in batch, once every 24 hours.
If matter is urgent, try https://t.me/kaction
--
Description: Fix spelling errors
Author: Dmitry Bogatov <kact...@debian.org>
Forwarded: yes
Last-Update: 2019-01-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/man/mh-alias.man5
+++ b/man/mh-alias.man5
@@ -220,7 +220,7 @@ file as appropriate.
.RE
.PP
Earlier versions of this man page showed a semicolon at the end of the
-blind list example. That caused the preceeding alias to not be
+blind list example. That caused the preceding alias to not be
expanded. There must not be a semicolon at the end of, or within, the
address group of a blind list.
.B post
diff --git a/man/mhl.man1 b/man/mhl.man1
index b6af953..e1a4b4b 100644
--- a/man/mhl.man1
+++ b/man/mhl.man1
@@ -170,7 +170,7 @@ ignores=component,...
specifies a list of components which are never output.
This option supports some simple globbing,
so a '*' at the end of a component will match
-for all components which start wich the string.
+for all components which start which the string.
When you want to match a component which ends with
a '*', you can escape the '*' with a '\\'.
.PP
diff --git a/man/pick.man1 b/man/pick.man1
index 5e20903..2de3ce5 100644
--- a/man/pick.man1
+++ b/man/pick.man1
@@ -94,11 +94,11 @@ With the others,
.B pick
compares the header field name case insensitive
and the tries to match the field body with the
-.IR patern.
+.IR pattern.
.PP
With
.BR --componend
-you can sepcify the exact header field name you are looking for.
+you can specify the exact header field name you are looking for.
It is used to pick a component which is not one of `To:',
`Cc:', `Date:', `From:', or `Subject:'.
An example is
@@ -107,7 +107,7 @@ An example is
Pattern matching is performed on a per\-header-field basis. Within the header
of the message, each field is treated as one long line, but in the
body, each line is separate. The
-.IR patern
+.IR pattern
will match any case.
.PP
Note that since the
@@ -304,7 +304,7 @@ The default
.B Scan
line contains the message number
(name), the date, the `From:' field and the `Subject' field.
-The folowing example shows the default output of
+The following example shows the default output of
.B scan
.PP
.RS 5
@@ -450,7 +450,7 @@ mark(1)
.RB ` "\-datefield date" '
.RB ` \-zero '
.RB ` \-list "' is the default if no `\-sequence', `\-nolist' otherwise"
-.RB ` "\-format pick\.default" "' if the programm is called with scan `scan.default' is used
+.RB ` "\-format pick\.default" "' if the program is called with scan `scan.default' is used
.fi
.SH CONTEXT
@@ -507,7 +507,7 @@ In
.B nmh
and old
.B mmh
-versions scan and pick where two diffrent tools. So instand of typing
+versions scan and pick where two different tools. So instand of typing
.PP
.RS 5
.nf
From: Dmitry Bogatov <kact...@gnu.org>
Date: Thu, 15 Feb 2018 23:16:13 +0300
X-Dgit-Generated: 0.3-2 6b99e2027ebc1565c4ab3c1daed87319168f9b26
Subject: [PATCH] man-fix-hyphen-usage
---
--- mmh-0.3.orig/etc/mhl.reply
+++ mmh-0.3/etc/mhl.reply
@@ -1,5 +1,5 @@
; mhl.reply
;
-; default message filter for `repl' (repl -format)
+; default message filter for `repl' (repl \-format)
;
body:component="> ",overflowtext="> ",overflowoffset=0
From: Dmitry Bogatov <kact...@gnu.org>
Date: Thu, 15 Feb 2018 23:16:13 +0300
X-Dgit-Generated: 0.3-2 689947f626a784325feeba832191bbdad9aadfab
Subject: [PATCH] change-manpage-suffix
---
Index: mmh/man/Makefile.in
===================================================================
--- mmh.orig/man/Makefile.in
+++ mmh/man/Makefile.in
@@ -19,10 +19,10 @@ libdir = @libdir@
etcdir = @sysconfdir@
datarootdir = @datarootdir@
mandir = @mandir@
-manext1 = 1
-manext5 = 5
-manext7 = 7
-manext8 = 8
+manext1 = 1mh
+manext5 = 5mh
+manext7 = 7mh
+manext8 = 8mh
mailspool = @mailspool@
sendmailpath = @sendmailpath@
@@ -124,30 +124,30 @@ install: install-man1 install-man5 insta
# install the man pages in man1
install-man1:
- mkdir -p $(DESTDIR)$(mandir)/man$(manext1)
+ mkdir -p $(DESTDIR)$(mandir)/man1
for file in $(MAN1); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man1 ; \
done
# install the man pages in man5
install-man5:
- mkdir -p $(DESTDIR)$(mandir)/man$(manext5)
+ mkdir -p $(DESTDIR)$(mandir)/man5
for file in $(MAN5); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man5 ; \
done
# install the man pages in man7
install-man7:
- mkdir -p $(DESTDIR)$(mandir)/man$(manext7)
+ mkdir -p $(DESTDIR)$(mandir)/man7
for file in $(MAN7); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext7) ; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man7 ; \
done
# install the man pages in man8
install-man8:
- mkdir -p $(DESTDIR)$(mandir)/man$(manext8)
+ mkdir -p $(DESTDIR)$(mandir)/man8
for file in $(MAN8); do \
- $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man8 ; \
done
# ========= UNINSTALL TARGETS =========
@@ -157,25 +157,25 @@ uninstall: uninstall-man1 uninstall-man5
# uninstall the man pages in man1
uninstall-man1:
for file in $(MAN1); do \
- rm -f $(DESTDIR)$(mandir)/man$(manext1)/$$file; \
+ rm -f $(DESTDIR)$(mandir)/man1/$$file; \
done
# uninstall the man pages in man5
uninstall-man5:
for file in $(MAN5); do \
- rm -f $(DESTDIR)$(mandir)/man$(manext5)/$$file; \
+ rm -f $(DESTDIR)$(mandir)/man5/$$file; \
done
# uninstall the man pages in man7
uninstall-man7:
for file in $(MAN7); do \
- rm -f $(DESTDIR)$(mandir)/man$(manext7)/$$file; \
+ rm -f $(DESTDIR)$(mandir)/man7/$$file; \
done
# uninstall the man pages in man8
uninstall-man8:
for file in $(MAN8); do \
- rm -f $(DESTDIR)$(mandir)/man$(manext8)/$$file; \
+ rm -f $(DESTDIR)$(mandir)/man8/$$file; \
done
# ========== DEPENDENCIES FOR CLEANUP ==========
@@ -203,4 +203,3 @@ subdir = man
Makefile: Makefile.in ../config.status
cd .. && ./config.status $(subdir)/$@
-
From: Dmitry Bogatov <kact...@gnu.org>
Date: Sun, 29 Apr 2018 12:28:44 +0000
X-Dgit-Generated: 0.3-3 9e66e78669e6484877e9c9ecf32ccedd4fa1a5ac
Subject: Remove SETGID_MAIL trickery from build system
It is correct, that inc(1mh) must have ability to create temporary files
in /var/spool/mail, but setting setgid bit at build stage {as opposite
to maintainer script} does not seem to work and breaks rootless build.
---
Index: mmh/configure.ac
===================================================================
--- mmh.orig/configure.ac
+++ mmh/configure.ac
@@ -286,16 +286,6 @@ if test "$ac_cv_lib_lockfile_lockfile_cr
fi
fi
-dnl If mailspool is not world-writable and dotlockfile is not setgid,
-dnl we need to #define MAILGROUP to 1 and make inc setgid.
-if test x"$LOCKTYPE" = x"dot" -a x"$nmh_cv_mailspool_world_writable" = x"no" -a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then
- dnl do we really need both of these?
- AC_DEFINE(MAILGROUP,1,
- [Define to 1 if you need to make `inc' set-group-id because your mail spool is not world writable. There are no guarantees as to the safety of doing this, but this #define will add some extra security checks.])dnl
- SETGID_MAIL=1
-fi
-AC_SUBST(SETGID_MAIL)dnl
-
dnl Use ls to see which group owns the mail spool directory.
AC_CACHE_CHECK(what group owns the mail spool, nmh_cv_ls_mail_grp,
[nmh_cv_ls_mail_grp=`$lspath -dL $nmh_cv_ls_grpopt $mailspool|$AWK '{print $4}'`
Index: mmh/uip/Makefile.in
===================================================================
--- mmh.orig/uip/Makefile.in
+++ mmh/uip/Makefile.in
@@ -268,11 +268,7 @@ install-misc:
# install commands with special installation needs (thus no $(SCMDS) use here)
install-scmds:
- if test x$(SETGID_MAIL) != x; then \
- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \
- else \
$(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd; \
- fi
uninstall:
for cmd in $(CMDS); do \
