Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: 8de35e700dcf8074d2855f8bb520d1c900991a1e
  funtoo-overlay: f514daf740df8023860498af76c6a0cf0e5e1667
  foo-overlay: 4e928d47e22991dc209ec57d02372c56ceff4275
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: dd3b7c244227d000e55d37845e639e7de0ebd0f5
  lcd-filtering: dd3d9b094dbfc726ee9b3d886783a18b92f899fd
  mythtv: 95879253cedb6bb8352ecd3c61fc8c7f1b03534a
  • Loading branch information...
1 parent fe1f5b7 commit 9c9e3365eeda80194494555d086d882fa77205be @danielrobbins danielrobbins committed Aug 1, 2012
Showing 401 changed files with 2,734 additions and 1,292 deletions.
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild,v 1.1 2012/06/20 08:29:19 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r1.ebuild,v 1.2 2012/08/01 07:02:10 jdhore Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
IUSE="ssl static"
DEPEND="sys-devel/automake
@@ -0,0 +1,21 @@
+diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
+index 23623fe..8ada9d0 100644
+--- a/src/kdc/do_as_req.c
++++ b/src/kdc/do_as_req.c
+@@ -463,7 +463,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
+ krb5_enctype useenctype;
+ struct as_req_state *state;
+
+- state = malloc(sizeof(*state));
++ state = calloc(sizeof(*state), 1);
+ if (!state) {
+ (*respond)(arg, ENOMEM, NULL);
+ return;
+@@ -486,6 +486,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
+ state->authtime = 0;
+ state->c_flags = 0;
+ state->req_pkt = req_pkt;
++ state->inner_body = NULL;
+ state->rstate = NULL;
+ state->sname = 0;
+ state->cname = 0;
@@ -0,0 +1,40 @@
+diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
+index 9d8cb34..d4ece3f 100644
+--- a/src/kdc/kdc_preauth.c
++++ b/src/kdc/kdc_preauth.c
+@@ -1438,7 +1438,8 @@ etype_info_helper(krb5_context context, krb5_kdc_req *request,
+ continue;
+
+ }
+- if (request_contains_enctype(context, request, db_etype)) {
++ if (krb5_is_permitted_enctype(context, db_etype) &&
++ request_contains_enctype(context, request, db_etype)) {
+ retval = _make_etype_info_entry(context, client->princ,
+ client_key, db_etype,
+ &entry[i], etype_info2);
+diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
+index a43b291..94dad3a 100644
+--- a/src/kdc/kdc_util.c
++++ b/src/kdc/kdc_util.c
+@@ -2461,6 +2461,7 @@ kdc_handle_protected_negotiation(krb5_data *req_pkt, krb5_kdc_req *request,
+ return 0;
+ pa.magic = KV5M_PA_DATA;
+ pa.pa_type = KRB5_ENCPADATA_REQ_ENC_PA_REP;
++ memset(&checksum, 0, sizeof(checksum));
+ retval = krb5_c_make_checksum(kdc_context,0, reply_key,
+ KRB5_KEYUSAGE_AS_REQ, req_pkt, &checksum);
+ if (retval != 0)
+diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
+index c4bf92e..367c894 100644
+--- a/src/lib/kdb/kdb_default.c
++++ b/src/lib/kdb/kdb_default.c
+@@ -61,6 +61,9 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap)
+ krb5_boolean saw_non_permitted = FALSE;
+
+ ret = 0;
++ if (ktype != -1 && !krb5_is_permitted_enctype(kcontext, ktype))
++ return KRB5_KDB_NO_PERMITTED_KEY;
++
+ if (kvno == -1 && stype == -1 && ktype == -1)
+ kvno = 0;
+
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild,v 1.1 2012/08/01 16:38:00 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
+
+RDEPEND="!!app-crypt/heimdal
+ >=sys-libs/e2fsprogs-libs-1.41.0
+ dev-libs/libverto
+ keyutils? ( sys-apps/keyutils )
+ openldap? ( net-nds/openldap )
+ xinetd? ( sys-apps/xinetd )"
+DEPEND="${RDEPEND}
+ virtual/yacc
+ doc? ( virtual/latex-base )
+ test? ( dev-lang/tcl
+ dev-lang/python
+ dev-util/dejagnu )"
+
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+ unpack ${A}
+ unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.10.1_uninitialized_extra.patch"
+ epatch "${FILESDIR}/${PN}-1.10.1_uninitialized_extra-2.patch"
+ epatch "${FILESDIR}/${PN}-1.10.1_gcc470.patch"
+ epatch "${FILESDIR}"/CVE-2012-1014.patch
+ epatch "${FILESDIR}"/CVE-2012-1015.patch
+}
+
+src_configure() {
+ append-cppflags "-I${EPREFIX}/usr/include/et"
+ # QA
+ append-flags -fno-strict-aliasing
+ append-flags -fno-strict-overflow
+ [[ $(gcc-version) == "4.7" ]] && replace-flags -O? -O0
+
+ use keyutils || export ac_cv_header_keyutils_h=no
+ econf \
+ $(use_with openldap ldap) \
+ "$(use_with test tcl "${EPREFIX}/usr")" \
+ $(use_enable pkinit) \
+ $(use_enable threads thread-support) \
+ --without-hesiod \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --enable-dns-for-realm \
+ --enable-kdc-lookaside-cache \
+ --with-system-verto \
+ --disable-rpath
+}
+
+src_compile() {
+ emake -j1
+
+ if use doc ; then
+ cd ../doc
+ for dir in api implement ; do
+ emake -C "${dir}"
+ done
+ fi
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+ install
+
+ # default database dir
+ keepdir /var/lib/krb5kdc
+
+ cd ..
+ dodoc NOTICE README
+ dodoc doc/*.{ps,txt}
+ doinfo doc/*.info*
+ dohtml -r doc/*.html
+
+ if use doc ; then
+ dodoc doc/{api,implement}/*.ps
+ fi
+
+ newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
+ newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
+ newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd
+
+ insinto /etc
+ newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+ insinto /var/lib/krb5kdc
+ newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+ if use openldap ; then
+ insinto /etc/openldap/schema
+ doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/kpropd.xinetd" kpropd
+ fi
+}
+
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+ elog "MIT split the Kerberos applications from the base Kerberos"
+ elog "distribution. Kerberized versions of telnet, rlogin, rsh, rcp,"
+ elog "ftp clients and telnet, ftp deamons now live in"
+ elog "\"app-crypt/mit-krb5-appl\" package."
+ fi
+}
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.4-r1.ebuild,v 1.1 2012/08/01 16:38:00 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
+
+RDEPEND="!!app-crypt/heimdal
+ >=sys-libs/e2fsprogs-libs-1.41.0
+ keyutils? ( sys-apps/keyutils )
+ openldap? ( net-nds/openldap )
+ xinetd? ( sys-apps/xinetd )"
+DEPEND="${RDEPEND}
+ virtual/yacc
+ doc? ( virtual/latex-base )
+ test? ( dev-lang/tcl
+ dev-lang/python
+ dev-util/dejagnu )"
+
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+ unpack ${A}
+ unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/CVE-2012-1015.patch
+}
+
+src_configure() {
+ # QA
+ append-flags -fno-strict-aliasing
+ append-flags -fno-strict-overflow
+ use keyutils || export ac_cv_header_keyutils_h=no
+ econf \
+ $(use_with openldap ldap) \
+ "$(use_with test tcl "${EPREFIX}/usr")" \
+ $(use_enable pkinit) \
+ $(use_enable threads thread-support) \
+ --without-hesiod \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --enable-dns-for-realm \
+ --enable-kdc-lookaside-cache \
+ --disable-rpath
+}
+
+src_compile() {
+ emake -j1
+
+ if use doc ; then
+ cd ../doc
+ for dir in api implement ; do
+ emake -C "${dir}" || die "doc emake failed"
+ done
+ fi
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+ install
+
+ # default database dir
+ keepdir /var/lib/krb5kdc
+
+ cd ..
+ dodoc NOTICE README
+ dodoc doc/*.{ps,txt}
+ doinfo doc/*.info*
+ dohtml -r doc/*.html
+
+ # die if we cannot respect a USE flag
+ if use doc ; then
+ dodoc doc/{api,implement}/*.ps
+ fi
+
+ newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
+ newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
+ newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd
+
+ insinto /etc
+ newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+ insinto /var/lib/krb5kdc
+ newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+ if use openldap ; then
+ insinto /etc/openldap/schema
+ doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/kpropd.xinetd" kpropd
+ fi
+}
+
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+ elog "MIT split the Kerberos applications from the base Kerberos"
+ elog "distribution. Kerberized versions of telnet, rlogin, rsh, rcp,"
+ elog "ftp clients and telnet, ftp deamons now live in"
+ elog "\"app-crypt/mit-krb5-appl\" package."
+ fi
+}
@@ -6,7 +6,7 @@ DIST emacs-21.4a.tar.gz 20403483 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22
DIST emacs-22.3-patches-8.tar.bz2 5974 SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7 SHA512 b3489e57db9b7c4d9202238acd6f956b6adeaf09ec161b639ad59e0eea8e2152d5fad24e777a486310eaed68be1c7bf77e474a9aced0041820e74582f7e2e73d WHIRLPOOL 85d127fb9b367d73d8f2674e21096a23b474faf54fa21f178ea0e0dadbb285d1d7c627b7609b7c92ba27590340cf76afc4df4a5c991c252a7ce80b2f6569cf06
DIST emacs-22.3.tar.gz 39587396 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 SHA512 6cba24921ba9bd27458334b92c6f8fcacc4d5af0f70a067d57ab068eb8d0925143f109847515548584f80c9439d96a9d05158d10a73dda917187bd16a6758584 WHIRLPOOL 74c612213b8f6fc1fc6e243adc27b5a5ff5528100f3c319925519e23477fe2c642d2cf7b382d7b70c8b2b9d7be508773193c95bbf14cb7c55046f76bf4b81225
DIST emacs-23.4-patches-2.tar.bz2 1535 SHA256 ee12b40d769497b98b609933f9f122f9b45873ac84447832930158822f52f920 SHA512 8423d36d6f20e9941553fafcfdb4b35030ff00c94ef9bd119d958b0ed7079a473964737b638b1d5223e0e1c317ba8daf8decbd7008ebe3e821c99849638d701f WHIRLPOOL 1217e8a806985b85d6177cb93b5687341fabcf50ebcaef6f3cb02fbf19993101ee61c2bd498e73fa17f6391ff7f1baf0bc9ef0cd18b30b4fb1895cb135c5bd5e
-DIST emacs-23.4-patches-5.tar.bz2 3202 SHA256 309881458bda2b51ba92a5772c4a288e593e684c8c2d983d77faf7aa1dea9558 SHA512 8ab994c550a2d283e9c8f05e6e624e6470c7238f2ce5bbe7fe9b574ebfac452511ca686cb6ccf74a57fd6b272f3d7d60b9a636c5c541bc495ec8d62f2058e956 WHIRLPOOL 50bcb04ce1d2421dd6cbd7e122e7dbf71be07eeaef9ea9a9ccf354f4eabfef69d94982e434938c4dcc4fc399792ae62ab4acd714e10e95eddb7f8dcae4539cc8
+DIST emacs-23.4-patches-6.tar.bz2 3416 SHA256 a10b45101dbd3f7e4d0bcdf483736b445abf76efdd5d181607ca86180472930d SHA512 b7913b1c6b70b85656007f69b4dd08455a3bcb4eeeeec502c4754b818584e1c186d0be1e8b56ac4358b4bf64997961d72234136e52c09fa115a7a24a3911c06f WHIRLPOOL ef3ae5086863f834b3d46ba3c45c04d4ae27bd95fab225895e3052763716600df89e2b7f6b4dad437cd81e82411ac861aa7a923b66e11064f7719c4d9c868543
DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
DIST emacs-24.1-patches-4.tar.bz2 4296 SHA256 2dda7c1d74b4fd55937c41fd25401684c6a2998dcd27ada4c5bcca856743cbd7 SHA512 bba85091b10791b7539102f5e8ea961e62da1d9b7752225997ecbbe0c1dd80acadcb74e553a89c4fce0e16c2095938f2f565566aa71f003dd108ab73b7806dc1 WHIRLPOOL 7d950722a9b63d07163b3ca150faf134017e22f38b574adfeef206f29f5a696a469d8b9fa7eb62cc4087095bd2cbf7c91a3030ce3ce7f6c74766898471c3ba00
DIST emacs-24.1.tar.bz2 41722508 SHA256 eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c SHA512 aff89b54f2c6b30aa8c9bec8902a52b76ee1c5e4717b4c7385fe3a1583153d6857eed5351ce04f0a16d8fa93bb4b96804ade5dcfffc381094cbb7724934633ca WHIRLPOOL fc9343d464ec837dd069931a90c716e200ea8c67ea2e58d916e4bc3e00ad883c05e105161f6cec868d86ca7f6ec79b2a8a9f887fd3a247c1cfb885a4a685d3f6
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.10 2012/07/26 18:44:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.11 2012/08/01 09:10:27 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -10,7 +10,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
- mirror://gentoo/${P}-patches-5.tar.bz2"
+ mirror://gentoo/${P}-patches-6.tar.bz2"
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="23"
@@ -79,11 +79,6 @@ src_prepare() {
EPATCH_SUFFIX=patch epatch
epatch_user
- sed -i \
- -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
- -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
- "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.
# Suppress it by supplying pkg-config with a wrong library name.
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild,v 1.2 2010/08/23 07:02:15 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild,v 1.3 2012/08/01 07:26:41 phajdan.jr Exp $
EAPI="2"
@@ -21,7 +21,7 @@ IUSE="guidexml"
RDEPEND=">=dev-libs/libxml2-2.7.3-r1
dev-libs/libxslt
- dev-libs/xerces-c
+ dev-libs/xerces-c[icu]
dev-libs/libpcre
app-text/aspell
x11-libs/wxGTK:2.8[X]"
@@ -1,2 +1,3 @@
DIST openscap-0.8.0.tar.gz 4473555 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33 SHA512 f0fd5f042ad8fc595ec7835efd9ec2f66c44615d53faa986eb5320d4bc7701323b4fec3840c15a52603c105aeac091912ab42ee6f2270c033e90584b7abd6afd WHIRLPOOL 45d8f741068e1f0a435559dea9f0e341639d5ed2a1a199dce6aadaa5c964f1e327baa6a83fda0843329e38f23e583a9d003686bd6dcd1d94fa47423ebfb8de56
DIST openscap-0.8.2.tar.gz 4524453 SHA256 fe7d6b3f20c08feef5c70ff3a02b752b593a8d8a3b3d1302d8e31fe0c29cce11 SHA512 a7bf55014095f0e5d2168905518c592ba3eb91783db89ab74eec7a9c29a17bcb8071c41cb9256d9c449b8a10aebaa57173ef3f9ed37ebe24ecf84edb85da5790 WHIRLPOOL 1fb157676c71c4db7af030746605c6181b16a17cbbbdd2e9d0ada99fc9bffc5570c9f488570c47780928906484d68723446056e68e032181dee18a655eb4e510
+DIST openscap-0.8.3.tar.gz 6420923 SHA256 e00b9ee6741b7ae01f46172c2ed560b38107a1fffdda5bc7c32be4f4a15ef5e4 SHA512 b1fe3577e18d9ee8da0ce39f15c7f1e0ade507da1893aaa71093af1214be119b72c5a16f0f3e81b0ed91fde1ffbfdd53c9252d096ca45a356cb63f9fa8d31427 WHIRLPOOL 59a48c872ca047396f911a96efb2b559ac35055d46c61a78b3170c390c4959f9276cc9545fd4b94e0c29bbab545e702f0cbd93600d36d0765749a66bceaba86e
Oops, something went wrong.

0 comments on commit 9c9e336

Please sign in to comment.