some x86_64 build fixes

7 files changed, 159 insertions, 142 deletions

diff --git a/Makefile b/Makefile
index 52fd53bd2..ba4ad1c5f 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ upload:
 	$(MAKE) upload_only
 
 upload_only:
-	function upload() { rel=`echo $$1 | sed 's!$(ROOTDEST)/!!'`; rsync -qSavz --verbose --exclude '*~' -e ssh --delete $$1/$$2 mandrake@ken:/c/cooker/$$rel; } ;\
+	function upload() { rel=`echo $$1 | sed 's!$(ROOTDEST)/!!'`; rsync -qSavz --verbose --exclude '*~' -e ssh --delete $$1/$$2 mandrake@ken:/c/x86_64/$$rel; } ;\
 	upload $(MEDIA_INFO_DEST) 'compssUsers.pl*' ;\
 	upload $(MEDIA_INFO_DEST) rpmsrate ;\
 	upload $(STAGE2_DEST) '*.clp' ;\
diff --git a/isolinux-graphic.bmp.parameters b/isolinux-graphic.bmp.parameters
index ad3699c96..bdf1d6640 100644
--- a/isolinux-graphic.bmp.parameters
+++ b/isolinux-graphic.bmp.parameters
@@ -5,6 +5,6 @@ mode=259
 progress_c=121
 progress_h=13
 progress_real_w=425
-progress_w=16
+progress_w=5
 progress_x=186
 progress_y=396
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index abfde8000..0efa935fc 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -95,11 +95,11 @@ our %l = (
 	'53c7,8xx',
         qw(AM53C974 BusLogic NCR53c406a a100u2w advansys aha152x aha1542 aha1740),
         qw(atp870u dc395x dc395x_trm dmx3191d dtc g_NCR5380 in2000 initio pas16 pci2220i psi240i fdomain),
-        qw(qla1280 qla2x00 qla2xxx qlogicfas qlogicfc),
+        qw(qla1280 qla2x00 qlogicfas qlogicfc),
         qw(seagate wd7000 sim710 sym53c416 t128 tmscsim u14-34f ultrastor),
         qw(eata eata_pio eata_dma nsp32),
       ),
-      qw(aic7xxx aic7xxx_old aic79xx pci2000 qlogicisp sym53c8xx lpfc lpfcdd), # ncr53c8xx
+      qw(aic7xxx aic7xxx_old aic79xx pci2000 qlogicisp lpfcdd), # ncr53c8xx
     ],
     sata => [
       # note that ata_piix manage RAID devices on ICH6R
@@ -118,7 +118,7 @@ our %l = (
        ),
       ),
     ],
-    pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs) ], #ide_cs
+    pcmcia => [ qw(aha152x_cs nsp_cs ide-cs) ], #ide_cs
     raw => [ qw(sd_mod) ],
     usb => [ qw(usb-storage) ],
     firewire => [ qw(sbp2) ],
@@ -138,7 +138,7 @@ our %l = (
       if_(arch() !~ /^ppc/, qw(i2c-hydra i2c-ibm_iic i2c-mpc)),
     ],
     pcmcia => [
-      if_(arch() !~ /^sparc/, qw(au1x00_ss i82365 i82092 pd6729 tcic vrc4171_card vrc4173_cardu yenta_socket)), # cb_enabler
+      if_(arch() !~ /^sparc/, qw(au1x00_ss i82365 i82092 tcic vrc4171_card vrc4173_cardu yenta_socket)), # cb_enabler
     ],
     usb_keyboard => [ qw(usbkbd keybdev) ],
    #serial_cs
