summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2013-02-28 18:57:33 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2013-02-28 18:57:33 +0100
commit5d09992bbd94a5329a042c2fbcfe4cb1545f05c1 (patch)
tree41d6a293d33befa0e08982a013765b0c6b9b21fd
parentBad packages. (diff)
downloadportage-5d09992bbd94a5329a042c2fbcfe4cb1545f05c1.tar.xz
portage-5d09992bbd94a5329a042c2fbcfe4cb1545f05c1.zip
Move to main tree.
-rw-r--r--mail-mta/opensmtpd/Manifest6
-rw-r--r--mail-mta/opensmtpd/files/build-warnings.patch39
-rw-r--r--mail-mta/opensmtpd/files/pam.patch85
-rw-r--r--mail-mta/opensmtpd/files/smtpd.initd20
-rw-r--r--mail-mta/opensmtpd/files/smtpd.pam4
-rw-r--r--mail-mta/opensmtpd/metadata.xml12
-rw-r--r--mail-mta/opensmtpd/opensmtpd-9999.ebuild68
7 files changed, 0 insertions, 234 deletions
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
deleted file mode 100644
index fe75fbe..0000000
--- a/mail-mta/opensmtpd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX build-warnings.patch 1174 SHA256 6e3cf0e9ba2acf23f94baafc1c63533be3fa6370991c7b50dd84ec74340c6f5c SHA512 6adc6cb036e479d6e63355ac561529bb5cc15ebf315b54e76a0c94f031fb8bec6820bc97ce72a8f86ac664d222199c6fe3f2d4e893bd01d350567cc97eff4517 WHIRLPOOL bfaca8853680b4fc182b9ba6fe5c9f0bfd245b406c1d163afccbf7627aea085a0209a40535cdf29c8c782c2446512fcaa712ad7425bd6980dd5947311da1a14a
-AUX pam.patch 2076 SHA256 5110ab640222528fd494118136f83e201ad366ba999c9560b10671606bf79852 SHA512 c3d060a75d352bd17bfbaa1fc39fd3871e7e2b687c3cf71ed8b0ee0fab5261e6be89da6a8cbd39937399976ee4d1ce315d108ebc59fd92faca5e343d14025002 WHIRLPOOL cc6fa7fef6e2a1542fe7387d26849760720f93668e0364d7fcc6fb97b4d7c930c2fc97ca4d4fadf84e3aa2c066f2b374c8f8f0665aaa8053ea9220e07cface6c
-AUX smtpd.initd 349 SHA256 93104f5773e0f3eb0aa20cfe1d98d3812d5421b2499247b04de6a1cfad932c59 SHA512 858064618eeb9056e6accbf5a0fb8022958bc4e213a888e213ef1e80099c4fef23f9db2b3420f325a0dfeef47d666e219aa233fb84625f61571d82e5e6dae241 WHIRLPOOL 96daba57112300d1c06356494c8bdc87452a4b9498d8c344ef209a5a72fb9798c57a43200feb1d986908fb079e3e87852e9a0e47252a0dde98f9b6cd8d908a57
-AUX smtpd.pam 147 SHA256 d8edae7ceb5f5574426127aaa16fa00985f070065407b9de03e1963e9f7aaa58 SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086 WHIRLPOOL cb84894bb7c0f8348ad895568dd65864b15190f8f915f4501c0dd8c595fc32cd3430e5616e93286880f61d35b2c3120c731d1d091e69d77e92aeaed8817c169d
-EBUILD opensmtpd-9999.ebuild 1376 SHA256 7b6e75ee0a53db09a784920df97b6c7f733ac497f4ee9ea5e861b43bb63d7c19 SHA512 b30489edb4b06f7c7b182a80c36a5173c09112f12c0bc1bcf04e3839a5bb3c3b94ff3ab9f3619f92744de145600f5188bf035d8dbd77c0c9dc71c4d289c8279c WHIRLPOOL 25b098e452dfe8c53170da928bf3c0429110dd655876ad95b941f33de7d22d7f02b7a5404881cdd50b7299ec50cf637c9c7f9c9b16b22261ce58cfbfbcf89172
-MISC metadata.xml 503 SHA256 93b8d66532d8408a6d4b09aa464811631220d74112a0063a3cafd411b200b0ab SHA512 c052f461b4c31e9fe8956965d0d8dfa6939af9cecf41e1040d81f0943d1cfe41143f5a942dc72902ebc4b57f311743cf98c304020b0d60937e44087675a37b6a WHIRLPOOL 001bf05ce0a2cebabb3b7536172db8ec3f869fef28d138246ad7a287d779a08adcff63b9dbf184eb62f2c068497c807a9aedff7bdf0977c07b4b91ebb33de0e2
diff --git a/mail-mta/opensmtpd/files/build-warnings.patch b/mail-mta/opensmtpd/files/build-warnings.patch
deleted file mode 100644
index 5732da9..0000000
--- a/mail-mta/opensmtpd/files/build-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/openbsd-compat/entropy.c b/openbsd-compat/entropy.c
-index 2d4e151..ac1ab37 100644
---- a/openbsd-compat/entropy.c
-+++ b/openbsd-compat/entropy.c
-@@ -48,7 +48,7 @@
- //#include "xmalloc.h"
- //#include "atomicio.h"
- //#include "pathnames.h"
--//#include "log.h"
-+#include "log.h"
- //#include "buffer.h"
-
- /* wrapper for signal interface */
-diff --git a/openbsd-compat/imsg-buffer.c b/openbsd-compat/imsg-buffer.c
-index 7223ad7..7c4d686 100644
---- a/openbsd-compat/imsg-buffer.c
-+++ b/openbsd-compat/imsg-buffer.c
-@@ -256,7 +256,7 @@ msgbuf_write(struct msgbuf *msgbuf)
- cmsg->cmsg_len = CMSG_LEN(sizeof(int));
- cmsg->cmsg_level = SOL_SOCKET;
- cmsg->cmsg_type = SCM_RIGHTS;
-- *(int *)CMSG_DATA(cmsg) = buf->fd;
-+ memcpy(CMSG_DATA(cmsg), &buf->fd, sizeof(int));
- }
-
- again:
-diff --git a/smtpd/mproc.c b/smtpd/mproc.c
-index 7d9e593..d152784 100644
---- a/smtpd/mproc.c
-+++ b/smtpd/mproc.c
-@@ -230,7 +230,7 @@ msgbuf_write2(struct msgbuf *msgbuf)
- cmsg->cmsg_len = CMSG_LEN(sizeof(int));
- cmsg->cmsg_level = SOL_SOCKET;
- cmsg->cmsg_type = SCM_RIGHTS;
-- *(int *)CMSG_DATA(cmsg) = buf->fd;
-+ memcpy(CMSG_DATA(cmsg), &buf->fd, sizeof(int));
- }
-
- again:
diff --git a/mail-mta/opensmtpd/files/pam.patch b/mail-mta/opensmtpd/files/pam.patch
deleted file mode 100644
index bb2a4e1..0000000
--- a/mail-mta/opensmtpd/files/pam.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ru opensmtpd-5.2.xp1/smtpd/smtpd.c opensmtpd-5.2.xp1-pam/smtpd/smtpd.c
---- opensmtpd-5.2.xp1/smtpd/smtpd.c 2013-02-21 20:13:32.000000000 +0100
-+++ opensmtpd-5.2.xp1-pam/smtpd/smtpd.c 2013-02-28 06:02:51.034730193 +0100
-@@ -34,6 +34,15 @@
- #ifdef BSD_AUTH
- #include <bsd_auth.h>
- #endif
-+
-+#ifdef USE_PAM
-+#if defined(HAVE_SECURITY_PAM_APPL_H)
-+#include <security/pam_appl.h>
-+#elif defined (HAVE_PAM_PAM_APPL_H)
-+#include <pam/pam_appl.h>
-+#endif
-+#endif
-+
- #ifdef HAVE_CRYPT_H
- #include <crypt.h> /* needed for crypt() */
- #endif
-@@ -1639,6 +1648,53 @@
- }
- #endif
-
-+#ifdef USE_PAM
-+int
-+pam_conv_password(int num_msg, const struct pam_message **msg, struct pam_response **respp, const char *password)
-+{
-+ struct pam_response *response;
-+ if (num_msg != 1)
-+ return PAM_CONV_ERR;
-+ response = malloc(sizeof(struct pam_response));
-+ if (!response)
-+ return PAM_BUF_ERR;
-+ memset(response, 0, sizeof(struct pam_response));
-+ response->resp = strdup(password);
-+ if (!response->resp)
-+ return PAM_BUF_ERR;
-+ *respp = response;
-+ return PAM_SUCCESS;
-+}
-+int
-+parent_auth_pam(const char *username, const char *password)
-+{
-+ int rc;
-+ pam_handle_t *pamh = NULL;
-+ struct pam_conv conv = { pam_conv_password, password };
-+
-+ if ((rc = pam_start("smtpd", username, &conv, &pamh)) != PAM_SUCCESS)
-+ goto end;
-+ if ((rc = pam_authenticate(pamh, 0)) != PAM_SUCCESS)
-+ goto end;
-+ if ((rc = pam_acct_mgmt(pamh, 0)) != PAM_SUCCESS)
-+ goto end;
-+end:
-+ pam_end(pamh, rc);
-+
-+ switch (rc) {
-+ case PAM_SUCCESS:
-+ return LKA_OK;
-+ case PAM_SYSTEM_ERR:
-+ case PAM_ABORT:
-+ case PAM_AUTHINFO_UNAVAIL:
-+ return LKA_TEMPFAIL;
-+ default:
-+ return LKA_PERMFAIL;
-+
-+ }
-+}
-+#endif
-+
- int
- parent_auth_pwd(const char *username, const char *password)
- {
-@@ -1664,8 +1720,10 @@
- int
- parent_auth_user(const char *username, const char *password)
- {
--#ifdef BSD_AUTH
-+#if defined(BSD_AUTH)
- return (parent_auth_bsd(username, password));
-+#elif defined(USE_PAM)
-+ return (parent_auth_pam(username, password));
- #else
- return (parent_auth_pwd(username, password));
- #endif
diff --git a/mail-mta/opensmtpd/files/smtpd.initd b/mail-mta/opensmtpd/files/smtpd.initd
deleted file mode 100644
index db89844..0000000
--- a/mail-mta/opensmtpd/files/smtpd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting OpenSMTPD"
- start-stop-daemon --start --quiet --exec /usr/sbin/smtpd
- eend ${?}
-}
-
-stop() {
- ebegin "Stopping OpenSMTPD"
- /usr/sbin/smtpctl stop
- eend ${?}
-}
diff --git a/mail-mta/opensmtpd/files/smtpd.pam b/mail-mta/opensmtpd/files/smtpd.pam
deleted file mode 100644
index a85aeae..0000000
--- a/mail-mta/opensmtpd/files/smtpd.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-auth required pam_nologin.so
-auth include system-auth
-account include system-auth
-session include system-auth
diff --git a/mail-mta/opensmtpd/metadata.xml b/mail-mta/opensmtpd/metadata.xml
deleted file mode 100644
index c7aad02..0000000
--- a/mail-mta/opensmtpd/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription lang="en">
-OpenSMTPD is an implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions. It allows ordinary machines to exchange e-mails with other systems speaking the SMTP protocol.
-</longdescription>
-<maintainer>
-<email>zx2c4@gentoo.org</email>
-<name>Jason A. Donenfeld</name>
-</maintainer>
-</pkgmetadata>
-
diff --git a/mail-mta/opensmtpd/opensmtpd-9999.ebuild b/mail-mta/opensmtpd/opensmtpd-9999.ebuild
deleted file mode 100644
index 5f15f5d..0000000
--- a/mail-mta/opensmtpd/opensmtpd-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam git-2
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="http://www.opensmtpd.org/"
-SRC_URI=""
-EGIT_BRANCH="portable"
-EGIT_REPO_URI="git://github.com/poolpOrg/OpenSMTPD.git"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4 SSLeay"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pam"
-
-DEPEND="dev-libs/openssl
- sys-libs/zlib
- pam? ( virtual/pam )
- sys-libs/db
- dev-db/sqlite:3
- dev-libs/libevent
- !net-mail/mailwrapper
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/nbsmtp
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/postfix
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}.xp1
-
-src_prepare() {
- epatch "${FILESDIR}"/pam.patch
- epatch "${FILESDIR}"/build-warnings.patch
-}
-
-src_configure() {
- ./bootstrap
- econf \
- --with-privsep-user=smtpd \
- --with-privsep-path=/var/empty \
- --with-sock-dir=/var/run \
- --sysconfdir=/etc/opensmtpd \
- $(use_with pam)
-}
-
-src_install() {
- default
- newinitd "${FILESDIR}"/smtpd.initd smtpd
- use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-}
-
-pkg_preinst() {
- enewgroup smtpd 25
- enewuser smtpd 25 -1 /var/empty smtpd
-}