version bump as per bug #157715.

(Portage version: 2.1.2.2)

7 files changed, 1424 insertions, 13 deletions

diff --git a/net-analyzer/authforce/ChangeLog b/net-analyzer/authforce/ChangeLog
index 8adef51de864..ebd383faee11 100644
--- a/net-analyzer/authforce/ChangeLog
+++ b/net-analyzer/authforce/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/authforce
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/ChangeLog,v 1.7 2007/02/09 03:59:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/ChangeLog,v 1.8 2007/04/17 11:19:59 dragonheart Exp $
+
+*authforce-0.9.8 (17 Apr 2007)
+
+  17 Apr 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/authforce-0.9.8-autoconfupdate.patch,
+  +files/authforce-0.9.8-gettext.patch, +files/authforce-0.9.8-malloc.patch,
+  authforce-0.9.6.ebuild, +authforce-0.9.8.ebuild:
+  version bump as per bug #157715. Thanks upstream for the fixes and me for
+  far too much time hacking it.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-analyzer/authforce/authforce-0.9.6.ebuild b/net-analyzer/authforce/authforce-0.9.6.ebuild
index 33e1cf263310..4664b871171c 100644
--- a/net-analyzer/authforce/authforce-0.9.6.ebuild
+++ b/net-analyzer/authforce/authforce-0.9.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/authforce-0.9.6.ebuild,v 1.5 2004/07/15 08:10:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/authforce-0.9.6.ebuild,v 1.6 2007/04/17 11:19:59 dragonheart Exp $
 
 DESCRIPTION="An HTTP authentication brute forcer"
-HOMEPAGE="http://kapheine.hypa.net/authforce/"
-SRC_URI="http://kapheine.hypa.net/authforce/authforce-0.9.6.tar.gz"
+HOMEPAGE="http://www.divineinvasion.net/authforce"
+SRC_URI="http://www.divineinvasion.net/authforce/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,11 +20,11 @@ src_compile() {
 	emake || die
 }
 
