- rediff patches

diff --git a/amanda-FHS.patch b/amanda-FHS.patch
index 9ee2e0356f3e0b0cbb3a8a731aa6b16e73e41b0f..d80b1c3a7a5d0d20e802ab5ace85c1fd488bcb97 100644 (file)
--- a/amanda-FHS.patch
+++ b/amanda-FHS.patch
@@ -1,8 +1,8 @@
-diff -ur amanda-2.6.0/common-src/conffile.c amanda-2.6.0-fhs/common-src/conffile.c
---- amanda-2.6.0/common-src/conffile.c 2008-01-28 22:57:34.000000000 +0100
-+++ amanda-2.6.0-fhs/common-src/conffile.c     2008-05-08 17:39:18.000000000 +0200
-@@ -3143,9 +3143,9 @@
-     conf_init_str   (&conf_data[CNF_LABELSTR]             , ".*");
+diff -urNp -x '*.orig' amanda-3.5.1.org/common-src/conffile.c amanda-3.5.1/common-src/conffile.c
+--- amanda-3.5.1.org/common-src/conffile.c     2017-12-01 14:26:28.000000000 +0100
++++ amanda-3.5.1/common-src/conffile.c 2021-05-08 10:23:13.673469863 +0200
+@@ -6422,9 +6422,9 @@ init_defaults(
+     conf_init_str(&conf_data[CNF_CHANGERFILE]             , "changer");
      conf_init_str   (&conf_data[CNF_TAPELIST]             , "tapelist");
      conf_init_str   (&conf_data[CNF_DISKFILE]             , "disklist");
 -    conf_init_str   (&conf_data[CNF_INFOFILE]             , "/usr/adm/amanda/curinfo");
@@ -13,11 +13,11 @@ diff -ur amanda-2.6.0/common-src/conffile.c amanda-2.6.0-fhs/common-src/conffile
 +    conf_init_str   (&conf_data[CNF_INDEXDIR]             , "/var/lib/amanda/index");
      conf_init_ident    (&conf_data[CNF_TAPETYPE]             , "DEFAULT_TAPE");
      conf_init_identlist(&conf_data[CNF_HOLDINGDISK]          , NULL);
-     conf_init_int      (&conf_data[CNF_DUMPCYCLE]            , 10);
-diff -ur amanda-2.6.0/example/amanda.conf.in amanda-2.6.0-fhs/example/amanda.conf.in
---- amanda-2.6.0/example/amanda.conf.in        2008-01-18 01:31:14.000000000 +0100
-+++ amanda-2.6.0-fhs/example/amanda.conf.in    2008-05-08 17:42:35.000000000 +0200
-@@ -237,9 +237,9 @@
+     conf_init_int      (&conf_data[CNF_DUMPCYCLE]            , CONF_UNIT_NONE, 10);
+diff -urNp -x '*.orig' amanda-3.5.1.org/example/amanda.conf.in amanda-3.5.1/example/amanda.conf.in
+--- amanda-3.5.1.org/example/amanda.conf.in    2017-12-01 14:26:34.000000000 +0100
++++ amanda-3.5.1/example/amanda.conf.in        2021-05-08 10:23:13.673469863 +0200
+@@ -215,9 +215,9 @@ holdingdisk hd1 {
  # Note that, although the keyword below is infofile, it is only so for
  # historic reasons, since now it is supposed to be a directory (unless
  # you have selected some database format other than the `text' default)
@@ -30,10 +30,10 @@ diff -ur amanda-2.6.0/example/amanda.conf.in amanda-2.6.0-fhs/example/amanda.con
  #tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist"    # list of used tapes
  # tapelist is stored, by default, in the directory that contains amanda.conf
  
-diff -ur amanda-2.6.0/example/template.d/advanced.conf.in amanda-2.6.0-fhs/example/template.d/advanced.conf.in
---- amanda-2.6.0/example/template.d/advanced.conf.in   2008-01-18 01:31:13.000000000 +0100
-+++ amanda-2.6.0-fhs/example/template.d/advanced.conf.in       2008-05-08 17:43:27.000000000 +0200
-@@ -97,10 +97,10 @@
+diff -urNp -x '*.orig' amanda-3.5.1.org/example/template.d/advanced.conf.in amanda-3.5.1/example/template.d/advanced.conf.in
+--- amanda-3.5.1.org/example/template.d/advanced.conf.in       2017-12-01 14:26:34.000000000 +0100
++++ amanda-3.5.1/example/template.d/advanced.conf.in   2021-05-08 10:23:13.673469863 +0200
+@@ -84,10 +84,10 @@ autoflush no
  # Note that, although the keyword below is infofile, it is only so for
  # historic reasons, since now it is supposed to be a directory (unless
  # you have selected some database format other than the `text' default)
@@ -48,24 +48,23 @@ diff -ur amanda-2.6.0/example/template.d/advanced.conf.in amanda-2.6.0-fhs/examp
  # tapelist is stored, by default, in the directory that contains amanda.conf
  
  # Specify holding disks.  These are used as a temporary staging area for
-diff -ur amanda-2.6.0/server-src/amserverconfig.pl amanda-2.6.0-fhs/server-src/amserverconfig.pl
---- amanda-2.6.0/server-src/amserverconfig.pl  2008-01-18 01:31:25.000000000 +0100
-+++ amanda-2.6.0-fhs/server-src/amserverconfig.pl      2008-05-08 17:37:13.000000000 +0200
-@@ -99,16 +99,16 @@
+diff -urNp -x '*.orig' amanda-3.5.1.org/server-src/amserverconfig.pl amanda-3.5.1/server-src/amserverconfig.pl
+--- amanda-3.5.1.org/server-src/amserverconfig.pl      2017-12-01 14:26:29.000000000 +0100
++++ amanda-3.5.1/server-src/amserverconfig.pl  2021-05-08 10:23:13.673469863 +0200
+@@ -96,16 +96,16 @@ sub log_and_die {
            unlink "$confdir/$config/tapelist" || 
            print LOG "unlink $confdir/$config/tapelist failed: $!\n";
        }
 -      if ( -e "$confdir/$config/curinfo" ) {
 -          rmdir "$confdir/$config/curinfo" || 
 -          print LOG "rmdir $confdir/$config failed: $!\n";
--      }
--      if ( -e "$confdir/$config/index" ) {
--          rmdir "$confdir/$config/index" || 
--          print LOG "rmdir $confdir/$config/index failed: $!\n";
 +      if ( -e "$localstatedir/lib/amanda/$config/curinfo" ) {
 +          rmdir "$localstatedir/lib/amanda/$config/curinfo" || 
 +          print LOG "rmdir $localstatedir/lib/amanda/$config/curinfo failed: $!\n";
-+      }
+       }
+-      if ( -e "$confdir/$config/index" ) {
+-          rmdir "$confdir/$config/index" || 
+-          print LOG "rmdir $confdir/$config/index failed: $!\n";
 +      if ( -e "$localstatedir/lib/amanda/$config/index" ) {
 +          rmdir "$localstatedir/lib/amanda/$config/index" || 
 +          print LOG "rmdir $localstatedir/lib/amanda/$config/index failed: $!\n";
@@ -76,7 +75,7 @@ diff -ur amanda-2.6.0/server-src/amserverconfig.pl amanda-2.6.0-fhs/server-src/a
      }
      die $err;
  }
-@@ -173,10 +173,12 @@
+@@ -159,10 +159,12 @@ sub copy_template_file {
  
  
  sub create_curinfo_index_dir {

diff --git a/amanda-heimdal.patch b/amanda-heimdal.patch
index 4448083fce10f26a470f829f7722318299b1460e..48ea52a8dedc70071fbd1366b195b0620bf5e7c3 100644 (file)
--- a/amanda-heimdal.patch
+++ b/amanda-heimdal.patch
@@ -1,17 +1,7 @@
---- amanda-2.6.0/config/amanda/krb5-security.m4~       2008-01-18 01:31:33.000000000 +0100
-+++ amanda-2.6.0/config/amanda/krb5-security.m4        2008-05-13 11:41:28.000000000 +0200
-@@ -69,6 +69,8 @@
-                 AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err])
-                 break
-             elif test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libasn1.a -o -f ${k5libdir}/libasn1.so \) -a \( -f ${k5libdir}/libgssapi.a -o -f ${k5libdir}/libgssapi.so \); then
-+                KRB5_DIR_FOUND=$dir
-+                KRB5_LIBDIR_FOUND=$k5libdir
-                 AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1])
-                 AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES])
-                 break
---- amanda-2.6.0/common-src/krb5-security.c~   2008-01-18 01:31:41.000000000 +0100
-+++ amanda-2.6.0/common-src/krb5-security.c    2008-05-13 11:50:57.000000000 +0200
-@@ -45,7 +45,7 @@
+diff -urNp -x '*.orig' amanda-3.5.1.org/common-src/krb5-security.c amanda-3.5.1/common-src/krb5-security.c
+--- amanda-3.5.1.org/common-src/krb5-security.c        2017-12-01 14:26:28.000000000 +0100
++++ amanda-3.5.1/common-src/krb5-security.c    2021-05-08 10:23:14.430132083 +0200
+@@ -43,7 +43,7 @@
  #include "sockaddr-util.h"
  
  #ifdef KRB5_HEIMDAL_INCLUDES
