apache-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 @@ -424,7 +424,7 @@
   5          my $t = $f;
   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 @@ -512,9 +512,9 @@
  14              if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
  15                  print FP $content;
  16                  close(FP);
  17 -                system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
  18 -                       "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
  19 -                       "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
  20 +                system("cp -f $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
  21 +                       "cp -f $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
  22 +                       "rm -f $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
  23              } else {
  24                  print STDERR "apxs:Error: unable to open configuration file\n";
  25              }