Index: general/genlib/expat/expat.ent
===================================================================
--- general/genlib/expat/expat.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/genlib/expat/expat.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY expat-version "1.95.7">
 <!ENTITY expat-download-http "http://umn.dl.sourceforge.net/sourceforge/expat/expat-&expat-version;.tar.gz">
-<!ENTITY expat-download-ftp "ftp://ftp.at.linuxfromscratch.org/opsys/linux/sf/e/expat/expat-&expat-version;.tar.gz">
+<!ENTITY expat-download-ftp " ">
 <!ENTITY expat-size "290 KB">
 <!ENTITY expat-buildsize "3.2 MB">
Index: general/genlib/libpcap/libpcap.ent
===================================================================
--- general/genlib/libpcap/libpcap.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/genlib/libpcap/libpcap.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY libpcap-version "0.8.3">
 <!ENTITY libpcap-download-http "http://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
-<!ENTITY libpcap-download-ftp "ftp://ftp.hacettepe.edu.tr/pub/linux/sunfreeware/freeware/SOURCES/libpcap-&libpcap-version;.tar.gz">
+<!ENTITY libpcap-download-ftp " ">
 <!ENTITY libpcap-size "299 KB">
 <!ENTITY libpcap-buildsize "1.9 MB">
Index: general/genlib/pcre/pcre.ent
===================================================================
--- general/genlib/pcre/pcre.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/genlib/pcre/pcre.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY pcre-desc SYSTEM "pcre-desc.xml">
 <!ENTITY pcre-version "4.5">
-<!ENTITY pcre-download-http "http://ftp.jg555.com/linux/libs/pcre-&pcre-version;.tar.bz2">
+<!ENTITY pcre-download-http " ">
 <!ENTITY pcre-download-ftp "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
 <!ENTITY pcre-size "344 KB">
Index: general/genutils/compface/compface.ent
===================================================================
--- general/genutils/compface/compface.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/genutils/compface/compface.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY compface-version "1.4">
 <!ENTITY compface-download-http "http://www.ibiblio.org/pub/Linux/apps/graphics/convert/compface-&compface-version;.tar.gz">
-<!ENTITY compface-download-ftp "ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/convert/compface-&compface-version;.tar.gz">
+<!ENTITY compface-download-ftp " ">
 <!ENTITY compface-size "28 KB">
 <!ENTITY compface-buildsize "520 KB">
Index: general/genutils/imagemagick/imagemagick.ent
===================================================================
--- general/genutils/imagemagick/imagemagick.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/genutils/imagemagick/imagemagick.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -6,5 +6,5 @@
 <!ENTITY imagemagick-patch-version "16">
 <!ENTITY imagemagick-download-http "http://aleron.dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
-<!ENTITY imagemagick-download-ftp "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
+<!ENTITY imagemagick-download-ftp " ">
 <!ENTITY imagemagick-size "4.1 MB">
 <!ENTITY imagemagick-buildsize "107 MB">
Index: general/graphlib/aalib/aalib.ent
===================================================================
--- general/graphlib/aalib/aalib.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/graphlib/aalib/aalib.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY aalib-version "1.4rc5">
 <!ENTITY aalib-download-http "http://telia.dl.sourceforge.net/sourceforge/aa-project/aalib-&aalib-version;.tar.gz">
-<!ENTITY aalib-download-ftp "ftp://ftp.sourceforge.net/pub/sourceforge/aa-project/aalib-&aalib-version;.tar.gz">
+<!ENTITY aalib-download-ftp " ">
 <!ENTITY aalib-size "388 KB">
 <!ENTITY aalib-buildsize "6.5 MB">
Index: general/graphlib/lcms/lcms.ent
===================================================================
--- general/graphlib/lcms/lcms.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/graphlib/lcms/lcms.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -6,5 +6,5 @@
 <!ENTITY lcms-version "1.12">
 <!ENTITY lcms-download-http "http://www.littlecms.com/lcms-&lcms-version;.tar.gz">