@@ -20,7 +10,7 @@
  #endif
  
  #define BROKEN_MEMORY_CCACHE
-@@ -67,7 +67,7 @@
+@@ -65,7 +65,7 @@
  #ifndef KRB5_HEIMDAL_INCLUDES
  #include <gssapi/gssapi_generic.h>
  #else
@@ -29,10 +19,11 @@
  #endif
  #include <krb5.h>
  
---- amanda-2.6.0/common-src/security-util.h~   2008-01-18 01:31:41.000000000 +0100
-+++ amanda-2.6.0/common-src/security-util.h    2008-05-13 11:51:10.000000000 +0200
-@@ -47,11 +47,11 @@
- 
+diff -urNp -x '*.orig' amanda-3.5.1.org/common-src/security-util.h amanda-3.5.1/common-src/security-util.h
+--- amanda-3.5.1.org/common-src/security-util.h        2017-12-01 14:26:28.000000000 +0100
++++ amanda-3.5.1/common-src/security-util.h    2021-05-08 10:23:14.430132083 +0200
+@@ -53,11 +53,11 @@
+ #define H_EOF   -2            /* this connection has been shut down */
  
  #ifdef KRB5_SECURITY
 -#  define KRB5_DEPRECATED 1
@@ -45,3 +36,15 @@
  #  endif
  #  include <krb5.h>
  #endif
