From d62d7863a1b694bdd5406d505ed95c648d013433 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Oct 2014 16:15:28 +0400 Subject: [PATCH] Sync with portage [Tue Oct 14 16:15:27 MSK 2014]. --- mail-mta/postfix/Manifest | 4 +- mail-mta/postfix/postfix-2.10.4.ebuild | 315 +++++++++++++++++ mail-mta/postfix/postfix-2.11.2.ebuild | 324 ++++++++++++++++++ ...ebuild => postfix-2.12_pre20141013.ebuild} | 2 +- media-fonts/unifont/unifont-7.0.03.ebuild | 4 +- media-libs/plib/files/plib-1.8.5-X11.patch | 11 + media-libs/plib/plib-1.8.5.ebuild | 6 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/mail-mta/postfix-2.10.4 | 14 + metadata/md5-cache/mail-mta/postfix-2.11.2 | 14 + ...2_pre20141011 => postfix-2.12_pre20141013} | 4 +- metadata/md5-cache/media-fonts/unifont-7.0.03 | 4 +- metadata/md5-cache/media-libs/plib-1.8.5 | 6 +- metadata/md5-cache/net-im/prosody-0.9.5-r1 | 13 + metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-im/prosody/files/prosody.initd-r1 | 47 +++ net-im/prosody/prosody-0.9.5-r1.ebuild | 83 +++++ 21 files changed, 844 insertions(+), 19 deletions(-) create mode 100644 mail-mta/postfix/postfix-2.10.4.ebuild create mode 100644 mail-mta/postfix/postfix-2.11.2.ebuild rename mail-mta/postfix/{postfix-2.12_pre20141011.ebuild => postfix-2.12_pre20141013.ebuild} (99%) create mode 100644 media-libs/plib/files/plib-1.8.5-X11.patch create mode 100644 metadata/md5-cache/mail-mta/postfix-2.10.4 create mode 100644 metadata/md5-cache/mail-mta/postfix-2.11.2 rename metadata/md5-cache/mail-mta/{postfix-2.12_pre20141011 => postfix-2.12_pre20141013} (95%) create mode 100644 metadata/md5-cache/net-im/prosody-0.9.5-r1 create mode 100644 net-im/prosody/files/prosody.initd-r1 create mode 100644 net-im/prosody/prosody-0.9.5-r1.ebuild diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index 2818eed7f203..7ef81a3ae0f6 100644 --- a/mail-mta/postfix/Manifest +++ b/mail-mta/postfix/Manifest @@ -1,5 +1,7 @@ DIST postfix-2.10.2.tar.gz 3828326 SHA256 f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4 SHA512 fa6c123da040a8e332c0bf2430f5b098523c2eff42a6cf4bfe6618b82d59be8e5a7f5c85b09ab8fd0312058b2135b174e00890423e4d3f8f732c3dc3c91f01c3 WHIRLPOOL 4e1e453ecd653058faf7420d6bfb6ac6a6c343f03f9c1a4213c403a7164d99f659a0b9ba744b803c3d94cfaf3216d3505f44d22069421f6cc4a4651b6be1f316 DIST postfix-2.10.3.tar.gz 3828808 SHA256 7815d8ad88af76e0962f18bf1e80b1aa5a0d096a00dac1d313fbab3e824b3f5b SHA512 f21ae36f9fa7fd8ad1727f5595e0f65fe49a3a5937269ad68b0a96e666e61d49cf6c72303d84c81ae7fc902146121443f9e27b876b447594557a756f239937d1 WHIRLPOOL b7a7c6f31a78a9ce92ca072c11e1ecc44c72cd5c37fb2067f91a4bcb2a92556e60f41ba23e065c31acd58a97f5497d4f62af01edd3003de5e6c6879a304a4a9f +DIST postfix-2.10.4.tar.gz 3829427 SHA256 e5233438420fbd6b49a64f007bd8da7dd046777436fb82dd50eadcd8901e7201 SHA512 619b6e2cfa0bd50148fe7ad7df09c13b9e5e8e43fe9331ce03010911f02b9daac16df863cc3ce604375f7e3ae076bf316fed7ffb6f424f873c869d3797d5c81f WHIRLPOOL c7b23975484383be1001f5da96a98614ac96f50c9083fff0986c8303933f51c673c1cd389dbaaa92c17b0f3c087f7979ef9d2a03cfa03c1d5f6c771554269cad DIST postfix-2.11.1.tar.gz 4035026 SHA256 487f98a73b95a5799409caf21ec065efea91c1dcdfb84c038a0e3a265d6489e2 SHA512 988659ed7f256fdc831c6a211c33aede922d5baf32da7129afe0ec2fe5011ac95dacb21e59c92f658323b6ea773ebf2bcd66a796d9271c1e7b949d5d9b9ee977 WHIRLPOOL 902eff1304b9d0d52a759f0a0804cd5e34d44b8f1acde26f60db6ddc69d84ff93c70c7b27b9c39318b124582b13d61685fc46c2513044fd4c7511370a33efde7 -DIST postfix-2.12-20141011.tar.gz 4183215 SHA256 4680bbefd9bd1fa950b6d257025f082fd35d22a7d2d162266da51677f7783bca SHA512 95507579f4b20229d0e79eeab3e23494b7fc25ed98367eb00201f4a4e74b555c5d49d1c9bd4fcab18aee335a298a7792b4a6a71b9ac462bc9e3c34287192b360 WHIRLPOOL 235d6355d6f797978ddcdb9604f4106db92e5df6e1c694c946569fb0268f5980811072d93f3647be1c8697da14df9dcd5432ea5b2eb6d524e4c278a941bd5b48 +DIST postfix-2.11.2.tar.gz 4039038 SHA256 aa6eba4842457c88c48fb65faeb4fc6496cb3e9ceb9e0ddcb3c13b501821a258 SHA512 065688e2d95616dec5111a46d0e2a564d8617a5001156da79833b56056dccad411b5205ab4c304ffa49519dd810539543978f0babd7daba0e5618d8e448c9fcb WHIRLPOOL d15ed1456b4905ced04afaeee13150aff36c971fd1cdc4e19be18740249c188e071d353004728ca5474727e7eccc35eb61cbbf07ad8a1e5fd15261d31a134c92 +DIST postfix-2.12-20141013.tar.gz 4185611 SHA256 ae8166b98ca33489c02c401dbbffaf5b6de55c86f862f891ff1dacf0a0837474 SHA512 a7441756c748a7b94e21c494c30195bab5b73985970d330bf86049f3fae8ca5473f5adf982a60ea02242d3014fd65908e7d5cee837de4d5d5a52595b0dafd5fb WHIRLPOOL 55ff0325dd9f57842314ac555c001a49b2a482f9c7f4f2994a361330ae0cc50e73494b73501227e67c3d01a63f5438863c5f761d93278288a75b6da67b8172e0 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3 diff --git a/mail-mta/postfix/postfix-2.10.4.ebuild b/mail-mta/postfix/postfix-2.10.4.ebuild new file mode 100644 index 000000000000..79d2c34bb56c --- /dev/null +++ b/mail-mta/postfix/postfix-2.10.4.ebuild @@ -0,0 +1,315 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10.4.ebuild,v 1.1 2014/10/14 10:36:44 eras Exp $ + +EAPI=5 +inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator systemd + +MY_PV="${PV/_pre/-}" +MY_SRC="${PN}-${MY_PV}" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" +VDA_PV="2.10.0" +VDA_P="${PN}-vda-v13-${VDA_PV}" +RC_VER="2.7" + +DESCRIPTION="A fast and secure drop-in replacement for sendmail" +HOMEPAGE="http://www.postfix.org/" +SRC_URI="${MY_URI}/${MY_SRC}.tar.gz + vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) " + +LICENSE="IBM" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda" + +DEPEND=">=dev-libs/libpcre-3.4 + dev-lang/perl + berkdb? ( >=sys-libs/db-3.2 ) + cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) + ldap? ( net-nds/openldap ) + ldap-bind? ( net-nds/openldap[sasl] ) + mysql? ( virtual/mysql ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql-base ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( >=dev-libs/openssl-0.9.6g )" + +RDEPEND="${DEPEND} + dovecot-sasl? ( net-mail/dovecot ) + memcached? ( net-misc/memcached ) + net-mail/mailbase + selinux? ( sec-policy/selinux-postfix ) + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp[mta] + !mail-mta/netqmail + !mail-mta/nullmailer + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/opensmtpd + !=mail-mta/ssmtp-2.64-r2[mta] + !net-mail/fastforward" + +REQUIRED_USE="ldap-bind? ( ldap sasl )" + +S="${WORKDIR}/${MY_SRC}" + +pkg_setup() { + # Add postfix, postdrop user/group (bug #77565) + enewgroup postfix 207 + enewgroup postdrop 208 + enewuser postfix 207 -1 /var/spool/postfix postfix,mail +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-2.11.1-db6.patch" + if use vda; then + epatch "${DISTDIR}"/${VDA_P}.patch + fi + + sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \ + src/util/sys_defs.h || die "sed failed" + + # change default paths to better comply with portage standard paths + sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" +} + +src_configure() { + # Make sure LDFLAGS get passed down to the executables. + local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread" + + use pam && mylibs="${mylibs} -lpam" + + if use ldap; then + mycc="${mycc} -DHAS_LDAP" + mylibs="${mylibs} -lldap -llber" + fi + + if use mysql; then + mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)" + mylibs="${mylibs} $(mysql_config --libs)" + fi + + if use postgres; then + mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)" + mylibs="${mylibs} -lpq -L$(pg_config --libdir)" + fi + + if use sqlite; then + mycc="${mycc} -DHAS_SQLITE" + mylibs="${mylibs} -lsqlite3" + fi + + if use ssl; then + mycc="${mycc} -DUSE_TLS" + mylibs="${mylibs} -lssl -lcrypto" + fi + + # broken. and "in other words, not supported" by upstream. + # Use inet_protocols setting in main.cf + #if ! use ipv6; then + # mycc="${mycc} -DNO_IPV6" + #fi + + if use sasl; then + if use dovecot-sasl; then + # Set dovecot as default. + mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\"" + fi + if use ldap-bind; then + mycc="${mycc} -DUSE_LDAP_SASL" + fi + mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" + mylibs="${mylibs} -lsasl2" + elif use dovecot-sasl; then + mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" + fi + + if ! use nis; then + sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \ + src/util/sys_defs.h || die "sed failed" + fi + + if ! use berkdb; then + mycc="${mycc} -DNO_DB" + if use cdb; then + # change default hash format from Berkeley DB to cdb + sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die + fi + fi + + if use cdb; then + mycc="${mycc} -DHAS_CDB -I/usr/include/cdb" + CDB_LIBS="" + # Tinycdb is preferred. + if has_version dev-db/tinycdb ; then + einfo "Building with dev-db/tinycdb" + CDB_LIBS="-lcdb" + else + einfo "Building with dev-db/cdb" + CDB_PATH="/usr/$(get_libdir)" + for i in cdb.a alloc.a buffer.a unix.a byte.a ; do + CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}" + done + fi + mylibs="${mylibs} ${CDB_LIBS}" + fi + + # Robin H. Johnson 17/Nov/2006 + # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check. + mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" + filter-lfs-flags + + # Workaround for bug #76512 + if use hardened; then + [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os + fi + + # Remove annoying C++ comment style warnings - bug #378099 + append-flags -Wno-comment + + sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs + sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs + emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles +} + +src_install () { + local myconf + use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \ + html_directory=\"/usr/share/doc/${PF}/html\"" + + /bin/sh postfix-install \ + -non-interactive \ + install_root="${D}" \ + config_directory="/etc/postfix" \ + manpage_directory="/usr/share/man" \ + command_directory="/usr/sbin" \ + mailq_path="/usr/bin/mailq" \ + newaliases_path="/usr/bin/newaliases" \ + sendmail_path="/usr/sbin/sendmail" \ + ${myconf} \ + || die "postfix-install failed" + + # Fix spool removal on upgrade + rm -Rf "${D}"/var + keepdir /var/spool/postfix + + # Install rmail for UUCP, closes bug #19127 + dobin auxiliary/rmail/rmail + + # Provide another link for legacy FSH + dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail + + # Install qshape tool + dobin auxiliary/qshape/qshape.pl + doman man/man1/qshape.1 + + # Performance tuning tools and their manuals + dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink} + doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1 + + # Set proper permissions on required files/directories + dodir /var/lib/postfix + keepdir /var/lib/postfix + fowners -R postfix:postfix /var/lib/postfix + fperms 0750 /var/lib/postfix + fowners root:postdrop /usr/sbin/post{drop,queue} + fperms 02711 /usr/sbin/post{drop,queue} + + keepdir /etc/postfix + if use mbox; then + mypostconf="mail_spool_directory=/var/spool/mail" + else + mypostconf="home_mailbox=.maildir/" + fi + "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \ + -e ${mypostconf} || die "postconf failed" + + insinto /etc/postfix + newins "${FILESDIR}"/smtp.pass saslpass + fperms 600 /etc/postfix/saslpass + + newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix + # do not start mysql/postgres unnecessarily - bug #359913 + use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix" + use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" + + dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* + mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/ + use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ + + pamd_mimic_system smtp auth account + + if use sasl; then + insinto /etc/sasl2 + newins "${FILESDIR}"/smtp.sasl smtpd.conf + fi + + # header files + insinto /usr/include/postfix + doins include/*.h + + # Remove unnecessary files + rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic} + rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual} + + systemd_dounit "${FILESDIR}/${PN}.service" +} + +pkg_preinst() { + # Postfix 2.9. + # default for inet_protocols changed from ipv4 to all in postfix-2.9. + # check inet_protocols setting in main.cf and modify if necessary to prevent + # performance loss with useless DNS lookups and useless connection attempts. + [[ -d ${ROOT}/etc/postfix ]] && { + if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then + if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]]; + then + ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf." + ewarn "That will keep the same behaviour as previous postfix versions." + ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n" + else + # delete inet_protocols setting. there is already one in /etc/postfix + sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die + fi + fi + } +} + +pkg_postinst() { + # Do not install server.{key,pem) SSL certificates if they already exist + if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \ + && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" + install_cert /etc/ssl/postfix/server + chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem} + fi + + if [[ ! -e /etc/mail/aliases.db ]] ; then + ewarn + ewarn "You must edit /etc/mail/aliases to suit your needs" + ewarn "and then run /usr/bin/newaliases. Postfix will not" + ewarn "work correctly without it." + ewarn + fi + + if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then + elog "If you are using old style postfix instances by symlinking" + elog "startup scripts in ${ROOT}etc/init.d, please consider" + elog "upgrading your config for postmulti support. For more info:" + elog "http://www.postfix.org/MULTI_INSTANCE_README.html" + if ! use berkdb; then + ewarn "\nPostfix is installed without BerkeleyDB support." + ewarn "Please turn on berkdb USE flag if you need hash or" + ewarn "btree table lookups.\n" + fi + ewarn "Postfix daemons now live under /usr/libexec/postfix" + ewarn "Please adjust your main.cf accordingly by running" + ewarn "etc-update/dispatch-conf or similar and accepting the new" + ewarn "daemon_directory setting." + fi +} diff --git a/mail-mta/postfix/postfix-2.11.2.ebuild b/mail-mta/postfix/postfix-2.11.2.ebuild new file mode 100644 index 000000000000..aee4efefb243 --- /dev/null +++ b/mail-mta/postfix/postfix-2.11.2.ebuild @@ -0,0 +1,324 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.2.ebuild,v 1.1 2014/10/14 10:36:44 eras Exp $ + +EAPI=5 +inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator + +MY_PV="${PV/_pre/-}" +MY_SRC="${PN}-${MY_PV}" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" +VDA_PV="2.10.0" +VDA_P="${PN}-vda-v13-${VDA_PV}" +RC_VER="2.7" + +DESCRIPTION="A fast and secure drop-in replacement for sendmail" +HOMEPAGE="http://www.postfix.org/" +SRC_URI="${MY_URI}/${MY_SRC}.tar.gz + vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) " + +LICENSE="IBM" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda" + +DEPEND=">=dev-libs/libpcre-3.4 + dev-lang/perl + berkdb? ( >=sys-libs/db-3.2 ) + cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) + ldap? ( net-nds/openldap ) + ldap-bind? ( net-nds/openldap[sasl] ) + lmdb? ( >=dev-db/lmdb-0.9.11 ) + mysql? ( virtual/mysql ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql-base ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + selinux? ( sec-policy/selinux-postfix ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( >=dev-libs/openssl-0.9.6g )" + +RDEPEND="${DEPEND} + dovecot-sasl? ( net-mail/dovecot ) + memcached? ( net-misc/memcached ) + net-mail/mailbase + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp[mta] + !mail-mta/netqmail + !mail-mta/nullmailer + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/opensmtpd + !=mail-mta/ssmtp-2.64-r2[mta] + !net-mail/fastforward" + +REQUIRED_USE="ldap-bind? ( ldap sasl )" + +S="${WORKDIR}/${MY_SRC}" + +pkg_setup() { + # Add postfix, postdrop user/group (bug #77565) + enewgroup postfix 207 + enewgroup postdrop 208 + enewuser postfix 207 -1 /var/spool/postfix postfix,mail +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-2.11.1-db6.patch" + if use vda; then + epatch "${DISTDIR}"/${VDA_P}.patch + fi + + sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \ + src/util/sys_defs.h || die "sed failed" + + # change default paths to better comply with portage standard paths + sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" + + epatch_user +} + +src_configure() { + # Make sure LDFLAGS get passed down to the executables. + local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread" + + use pam && mylibs="${mylibs} -lpam" + + if use ldap; then + mycc="${mycc} -DHAS_LDAP" + mylibs="${mylibs} -lldap -llber" + fi + + if use mysql; then + mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)" + mylibs="${mylibs} $(mysql_config --libs)" + fi + + if use postgres; then + mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)" + mylibs="${mylibs} -lpq -L$(pg_config --libdir)" + fi + + if use sqlite; then + mycc="${mycc} -DHAS_SQLITE" + mylibs="${mylibs} -lsqlite3" + fi + + if use ssl; then + mycc="${mycc} -DUSE_TLS" + mylibs="${mylibs} -lssl -lcrypto" + fi + + if use lmdb; then + mycc="${mycc} -DHAS_LMDB" + mylibs="${mylibs} -llmdb" + fi + + # broken. and "in other words, not supported" by upstream. + # Use inet_protocols setting in main.cf + #if ! use ipv6; then + # mycc="${mycc} -DNO_IPV6" + #fi + + if use sasl; then + if use dovecot-sasl; then + # Set dovecot as default. + mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\"" + fi + if use ldap-bind; then + mycc="${mycc} -DUSE_LDAP_SASL" + fi + mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" + mylibs="${mylibs} -lsasl2" + elif use dovecot-sasl; then + mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" + fi + + if ! use nis; then + mycc="${mycc} -DNO_NIS" + fi + + if ! use berkdb; then + mycc="${mycc} -DNO_DB" + if use cdb; then + # change default hash format from Berkeley DB to cdb + mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\"" + fi + fi + + if use cdb; then + mycc="${mycc} -DHAS_CDB -I/usr/include/cdb" + CDB_LIBS="" + # Tinycdb is preferred. + if has_version dev-db/tinycdb ; then + einfo "Building with dev-db/tinycdb" + CDB_LIBS="-lcdb" + else + einfo "Building with dev-db/cdb" + CDB_PATH="/usr/$(get_libdir)" + for i in cdb.a alloc.a buffer.a unix.a byte.a ; do + CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}" + done + fi + mylibs="${mylibs} ${CDB_LIBS}" + fi + + # Robin H. Johnson 17/Nov/2006 + # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check. + mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" + filter-lfs-flags + + # Workaround for bug #76512 + if use hardened; then + [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os + fi + + # Remove annoying C++ comment style warnings - bug #378099 + append-flags -Wno-comment + + sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs + sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs + emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles +} + +src_install () { + local myconf + use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \ + html_directory=\"/usr/share/doc/${PF}/html\"" + + /bin/sh postfix-install \ + -non-interactive \ + install_root="${D}" \ + config_directory="/etc/postfix" \ + manpage_directory="/usr/share/man" \ + command_directory="/usr/sbin" \ + mailq_path="/usr/bin/mailq" \ + newaliases_path="/usr/bin/newaliases" \ + sendmail_path="/usr/sbin/sendmail" \ + ${myconf} \ + || die "postfix-install failed" + + # Fix spool removal on upgrade + rm -Rf "${D}"/var + keepdir /var/spool/postfix + + # Install rmail for UUCP, closes bug #19127 + dobin auxiliary/rmail/rmail + + # Provide another link for legacy FSH + dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail + + # Install qshape tool and posttls-finger + dobin auxiliary/qshape/qshape.pl + doman man/man1/qshape.1 + dobin bin/posttls-finger + doman man/man1/posttls-finger.1 + + # Performance tuning tools and their manuals + dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink} + doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1 + + # Set proper permissions on required files/directories + dodir /var/lib/postfix + keepdir /var/lib/postfix + fowners -R postfix:postfix /var/lib/postfix + fperms 0750 /var/lib/postfix + fowners root:postdrop /usr/sbin/post{drop,queue} + fperms 02711 /usr/sbin/post{drop,queue} + + keepdir /etc/postfix + if use mbox; then + mypostconf="mail_spool_directory=/var/spool/mail" + else + mypostconf="home_mailbox=.maildir/" + fi + "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \ + -e ${mypostconf} || die "postconf failed" + + insinto /etc/postfix + newins "${FILESDIR}"/smtp.pass saslpass + fperms 600 /etc/postfix/saslpass + + newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix + # do not start mysql/postgres unnecessarily - bug #359913 + use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix" + use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" + + dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* + mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/ + use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ + + pamd_mimic_system smtp auth account + + if use sasl; then + insinto /etc/sasl2 + newins "${FILESDIR}"/smtp.sasl smtpd.conf + fi + + # header files + insinto /usr/include/postfix + doins include/*.h + + # Remove unnecessary files + rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic} + rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual} + + systemd_dounit "${FILESDIR}/${PN}.service" +} + +pkg_preinst() { + # Postfix 2.9. + # default for inet_protocols changed from ipv4 to all in postfix-2.9. + # check inet_protocols setting in main.cf and modify if necessary to prevent + # performance loss with useless DNS lookups and useless connection attempts. + [[ -d ${ROOT}/etc/postfix ]] && { + if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then + if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]]; + then + ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf." + ewarn "That will keep the same behaviour as previous postfix versions." + ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n" + else + # delete inet_protocols setting. there is already one in /etc/postfix + sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die + fi + fi + } +} + +pkg_postinst() { + # Do not install server.{key,pem) SSL certificates if they already exist + if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \ + && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" + install_cert /etc/ssl/postfix/server + chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem} + fi + + if [[ ! -e /etc/mail/aliases.db ]] ; then + ewarn + ewarn "You must edit /etc/mail/aliases to suit your needs" + ewarn "and then run /usr/bin/newaliases. Postfix will not" + ewarn "work correctly without it." + ewarn + fi + + if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then + elog "If you are using old style postfix instances by symlinking" + elog "startup scripts in ${ROOT}etc/init.d, please consider" + elog "upgrading your config for postmulti support. For more info:" + elog "http://www.postfix.org/MULTI_INSTANCE_README.html" + if ! use berkdb; then + ewarn "\nPostfix is installed without BerkeleyDB support." + ewarn "Please turn on berkdb USE flag if you need hash or" + ewarn "btree table lookups.\n" + fi + ewarn "Postfix daemons now live under /usr/libexec/postfix" + ewarn "Please adjust your main.cf accordingly by running" + ewarn "etc-update/dispatch-conf or similar and accepting the new" + ewarn "daemon_directory setting." + fi +} diff --git a/mail-mta/postfix/postfix-2.12_pre20141011.ebuild b/mail-mta/postfix/postfix-2.12_pre20141013.ebuild similarity index 99% rename from mail-mta/postfix/postfix-2.12_pre20141011.ebuild rename to mail-mta/postfix/postfix-2.12_pre20141013.ebuild index 871b6776c6ce..a0d40c41a0f3 100644 --- a/mail-mta/postfix/postfix-2.12_pre20141011.ebuild +++ b/mail-mta/postfix/postfix-2.12_pre20141013.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20141011.ebuild,v 1.1 2014/10/13 10:10:44 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20141013.ebuild,v 1.1 2014/10/14 10:36:44 eras Exp $ EAPI=5 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator diff --git a/media-fonts/unifont/unifont-7.0.03.ebuild b/media-fonts/unifont/unifont-7.0.03.ebuild index 5516b5b3905c..da39f0ee5f34 100644 --- a/media-fonts/unifont/unifont-7.0.03.ebuild +++ b/media-fonts/unifont/unifont-7.0.03.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-7.0.03.ebuild,v 1.2 2014/08/29 01:13:28 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-7.0.03.ebuild,v 1.3 2014/10/14 11:11:47 klausman Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="fontforge utils" DEPEND=" diff --git a/media-libs/plib/files/plib-1.8.5-X11.patch b/media-libs/plib/files/plib-1.8.5-X11.patch new file mode 100644 index 000000000000..86bccc31c0e6 --- /dev/null +++ b/media-libs/plib/files/plib-1.8.5-X11.patch @@ -0,0 +1,11 @@ +--- configure.in.old 2014-10-14 12:23:00.422971952 +0200 ++++ configure.in 2014-10-14 12:23:24.806746868 +0200 +@@ -276,7 +276,7 @@ + + LDFLAGS="$LDFLAGS $X_LIBS" + +- LIBS="$LIBS $X_PRE_LIBS -lXi -lXmu -lXext -lX11 $X_EXTRA_LIBS -lm" ++ LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" + + dnl ========================================================= + dnl if test "x$x_includes" != "x"; then diff --git a/media-libs/plib/plib-1.8.5.ebuild b/media-libs/plib/plib-1.8.5.ebuild index 5d65416182c8..1c4f34ef1c59 100644 --- a/media-libs/plib/plib-1.8.5.ebuild +++ b/media-libs/plib/plib-1.8.5.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/plib-1.8.5.ebuild,v 1.9 2014/10/10 22:12:34 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/plib-1.8.5.ebuild,v 1.10 2014/10/14 11:30:17 tupone Exp $ EAPI=5 -inherit flag-o-matic +inherit flag-o-matic eutils autotools DESCRIPTION="multimedia library used by many games" HOMEPAGE="http://plib.sourceforge.net/" @@ -17,6 +17,8 @@ DEPEND="virtual/opengl" RDEPEND="${DEPEND}" src_prepare() { + epatch "${FILESDIR}"/${P}-X11.patch + eautoreconf # Since plib only provides static libraries, force # building as PIC or plib is useless to amd64/etc... append-flags -fPIC diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index bf53ad3660eb..96527ad43cbe 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Tue, 14 Oct 2014 10:37:05 +0000 +Tue, 14 Oct 2014 11:37:07 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index bf53ad3660eb..28fac62bb056 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Tue, 14 Oct 2014 10:37:05 +0000 +Tue, 14 Oct 2014 11:37:08 +0000 diff --git a/metadata/md5-cache/mail-mta/postfix-2.10.4 b/metadata/md5-cache/mail-mta/postfix-2.10.4 new file mode 100644 index 000000000000..ee5cbcf404ea --- /dev/null +++ b/metadata/md5-cache/mail-mta/postfix-2.10.4 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst preinst prepare setup +DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl ) virtual/pkgconfig +DESCRIPTION=A fast and secure drop-in replacement for sendmail +EAPI=5 +HOMEPAGE=http://www.postfix.org/ +IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd +LICENSE=IBM +RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward +REQUIRED_USE=ldap-bind? ( ldap sasl ) +SLOT=0 +SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.10.4.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch ) +_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed ssl-cert b53367370fde96e19beca78050a47c61 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=dc39ba97a2d0d3ad4eecbaeeaae03a55 diff --git a/metadata/md5-cache/mail-mta/postfix-2.11.2 b/metadata/md5-cache/mail-mta/postfix-2.11.2 new file mode 100644 index 000000000000..ac5094adfc13 --- /dev/null +++ b/metadata/md5-cache/mail-mta/postfix-2.11.2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst preinst prepare setup +DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) selinux? ( sec-policy/selinux-postfix ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl ) virtual/pkgconfig +DESCRIPTION=A fast and secure drop-in replacement for sendmail +EAPI=5 +HOMEPAGE=http://www.postfix.org/ +IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 +LICENSE=IBM +RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) selinux? ( sec-policy/selinux-postfix ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward +REQUIRED_USE=ldap-bind? ( ldap sasl ) +SLOT=0 +SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.2.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch ) +_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed ssl-cert b53367370fde96e19beca78050a47c61 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=323126b64a530f903f842287f99d8875 diff --git a/metadata/md5-cache/mail-mta/postfix-2.12_pre20141011 b/metadata/md5-cache/mail-mta/postfix-2.12_pre20141013 similarity index 95% rename from metadata/md5-cache/mail-mta/postfix-2.12_pre20141011 rename to metadata/md5-cache/mail-mta/postfix-2.12_pre20141013 index d2c97124ab58..5817302775d8 100644 --- a/metadata/md5-cache/mail-mta/postfix-2.12_pre20141011 +++ b/metadata/md5-cache/mail-mta/postfix-2.12_pre20141013 @@ -9,6 +9,6 @@ LICENSE=IBM RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) selinux? ( sec-policy/selinux-postfix ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda SLOT=0 -SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.12-20141011.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch ) +SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.12-20141013.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch ) _eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed ssl-cert b53367370fde96e19beca78050a47c61 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=b0a5028cf3eb778ed07f0d748ff0bf0d +_md5_=500936dfc73aefa68d7ad71a073e29c1 diff --git a/metadata/md5-cache/media-fonts/unifont-7.0.03 b/metadata/md5-cache/media-fonts/unifont-7.0.03 index d93be28dfd78..fd89b9fd7d0e 100644 --- a/metadata/md5-cache/media-fonts/unifont-7.0.03 +++ b/metadata/md5-cache/media-fonts/unifont-7.0.03 @@ -4,10 +4,10 @@ DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font EAPI=5 HOMEPAGE=http://unifoundry.com/ IUSE=fontforge utils X -KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd +KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd LICENSE=GPL-2 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] ) SLOT=0 SRC_URI=mirror://gnu/unifont/unifont-7.0.03/unifont-7.0.03.tar.gz _eclasses_=eutils 32548a82e42dc26e3312581476d2f20c font 37271e0911f39dd15a28adcaf94f6956 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=e306e00139ef074f4b5c79f5f5a9fdcd +_md5_=fbf9104cd83c6d720b6982333c6095b4 diff --git a/metadata/md5-cache/media-libs/plib-1.8.5 b/metadata/md5-cache/media-libs/plib-1.8.5 index a0360e71f6d3..74f79364cc93 100644 --- a/metadata/md5-cache/media-libs/plib-1.8.5 +++ b/metadata/md5-cache/media-libs/plib-1.8.5 @@ -1,5 +1,5 @@ DEFINED_PHASES=install prepare -DEPEND=virtual/opengl +DEPEND=virtual/opengl !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool DESCRIPTION=multimedia library used by many games EAPI=5 HOMEPAGE=http://plib.sourceforge.net/ @@ -8,5 +8,5 @@ LICENSE=LGPL-2 RDEPEND=virtual/opengl SLOT=0 SRC_URI=http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz -_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 -_md5_=fe73d5faf90636a990f30894eed9a612 +_eclasses_=autotools ebea507d219855923e3438c953cf4ab8 eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 +_md5_=45586e17e987833120272d28fec9857d diff --git a/metadata/md5-cache/net-im/prosody-0.9.5-r1 b/metadata/md5-cache/net-im/prosody-0.9.5-r1 new file mode 100644 index 000000000000..768ed8f33c0c --- /dev/null +++ b/metadata/md5-cache/net-im/prosody-0.9.5-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare test +DEPEND=net-im/jabber-base !jit? ( >=dev-lang/lua-5.1 ) jit? ( dev-lang/luajit ) >=net-dns/libidn-1.1 >=dev-libs/openssl-0.9.8 virtual/pkgconfig +DESCRIPTION=Prosody is a flexible communications server for Jabber/XMPP written in Lua +EAPI=5 +HOMEPAGE=http://prosody.im/ +IUSE=ipv6 libevent mysql postgres sqlite ssl zlib jit +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=MIT +RDEPEND=net-im/jabber-base !jit? ( >=dev-lang/lua-5.1 ) jit? ( dev-lang/luajit ) >=net-dns/libidn-1.1 >=dev-libs/openssl-0.9.8 >=dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem ipv6? ( >=dev-lua/luasocket-3 ) !ipv6? ( dev-lua/luasocket ) libevent? ( >=dev-lua/luaevent-0.4.3 ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( dev-lua/luasec ) zlib? ( dev-lua/lua-zlib ) +SLOT=0 +SRC_URI=http://prosody.im/tmp/0.9.5/prosody-0.9.5.tar.gz +_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c flag-o-matic 75e24bac8423c515dd9c5717f08feb83 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=eac279895aca5923558d4735abe0f40b diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 03dc02c7cf0a..43b26191ecf4 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Tue, 14 Oct 2014 10:37:08 +0000 +Tue, 14 Oct 2014 11:37:10 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 3b25573def02..598f5f3c31e7 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Tue Oct 14 10:37:05 UTC 2014 +Tue Oct 14 11:37:07 UTC 2014 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index ae914825e0be..6da1afd02223 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Tue, 14 Oct 2014 11:00:01 +0000 +Tue, 14 Oct 2014 12:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 7d3520082830..ffd2e9bfdaed 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1413282901 Tue 14 Oct 2014 10:35:01 AM UTC UTC +1413286501 Tue 14 Oct 2014 11:35:01 AM UTC UTC diff --git a/net-im/prosody/files/prosody.initd-r1 b/net-im/prosody/files/prosody.initd-r1 new file mode 100644 index 000000000000..bc72e2e90ef1 --- /dev/null +++ b/net-im/prosody/files/prosody.initd-r1 @@ -0,0 +1,47 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd-r1,v 1.1 2014/10/14 10:53:36 klausman Exp $ + +description="Prosody is a server for Jabber/XMPP written in Lua." +description_reload="Reload configuration and reopen log files." +extra_started_commands="reload" +pidfile="/var/run/jabber/prosody.pid" + +depend() { + use dns + need net + provide jabber-server +} + +checkconfig() { + if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then + eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody" + return 1 + fi + luac -p /etc/jabber/prosody.cfg.lua + return $? +} + +start() { + checkconfig || return 1 + checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})" + checkpath -q -d -m 0770 -o jabber:jabber "${pidfile}" + checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber + ebegin "Starting Prosody XMPP Server" + prosodyctl start + eend $? +} + +stop() { + ebegin "Stopping Prosody XMPP Server" + prosodyctl stop + eend $? +} + +reload() { + checkconfig || return 1 + ebegin "Reloading configuration of Prosody XMPP Server" + prosodyctl reload + eend $? +} diff --git a/net-im/prosody/prosody-0.9.5-r1.ebuild b/net-im/prosody/prosody-0.9.5-r1.ebuild new file mode 100644 index 000000000000..bc2426a8b9a5 --- /dev/null +++ b/net-im/prosody/prosody-0.9.5-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.5-r1.ebuild,v 1.1 2014/10/14 10:53:36 klausman Exp $ + +EAPI=5 + +inherit flag-o-matic multilib systemd versionator + +MY_PV=$(replace_version_separator 3 '') +MY_P="${PN}-${MY_PV}" +DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" +HOMEPAGE="http://prosody.im/" +SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit" + +DEPEND="net-im/jabber-base + !jit? ( >=dev-lang/lua-5.1 ) + jit? ( dev-lang/luajit ) + >=net-dns/libidn-1.1 + >=dev-libs/openssl-0.9.8" +RDEPEND="${DEPEND} + >=dev-lua/luaexpat-1.3.0 + dev-lua/luafilesystem + ipv6? ( >=dev-lua/luasocket-3 ) + !ipv6? ( dev-lua/luasocket ) + libevent? ( >=dev-lua/luaevent-0.4.3 ) + mysql? ( dev-lua/luadbi[mysql] ) + postgres? ( dev-lua/luadbi[postgres] ) + sqlite? ( dev-lua/luadbi[sqlite] ) + ssl? ( dev-lua/luasec ) + zlib? ( dev-lua/lua-zlib )" + +S=${WORKDIR}/${MY_P} + +JABBER_ETC="/etc/jabber" +JABBER_SPOOL="/var/spool/jabber" + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch" + sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ + -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ + -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\ + -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\ + Makefile || die +} + +src_configure() { + # the configure script is handcrafted (and yells at unknown options) + # hence do not use 'econf' + append-cflags -D_GNU_SOURCE + luajit="" + if use jit; then + luajit="--runwith=luajit" + fi + ./configure \ + --ostype=linux $luajit \ + --prefix="/usr" \ + --sysconfdir="${JABBER_ETC}" \ + --datadir="${JABBER_SPOOL}" \ + --with-lua-include=/usr/include \ + --with-lua-lib=/usr/$(get_libdir)/lua \ + --cflags="${CFLAGS} -Wall -fPIC" \ + --ldflags="${LDFLAGS} -shared" \ + --c-compiler="$(tc-getCC)" \ + --linker="$(tc-getCC)" \ + --require-config || die "configure failed" +} + +src_install() { + emake DESTDIR="${D}" install + systemd_dounit "${FILESDIR}/${PN}".service + systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf + newinitd "${FILESDIR}/${PN}".initd-r1 ${PN} +} + +src_test() { + cd tests || die + ./run_tests.sh || die +}