* Upgraded a bunch of packages (in particular OpenSSL, which had a

  security bug).

svn path=/nixpkgs/trunk/; revision=407

13 files changed, 37 insertions, 35 deletions

diff --git a/pkgs/MPlayer/MPlayer.fix b/pkgs/MPlayer/MPlayer.fix
index cd3beea7229e4..032b7553f9644 100644
--- a/pkgs/MPlayer/MPlayer.fix
+++ b/pkgs/MPlayer/MPlayer.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "MPlayer-0.91")
+  [ ("name", "MPlayer-1.0pre2")
 
   , ("build", Relative("MPlayer/MPlayer-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-0.91.tar.bz2")
-      , ("md5", "bb09138564ddf954392d20dbc4b88ebd")
+      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre2.tar.bz2")
+      , ("md5", "a60c179468f85e83e3f9e1922e81ad64")
       ]))
 
   , ("fonts", App(IncludeFix("fetchurl/fetchurl.fix"),
diff --git a/pkgs/Xft/Xft-build.sh b/pkgs/Xft/Xft-build.sh
index 88541e0cb6ee1..4f674b32ad5de 100755
--- a/pkgs/Xft/Xft-build.sh
+++ b/pkgs/Xft/Xft-build.sh
@@ -2,9 +2,10 @@
 
 envpkgs="$fontconfig $x11"
 . $stdenv/setup || exit 1
+export PATH=$pkgconfig/bin:$PATH
 
 tar xvfz $src || exit 1
-cd fcpackage*/Xft || exit 1
+cd xft-* || exit 1
 ./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
 make || exit 1
 make install || exit 1
diff --git a/pkgs/Xft/Xft.fix b/pkgs/Xft/Xft.fix
index 3f4c06d79c5c5..f2804c7c056fe 100644
--- a/pkgs/Xft/Xft.fix
+++ b/pkgs/Xft/Xft.fix
@@ -1,14 +1,15 @@
 Package(
-  [ ("name", "Xft-20021121")
+  [ ("name", "Xft-2.1.2")
 
   , ("build", Relative("Xft/Xft-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz")
-      , ("md5", "2f2852c80924a9b5356c3037a471c1a1")
+      [ ("url", "http://pdx.freedesktop.org/software/fontconfig/releases/xft-2.1.2.tar.gz")
+      , ("md5", "defb7e801d4938b8b15a426ae57e2f3f")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
   ]
diff --git a/pkgs/fontconfig/fontconfig-build.sh b/pkgs/fontconfig/fontconfig-build.sh
index bc759ce47bf47..92b0be5b61bda 100755
--- a/pkgs/fontconfig/fontconfig-build.sh
+++ b/pkgs/fontconfig/fontconfig-build.sh
@@ -9,7 +9,7 @@ export PATH=$ed/bin:$PATH
 export TZ=UTC
 
 tar xvfz $src || exit 1
-cd fcpackage*/fontconfig || exit 1
+cd fontconfig-* || exit 1
 ./configure --prefix=$out --with-confdir=$out/etc/fonts \
  --x-includes=$x11/include --x-libraries=$x11/lib \
  --with-expat-includes=$expat/include --with-expat-lib=$expat/lib || exit 1
diff --git a/pkgs/fontconfig/fontconfig.fix b/pkgs/fontconfig/fontconfig.fix
index 95f552da17b42..3893265e89f41 100644
--- a/pkgs/fontconfig/fontconfig.fix
+++ b/pkgs/fontconfig/fontconfig.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "fontconfig-20021121")
+  [ ("name", "fontconfig-2.2.90")
 
   , ("build", Relative("fontconfig/fontconfig-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz")
-      , ("md5", "2f2852c80924a9b5356c3037a471c1a1")
+      [ ("url", "http://pdx.freedesktop.org/software/fontconfig/releases/fontconfig-2.2.90.tar.gz")
+      , ("md5", "5cb87476743be1bbf1674ed72a76ae6a")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/glib/glib.fix b/pkgs/glib/glib.fix
index 8daeeb0ec683f..beca151b147d9 100644
--- a/pkgs/glib/glib.fix
+++ b/pkgs/glib/glib.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "glib-2.2.2")
+  [ ("name", "glib-2.2.3")
 
   , ("build", Relative("glib/glib-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.2.tar.bz2")
-      , ("md5", "3e9a9512943c81a78cafa0536dcc8b41")
+      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2")
+      , ("md5", "aa214a10d873b68ddd67cd9de2ccae55")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/gnet/gnet.fix b/pkgs/gnet/gnet.fix
index 38ecfad90ad89..10a0b1f671e6e 100644
--- a/pkgs/gnet/gnet.fix
+++ b/pkgs/gnet/gnet.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "gnet-1.1.9")
+  [ ("name", "gnet-2.0.4")
 
   , ("build", Relative("gnet/gnet-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.gnetlibrary.org/src/gnet-1.1.9.tar.gz")
-      , ("md5", "381b5c6d4031806fc4c3e6b28dc752ec")
+      [ ("url", "http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz")
+      , ("md5", "b43e728391143214e2cfd0b835b6fd2a")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/gtk+/gtk+.fix b/pkgs/gtk+/gtk+.fix
index e2f2a34a90095..2303c516e9e85 100644
--- a/pkgs/gtk+/gtk+.fix
+++ b/pkgs/gtk+/gtk+.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "gtk+-2.2.2")
+  [ ("name", "gtk+-2.2.4")
 
   , ("build", Relative("gtk+/gtk+-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.2.tar.bz2")
-      , ("md5", "5a7c639f0f2d682bdc17e3f81c17c79c")
+      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2")
+      , ("md5", "605332199533e73bc6eec481fb4f1671")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/libxml2/libxml2.fix b/pkgs/libxml2/libxml2.fix
index 8c2120cafa3cf..458008a2f1e7d 100644
--- a/pkgs/libxml2/libxml2.fix
+++ b/pkgs/libxml2/libxml2.fix
@@ -1,10 +1,10 @@
 Package(
-  [ ("name", "libxml2-2.5.8")
+  [ ("name", "libxml2-2.5.9")
   , ("build", Relative("libxml2/libxml2-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://rpmfind.net/pub/libxml/libxml2-2.5.8.tar.gz")
-      , ("md5", "b2caf6efe9ff9c4d2c175fb0689bd20e")
+      [ ("url", "http://rpmfind.net/pub/libxml/libxml2-2.5.9.tar.gz")
+      , ("md5", "e69c69e1f051567d298224b886a90583")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/openssl/openssl.fix b/pkgs/openssl/openssl.fix
index d154ca6e9b959..b553034d5a0b5 100644
--- a/pkgs/openssl/openssl.fix
+++ b/pkgs/openssl/openssl.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "openssl-0.9.7b")
+  [ ("name", "openssl-0.9.7c")
 
   , ("build", Relative("openssl/openssl-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz")
-      , ("md5", "fae4bec090fa78e20f09d76d55b6ccff")
+      [ ("url", "http://www.openssl.org/source/openssl-0.9.7c.tar.gz")
+      , ("md5", "c54fb36218adaaaba01ef733cd88c8ec")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/pan/pan.fix b/pkgs/pan/pan.fix
index b4a7e83ee000c..70c9ff0ea53e0 100644
--- a/pkgs/pan/pan.fix
+++ b/pkgs/pan/pan.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "pan-0.14.0.90")
+  [ ("name", "pan-0.14.2")
 
   , ("build", Relative("pan/pan-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://losser.st-lab.cs.uu.nl/~eelco/mirror/pan-0.14.0.90.tar.bz2")
-      , ("md5", "59612bf2551650c0060b214f9742a105")
+      [ ("url", "http://pan.rebelbase.com/download/releases/0.14.2/SOURCE/pan-0.14.2.tar.bz2")
+      , ("md5", "ed3188e7059bb6d6c209ee5d46ac1852")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/pango/pango.fix b/pkgs/pango/pango.fix
index 281344881ff3f..d1300632534ad 100644
--- a/pkgs/pango/pango.fix
+++ b/pkgs/pango/pango.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "pango-1.2.3")
+  [ ("name", "pango-1.2.5")
 
   , ("build", Relative("pango/pango-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.3.tar.bz2")
-      , ("md5", "12247592ea582907cfd2de81aeb32caf")
+      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2")
+      , ("md5", "df00fe3e71cd297010f24f439b6c8ee6")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
diff --git a/pkgs/sylpheed/sylpheed.fix b/pkgs/sylpheed/sylpheed.fix
index 04e1e24f4cda3..bbeab310ee5f2 100644
--- a/pkgs/sylpheed/sylpheed.fix
+++ b/pkgs/sylpheed/sylpheed.fix
@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "sylpheed-0.9.3")
+  [ ("name", "sylpheed-0.9.6")
 
   , ("build", Relative("sylpheed/sylpheed-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/sylpheed-claws/sylpheed-0.9.3.tar.bz2")
-      , ("md5", "6a1ae8e746099e13f8ba968d4604adcf")
+      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/sylpheed-claws/sylpheed-0.9.6.tar.bz2")
+      , ("md5", "07217db4f989f3a8552d6e5a14e5e924")
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))