-<!ENTITY lcms-download-ftp "ftp://gd.tuwien.ac.at/graphics/libs/alsolibs/lcms-&lcms-version;.tar.gz">
+<!ENTITY lcms-download-ftp " ">
 <!ENTITY lcms-size "555 KB">
 <!ENTITY lcms-buildsize "17 MB">
Index: general/graphlib/libmng/libmng.ent
===================================================================
--- general/graphlib/libmng/libmng.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/graphlib/libmng/libmng.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY libmng-desc SYSTEM "libmng-desc.xml">
 <!ENTITY libmng-version "1.0.7">
-<!ENTITY libmng-download-http "http://twtelecom.dl.sourceforge.net/sourceforge/libmng/libmng-&libmng-version;.tar.gz">
+<!ENTITY libmng-download-http "http://heanet.dl.sourceforge.net/sourceforge/libmng/libmng-&libmng-version;.tar.gz">
 <!ENTITY libmng-download-ftp " ">
 <!ENTITY libmng-size "492 KB">
Index: general/graphlib/libtiff/libtiff.ent
===================================================================
--- general/graphlib/libtiff/libtiff.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/graphlib/libtiff/libtiff.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -7,5 +7,5 @@
 <!ENTITY libtiff-version "3.6.1">
 <!ENTITY libtiff-download-http "http://libtiff.maptools.org/dl/tiff-v&libtiff-version;.tar.gz">
-<!ENTITY libtiff-download-ftp "ftp://ftp.remotesensing.org/pub/libtiff/tiff-v&libtiff-version;.tar.gz">
+<!ENTITY libtiff-download-ftp " ">
 <!ENTITY libtiff-size "1.1 MB">
 <!ENTITY libtiff-buildsize "11 MB">
Index: general/graphlib/svgalib/svgalib.ent
===================================================================
--- general/graphlib/svgalib/svgalib.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/graphlib/svgalib/svgalib.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -7,5 +7,5 @@
 <!ENTITY SVGAlib-version "1.4.3">
 <!ENTITY SVGAlib-download-http "http://www.svgalib.org/svgalib-&SVGAlib-version;.tar.gz">
-<!ENTITY SVGAlib-download-ftp "ftp://ftp.ibiblio.org/pub/Linux/libs/graphics/svgalib-&SVGAlib-version;.tar.gz">
+<!ENTITY SVGAlib-download-ftp " ">
 <!ENTITY SVGAlib-size "827 KB">
 <!ENTITY SVGAlib-buildsize "9.7 MB">
Index: general/prog/nasm/nasm.ent
===================================================================
--- general/prog/nasm/nasm.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/prog/nasm/nasm.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY NASM-version "0.98.38">
 <!ENTITY NASM-download-http "http://unc.dl.sourceforge.net/sourceforge/nasm/nasm-&NASM-version;.tar.bz2">
-<!ENTITY NASM-download-ftp "ftp://ftp.iasi.roedu.net/pub/mirrors/download.sourceforge.net/nasm/nasm-&NASM-version;.tar.bz2">
+<!ENTITY NASM-download-ftp " ">
 <!ENTITY NASM-size "536 KB">
 <!ENTITY NASM-buildsize "6.3 MB">
Index: general/prog/ruby/ruby.ent
===================================================================
--- general/prog/ruby/ruby.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/prog/ruby/ruby.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -5,5 +5,5 @@
 <!ENTITY ruby-version "1.8.1">
 <!ENTITY ruby-download-http "http://rubyforge.org/download.php/262/ruby-&ruby-version;.tar.gz">
-<!ENTITY ruby-download-ftp "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-&ruby-version;.tar.gz">
+<!ENTITY ruby-download-ftp " ">
 <!ENTITY ruby-size "2.6 MB">
 <!ENTITY ruby-buildsize "31 MB">
