From 81aac8d84d9842e60f1781205c7d4edefc5fe128 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 30 Jan 2008 19:49:42 +0000
Subject: meta.homepage added to several packages

svn path=/nixpkgs/trunk/; revision=10417
---
 pkgs/applications/misc/acrobat-reader/default.nix   |  4 ++++
 pkgs/applications/misc/bluez-firmware/default.nix   |  4 ++++
 pkgs/applications/misc/bluez-utils/default.nix      |  4 ++++
 pkgs/applications/misc/djvulibre/default.nix        |  1 +
 pkgs/applications/misc/fetchmail/default.nix        |  9 ++++++++-
 pkgs/applications/misc/fetchmail/security-fix.patch | 11 +++++++++++
 pkgs/applications/misc/gphoto2/default.nix          |  4 ++++
 pkgs/applications/misc/gv/default.nix               |  4 ++++
 pkgs/applications/misc/hello/ex-1/default.nix       |  1 +
 pkgs/applications/misc/maxima/default.nix           |  5 ++---
 pkgs/applications/misc/pgadmin/default.nix          |  2 +-
 pkgs/applications/misc/procmail/default.nix         |  3 ++-
 pkgs/applications/misc/rxvt_unicode/default.nix     |  3 ++-
 pkgs/applications/misc/synergy/default.nix          |  2 +-
 pkgs/applications/misc/xchm/default.nix             |  1 +
 pkgs/applications/misc/xterm/default.nix            |  4 ++++
 16 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/misc/fetchmail/security-fix.patch

(limited to 'pkgs/applications/misc')

diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix
index 1cbdd09bc58e..3c2e5bafeb23 100644
--- a/pkgs/applications/misc/acrobat-reader/default.nix
+++ b/pkgs/applications/misc/acrobat-reader/default.nix
@@ -18,4 +18,8 @@ stdenv.mkDerivation {
     (if xineramaSupport then libXinerama else null)
   ];
   inherit fastStart;
+
+  meta = {
+    homepage = http://www.adobe.com/products/reader;
+  };
 }
diff --git a/pkgs/applications/misc/bluez-firmware/default.nix b/pkgs/applications/misc/bluez-firmware/default.nix
index 91b8dbdf8f48..f38a269408dd 100644
--- a/pkgs/applications/misc/bluez-firmware/default.nix
+++ b/pkgs/applications/misc/bluez-firmware/default.nix
@@ -6,4 +6,8 @@ stdenv.mkDerivation {
     url = http://bluez.sf.net/download/bluez-firmware-1.1.tar.gz;
     md5 = "2f1c2d939108c865dd07bae3e819c573";
   };
+
+  meta = {
+    homepage = http://www.bluez.org;
+  };
 }
diff --git a/pkgs/applications/misc/bluez-utils/default.nix b/pkgs/applications/misc/bluez-utils/default.nix
index 7cf88851fc3c..06bc2b2555f3 100644
--- a/pkgs/applications/misc/bluez-utils/default.nix
+++ b/pkgs/applications/misc/bluez-utils/default.nix
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
     md5 = "ae3729ab5592be06ed01b973d4b3e9fe";
   };
   buildInputs = [bluezLibs];
+
+  meta = {
+    homepage = http://www.bluez.org;
+  };
 }
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index e2082088fc99..81aa12e59f65 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
 	DjVu libre - a library and a viewer for djvu format - compression for
 	scanned images.
 ";
+    homepage = http://djvu.sourceforge.net;
   };
 }
 
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 95fc61668fcb..9639ff19fb06 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -1,7 +1,14 @@
-args: with args; stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name="fetchmail-6.3.8";
   src = fetchurl {
     url = http://download.berlios.de/fetchmail/fetchmail-6.3.8.tar.bz2;
     sha256 = "5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b";
   };
+
+  patches = [ ./security-fix.patch ];
+
+  meta = {
+    homepage = http://www.fetchmail.info;
+  };
 }
