From ae7b5052b3c4bbc01e6ef8c807a69487e11f6433 Mon Sep 17 00:00:00 2001 From: Christian Birchinger Date: Sun, 17 Dec 2006 15:55:29 +0000 Subject: [PATCH] Added a patch for the missing optarg in recent glibcs Package-Manager: portage-2.1.1-r2 --- app-admin/ccze/ChangeLog | 8 ++++- app-admin/ccze/Manifest | 19 ++++++++--- app-admin/ccze/ccze-0.2.1-r2.ebuild | 41 +++++++++++++++++++++++ app-admin/ccze/files/ccze-segfault.patch | 30 +++++++++++++++++ app-admin/ccze/files/digest-ccze-0.2.1-r2 | 3 ++ 5 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 app-admin/ccze/ccze-0.2.1-r2.ebuild create mode 100644 app-admin/ccze/files/ccze-segfault.patch create mode 100644 app-admin/ccze/files/digest-ccze-0.2.1-r2 diff --git a/app-admin/ccze/ChangeLog b/app-admin/ccze/ChangeLog index 3cc84f18a77e..9702d442f9c8 100644 --- a/app-admin/ccze/ChangeLog +++ b/app-admin/ccze/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/ccze # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ChangeLog,v 1.17 2006/12/17 15:35:32 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ChangeLog,v 1.18 2006/12/17 15:55:29 joker Exp $ + +*ccze-0.2.1-r2 (17 Dec 2006) + + 17 Dec 2006; Christian Birchinger + +files/ccze-segfault.patch, +ccze-0.2.1-r2.ebuild: + Added a patch for the missing optarg in recent glibcs 17 Dec 2006; Christian Birchinger -ccze-0.2.1.ebuild: Remove old version diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest index 40ea7c032646..00237c1f6e45 100644 --- a/app-admin/ccze/Manifest +++ b/app-admin/ccze/Manifest @@ -2,15 +2,23 @@ AUX ccze-fbsd.patch 635 RMD160 a008d2bf9cf2c303f16c1dcb136538fea26de455 SHA1 76b MD5 4503cf5c22bc9da3385a55c3d976eead files/ccze-fbsd.patch 635 RMD160 a008d2bf9cf2c303f16c1dcb136538fea26de455 files/ccze-fbsd.patch 635 SHA256 f80d6bea0b9a0655330e2e55e7abb4f31c9968c19f3d9e4ac06ab2e4ce8ee3b7 files/ccze-fbsd.patch 635 +AUX ccze-segfault.patch 814 RMD160 e1ef1873b8a69ddbce052720a638232630ed1dbb SHA1 a7cf64aadf72ceecb90d758eb31bfc24d73f1789 SHA256 43d82cc9ecb9c3b4aeea311411ada9622094903f60861ed4bc0b2044f294dddc +MD5 bdbd5625f7229992033ad574a024d968 files/ccze-segfault.patch 814 +RMD160 e1ef1873b8a69ddbce052720a638232630ed1dbb files/ccze-segfault.patch 814 +SHA256 43d82cc9ecb9c3b4aeea311411ada9622094903f60861ed4bc0b2044f294dddc files/ccze-segfault.patch 814 DIST ccze-0.2.1.tar.gz 139795 RMD160 22d89140ea0518c6a33c07464620a2a1fb212b94 SHA1 a265e826be8018cd2f1b13ea1e96e27cc1941d02 SHA256 8263a11183fd356a033b6572958d5a6bb56bfd2dba801ed0bff276cfae528aa3 EBUILD ccze-0.2.1-r1.ebuild 1000 RMD160 6d9504452bba1940a2934a6f1d73e3fcb6ad956e SHA1 0caef9cfcc2821c97f6af5cf035300a0fc295fb4 SHA256 302d4cfdac798a8eda39d14dcca444aed509f7c930189ee97c9bd1530b2a1890 MD5 83f2a50fe3639d4a8fefba590a08d716 ccze-0.2.1-r1.ebuild 1000 RMD160 6d9504452bba1940a2934a6f1d73e3fcb6ad956e ccze-0.2.1-r1.ebuild 1000 SHA256 302d4cfdac798a8eda39d14dcca444aed509f7c930189ee97c9bd1530b2a1890 ccze-0.2.1-r1.ebuild 1000 -MISC ChangeLog 2057 RMD160 25f3b8be6c353871105cb1c2d6b854934604b42d SHA1 7dfa02bd6325d20faf2acb17845a686268976808 SHA256 bb6156e2d16e08e826459b9e3ba949b9c45b10c92c10a46e2989203acb277d0b -MD5 aa94fe3aa712ade3f8ad151d6b1d48ee ChangeLog 2057 -RMD160 25f3b8be6c353871105cb1c2d6b854934604b42d ChangeLog 2057 -SHA256 bb6156e2d16e08e826459b9e3ba949b9c45b10c92c10a46e2989203acb277d0b ChangeLog 2057 +EBUILD ccze-0.2.1-r2.ebuild 1081 RMD160 a2686d9790d048af19af83de2979b4c3ffbe3dce SHA1 e30d1ab476730b644395961b1177fc9751d9d48b SHA256 4b9a28012ee183927283b6673be177c4303c180b55d1641e6671663d554d17de +MD5 a872bc0323a3a6c8abee8da8e9f678c6 ccze-0.2.1-r2.ebuild 1081 +RMD160 a2686d9790d048af19af83de2979b4c3ffbe3dce ccze-0.2.1-r2.ebuild 1081 +SHA256 4b9a28012ee183927283b6673be177c4303c180b55d1641e6671663d554d17de ccze-0.2.1-r2.ebuild 1081 +MISC ChangeLog 2252 RMD160 9deebf011a308dfed7883708b5d04a1d30391023 SHA1 1b73cb9a7d891f03edccb149754bf7427b491282 SHA256 83ad3f8b0e72bfe22896e8fe61e17c7480fe800897fa0526bb0ac2c5a8d1aa54 +MD5 5363b68229b2647ab80c6702a7100021 ChangeLog 2252 +RMD160 9deebf011a308dfed7883708b5d04a1d30391023 ChangeLog 2252 +SHA256 83ad3f8b0e72bfe22896e8fe61e17c7480fe800897fa0526bb0ac2c5a8d1aa54 ChangeLog 2252 MISC metadata.xml 644 RMD160 62a75c36180109b37c85c51c118cc566f7895365 SHA1 e90e62aba83f2679ae1ec345b735a6c368680220 SHA256 1f5ded692570e05dcbcf2b7e578b6afe49499dcce935da0991e7ca98746866f1 MD5 02a03e9ed6268b3c5ab55184ac8c4486 metadata.xml 644 RMD160 62a75c36180109b37c85c51c118cc566f7895365 metadata.xml 644 @@ -18,3 +26,6 @@ SHA256 1f5ded692570e05dcbcf2b7e578b6afe49499dcce935da0991e7ca98746866f1 metadata MD5 b7c0cb16221d704921056b3473a8eb0a files/digest-ccze-0.2.1-r1 232 RMD160 6b19c6cc3291dd9d406f86b962a33c7c1ddbadcc files/digest-ccze-0.2.1-r1 232 SHA256 a877e64383bee74751288f5b2c097becbfb3a03fd1821e770a8570094430be7f files/digest-ccze-0.2.1-r1 232 +MD5 b7c0cb16221d704921056b3473a8eb0a files/digest-ccze-0.2.1-r2 232 +RMD160 6b19c6cc3291dd9d406f86b962a33c7c1ddbadcc files/digest-ccze-0.2.1-r2 232 +SHA256 a877e64383bee74751288f5b2c097becbfb3a03fd1821e770a8570094430be7f files/digest-ccze-0.2.1-r2 232 diff --git a/app-admin/ccze/ccze-0.2.1-r2.ebuild b/app-admin/ccze/ccze-0.2.1-r2.ebuild new file mode 100644 index 000000000000..91b4867b8f8e --- /dev/null +++ b/app-admin/ccze/ccze-0.2.1-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r2.ebuild,v 1.1 2006/12/17 15:55:29 joker Exp $ + +inherit fixheadtails autotools eutils + +DESCRIPTION="A flexible and fast logfile colorizer" +HOMEPAGE="http://bonehunter.rulez.org/software/ccze/" +SRC_URI="ftp://bonehunter.rulez.org/pub/ccze/stable/${P}.tar.gz" + +RESTRICT="test" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~x86-fbsd" +IUSE="" + +DEPEND="dev-libs/libpcre" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}"/ccze-fbsd.patch || die "epatch ccze-fbsd.patch failed" + epatch "${FILESDIR}"/ccze-segfault.patch || die "epatch ccze-segfault.patch" + + # GCC 4.x fixes + sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \ + -i src/Makefile.in + sed -e '/AC_CHECK_TYPE(error_t, int)/d' \ + -i configure.ac + + eautoreconf + + ht_fix_file Rules.mk.in +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ +} diff --git a/app-admin/ccze/files/ccze-segfault.patch b/app-admin/ccze/files/ccze-segfault.patch new file mode 100644 index 000000000000..fa30d2f515c1 --- /dev/null +++ b/app-admin/ccze/files/ccze-segfault.patch @@ -0,0 +1,30 @@ +diff -ruN ccze-0.2.1.orig/src/ccze.c ccze-0.2.1/src/ccze.c +--- ccze-0.2.1.orig/src/ccze.c 2003-05-13 20:09:30.000000000 +0200 ++++ ccze-0.2.1/src/ccze.c 2006-12-12 20:36:09.000000000 +0100 +@@ -209,7 +209,7 @@ + } + break; + case 'a': +- plugin = strtok (optarg, "="); ++ plugin = strtok (arg, "="); + value = strtok (NULL, "\n"); + ccze_plugin_argv_set (plugin, value); + break; +@@ -249,7 +249,7 @@ + ccze_config.remfac = 1; + break; + case 'm': +- subopts = optarg; ++ subopts = arg; + while (*subopts != '\0') + { + switch (getsubopt (&subopts, m_subopts, &value)) +@@ -273,7 +273,7 @@ + } + break; + case 'o': +- subopts = optarg; ++ subopts = arg; + while (*subopts != '\0') + { + switch (getsubopt (&subopts, o_subopts, &value)) diff --git a/app-admin/ccze/files/digest-ccze-0.2.1-r2 b/app-admin/ccze/files/digest-ccze-0.2.1-r2 new file mode 100644 index 000000000000..6bfb802e7ad1 --- /dev/null +++ b/app-admin/ccze/files/digest-ccze-0.2.1-r2 @@ -0,0 +1,3 @@ +MD5 221966bce7c5f011eca38157241a0432 ccze-0.2.1.tar.gz 139795 +RMD160 22d89140ea0518c6a33c07464620a2a1fb212b94 ccze-0.2.1.tar.gz 139795 +SHA256 8263a11183fd356a033b6572958d5a6bb56bfd2dba801ed0bff276cfae528aa3 ccze-0.2.1.tar.gz 139795 -- 2.26.2