diff --git a/kernel/modules.pl b/kernel/modules.pl
index 22f71e048..1188fe8f7 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -26,7 +26,7 @@ my %modules_only_for_all_img = (
 
   'disk/scsi' => [
     # ISA cards:
-    qw(NCR53c406a aha152x psi240i qlogicfas qlogicfc wd7000 sim710 t128 ultrastor), '53c7,8xx',
+    qw(NCR53c406a aha152x psi240i qlogicfc wd7000 sim710 t128 ultrastor), '53c7,8xx',
     qw(qla2x00 in2000 pas16 a100u2w seagate g_NCR5380),
     if_(arch() =~ /x86_64/, qw(53c7,8xx nsp32 initio advansys atp870u)), #- old
     qw(AM53C974), # deprecated by tmscsim
@@ -92,7 +92,7 @@ my @modules_removed_from_stage1 = flatten_and_check(\%modules_removed_from_stage
 my %images = (
     pcmcia  => 'fs/cdrom|loopback disk/cdrom|raw|pcmcia bus/pcmcia',
     cdrom   => 'fs/cdrom|loopback disk/cdrom|raw|scsi',
-    network  => 'bus/usb|usb_keyboard|pcmcia disk/raw|usb',
+    network  => '',
     network_drivers => 'fs/network|loopback network/main|pcmcia|usb|raw|gigabit',
     all     => 'fs/cdrom disk/cdrom|raw bus/usb|usb_keyboard disk/usb|scsi fs/loopback|local bus/pcmcia disk/ide|pcmcia|sata|hardware_raid fs/network network/main|pcmcia|usb|raw|gigabit|wireless|tokenring bus/firewire disk/firewire',
 );
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 1affd1a9c..ae3879824 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -358,6 +358,8 @@ sub set {
 	$when_network_is_up->(sub {
 	    run_program::rooted($::prefix, 'net', 'ads', 'join', '-U', $authentication->{winuser} . '%' . $authentication->{winpass});
 	});
+    } elsif ($kind eq 'smartcard') {
+
     }
 }
 
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 2fd6ddfe6..15d815aa2 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -535,140 +535,140 @@ updatesi586:rsync://mirror.umr.edu/mandrake/official/updates
 updatesi586:rsync://rsync.gtlib.cc.gatech.edu/mandrake/official/updates
 updatesi586:rsync://rsync.mirrorservice.org/sunsite.uio.no/pub/unix/Linux/mandrakelinux/official/updates
 updatesi586:rsync://rsync.uni-bayreuth.de/Mandrakelinux/official/updates
-officiali586:ftp://anorien.csc.warwick.ac.uk/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://bo.mirror.garr.it/pub/mirrors/Mandrake/official/10.1/i586/media/main/
-officiali586:ftp://chronos.iut-bm.univ-fcomte.fr/pub/linux/distributions/Mandrake/official/10.1/i586/media/main/
-officiali586:ftp://distro.ibiblio.org/pub/Linux/distributions/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://fr2.rpmfind.net/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.ale.org/pub/mirrors/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.aso.ee/pub/Mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.belnet.be/packages/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.cica.es/pub/Linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.ciril.fr/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.cru.fr/pub/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.cs.ucr.edu/pub/mirrors/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.cse.buffalo.edu/pub/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.ens-cachan.fr/pub/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.esat.net/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.fh-giessen.de/pub/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.fh-wolfenbuettel.de/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.fi.muni.cz/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.free.fr/mirrors/ftp.mandrake-linux.com/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.fsn.hu/pub/linux/distributions/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.gtlib.cc.gatech.edu/pub/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.heanet.ie/pub/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.iasi.roedu.net/mirrors/ftp.mandrake.com/official/10.1/i586/media/main/
-officiali586:ftp://ftp.icm.edu.pl/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.informatik.hu-berlin.de/pub/Linux/Distributions/Mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.int-evry.fr/pub/linux/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.isu.edu.tw/pub/Linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.isu.net.sa/pub/mirrors/ftp.mandrake.com/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.kddlabs.co.jp/Linux/packages/Mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.linux.cz/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.lip6.fr/pub/linux/distributions/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.mandrake.ikoula.com/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.mirror.ac.uk/sites/sunsite.uio.no/ftp/linux/mdl/official/10.1/i586/media/main/
-officiali586:ftp://ftp.mirrorservice.org/pub/Mandrake_Linux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.mki.fh-duesseldorf.de/Mirror/Mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.nara.wide.ad.jp/pub/Linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.ndlug.nd.edu/pub/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.neva.ru/Linux-Distrib/Mandrake/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.ntua.gr/pub/linux/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.phys.ttu.edu/pub/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.physics.auth.gr/pub/mirrors/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.prew.hu/pub/Linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.ps.pl/mirrors/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.rediris.es/pub/linux/distributions/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.riken.go.jp/pub/Linux/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.song.fi/pub/mirrors/Mandrake-linux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.sun.ac.za/pub/linux/mandrake/pub/Linux/distributions/official/10.1/i586/media/main/
-officiali586:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.sunsite.org.uk/package/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.tu-chemnitz.de/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.tuniv.szczecin.pl/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.u-strasbg.fr/pub/linux/distributions/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.uasw.edu/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.uio.no/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.uni-wuppertal.de/pub/linux/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.unicamp.br/pub/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.uninett.no/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://ftp.uvsq.fr/pub/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://linux.ntcu.net/dists/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://linux.ups-tlse.fr/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mandrake.contactel.cz/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mandrake.mirrors.pair.com/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mdk.linux.org.tw/pub/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirror.averse.net/pub/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirror.cs.wisc.edu/pub/mirrors/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirror.etf.bg.ac.yu/distributions/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirror.fis.unb.br/pub/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirror.inspire.net.nz/mandrake//official/10.1/i586/media/main/
-officiali586:ftp://mirror.pacific.net.au/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirror.switch.ch/mirror/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://mirror.umr.edu/pub/linux/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirror.usu.edu/mirrors/Mandrake/official/10.1/i586/media/main/
-officiali586:ftp://mirrors.dotsrc.org/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://mirrors.ptd.net/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://mirrors.secsup.org/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://mirrors.xmission.com/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://ramses.wh2.tu-dresden.de/pub/mirrors/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://sunsite.cnlab-switch.ch/mirror/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://sunsite.icm.edu.pl/pub/Linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake/official/10.1/i586/media/main/
-officiali586:ftp://sunsite.mff.cuni.cz/OS/Linux/Dist/Mandrake/mandrake/official/10.1/i586/media/main/
-officiali586:http://anorien.csc.warwick.ac.uk/mirrors/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://distro.ibiblio.org/pub/Linux/distributions/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://fr2.rpmfind.net/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.ale.org/pub/mirrors/mandrake/official/10.1/i586/media/main/
-officiali586:http://ftp.club-internet.fr/pub/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.esat.net/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.fi.muni.cz/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.heanet.ie/pub/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.iasi.roedu.net/mirrors/ftp.mandrake.com/official/10.1/i586/media/main/
-officiali586:http://ftp.isu.edu.tw/pub/Linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.kddlabs.co.jp/Linux/distributions/Mandrake/official/10.1/i586/media/main/
-officiali586:http://ftp.nluug.nl/ftp/pub/os/Linux/distr/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.rediris.es/pub/linux/distributions/mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.riken.go.jp/Linux/mandrake/official/10.1/i586/media/main/
-officiali586:http://ftp.sun.ac.za/ftp/mirrorsites/mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://gulus.usherbrooke.ca/pub/distro/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://klid.dk/homeftp/mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://mandrake.mirrors.pair.com/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://mirror.averse.net/pub/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://mirror.etf.bg.ac.yu/distributions/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://mirror.hamakor.org.il/pub/mirrors/mandrake/official/10.1/i586/media/main/
-officiali586:http://mirror.pacific.net.au/linux/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://mirror.umr.edu/pub/linux/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://mirror.usu.edu/mirrors/Mandrake/official/10.1/i586/media/main/
-officiali586:http://mirrors.dotsrc.org/mandrake/official/10.1/i586/media/main/
-officiali586:http://sunsite.icm.edu.pl/pub/Linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://wftp.tu-chemnitz.de/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:http://www.gtlib.cc.gatech.edu/pub/mandrake/official/10.1/i586/media/main/
-officiali586:http://www.mirror.ac.uk/sites/sunsite.uio.no/ftp/linux/mdl/official/10.1/i586/media/main/
-officiali586:http://www.sunsite.org.uk/package/mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://carroll.cac.psu.edu/mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://distro.ibiblio.org/distros/mandrake/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://ftp.esat.net/ftp/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://ftp.fi.muni.cz/pub/linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://ftp.iasi.roedu.net/mandrake.com/official/10.1/i586/media/main/
-officiali586:rsync://ftp.join.uni-muenster.de/mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://ftp.nluug.nl/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://ftp.riken.go.jp/mandrake/official/10.1/i586/media/main/
-officiali586:rsync://ftp.surfnet.nl/Mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://mirror.umr.edu/mandrake/official/10.1/i586/media/main/
-officiali586:rsync://rsync.gtlib.cc.gatech.edu/mandrake/official/10.1/i586/media/main/
-officiali586:rsync://rsync.mirrorservice.org/sunsite.uio.no/pub/unix/Linux/mandrakelinux/official/10.1/i586/media/main/
-officiali586:rsync://rsync.uni-bayreuth.de/Mandrakelinux/official/10.1/i586/media/main/
+officiali586:ftp://anorien.csc.warwick.ac.uk/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://bo.mirror.garr.it/pub/mirrors/Mandrake/official/10.2/i586/media/main/
+officiali586:ftp://chronos.iut-bm.univ-fcomte.fr/pub/linux/distributions/Mandrake/official/10.2/i586/media/main/
+officiali586:ftp://distro.ibiblio.org/pub/Linux/distributions/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://fr2.rpmfind.net/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.ale.org/pub/mirrors/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.aso.ee/pub/Mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.belnet.be/packages/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.cica.es/pub/Linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.ciril.fr/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.cru.fr/pub/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.cs.ucr.edu/pub/mirrors/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.cse.buffalo.edu/pub/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.ens-cachan.fr/pub/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.esat.net/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.fh-giessen.de/pub/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.fh-wolfenbuettel.de/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.fi.muni.cz/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.free.fr/mirrors/ftp.mandrake-linux.com/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.fsn.hu/pub/linux/distributions/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.gtlib.cc.gatech.edu/pub/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.heanet.ie/pub/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.iasi.roedu.net/mirrors/ftp.mandrake.com/official/10.2/i586/media/main/
+officiali586:ftp://ftp.icm.edu.pl/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.informatik.hu-berlin.de/pub/Linux/Distributions/Mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.int-evry.fr/pub/linux/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.isu.edu.tw/pub/Linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.isu.net.sa/pub/mirrors/ftp.mandrake.com/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.kddlabs.co.jp/Linux/packages/Mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.linux.cz/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.lip6.fr/pub/linux/distributions/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.mandrake.ikoula.com/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.mirror.ac.uk/sites/sunsite.uio.no/ftp/linux/mdl/official/10.2/i586/media/main/
+officiali586:ftp://ftp.mirrorservice.org/pub/Mandrake_Linux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.mki.fh-duesseldorf.de/Mirror/Mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.nara.wide.ad.jp/pub/Linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.ndlug.nd.edu/pub/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.neva.ru/Linux-Distrib/Mandrake/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.ntua.gr/pub/linux/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.phys.ttu.edu/pub/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.physics.auth.gr/pub/mirrors/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.prew.hu/pub/Linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.ps.pl/mirrors/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.rediris.es/pub/linux/distributions/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.riken.go.jp/pub/Linux/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.song.fi/pub/mirrors/Mandrake-linux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.sun.ac.za/pub/linux/mandrake/pub/Linux/distributions/official/10.2/i586/media/main/
+officiali586:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.sunsite.org.uk/package/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.tu-chemnitz.de/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.tuniv.szczecin.pl/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.u-strasbg.fr/pub/linux/distributions/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.uasw.edu/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.uio.no/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.uni-wuppertal.de/pub/linux/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.unicamp.br/pub/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.uninett.no/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://ftp.uvsq.fr/pub/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://linux.ntcu.net/dists/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://linux.ups-tlse.fr/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mandrake.contactel.cz/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mandrake.mirrors.pair.com/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mdk.linux.org.tw/pub/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirror.averse.net/pub/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirror.cs.wisc.edu/pub/mirrors/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirror.etf.bg.ac.yu/distributions/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirror.fis.unb.br/pub/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirror.inspire.net.nz/mandrake//official/10.2/i586/media/main/
+officiali586:ftp://mirror.pacific.net.au/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirror.switch.ch/mirror/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://mirror.umr.edu/pub/linux/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirror.usu.edu/mirrors/Mandrake/official/10.2/i586/media/main/
+officiali586:ftp://mirrors.dotsrc.org/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://mirrors.ptd.net/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://mirrors.secsup.org/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://mirrors.xmission.com/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://ramses.wh2.tu-dresden.de/pub/mirrors/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://sunsite.cnlab-switch.ch/mirror/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://sunsite.icm.edu.pl/pub/Linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake/official/10.2/i586/media/main/
+officiali586:ftp://sunsite.mff.cuni.cz/OS/Linux/Dist/Mandrake/mandrake/official/10.2/i586/media/main/
+officiali586:http://anorien.csc.warwick.ac.uk/mirrors/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://distro.ibiblio.org/pub/Linux/distributions/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://fr2.rpmfind.net/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.ale.org/pub/mirrors/mandrake/official/10.2/i586/media/main/
+officiali586:http://ftp.club-internet.fr/pub/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.esat.net/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.fi.muni.cz/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.heanet.ie/pub/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.iasi.roedu.net/mirrors/ftp.mandrake.com/official/10.2/i586/media/main/
+officiali586:http://ftp.isu.edu.tw/pub/Linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.kddlabs.co.jp/Linux/distributions/Mandrake/official/10.2/i586/media/main/
+officiali586:http://ftp.nluug.nl/ftp/pub/os/Linux/distr/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.rediris.es/pub/linux/distributions/mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.riken.go.jp/Linux/mandrake/official/10.2/i586/media/main/
+officiali586:http://ftp.sun.ac.za/ftp/mirrorsites/mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://gulus.usherbrooke.ca/pub/distro/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://klid.dk/homeftp/mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://mandrake.mirrors.pair.com/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://mirror.averse.net/pub/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://mirror.etf.bg.ac.yu/distributions/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://mirror.hamakor.org.il/pub/mirrors/mandrake/official/10.2/i586/media/main/
+officiali586:http://mirror.pacific.net.au/linux/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://mirror.umr.edu/pub/linux/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://mirror.usu.edu/mirrors/Mandrake/official/10.2/i586/media/main/
+officiali586:http://mirrors.dotsrc.org/mandrake/official/10.2/i586/media/main/
+officiali586:http://sunsite.icm.edu.pl/pub/Linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://wftp.tu-chemnitz.de/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:http://www.gtlib.cc.gatech.edu/pub/mandrake/official/10.2/i586/media/main/
+officiali586:http://www.mirror.ac.uk/sites/sunsite.uio.no/ftp/linux/mdl/official/10.2/i586/media/main/
+officiali586:http://www.sunsite.org.uk/package/mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://carroll.cac.psu.edu/mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://distro.ibiblio.org/distros/mandrake/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://ftp.esat.net/ftp/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://ftp.fi.muni.cz/pub/linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://ftp.iasi.roedu.net/mandrake.com/official/10.2/i586/media/main/
+officiali586:rsync://ftp.join.uni-muenster.de/mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://ftp.nluug.nl/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://ftp.riken.go.jp/mandrake/official/10.2/i586/media/main/
+officiali586:rsync://ftp.surfnet.nl/Mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://mirror.umr.edu/mandrake/official/10.2/i586/media/main/
+officiali586:rsync://rsync.gtlib.cc.gatech.edu/mandrake/official/10.2/i586/media/main/
+officiali586:rsync://rsync.mirrorservice.org/sunsite.uio.no/pub/unix/Linux/mandrakelinux/official/10.2/i586/media/main/
+officiali586:rsync://rsync.uni-bayreuth.de/Mandrakelinux/official/10.2/i586/media/main/
 updatesx86_64:ftp://anorien.csc.warwick.ac.uk/Mandrakelinux/official/updates/x86_64
 updatesx86_64:ftp://bo.mirror.garr.it/pub/mirrors/Mandrake/official/updates/x86_64
 updatesx86_64:ftp://carroll.cac.psu.edu/pub/linux/distributions/mandrakelinux/official/updates/x86_64
diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml
index 2ffde5fdd..7fed3e857 100644
--- a/perl-install/share/list.xml
+++ b/perl-install/share/list.xml
@@ -117,6 +117,17 @@
   /usr/share/themes/Galaxy/gtk-2.0/gtkrc
   /bin/brltty
 
+  /lib64/tls/libc-2.3.5.so
+  /lib64/tls/libc.so.6
+  /lib64/tls/libm-2.3.5.so
+  /lib64/tls/libm.so.6
+  /lib64/tls/libpthread-0.10.so
+  /lib64/tls/libpthread.so.0
+  /lib64/tls/librt-2.3.5.so
+  /lib64/tls/librt.so.1
+  /lib64/tls/libthread_db-1.0.so
+  /lib64/tls/libthread_db.so.1
+
   <from expand="glob">
     /etc/gtk-2.0/gdk-pixbuf.loaders.*
     /etc/gtk-2.0/gtk.immodules.*
@@ -236,6 +247,10 @@
   ARCH-linux/Socket.pm
   ARCH-linux/_h2ph_pre.ph
   ARCH-linux/asm/unistd.ph
+  <if ARCH="x86_64">
+  ARCH-linux/asm-i386/unistd.ph 
+  ARCH-linux/asm-x86_64/unistd.ph 
+  </if>
   <if ARCH="ia64">
   ARCH-linux/asm-i386/unistd.ph 
   ARCH-linux/asm-x86_64/unistd.ph