projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2645a44)
Fix compile error with -nls, introduced by my nls patch. Bug #174787, by Philipp...
authorAndrej Kacian <ticho@gentoo.org>
Mon, 16 Apr 2007 13:46:34 +0000 (13:46 +0000)
committerAndrej Kacian <ticho@gentoo.org>
Mon, 16 Apr 2007 13:46:34 +0000 (13:46 +0000)
Package-Manager: portage-2.1.2.3

app-antivirus/clamav/ChangeLog patch | blob | history
app-antivirus/clamav/Manifest patch | blob | history
app-antivirus/clamav/files/clamav-0.90-nls.patch patch | blob | history

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index b50e3f4d11c192157fd0785bd4a2e6945560823f..1c73e0a007051938840136ef0bd45e513c94382b 100644 (file)
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.229 2007/04/15 19:20:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.230 2007/04/16 13:46:34 ticho Exp $
+
+  16 Apr 2007; Andrej Kacian <ticho@gentoo.org> files/clamav-0.90-nls.patch:
+  Fix compile error with -nls, introduced by my nls patch. Bug #174787, by
+  Philipp Riegger <stoile at anderedomain.de>.
 
   15 Apr 2007; Markus Rothe <corsair@gentoo.org> clamav-0.90.2.ebuild:
   Stable on ppc64; bug #174375
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index afc7103aeba013ca36ed676790b40a585636a5a2..7a95b8bd261fbf61feeed9d1b89b1986db8560aa 100644 (file)
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX clamav-0.90-compat.patch 585 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 SHA1 fedfe373a6a911230c553fd5a095c8acb72b4ce2 SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9
 MD5 6c50cdabc6ee6dc40df2b89c075380a5 files/clamav-0.90-compat.patch 585
 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 files/clamav-0.90-compat.patch 585
 SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9 files/clamav-0.90-compat.patch 585
-AUX clamav-0.90-nls.patch 2335 RMD160 7035c465bec945ccac3cf26484106bfe2a8ef746 SHA1 40b026bf025ef45955df6725237ae824d47111ad SHA256 4fbf245f89544a13695ba8b62082cc093a5ee9129fc0373ea93aa2d33bdbacb4
-MD5 cc65ddeb567d7b9136aeb6059c2a0557 files/clamav-0.90-nls.patch 2335
-RMD160 7035c465bec945ccac3cf26484106bfe2a8ef746 files/clamav-0.90-nls.patch 2335
-SHA256 4fbf245f89544a13695ba8b62082cc093a5ee9129fc0373ea93aa2d33bdbacb4 files/clamav-0.90-nls.patch 2335
+AUX clamav-0.90-nls.patch 2531 RMD160 442990f305b47bd0eb4c459e9ed054612259992e SHA1 4e74b895739ff1aa1929a444f9e89dbe0f18a30c SHA256 b160e11ee12df6634cb8d524816f8bba08c7cd5b6154f9bff671423a8e0031a3
+MD5 dad3ac73c0e86466301c457bfdb97952 files/clamav-0.90-nls.patch 2531
+RMD160 442990f305b47bd0eb4c459e9ed054612259992e files/clamav-0.90-nls.patch 2531
+SHA256 b160e11ee12df6634cb8d524816f8bba08c7cd5b6154f9bff671423a8e0031a3 files/clamav-0.90-nls.patch 2531
 AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11
 MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b files/clamav-milter.README.gentoo 1124
@@ -54,10 +57,10 @@ EBUILD clamav-0.90.ebuild 3958 RMD160 acabf30bc728a8edc824d14d7e965b858b324340 S
 MD5 1a6bb4a7e8d417feff74b768aaa216e9 clamav-0.90.ebuild 3958
 RMD160 acabf30bc728a8edc824d14d7e965b858b324340 clamav-0.90.ebuild 3958
 SHA256 ec400f0e7387af9362c5ee2d77cb686a227634f9caf638be381f2094e43b6ace clamav-0.90.ebuild 3958
-MISC ChangeLog 36128 RMD160 cf3bdc61256132d91e2532a0580447688565ccc8 SHA1 9b4ec8d04812924f6c8759f5f489ada15afd0be7 SHA256 0433082dcec66b0e65caf6b1cab500aa52ed01ce22db01c88e6427e37ad883b0
-MD5 37bfe524fda37b1513adeba4f3c4b555 ChangeLog 36128
-RMD160 cf3bdc61256132d91e2532a0580447688565ccc8 ChangeLog 36128
-SHA256 0433082dcec66b0e65caf6b1cab500aa52ed01ce22db01c88e6427e37ad883b0 ChangeLog 36128
+MISC ChangeLog 36326 RMD160 dc3fe6dbcf289835caf65d7ffa0723d6ac8dd9ff SHA1 c103983e99efb397d7d138726da2979533385857 SHA256 59b71efbb05a2f4f001e1296242e2efc93f9496ced6a5b1ca103c2fc8aa486b9
+MD5 5de20ceca62b1daa333eb03d89861088 ChangeLog 36326
+RMD160 dc3fe6dbcf289835caf65d7ffa0723d6ac8dd9ff ChangeLog 36326
+SHA256 59b71efbb05a2f4f001e1296242e2efc93f9496ced6a5b1ca103c2fc8aa486b9 ChangeLog 36326
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -83,3 +86,10 @@ SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/di
 MD5 a51cf8bdb107839a6a251af7ca543e74 files/digest-clamav-0.90.2 247
 RMD160 07dc65c177668ad15f01334d6476c7c8358d60f9 files/digest-clamav-0.90.2 247
 SHA256 e68c7b04a6e584aec2663aec7d1fb258ddf06e21554f0dd71bc9fec76ed12a20 files/digest-clamav-0.90.2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGI35EQlM6RnzZP+IRAsWNAJ9xHWHzkjXULVH6T0Nw9HKIcjg+5wCaA4C/
