Suppress warnings.

6 files changed, 49 insertions, 10 deletions

diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index dd1a4ef..48f4d26 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,7 +1,7 @@
-AUX opensmtpd.initd 349 SHA256 93104f5773e0f3eb0aa20cfe1d98d3812d5421b2499247b04de6a1cfad932c59 SHA512 858064618eeb9056e6accbf5a0fb8022958bc4e213a888e213ef1e80099c4fef23f9db2b3420f325a0dfeef47d666e219aa233fb84625f61571d82e5e6dae241 WHIRLPOOL 96daba57112300d1c06356494c8bdc87452a4b9498d8c344ef209a5a72fb9798c57a43200feb1d986908fb079e3e87852e9a0e47252a0dde98f9b6cd8d908a57
-AUX opensmtpd.pam 147 SHA256 d8edae7ceb5f5574426127aaa16fa00985f070065407b9de03e1963e9f7aaa58 SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086 WHIRLPOOL cb84894bb7c0f8348ad895568dd65864b15190f8f915f4501c0dd8c595fc32cd3430e5616e93286880f61d35b2c3120c731d1d091e69d77e92aeaed8817c169d
-AUX pam.patch 2080 SHA256 a054c4aa83140ac1ea219c7ed2fc2b22d68f5371ffc812360d48ec191010c343 SHA512 39fc5767538629cdb58f84c0c9ca8f6dca8c8bb94df90abad4d662e65b4a20392b1b90b5ecc7d2bba35ddee95bcf280225d771f680a8fcf6b745ed324f734eef WHIRLPOOL 0ebc1cbdfa7b395e71ca7f014d5bd3a4073ed0ddf5bf631c628b5a234faa680d2e26a097a9ebae4d5af86dc5827c734e54d406fd8947c032c07026edc2f564b7
-AUX strict-alias.patch 825 SHA256 217825a8d0f8c58ff0090915151debb8368cfacc05ee546a414ecf8bfb05c9cf SHA512 1010eda3f2f924fcc84f24cf9b38276010043c5fa5731691dda14480ef0f09c45d001bdaeb15d9e1ac6ea3e3aac6d392eb3dcb3bc36414a73bbc0cc856e3c0eb WHIRLPOOL c18dda3d540a330f804cfbd278494dedb0a6587f1f5ace3c1f5521833bdf4e927dec5820b62dd3443b40a13cfd2d7d8081b6e110f21c9f6cf453f9b60235d4d7
+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
 DIST opensmtpd-portable-latest.tar.gz 434149 SHA256 596a2cf1ce1e7f637d80042130fe6fd8e4a570e01ef4931767d4a3eda80838ee SHA512 882873abc9c3a3131dcb6dd9e189330975af7a6bb17338f4f00054f71cc24fc70f3651aee042fa30a4544758120e6e6cf8041c231ae68ee655cc3725034fd2af WHIRLPOOL 4658ee14eb0d9ea25e0e9816416614299a108186a20d87f699864df929cf57854bf326cd6cae0c41642fe9f6d5f14097f2ac5a749bf7cba6b9c51a6c48b11ec7
-EBUILD opensmtpd-5.2.ebuild 1364 SHA256 da248037a9d7b9fb9096ecfb6fc6e4be010bbb10d4b1607b43c869811012a6e2 SHA512 66028e5b12974309f5f9ae5f1a4613ceb182486b496b7b3d97d308b1d5fa0e0f8d6bcedf5433c4a16c5e9c77b15d7a959238861b4e3dc7b595958d6a4034ae1c WHIRLPOOL 9f4d2431f73d83871525da14cac8c1562dd56a349351d746e40c0065b53289f69ec5a02cf332997b9680ed33c02ea0090966d486d777e813554cd6e19f8323bb
+EBUILD opensmtpd-5.2.ebuild 1350 SHA256 cbf68e4aa4e408551d42ea12d20b0b3d4ac1399090921a06287bd672520e9903 SHA512 5683bbf959d36598fae46eb6ba74fd353b4b1d854c17f0064e58721e2c24c7c6337b22f94094e3f2f054bc26191acb4ee9019fe7848148c8df4c3ecbf78c5cdc WHIRLPOOL 3a0b58c4a582dc1e524c7b6eb3848de5bff5cc63196721b695f66a1322cf16ed05f1fb28b7abe61ec4ff32b0f23d37da41dbf36dd873a3b901d0ccdf7b0f5e47
 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
new file mode 100644
index 0000000..5732da9
--- /dev/null
+++ b/mail-mta/opensmtpd/files/build-warnings.patch
@@ -0,0 +1,39 @@
+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
index f07fb51..bb2a4e1 100644
--- a/mail-mta/opensmtpd/files/pam.patch
+++ b/mail-mta/opensmtpd/files/pam.patch
@@ -45,7 +45,7 @@ diff -ru opensmtpd-5.2.xp1/smtpd/smtpd.c opensmtpd-5.2.xp1-pam/smtpd/smtpd.c
 +	pam_handle_t *pamh = NULL;
 +	struct pam_conv conv = { pam_conv_password, password };
 +	
-+	if ((rc = pam_start("opensmtpd", username, &conv, &pamh)) != PAM_SUCCESS)
++	if ((rc = pam_start("smtpd", username, &conv, &pamh)) != PAM_SUCCESS)
 +		goto end;
 +	if ((rc = pam_authenticate(pamh, 0)) != PAM_SUCCESS)
 +		goto end;
diff --git a/mail-mta/opensmtpd/files/opensmtpd.initd b/mail-mta/opensmtpd/files/smtpd.initd
index db89844..db89844 100644
--- a/mail-mta/opensmtpd/files/opensmtpd.initd
+++ b/mail-mta/opensmtpd/files/smtpd.initd
diff --git a/mail-mta/opensmtpd/files/opensmtpd.pam b/mail-mta/opensmtpd/files/smtpd.pam
index a85aeae..a85aeae 100644
--- a/mail-mta/opensmtpd/files/opensmtpd.pam
+++ b/mail-mta/opensmtpd/files/smtpd.pam
diff --git a/mail-mta/opensmtpd/opensmtpd-5.2.ebuild b/mail-mta/opensmtpd/opensmtpd-5.2.ebuild
index 7e3cf84..2acfdce 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
 HOMEPAGE="http://www.opensmtpd.org/"
 SRC_URI="http://www.opensmtpd.org/archives/opensmtpd-portable-latest.tar.gz"
 
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4 SSLeay"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="pam"
@@ -41,7 +41,7 @@ S=${WORKDIR}/${P}.xp1
 
 src_prepare() {
 	epatch "${FILESDIR}"/pam.patch
-	epatch "${FILESDIR}"/strict-alias.patch
+	epatch "${FILESDIR}"/build-warnings.patch
 }
 
 src_configure() {
@@ -56,8 +56,8 @@ src_configure() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/opensmtpd.initd opensmtpd
-	use pam && newpamd "${FILESDIR}"/opensmtpd.pam opensmtpd
+	newinitd "${FILESDIR}"/smtpd.initd smtpd
+	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
 }
 
 pkg_preinst() {