X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ac2.68.patch;h=427ab729fcbab963c834c3e2bf556f900cc65125;hb=d1044716fe9777720d8ac8cf7fe212a58d7547b5;hp=27bd529a9a64d4c76f0dd6c48e58b57b7fa0ad92;hpb=5e04f218946a2ed23cc00894816d14877f2702df;p=packages%2Fclamav.git

diff --git a/ac2.68.patch b/ac2.68.patch
index 27bd529..427ab72 100644
--- a/ac2.68.patch
+++ b/ac2.68.patch
@@ -1,37 +1,34 @@
-diff -ur clamav-0.97.5/clamav-milter/Makefile.am clamav-0.97.5-am/clamav-milter/Makefile.am
---- clamav-0.97.5/clamav-milter/Makefile.am	2012-06-12 15:36:05.000000000 +0200
-+++ clamav-0.97.5-am/clamav-milter/Makefile.am	2012-06-28 11:10:21.205378306 +0200
-@@ -45,7 +45,7 @@
- endif
+diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
+--- clamav-0.98.3/configure.ac	2014-05-06 20:42:41.000000000 +0200
++++ clamav-0.98.3-ac2.68/configure.ac	2014-05-09 10:51:30.508280355 +0200
+@@ -42,12 +42,12 @@
+ AC_USE_SYSTEM_EXTENSIONS
  
- DEFS = @DEFS@ -DCL_NOLIBCLAMAV
--CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
-+AM_CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
- LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
- AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
- CLEANFILES=*.gcda *.gcno
-diff -ur clamav-0.97.5/configure.ac clamav-0.97.5-am/configure.ac
---- clamav-0.97.5/configure.ac	2012-06-28 11:10:46.795377403 +0200
-+++ clamav-0.97.5-am/configure.ac	2012-06-28 11:01:44.658245193 +0200
-@@ -54,6 +54,8 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-+AM_PROG_AR
-+AM_PROG_CC_C_O
+ m4_include([m4/reorganization/version.m4])
++m4_include([m4/reorganization/build_tools.m4])
  
  LT_CONFIG_LTDL_DIR([libltdl])
  LT_INIT([dlopen disable-static])
-@@ -469,7 +471,7 @@
+ LTDL_INIT([recursive])
+ PKG_PROG_PKG_CONFIG(0.16)
  
- if test "$enable_check_ut" != "no" ; then
- 	AC_LIB_FIND([check],[check.h],
--			AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
-+			[AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
- 			[CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"],
- 			[])
- fi
-@@ -1549,8 +1551,8 @@
+-m4_include([m4/reorganization/build_tools.m4])
+ m4_include([m4/reorganization/headers.m4])
+ 
+ AC_CONFIG_FILES([libltdl/Makefile])
+diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4
+--- clamav-0.98.3/m4/reorganization/build_tools.m4	2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4	2014-05-09 10:53:30.800262620 +0200
+@@ -1,3 +1,5 @@
++AM_PROG_AR
++AM_PROG_CC_C_O
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4
+--- clamav-0.98.3/m4/reorganization/clamdtop.m4	2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4	2014-05-09 10:51:06.963907781 +0200
+@@ -6,8 +6,8 @@
  if test "$enable_clamdtop" != "no"; then
  
  AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
@@ -42,7 +39,7 @@ diff -ur clamav-0.97.5/configure.ac clamav-0.97.5-am/configure.ac
  	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
  	    [])
-@@ -1558,8 +1560,8 @@
+@@ -15,8 +15,8 @@
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      HAVE_LIBNCURSES=
      AC_LIB_FIND([ncurses], [ncurses.h],
@@ -53,7 +50,7 @@ diff -ur clamav-0.97.5/configure.ac clamav-0.97.5-am/configure.ac
  	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  	     CURSES_INCLUDE="<ncurses.h>"],
  	    [])
-@@ -1567,8 +1569,8 @@
+@@ -24,8 +24,8 @@
  
  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
      AC_LIB_FIND([pdcurses],[curses.h],
@@ -64,41 +61,15 @@ diff -ur clamav-0.97.5/configure.ac clamav-0.97.5-am/configure.ac
  			    [CURSES_CPPFLAGS="$INCPDCURSES";
  			     CURSES_LIBS="$LTLIBPDCURSES";
  			     CURSES_INCLUDE="<curses.h>"],
-diff -ur clamav-0.97.5/m4/resolv.m4 clamav-0.97.5-am/m4/resolv.m4
---- clamav-0.97.5/m4/resolv.m4	2012-06-12 15:36:05.000000000 +0200
-+++ clamav-0.97.5-am/m4/resolv.m4	2012-06-28 11:09:01.312047789 +0200
-@@ -18,7 +18,7 @@
- 	[
- 	    AC_CACHE_CHECK([for dn_expand in std libs], [ac_cv_have_lresolv_std], [
- 	    	ac_cv_have_lresolv_std='no'
--	        AC_LINK_IFELSE([
-+	        AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-@@ -28,14 +28,14 @@
- 		[
- 		    ac_cv_have_lresolv_std='yes'
- 		    ac_cv_have_lresolv=''
--		])
-+		])])
- 	    ])
- 	    if test "x$ac_cv_have_lresolv" = "xno"; then
- 	    bklibs=$LIBS
- 	    LIBS=-lresolv
- 	    AC_CACHE_CHECK([for dn_expand in -lresolv], [ac_cv_have_lresolv_lresolv], [
- 		ac_cv_have_lresolv_lresolv='yes'
--		AC_LINK_IFELSE([
-+		AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-@@ -45,7 +45,7 @@
- 		[
- 		    ac_cv_have_lresolv_lresolv='yes'
- 		    ac_cv_have_lresolv=' -lresolv'
--		])
-+		])])
- 	    ])
- 	    LIBS=$bklibs;
- 	    fi
+diff -uNr clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4
+--- clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4	2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4	2014-05-09 10:51:06.963907781 +0200
+@@ -12,7 +12,7 @@
+ esac
+ 
+ 	AC_LIB_FIND([check],[check.h],
+-			AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
++			[AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
+ 			[CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],
+ 			[])
+