← Commit list

c19f7584e

Denys Vlasenko
Denys Vlasenko
2016-11-23
SUCCESS Duration: 268s

Subject

Convert all mailutils/* applets to "new style" applet definitions

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

include/applets.src.h +0 -4mailutils/Config.src +0 -43mailutils/makemime.c +7 -0mailutils/popmaildir.c +18 -0mailutils/reformime.c +15 -0mailutils/sendmail.c +7 -0
include/applets.src.h+0 -4
@@ -144,7 +144,6 @@ IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP))
IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP))
-IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP))
IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo))
@@ -165,7 +164,6 @@ IF_OD(APPLET(od, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_OPENVT(APPLET(openvt, BB_DIR_USR_BIN, BB_SUID_DROP))
//IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_PIVOT_ROOT(APPLET(pivot_root, BB_DIR_SBIN, BB_SUID_DROP))
-IF_POPMAILDIR(APPLET(popmaildir, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_PRINTENV(APPLET_NOFORK(printenv, printenv, BB_DIR_BIN, BB_SUID_DROP, printenv))
IF_PRINTF(APPLET_NOFORK(printf, printf, BB_DIR_USR_BIN, BB_SUID_DROP, printf))
IF_PWD(APPLET_NOFORK(pwd, pwd, BB_DIR_BIN, BB_SUID_DROP, pwd))
@@ -174,7 +172,6 @@ IF_RDEV(APPLET(rdev, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_READLINK(APPLET(readlink, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_READPROFILE(APPLET(readprofile, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_REALPATH(APPLET(realpath, BB_DIR_USR_BIN, BB_SUID_DROP))
-IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP))
IF_RESET(APPLET(reset, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_RESIZE(APPLET(resize, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon))
@@ -185,7 +182,6 @@ IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_SCRIPT(APPLET(script, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_SCRIPTREPLAY(APPLET(scriptreplay, BB_DIR_BIN, BB_SUID_DROP))
IF_SELINUXENABLED(APPLET(selinuxenabled, BB_DIR_USR_SBIN, BB_SUID_DROP))
-IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_SEQ(APPLET_NOFORK(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
IF_SESTATUS(APPLET(sestatus, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))
mailutils/Config.src+0 -43
@@ -2,12 +2,6 @@ menu "Mail Utilities"
INSERT
-config MAKEMIME
- bool "makemime"
- default y
- help
- Create MIME-formatted messages.
-
config FEATURE_MIME_CHARSET
string "Default charset"
default "us-ascii"
@@ -15,41 +9,4 @@ config FEATURE_MIME_CHARSET
help
Default charset of the message.
-config POPMAILDIR
- bool "popmaildir"
- default y
- help
- Simple yet powerful POP3 mail popper. Delivers content
- of remote mailboxes to local Maildir.
-
-config FEATURE_POPMAILDIR_DELIVERY
- bool "Allow message filters and custom delivery program"
- default y
- depends on POPMAILDIR
- help
- Allow to use a custom program to filter the content
- of the message before actual delivery (-F "prog [args...]").
- Allow to use a custom program for message actual delivery
- (-M "prog [args...]").
-
-config REFORMIME
- bool "reformime"
- default y
- help
- Parse MIME-formatted messages.
-
-config FEATURE_REFORMIME_COMPAT
- bool "Accept and ignore options other than -x and -X"
- default y
- depends on REFORMIME
- help
- Accept (for compatibility only) and ignore options
- other than -x and -X.
-
-config SENDMAIL
- bool "sendmail"
- default y
- help
- Barebones sendmail.
-
endmenu
mailutils/makemime.c+7 -0
@@ -6,6 +6,13 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
+//config:config MAKEMIME
+//config: bool "makemime"
+//config: default y
+//config: help
+//config: Create MIME-formatted messages.
+
+//applet:IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_MAKEMIME) += makemime.o mail.o
mailutils/popmaildir.c+18 -0
@@ -9,6 +9,24 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
+//config:config POPMAILDIR
+//config: bool "popmaildir"
+//config: default y
+//config: help
+//config: Simple yet powerful POP3 mail popper. Delivers content
+//config: of remote mailboxes to local Maildir.
+//config:
+//config:config FEATURE_POPMAILDIR_DELIVERY
+//config: bool "Allow message filters and custom delivery program"
+//config: default y
+//config: depends on POPMAILDIR
+//config: help
+//config: Allow to use a custom program to filter the content
+//config: of the message before actual delivery (-F "prog [args...]").
+//config: Allow to use a custom program for message actual delivery
+//config: (-M "prog [args...]").
+
+//applet:IF_POPMAILDIR(APPLET(popmaildir, BB_DIR_USR_SBIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_POPMAILDIR) += popmaildir.o mail.o
mailutils/reformime.c+15 -0
@@ -6,6 +6,21 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
+//config:config REFORMIME
+//config: bool "reformime"
+//config: default y
+//config: help
+//config: Parse MIME-formatted messages.
+//config:
+//config:config FEATURE_REFORMIME_COMPAT
+//config: bool "Accept and ignore options other than -x and -X"
+//config: default y
+//config: depends on REFORMIME
+//config: help
+//config: Accept (for compatibility only) and ignore options
+//config: other than -x and -X.
+
+//applet:IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_REFORMIME) += reformime.o mail.o
mailutils/sendmail.c+7 -0
@@ -6,6 +6,13 @@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
+//config:config SENDMAIL
+//config: bool "sendmail"
+//config: default y
+//config: help
+//config: Barebones sendmail.
+
+//applet:IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_SENDMAIL) += sendmail.o mail.o