From: Markus Ullmann Date: Mon, 27 Mar 2006 21:48:00 +0000 (+0000) Subject: Added LANG fix, adapted from flex wrt bug #126065 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca92860685f1d84be9e48335ffa1e665c1c3d5be;p=gentoo.git Added LANG fix, adapted from flex wrt bug #126065 Package-Manager: portage-2.1_pre7-r1 --- diff --git a/net-analyzer/traceroute/ChangeLog b/net-analyzer/traceroute/ChangeLog index e8c42539865b..3555f6957884 100644 --- a/net-analyzer/traceroute/ChangeLog +++ b/net-analyzer/traceroute/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/traceroute # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.28 2006/03/09 18:07:30 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.29 2006/03/27 21:48:00 jokey Exp $ + +*traceroute-1.4_p12-r5 (27 Mar 2006) + + 27 Mar 2006; Markus Ullmann + +files/traceroute-configure-LANG.patch, +traceroute-1.4_p12-r5.ebuild: + Added LANG fix, adapted from flex wrt bug #126065 *traceroute-1.4_p12-r4 (09 Mar 2006) diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest index 785c468c4c42..583931bdfbcc 100644 --- a/net-analyzer/traceroute/Manifest +++ b/net-analyzer/traceroute/Manifest @@ -1,9 +1,36 @@ -MD5 3783d1275bd6022801d035e0227abf80 ChangeLog 5113 +MD5 74e50d307d5bdb4151beab205461f6e0 ChangeLog 5321 +RMD160 3614b343d1720dda3a59be484a92f2f9ca6c8167 ChangeLog 5321 +SHA256 7fad11201a74c59443a54d53130027c0a3d015dc7e7ee6ab66f7bd63180928a9 ChangeLog 5321 MD5 8122082980a7ee66b278371da18b5c61 files/digest-traceroute-1.4_p12-r2 521 +RMD160 347245db1ccc102e599090e0592efeaaba1bf41c files/digest-traceroute-1.4_p12-r2 521 +SHA256 8013b2342e32d798ab799788e833eefdb58dab81d5fdf56c465599c7296669f4 files/digest-traceroute-1.4_p12-r2 521 MD5 8122082980a7ee66b278371da18b5c61 files/digest-traceroute-1.4_p12-r3 521 +RMD160 347245db1ccc102e599090e0592efeaaba1bf41c files/digest-traceroute-1.4_p12-r3 521 +SHA256 8013b2342e32d798ab799788e833eefdb58dab81d5fdf56c465599c7296669f4 files/digest-traceroute-1.4_p12-r3 521 MD5 3eae5594aebda2c1d7d981fc74fea997 files/digest-traceroute-1.4_p12-r4 143 +RMD160 675fc300842a62208fa99b1423701ffe0c4acdae files/digest-traceroute-1.4_p12-r4 143 +SHA256 ca5d30b6dc53d47b3a488b7cf969490a900dcbc22c1965efd9727fb638e8efc1 files/digest-traceroute-1.4_p12-r4 143 +MD5 8122082980a7ee66b278371da18b5c61 files/digest-traceroute-1.4_p12-r5 521 +RMD160 347245db1ccc102e599090e0592efeaaba1bf41c files/digest-traceroute-1.4_p12-r5 521 +SHA256 8013b2342e32d798ab799788e833eefdb58dab81d5fdf56c465599c7296669f4 files/digest-traceroute-1.4_p12-r5 521 MD5 2504b277ffc8b8a3730629607672663d files/traceroute-1.4a12-mpls-icmp-02.patch 4273 +RMD160 be475d41d6d1bd42dc9d06453c6843610733f3df files/traceroute-1.4a12-mpls-icmp-02.patch 4273 +SHA256 b7ea05b34b255674b2eb179432b43c2c4e252fb8c5c4c525e824c6040f4a7f6a files/traceroute-1.4a12-mpls-icmp-02.patch 4273 +MD5 e2afdd889f5dba3d206b573eb8f45958 files/traceroute-configure-LANG.patch 1684 +RMD160 4b8b67705835e2ef224a83cf895f016d69507689 files/traceroute-configure-LANG.patch 1684 +SHA256 4968da320016fc7211a5aec839c3b49f13bab265d525e43e0cfddc98cd54cf99 files/traceroute-configure-LANG.patch 1684 MD5 7ed4ef8e3d3fd7d4c7e9682b2519d739 metadata.xml 235 +RMD160 de3c26bbe3899e398acc788b01189adf8487038e metadata.xml 235 +SHA256 0dd7765ffffa47a13dd4ffcd8f83d0b1f7cb64a0b80abe132ecaf0373bf6d11e metadata.xml 235 MD5 0733378af785c65743ff4d85bac2060d traceroute-1.4_p12-r2.ebuild 1309 +RMD160 694917ebaf4b684615855750491030479662aa38 traceroute-1.4_p12-r2.ebuild 1309 +SHA256 d3be956c3dd74330d701506c1d01917ceaa9b6efa52d4b0dd72825d3e7686ea3 traceroute-1.4_p12-r2.ebuild 1309 MD5 47deceb3075f95da7921ebc8cbd08360 traceroute-1.4_p12-r3.ebuild 1588 +RMD160 79e4b416dff8d687c88d8e1ee76c6a9a68b7583e traceroute-1.4_p12-r3.ebuild 1588 +SHA256 d1ab8210236999d329267b9a71e360719ec551ab4ac89bdd66c442cfad10d154 traceroute-1.4_p12-r3.ebuild 1588 MD5 1b18cae6648d31d9056741eb59d863d8 traceroute-1.4_p12-r4.ebuild 1647 +RMD160 d71f83c597fb8ca63f0ca160f1c988bd117e0968 traceroute-1.4_p12-r4.ebuild 1647 +SHA256 1caf672a67d00f25b8fc06702bfcb4710030c859019b957352ebb8590239407f traceroute-1.4_p12-r4.ebuild 1647 +MD5 c3bcbe91e8dd925bdf9c5bae4e60cdb0 traceroute-1.4_p12-r5.ebuild 1637 +RMD160 1bc26fa80ab7153ab6f81da63d6fde5bf7ebf4e2 traceroute-1.4_p12-r5.ebuild 1637 +SHA256 c0af0e3c964254b53f35274f1a2b2dd0ec0f46a550881b71a1b7fb602f855539 traceroute-1.4_p12-r5.ebuild 1637 diff --git a/net-analyzer/traceroute/files/digest-traceroute-1.4_p12-r5 b/net-analyzer/traceroute/files/digest-traceroute-1.4_p12-r5 new file mode 100644 index 000000000000..648a9933d43c --- /dev/null +++ b/net-analyzer/traceroute/files/digest-traceroute-1.4_p12-r5 @@ -0,0 +1,6 @@ +MD5 0b3b77a7a4b6338c4e1ee2ca338d1529 traceroute-1.4-genpatches.tar.gz 6554 +RMD160 ce28748bdbb7c3caab36049bf486c883b5976566 traceroute-1.4-genpatches.tar.gz 6554 +SHA256 861a0c785febf8b2886600f0f6d77218e686c5772852e2b0f9e44b540b3ea7e7 traceroute-1.4-genpatches.tar.gz 6554 +MD5 964d599ef696efccdeebe7721cd4828d traceroute-1.4a12.tar.gz 74917 +RMD160 10fc951fb1453affe4b27dc197fa71e488cf0a40 traceroute-1.4a12.tar.gz 74917 +SHA256 b099eeb0e4c40f274888669ac242f6ed092b36977817bd101c051db248fec4b0 traceroute-1.4a12.tar.gz 74917 diff --git a/net-analyzer/traceroute/files/traceroute-configure-LANG.patch b/net-analyzer/traceroute/files/traceroute-configure-LANG.patch new file mode 100644 index 000000000000..3a35abf82c79 --- /dev/null +++ b/net-analyzer/traceroute/files/traceroute-configure-LANG.patch @@ -0,0 +1,41 @@ +The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in +option parsing, it may break. + +adapted from sys-devel/flex + +--- configure ++++ configure +@@ -54,6 +54,16 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + ++# NLS nuisances. ++# Only set these to C if already set. These must not be set unconditionally ++# because not all systems understand e.g. LANG=C (notably SCO). ++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! ++# Non-C LC_CTYPE values break the ctype check. ++if test "${LANG+set}" = set; then LANG=C; export LANG; fi ++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi ++if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= +@@ -452,16 +463,6 @@ + esac + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h + # AIX cpp loses on an empty file, so make sure it contains at least a newline. diff --git a/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild b/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild new file mode 100644 index 000000000000..c5fdfe3d0078 --- /dev/null +++ b/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-1.4_p12-r5.ebuild,v 1.1 2006/03/27 21:48:00 jokey Exp $ + +inherit eutils flag-o-matic + +MY_P="${PN}-${PV/_p/a}" +DESCRIPTION="Utility to trace the route of IP packets" +HOMEPAGE="http://ee.lbl.gov/" +SRC_URI="ftp://ee.lbl.gov/${MY_P}.tar.gz + mirror://gentoo/${PN}-1.4-genpatches.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="static" + +DEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd ${S} + + # nasty hack until bug 93363 is fixed + chmod 644 config.{guess,sub} + + epatch ${WORKDIR}/${PN}-1.4-target-resolv.patch + epatch ${WORKDIR}/${PN}-1.4a12-LDFLAGS.patch + epatch ${WORKDIR}/${PN}-1.4a5-bigpacklen.patch + epatch ${WORKDIR}/${PN}-1.4a12.patch + epatch ${WORKDIR}/${PN}-1.4a5-droproot.patch + epatch ${WORKDIR}/${PN}-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.patch + epatch ${WORKDIR}/${PN}-1.4a5-secfix.patch + epatch ${WORKDIR}/${PN}-1.4a5-unaligned.patch + epatch ${WORKDIR}/${PN}-1.4-emptylabel.patch + epatch ${FILESDIR}/${PN}-1.4a12-mpls-icmp-02.patch + + # assume linux by default #26699 + sed -i '/^t=/s:generic:linux:' configure + + # bug 126065 + epatch ${FILESDIR}/traceroute-configure-LANG.patch + + use static && append-ldflags -static + append-ldflags $(bindnow-flags) -Wl,-z,relro +} + +src_install() { + dosbin traceroute || die "dosbin" + fowners root:wheel /usr/sbin/traceroute + fperms 4711 /usr/sbin/traceroute + + doman traceroute.8 + dodoc CHANGES +}