Software Freedom Conservancy

Software Freedom Law Center

Changeset 585

Show
Ignore:
Timestamp:
01/18/08 11:46:34 (11 months ago)
Author:
bkuhn
Message:

r83@hughes: bkuhn | 2008-01-18 11:30:15 -0500

  • Fixed patch to correctly only patch apt-mirror as it should be. The rest of the patch was just plain broken and an accident.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/dists/gutsy/apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch

    r581 r585  
    1 #! /bin/sh /usr/share/dpatch/dpatch-run 
    2 ## 01_mirror_bz2_files_too.dpatch by  <bkuhn@softwarefreedom.org> 
    3 ## 
    4 ## All lines beginning with `## DP:' are a description of the patch. 
    5 ## DP: Should also mirror bz2 files even though they are not used 
    6  
    7 @DPATCH@ 
    8  
    9 === apt-mirror 
    10 ================================================================== 
    11 --- apt-mirror  (revision 78) 
    12 +++ apt-mirror  (local) 
    13 @@ -286,9 +286,11 @@ 
    14         foreach (@components) { 
    15             add_url_to_download($url . $_ . "/source/Release"); 
    16             add_url_to_download($url . $_ . "/source/Sources.gz"); 
    17 +           add_url_to_download($url . $_ . "/source/Sources.bz2"); 
    18         } 
    19      } else { 
    20         add_url_to_download($uri . "/$distribution/Sources.gz"); 
    21 +       add_url_to_download($uri . "/$distribution/Sources.bz2"); 
    22      } 
    23  } 
    24   
    25 @@ -300,13 +302,18 @@ 
    26   
    27         add_url_to_download($url . "Release"); 
    28         add_url_to_download($url . "Release.gpg"); 
    29 -       add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); 
    30 +        if get_variable("_contents") { 
    31 +            add_url_to_download($url . "Contents-" . $arch . ".gz"); 
    32 +            add_url_to_download($url . "Contents-" . $arch . ".bz2"); 
    33 +        } 
    34         foreach (@components) { 
    35             add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); 
    36             add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); 
    37 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); 
    38         } 
    39      } else { 
    40         add_url_to_download($uri . "/$distribution/Packages.gz"); 
    41 +       add_url_to_download($uri . "/$distribution/Packages.bz2"); 
    42      } 
    43  } 
    44   
    45 @@ -319,6 +326,7 @@ 
    46      s[~][%7E]g if get_variable("_tilde"); 
    47      $skipclean{$_} = 1; 
    48      $skipclean{$_} = 1 if s[\.gz$][]; 
    49 +    $skipclean{$_} = 1 if s[\.bz2$][]; 
    50  } 
    51   
    52  ###################################################################################### 
    53 @@ -490,6 +498,7 @@ 
    54      die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; 
    55      copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_"); 
    56      copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.gz$//); 
    57 +    copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.bz2$//); 
    58  } 
    59   
    60   
    61 #! /bin/sh /usr/share/dpatch/dpatch-run 
    62 ## 01_mirror_bz2_files_too.dpatch by  <bkuhn@ebb.org> 
    63 ## 
    64 ## All lines beginning with `## DP:' are a description of the patch. 
    65 ## DP: Should also mirror bz2 files even though they are not used 
    66  
    67 @DPATCH@ 
    68  
    69 === apt-mirror/apt-mirror 
    70 ================================================================== 
    71 --- apt-mirror/apt-mirror       (revision 78) 
    72 +++ apt-mirror/apt-mirror       (local) 
    73 @@ -286,9 +286,11 @@ 
    74         foreach (@components) { 
    75             add_url_to_download($url . $_ . "/source/Release"); 
    76             add_url_to_download($url . $_ . "/source/Sources.gz"); 
    77 +           add_url_to_download($url . $_ . "/source/Sources.bz2"); 
    78         } 
    79      } else { 
    80         add_url_to_download($uri . "/$distribution/Sources.gz"); 
    81 +       add_url_to_download($uri . "/$distribution/Sources.bz2"); 
    82      } 
    83  } 
    84   
    85 @@ -300,13 +302,18 @@ 
    86   
    87         add_url_to_download($url . "Release"); 
    88         add_url_to_download($url . "Release.gpg"); 
    89 -       add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); 
    90 +        if get_variable("_contents") { 
    91 +            add_url_to_download($url . "Contents-" . $arch . ".gz"); 
    92 +            add_url_to_download($url . "Contents-" . $arch . ".bz2"); 
    93 +        } 
    94         foreach (@components) { 
    95             add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); 
    96             add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); 
    97 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); 
    98         } 
    99      } else { 
    100         add_url_to_download($uri . "/$distribution/Packages.gz"); 
    101 +       add_url_to_download($uri . "/$distribution/Packages.bz2"); 
    102      } 
    103  } 
    104   
    105 @@ -319,6 +326,7 @@ 
    106      s[~][%7E]g if get_variable("_tilde"); 
    107      $skipclean{$_} = 1; 
    108      $skipclean{$_} = 1 if s[\.gz$][]; 
    109 +    $skipclean{$_} = 1 if s[\.bz2$][]; 
    110  } 
    111   
    112  ###################################################################################### 
    113 @@ -490,6 +498,7 @@ 
    114      die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; 
    115      copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_"); 
    116      copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.gz$//); 
    117 +    copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.bz2$//); 
    118  } 
    119   
    120   
    121 === debian/patches      (new directory) 
    122 ================================================================== 
    123 === apt-mirror/debian/patches/00list 
    124 ================================================================== 
    125 --- apt-mirror/debian/patches/00list    (revision 78) 
    126 +++ apt-mirror/debian/patches/00list    (local) 
    127 @@ -0,0 +1 @@ 
    128 +01_mirror_bz2_files_too 
    129 === apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch 
    130 ================================================================== 
    131 --- apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch    (revision 78) 
    132 +++ apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch    (local) 
    133 @@ -0,0 +1,60 @@ 
    134 +#! /bin/sh /usr/share/dpatch/dpatch-run 
    135 +## 01_mirror_bz2_files_too.dpatch by  <bkuhn@softwarefreedom.org> 
    136 +## 
    137 +## All lines beginning with `## DP:' are a description of the patch. 
    138 +## DP: Should also mirror bz2 files even though they are not used 
    139 + 
    140 +@DPATCH@ 
    141 + 
    142 +=== apt-mirror 
    143 +================================================================== 
    144 +--- apt-mirror (revision 78) 
    145 ++++ apt-mirror (local) 
    146 +@@ -286,9 +286,11 @@ 
    147 +       foreach (@components) { 
    148 +           add_url_to_download($url . $_ . "/source/Release"); 
    149 +           add_url_to_download($url . $_ . "/source/Sources.gz"); 
    150 ++          add_url_to_download($url . $_ . "/source/Sources.bz2"); 
    151 +       } 
    152 +     } else { 
    153 +       add_url_to_download($uri . "/$distribution/Sources.gz"); 
    154 ++      add_url_to_download($uri . "/$distribution/Sources.bz2"); 
    155 +     } 
    156 + } 
    157 +  
    158 +@@ -300,13 +302,18 @@ 
    159 +  
    160 +       add_url_to_download($url . "Release"); 
    161 +       add_url_to_download($url . "Release.gpg"); 
    162 +-      add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); 
    163 ++        if get_variable("_contents") { 
    164 ++            add_url_to_download($url . "Contents-" . $arch . ".gz"); 
    165 ++            add_url_to_download($url . "Contents-" . $arch . ".bz2"); 
    166 ++        } 
    167 +       foreach (@components) { 
    168 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); 
    169 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); 
    170 ++          add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); 
    171 +       } 
    172 +     } else { 
    173 +       add_url_to_download($uri . "/$distribution/Packages.gz"); 
    174 ++      add_url_to_download($uri . "/$distribution/Packages.bz2"); 
    175 +     } 
    176 + } 
    177 +  
    178 +@@ -319,6 +326,7 @@ 
    179 +     s[~][%7E]g if get_variable("_tilde"); 
    180 +     $skipclean{$_} = 1; 
    181 +     $skipclean{$_} = 1 if s[\.gz$][]; 
    182 ++    $skipclean{$_} = 1 if s[\.bz2$][]; 
    183 + } 
    184 +  
    185 + ###################################################################################### 
    186 +@@ -490,6 +498,7 @@ 
    187 +     die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; 
    188 +     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_"); 
    189 +     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.gz$//); 
    190 ++    copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.bz2$//); 
    191 + } 
    192 +  
    193 +  
    1941#! /bin/sh /usr/share/dpatch/dpatch-run 
    1952## 01_mirror_bz2_files_too.dpatch by  <bkuhn@softwarefreedom.org> 
    …… 
    2029=== apt-mirror/apt-mirror 
    20310================================================================== 
    204 --- apt-mirror/apt-mirror       (revision 78) 
     11--- apt-mirror/apt-mirror       (revision 82) 
    20512+++ apt-mirror/apt-mirror       (local) 
    20613@@ -286,9 +286,11 @@ 
    …… 
    25259  
    25360  
    254 === debian/patches      (new directory) 
    255 ================================================================== 
    256 === apt-mirror/debian/patches/00list 
    257 ================================================================== 
    258 --- apt-mirror/debian/patches/00list    (revision 78) 
    259 +++ apt-mirror/debian/patches/00list    (local) 
    260 @@ -0,0 +1,2 @@ 
    261 +01_mirror_bz2_files_too 
    262 +01_mirror_bz2_files_too 
    263 === apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch 
    264 ================================================================== 
    265 --- apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch    (revision 78) 
    266 +++ apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch    (local) 
    267 @@ -0,0 +1,193 @@ 
    268 +#! /bin/sh /usr/share/dpatch/dpatch-run 
    269 +## 01_mirror_bz2_files_too.dpatch by  <bkuhn@softwarefreedom.org> 
    270 +## 
    271 +## All lines beginning with `## DP:' are a description of the patch. 
    272 +## DP: Should also mirror bz2 files even though they are not used 
    273 + 
    274 +@DPATCH@ 
    275 + 
    276 +=== apt-mirror 
    277 +================================================================== 
    278 +--- apt-mirror (revision 78) 
    279 ++++ apt-mirror (local) 
    280 +@@ -286,9 +286,11 @@ 
    281 +       foreach (@components) { 
    282 +           add_url_to_download($url . $_ . "/source/Release"); 
    283 +           add_url_to_download($url . $_ . "/source/Sources.gz"); 
    284 ++          add_url_to_download($url . $_ . "/source/Sources.bz2"); 
    285 +       } 
    286 +     } else { 
    287 +       add_url_to_download($uri . "/$distribution/Sources.gz"); 
    288 ++      add_url_to_download($uri . "/$distribution/Sources.bz2"); 
    289 +     } 
    290 + } 
    291 +  
    292 +@@ -300,13 +302,18 @@ 
    293 +  
    294 +       add_url_to_download($url . "Release"); 
    295 +       add_url_to_download($url . "Release.gpg"); 
    296 +-      add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); 
    297 ++        if get_variable("_contents") { 
    298 ++            add_url_to_download($url . "Contents-" . $arch . ".gz"); 
    299 ++            add_url_to_download($url . "Contents-" . $arch . ".bz2"); 
    300 ++        } 
    301 +       foreach (@components) { 
    302 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); 
    303 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); 
    304 ++          add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); 
    305 +       } 
    306 +     } else { 
    307 +       add_url_to_download($uri . "/$distribution/Packages.gz"); 
    308 ++      add_url_to_download($uri . "/$distribution/Packages.bz2"); 
    309 +     } 
    310 + } 
    311 +  
    312 +@@ -319,6 +326,7 @@ 
    313 +     s[~][%7E]g if get_variable("_tilde"); 
    314 +     $skipclean{$_} = 1; 
    315 +     $skipclean{$_} = 1 if s[\.gz$][]; 
    316 ++    $skipclean{$_} = 1 if s[\.bz2$][]; 
    317 + } 
    318 +  
    319 + ###################################################################################### 
    320 +@@ -490,6 +498,7 @@ 
    321 +     die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; 
    322 +     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_"); 
    323 +     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.gz$//); 
    324 ++    copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.bz2$//); 
    325 + } 
    326 +  
    327 +  
    328 +#! /bin/sh /usr/share/dpatch/dpatch-run 
    329 +## 01_mirror_bz2_files_too.dpatch by  <bkuhn@ebb.org> 
    330 +## 
    331 +## All lines beginning with `## DP:' are a description of the patch. 
    332 +## DP: Should also mirror bz2 files even though they are not used 
    333 + 
    334 +@DPATCH@ 
    335 + 
    336 +=== apt-mirror/apt-mirror 
    337 +================================================================== 
    338 +--- apt-mirror/apt-mirror      (revision 78) 
    339 ++++ apt-mirror/apt-mirror      (local) 
    340 +@@ -286,9 +286,11 @@ 
    341 +       foreach (@components) { 
    342 +           add_url_to_download($url . $_ . "/source/Release"); 
    343 +           add_url_to_download($url . $_ . "/source/Sources.gz"); 
    344 ++          add_url_to_download($url . $_ . "/source/Sources.bz2"); 
    345 +       } 
    346 +     } else { 
    347 +       add_url_to_download($uri . "/$distribution/Sources.gz"); 
    348 ++      add_url_to_download($uri . "/$distribution/Sources.bz2"); 
    349 +     } 
    350 + } 
    351 +  
    352 +@@ -300,13 +302,18 @@ 
    353 +  
    354 +       add_url_to_download($url . "Release"); 
    355 +       add_url_to_download($url . "Release.gpg"); 
    356 +-      add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); 
    357 ++        if get_variable("_contents") { 
    358 ++            add_url_to_download($url . "Contents-" . $arch . ".gz"); 
    359 ++            add_url_to_download($url . "Contents-" . $arch . ".bz2"); 
    360 ++        } 
    361 +       foreach (@components) { 
    362 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); 
    363 +           add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); 
    364 ++          add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); 
    365 +       } 
    366 +     } else { 
    367 +       add_url_to_download($uri . "/$distribution/Packages.gz"); 
    368 ++      add_url_to_download($uri . "/$distribution/Packages.bz2"); 
    369 +     } 
    370 + } 
    371 +  
    372 +@@ -319,6 +326,7 @@ 
    373 +     s[~][%7E]g if get_variable("_tilde"); 
    374 +     $skipclean{$_} = 1; 
    375 +     $skipclean{$_} = 1 if s[\.gz$][]; 
    376 ++    $skipclean{$_} = 1 if s[\.bz2$][]; 
    377 + } 
    378 +  
    379 + ###################################################################################### 
    380 +@@ -490,6 +498,7 @@ 
    381 +     die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; 
    382 +     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_"); 
    383 +     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.gz$//); 
    384 ++    copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.bz2$//); 
    385 + } 
    386 +  
    387 +  
    388 +=== debian/patches     (new directory) 
    389 +================================================================== 
    390 +=== apt-mirror/debian/patches/00list 
    391 +================================================================== 
    392 +--- apt-mirror/debian/patches/00list   (revision 78) 
    393 ++++ apt-mirror/debian/patches/00list   (local) 
    394 +@@ -0,0 +1 @@ 
    395 ++01_mirror_bz2_files_too 
    396 +=== apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch 
    397 +================================================================== 
    398 +--- apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch   (revision 78) 
    399 ++++ apt-mirror/debian/patches/01_mirror_bz2_files_too.dpatch   (local) 
    400 +@@ -0,0 +1,60 @@ 
    401 ++#! /bin/sh /usr/share/dpatch/dpatch-run 
    402 ++## 01_mirror_bz2_files_too.dpatch by  <bkuhn@softwarefreedom.org> 
    403 ++## 
    404 ++## All lines beginning with `## DP:' are a description of the patch. 
    405 ++## DP: Should also mirror bz2 files even though they are not used 
    406 ++ 
    407 ++@DPATCH@ 
    408 ++ 
    409 ++=== apt-mirror 
    410 ++================================================================== 
    411 ++--- apt-mirror        (revision 78) 
    412 +++++ apt-mirror        (local) 
    413 ++@@ -286,9 +286,11 @@ 
    414 ++      foreach (@components) { 
    415 ++          add_url_to_download($url . $_ . "/source/Release"); 
    416 ++          add_url_to_download($url . $_ . "/source/Sources.gz"); 
    417 +++         add_url_to_download($url . $_ . "/source/Sources.bz2"); 
    418 ++      } 
    419 ++     } else { 
    420 ++      add_url_to_download($uri . "/$distribution/Sources.gz"); 
    421 +++     add_url_to_download($uri . "/$distribution/Sources.bz2"); 
    422 ++     } 
    423 ++ } 
    424 ++  
    425 ++@@ -300,13 +302,18 @@ 
    426 ++  
    427 ++      add_url_to_download($url . "Release"); 
    428 ++      add_url_to_download($url . "Release.gpg"); 
    429 ++-     add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); 
    430 +++        if get_variable("_contents") { 
    431 +++            add_url_to_download($url . "Contents-" . $arch . ".gz"); 
    432 +++            add_url_to_download($url . "Contents-" . $arch . ".bz2"); 
    433 +++        } 
    434 ++      foreach (@components) { 
    435 ++          add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); 
    436 ++          add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); 
    437 +++         add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); 
    438 ++      } 
    439 ++     } else { 
    440 ++      add_url_to_download($uri . "/$distribution/Packages.gz"); 
    441 +++     add_url_to_download($uri . "/$distribution/Packages.bz2"); 
    442 ++     } 
    443 ++ } 
    444 ++  
    445 ++@@ -319,6 +326,7 @@ 
    446 ++     s[~][%7E]g if get_variable("_tilde"); 
    447 ++     $skipclean{$_} = 1; 
    448 ++     $skipclean{$_} = 1 if s[\.gz$][]; 
    449 +++    $skipclean{$_} = 1 if s[\.bz2$][]; 
    450 ++ } 
    451 ++  
    452 ++ ###################################################################################### 
    453 ++@@ -490,6 +498,7 @@ 
    454 ++     die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; 
    455 ++     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_"); 
    456 ++     copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.gz$//); 
    457 +++    copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") . "/$_") if(s/\.bz2$//); 
    458 ++ } 
    459 ++  
    460 ++  

SFLC Main Page

[frdm] Support SFLC