Index: general/sysutils/hdparm/hdparm.ent
===================================================================
--- general/sysutils/hdparm/hdparm.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/sysutils/hdparm/hdparm.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -6,5 +6,5 @@
 <!ENTITY hdparm-version "5.5">
 <!ENTITY hdparm-download-http "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-&hdparm-version;.tar.gz">
-<!ENTITY hdparm-download-ftp "ftp://ftp.ibiblio.org/pub/Linux/system/hardware/hdparm-&hdparm-version;.tar.gz">
+<!ENTITY hdparm-download-ftp " ">
 <!ENTITY hdparm-size "33 KB">
 <!ENTITY hdparm-buildsize "257 KB">
Index: general/sysutils/pkgconfig/pkgconfig.ent
===================================================================
--- general/sysutils/pkgconfig/pkgconfig.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/sysutils/pkgconfig/pkgconfig.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -6,5 +6,5 @@
 <!ENTITY pkgconfig-version "0.15.0">
 <!ENTITY pkgconfig-download-http "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-&pkgconfig-version;.tar.gz">
-<!ENTITY pkgconfig-download-ftp "ftp://ftp.netbuddy.org/linux/pkgconfig-&pkgconfig-version;.tar.gz">
+<!ENTITY pkgconfig-download-ftp " ">
 <!ENTITY pkgconfig-size "604 KB">
 <!ENTITY pkgconfig-buildsize "5.2 MB">
Index: general/sysutils/unzip/unzip-inst.xml
===================================================================
--- general/sysutils/unzip/unzip-inst.xml	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/sysutils/unzip/unzip-inst.xml	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -10,8 +10,6 @@
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../unzip-5.50-fix-Makefile.patch &amp;&amp;
-patch -Np1 -i ../unzip-5.50-fix-libz.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../unzip-5.50-fix-libz.patch &amp;&amp;
 patch -Np1 -i ../unzip-5.50-dont-make-noise.patch &amp;&amp;
-patch -Np1 -i ../unzip-5.50-dotdot.patch &amp;&amp;
 cp unix/Makefile . &amp;&amp;
 make prefix=/usr linux &amp;&amp;
@@ -21,3 +19,2 @@
 
 </sect2>
-
Index: general/sysutils/unzip/unzip-intro.xml
===================================================================
--- general/sysutils/unzip/unzip-intro.xml	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/sysutils/unzip/unzip-intro.xml	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -25,9 +25,5 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required patch: <ulink
-url="&patch-root;/unzip-5.50-fix-Makefile.patch"/></para></listitem>
-<listitem><para>Required patch: <ulink
 url="&patch-root;/unzip-5.50-fix-libz.patch"/></para></listitem>
-<listitem><para>Recommended patch: <ulink
-url="&patch-root;/unzip-5.50-dotdot.patch"/></para></listitem>
 <listitem><para>Recommended patch: <ulink
 url="&patch-root;/unzip-5.50-dont-make-noise.patch"/></para></listitem></itemizedlist>
Index: general/sysutils/unzip/unzip.ent
===================================================================
--- general/sysutils/unzip/unzip.ent	(revision 5f51d2187e3e65acffab8c9205d97ec9629aa7aa)
+++ general/sysutils/unzip/unzip.ent	(revision 8bf4c673df39fae8a60cb4a906000764ce8b1b8d)
@@ -4,8 +4,8 @@
 <!ENTITY unzip-exp SYSTEM "unzip-exp.xml">
 <!ENTITY unzip-desc SYSTEM "unzip-desc.xml">
-<!ENTITY unzip-version "5.50">
-<!ENTITY unzip-download-http "http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz">
-<!ENTITY unzip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz">
+<!ENTITY unzip-version "5.51">
+<!ENTITY unzip-download-http "http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/unzip551.tar.gz">
+<!ENTITY unzip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/unzip551.tar.gz">
 <!ENTITY unzip-size "1.1 MB">
-<!ENTITY unzip-buildsize "5.8 MB">
-<!ENTITY unzip-time "0.16 SBU">
+<!ENTITY unzip-buildsize "6.5 MB">
+<!ENTITY unzip-time "0.11 SBU">
