mblaze: version bump
parent
893d4f066c
commit
9d52695238
@ -1,11 +1,10 @@
|
||||
untrusted comment: verify with /etc/ports/jmq.pub
|
||||
RWTTPlFarK9CxKbgJY54+XdgP4VSkiRm9d9KOWFFZB1l8b+Aw8KMgcnEBiVxF2LjR0vvF9pbMmh0+lceBPVKyuN+enak0p3LuQ0=
|
||||
SHA256 (Pkgfile) = 5581e0ec639d08b3f03fc758662bd1836dd2eafd8caad0ff042c11e3cdc6371b
|
||||
RWTTPlFarK9CxFiQ4E6Qh4Rfgm7AWcDnG4Qq1uslRPeH7+A1Xgkl5ixeZbhYBnW+D0g3u/M4s35CGgk+dCljHsX/nsrnOU6zvAg=
|
||||
SHA256 (Pkgfile) = cd8b767a81122b4be7a8c42aed20a4dba153557d4901c26f344b536b910abcb0
|
||||
SHA256 (.footprint) = 6fc746ca88bb316e98fd2525578806717913e4d9da14730deb9b20e4d6bb93ca
|
||||
SHA256 (mblaze-v1.1.tar.gz) = edd8cb86f667543e703dee58263b81c7e47744339d23ebbb6a43e75059ba93b1
|
||||
SHA256 (replyfrom.patch) = 33b425ce02ee8651fdea79dd31de60116eaf0fc74c3093db71f5dc80f54cd163
|
||||
SHA256 (reuse-sent.patch) = 355c8f0cafd5d68fa91a60b4f7cc6b974f5d1bf96b5e091256989cee51f5be94
|
||||
SHA256 (mblaze-delete.patch) = bd13dc6ee7447388ffbf28c52889d6b59a0409313b9865af6fdcebe240f3ea9c
|
||||
SHA256 (mblaze-fofl.patch) = 0d492cba2fd4fde895021491c06a468b5352436e87b87734477005f1a01ce363
|
||||
SHA256 (mblaze-v1.2.tar.gz) = 50c164c88cc83b4f52691341ee14060da5a6f1859e86aa73ff595de4b410037f
|
||||
SHA256 (reuse-sent.patch) = a9a92c2c1e393c0cedb89bd4a78ec88114bb0fda10f73c2723d65ba3874f15c7
|
||||
SHA256 (mblaze-delete.patch) = 45e79542f911ae356cf03c20ad65d6ce8bdc4b0fad632922c2ca47fe5d7c1cc1
|
||||
SHA256 (mblaze-fofl.patch) = a829a8c52966dfa073b521214510eec78284214a7a8d2b9e26d979ad76f3e62e
|
||||
SHA256 (mdelete.1) = 3cf71d8227dbefe66273d5caf4096a271b10c81f81775b42d707ab93aa8a36c3
|
||||
SHA256 (mailshow) = 2d3b51f11007e41cbeb3a30afac9a68b76817cd2130a57f80fda5b870145c53d
|
||||
|
||||
@ -1,79 +1,69 @@
|
||||
--- mblaze-1.1/GNUmakefile 2021-01-14 10:45:22.000000000 -0500
|
||||
+++ mblaze-1.1f/GNUmakefile 2021-05-31 19:11:33.146804008 -0400
|
||||
@@ -15,7 +15,7 @@
|
||||
endif
|
||||
|
||||
DESTDIR=
|
||||
-PREFIX=/usr/local
|
||||
+PREFIX=/usr
|
||||
BINDIR=$(PREFIX)/bin
|
||||
MANDIR=$(PREFIX)/share/man
|
||||
|
||||
@@ -62,6 +62,7 @@
|
||||
ln -sf mcom $(DESTDIR)$(BINDIR)/mfwd
|
||||
ln -sf mcom $(DESTDIR)$(BINDIR)/mrep
|
||||
ln -sf mdeliver $(DESTDIR)$(BINDIR)/mrefile
|
||||
+ ln -sf mdeliver $(DESTDIR)$(BINDIR)/mdelete
|
||||
install -m0644 man/*.1 $(DESTDIR)$(MANDIR)/man1
|
||||
install -m0644 man/*.5 $(DESTDIR)$(MANDIR)/man5
|
||||
install -m0644 man/*.7 $(DESTDIR)$(MANDIR)/man7
|
||||
|
||||
--- mblaze-1.1/mdeliver.c 2021-01-14 10:45:22.000000000 -0500
|
||||
+++ mblaze-1.1f/mdeliver.c 2021-05-31 19:01:02.500148004 -0400
|
||||
@@ -287,6 +287,22 @@
|
||||
--- mblaze-1.2/mdeliver.c 2021-12-12 11:39:30.000000000 -0500
|
||||
+++ mblaze-1.2f/mdeliver.c 2022-05-12 09:01:42.858863260 -0400
|
||||
@@ -300,6 +300,23 @@ refile(char *file)
|
||||
unlink(file);
|
||||
}
|
||||
|
||||
+
|
||||
+void
|
||||
+mdelete(char *file)
|
||||
+ {
|
||||
+ while (*file == ' ' || *file == '\t')
|
||||
+ file++;
|
||||
+
|
||||
+ if (!kflag) {
|
||||
+ unlink(file);
|
||||
+ if (vflag)
|
||||
+ fprintf(stderr, "Messages deleted.\n");
|
||||
+ }
|
||||
+{
|
||||
+ while (*file == ' ' || *file == '\t')
|
||||
+ file++;
|
||||
+
|
||||
+ if (kflag)
|
||||
+ fprintf(stderr, "Deletion command overridden.\n");
|
||||
+ }
|
||||
+ if (!kflag) {
|
||||
+ unlink(file);
|
||||
+ if (vflag)
|
||||
+ fprintf(stderr, "Messages deleted.\n");
|
||||
+ }
|
||||
+
|
||||
+ if (kflag)
|
||||
+ fprintf(stderr, "Deletion command overridden.\n");
|
||||
+}
|
||||
+
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
@@ -323,6 +339,32 @@
|
||||
@@ -335,6 +352,32 @@ usage:
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
+
|
||||
+
|
||||
+ if (strchr(argv[0], 't')) {
|
||||
+ // mdelete(1)
|
||||
+ // mdelete(1)
|
||||
+
|
||||
+ int c;
|
||||
+ while ((c = getopt(argc, argv, "kv")) != -1)
|
||||
+ switch (c) {
|
||||
+ case 'k': kflag = 1; break;
|
||||
+ case 'v': vflag = 1; break;
|
||||
+ default:
|
||||
+ int c;
|
||||
+ while ((c = getopt(argc, argv, "kv")) != -1)
|
||||
+ switch (c) {
|
||||
+ case 'k': kflag = 1; break;
|
||||
+ case 'v': vflag = 1; break;
|
||||
+ default:
|
||||
+usage3:
|
||||
+ fprintf(stderr,
|
||||
+ "Usage: mdelete [-kv] [msgs]... \n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ fprintf(stderr, "Usage: mdelete [-kv] [msgs]... \n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ if (argc == optind - 1)
|
||||
+ goto usage3;
|
||||
+ if (argc == optind - 1)
|
||||
+ goto usage3;
|
||||
+
|
||||
+ if (argc == optind && isatty(0))
|
||||
+ goto usage3;
|
||||
+ else
|
||||
+ blaze822_loop(argc - optind, argv + optind, mdelete);
|
||||
+ if (argc == optind && isatty(0))
|
||||
+ goto usage3;
|
||||
+ else
|
||||
+ blaze822_loop(argc - optind, argv + optind, mdelete);
|
||||
+
|
||||
+ return 0;
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
|
||||
int c;
|
||||
while ((c = getopt(argc, argv, "cMvX:")) != -1)
|
||||
switch (c) {
|
||||
|
||||
--- mblaze-1.2/GNUmakefile 2021-12-12 11:39:30.000000000 -0500
|
||||
+++ mblaze-1.2f/GNUmakefile 2022-05-12 09:02:48.345479146 -0400
|
||||
@@ -62,6 +62,7 @@ install: FRC all
|
||||
ln -sf mcom $(DESTDIR)$(BINDIR)/mfwd
|
||||
ln -sf mcom $(DESTDIR)$(BINDIR)/mrep
|
||||
ln -sf mdeliver $(DESTDIR)$(BINDIR)/mrefile
|
||||
+ ln -sf mdeliver $(DESTDIR)$(BINDIR)/mdelete
|
||||
install -m0644 man/*.1 $(DESTDIR)$(MANDIR)/man1
|
||||
install -m0644 man/*.5 $(DESTDIR)$(MANDIR)/man5
|
||||
install -m0644 man/*.7 $(DESTDIR)$(MANDIR)/man7
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
--- mblaze-1.1/mcom 2021-01-14 15:45:22.000000000 -0000
|
||||
+++ mblaze-1.1f/mcom 2021-08-22 00:08:04.418851752 -0000
|
||||
@@ -12,13 +12,13 @@ commajoin() {
|
||||
|
||||
notmine() {
|
||||
mine="$(maddr -a -h local-mailbox:alternate-mailboxes: "$MBLAZE/profile")"
|
||||
- grep -Fv -e "$mine"
|
||||
+ grep -Fvi -e "$mine"
|
||||
}
|
||||
|
||||
replyfrom() {
|
||||
addrs="$(maddr -a -h reply-from: "$MBLAZE/profile")"
|
||||
[ -z "$addrs" ] && addrs="$(maddr -a -h alternate-mailboxes: "$MBLAZE/profile")"
|
||||
- grep -F -e "$addrs"
|
||||
+ grep -Fi -e "$addrs"
|
||||
}
|
||||
|
||||
ouniq() {
|
||||
@@ -358,8 +370,8 @@ fi
|
||||
[ -z "$to" ] && to=$(mhdr -d -h from "$1")
|
||||
printf 'To: %s\n' "$to"
|
||||
printf 'Cc: %s\n' \
|
||||
- "$(mhdr -d -A -h to:cc: "$1" |
|
||||
- notmine |grep -Fv -e "$to" |
|
||||
+ "$(maddr -a -h to:cc: "$1" |
|
||||
+ notmine |grep -Fvi -e "$to" |
|
||||
ouniq |commajoin)"
|
||||
printf 'Bcc: \n'
|
||||
printf '%s\n' "$hdrs" | awk '{ print }' |
|
||||
|
||||
@ -1,21 +1,48 @@
|
||||
--- mblaze-1.1/mcom 2021-01-14 15:45:22.000000000 -0000
|
||||
+++ mblaze-1.1f/mcom 2021-08-22 00:08:04.418851752 -0000
|
||||
--- mblaze-1.2/mcom 2021-12-12 11:39:30.000000000 -0500
|
||||
+++ mblaze-1.2f/mcom 2022-05-12 08:54:57.169177959 -0400
|
||||
@@ -12,13 +12,13 @@ commajoin() {
|
||||
|
||||
notmine() {
|
||||
mine="$(maddr -a -h local-mailbox:alternate-mailboxes: "$MBLAZE/profile")"
|
||||
- grep -Fv -e "$mine"
|
||||
+ grep -Fvi -e "$mine"
|
||||
}
|
||||
|
||||
replyfrom() {
|
||||
addrs="$(maddr -a -h reply-from: "$MBLAZE/profile")"
|
||||
[ -z "$addrs" ] && addrs="$(maddr -a -h alternate-mailboxes: "$MBLAZE/profile")"
|
||||
- grep -F -e "$addrs"
|
||||
+ grep -Fi -e "$addrs"
|
||||
}
|
||||
|
||||
ouniq() {
|
||||
@@ -133,6 +133,18 @@ case "$0" in
|
||||
"$draft" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
+ outbox=$(mhdr -h outbox "$MBLAZE/profile" | sed "s:^~/:$HOME/:")
|
||||
+ if [ -n "$(dirname "$draft" | grep "$outbox/cur")" ]; then
|
||||
+ newdraft=$(true | mdeliver -v -c -XD "$outbox")
|
||||
+ if [ -z "$newdraft" ]; then
|
||||
+ printf '%s\n' "$0: failed to load draft for editing." 1>&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+ sed "s/^\(Message-Id: \).*/\1$(mgenmid 2>/dev/null)/" $draft \
|
||||
+ > $newdraft
|
||||
+ sed -i "s/^\(Date: \).*/\1$(mdate)/" $newdraft
|
||||
+ draft=$newdraft
|
||||
+ fi
|
||||
+ if [ -n "$(dirname "$draft" | grep "$outbox/cur")" ]; then
|
||||
+ newdraft=$(true | mdeliver -v -c -XD "$outbox")
|
||||
+ if [ -z "$newdraft" ]; then
|
||||
+ printf '%s\n' "$0: failed to load draft for editing." 1>&2
|
||||
+ exit 1
|
||||
+ fi
|
||||
+ sed "s/^\(Message-Id: \).*/\1$(mgenmid 2>/dev/null)/" $draft \
|
||||
+ > $newdraft
|
||||
+ sed -i "s/^\(Date: \).*/\1$(mdate)/" $newdraft
|
||||
+ draft=$newdraft
|
||||
+ fi
|
||||
echo "using draft $draft"
|
||||
shift
|
||||
fi
|
||||
@@ -358,8 +370,8 @@ fi
|
||||
[ -z "$to" ] && to=$(mhdr -d -A -h from "$1")
|
||||
printf 'To: %s\n' "$to"
|
||||
printf 'Cc: %s\n' \
|
||||
- "$(mhdr -d -A -h to:cc: "$1" |
|
||||
- notmine |grep -Fv -e "$to" |
|
||||
+ "$(maddr -a -h to:cc: "$1" |
|
||||
+ notmine |grep -Fvi -e "$to" |
|
||||
ouniq |commajoin)"
|
||||
printf 'Bcc: \n'
|
||||
printf '%s\n' "$hdrs" | awk '{ print }' |
|
||||
|
||||
Loading…
Reference in New Issue