-src_install() {
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS README THANKS TODO
-	dobin src/authforce
-	doman doc/authforce.1.gz
-	doinfo doc/authforce.info
-	insinto /usr/share/${P}
-	doins data/*.lst
-}
+#src_install() {
+#	dodoc ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS README THANKS TODO
+#	dobin src/authforce
+#	doman doc/authforce.1.gz
+#	doinfo doc/authforce.info
+#	insinto /usr/share/${P}
+#	doins data/*.lst
+#}
diff --git a/net-analyzer/authforce/authforce-0.9.8.ebuild b/net-analyzer/authforce/authforce-0.9.8.ebuild
new file mode 100644
index 000000000000..5024b31255dc
--- /dev/null
+++ b/net-analyzer/authforce/authforce-0.9.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/authforce-0.9.8.ebuild,v 1.1 2007/04/17 11:19:59 dragonheart Exp $
+
+inherit autotools
+
+DESCRIPTION="An HTTP authentication brute forcer"
+HOMEPAGE="http://www.divineinvasion.net/authforce"
+SRC_URI="http://www.divineinvasion.net/authforce/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl nls"
+DEPEND="sys-libs/readline
+	nls? ( sys-devel/gettext )
+	curl? ( net-misc/curl )"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-autoconfupdate.patch
+	epatch "${FILESDIR}"/${P}-gettext.patch
+	epatch "${FILESDIR}"/${P}-malloc.patch
+	cd "${S}"
+	touch ChangeLog
+	eautoreconf
+	chmod a+x configure
+}
+
+src_compile() {
+	econf  $(use_with curl) $(use_enable nls) --with-path=/usr/share/${PN}/data:. || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS README THANKS TODO
+}
diff --git a/net-analyzer/authforce/files/authforce-0.9.8-autoconfupdate.patch b/net-analyzer/authforce/files/authforce-0.9.8-autoconfupdate.patch
new file mode 100644
index 000000000000..8fdcdfcea2df
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.8-autoconfupdate.patch
@@ -0,0 +1,431 @@
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/Makefile.am ../authforce-0.9.8/Makefile.am
+--- authforce-0.9.8/Makefile.am	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/Makefile.am	2007-04-17 06:22:05.000000000 +1000
+@@ -2,14 +2,11 @@
+ # $Date: 2007/04/17 11:19:59 $
+ # $Revision: 1.1 $
+ 
+-EXTRA_DIST = BUGS TODO THANKS ChangeLog \
++EXTRA_DIST = config.rpath m4/ChangeLog  BUGS TODO THANKS ChangeLog \
+ 	authforce.spec.in authforce.spec \
+ 	authforcerc.sample
+ 
+-SUBDIRS = intl data src doc po
++SUBDIRS = data src doc po
+ 
+ 
+-distbz2: distdir
+-	-chmod -R a+r $(distdir)
+-	$(TAR) choyf $(distdir).tar.bz2 $(distdir)
+-	-rm -rf $(distdir)
++ACLOCAL_AMFLAGS = -I m4
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/acconfig.h ../authforce-0.9.8/acconfig.h
+--- authforce-0.9.8/acconfig.h	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/acconfig.h	1970-01-01 10:00:00.000000000 +1000
+@@ -1,11 +0,0 @@
+-#undef ENABLE_NLS
+-#undef HAVE_CATGETS
+-#undef HAVE_GETTEXT
+-#undef HAVE_LC_MESSAGES
+-#undef HAVE_STPCPY
+-#undef HAVE_LIBSM
+-#undef PACKAGE_LOCALE_DIR
+-#undef PACKAGE_DATA_DIR
+-#undef PACKAGE_SOURCE_DIR
+-#undef DEFAULT_PATH
+-#undef DEFAULT_CONFIG
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/configure.in ../authforce-0.9.8/configure.in
+--- authforce-0.9.8/configure.in	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/configure.in	2007-04-17 06:13:35.000000000 +1000
+@@ -1,20 +1,13 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(src/main.c)
+ 
+-MAJOR_VERSION=0
+-MINOR_VERSION=9
+-MICRO_VERSION=6
+-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
+-AC_SUBST(MAJOR_VERSION)
+-AC_SUBST(MINOR_VERSION)
+-AC_SUBST(MICRO_VERSION)
+-AC_SUBST(VERSION)
++AC_INIT([authforce],[0.9.6],[kapheine@divineinvasion.net])
++AC_CANONICAL_TARGET
++AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2])
+ 
+-AM_INIT_AUTOMAKE(authforce, $VERSION)
+-
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AM_WITH_DMALLOC
++AM_GNU_GETTEXT([external])
+ 
+ dnl Add the languages which your application supports here.
+ ALL_LINGUAS="nl"
+@@ -22,10 +15,8 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+-AC_ARG_PROGRAM
+ AC_PROG_INSTALL
+ 
+-AM_GNU_GETTEXT
+ 
+ curl=yes
+ AC_ARG_WITH(curl,
+@@ -76,7 +67,7 @@
+ AUTHFORCE_PATH=".:/usr/local/share/authforce/data:../data"
+ AUTHFORCE_CONFIG="/usr/local/etc/authforcerc:~/.authforcerc"
+ dnl AC_DEFINE_UNQUOTED(DEFAULT_PATH, "${AUTHFORCE_PATH}")
+-AC_DEFINE_UNQUOTED(DEFAULT_CONFIG,"${AUTHFORCE_CONFIG}")
++AC_DEFINE_UNQUOTED(DEFAULT_CONFIG,"${AUTHFORCE_CONFIG}", [Authforce config files])
+ 
+ AC_ARG_WITH(path, [  --with-path=PATH        change default path])
+ 
+@@ -84,7 +75,7 @@
+ 
+ if test "x$with_path" != "x"
+ then
+-  AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$with_path")
++  AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$with_path", [Authforce path])
+ else
+   AC_DEFINE_UNQUOTED(DEFAULT_PATH, "${AUTHFORCE_PATH}")
+ fi
+@@ -93,7 +84,6 @@
+ Makefile
+ src/Makefile
+ doc/Makefile
+-intl/Makefile
+ po/Makefile.in
+ data/Makefile
+ authforce.spec
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/Makefile.am ../authforce-0.9.8/src/Makefile.am
+--- authforce-0.9.8/src/Makefile.am	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/src/Makefile.am	2007-04-17 06:13:54.000000000 +1000
+@@ -23,4 +23,4 @@
+ 	signal.c \
+ 	extern.h
+ 
+-authforce_LDADD = @INTLLIBS@
++authforce_LDADD = @LIBINTL@
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/debug.c ../authforce-0.9.8/src/debug.c
+--- authforce-0.9.8/src/debug.c	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/src/debug.c	2007-04-17 06:41:06.000000000 +1000
+@@ -7,7 +7,6 @@
+ #include "memwatch.h"
+ #endif /* MEMWATCH*/
+ #include "extern.h"
+-#include <libintl.h>
+ 
+ 
+ /* debug_level: print debugging messages of this level and lower, based on
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/extern.h ../authforce-0.9.8/src/extern.h
+--- authforce-0.9.8/src/extern.h	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/src/extern.h	2007-04-17 06:29:30.000000000 +1000
+@@ -2,13 +2,7 @@
+ 
+ /* main.c */
+ #include <config.h>
+-#include <libintl.h>
+-#ifdef ENABLE_NLS
+-#include <libintl.h>
+-#define _(String) gettext (String)
+-#else
+-#define _(String) (String)
+-#endif
++#include "gettext.h"
+ 
+ /* command line configurable variables */
+ extern char datafile_path[60];          /* location of data files */
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/gettext.h ../authforce-0.9.8/src/gettext.h
+--- authforce-0.9.8/src/gettext.h	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/src/gettext.h	2007-04-17 06:18:50.000000000 +1000
+@@ -0,0 +1,265 @@
++/* Convenience header for conditional use of GNU <libintl.h>.
++   Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify it
++   under the terms of the GNU Library General Public License as published
++   by the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++
++   You should have received a copy of the GNU Library General Public
++   License along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
++   USA.  */
++
++#ifndef _LIBGETTEXT_H
++#define _LIBGETTEXT_H 1
++
++/* NLS can be disabled through the configure --disable-nls option.  */
++#if ENABLE_NLS
++
++/* Get declarations of GNU message catalog functions.  */
++# include <libintl.h>
++
++/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
++   the gettext() and ngettext() macros.  This is an alternative to calling
++   textdomain(), and is useful for libraries.  */
++# ifdef DEFAULT_TEXT_DOMAIN
++#  undef gettext
++#  define gettext(Msgid) \
++     dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
++#  undef ngettext
++#  define ngettext(Msgid1, Msgid2, N) \
++     dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
++# endif
++
++#else
++
++/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
++   chokes if dcgettext is defined as a macro.  So include it now, to make
++   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
++   as well because people using "gettext.h" will not include <libintl.h>,
++   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
++   is OK.  */
++#if defined(__sun)
++# include <locale.h>
++#endif
++
++/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
++   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
++   it now, to make later inclusions of <libintl.h> a NOP.  */
++#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
++# include <cstdlib>
++# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
++#  include <libintl.h>
++# endif
++#endif
++
++/* Disabled NLS.
++   The casts to 'const char *' serve the purpose of producing warnings
++   for invalid uses of the value returned from these functions.
++   On pre-ANSI systems without 'const', the config.h file is supposed to
++   contain "#define const".  */
++# define gettext(Msgid) ((const char *) (Msgid))
++# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
++# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
++# define ngettext(Msgid1, Msgid2, N) \
++    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
++# define dngettext(Domainname, Msgid1, Msgid2, N) \
++    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
++# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
++    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
++# define textdomain(Domainname) ((const char *) (Domainname))
++# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
++# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
++
++#endif
++
++/* A pseudo function call that serves as a marker for the automated
++   extraction of messages, but does not call gettext().  The run-time
++   translation is done at a different place in the code.
++   The argument, String, should be a literal string.  Concatenated strings
++   and other string expressions won't work.
++   The macro's expansion is not parenthesized, so that it is suitable as
++   initializer for static 'char[]' or 'const char[]' variables.  */
++#define gettext_noop(String) String
++
++/* The separator between msgctxt and msgid in a .mo file.  */
++#define GETTEXT_CONTEXT_GLUE "\004"
++
++/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
++   MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
++   short and rarely need to change.
++   The letter 'p' stands for 'particular' or 'special'.  */
++#ifdef DEFAULT_TEXT_DOMAIN
++# define pgettext(Msgctxt, Msgid) \
++   pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
++#else
++# define pgettext(Msgctxt, Msgid) \
++   pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
++#endif
++#define dpgettext(Domainname, Msgctxt, Msgid) \
++  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
++#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
++  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
++#ifdef DEFAULT_TEXT_DOMAIN
++# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
++   npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
++#else
++# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
++   npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
++#endif
++#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
++  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
++#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
++  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
++
++#ifdef __GNUC__
++__inline
++#else
++#ifdef __cplusplus
++inline
++#endif
++#endif
++static const char *
++pgettext_aux (const char *domain,
++	      const char *msg_ctxt_id, const char *msgid,
++	      int category)
++{
++  const char *translation = dcgettext (domain, msg_ctxt_id, category);
++  if (translation == msg_ctxt_id)
++    return msgid;
++  else
++    return translation;
++}
++
++#ifdef __GNUC__
++__inline
++#else
++#ifdef __cplusplus
++inline
++#endif
++#endif
++static const char *
++npgettext_aux (const char *domain,
++	       const char *msg_ctxt_id, const char *msgid,
++	       const char *msgid_plural, unsigned long int n,
++	       int category)
++{
++  const char *translation =
++    dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
++  if (translation == msg_ctxt_id || translation == msgid_plural)
++    return (n == 1 ? msgid : msgid_plural);
++  else
++    return translation;
++}
++
++/* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
++   can be arbitrary expressions.  But for string literals these macros are
++   less efficient than those above.  */
++
++#include <string.h>
++
++#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
++  (__GNUC__ >= 3 || __GNUG__ >= 2 /* || __STDC_VERSION__ >= 199901L */ )
++
++#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
++#include <stdlib.h>
++#endif
++
++#define pgettext_expr(Msgctxt, Msgid) \
++  dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
++#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
++  dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
++
++#ifdef __GNUC__
++__inline
++#else
++#ifdef __cplusplus
++inline
++#endif
++#endif
++static const char *
++dcpgettext_expr (const char *domain,
++		 const char *msgctxt, const char *msgid,
++		 int category)
++{
++  size_t msgctxt_len = strlen (msgctxt) + 1;
++  size_t msgid_len = strlen (msgid) + 1;
++  const char *translation;
++#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
++  char msg_ctxt_id[msgctxt_len + msgid_len];
++#else
++  char buf[1024];
++  char *msg_ctxt_id =
++    (msgctxt_len + msgid_len <= sizeof (buf)
++     ? buf
++     : (char *) malloc (msgctxt_len + msgid_len));
++  if (msg_ctxt_id != NULL)
++#endif
++    {
++      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
++      msg_ctxt_id[msgctxt_len - 1] = '\004';
++      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
++      translation = dcgettext (domain, msg_ctxt_id, category);
++#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
++      if (msg_ctxt_id != buf)
++	free (msg_ctxt_id);
++#endif
++      if (translation != msg_ctxt_id)
++	return translation;
++    }
++  return msgid;
++}
++
++#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
++  dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
++#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
++  dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
++
++#ifdef __GNUC__
++__inline
++#else
++#ifdef __cplusplus
++inline
++#endif
++#endif
++static const char *
++dcnpgettext_expr (const char *domain,
++		  const char *msgctxt, const char *msgid,
++		  const char *msgid_plural, unsigned long int n,
++		  int category)
++{
++  size_t msgctxt_len = strlen (msgctxt) + 1;
++  size_t msgid_len = strlen (msgid) + 1;
++  const char *translation;
++#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
++  char msg_ctxt_id[msgctxt_len + msgid_len];
++#else
++  char buf[1024];
++  char *msg_ctxt_id =
++    (msgctxt_len + msgid_len <= sizeof (buf)
++     ? buf
++     : (char *) malloc (msgctxt_len + msgid_len));
++  if (msg_ctxt_id != NULL)
++#endif
++    {
++      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
++      msg_ctxt_id[msgctxt_len - 1] = '\004';
++      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
++      translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
++#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
++      if (msg_ctxt_id != buf)
++	free (msg_ctxt_id);
++#endif
++      if (!(translation == msg_ctxt_id || translation == msgid_plural))
++	return translation;
++    }
++  return (n == 1 ? msgid : msgid_plural);
++}
++
++#endif /* _LIBGETTEXT_H */
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/main.c ../authforce-0.9.8/src/main.c
+--- authforce-0.9.8/src/main.c	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/src/main.c	2007-04-17 06:48:11.000000000 +1000
+@@ -7,11 +7,17 @@
+ #include <string.h>
+ #include <time.h>
+ #include <getopt.h>
++#include "gettext.h"
+ #ifdef MEMWATCH
+ #include "memwatch.h"
+ #endif /* MEMWATCH */
+ #include "extern.h"
+-#include <libintl.h>
++#ifdef ENABLE_NLS
++#define _(x) dgettext(PACKAGE_NAME, x)
++#else
++#define _(x) (x)
++#endif
++
+ 
+ static const char *program_name = PACKAGE;
+ static const char *author = "Zachary P. Landau";
diff --git a/net-analyzer/authforce/files/authforce-0.9.8-gettext.patch b/net-analyzer/authforce/files/authforce-0.9.8-gettext.patch
new file mode 100644
index 000000000000..573efa34e42b
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.8-gettext.patch
@@ -0,0 +1,895 @@
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/Makevars ../authforce-0.9.8/po/Makevars
+--- authforce-0.9.8/po/Makevars	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/Makevars	2007-04-17 07:01:11.000000000 +1000
+@@ -0,0 +1,7 @@
++DOMAIN = $(PACKAGE)
++subdir = po
++top_builddir = ..
++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
++COPYRIGHT_HOLDER = Various
++MSGID_BUGS_ADDRESS = kapheine@divineinvasion.net
++EXTRA_LOCALE_CATEGORIES =
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/Rules-quot ../authforce-0.9.8/po/Rules-quot
+--- authforce-0.9.8/po/Rules-quot	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/Rules-quot	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,47 @@
++# Special Makefile rules for English message catalogs with quotation marks.
++
++DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
++
++.SUFFIXES: .insert-header .po-update-en
++
++en@quot.po-create:
++	$(MAKE) en@quot.po-update
++en@boldquot.po-create:
++	$(MAKE) en@boldquot.po-update
++
++en@quot.po-update: en@quot.po-update-en
++en@boldquot.po-update: en@boldquot.po-update-en
++
++.insert-header.po-update-en:
++	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
++	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
++	tmpdir=`pwd`; \
++	echo "$$lang:"; \
++	ll=`echo $$lang | sed -e 's/@.*//'`; \
++	LC_ALL=C; export LC_ALL; \
++	cd $(srcdir); \
++	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
++	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
++	    rm -f $$tmpdir/$$lang.new.po; \
++	  else \
++	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
++	      :; \
++	    else \
++	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
++	      exit 1; \
++	    fi; \
++	  fi; \
++	else \
++	  echo "creation of $$lang.po failed!" 1>&2; \
++	  rm -f $$tmpdir/$$lang.new.po; \
++	fi
++
++en@quot.insert-header: insert-header.sin
++	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
++
++en@boldquot.insert-header: insert-header.sin
++	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
++
++mostlyclean: mostlyclean-quot
++mostlyclean-quot:
++	rm -f *.insert-header
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/boldquot.sed ../authforce-0.9.8/po/boldquot.sed
+--- authforce-0.9.8/po/boldquot.sed	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/boldquot.sed	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,10 @@
++s/"\([^"]*\)"/“\1”/g
++s/`\([^`']*\)'/‘\1’/g
++s/ '\([^`']*\)' / ‘\1’ /g
++s/ '\([^`']*\)'$/ ‘\1’/g
++s/^'\([^`']*\)' /‘\1’ /g
++s/“”/""/g
++s/“/“/g
++s/”/”/g
++s/‘/‘/g
++s/’/’/g
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/cat-id-tbl.c ../authforce-0.9.8/po/cat-id-tbl.c
+--- authforce-0.9.8/po/cat-id-tbl.c	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/po/cat-id-tbl.c	1970-01-01 10:00:00.000000000 +1000
+@@ -1,73 +0,0 @@
+-/* Automatically generated by po2tbl.sed from authforce.pot.  */
+-
+-#if HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include "libgettext.h"
+-
+-const struct _msg_ent _msg_tbl[] = {
+-  {"", 1},
+-  {"\
+-usage: %s [OPTION]... URL\n\
+-\n", 2},
+-  {"options:\n", 3},
+-  {"\
+-\t-b,\t--beep\t\t\tbeep when a match is found\n\
+-\t-d,\t--debug=NUMBER\t\t\tlevel of debugging\n\
+-\t\t--dummy-file=FILE\tfile containing dummy matches\n\
+-\t\t\t\t\t[username:password form]\n\
+-\t-h,\t--help\t\t\tdisplay this help and exit\n\
+-\t-l,\t--logfile=FILE\t\tset logfile to FILE\n\
+-\t-r,\t--resume[=FILE]\t\tresume old session using FILE\n\
+-\t\t\t\t\t[default session.save]\n\
+-\t-s,\t--save[=FILE]\t\tsave session on SIGUSR1 to FILE\n\
+-\t\t\t\t\t[default session.save]\n\
+-\t-c,\t--max-connects=NUMBER\tdon't make more than NUMBER connections\n\
+-\t-u,\t--max-users=NUMBER\tdon't try more than NUMBER users\n\
+-\t-U,\t--user-agent=STRING\tset user agent to STRING\n\
+-\t\t--pairs-file=FILE\tfile containing username:password pairs\n\
+-\t\t--password-delay=NUMBER\tdelay for # seconds between attempts\n\
+-\t\t--password-file=FILE\tfile containing common passwords\n\
+-\t-p,\t--path=STRING\t\tlook for pathlist STRING\n\
+-\t-P,\t--proxy=STRING\t\tset proxy to STRING\n\
+-\t\t--auth-digest\t\tuse auth digest method\n\
+-\t\t--no-ssl-fail\t\tdon't fail with self signed certs\n\
+-\t-q,\t--quiet\t\t\tdon't output to stdout\n\
+-\t\t--user-delay=NUMBER\tdelay for # seconds between usernames\n\
+-\t\t--username-file=FILE\tfile containing list of usernames\n\
+-\t\t--verbose\t\tbe verbose (default), opposite of --quiet\n\
+-\t-V,\t--version\t\tprint version information and exit\n", 4},
+-  {"\
+-\n\
+-Report bugs to <%s>.\n", 5},
+-  {"%s: Missing arguments\n", 6},
+-  {"Try %s --help for more information.\n", 7},
+-  {"\
+-%s %s\n\
+-\n\
+-Copyright (C) 2000 %s\n\
+-There is NO warranty.  You may redistribute this software\n\
+-under the terms of the GNU General Public License.\n\
+-For more information about these matters, see the files named COPYING\n\
+-\n\
+-Written by %s <%s>.\n", 8},
+-  {"%s: missing URL\n", 9},
+-  {"\
+-Usage: %s [OPTION]... [URL]\n\
+-\n", 10},
+-  {"Try `%s --help` for more information.\n", 11},
+-  {"%s: too many URLs\n", 12},
+-  {"initialize_data: couldn't open %s\n", 13},
+-  {"scan started: %s", 14},
+-  {"scan ended: %s", 15},
+-  {"main: session_function greater than 1\n", 16},
+-  {"main: session_usernumber greater than num_lines\n", 17},
+-  {"main: session_count greater than num_lines\n", 18},
+-  {"match [%s:%s]\n", 19},
+-  {"max users reached at %i\n", 20},
+-  {"Congratulations: %i password%s found.\n", 21},
+-  {"No passwords found.\n", 22},
+-};
+-
+-int _msg_tbl_length = 22;
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/en@boldquot.header ../authforce-0.9.8/po/en@boldquot.header
+--- authforce-0.9.8/po/en@boldquot.header	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/en@boldquot.header	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,25 @@
++# All this catalog "translates" are quotation characters.
++# The msgids must be ASCII and therefore cannot contain real quotation
++# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
++# and double quote (0x22). These substitutes look strange; see
++# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
++#
++# This catalog translates grave accent (0x60) and apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019).
++# It also translates pairs of apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019)
++# and pairs of quotation mark (0x22) to
++# left double quotation mark (U+201C) and right double quotation mark (U+201D).
++#
++# When output to an UTF-8 terminal, the quotation characters appear perfectly.
++# When output to an ISO-8859-1 terminal, the single quotation marks are
++# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
++# grave/acute accent (by libiconv), and the double quotation marks are
++# transliterated to 0x22.
++# When output to an ASCII terminal, the single quotation marks are
++# transliterated to apostrophes, and the double quotation marks are
++# transliterated to 0x22.
++#
++# This catalog furthermore displays the text between the quotation marks in
++# bold face, assuming the VT100/XTerm escape sequences.
++#
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/en@quot.header ../authforce-0.9.8/po/en@quot.header
+--- authforce-0.9.8/po/en@quot.header	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/en@quot.header	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,22 @@
++# All this catalog "translates" are quotation characters.
++# The msgids must be ASCII and therefore cannot contain real quotation
++# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
++# and double quote (0x22). These substitutes look strange; see
++# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
++#
++# This catalog translates grave accent (0x60) and apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019).
++# It also translates pairs of apostrophe (0x27) to
++# left single quotation mark (U+2018) and right single quotation mark (U+2019)
++# and pairs of quotation mark (0x22) to
++# left double quotation mark (U+201C) and right double quotation mark (U+201D).
++#
++# When output to an UTF-8 terminal, the quotation characters appear perfectly.
++# When output to an ISO-8859-1 terminal, the single quotation marks are
++# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
++# grave/acute accent (by libiconv), and the double quotation marks are
++# transliterated to 0x22.
++# When output to an ASCII terminal, the single quotation marks are
++# transliterated to apostrophes, and the double quotation marks are
++# transliterated to 0x22.
++#
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/insert-header.sin ../authforce-0.9.8/po/insert-header.sin
+--- authforce-0.9.8/po/insert-header.sin	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/insert-header.sin	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,23 @@
++# Sed script that inserts the file called HEADER before the header entry.
++#
++# At each occurrence of a line starting with "msgid ", we execute the following
++# commands. At the first occurrence, insert the file. At the following
++# occurrences, do nothing. The distinction between the first and the following
++# occurrences is achieved by looking at the hold space.
++/^msgid /{
++x
++# Test if the hold space is empty.
++s/m/m/
++ta
++# Yes it was empty. First occurrence. Read the file.
++r HEADER
++# Output the file's contents by reading the next line. But don't lose the
++# current line while doing this.
++g
++N
++bb
++:a
++# The hold space was nonempty. Following occurrences. Do nothing.
++x
++:b
++}
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/quot.sed ../authforce-0.9.8/po/quot.sed
+--- authforce-0.9.8/po/quot.sed	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/quot.sed	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,6 @@
++s/"\([^"]*\)"/“\1”/g
++s/`\([^`']*\)'/‘\1’/g
++s/ '\([^`']*\)' / ‘\1’ /g
++s/ '\([^`']*\)'$/ ‘\1’/g
++s/^'\([^`']*\)' /‘\1’ /g
++s/“”/""/g
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/remove-potcdate.sin ../authforce-0.9.8/po/remove-potcdate.sin
+--- authforce-0.9.8/po/remove-potcdate.sin	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/remove-potcdate.sin	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,19 @@
++# Sed script that remove the POT-Creation-Date line in the header entry
++# from a POT file.
++#
++# The distinction between the first and the following occurrences of the
++# pattern is achieved by looking at the hold space.
++/^"POT-Creation-Date: .*"$/{
++x
++# Test if the hold space is empty.
++s/P/P/
++ta
++# Yes it was empty. First occurrence. Remove the line.
++g
++d
++bb
++:a
++# The hold space was nonempty. Following occurrences. Do nothing.
++x
++:b
++}
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/stamp-cat-id ../authforce-0.9.8/po/stamp-cat-id
+--- authforce-0.9.8/po/stamp-cat-id	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/po/stamp-cat-id	1970-01-01 10:00:00.000000000 +1000
+@@ -1 +0,0 @@
+-timestamp
+diff --exclude-from=exclude-from -ruN authforce-0.9.8/po/stamp-po ../authforce-0.9.8/po/stamp-po
+--- authforce-0.9.8/po/stamp-po	1970-01-01 10:00:00.000000000 +1000
++++ ../authforce-0.9.8/po/stamp-po	2007-04-17 06:48:14.000000000 +1000
+@@ -0,0 +1 @@
++timestamp
+--- authforce-0.9.8/config.rpath	2007-04-13 19:43:52.790087191 +1000
++++ ../authforce-0.9.8/config.rpath	2007-04-17 06:29:36.000000000 +1000
+@@ -0,0 +1,614 @@
++#! /bin/sh
++# Output a system dependent set of variables, describing how to set the
++# run time search path of shared libraries in an executable.
++#
++#   Copyright 1996-2006 Free Software Foundation, Inc.
++#   Taken from GNU libtool, 2001
++#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++#   This file is free software; the Free Software Foundation gives
++#   unlimited permission to copy and/or distribute it, with or without
++#   modifications, as long as this notice is preserved.
++#
++# The first argument passed to this file is the canonical host specification,
++#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
++# or
++#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
++# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
++# should be set by the caller.
++#
++# The set of defined variables is at the end of this script.
++
++# Known limitations:
++# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
++#   than 256 bytes, otherwise the compiler driver will dump core. The only
++#   known workaround is to choose shorter directory names for the build
++#   directory and/or the installation directory.
++
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++shrext=.so
++
++host="$1"
++host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++# Code taken from libtool.m4's _LT_CC_BASENAME.
++
++for cc_temp in $CC""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
++
++# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
++
++wl=
++if test "$GCC" = yes; then
++  wl='-Wl,'
++else
++  case "$host_os" in
++    aix*)
++      wl='-Wl,'
++      ;;
++    darwin*)
++      case $cc_basename in
++        xlc*)
++          wl='-Wl,'
++          ;;
++      esac
++      ;;
++    mingw* | pw32* | os2*)
++      ;;
++    hpux9* | hpux10* | hpux11*)
++      wl='-Wl,'
++      ;;
++    irix5* | irix6* | nonstopux*)
++      wl='-Wl,'
++      ;;
++    newsos6)
++      ;;
++    linux*)
++      case $cc_basename in
++        icc* | ecc*)
++          wl='-Wl,'
++          ;;
++        pgcc | pgf77 | pgf90)
++          wl='-Wl,'
++          ;;
++        ccc*)
++          wl='-Wl,'
++          ;;
++        como)
++          wl='-lopt='
++          ;;
++        *)
++          case `$CC -V 2>&1 | sed 5q` in
++            *Sun\ C*)
++              wl='-Wl,'
++              ;;
++          esac
++          ;;
++      esac
++      ;;
++    osf3* | osf4* | osf5*)
++      wl='-Wl,'
++      ;;
++    sco3.2v5*)
++      ;;
++    solaris*)
++      wl='-Wl,'
++      ;;
++    sunos4*)
++      wl='-Qoption ld '
++      ;;
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      wl='-Wl,'
++      ;;
++    sysv4*MP*)
++      ;;
++    unicos*)
++      wl='-Wl,'
++      ;;
++    uts4*)
++      ;;
++  esac
++fi
++
++# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
++
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++
++case "$host_os" in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # Set some defaults for GNU ld with shared library support. These
++  # are reset later if shared libraries are not supported. Putting them
++  # here allows them to be overridden if necessary.
++  # Unlike libtool, we use -rpath here, not --rpath, since the documented
++  # option of GNU ld is called -rpath, not --rpath.
++  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++  case "$host_os" in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++        ld_shlibs=no
++      fi
++      ;;
++    amigaos*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we cannot use
++      # them.
++      ld_shlibs=no
++      ;;
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    cygwin* | mingw* | pw32*)
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    interix3*)
++      hardcode_direct=no
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      ;;
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    netbsd*)
++      ;;
++    solaris*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++        ld_shlibs=no
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++          ld_shlibs=no
++          ;;
++        *)
++          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++          else
++            ld_shlibs=no
++          fi
++          ;;
++      esac
++      ;;
++    sunos4*)
++      hardcode_direct=yes
++      ;;
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        :
++      else
++        ld_shlibs=no
++      fi
++      ;;
++  esac
++  if test "$ld_shlibs" = no; then
++    hardcode_libdir_flag_spec=
++  fi
++else
++  case "$host_os" in
++    aix3*)
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes; then
++        # Neither direct hardcoding nor static linking is supported with a
++        # broken collect2.
++        hardcode_direct=unsupported
++      fi
++      ;;
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++        # On IA64, the linker does run time linking by default, so we don't
++        # have to do anything special.
++        aix_use_runtimelinking=no
++      else
++        aix_use_runtimelinking=no
++        # Test if we are trying to use run time linking or normal
++        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++        # need to do runtime linking.
++        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++          for ld_flag in $LDFLAGS; do
++            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++              aix_use_runtimelinking=yes
++              break
++            fi
++          done
++          ;;
++        esac
++      fi
++      hardcode_direct=yes
++      hardcode_libdir_separator=':'
++      if test "$GCC" = yes; then
++        case $host_os in aix4.[012]|aix4.[012].*)
++          collect2name=`${CC} -print-prog-name=collect2`
++          if test -f "$collect2name" && \
++            strings "$collect2name" | grep resolve_lib_name >/dev/null
++          then
++            # We have reworked collect2
++            hardcode_direct=yes
++          else
++            # We have old collect2
++            hardcode_direct=unsupported
++            hardcode_minus_L=yes
++            hardcode_libdir_flag_spec='-L$libdir'
++            hardcode_libdir_separator=
++          fi
++          ;;
++        esac
++      fi
++      # Begin _LT_AC_SYS_LIBPATH_AIX.
++      echo 'int main () { return 0; }' > conftest.c
++      ${CC} ${LDFLAGS} conftest.c -o conftest
++      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++      if test -z "$aix_libpath"; then
++        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++      fi
++      if test -z "$aix_libpath"; then
++        aix_libpath="/usr/lib:/lib"
++      fi
++      rm -f conftest.c conftest
++      # End _LT_AC_SYS_LIBPATH_AIX.
++      if test "$aix_use_runtimelinking" = yes; then
++        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++      else
++        if test "$host_cpu" = ia64; then
++          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++        else
++          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++        fi
++      fi
++      ;;
++    amigaos*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs=no
++      ;;
++    bsdi[45]*)
++      ;;
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec=' '
++      libext=lib
++      ;;
++    darwin* | rhapsody*)
++      hardcode_direct=no
++      if test "$GCC" = yes ; then
++        :
++      else
++        case $cc_basename in
++          xlc*)
++            ;;
++          *)
++            ld_shlibs=no
++            ;;
++        esac
++      fi
++      ;;
++    dgux*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      ;;
++    freebsd1*)
++      ld_shlibs=no
++      ;;
++    freebsd2.2*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      ;;
++    freebsd2*)
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      ;;
++    freebsd* | kfreebsd*-gnu | dragonfly*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      ;;
++    hpux9*)
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      ;;
++    hpux10*)
++      if test "$with_gnu_ld" = no; then
++        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++        hardcode_libdir_separator=:
++        hardcode_direct=yes
++        # hardcode_minus_L: Not really in the search PATH,
++        # but as the default location of the library.
++        hardcode_minus_L=yes
++      fi
++      ;;
++    hpux11*)
++      if test "$with_gnu_ld" = no; then
++        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++        hardcode_libdir_separator=:
++        case $host_cpu in
++          hppa*64*|ia64*)
++            hardcode_direct=no
++            ;;
++          *)
++            hardcode_direct=yes
++            # hardcode_minus_L: Not really in the search PATH,
++            # but as the default location of the library.
++            hardcode_minus_L=yes
++            ;;
++        esac
++      fi
++      ;;
++    irix5* | irix6* | nonstopux*)
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++    netbsd*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      ;;
++    newsos6)
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++    openbsd*)
++      hardcode_direct=yes
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      else
++        case "$host_os" in
++          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++            hardcode_libdir_flag_spec='-R$libdir'
++            ;;
++          *)
++            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++            ;;
++        esac
++      fi
++      ;;
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      ;;
++    osf3*)
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++    osf4* | osf5*)
++      if test "$GCC" = yes; then
++        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++        # Both cc and cxx compiler support -rpath directly
++        hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      hardcode_libdir_separator=:
++      ;;
++    solaris*)
++      hardcode_libdir_flag_spec='-R$libdir'
++      ;;
++    sunos4*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      ;;
++    sysv4)
++      case $host_vendor in
++        sni)
++          hardcode_direct=yes # is this really true???
++          ;;
++        siemens)
++          hardcode_direct=no
++          ;;
++        motorola)
++          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++          ;;
++      esac
++      ;;
++    sysv4.3*)
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++        ld_shlibs=yes
++      fi
++      ;;
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++      ;;
++    sysv5* | sco3.2v5* | sco5v6*)
++      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator=':'
++      ;;
++    uts4*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      ;;
++    *)
++      ld_shlibs=no
++      ;;
++  esac
++fi
++
++# Check dynamic linker characteristics
++# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
++libname_spec='lib$name'
++case "$host_os" in
++  aix3*)
++    ;;
++  aix4* | aix5*)
++    ;;
++  amigaos*)
++    ;;
++  beos*)
++    ;;
++  bsdi[45]*)
++    ;;
++  cygwin* | mingw* | pw32*)
++    shrext=.dll
++    ;;
++  darwin* | rhapsody*)
++    shrext=.dylib
++    ;;
++  dgux*)
++    ;;
++  freebsd1*)
++    ;;
++  kfreebsd*-gnu)
++    ;;
++  freebsd* | dragonfly*)
++    ;;
++  gnu*)
++    ;;
++  hpux9* | hpux10* | hpux11*)
++    case $host_cpu in
++      ia64*)
++        shrext=.so
++        ;;
++      hppa*64*)
++        shrext=.sl
++        ;;
++      *)
++        shrext=.sl
++        ;;
++    esac
++    ;;
++  interix3*)
++    ;;
++  irix5* | irix6* | nonstopux*)
++    case "$host_os" in
++      irix5* | nonstopux*)
++        libsuff= shlibsuff=
++        ;;
++      *)
++        case $LD in
++          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
++          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
++          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
++          *) libsuff= shlibsuff= ;;
++        esac
++        ;;
++    esac
++    ;;
++  linux*oldld* | linux*aout* | linux*coff*)
++    ;;
++  linux*)
++    ;;
++  knetbsd*-gnu)
++    ;;
++  netbsd*)
++    ;;
++  newsos6)
++    ;;
++  nto-qnx*)
++    ;;
++  openbsd*)
++    ;;
++  os2*)
++    libname_spec='$name'
++    shrext=.dll
++    ;;
++  osf3* | osf4* | osf5*)
++    ;;
++  solaris*)
++    ;;
++  sunos4*)
++    ;;
++  sysv4 | sysv4.3*)
++    ;;
++  sysv4*MP*)
++    ;;
++  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++    ;;
++  uts4*)
++    ;;
++esac
++
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
++shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
++escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++
++LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
++
++# How to pass a linker flag through the compiler.
++wl="$escaped_wl"
++
++# Static library suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally "so").
++shlibext="$shlibext"
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator="$hardcode_libdir_separator"
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct="$hardcode_direct"
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L="$hardcode_minus_L"
++
++EOF
diff --git a/net-analyzer/authforce/files/authforce-0.9.8-malloc.patch b/net-analyzer/authforce/files/authforce-0.9.8-malloc.patch
new file mode 100644
index 000000000000..3fda6e85564c
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.8-malloc.patch
@@ -0,0 +1,35 @@
+--- authforce-0.9.8/src/files.c	2007-02-13 11:35:34.000000000 +1100
++++ ../authforce-0.9.8/src/files.c	2007-04-17 20:38:55.000000000 +1000
+@@ -168,15 +168,22 @@
+ 		if (access(tilde_expand(filename), R_OK) == 0)
+ 			return(tilde_expand(filename));
+ 	}
++	fullpath = (char*)malloc_w(sizeof(char)*80);
++	if (fullpath == NULL) {
++		fprintf(stderr, "search_path: out of memory\n");
++		exit(EXIT_FAILURE);
++	}
++	*(fullpath+79)='\0';
++
+ 	if (*filename == '.' && *(filename+1) == '.') {
+ 		debug(3, "search_path: attempting to access %s\n", filename);
+ 		if (access(filename, R_OK) == 0)
+-			return(filename);
++			return(strncpy(fullpath,filename,79));
+ 	}
+ 	if (*filename == '/') {
+ 		debug(3, "search_path: attempting to access %s\n", filename);
+ 		if (access(filename, R_OK) == 0)
+-			return(filename);
++			return(strncpy(fullpath,filename,79));
+ 	}
+ 
+ 	if (rindex(filename, '/')) {
+@@ -184,7 +191,6 @@
+ 		filename++;
+ 	}
+ 
+-	fullpath = (char*)malloc_w(sizeof(char)*80);
+ 	/* then look for it in the path */
+ 	while ((curpath = extract_colon_unit(pathlist, &i)) != NULL) {
+ 		snprintf(fullpath, sizeof(char)*80, "%s/%s", curpath, filename);
diff --git a/net-analyzer/authforce/files/digest-authforce-0.9.8 b/net-analyzer/authforce/files/digest-authforce-0.9.8
new file mode 100644
index 000000000000..e4755cfd7079
--- /dev/null
+++ b/net-analyzer/authforce/files/digest-authforce-0.9.8
@@ -0,0 +1,3 @@
+MD5 e3b049d393445867fbc03f30a892c809 authforce-0.9.8.tar.gz 183038
+RMD160 4dfeefa9082ba7490718ca4e77b01d14b9e6f9fe authforce-0.9.8.tar.gz 183038
+SHA256 041b5668ad440fa0a752ab4f956da4a64dc6403df1b48f8cfe342631b275f447 authforce-0.9.8.tar.gz 183038