- adapted patches for version 0.96.4

Changed files:
    bogofilter-dummy.patch -> 1.3
    bogofilter-home_etc.patch -> 1.5

diff --git a/bogofilter-dummy.patch b/bogofilter-dummy.patch
index 253698ab8d0cbfce747faadf265399816ec2c76f..f86f4b508be9325a376559e5b565002676519531 100644 (file)
--- a/bogofilter-dummy.patch
+++ b/bogofilter-dummy.patch
@@ -1,12 +1,12 @@
-diff -burN bogofilter-0.16.4.orig/configure.ac bogofilter-0.16.4/configure.ac
---- bogofilter-0.16.4.orig/configure.ac        2004-02-05 18:40:11.998145456 +0100
-+++ bogofilter-0.16.4/configure.ac     2004-02-05 19:07:20.235615736 +0100
-@@ -514,7 +514,7 @@
+diff -urN bogofilter-0.96.4.orig/configure.ac bogofilter-0.96.4/configure.ac
+--- bogofilter-0.96.4.orig/configure.ac        2005-11-01 01:31:40.000000000 +0100
++++ bogofilter-0.96.4/configure.ac     2005-11-03 16:37:09.816592656 +0100
+@@ -706,7 +706,7 @@
  export PATH
  
  need_my_gsl=1
 -AC_ARG_WITH(included-gsl, AC_HELP_STRING([--with-included-gsl],[force use of shipped GSL rather than system GSL]),
 +AC_ARG_WITH(included-gsl, ([--with-included-gsl],[force use of shipped GSL rather than system GSL]),
- if test "x$WITHVAL" != "xyes" ; then need_my_gsl=2 ; fi)
+     if test "x$withval" = "xyes" ; then need_my_gsl=2 ; fi)
  
  if test "$need_my_gsl" = 1 ; then

diff --git a/bogofilter-home_etc.patch b/bogofilter-home_etc.patch
index 2916027daff1312040a524234f07cfce9a39ef51..47819a6595a725768a3bde40bbc671b434ed058a 100644 (file)
--- a/bogofilter-home_etc.patch
+++ b/bogofilter-home_etc.patch
@@ -1,24 +1,24 @@
-diff -urN bogofilter-0.92.8.oryg/src/configfile.c bogofilter-0.92.8/src/configfile.c
---- bogofilter-0.92.8.oryg/src/configfile.c    2004-08-22 17:52:28.000000000 +0200
-+++ bogofilter-0.92.8/src/configfile.c 2004-10-24 18:20:00.925433952 +0200
-@@ -125,7 +125,14 @@
+diff -urN bogofilter-0.96.4.orig/src/configfile.c bogofilter-0.96.4/src/configfile.c
+--- bogofilter-0.96.4.orig/src/configfile.c    2005-10-15 23:03:11.000000000 +0200
++++ bogofilter-0.96.4/src/configfile.c 2005-11-03 16:26:38.844514992 +0100
+@@ -148,7 +148,13 @@
      bool ok = true;
      int lineno = 0;
      FILE *fp;
+-
 +    char *home_etc = getenv("HOME_ETC");
- 
 +    if (home_etc && fname[0] == '~') {
-+      char buffer[1024];
-+      snprintf(buffer, 1024, "%s%s", home_etc, fname+1);
-+      config_file_name=xstrdup(buffer);
++       char buffer[1024];
++       snprintf(buffer, 1024, "%s%s", home_etc, fname+1);
++       config_file_name=xstrdup(buffer);
 +    } else
-+    
++   
      if (config_file_name != NULL)
        xfree(config_file_name);
-     config_file_name = tildeexpand(fname, tilde_expand);
-diff -urN bogofilter-0.92.8.oryg/src/paths.c bogofilter-0.92.8/src/paths.c
---- bogofilter-0.92.8.oryg/src/paths.c 2004-05-18 02:22:52.000000000 +0200
-+++ bogofilter-0.92.8/src/paths.c      2004-10-24 18:22:51.345526160 +0200
+ 
+diff -urN bogofilter-0.96.4.orig/src/paths.c bogofilter-0.96.4/src/paths.c
+--- bogofilter-0.96.4.orig/src/paths.c 2005-08-15 01:03:42.000000000 +0200
++++ bogofilter-0.96.4/src/paths.c      2005-11-03 16:28:51.672322096 +0100
 @@ -29,7 +29,7 @@
  #ifndef __riscos__
      { PR_ENV_BOGO, "BOGOFILTER_DIR", NULL },
@@ -28,7 +28,7 @@ diff -urN bogofilter-0.92.8.oryg/src/paths.c bogofilter-0.92.8/src/paths.c
  #else
      { PR_ENV_HOME, "Choices$Write",  BOGODIR },
      { PR_ENV_HOME, "Bogofilter$Dir", NULL },
-@@ -104,6 +104,7 @@
+@@ -274,6 +274,7 @@
      size_t path_size, env_size;
  
      env = getenv(var);