Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1:/tmp/cvs-serv6591
Modified Files:
fink.conf.5.in fink.info.in inject.pl
Log Message:
Implement fink master mirroring via distfiles.opendarwin.org
(patch# 700260 )
Note: mirror currently has most files, but is not regularly syncing, that will happen
soon.
Index: fink.conf.5.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.conf.5.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fink.conf.5.in 16 Jan 2003 16:38:34 -0000 1.2
+++ fink.conf.5.in 6 Apr 2003 01:58:23 -0000 1.3
@@ -203,7 +203,7 @@
.Bl -tag -width flag -offset indent -compact
.It MirrorContinent: eur
.El
-.It Cm MirrorCountry: six letter code
+.It Cm MirrorCountry: Ar six letter code
You should change this value using the
.Nm fink configure
command. The three letter code is one found in
@@ -212,6 +212,21 @@
.Bl -tag -width flag -offset indent -compact
.It MirrorCountry: eur-AT
.El
+.It Cm MirrorOrder: Ar MasterFirst or MasterLast or MasterNever or ClosestFirst
+fink supports 'Master' mirrors, which are mirrored repositories of the source
+tarballs for all fink packages. The advantage of using the Master mirror set is that
+the source download URLs will never break. Users can choose to use
+these mirrors which are maintained by the fink team, or to use only the original
+source URLs and external mirror sites such as the gnome, KDE, and debian mirror sites.
+Additionally users can choose to combine the two sets, which are then searched in
proximity order, as
+documented above. When using the MasterFirst or MasterLast options, the user can
'skip ahead'
+to the Master (or non Master) set if a download fails. The options are:
+.Bl -tag -width flag -offset indent -compact
+.It MasterFirst - Search "Master" source mirrors first.
+.It MasterLast - Search "Master" source mirrors last.
+.It MasterNever - Never use "Master" source mirrors.
+.It ClosestFirst - Search closest source mirrors first. (combine all mirrors into one
set)
+.El
.El
.\"
.\"
Index: fink.info.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.info.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fink.info.in 22 Dec 2002 22:09:01 -0000 1.5
+++ fink.info.in 6 Apr 2003 01:58:23 -0000 1.6
@@ -2,6 +2,7 @@
Version: @VERSION@
Revision: @REVISION@
Source: %n-%v.tar
+Source-MD5: @MD5@
NoSourceDirectory: true
Depends: base-files
Essential: yes
Index: inject.pl
===================================================================
RCS file: /cvsroot/fink/fink/inject.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- inject.pl 15 Jan 2003 21:32:05 -0000 1.11
+++ inject.pl 6 Apr 2003 01:58:23 -0000 1.12
@@ -48,7 +48,7 @@
unshift @INC, "$FindBin::RealBin/perlmod";
require Fink::Services;
-import Fink::Services qw(&print_breaking &read_config &execute);
+import Fink::Services qw(&print_breaking &read_config &execute &file_MD5_checksum);
require Fink::Config;
### locate Fink installation
@@ -129,49 +129,49 @@
}
}
-### create and copy description file
+### create tarball for the package
-print "Copying package description...\n";
+print "Creating tarball...\n";
$script = "";
-if (not -d "$basepath/fink/debs") {
- $script .= "mkdir -p $basepath/fink/debs\n";
-}
-if (not -d "$basepath/fink/dists/local/bootstrap/finkinfo") {
- $script .= "mkdir -p $basepath/fink/dists/local/bootstrap/finkinfo\n";
+if (not -d "$basepath/src") {
+ $script .= "mkdir -p $basepath/src\n";
}
-$script .= "sed -e 's/[EMAIL PROTECTED]@/$packageversion/' -e 's/[EMAIL
PROTECTED]@/$packagerevision/' <fink.info.in
>$basepath/fink/dists/local/bootstrap/finkinfo/fink-$packageversion.info\n";
+$script .=
+ "tar -cf $basepath/src/fink-$packageversion.tar ".
+ "COPYING INSTALL INSTALL.html README README.html USAGE USAGE.html ".
+ "ChangeLog VERSION fink.in fink.8.in fink.conf.5.in install.sh setup.sh ".
+ "shlibs.default.in postinstall.pl.in perlmod update mirror\n";
foreach $cmd (split(/\n/,$script)) {
next unless $cmd; # skip empty lines
if (&execute($cmd)) {
- print "ERROR: Can't copy package description.\n";
+ print "ERROR: Can't create tarball.\n";
exit 1;
}
}
-### create tarball for the package
+### create and copy description file
-print "Creating tarball...\n";
+print "Copying package description...\n";
$script = "";
-if (not -d "$basepath/src") {
- $script .= "mkdir -p $basepath/src\n";
+if (not -d "$basepath/fink/debs") {
+ $script .= "mkdir -p $basepath/fink/debs\n";
}
-
-$script .=
- "tar -cf $basepath/src/fink-$packageversion.tar ".
- "COPYING INSTALL INSTALL.html README README.html USAGE USAGE.html ".
- "ChangeLog VERSION fink.in fink.8.in fink.conf.5.in install.sh setup.sh ".
- "shlibs.default.in postinstall.pl.in perlmod update mirror\n";
+if (not -d "$basepath/fink/dists/local/bootstrap/finkinfo") {
+ $script .= "mkdir -p $basepath/fink/dists/local/bootstrap/finkinfo\n";
+}
+my $md5 = &file_MD5_checksum("$basepath/src/fink-$packageversion.tar");
+$script .= "sed -e 's/[EMAIL PROTECTED]@/$packageversion/' -e 's/[EMAIL
PROTECTED]@/$packagerevision/' -e 's/[EMAIL PROTECTED]@/$md5/' <fink.info.in
>$basepath/fink/dists/local/bootstrap/finkinfo/fink-$packageversion.info\n";
foreach $cmd (split(/\n/,$script)) {
next unless $cmd; # skip empty lines
if (&execute($cmd)) {
- print "ERROR: Can't create tarball.\n";
+ print "ERROR: Can't copy package description.\n";
exit 1;
}
}
-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb:
Dedicated Hosting for just $79/mo with 500 GB of bandwidth!
No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