+Tmbb8wyLe8gUrS2c1a8g+WI=
+=VJ8z
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/files/clamav-0.90-nls.patch b/app-antivirus/clamav/files/clamav-0.90-nls.patch
index 3a9ac5703f842581fb989ac6d291778fe40bcdaf..7349f32ea20baaa84458b1a93d46f8ff22a5ddb2 100644 (file)
--- a/app-antivirus/clamav/files/clamav-0.90-nls.patch
+++ b/app-antivirus/clamav/files/clamav-0.90-nls.patch
@@ -1,6 +1,6 @@
-diff -bur clamav-0.90.2-orig/clamav-milter/clamav-milter.c clamav-0.90.2/clamav-milter/clamav-milter.c
---- clamav-0.90.2-orig/clamav-milter/clamav-milter.c   2007-04-13 10:26:39.000000000 +0200
-+++ clamav-0.90.2/clamav-milter/clamav-milter.c        2007-04-13 10:31:02.000000000 +0200
+diff -bur clamav-0.90.2/clamav-milter/clamav-milter.c clamav-0.90.2-nls/clamav-milter/clamav-milter.c
+--- clamav-0.90.2/clamav-milter/clamav-milter.c        2007-04-12 18:35:17.000000000 +0200
++++ clamav-0.90.2-nls/clamav-milter/clamav-milter.c    2007-04-16 15:33:40.000000000 +0200
 @@ -110,6 +110,7 @@
  
  #ifdef        C_LINUX
@@ -19,9 +19,18 @@ diff -bur clamav-0.90.2-orig/clamav-milter/clamav-milter.c clamav-0.90.2/clamav-
  
  #ifdef        USE_SYSLOG
  #include <syslog.h>
-diff -bur clamav-0.90.2-orig/configure.in clamav-0.90.2/configure.in
---- clamav-0.90.2-orig/configure.in    2007-04-13 10:26:39.000000000 +0200
-+++ clamav-0.90.2/configure.in 2007-04-13 10:26:57.000000000 +0200
+@@ -664,7 +666,7 @@
+       else
+               progname = "clamav-milter";
+ 
+-#ifdef        C_LINUX
++#ifdef        ENABLE_NLS
+       setlocale(LC_ALL, "");
+       bindtextdomain(progname, DATADIR"/clamav-milter/locale");
+       textdomain(progname);
+diff -bur clamav-0.90.2/configure.in clamav-0.90.2-nls/configure.in
+--- clamav-0.90.2/configure.in 2007-04-13 01:10:37.000000000 +0200
++++ clamav-0.90.2-nls/configure.in     2007-04-16 15:33:40.000000000 +0200
 @@ -160,6 +160,15 @@
      AC_CHECK_HEADER(dlfcn.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ldl" ; AC_DEFINE(HAVE_NCORE,1,Support for NodalCore acceleration)], AC_MSG_WARN([****** NodalCore support disabled (no support for dlopen)]))
  fi
@@ -38,9 +47,9 @@ diff -bur clamav-0.90.2-orig/configure.in clamav-0.90.2/configure.in
  AC_ARG_ENABLE(dns,
      AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
      [want_dns=$enableval], [want_dns=yes]
-diff -bur clamav-0.90.2-orig/shared/getopt.c clamav-0.90.2/shared/getopt.c
---- clamav-0.90.2-orig/shared/getopt.c 2007-04-13 10:26:39.000000000 +0200
-+++ clamav-0.90.2/shared/getopt.c      2007-04-13 10:26:57.000000000 +0200
+diff -bur clamav-0.90.2/shared/getopt.c clamav-0.90.2-nls/shared/getopt.c
+--- clamav-0.90.2/shared/getopt.c      2007-02-28 02:08:59.000000000 +0100
++++ clamav-0.90.2-nls/shared/getopt.c  2007-04-16 15:33:40.000000000 +0200
 @@ -82,7 +82,7 @@
  
  #ifndef _
@@ -50,9 +59,9 @@ diff -bur clamav-0.90.2-orig/shared/getopt.c clamav-0.90.2/shared/getopt.c
  #  include <libintl.h>
  #  ifndef _
  #   define _(msgid)   gettext (msgid)
-diff -bur clamav-0.90.2-orig/shared/output.c clamav-0.90.2/shared/output.c
---- clamav-0.90.2-orig/shared/output.c 2007-04-13 10:26:39.000000000 +0200
-+++ clamav-0.90.2/shared/output.c      2007-04-13 10:26:57.000000000 +0200
+diff -bur clamav-0.90.2/shared/output.c clamav-0.90.2-nls/shared/output.c
+--- clamav-0.90.2/shared/output.c      2007-03-02 01:43:18.000000000 +0100
++++ clamav-0.90.2-nls/shared/output.c  2007-04-16 15:33:40.000000000 +0200
 @@ -61,7 +61,7 @@
  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
  #endif
Unnamed repository; edit this file 'description' to name the repository.