From a5e7178acde17721e9a73ab5930facf5f60f489f Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Fri, 21 Sep 2012 13:25:10 +0000 Subject: [PATCH] freeradius: version bump --- net-dialup/freeradius/Manifest | 6 +- .../files/freeradius-CVE-2012-3547.patch | 11 ++ ...-r1.ebuild => freeradius-2.1.12-r1.ebuild} | 70 +++++--- net-dialup/freeradius/freeradius-2.2.0.ebuild | 167 ++++++++++++++++++ 4 files changed, 225 insertions(+), 29 deletions(-) create mode 100644 net-dialup/freeradius/files/freeradius-CVE-2012-3547.patch rename net-dialup/freeradius/{freeradius-2.1.7-r1.ebuild => freeradius-2.1.12-r1.ebuild} (65%) create mode 100644 net-dialup/freeradius/freeradius-2.2.0.ebuild diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest index 35abd9c93..493814626 100644 --- a/net-dialup/freeradius/Manifest +++ b/net-dialup/freeradius/Manifest @@ -16,13 +16,15 @@ AUX freeradius-2.1.7-qafixes.patch 3686 SHA256 f0b3fc440636eeb33cc42a36d3ff344c8 AUX freeradius-2.1.7-ssl.patch 577 SHA256 a7a3ed31fd470c23035f79a5b6252e163dde430a5d9dbcad5cf75bbd34b78672 SHA512 1e08950d504fa04d89c640f453da43c74072c55fb46d94e618a3afa05437051a44c8a17bc6f7e6d9a435f6a7a54727507292526cbf8ef33c40297808e4ca4a04 WHIRLPOOL 2dd491dbee00e38eac55a846c10572fecda25e0e700f515d20d7f6cb9581f5f1e1d26243af711fe37f2b850937b666ab26e1ca4c3ff636ae0edb2a9a01a3bda8 AUX freeradius-2.1.7-versionless-la-files.patch 1747 SHA256 4e60188f1a2cd63b6dc775dbc8d09afd93e94b43431f7a930fed86399dd4883b SHA512 1be152682c6617a7683c8f3a016160f35de45aa116280b508f7f6c40b33c96d2480a3d7eda01b1a96d7d8781804c6ebd05d594be8831fd65f3b90d5f780452b3 WHIRLPOOL 934d1da163a87139e1a6b17ca57370114408efe1b59f1801acf32eb29f145fa509c031e38753f32aabe4b68412d51384abcb9cb5cbd502820b6d11283b239e85 AUX freeradius-2.1.7-wpe.patch 32096 SHA256 34ae76dd578ce3a497e93a7479336b2ce6eeb13be204590b8015e060bed3ef8c SHA512 82e80802beaf1021cb74b1f20d4b8c888398794a6acb8c879236ea58dff55a6df405446a3822bb81b3a1950641d795ad2c7f65d0fb72647d47c74010e8b69232 WHIRLPOOL b44a07e1a3cef83cf62dd27dc408d40de0d50ea96e7f1ed12e2d8d65e2d453eb3f42461711e7a7959e9b132eb058390bd7eb8fa22cc31f0fc0ff67bcc0ab4616 +AUX freeradius-CVE-2012-3547.patch 591 SHA256 43a9ecfe1b536dd2d0a05460d42ca3d29e200e2413a4d36c96940e051f751014 SHA512 90c4d423f359eccc13d1054040eaacead56bf5ba5d8236c9523d5d97276243b00d39806c9c8386af12409fa5893d502a3b3d3e3d47bb6e334dce0ad0e3d24d79 WHIRLPOOL 921232d374f400671f27bc915a75f6de961692778dac645fb026643620773369b81a9a4f2a5f381b239d5c40e29dac5f5212d6d614b4419b17c17a3331bc3fc7 AUX radius.conf 129 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 SHA512 e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b WHIRLPOOL c409c0a928e01045f1a60aab7e24ba2ef1645a94ac120cddc6a05b39b0b2dd0e79e50bb40d68ff9ec31aa8d1173c4f2d6f626376eda7d07fc47fc491d8f2bbcf AUX radius.init-r1 1575 SHA256 5f20b72e4b627442313818cbe3c31cadfdc747fad18cacdafe58de62812eea41 SHA512 25c9cec70befd126bc5d324e802ecdf2ad940478edab55cb4384f0392690cade2fa2735c1eb18d990616c3d506b470c9007292192baf7a11ffe67b79c2e6df3b WHIRLPOOL 62e0b177a62b5248494f39baedd7ed65b6b8c10d2b872bd11a0c075b8d55069e890e4c92816b8fb6a4f6abc1234eea3235f1cb4a465ad59099f6f9fdd799a0d3 AUX radius.init-r2 1358 SHA256 8a3d7d571985aef8c16c19a8b57bb7e1e2c7cf5dcfb24da421ce4bd241c5a001 SHA512 21265b729f1080a59805ac186280a4ad2cc2a26d56636b1969197ebbdf0a0fd471da31805ca9ce1e18693e90522a610ff95ec743a39f3a2b73e33ac3ee19a0da WHIRLPOOL 1b6fc4b3d55f6e69c04ea837510737e98744165f516b3bd582ee598221988dd8704e8f66781c9fa9c46d18cbb69b1c89afc79f2b48e047fb07fa592c8419c0c1 AUX users_wpe 99 SHA256 922a318e7f66b3b52b4a1cc53d765ff116567f010d9ce4784b4ae009fe97ca73 SHA512 8d533b6a4d3a2622ae5f2d768946840ddd49001cc0d34cb571da6123232d1987abcd3cb39a05e0ac20e680b7d9b910586532c39a9ef1af677bade856d2201fe0 WHIRLPOOL 2c2b1c27c7a8407c264425756ea386d56f8be647993ec86e26f892c97b87b7c4770651c4aa7032cfd6834d34d9f5ca708affb759d3e9e671b4a4e0f679448c64 DIST freeradius-server-2.1.11.tar.gz 4219356 SHA256 274ef96aa528d8b759f2fa06f2ba49ecbe1612e99fdedbb7016b557804b16b85 DIST freeradius-server-2.1.12.tar.gz 4257106 SHA256 e597567c81ddbee385df8f076162c868ee6db5bf446c45ace94078c0c7d53805 SHA512 543ca20faa5ab2c45d7e0c9627c2860ac6eb2d1e3e920beffad612bb4a50a3ae65fe8f20a385541bca75ba05575091168de22c9c245f6869ecd5c862e6686189 WHIRLPOOL 88b8584fc8f27cfca99ec4a51ac77b653d0fa258aa80ccdd5d928893ec7a43c9c3db6a4e4716cc16d8da7dbbae64272862adba8ba3ba0558f1819996db42e5be -DIST freeradius-server-2.1.7.tar.gz 3894247 SHA256 43504dc7fd2780e576361f9101ed7935d8c34782bb8954336a4196efab59b587 +DIST freeradius-server-2.2.0.tar.gz 4289865 SHA256 ac22eefe7bd7c1c2b4de28613e628fd3e9ccae08a00a103e5f75aac0927bf009 SHA512 8652d27a292c3a8627c13b0bf12b829d3f2c50d82ed85eb342d1ec5c84ceabf8963907d50464a5907d2934f1b069a491411b1d5129efaaecefe4a30251b2b607 WHIRLPOOL 9f7dc926da7a33bfb425cb668bc9cf940a7a2dafa2a73ba8847a15f0d725476fdb4afc41963426ade9175709007f6f72892c3e9cd33d82c6601f57b873f92471 EBUILD freeradius-2.1.11-r1.ebuild 4821 SHA256 24df33d5700ce135f6392aef7e2182ae70ea8753cb22834affdace0d4d226b84 SHA512 4336a20ada2194bb76cfa28ae94122b920739ba0650e0143b49020545971a3e22236b9b0cc07d8938282d31d059de40daf64dab28f6870222fb44cdec5d1fcc4 WHIRLPOOL 4123b6548e91c1ecf452072e9883b1efbd9b5fcd404748d09c5bacf51e9bae9f5b2b9b4eeb2d1657a25c292c5af3594c6d0ee521e1109158133b3e87dbc20e90 +EBUILD freeradius-2.1.12-r1.ebuild 5010 SHA256 8403de3b937bf12436018207aee10d8004590c6aa5ccdcb01ae1297b17a10161 SHA512 042a2b6226fcc5a18be6dd51f36b0a530393769edb33c4290dcbc267730e418518c8d9c73d45b1f2db52b3a65c12361bb60f3a0b9f98ceb1e054e20c26f646e7 WHIRLPOOL 4f374cab928bc51fb319c319f63c6278d9d0cea0a320a57ca5eef260550da0a6651a9c99ef5471bf04f90b01d03228251769470e87bcb791e21587487ead5da6 EBUILD freeradius-2.1.12.ebuild 4962 SHA256 4abb54a259e598782061354bdbd30289f20cb0a52d4748943e435052a8d65302 SHA512 c226f3956214b4b910afac46fc5276166681d7861b2a194bc51fb21f7fb9870666f70bbd602513720a0f27cc0de474235701516763e3d816cc5a5a1cb40cb55f WHIRLPOOL 1fb59344c6b9fe6fed82be8703400f459bd56220bf78174492078fa150ca217cb6899f35703c91de302f60ab9bea173af10180c59b39392abe7ef7374301ab9d -EBUILD freeradius-2.1.7-r1.ebuild 4526 SHA256 2457783dc531a5d3ec1cfc6d7241d587da99f25c8c37ddac4241e13da96e4251 SHA512 c20d438280d1e727df8396f5816acfc00784d35a757c7ba3bfa088a889399d393fca74af5d6baaa9414399c704076acaade56ee26630639d0c759153baf1b5d2 WHIRLPOOL b96cccb67a6e5f067270954e2434088b17c23549c453a577ba83dfcfcc41088de766c46fc1d0f0e4102b23dac5dbf3f42ea00db869a9963c877bc68e25dab437 +EBUILD freeradius-2.2.0.ebuild 5016 SHA256 f00c09d7a97504f40836ac225f399d7ccb550a0a4c7ec8d56d2ca520e101f2b6 SHA512 bf2893460db3676ec12f2405544bf6fc68f488df73ac2d7a7bc31c802bf367a86579cfc4632befa5597600dbe4a1dad2333b24b661babe9e6faa6abae695fd91 WHIRLPOOL c87907ce9cc0df6e6105cfea5f60c9407f78c198325616f3a43042cdb9cfdc1c24725103b3e61499fc3e7032f13a53dc9bfdc91dbca542547f4a7231e89c3047 diff --git a/net-dialup/freeradius/files/freeradius-CVE-2012-3547.patch b/net-dialup/freeradius/files/freeradius-CVE-2012-3547.patch new file mode 100644 index 000000000..f6fce8985 --- /dev/null +++ b/net-dialup/freeradius/files/freeradius-CVE-2012-3547.patch @@ -0,0 +1,11 @@ +--- freeradius-server-2.1.11.orig/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c 2011-06-20 16:57:14.000000000 +0200 ++++ freeradius-server-2.1.11/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c 2012-09-11 13:55:45.000000000 +0200 +@@ -484,7 +484,7 @@ + */ + buf[0] = '\0'; + asn_time = X509_get_notAfter(client_cert); +- if ((lookup <= 1) && asn_time && (asn_time->length < MAX_STRING_LEN)) { ++ if ((lookup <= 1) && asn_time && (asn_time->length < sizeof(buf))) { + memcpy(buf, (char*) asn_time->data, asn_time->length); + buf[asn_time->length] = '\0'; + pairadd(&handler->certs, diff --git a/net-dialup/freeradius/freeradius-2.1.7-r1.ebuild b/net-dialup/freeradius/freeradius-2.1.12-r1.ebuild similarity index 65% rename from net-dialup/freeradius/freeradius-2.1.7-r1.ebuild rename to net-dialup/freeradius/freeradius-2.1.12-r1.ebuild index f8d805d39..e1a6369e2 100644 --- a/net-dialup/freeradius/freeradius-2.1.7-r1.ebuild +++ b/net-dialup/freeradius/freeradius-2.1.12-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.6.ebuild,v 1.2 2009/09/05 06:04:40 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.12.ebuild,v 1.1 2011/11/20 18:54:06 mrness Exp $ -EAPI="2" +EAPI="4" inherit eutils multilib pam autotools libtool @@ -13,7 +13,7 @@ HOMEPAGE="http://www.freeradius.org/" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" LICENSE="GPL-2" SLOT="0" -IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl +threads +udpfromto +wpe" +IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads +udpfromto +wpe" RDEPEND="!net-dialup/cistronradius !net-dialup/gnuradius @@ -33,6 +33,8 @@ RDEPEND="!net-dialup/cistronradius frxp? ( dev-lang/python )" DEPEND="${RDEPEND}" +REQUIRED_USE="frxp? ( threads )" + S="${WORKDIR}/${PN}-server-${PV}" pkg_setup() { @@ -41,19 +43,25 @@ pkg_setup() { eerror "Either you select ldap USE flag or remove edirectory" die "edirectory needs ldap" fi - enewgroup radiusd - enewuser radiusd -1 -1 /var/log/radius radiusd + if has_version '