commit: 2d5b72d67ddecd78c62e63cfa5c5dc484b97bdd8
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 19:37:30 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 19:37:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5b72d6
net-mail/qpopper: Fix LICENSE (#426048), and compilation with current glibc
(#532254 by Tom).
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-mail/qpopper/Manifest | 2 +-
.../qpopper/files/qpopper-4.1-parallel-build.patch | 4 ++--
net-mail/qpopper/files/qpopper-4.1.0-glibc.patch | 12 ++++++++++
net-mail/qpopper/qpopper-4.1.0.ebuild | 26 +++++++++++++---------
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/net-mail/qpopper/Manifest b/net-mail/qpopper/Manifest
index 936b8427303..4b2650478e9 100644
--- a/net-mail/qpopper/Manifest
+++ b/net-mail/qpopper/Manifest
@@ -1 +1 @@
-DIST qpopper4.1.0.tar.gz 1239530 SHA256
1bc21f83cda47e9b2d5d8ceecc49f169e10fdb9b99ddddcd543218fad269b0de SHA512
01e3ac13fa446bded84628a29a23849f623d5e5f85fdb77126cc4c2e20785c658fbc3d8a356eafd9f0ed2e879c6b4f6a754b6b685ea51b784c2cd0458c389c8b
WHIRLPOOL
1317aaf3726a0406aa3b3bda0316a8fcd859dd681fe961db2233ae3832ad262d5341fa5af42796af2b2d86ac9f9cf32e8ee625c993021eb619df0807f2fff0f5
+DIST qpopper4.1.0.tar.gz 1239530 BLAKE2B
a82d0ae8cbb5e606b8e0f7f4902b6920e14f404fa78860d4a7e92e0ab9ac354d518aab39f4a32c9b095c9396995e186bde2315d17d9496a7c0231cb1452e1439
SHA512
01e3ac13fa446bded84628a29a23849f623d5e5f85fdb77126cc4c2e20785c658fbc3d8a356eafd9f0ed2e879c6b4f6a754b6b685ea51b784c2cd0458c389c8b
diff --git a/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
b/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
index 23cc7c39cec..16b0c3aff88 100644
--- a/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
+++ b/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
@@ -1,6 +1,6 @@
=== modified file 'popper/Makefile.in'
---- popper/Makefile.in 2011-09-11 13:29:01 +0000
-+++ popper/Makefile.in 2011-09-11 13:29:23 +0000
+--- a/popper/Makefile.in 2011-09-11 13:29:01 +0000
++++ b/popper/Makefile.in 2011-09-11 13:29:23 +0000
@@ -212,7 +212,7 @@
-I${common_srcdir} ${common_dir}/libcommon.a \
${LIBS} ${LDFLAGS}
diff --git a/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch
b/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch
new file mode 100644
index 00000000000..53e2c6234f9
--- /dev/null
+++ b/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch
@@ -0,0 +1,12 @@
+glibc-fix.diff:
+--- qpopper4.1.0/popper/popper.h.orig 2011-05-30 21:13:40.000000000 +0200
++++ qpopper4.1.0/popper/popper.h 2016-12-31 09:31:26.910604367 +0100
+@@ -313,7 +313,7 @@
+ #if !( defined(BSD) && (BSD >= 199306) ) && !defined(__USE_BSD)
+ extern int sys_nerr;
+ # ifndef FREEBSD
+- extern char * sys_errlist[];
++ extern const char * const sys_errlist[];
+ # ifndef SYS_SIGLIST_DECLARED
+ # ifndef __linux__
+ extern char * sys_siglist[];
diff --git a/net-mail/qpopper/qpopper-4.1.0.ebuild
b/net-mail/qpopper/qpopper-4.1.0.ebuild
index e9b1d4e5b43..d93429ce1c2 100644
--- a/net-mail/qpopper/qpopper-4.1.0.ebuild
+++ b/net-mail/qpopper/qpopper-4.1.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
-#inherit eutils flag-o-matic ssl-cert
-inherit eutils ssl-cert user
+EAPI=6
+inherit ssl-cert user
MY_P=${PN}${PV}
@@ -11,7 +10,7 @@ DESCRIPTION="A POP3 Server"
HOMEPAGE="http://www.eudora.com/products/unsupported/qpopper/index.html";
SRC_URI="ftp://ftp.qualcomm.com/eudora/servers/unix/popper/${MY_P}.tar.gz";
-LICENSE="qpopper ISOC-rfc"
+LICENSE="qpopper GPL-2 ISOC-rfc"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug drac gdbm mailbox pam ssl xinetd apop"
@@ -22,19 +21,25 @@ DEPEND="virtual/mta
gdbm? ( sys-libs/gdbm )
drac? ( mail-client/drac )
pam? ( >=sys-libs/pam-0.72 )
- ssl? ( dev-libs/openssl )"
+ ssl? ( dev-libs/openssl )
+"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.1-parallel-build.patch
+ "${FILESDIR}"/${PN}-4.1.0-glibc.patch #532254
+)
pkg_setup() {
use apop && enewuser pop
}
src_prepare() {
+ default
# Test dirs are full of binary craft. Drop it.
rm -rf ./mmangle/test || die
- epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
sed -i -e 's:-o popauth:& ${LDFLAGS}:' popper/Makefile.in || die
}
@@ -87,11 +92,12 @@ src_install() {
newinitd "${FILESDIR}/qpopper.init.d" qpopper
fi
- dodoc README doc/{Release.Notes,Changes}
+ HTML_DOCS="doc/LMOS-FAQ.html"
+ einstalldocs
+ dodoc doc/{Release.Notes,Changes}
docinto rfc
dodoc doc/rfc*.txt
- dohtml doc/LMOS-FAQ.html
insinto /usr/share/doc/${PF}
doins GUIDE.pdf
