diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-05-05 04:45:18 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-05-05 04:45:18 +0000 |
commit | 9d749e3d5c1377037a60083bcf29c0a86b56de3d (patch) | |
tree | 8aecd52d4691048e78e2ae28569553e5f2234c7d /sys-apps/gawk | |
parent | Version bump #219476 by Conrad Kostecki. (diff) | |
download | historical-9d749e3d5c1377037a60083bcf29c0a86b56de3d.tar.gz historical-9d749e3d5c1377037a60083bcf29c0a86b56de3d.tar.bz2 historical-9d749e3d5c1377037a60083bcf29c0a86b56de3d.zip |
old
Diffstat (limited to 'sys-apps/gawk')
-rw-r--r-- | sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff | 11 | ||||
-rw-r--r-- | sys-apps/gawk/files/gawk-3.1.5-freewstr.patch | 193 | ||||
-rw-r--r-- | sys-apps/gawk/files/gawk-3.1.5-utf-8-strcat.patch | 47 | ||||
-rw-r--r-- | sys-apps/gawk/gawk-3.1.5-r3.ebuild | 112 | ||||
-rw-r--r-- | sys-apps/gawk/gawk-3.1.5-r4.ebuild | 122 |
5 files changed, 0 insertions, 485 deletions
diff --git a/sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff b/sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff deleted file mode 100644 index 3807e0178b64..000000000000 --- a/sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- gawk-3.1.2.orig/regex.h 2003-02-25 09:58:52.000000000 +0000 -+++ gawk-3.1.2/regex.h 2003-05-23 11:31:52.000000000 +0100 -@@ -552,7 +552,7 @@ - - extern int regexec _RE_ARGS ((const regex_t *__restrict __preg, - const char *__restrict __string, size_t __nmatch, -- regmatch_t __pmatch[__restrict_arr], -+ regmatch_t __pmatch[__restrict], - int __eflags)); - - extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg, diff --git a/sys-apps/gawk/files/gawk-3.1.5-freewstr.patch b/sys-apps/gawk/files/gawk-3.1.5-freewstr.patch deleted file mode 100644 index c4d98bafa2f6..000000000000 --- a/sys-apps/gawk/files/gawk-3.1.5-freewstr.patch +++ /dev/null @@ -1,193 +0,0 @@ ---- gawk-3.1.5/builtin.c.freewstr 2005-07-26 20:07:43.000000000 +0200 -+++ gawk-3.1.5/builtin.c 2007-01-08 13:29:45.000000000 +0100 -@@ -2089,9 +2089,9 @@ - } - - free(buf); -- if (wc_indices != NULL) -- free(wc_indices); - } -+ if (wc_indices != NULL) -+ free(wc_indices); - } else { /* match failed */ - rstart = 0; - rlength = -1; -@@ -2462,6 +2462,8 @@ - free(t->stptr); - t->stptr = buf; - t->stlen = textlen; -+ free_wstr(t); -+ t->flags &= ~(NUMCUR|NUMBER); - - free_temp(s); - if (matches > 0 && lhs) { -@@ -2471,7 +2473,6 @@ - } - if (after_assign != NULL) - (*after_assign)(); -- t->flags &= ~(NUMCUR|NUMBER); - } - if (mb_indices != NULL) - free(mb_indices); ---- gawk-3.1.5/awk.h.freewstr 2005-07-26 20:07:43.000000000 +0200 -+++ gawk-3.1.5/awk.h 2007-01-08 12:31:26.000000000 +0100 -@@ -1166,6 +1166,9 @@ - #define force_wstring(n) str2wstr(n, NULL) - extern const wchar_t *wstrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len)); - extern const wchar_t *wcasestrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len)); -+extern void free_wstr P((NODE *n)); -+#else -+#define free_wstr(NODE) /* empty */ - #endif - /* re.c */ - extern Regexp *make_regexp P((const char *s, size_t len, int ignorecase, int dfa)); ---- gawk-3.1.5/node.c.freewstr 2007-01-08 12:31:26.000000000 +0100 -+++ gawk-3.1.5/node.c 2007-01-08 12:41:48.000000000 +0100 -@@ -218,15 +218,7 @@ - no_malloc: - s->stref = 1; - s->flags |= STRCUR; --#if defined MBS_SUPPORT -- if ((s->flags & WSTRCUR) != 0) { -- assert(s->wstptr != NULL); -- free(s->wstptr); -- s->wstptr = NULL; -- s->wstlen = 0; -- s->flags &= ~WSTRCUR; -- } --#endif -+ free_wstr(s); - return s; - } - -@@ -289,8 +281,14 @@ - *r = *n; - r->flags &= ~(PERM|TEMP|FIELD); - r->flags |= MALLOC; --#if defined MBS_SUPPORT -+#ifdef MBS_SUPPORT -+ /* -+ * DON'T call free_wstr(r) here! -+ * r->wstptr still points at n->wstptr's value, and we -+ * don't want to free it! -+ */ - r->wstptr = NULL; -+ r->wstlen = 0; - #endif /* defined MBS_SUPPORT */ - if (n->type == Node_val && (n->flags & STRCUR) != 0) { - r->stref = 1; -@@ -346,11 +344,7 @@ - r->stref = 1; - r->stptr = NULL; - r->stlen = 0; --#if defined MBS_SUPPORT -- r->wstptr = NULL; -- r->wstlen = 0; -- r->flags &= ~WSTRCUR; --#endif /* MBS_SUPPORT */ -+ free_wstr(r); - #endif /* GAWKDEBUG */ - return r; - } -@@ -365,10 +359,11 @@ - getnode(r); - r->type = Node_val; - r->flags = (STRING|STRCUR|MALLOC); --#if defined MBS_SUPPORT -+#ifdef MBS_SUPPORT - r->wstptr = NULL; - r->wstlen = 0; --#endif -+#endif /* defined MBS_SUPPORT */ -+ - if (flags & ALREADY_MALLOCED) - r->stptr = s; - else { -@@ -512,20 +507,13 @@ - return; - } - free(tmp->stptr); --#if defined MBS_SUPPORT -- if (tmp->wstptr != NULL) { -- assert((tmp->flags & WSTRCUR) != 0); -- free(tmp->wstptr); -- } -- tmp->flags &= ~WSTRCUR; -- tmp->wstptr = NULL; -- tmp->wstlen = 0; --#endif -+ free_wstr(tmp); - } - freenode(tmp); - return; - } - if ((tmp->flags & FIELD) != 0) { -+ free_wstr(tmp); - freenode(tmp); - return; - } -@@ -708,11 +696,8 @@ - fall through and recompute to fill in the array */ - } - -- if (n->wstptr != NULL) { -- free(n->wstptr); -- n->wstptr = NULL; -- n->wstlen = 0; -- } -+ if (n->wstptr != NULL) -+ free_wstr(n); - - /* - * After consideration and consultation, this -@@ -777,6 +762,20 @@ - return n; - } - -+/* free_wstr --- release the wide string part of a node */ -+ -+void -+free_wstr(NODE *n) -+{ -+ if ((n->flags & WSTRCUR) != 0) { -+ assert(n->wstptr != NULL); -+ free(n->wstptr); -+ n->wstptr = NULL; -+ n->wstlen = 0; -+ n->flags &= ~WSTRCUR; -+ } -+} -+ - #if 0 - static void - dump_wstr(FILE *fp, const wchar_t *str, size_t len) -@@ -839,11 +838,10 @@ - h = towlower(*start); - n = towlower(needle[j]); - if (h != n) -- goto out; -+ continue; - } - return haystack + i; - } --out: ; - } - - return NULL; ---- gawk-3.1.5/eval.c.freewstr 2007-01-08 12:31:26.000000000 +0100 -+++ gawk-3.1.5/eval.c 2007-01-08 12:31:26.000000000 +0100 -@@ -1176,13 +1176,7 @@ - memcpy(l->stptr + l->stlen, r->stptr, r->stlen); - l->stlen += r->stlen; - l->stptr[l->stlen] = '\0'; --#if defined MBS_SUPPORT -- if (r->wstptr != NULL) -- free(r->wstptr); -- r->wstptr = NULL; -- r->wstlen = 0; -- r->flags &= ~WSTRCUR; --#endif /* MBS_SUPPORT */ -+ free_wstr(l); - } else { - char *nval; - size_t nlen = l->stlen + r->stlen + 2; diff --git a/sys-apps/gawk/files/gawk-3.1.5-utf-8-strcat.patch b/sys-apps/gawk/files/gawk-3.1.5-utf-8-strcat.patch deleted file mode 100644 index e4fb68608807..000000000000 --- a/sys-apps/gawk/files/gawk-3.1.5-utf-8-strcat.patch +++ /dev/null @@ -1,47 +0,0 @@ -Ripped from Debian's gawk_3.1.5.dfsg-4.diff.gz - -#! /bin/sh -e -## 20_eval.c-utf-8-strcat.dpatch -## -## DP: Description: Fix handling of string concatenation with multi-byte strings. (#347490) -## DP: Author: Karel Zak and Aharon Robbins -## DP: Upstream status: Unclear - in discussion -## DP: URL: http://lists.gnu.org/archive/html/bug-gnu-utils/2006-02/msg00023.html -## DP: Date: 2006-02-10 - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./eval.c /tmp/dpep-work.D8ZI7f/gawk-3.1.5/eval.c ---- ./eval.c 2006-04-18 03:07:14.000000000 +0100 -+++ /tmp/dpep-work.D8ZI7f/gawk-3.1.5/eval.c 2006-04-18 03:07:52.000000000 +0100 -@@ -1176,6 +1176,13 @@ - memcpy(l->stptr + l->stlen, r->stptr, r->stlen); - l->stlen += r->stlen; - l->stptr[l->stlen] = '\0'; -+#if defined MBS_SUPPORT -+ if (l->wstptr != NULL) -+ free(l->wstptr); -+ l->wstptr = NULL; -+ l->wstlen = 0; -+ l->flags &= ~WSTRCUR; -+#endif /* MBS_SUPPORT */ - } else { - char *nval; - size_t nlen = l->stlen + r->stlen + 2; diff --git a/sys-apps/gawk/gawk-3.1.5-r3.ebuild b/sys-apps/gawk/gawk-3.1.5-r3.ebuild deleted file mode 100644 index 57d1a870f827..000000000000 --- a/sys-apps/gawk/gawk-3.1.5-r3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.5-r3.ebuild,v 1.11 2007/07/09 03:36:08 jer Exp $ - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="GNU awk pattern-matching language" -HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html" -SRC_URI="mirror://gnu/gawk/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="nls" - -RDEPEND="" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -SFFS=${WORKDIR}/filefuncs - -src_unpack() { - unpack ${P}.tar.gz - - # Copy filefuncs module's source over ... - cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed" - - cd "${S}" - epatch "${FILESDIR}"/${P}-core.patch - epatch "${FILESDIR}"/${P}-gcc4.patch - epatch "${FILESDIR}"/${P}-autotools-crap.patch #139397 - # Patches from Fedora - epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch - epatch "${FILESDIR}"/${P}-fieldwidths.patch #127163 - epatch "${FILESDIR}"/${P}-binmode.patch - epatch "${FILESDIR}"/${P}-num2str.patch - epatch "${FILESDIR}"/${P}-internal.patch - epatch "${FILESDIR}"/${P}-numflags.patch - epatch "${FILESDIR}"/${P}-syntaxerror.patch - epatch "${FILESDIR}"/${P}-wconcat.patch - epatch "${FILESDIR}"/${P}-freewstr.patch #135931 -} - -src_compile() { - econf \ - --bindir=/bin \ - --libexec='$(libdir)/misc' \ - $(use_enable nls) \ - --enable-switch \ - || die - emake || die "emake failed" - - cd "${SFFS}" - emake CC=$(tc-getCC) || die "filefuncs emake failed" -} - -src_install() { - make install DESTDIR="${D}" || die "install failed" - cd "${SFFS}" - make LIBDIR="$(get_libdir)" install || die "filefuncs install failed" - - dodir /usr/bin - # In some rare cases, (p)gawk gets installed as (p)gawk- and not - # (p)gawk-${PV} ... Also make sure that /bin/(p)gawk is a symlink - # to /bin/(p)gawk-${PV}. - local binpath x - for x in gawk pgawk igawk ; do - [[ ${x} == "gawk" ]] \ - && binpath="/bin" \ - || binpath="/usr/bin" - - if [[ -f ${D}/bin/${x} && ! -f ${D}/bin/${x}-${PV} ]] ; then - mv -f "${D}"/bin/${x} "${D}"/${binpath}/${x}-${PV} - elif [[ -f ${D}/bin/${x}- && ! -f ${D}/bin/${x}-${PV} ]] ; then - mv -f "${D}"/bin/${x}- "${D}"/${binpath}/${x}-${PV} - elif [[ ${binpath} == "/usr/bin" && -f ${D}/bin/${x}-${PV} ]] ; then - mv -f "${D}"/bin/${x}-${PV} "${D}"/${binpath}/${x}-${PV} - fi - - rm -f "${D}"/bin/${x} - dosym ${x}-${PV} ${binpath}/${x} - [[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x} - done - - rm -f "${D}"/bin/awk - dodir /usr/bin - # Compat symlinks - dosym /bin/gawk-${PV} /usr/bin/gawk - dosym gawk-${PV} /bin/awk - dosym /bin/gawk-${PV} /usr/bin/awk - [[ ${USERLAND} != "GNU" ]] && rm -f "${D}"/{,usr/}bin/awk{,-${PV}} - - # Install headers - insinto /usr/include/awk - doins "${S}"/*.h || die "ins headers failed" - # We do not want 'acconfig.h' in there ... - rm -f "${D}"/usr/include/awk/acconfig.h - - cd "${S}" - rm -f "${D}"/usr/share/man/man1/pgawk.1 - dosym gawk.1 /usr/share/man/man1/pgawk.1 - [[ ${USERLAND} == "GNU" ]] && dosym gawk.1 /usr/share/man/man1/awk.1 - dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README - docinto README_d - dodoc README_d/* - docinto awklib - dodoc awklib/ChangeLog - docinto pc - dodoc pc/ChangeLog - docinto posix - dodoc posix/ChangeLog -} diff --git a/sys-apps/gawk/gawk-3.1.5-r4.ebuild b/sys-apps/gawk/gawk-3.1.5-r4.ebuild deleted file mode 100644 index c4071a5d5628..000000000000 --- a/sys-apps/gawk/gawk-3.1.5-r4.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.5-r4.ebuild,v 1.3 2007/08/25 15:54:29 vapier Exp $ - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="GNU awk pattern-matching language" -HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html" -SRC_URI="mirror://gnu/gawk/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="nls" - -RDEPEND="" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -SFFS=${WORKDIR}/filefuncs - -src_unpack() { - unpack ${P}.tar.gz - - # Copy filefuncs module's source over ... - cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed" - - cd "${S}" - epatch "${FILESDIR}"/${P}-core.patch - epatch "${FILESDIR}"/${P}-gcc4.patch - epatch "${FILESDIR}"/${P}-autotools-crap.patch #139397 - # Patches from Fedora - epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch - epatch "${FILESDIR}"/${P}-fieldwidths.patch #127163 - epatch "${FILESDIR}"/${P}-binmode.patch - epatch "${FILESDIR}"/${P}-num2str.patch - epatch "${FILESDIR}"/${P}-internal.patch - epatch "${FILESDIR}"/${P}-numflags.patch - epatch "${FILESDIR}"/${P}-syntaxerror.patch - epatch "${FILESDIR}"/${P}-wconcat.patch - epatch "${FILESDIR}"/${P}-freewstr.patch #135931 -} - -src_compile() { - local bindir=/usr/bin - use userland_GNU && bindir=/bin - econf \ - --bindir=${bindir} \ - --libexec='$(libdir)/misc' \ - $(use_enable nls) \ - --enable-switch \ - || die - emake || die "emake failed" - - cd "${SFFS}" - emake CC=$(tc-getCC) || die "filefuncs emake failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "install failed" - cd "${SFFS}" - emake LIBDIR="$(get_libdir)" install || die "filefuncs install failed" - - dodir /usr/bin - # In some rare cases, (p)gawk gets installed as (p)gawk- and not - # (p)gawk-${PV} ... Also make sure that /bin/(p)gawk is a symlink - # to /bin/(p)gawk-${PV}. - local bindir=/usr/bin binpath= x= - use userland_GNU && bindir=/bin - for x in gawk pgawk igawk ; do - [[ ${x} == "gawk" ]] \ - && binpath=${bindir} \ - || binpath=/usr/bin - - if [[ -f ${D}/${bindir}/${x} && ! -f ${D}/${bindir}/${x}-${PV} ]] ; then - mv -f "${D}"/${bindir}/${x} "${D}"/${binpath}/${x}-${PV} - elif [[ -f ${D}/${bindir}/${x}- && ! -f ${D}/${bindir}/${x}-${PV} ]] ; then - mv -f "${D}"/${bindir}/${x}- "${D}"/${binpath}/${x}-${PV} - elif [[ ${binpath} == "/usr/bin" && -f ${D}/${bindir}/${x}-${PV} ]] ; then - mv -f "${D}"/${bindir}/${x}-${PV} "${D}"/${binpath}/${x}-${PV} - fi - - rm -f "${D}"/${bindir}/${x} - [[ -x "${D}"/${binpath}/${x}-${PV} ]] && dosym ${x}-${PV} ${binpath}/${x} - if use userland_GNU ; then - [[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x} - fi - done - - rm -f "${D}"/bin/awk - dodir /usr/bin - # Compat symlinks - dosym gawk-${PV} ${bindir}/awk - dosym ${bindir}/gawk-${PV} /usr/bin/awk - if use userland_GNU ; then - dosym /bin/gawk-${PV} /usr/bin/gawk - else - rm -f "${D}"/{,usr/}bin/awk{,-${PV}} - fi - - # Install headers - insinto /usr/include/awk - doins "${S}"/*.h || die "ins headers failed" - # We do not want 'acconfig.h' in there ... - rm -f "${D}"/usr/include/awk/acconfig.h - - cd "${S}" - rm -f "${D}"/usr/share/man/man1/pgawk.1 - dosym gawk.1 /usr/share/man/man1/pgawk.1 - if use userland_GNU ; then - dosym gawk.1 /usr/share/man/man1/awk.1 - fi - dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README - docinto README_d - dodoc README_d/* - docinto awklib - dodoc awklib/ChangeLog - docinto pc - dodoc pc/ChangeLog - docinto posix - dodoc posix/ChangeLog -} |