+diff -urNp -x '*.orig' amanda-3.5.1.org/config/amanda/krb5-security.m4 amanda-3.5.1/config/amanda/krb5-security.m4
+--- amanda-3.5.1.org/config/amanda/krb5-security.m4    2017-12-01 14:26:31.000000000 +0100
++++ amanda-3.5.1/config/amanda/krb5-security.m4        2021-05-08 10:23:14.430132083 +0200
+@@ -61,6 +61,8 @@ AC_DEFUN([AMANDA_KRB5_SECURITY],
+                 AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err])
+                 break
+             elif test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libasn1.a -o -f ${k5libdir}/libasn1.so \) -a \( -f ${k5libdir}/libgssapi.a -o -f ${k5libdir}/libgssapi.so \); then
++                KRB5_DIR_FOUND=$dir
++                KRB5_LIBDIR_FOUND=$k5libdir
+                 AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1])
+                 AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES])
+                 break

diff --git a/amanda-krb5-auth.patch b/amanda-krb5-auth.patch
index 1545dd3e7cbdbf4dc72a17dc5bafea03996873c7..8888bcff83f36406522c06fb0d599b2334e9bd51 100644 (file)
--- a/amanda-krb5-auth.patch
+++ b/amanda-krb5-auth.patch
@@ -1,6 +1,7 @@
---- amanda-3.2.0/amandad-src/amandad.c~        2010-10-06 18:36:28.000000000 +0200
-+++ amanda-3.2.0/amandad-src/amandad.c 2010-11-29 14:23:20.580165324 +0100
-@@ -440,6 +440,11 @@
+diff -urNp -x '*.orig' amanda-3.5.1.org/amandad-src/amandad.c amanda-3.5.1/amandad-src/amandad.c
+--- amanda-3.5.1.org/amandad-src/amandad.c     2017-12-01 14:26:32.000000000 +0100
++++ amanda-3.5.1/amandad-src/amandad.c 2021-05-08 10:23:15.193461026 +0200
+@@ -476,6 +476,11 @@ main(
        exit_on_qlength = 1;
      }
  
