apache1-apxs_force_rm_cp.patch

   1 diff -Nru apache_1.3.12/src/support/apxs.pl apache_1.3.12.new/src/support/apxs.pl
   2 --- apache_1.3.12/src/support/apxs.pl   Mon Jun 12 18:37:55 2000
   3 +++ apache_1.3.12.new/src/support/apxs.pl       Mon Jun 12 18:39:53 2000
   4 @@ -459,7 +459,7 @@
   5          if ($^O ne "MSWin32") {
   6              $t =~ s|^.+/([^/]+)$|$1|;
   7              if ($opt_i) {
   8 -                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
   9 +                push(@cmds, "cp -f $f $CFG_LIBEXECDIR/$t");
  10                  push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
  11              }
  12          }
  13 @@ -555,9 +555,9 @@
  14                  print FP $content;
  15                  close(FP);
  16                  if ($^O ne "MSWin32") {
  17 -                    push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak");
  18 -                    push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf");
  19 -                    push(@cmds, "rm $cfgbase.conf.new");
  20 +                    push(@cmds, "cp -f $cfgbase.conf $cfgbase.conf.bak");
  21 +                    push(@cmds, "cp -f $cfgbase.conf.new $cfgbase.conf");
  22 +                    push(@cmds, "rm -f $cfgbase.conf.new");
  23                  } else {
  24                      $cfgbase =~ s|/|\\|g;
  25                      push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\"");