commit: 847df9ac26e031a12735da77badcc8490aecde6e Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Mon Jan 2 19:20:04 2017 +0000 Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> CommitDate: Wed Jan 4 10:01:04 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=847df9ac
dev-vcs/cvs: in tree version 1.12.12-r11 works dev-vcs/cvs/Manifest | 20 --- dev-vcs/cvs/cvs-1.12.12-r99.ebuild | 91 -------------- dev-vcs/cvs/files/01-cvs-env.d | 1 - dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch | 140 --------------------- .../files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch | 34 ----- dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch | 22 ---- .../cvs/files/cvs-1.12.12-fix-massive-leak.patch | 52 -------- dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch | 21 ---- dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch | 42 ------- dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch | 12 -- dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch | 29 ----- dev-vcs/cvs/files/cvs-1.12.12-openat.patch | 21 ---- .../cvs/files/cvs-1.12.12-rcs2log-coreutils.patch | 14 --- dev-vcs/cvs/files/cvs-1.12.12-regex.patch | 11 -- dev-vcs/cvs/files/cvs.pam-include-1.12.12 | 4 - dev-vcs/cvs/files/cvspserver.xinetd.d | 14 --- dev-vcs/cvs/metadata.xml | 11 -- 17 files changed, 539 deletions(-) diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest deleted file mode 100644 index 950c9fb..0000000 --- a/dev-vcs/cvs/Manifest +++ /dev/null @@ -1,20 +0,0 @@ -AUX 01-cvs-env.d 14 SHA256 dd2e8db836e3879e56cba5df8f0700c1c0581df7e2201f9196650936278a0d15 SHA512 cbb7545ae34fcbfb6e64ad6bf91105a1950a483bb68637d164026e7df06da2dccbcfe0af568c3249ac0a8e7ff466a5e77614fe6fd76a3829136a854bfa7ceb5a WHIRLPOOL 8aaa83c3d17a480ec03267b6d397576f04ea0ac41ad26e6030c739355d50ea698094920ff2e6c4ad6fc9f84425866eedead009e7ded11ea3e68113451e8bf9b8 -AUX cvs-1.12.12-block-requests.patch 4006 SHA256 70bbf745815d1e01582329160a10f5cdd9c11051e4e62d331686dd5124e01294 SHA512 541545ffc64c4f2303b7e8f6cae2cdff0437452e4bcf94b2149d51e43710096e17f024c1a8ed32433560ea51ecef2aba2f3e6bfaef8fa9e4ad2f2436649884d1 WHIRLPOOL 4c56980ea0d307789ace423e7fcafb86c82429f82cfbe6d873706f95e6e2554e06268540d23b9718113e5182b83b01bb22d02ae649e27feaac1dfd09b38fa892 -AUX cvs-1.12.12-cvs-gnulib-vasnprintf.patch 1092 SHA256 f38e6bbb0fd8b783b654ac775183a1cb24e3987698fdbd706a8d5fa59a45f945 SHA512 6c0be276f6e86dbe3646ada02ea57194b8c7d1e4d76c5faeb06750435599aa4125253bdf7af6232f53807977acb34aba093bc8bfa2ce98389c5ee80b2fd6e05d WHIRLPOOL 0b5dd5ee3c11fae83688d900db2ce678870c79b753c1ffde9aa11a6fe18286af7e24d57f2ce28ffcdbfb42172a0e87baed58047497248ffb1a37acca93ad716f -AUX cvs-1.12.12-cvsbug-tmpfix.patch 624 SHA256 061c26d140e1195200f1cc76217b2e7c2ff7f0c4dcbbb31124b386e8e756938e SHA512 29014631f5595dbf51a47032a19a23e545190dd8d40d77a71d363cee07a9ae38263b67db52a512436a9a7b37a7f5ff4daafa4a0a9f3c29bcfeb71ecff74408b7 WHIRLPOOL 09d53fa26159defe56cdbd414b699bd7c5be07f36b0b5addd367b393985bd7c98f14189db5b2793af0fc37d052f21af1f97c3775d46d71cebdfff15c447a9d5a -AUX cvs-1.12.12-fix-massive-leak.patch 1985 SHA256 30727f2f97164b7e71a8abaf859b2a6dea7f680cb7e97699ee1e8ca8600bd782 SHA512 c4c9026e971f3da49cefce102b57bc681427a708ec8caa185df1234fd2a95090c8dc8cbf84374a762fdef7002d658cd4b52450429664cb3a1bfbda63d31c78a7 WHIRLPOOL c669df0411348d88f140a6da8c1c7a89be835483f00308020025d027f2ad55ba463608e48e04f11689c3270c3318b2aebba828020a997c8754e9517baef3b2d2 -AUX cvs-1.12.12-getdelim.patch 559 SHA256 cc02f345d7347349df7b6fa826ef314871e5049df48e9c892db0175dbfe16cf4 SHA512 4e55f705b9fb8bc2a6c381e01c783ee4476fee8330aede6843b89c2217f8667f1e682ce098b78d3ea2d491b55227b97e07bc48173446ee8c9b86169357b03d19 WHIRLPOOL 663e4a42ac4e859acf0bde57eac5910b19e6a21a23878a03a3f56c9a5e092c81da0024a8fe519bbbdc82a528c258c5537084a4188ae127a5dcfc470a4f927216 -AUX cvs-1.12.12-hash-nameclash.patch 1015 SHA256 3a6a5bf6bd419bb8a4440f3f4f5dba770db1d06e33e0ab6d249ace490010edb4 SHA512 0c3a78d31a38fb478ee7a93b87ad9481f04d275a3b9a9820e4cdfc8f0c27516c056aa3abf5087d3ebd2938dee504d0ba9291a615b4eb33f5b66663d24a1ccbd7 WHIRLPOOL db273cd95429ad758615826cb54755b91eb2a9a56daa859e264dc46eb8ffb5f2ec0ec21f17cfe5767021827a835ed4b700b8a8f52ae6e46695b5e715979d695e -AUX cvs-1.12.12-install-sh.patch 495 SHA256 9c2fc03b42804f8edb3a5a6f9c9e80bd68924f265ce52d196c3b5c759ba42f8a SHA512 7e468d41c1eb23c0a62b605e6e48cffc004e8f386a87a9696dd73b36702c74aad529f5cba7280dee1100027b6e1e907adad257cc446ca3ad734fa40d47e4ff72 WHIRLPOOL 1eaf9e7ccab89cd0d2c95440da0454779b13d6efc4b2a773d41f58998353a2670134344d6a97379103f3ba6e8b6c96c93db0b6229821bb8c12ce037a3b7ddb64 -AUX cvs-1.12.12-mktime-x32.patch 916 SHA256 107b0adceda7c8b7b8e89604f38ea0e7a903420dc58dbf22c5eeac947d63d0e1 SHA512 4a58c0f94de8e19c2de1930b7e5e04816e79a86885c89b792616a4c43f6e12aef271005ae59ae0d5788a910ba97735ccdf35f0ef5faafc2e3c50a9858b8f6216 WHIRLPOOL 5ca4316ee5a272efabe6da249476f6f916851fa92338368616aff03f380b2cd290391faa455e914e423ce74a00122336e6bfa93236a8412c1f32103040e3038a -AUX cvs-1.12.12-openat.patch 761 SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f SHA512 b0a7abc785169705d2f0668a8af706f93ee3eba3d050d555689577962283e54f6bd186e662b64c65f926cf72dff76a37259181338707d641ee0f20591ba62805 WHIRLPOOL 31c9eb71d9d8cf5dff05e48c054e29b720702c6c12cafd7a2dd9687578bb1c441cf5e90c355b9164dee6b14f6c5cb7a2f4ad7d9ff4831f3ce2f02f82ffd082f7 -AUX cvs-1.12.12-rcs2log-coreutils.patch 561 SHA256 0df8b6ad74b344edc7c353c4dd2cc3825db14dfb1fed20bb007f09c58f1063c8 SHA512 796d2b7ee60619878ac4baa346927ab61ad1bf7b532a63976ef4c3d352ac73c6ed47392d614d538b979936f092291e97b23c47e1f029fc87c4de0b994975fb9c WHIRLPOOL dda784cf39c8a91573dbbc663d9e167961ae8540189b7675eef21e87bda6c6de05cc272e256c3a1ba27670f2fbbc03883b2b0ce68c263584d6f00917e5c53103 -AUX cvs-1.12.12-regex.patch 396 SHA256 0f8a66e61d92a0a9c23854a2b0f16f75f056cc804003a89428ae59d6ac48109a SHA512 0ea01d1df9e5f91c36d475639db10a22eb52fa7d23cc687482c09489d7ae19a4e5917476c61b7de15fe037775bef92aa206e01e58c26f7dd4ce7b02675eac40c WHIRLPOOL c6f3a33520dff71b4d91b5d4ed281db0bc4f671bf7c0f507052f9e7a202b2a65ac97c9b70c840cdc634dc07fb7600534744d5ff948f383ece2661c0fe4a4cbed -AUX cvs.pam-include-1.12.12 106 SHA256 8291f84c2d76269e7be6487ae1db7212e67ee7313d35e6b0cebcd01e30d155af SHA512 1e72da3f959433e59d0153ff09e53a79bb68793506456e38d7070ffe4fcf6d596fdc3740dd2325d626a8dbd356dd11d93fbd5f220515f2435a94b90bb5833fb9 WHIRLPOOL 4580958cbd6955c5fc3e84d4b5c5877c2e94c5a3de326f6936c641cda43a588196871b43280cdbe16c8274049a08eb73ac7067a5166b1f613770f4ea24afc5eb -AUX cvspserver.xinetd.d 282 SHA256 71b62c4f278ed17bf3cac8eacb2bfb17b6125bfe77f83b46fa5742395b74ef5f SHA512 6845a5fc38ed9d8f9194f14137066c3f2640f09ebc1dce7e9fa7c49761534003e5b1c59593496ba9f88a6c9b1196980bc145a2e2fdcbf662360d1b1ca8821411 WHIRLPOOL 949abc87f0d7c8f104ce8a896fdfd94e3db8f60d5aaa948d3358e348b17de942f19ba68fe545ec2af0026643d7b5efd5bc3bc26ccc7da47c70c544d01879646a -DIST cederqvist-1.12.12.html.tar.bz2 137581 SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3 WHIRLPOOL 41dd1e0d944a02eeca10539b87b5cfcadbf4fd5923c872aa86e5673bb6a98f774d5378e8b4f1c2e6c6a62e6dc6a4d02c69b5e51ad03da899903070effd62adc9 -DIST cederqvist-1.12.12.pdf 1252423 SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a WHIRLPOOL 88d015117c05716df6d0cdc763f16dc488f0641624475e9bd33478485dd32e36a7ee5c49a1789ebdd173e665ae5963e75975342d7308e8e453adb65dd31ec6c5 -DIST cederqvist-1.12.12.ps 1262208 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 WHIRLPOOL fb1616ca734e51a626713e7e78786ecbff18378966c2c131f6992df248096d38e850123449d3a5a6aa111ee209f90ef48848da7366b21cb6befeccf07ce54ab6 -DIST cvs-1.12.12.tar.bz2 3197171 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb WHIRLPOOL 74257976cdb957e86fb9fb7e54fc8c0b7210f72136ce05327203d935195e7a3bdda0c1d616dc04cb1d6495cb038ca7275e88488eddb5d936c1cfceb94583278c -EBUILD cvs-1.12.12-r99.ebuild 2740 SHA256 ad72ae2a8d1a208d55a7bfaf831a9b1a436e71e69939d5b76d9746b2f3f5461b SHA512 d32706ca858ee45bdda070d46b21d73379396afa8f6ed52834150e7980cb18b6742e2afed4e490035220a955c3c1d38734151274baf2936c7d50d9819f790327 WHIRLPOOL ca25836cfb65616a16b6127c9b40213b3e33b89fbd0a8b0f0ba9f4c363ca677a8af10bf1f78a943aa2c85cc36b578f8702988e851fb727126f253bc8e0f13a9d -MISC metadata.xml 331 SHA256 abe97ea27dc3dd970b0bdc5c6a13f144e677da4714992b73a082f0a0cb319904 SHA512 c698a58813dd993a32389cd8ddc4bcc76d4cf6a435c62ee78e1b4f5c3908ba8b55b9a3338b870b3287195d1f480401ee05f5531ca01827e8626e6d77201f2f03 WHIRLPOOL 653ede8acb3ef3f658064ca7622d28f9ccdf3a2152eac9db55c1d8f528aa869b2027159d546ea52dc27fc7e14b9d39580a9a83813d74992a05914321c0d49b7a diff --git a/dev-vcs/cvs/cvs-1.12.12-r99.ebuild b/dev-vcs/cvs/cvs-1.12.12-r99.ebuild deleted file mode 100644 index 354d77d..0000000 --- a/dev-vcs/cvs/cvs-1.12.12-r99.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -inherit eutils pam toolchain-funcs - -DESCRIPTION="Concurrent Versions System - source code revision control tools" -HOMEPAGE="http://www.nongnu.org/cvs/"; - -SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 - doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" - -IUSE="crypt doc kerberos nls pam server" -RESTRICT='test' - -DEPEND=">=sys-libs/zlib-1.1.4 - kerberos? ( virtual/krb5 ) - pam? ( virtual/pam )" - -src_unpack() { - unpack ${P}.tar.bz2 - use doc && unpack cederqvist-${PV}.html.tar.bz2 -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch - epatch "${FILESDIR}"/${P}-openat.patch - epatch "${FILESDIR}"/${P}-block-requests.patch - epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch - epatch "${FILESDIR}"/${P}-install-sh.patch - epatch "${FILESDIR}"/${P}-regex.patch # for musl - epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX - epatch "${FILESDIR}"/${P}-getdelim.patch # 314791 - epatch "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114 - epatch "${FILESDIR}"/${P}-mktime-x32.patch # 395641 - epatch "${FILESDIR}"/${P}-fix-massive-leak.patch - use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!" -} - -src_configure() { - if tc-is-cross-compiler ; then - # Sane defaults when cross-compiling (as these tests want to - # try and execute code). - export cvs_cv_func_printf_ptr="yes" - fi - econf \ - --with-external-zlib \ - --with-tmpdir=/tmp \ - $(use_enable crypt encryption) \ - $(use_with kerberos gssapi) \ - $(use_enable nls) \ - $(use_enable pam) \ - $(use_enable server) -} - -src_install() { - emake install DESTDIR="${D}" || die - - insinto /etc/xinetd.d - if use server; then - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed" - fi - newenvd "${FILESDIR}"/01-cvs-env.d 01cvs - - dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \ - MINOR* NEWS PROJECTS README* TESTS TODO - - # Not installed into emacs site-lisp because it clobbers the normal C - # indentations. - dodoc cvs-format.el || die "dodoc failed" - - use server && newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c - - if use doc; then - dodoc "${DISTDIR}"/cederqvist-${PV}.pdf - dodoc "${DISTDIR}"/cederqvist-${PV}.ps - tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2 - dohtml -r cederqvist-${PV}.html/* - dosym cvs.html /usr/share/doc/${PF}/html/index.html - fi - - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs -} diff --git a/dev-vcs/cvs/files/01-cvs-env.d b/dev-vcs/cvs/files/01-cvs-env.d deleted file mode 100644 index 5c89358..0000000 --- a/dev-vcs/cvs/files/01-cvs-env.d +++ /dev/null @@ -1 +0,0 @@ -CVS_RSH="ssh" diff --git a/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch b/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch deleted file mode 100644 index 9c9b49d..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch +++ /dev/null @@ -1,140 +0,0 @@ -Author: Robin H. Johnson <[email protected]> -Date: 2006-08-09 - -This patch allows a CVS server to deny usage of specific commands, based on -input in the environment. - -Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want, -seperated by spaces. Eg: -CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents" -would block ALL usage of compression. - -Please see the array 'struct request requests[]' in src/server.c for a full -list of commands. - -Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients -may fail! (This includes 'ci'!). - -See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups. - -Signed-off-by: Robin H. Johnson <[email protected]> - -diff -Nuar --exclude '*~' -U 10 cvs-1.12.12.orig/src/server.c cvs-1.12.12/src/server.c ---- cvs-1.12.12.orig/src/server.c 2005-04-14 14:13:29.000000000 +0000 -+++ cvs-1.12.12/src/server.c 2006-08-09 01:40:44.000000000 +0000 -@@ -5836,43 +5836,90 @@ - #undef REQ_LINE - }; - #endif /* SERVER_SUPPORT or CLIENT_SUPPORT */ - - - - #ifdef SERVER_SUPPORT - /* - * This server request is not ignored by the secondary. - */ -+ -+/* Hack by Robin H. Johnson <[email protected]>. -+ * Allow the server ENV to specify what request types are to be ignored. -+ */ -+ -+static char blocked_requests[BUFSIZ] = " "; -+ -+static void build_blocked_requests() { -+ char *tmp = getenv("CVS_BLOCK_REQUESTS"); -+ -+ if (tmp != NULL && strlen(tmp) > 0) { -+ // move to our custom buffer -+ strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests)); -+ //add a space on the end as well for searching -+ strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests)); -+ } -+ -+ // now blocked_requests contains the list of every request that we do not -+ // want to serve -+} -+ -+// returns 0 if we should serve this request -+// use as if(checker(FOO)) continue; -+static int serve_valid_requests_checker(char *reqname) { -+ char needle[BUFSIZ] = " "; -+ char *tmp; -+ -+ if(!blocked_requests || strlen(blocked_requests) < 2) -+ return 0; -+ -+ // we want to look for ' 'reqname' ' -+ snprintf(needle, sizeof(needle), " %s ", reqname); -+ -+ // now do the search -+ tmp = strstr(blocked_requests, needle); -+ -+ if (tmp != NULL) -+ return 1; -+ -+ return 0; -+ -+} -+ - static void - serve_valid_requests (char *arg) - { - struct request *rq; - - /* Since this is processed in the first pass, don't reprocess it in the - * second. - * - * We still print errors since new errors could have been generated in the - * second pass. - */ - if (print_pending_error () - #ifdef PROXY_SUPPORT - || reprocessing - #endif /* PROXY_SUPPORT */ - ) - return; -+ -+ build_blocked_requests(); - - buf_output0 (buf_to_net, "Valid-requests"); - for (rq = requests; rq->name != NULL; rq++) - { - if (rq->func != NULL) - { -+ if(serve_valid_requests_checker(rq->name)) -+ continue; - buf_append_char (buf_to_net, ' '); - buf_output0 (buf_to_net, rq->name); - } - } - buf_output0 (buf_to_net, "\nok\n"); - - /* The client is waiting for the list of valid requests, so we - must send the output now. */ - buf_flush (buf_to_net, 1); - } -@@ -6353,20 +6400,24 @@ - cmd += len; - else if (cmd[len] == ' ') - cmd += len + 1; - else - /* - * The first len characters match, but it's a different - * command. e.g. the command is "cooperate" but we matched - * "co". - */ - continue; -+ // Ignore commands that we are supposed to ignore. -+ if(serve_valid_requests_checker(rq->name)) -+ continue; -+ - - if (!(rq->flags & RQ_ROOTLESS) - && current_parsed_root == NULL) - { - /* For commands which change the way in which data - is sent and received, for example Gzip-stream, - this does the wrong thing. Since the client - assumes that everything is being compressed, - unconditionally, there is no way to give this - error to the client without turning on diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch deleted file mode 100644 index d7d6e6b..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch +++ /dev/null @@ -1,34 +0,0 @@ -http://bugs.gentoo.org/213833 - -commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8 -Author: Bruno Haible <[email protected]> -Date: Fri Oct 19 01:50:42 2007 +0200 - - Don't use %n on glibc >= 2.3 systems. - -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index f563823..5d818aa 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - #endif - *p = dp->conversion; - #if USE_SNPRINTF -+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) - p[1] = '%'; - p[2] = 'n'; - p[3] = '\0'; -+# else -+ /* On glibc2 systems from glibc >= 2.3 - probably also older -+ ones - we know that snprintf's returns value conforms to -+ ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes. -+ Therefore we can avoid using %n in this situation. -+ On glibc2 systems from 2004-10-18 or newer, the use of %n -+ in format strings in writable memory may crash the program -+ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it -+ in this situation. */ -+ p[1] = '\0'; -+# endif - #else - p[1] = '\0'; - #endif diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch deleted file mode 100644 index fcd4431..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: cvs-1.12.12/src/cvsbug.in -=================================================================== ---- cvs-1.12.12.orig/src/cvsbug.in -+++ cvs-1.12.12/src/cvsbug.in -@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then - /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" | - cut -f5 -d':' | sed -e 's/,.*//' > $TEMP - ORIGINATOR="`cat $TEMP`" -- rm -f $TEMP -+ > $TEMP - fi - fi - - if [ "$ORIGINATOR" = "" ]; then - grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP - ORIGINATOR="`cat $TEMP`" -- rm -f $TEMP -+ > $TEMP - fi - - if [ -n "$ORGANIZATION" ]; then - diff --git a/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch b/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch deleted file mode 100644 index 5366f50..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch +++ /dev/null @@ -1,52 +0,0 @@ -buf_free_data must free data independently -of send or reseived bytes over network. - -Moreover, when buffer is usually freed -buffer _is_ empty, but has one clean mapped page. - -I've observed massive 'cvs server' leaks -when importing large gentoo-x86 repo with 'cvsps'. -Leak ate all my 32GBs of RAM and killed process. -(Leaked around 3 pages per client request). - -valgrind found the leak easily: - -$ valgrind \ - cvsps \ - --root :local:$HOME/portage/gentoo-x86.rsync \ - --fast-export \ - gentoo-x86/dev-vcs/git-annex 2>l | - git fast-import - - ==13504== 1,248 bytes in 52 blocks are still reachable in loss record 41 of 47 - ==13504== at 0x4C2C19B: malloc (vg_replace_malloc.c:270) - ==13504== by 0x48A556: xnmalloc_inline (xmalloc.c:40) - ==13504== by 0x48A5B5: xmalloc (xmalloc.c:56) - ==13504== by 0x4855F5: new_memnode (pagealign_alloc.c:91) - ==13504== by 0x48571B: pagealign_alloc (pagealign_alloc.c:151) - ==13504== by 0x485739: pagealign_xalloc (pagealign_alloc.c:182) - ==13504== by 0x408DD7: get_buffer_data (buffer.c:98) - ==13504== by 0x409C0C: buf_input_data (buffer.c:738) - ==13504== by 0x45BB63: do_cvs_command (server.c:3847) - ==13504== by 0x45D39E: serve_co (server.c:4809) - ==13504== by 0x45F845: server (server.c:6438) - ==13504== by 0x438784: main (main.c:1066) - -And now it takes constant space (less, than 18MB) -for 'cvs server' process to convert all gentoo-x86 -by serving more, than 5 000 000 client requests. - -Signed-off-by: Sergei Trofimovich <[email protected]> -diff --git a/src/buffer.c b/src/buffer.c -index 3f12513..9a7a559 100644 ---- a/src/buffer.c -+++ b/src/buffer.c -@@ -526,7 +526,7 @@ buf_copy_data (struct buffer *buf, struct buffer_data *data, - void - buf_free_data (struct buffer *buffer) - { -- if (buf_empty_p (buffer)) return; -+ if (! buffer->data) return; - buf_free_datas (buffer->data, buffer->last); - buffer->data = buffer->last = NULL; - } diff --git a/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch b/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch deleted file mode 100644 index d27bcc0..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch +++ /dev/null @@ -1,21 +0,0 @@ -The function getdelim() behaves slightly different on FreeBSD, -only appending to the *line buffer if line_size is 0. - -See: -http://savannah.nongnu.org/bugs/?29466 -http://bugs.gentoo.org/314791 - -Already comitted upstream: -http://cvs.savannah.gnu.org/viewvc/ccvs/src/myndbm.c?root=cvs&r1=1.38&r2=1.39 - ---- src/myndbm.c.orig -+++ src/myndbm.c -@@ -213,7 +213,7 @@ - mydbm_load_file (FILE *fp, List *list, char *filename) - { - char *line = NULL; -- size_t line_size; -+ size_t line_size = 0; - char *value; - size_t value_allocated; - char *cp, *vp; diff --git a/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch b/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch deleted file mode 100644 index 0a33eea..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch +++ /dev/null @@ -1,42 +0,0 @@ -http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch -fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a - ---- src/hash.h.orig 2005-02-01 22:56:48 +0100 -+++ src/hash.h 2010-03-10 19:00:11 +0100 -@@ -27,26 +27,26 @@ - }; - typedef enum ntype Ntype; - --struct node -+struct hashnode - { - Ntype type; -- struct node *next; -- struct node *prev; -- struct node *hashnext; -- struct node *hashprev; -+ struct hashnode *next; -+ struct hashnode *prev; -+ struct hashnode *hashnext; -+ struct hashnode *hashprev; - char *key; - void *data; -- void (*delproc) (struct node *); -+ void (*delproc) (struct hashnode *); - }; --typedef struct node Node; -+typedef struct hashnode Node; - --struct list -+struct hashlist - { - Node *list; - Node *hasharray[HASHSIZE]; -- struct list *next; -+ struct hashlist *next; - }; --typedef struct list List; -+typedef struct hashlist List; - - List *getlist (void); - Node *findnode (List * list, const char *key); diff --git a/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch b/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch deleted file mode 100644 index 825c0ee..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/build-aux/install-sh b/build-aux/install-sh ---- a/build-aux/install-sh 2006-03-25 20:04:46 +0000 -+++ b/build-aux/install-sh 2007-09-14 10:53:29 +0100 -@@ -246,7 +246,7 @@ - fi - - if test -n "$dir_arg"; then -- $doit $mkdircmd "$dst" \ -+ { test -d "$dst" || $doit $mkdircmd -p "$dst"; } \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch deleted file mode 100644 index 948fa4d..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch +++ /dev/null @@ -1,29 +0,0 @@ -back port changes from upstream gnulib to make this work on x32 - -https://bugs.gentoo.org/395641 - ---- cvs-1.12.12/lib/mktime.c -+++ cvs-1.12.12/lib/mktime.c -@@ -115,6 +115,13 @@ - #define TM_YEAR_BASE 1900 - verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0); - -+#if INT_MAX <= LONG_MAX / 2 -+typedef long int long_int; -+#else -+typedef long long int long_int; -+#endif -+verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2); -+ - /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ - static inline int - leapyear (long int year) -@@ -167,8 +174,6 @@ - int year0, int yday0, int hour0, int min0, int sec0) - { - verify (C99_integer_division, -1 / 2 == 0); -- verify (long_int_year_and_yday_are_wide_enough, -- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); - - /* Compute intervening leap days correctly even if year is negative. - Take care to avoid integer overflow here. */ diff --git a/dev-vcs/cvs/files/cvs-1.12.12-openat.patch b/dev-vcs/cvs/files/cvs-1.12.12-openat.patch deleted file mode 100644 index fdb406a..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-openat.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cvs-1.12.12/lib/openat.c -=================================================================== ---- cvs-1.12.12.orig/lib/openat.c -+++ cvs-1.12.12/lib/openat.c -@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename - va_list arg; - va_start (arg, flags); - -- /* Assume that mode_t is passed compatibly with mode_t's type -- after argument promotion. */ -- mode = va_arg (arg, mode_t); -+ /* If mode_t is narrower than int, use the promoted type (int), -+ not mode_t. Use sizeof to guess whether mode_t is nerrower; -+ we don't know of any practical counterexamples. */ -+ if (sizeof (mode_t) < sizeof (int)) -+ mode = va_arg (arg, int); -+ else -+ mode = va_arg (arg, mode_t); - - va_end (arg); - } diff --git a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch deleted file mode 100644 index 0fb4c6c..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch +++ /dev/null @@ -1,14 +0,0 @@ -X-Gentoo-bug: 144114 - -diff -Nuar cvs-1.12.12.orig//contrib/rcs2log.sh cvs-1.12.12//contrib/rcs2log.sh ---- cvs-1.12.12.orig//contrib/rcs2log.sh 2003-02-25 21:32:51.000000000 +0000 -+++ cvs-1.12.12//contrib/rcs2log.sh 2010-12-06 21:14:33.831532212 +0000 -@@ -620,7 +620,7 @@ - # Sort the log entries, first by date+time (in reverse order), - # then by author, then by log entry, and finally by file name and revision - # (just in case). --sort -t"$SOH" +2 -4r +4 +0 | -+sort -t"$SOH" -k 3,4r -k 5 -k 1,2 | - - # Finally, reformat the sorted log entries. - $AWK -F"$SOH" ' diff --git a/dev-vcs/cvs/files/cvs-1.12.12-regex.patch b/dev-vcs/cvs/files/cvs-1.12.12-regex.patch deleted file mode 100644 index 4e69953..0000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-regex.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cvs-1.12.12/lib/regex.c -+++ b/cvs-1.12.12/lib/regex.c -@@ -8184,7 +8184,7 @@ - if (msg_size > errbuf_size) - { - #if defined HAVE_MEMPCPY || defined _LIBC -- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; -+ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; - #else - memcpy (errbuf, msg, errbuf_size - 1); - errbuf[errbuf_size - 1] = 0; diff --git a/dev-vcs/cvs/files/cvs.pam-include-1.12.12 b/dev-vcs/cvs/files/cvs.pam-include-1.12.12 deleted file mode 100644 index f401ec0..0000000 --- a/dev-vcs/cvs/files/cvs.pam-include-1.12.12 +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -session include system-auth diff --git a/dev-vcs/cvs/files/cvspserver.xinetd.d b/dev-vcs/cvs/files/cvspserver.xinetd.d deleted file mode 100644 index 0f2edb0..0000000 --- a/dev-vcs/cvs/files/cvspserver.xinetd.d +++ /dev/null @@ -1,14 +0,0 @@ -service cvspserver -{ - disable = yes - socket_type = stream - wait = no - user = root - log_type = FILE /var/log/cvspserver - protocol = tcp - env = HOME=/var/cvsroot - log_on_failure += USERID - port = 2401 - server = /usr/bin/cvs - server_args = -f --allow-root=/var/cvsroot pserver -} diff --git a/dev-vcs/cvs/metadata.xml b/dev-vcs/cvs/metadata.xml deleted file mode 100644 index 4951492..0000000 --- a/dev-vcs/cvs/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo CVS Project</name> - </maintainer> - <use> - <flag name="server">Enable server support</flag> - </use> -</pkgmetadata>
