summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-antivirus/clamav/files/clamav-0.93-nls.patch')
-rw-r--r--app-antivirus/clamav/files/clamav-0.93-nls.patch73
1 files changed, 73 insertions, 0 deletions
diff --git a/app-antivirus/clamav/files/clamav-0.93-nls.patch b/app-antivirus/clamav/files/clamav-0.93-nls.patch
new file mode 100644
index 000000000000..f082c636d06a
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.93-nls.patch
@@ -0,0 +1,73 @@
+diff -uNr -r clamav-0.93.orig/clamav-milter/clamav-milter.c clamav-0.93/clamav-milter/clamav-milter.c
+--- clamav-0.93.orig/clamav-milter/clamav-milter.c 2008-04-09 17:39:18.000000000 +0200
++++ clamav-0.93/clamav-milter/clamav-milter.c 2008-04-15 14:59:23.235003488 +0200
+@@ -110,6 +110,7 @@
+
+ #ifdef C_LINUX
+ #include <sys/sendfile.h> /* FIXME: use sendfile on BSD not Linux */
++#ifdef ENABLE_NLS
+ #include <libintl.h>
+ #include <locale.h>
+
+@@ -122,7 +123,8 @@
+ #define _(s) s
+ #define N_(s) s
+
+-#endif
++#endif /* ENABLE_NLS */
++#endif /* C_LINUX */
+
+ #ifdef USE_SYSLOG
+ #include <syslog.h>
+@@ -713,7 +715,7 @@
+ else
+ progname = "clamav-milter";
+
+-#ifdef C_LINUX
++#ifdef ENABLE_NLS
+ setlocale(LC_ALL, "");
+ bindtextdomain(progname, DATADIR"/clamav-milter/locale");
+ textdomain(progname);
+diff -uNr -r clamav-0.93.orig/configure.in clamav-0.93/configure.in
+--- clamav-0.93.orig/configure.in 2008-04-09 17:40:33.000000000 +0200
++++ clamav-0.93/configure.in 2008-04-15 15:03:43.391218848 +0200
+@@ -399,6 +399,15 @@
+ [ --disable-unrar don't build libclamunrar and libclamunrar_iface ],
+ want_unrar=$enableval, want_unrar="yes")
+
++AC_ARG_ENABLE(nls,
++ AC_HELP_STRING([--disable-nls], [disable nls support]),
++ [want_nls=$enableval], [want_nls=yes]
++)
++
++if test $want_nls = yes; then
++ CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
++fi
++
+ AC_ARG_ENABLE([dns],
+ AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
+ [want_dns=$enableval], [want_dns=yes]
+diff -uNr -r clamav-0.93.orig/shared/getopt.c clamav-0.93/shared/getopt.c
+--- clamav-0.93.orig/shared/getopt.c 2008-03-06 19:41:02.000000000 +0100
++++ clamav-0.93/shared/getopt.c 2008-04-15 15:00:51.885713837 +0200
+@@ -82,7 +82,7 @@
+
+ #ifndef _
+ /* This is for other GNU distributions with internationalized messages. */
+-# if defined HAVE_LIBINTL_H || defined _LIBC
++# if (defined(HAVE_LIBINTL_H) || defined(_LIBC)) && defined(ENABLE_NLS)
+ # include <libintl.h>
+ # ifndef _
+ # define _(msgid) gettext (msgid)
+diff -uNr -r clamav-0.93.orig/shared/output.c clamav-0.93/shared/output.c
+--- clamav-0.93.orig/shared/output.c 2008-03-06 19:41:02.000000000 +0100
++++ clamav-0.93/shared/output.c 2008-04-15 15:00:51.885713837 +0200
+@@ -61,7 +61,7 @@
+ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #endif
+
+-#ifdef C_LINUX
++#if defined(C_LINUX) && defined(ENABLE_NLS)
+ #include <libintl.h>
+ #include <locale.h>
+