@@ -10,9 +11,9 @@
 +    }
 +
  #ifndef SINGLE_USERID
-     if (geteuid() == 0) {
+     if (getuid() == 0) {
        if (strcasecmp(auth, "krb5") != 0) {
-@@ -474,11 +479,6 @@
+@@ -510,11 +515,6 @@ main(
        dbprintf(_("WARNING: argv[0] not defined: check inetd.conf\n"));
      }
  

diff --git a/amanda-no-buildtime-ipv6.patch b/amanda-no-buildtime-ipv6.patch
index ce3c9530a9ed3cca0e0c1c0551691bb78196799e..f85f61667a50de9ff5cc5e80e1b2d2c867d2977a 100644 (file)
--- a/amanda-no-buildtime-ipv6.patch
+++ b/amanda-no-buildtime-ipv6.patch
@@ -1,8 +1,9 @@
---- amanda-2.6.0/config/amanda/ipv6.m4~        2008-01-28 19:12:25.000000000 +0100
-+++ amanda-2.6.0/config/amanda/ipv6.m4 2008-05-13 11:34:36.000000000 +0200
-@@ -70,32 +70,7 @@
+diff -urNp -x '*.orig' amanda-3.5.1.org/config/amanda/ipv6.m4 amanda-3.5.1/config/amanda/ipv6.m4
+--- amanda-3.5.1.org/config/amanda/ipv6.m4     2017-12-01 14:26:31.000000000 +0100
++++ amanda-3.5.1/config/amanda/ipv6.m4 2021-05-08 10:23:14.050134288 +0200
+@@ -70,32 +70,7 @@ AC_DEFUN([AMANDA_CHECK_IPV6],
        [
-           case "$target" in
+           case "$host" in
                *-pc-cygwin) amanda_cv_working_ipv6=no;;
 -              *)
 -                  AC_RUN_IFELSE([AC_LANG_SOURCE([[

diff --git a/swig.patch b/swig.patch
index bf97610c5db459e719442a537b3381e11704435d..19e187a2bf23872fcf03cfcc46b8e8b40a36fe8b 100644 (file)
--- a/swig.patch
+++ b/swig.patch
@@ -1,19 +1,20 @@
---- amanda-3.3.6/perl/Amanda/Xfer.swg.orig     2015-12-27 11:44:42.539670320 +0100
-+++ amanda-3.3.6/perl/Amanda/Xfer.swg  2015-12-27 11:47:02.104286963 +0100
-@@ -533,8 +533,6 @@
- %perlcode {
+diff -urNp -x '*.orig' amanda-3.5.1.org/perl/Amanda/Xfer.swg amanda-3.5.1/perl/Amanda/Xfer.swg
+--- amanda-3.5.1.org/perl/Amanda/Xfer.swg      2017-12-01 14:26:29.000000000 +0100
++++ amanda-3.5.1/perl/Amanda/Xfer.swg  2021-05-08 10:23:15.580125519 +0200
+@@ -614,8 +614,6 @@ XFER_ELEMENT_SUBCLASS_OF(Amanda::Xfer::E
+ %perlcode %{
  sub new { 
      my $pkg = shift;
 -    # The C function adds the proper blessing -- this function
 -    # just gets $pkg out of the way.
      C_CONSTRUCTOR(@_);
  }
- }
-@@ -543,7 +543,6 @@
+ %}
+@@ -624,7 +622,6 @@ sub new {
  %define OVERLOAD_REPR()
- %perlcode {
+ %perlcode %{
  use overload '""' => sub { $_[0]->repr(); };
 -# overload comparison, so users can ask if one obj == another
  use overload '==' => sub {     Amanda::Xfer::same_elements($_[0], $_[1]); };
  use overload '!=' => sub { not Amanda::Xfer::same_elements($_[0], $_[1]); };
- }
+ %}