diff --git a/pkgs/applications/misc/fetchmail/security-fix.patch b/pkgs/applications/misc/fetchmail/security-fix.patch
new file mode 100644
index 000000000000..4d48c7aa0556
--- /dev/null
+++ b/pkgs/applications/misc/fetchmail/security-fix.patch
@@ -0,0 +1,11 @@
+--- old/sink.c	(revision 5118)
++++ new/sink.c	(revision 5119)
+@@ -262,7 +262,7 @@
+     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
+ 
+     /* don't bounce in reply to undeliverable bounces */
+-    if (!msg->return_path[0] ||
++    if (!msg || !msg->return_path[0] ||
+ 	strcmp(msg->return_path, "<>") == 0 ||
+ 	strcasecmp(msg->return_path, md1) == 0 ||
+ 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index ef70b54384a7..e6dad337eb31 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -9,4 +9,8 @@ stdenv.mkDerivation rec {
   buildInputs = [pkgconfig libgphoto2 libexif popt gettext];
 # There is a bug in 2.4.0 configure.ac (in their m4 macroses)
   patchPhase = "sed -e 's@_tmp=true@_tmp=false@' -i configure configure.ac";
+
+  meta = {
+    homepage = http://www.gphoto.org;
+  };
 }
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index 2a0603e27c9b..4566761e6903 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -13,4 +13,8 @@ stdenv.mkDerivation {
   postConfigure = [ "sed 's|\\<gs\\>|${ghostscriptX}/bin/gs|g' -i src/*.am src/*.ad" ];
 
   inherit ghostscriptX;
+
+  meta = {
+    homepage = http://wwwthep.physik.uni-mainz.de/~plass/gv;
+  };
 }
diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
index 6411e1a845ef..51b2ccb58ed3 100644
--- a/pkgs/applications/misc/hello/ex-1/default.nix
+++ b/pkgs/applications/misc/hello/ex-1/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GNU Hello, a classic computer science tool";
+    homepage = http://www.gnu.org/software/hello/;
   };
 }
diff --git a/pkgs/applications/misc/maxima/default.nix b/pkgs/applications/misc/maxima/default.nix
index ad44a7b5d0fd..72770c9a918f 100644
--- a/pkgs/applications/misc/maxima/default.nix
+++ b/pkgs/applications/misc/maxima/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation {
   buildInputs =[clisp];
 
   meta = {
-    description = "
-	Maxima computer algebra system
-";
+    description = "Maxima computer algebra system";
+    homepage = http://maxima.sourceforge.net;
   };
 }
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index d60a3ca15487..624c1dfcb61b 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   meta = { 
       description = "postgresql admin gui tool";
-      homepage = http://www.pgadmin.org/download/;
+      homepage = http://www.pgadmin.org;
       license = "GPL2";
     };
 }
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index b1d54ef5fc93..50767a7dde80 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -1,4 +1,5 @@
-args: with args; stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name="procmail-3.22";
   buildInputs = [stdenv.gcc.libc];
   installPhase = "
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index c128ca11a5ad..a44530987c43 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,4 +1,5 @@
-args: with args; stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "rxvt-unicode-8.9";
  
   buildInputs = [ libX11 libXt libXft perl ];
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index be0c449abc76..ea3fb6e7a91e 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta= { 
       description = "share mouse keyboard and clipboard between computers";
-      homepage = http://synergy2;
+      homepage = http://synergy2.sourceforge.net;
       license = "GPL";
   };
 }
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index ccd14b1f6528..d9ffe8515db1 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -10,5 +10,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A viewer for Microsoft HTML Help files";
+    homepage = http://xchm.sourceforge.net;
   };
 }
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index beb31b03baf1..30b3e6cbda80 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -8,5 +8,9 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [libXaw xproto libXt libX11 libSM libICE ncurses];
   configureFlags = ["--enable-wide-chars"];
+
+  meta = {
+    homepage = http://invisible-island.net/xterm;
+  };
 }
 
-- 
cgit 1.4.1