From bb46ec2a8b2383f2bd3b6badcc8a7fdd1eebf67b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 2 Feb 2012 18:02:43 -0500 Subject: [PATCH] smtp: drop now unused package Now that we stub out ssmtp in package.provided, we no longer have to keep this in our repo. BUG=chromium-os:5777 TEST=build_packages+build_image for x86-alex boots and sudo works fine Change-Id: Id963632e07f7f0372bf7b472f1eec9e71dd7fac8 CQ-DEPEND=Id5b332a90952eb3ee8e6267d1ff046d856eb18e4 Reviewed-on: https://gerrit.chromium.org/gerrit/15337 Reviewed-by: Brian Harring Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- .../portage-stable/mail-mta/ssmtp/Manifest | 1 - .../ssmtp/files/CVE-2008-3962-r2.patch | 20 ---- .../mail-mta/ssmtp/files/mailer.conf | 10 -- .../ssmtp/files/ssmtp-2.61-darwin7.patch | 10 -- .../ssmtp/files/ssmtp-2.62-authpass.patch | 12 -- .../files/ssmtp-2.62-darwin-crypto.patch | 18 --- .../files/ssmtp-2.62-from_format_fix.patch | 22 ---- .../files/ssmtp-2.62-maxsysuid-conf.patch | 17 --- .../ssmtp/files/ssmtp-2.62-maxsysuid.patch | 37 ------ ...ssmtp-2.62-solaris-basename-conflict.patch | 38 ------ .../ssmtp/files/ssmtp-2.62-strndup.patch | 32 ----- .../mail-mta/ssmtp/ssmtp-2.62-r8.ebuild | 109 ------------------ 12 files changed, 326 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/CVE-2008-3962-r2.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/mailer.conf delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-authpass.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid-conf.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch delete mode 100644 sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/Manifest b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/Manifest deleted file mode 100644 index 22a11cbdeb..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ssmtp_2.62.orig.tar.gz 57127 RMD160 1c16b2d50224f4d29813a34f87a3480e66892b36 SHA1 5c15aafb252f6cb11e4b93140a1457b6cb0d0fb8 SHA256 e2a0a5379cd0bbb0b4b0304abeba7a8f60aa85275982c5d7930c319e7f284ed1 diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/CVE-2008-3962-r2.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/CVE-2008-3962-r2.patch deleted file mode 100644 index dad814a17a..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/CVE-2008-3962-r2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ssmtp.c.orig 2009-02-18 15:17:23.000000000 +0200 -+++ ssmtp.c 2009-02-18 15:19:54.000000000 +0200 -@@ -1376,7 +1376,7 @@ - ssize_t outbytes = 0; - - va_start(ap, format); -- if(vsnprintf(buf, (BUF_SZ - 2), format, ap) == -1) { -+ if(vsnprintf(buf, BUF_SZ, format, ap) == -1) { - die("smtp_write() -- vsnprintf() failed"); - } - va_end(ap); -@@ -1643,7 +1643,7 @@ - - /* don't hang forever when reading from stdin */ - while(!feof(stdin) && timeout < MEDWAIT) { -- if (!fgets(buf, sizeof(buf), stdin)) { -+ if (!fgets(buf, sizeof(buf)-2, stdin)) { - /* if nothing was received, then no transmission - * over smtp should be done */ - sleep(1); diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/mailer.conf b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/mailer.conf deleted file mode 100644 index dd7498d5e0..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/mailer.conf +++ /dev/null @@ -1,10 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/files/mailer.conf,v 1.4 2005/04/25 20:36:38 ferdy Exp $ -# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $ - -# Execute the "real" sendmail program from ssmtp, -# named /usr/sbin/ssmtp -# -sendmail /usr/sbin/ssmtp -send-mail /usr/sbin/ssmtp -mailq /usr/sbin/ssmtp -newaliases /usr/sbin/ssmtp diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch deleted file mode 100644 index 8f6aaec76c..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ssmtp-2.61/ssmtp.c -+++ ssmtp-2.61/ssmtp.c -@@ -14,6 +14,7 @@ - */ - #define VERSION "2.60.4" - -+#include - #include - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-authpass.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-authpass.patch deleted file mode 100644 index 5d6aae9a51..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-authpass.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ssmtp.c 2008-09-26 02:13:48.000000000 -0600 -+++ ssmtp.c.new 2008-09-26 02:15:41.000000000 -0600 -@@ -1056,7 +1042,8 @@ - } - } - else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) { -- if((auth_pass = strdup(q)) == (char *)NULL) { -+ auth_pass = firsttok(&rightside, " \n\t"); -+ if(auth_pass == (char *)NULL) { - die("parse_config() -- strdup() failed"); - } - diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch deleted file mode 100644 index 94b52d60a8..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix linking error: - -Undefined symbols: - "_X509_free", referenced from: - _smtp_open in ssmtp.o -ld: symbol(s) not found - - ---- configure.in -+++ configure.in -@@ -53,6 +53,6 @@ - if test x$enableval = xyes ; then - AC_DEFINE(HAVE_SSL) -- LIBS="$LIBS -lssl" -+ LIBS="$LIBS -lssl -lcrypto" - fi - enableval="" - diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch deleted file mode 100644 index 119cea2c29..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ssmtp.c.old 2009-09-11 11:51:01.000000000 +0200 -+++ ssmtp.c 2009-09-11 11:52:10.000000000 +0200 -@@ -455,7 +455,7 @@ - */ - char *from_format(char *str, bool_t override_from) - { -- char buf[(BUF_SZ + 1)]; -+ char buf[(BUF_SZ + 1)] = ""; - - if(override_from) { - if(minus_f) { -@@ -484,6 +484,10 @@ - if(snprintf(buf, BUF_SZ, "\"%s\" <%s>", gecos, str) == -1) { - die("from_format() -- snprintf() failed"); - } -+ } else { -+ if(snprintf(buf, BUF_SZ, "%s", str) == -1) { -+ die("from_format() -- snprintf() failed"); -+ } - } - } - diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid-conf.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid-conf.patch deleted file mode 100644 index 8e51c5e3c3..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid-conf.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ssmtp.orig.conf 2004-07-23 00:58:48.000000000 -0500 -+++ ssmtp.conf 2008-07-14 14:11:34.000000000 -0500 -@@ -2,10 +2,13 @@ - # /etc/ssmtp.conf -- a config file for sSMTP sendmail. - # - --# The person who gets all mail for userids < 1000 -+# The person who gets all mail for userids < MinUserId - # Make this empty to disable rewriting. - root=postmaster - -+# All mail delivered to userid >= MinUserId goes to user, not root. -+#MinUserId=1000 -+ - # The place where the mail goes. The actual machine name is required - # no MX records are consulted. Commonly mailhosts are named mail.domain.com - # The example will fit if you are in domain.com and your mailhub is so named. diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid.patch deleted file mode 100644 index fef53c4116..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ssmtp.orig.c 2004-07-23 00:58:48.000000000 -0500 -+++ ssmtp.c 2008-07-14 16:03:08.000000000 -0500 -@@ -76,6 +76,7 @@ int log_level = 1; - #else - int log_level = 0; - #endif -+int minuserid = MAXSYSUID+1; - int port = 25; - #ifdef INET6 - int p_family = PF_UNSPEC; /* Protocol family used in SMTP connection */ -@@ -641,7 +642,7 @@ char *rcpt_remap(char *str) - { - struct passwd *pw; - if((root==NULL) || strlen(root)==0 || strchr(str, '@') || -- ((pw = getpwnam(str)) == NULL) || (pw->pw_uid > MAXSYSUID)) { -+ ((pw = getpwnam(str)) == NULL) || (pw->pw_uid >= minuserid)) { - return(append_domain(str)); /* It's not a local systems-level user */ - } - else { -@@ -814,6 +815,17 @@ bool_t read_config() - log_event(LOG_INFO, "Set Root=\"%s\"\n", root); - } - } -+ else if(strcasecmp(p, "MinUserId") == 0) { -+ if((r = strdup(q)) == (char *)NULL) { -+ die("parse_config() -- strdup() failed"); -+ } -+ -+ minuserid = atoi(r); -+ -+ if(log_level > 0) { -+ log_event(LOG_INFO, "Set MinUserId=\"%d\"\n", minuserid); -+ } -+ } - else if(strcasecmp(p, "MailHub") == 0) { - if((mailhost = strdup(q)) == (char *)NULL) { - die("parse_config() -- strdup() failed"); diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch deleted file mode 100644 index 362ba5948f..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch +++ /dev/null @@ -1,38 +0,0 @@ -This function overshadows the one from libc on Solaris, and guess what, -is hence never called. Since the original one has an entirely different -contract, it results in unconditional segfaults lateron, so always use -the internal copy as it's small enough not to care. - ---- ssmtp.c -+++ ssmtp.c -@@ -223,11 +223,10 @@ - exit(1); - } - --#ifndef _GNU_SOURCE - /* --basename() -- Return last element of path -+xbasename() -- Return last element of path - */ --char *basename(char *str) -+char *xbasename(char *str) - { - char *p; - -@@ -238,7 +237,6 @@ - - return(strdup(p)); - } --#endif /* _GNU_SOURCE */ - - /* - strip_pre_ws() -- Return pointer to first non-whitespace character -@@ -2058,7 +2056,7 @@ - (void)signal(SIGTTOU, SIG_IGN); - - /* Set the globals */ -- prog = basename(argv[0]); -+ prog = xbasename(argv[0]); - - hostname = xgethostname(); - diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch deleted file mode 100644 index a4434ebf08..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch +++ /dev/null @@ -1,32 +0,0 @@ -Compensate for platforms that don't have strndup, like Solaris - ---- configure.in -+++ configure.in -@@ -30,7 +30,7 @@ - dnl Checks for library functions. - AC_TYPE_SIGNAL - AC_FUNC_VPRINTF --AC_CHECK_FUNCS(gethostname socket strdup strstr) -+AC_CHECK_FUNCS(gethostname socket strdup strndup strstr) - - dnl Check for optional features - AC_ARG_ENABLE(logfile, ---- ssmtp.c -+++ ssmtp.c -@@ -842,7 +842,16 @@ - if (!rest) { - return NULL; - } -+#ifdef HAVE_STRNDUP - tok=strndup(*s,rest-(*s)); -+#else -+ { -+ size_t len = rest - (*s); -+ tok = malloc(sizeof(char) * (len + 1)); -+ memcpy(tok, *s, len); -+ tok[len] = '\0'; -+ } -+#endif - if (!tok) { - die("firsttok() -- strndup() failed"); - } diff --git a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild b/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild deleted file mode 100644 index 76c4eb10ba..0000000000 --- a/sdk_container/src/third_party/portage-stable/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild,v 1.7 2010/11/27 19:42:36 armin76 Exp $ - -EAPI="3" - -inherit eutils toolchain-funcs autotools - -DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub" -HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/" -SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="ssl ipv6 md5sum maxsysuid" - -DEPEND="ssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND} - net-mail/mailbase - !net-mail/mailwrapper - !virtual/mta" -PROVIDE="virtual/mta" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - enewgroup ssmtp -} - -src_prepare() { - # Allow to specify the last used system user id, bug #231866 - if use maxsysuid; then - epatch "${FILESDIR}"/${P}-maxsysuid.patch - epatch "${FILESDIR}"/${P}-maxsysuid-conf.patch - fi - - # - epatch "${FILESDIR}/${P}-from_format_fix.patch" - - # CVE-2008-3962 - epatch "${FILESDIR}/CVE-2008-3962-r2.patch" - - # Fix AuthPass parsing (bug #238724) - epatch "${FILESDIR}/${P}-authpass.patch" - - epatch "${FILESDIR}/${PN}-2.61-darwin7.patch" - epatch "${FILESDIR}/${P}-strndup.patch" - epatch "${FILESDIR}/${P}-darwin-crypto.patch" - epatch "${FILESDIR}/${P}-solaris-basename-conflict.patch" - eautoreconf - - # Respect LDFLAGS (bug #152197) - sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in -} - -src_configure() { - tc-export CC LD - - econf \ - --sysconfdir="${EPREFIX}"/etc/ssmtp \ - $(use_enable ssl) \ - $(use_enable ipv6 inet6) \ - $(use_enable md5sum md5auth) -} - -src_compile() { - make clean || die - make etcdir="${EPREFIX}"/etc || die -} - -src_install() { - dosbin ssmtp || die - - doman ssmtp.8 ssmtp.conf.5 || die - dodoc INSTALL README TLS CHANGELOG_OLD || die - newdoc ssmtp.lsm DESC || die - - insinto /etc/ssmtp - doins ssmtp.conf revaliases || die - - local conffile="${ED}etc/ssmtp/ssmtp.conf" - - # Sorry about the weird indentation, I couldn't figure out a cleverer way - # to do this without having horribly >80 char lines. - sed -i -e "s:^hostname=:\n# Gentoo bug #47562\\ -# Commenting the following line will force ssmtp to figure\\ -# out the hostname itself.\n\\ -# hostname=:" \ - "${conffile}" || die "sed failed" - - # Comment rewriteDomain (bug #243364) - sed -i -e "s:^rewriteDomain=:#rewriteDomain=:" "${conffile}" - - # Set restrictive perms on ssmtp.conf as per #187841, #239197 - # Protect the ssmtp configfile from being readable by regular users as it - # may contain login/password data to auth against a the mailhub used. - fowners root:ssmtp /etc/ssmtp/ssmtp.conf - fperms 640 /etc/ssmtp/ssmtp.conf - - fowners root:ssmtp /usr/sbin/ssmtp - fperms 2711 /usr/sbin/ssmtp - - dosym ../sbin/ssmtp /usr/lib/sendmail || die - dosym ../sbin/ssmtp /usr/bin/sendmail || die - dosym ssmtp /usr/sbin/sendmail || die - dosym ../sbin/ssmtp /usr/bin/mailq || die - dosym ../sbin/ssmtp /usr/bin/newaliases || die -}