summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pkgs/development/interpreters/php/default.nix6
-rw-r--r--pkgs/development/libraries/clearsilver/default.nix4
-rw-r--r--pkgs/development/libraries/directfb/default.nix6
-rw-r--r--pkgs/development/libraries/java/xalanj/default.nix2
-rw-r--r--pkgs/development/libraries/pysqlite/default.nix2
-rw-r--r--pkgs/os-specific/linux/device-mapper/default.nix6
-rw-r--r--pkgs/os-specific/linux/ifplugd/default.nix6
-rw-r--r--pkgs/os-specific/linux/ifplugd/interface.patch13
-rw-r--r--pkgs/os-specific/linux/lvm2/default.nix6
-rw-r--r--pkgs/os-specific/linux/pam_console/configure.ac27
-rw-r--r--pkgs/os-specific/linux/pam_console/default.nix9
-rw-r--r--pkgs/servers/mail/postfix/default.nix6
-rw-r--r--pkgs/shells/zsh/default.nix2
-rw-r--r--pkgs/tools/archivers/unrar/default.nix2
-rw-r--r--pkgs/tools/networking/dhcp/default.nix6
-rw-r--r--pkgs/tools/networking/lftp/default.nix8
-rw-r--r--pkgs/tools/networking/ntp/default.nix6
-rw-r--r--pkgs/tools/system/filelight/default.nix3
18 files changed, 77 insertions, 43 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 625628fdfba..745c171fa8a 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -3,10 +3,10 @@
 assert libxml2 != null;
 
 stdenv.mkDerivation {
-  name = "php-5.2.0";
+  name = "php-5.2.4";
   src = fetchurl {
-    url = http://nl2.php.net/distributions/php-5.2.0.tar.bz2;
-    md5 = "e6029fafcee029edcfa2ceed7a005333";
+    url = http://nl3.php.net/distributions/php-5.2.4.tar.bz2;
+    sha256 = "1h513j7crz08n7rlh8v7cvxfzisj87mvvyfrkiaa76v1wicm4bsh";
   };
   
   inherit flex bison libxml2 apacheHttpd;
diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix
index c640cb3f297..fb3a7d92c8e 100644
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/pkgs/development/libraries/clearsilver/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, python}:
 
 stdenv.mkDerivation {
-  name="clearsilver-0.10.3";
+  name = "clearsilver-0.10.3";
   src = fetchurl {
-    url = "http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz";
+    url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz;
     md5 = "ff4104b0e58bca1b61d528edbd902769";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix
index 65fa48eda47..0a00c676ef9 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/pkgs/development/libraries/directfb/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation {
-  name = "directfb-1.0.0-pre-rc2";
+  name = "directfb-1.1.0";
   src = fetchurl {
-    url = http://directfb.org/downloads/Core/DirectFB-1.0.0-rc2.tar.gz;
-    md5 = "1996c8e90075b1177b847cd594122401";
+    url = http://www.directfb.org/downloads/Core/DirectFB-1.1.0.tar.gz;
+    sha256 = "0fpjlgsyblvcjvqk8m3va2xsyx512mf26kwfsxarj1vql9b75s0f";
   };
   buildInputs = [perl];
 }
diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix
index af13a5015fd..eb09b6a80a1 100644
--- a/pkgs/development/libraries/java/xalanj/default.nix
+++ b/pkgs/development/libraries/java/xalanj/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "xalanj-2.7.0";
   directory = "xalan-j_2_7_0";
   src = fetchurl {
-    url = "http://apache.cs.uu.nl/dist/xml/xalan-j/xalan-j_2_7_0-bin-2jars.tar.gz";
+    url = http://apache.cs.uu.nl/dist/xml/xalan-j/xalan-j_2_7_0-bin-2jars.tar.gz;
     md5 = "4d7b03dcaf2484b5f9685cc4309a9910";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/libraries/pysqlite/default.nix b/pkgs/development/libraries/pysqlite/default.nix
index 1a3e8c05dc3..1a29e05132a 100644
--- a/pkgs/development/libraries/pysqlite/default.nix
+++ b/pkgs/development/libraries/pysqlite/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "pysqlite-2.2.2";
   src = fetchurl {
-    url = "http://initd.org/pub/software/pysqlite/releases/2.2/2.2.2/pysqlite-2.2.2.tar.gz";
+    url = http://initd.org/pub/software/pysqlite/releases/2.2/2.2.2/pysqlite-2.2.2.tar.gz;
     md5 = "3260547d3f11c85613b2de8ed529a4fc";
   };
   builder = ./builder.sh;
diff --git a/pkgs/os-specific/linux/device-mapper/default.nix b/pkgs/os-specific/linux/device-mapper/default.nix
index 2cb8ca3b258..c6b6de3e9e8 100644
--- a/pkgs/os-specific/linux/device-mapper/default.nix
+++ b/pkgs/os-specific/linux/device-mapper/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, static ? false}:
 
 stdenv.mkDerivation {
-  name = "device-mapper-1.02.20";
+  name = "device-mapper-1.02.22";
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.20.tgz;
-    sha256 = "2db8a8d402b6a827c5684919b4013444cb9fad50ab8cf7ca86ade9bea7796b1c";
+    url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.22.tgz;
+    sha256 = "158mnspws143wrgrx4h81z3gn7vzb7b2ysgmngsqcri4srn3m0zz";
   };
   configureFlags = if static then "--enable-static_link" else "";
   # To prevent make install from failing.
diff --git a/pkgs/os-specific/linux/ifplugd/default.nix b/pkgs/os-specific/linux/ifplugd/default.nix
index 3fc3528e06c..2d9ff16c8ad 100644
--- a/pkgs/os-specific/linux/ifplugd/default.nix
+++ b/pkgs/os-specific/linux/ifplugd/default.nix
@@ -9,10 +9,8 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig libdaemon];
   configureFlags = "--with-initdir=$out/etc/init.d --disable-lynx";
   patches = [
-    (fetchurl {
-      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch?rev=1.1";
-      sha256 = "0rxwy7l7vwxz9gy0prfb93x2ycxaz3r203rhbwmbwrzl4rzy3nqv";
-    })
+    # From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch?rev=1.1.
+    ./interface.patch
   ];
   patchFlags = "-p0";
 }
diff --git a/pkgs/os-specific/linux/ifplugd/interface.patch b/pkgs/os-specific/linux/ifplugd/interface.patch
new file mode 100644
index 00000000000..9c2de464bbd
--- /dev/null
+++ b/pkgs/os-specific/linux/ifplugd/interface.patch
@@ -0,0 +1,13 @@
+--- src/interface.c	2004/12/19 00:08:01	114
++++ src/interface.c	2006/03/07 13:15:11	133
+@@ -22,9 +22,9 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
+ #include <linux/sockios.h>
+ #include <linux/if_ether.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/if.h>
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index e9ee3defe9b..42a1a4eb81b 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, devicemapper, static ? false}:
 
 stdenv.mkDerivation {
-  name = "lvm2-2.02.26";
+  name = "lvm2-2.02.28";
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.26.tgz;
-    sha256 = "6a177953f1a81aff91144b6bea8eb5f73f6139b10bffd5946c22a32f586ab899";
+    url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.28.tgz;
+    sha256 = "1sxchdz31mz57gm25jjphawhx2c8zmyw3mvifkxhnza27q97p39d";
   };
   buildInputs = [devicemapper];
   configureFlags = if static then "--enable-static_link" else "";
diff --git a/pkgs/os-specific/linux/pam_console/configure.ac b/pkgs/os-specific/linux/pam_console/configure.ac
new file mode 100644
index 00000000000..0d2d0288acf
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_console/configure.ac
@@ -0,0 +1,27 @@
+AC_PREREQ([2.59])
+AC_INIT([pam_console], [@PV@])
+AM_INIT_AUTOMAKE([pam_console], [@PV@])
+
+AC_CONFIG_HEADER([config.h])
+
+AC_GNU_SOURCE
+
+AM_CONDITIONAL([HAVE_VERSIONING], [test "x" = "y"])
+
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+
+m4_undefine([AC_PROG_CXX])
+m4_defun([AC_PROG_CXX],[])
+m4_undefine([AC_PROG_F77])
+m4_defun([AC_PROG_F77],[])
+AC_PROG_LIBTOOL
+
+AC_PROG_YACC
+
+SECUREDIR=${libdir}/security
+SCONFIGDIR=${sysconfdir}/security
+
+AC_SUBST([SECUREDIR])
+AC_SUBST([SCONFIGDIR])
+
+AC_OUTPUT([Makefile])
diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix
index ae759479875..56c881b3340 100644
--- a/pkgs/os-specific/linux/pam_console/default.nix
+++ b/pkgs/os-specific/linux/pam_console/default.nix
@@ -2,12 +2,9 @@
 
 let
 
-  # Configure script borrowed from the good folks at Gentoo.
-  configure = fetchurl {
-    # !!! move this somewhere safe
-    url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-auth/pam_console/files/pam_console-configure.ac";
-    sha256 = "00wilsxhwjjrkfnv2xzvlw4fxwj36ds4shnac3hksbjwb9qivmpl";
-  };
+  # Configure script borrowed from the good folks at Gentoo 
+  # (http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-auth/pam_console/files/pam_console-configure.ac).
+  configure = ./configure.ac;
 
 in
    
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 7e903dac872..f9f5f511559 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, db4, glibc}:
 
 stdenv.mkDerivation {
-  name = "postfix-2.2.9";
+  name = "postfix-2.2.11";
   src = fetchurl {
-    url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.9.tar.gz;
-    md5 = "be78631bd9b6bf7735e43abfa54d69f6";
+    url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.11.tar.gz;
+    sha256 = "04hxpyd3h1f48fnppjwqqxbil13bcwidzpfkra2pgm7h42d9blq7";
   };
 
   buildinputs = [db4];
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index dafe9bb870a..0b227b031b8 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "zsh-4.3.4";
 
   src = fetchurl {
-    url = ftp://nephtys.lip6.fr/pub/unix/shells/zsh/zsh-4.3.4.tar.bz2;
+    url = mirror://sourceforge/zsh/zsh-4.3.4.tar.bz2;
     sha256 = "1inypy60h7hir8hwidid85pbajrb5w09fl222p0h4fnsn0nf583g";
   };
 
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 7c1aea70609..6e545726b14 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -3,8 +3,8 @@ stdenv.mkDerivation {
   name = "unrar-3.7.6";
 
   src = fetchurl {
-    sha256 = "0inzy0jlwqm18i6lq17aq4n2baqqlbjyr6incw4s9cxrvmjq51ls";
     url = http://www.rarlab.com/rar/unrarsrc-3.7.6.tar.gz;
+    sha256 = "0inzy0jlwqm18i6lq17aq4n2baqqlbjyr6incw4s9cxrvmjq51ls";
   };
 
   makeFlags = "-f makefile.unix";
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index ff7a0c87791..09e24e3a8b7 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, groff, nettools, coreutils, iputils, gnused, bash}:
 
 stdenv.mkDerivation {
-  name = "dhcp-3.0.5";
+  name = "dhcp-3.0.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.isc.org/isc/dhcp/dhcp-3.0.5.tar.gz;
-    sha256 = "1dpz6y08vrn3mw0lrlwq1sfiq6nsixpwwgb9hngddka1lfr5yi6x";
+    url = http://ftp.isc.org/isc/dhcp/dhcp-3.0.6.tar.gz;
+    sha256 = "0k8gy3ab9kzs4qcc9apgnxi982lhggha41fkw9w1bmvmz7mv0xwz";
   };
   buildInputs = [groff];
   inherit nettools coreutils iputils gnused bash;
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 52ff7d51fd7..c0e4f61b702 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, readline}:
 stdenv.mkDerivation {
-  name = "lftp-3.5.11";
+  name = "lftp-3.5.14";
 
   src = fetchurl {
-    url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-3.5.11.tar.bz2;
-    md5 = "a1691cc0b6f0045a61e9f3d4f668fe13";
+    url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-3.5.14.tar.bz2;
+    sha256 = "0hzrbhpgvndpd4wd08whfv1iqzbcijs1nxz40rhn651xabhiasrv";
   };
 
-  buildInputs = [readline ];
+  buildInputs = [readline];
 }
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 70765e9e92d..57d2ee8ab71 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -3,10 +3,10 @@
 assert stdenv.isLinux -> libcap != null;
  
 stdenv.mkDerivation {
-  name = "ntp-4.2.4";
+  name = "ntp-4.2.4p3";
   src = fetchurl {
-    url = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.4.tar.gz;
-    md5 = "eb9147d26cbe18bd8fbec07f1df55aef";
+    url = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.4p3.tar.gz;
+    sha256 = "077y1hw6v0qnp3j3w3pcxgsc76waswqhwsbzfj3jqc79jfh65jv9";
   };
   configureFlags = "
     --without-crypto
diff --git a/pkgs/tools/system/filelight/default.nix b/pkgs/tools/system/filelight/default.nix
index 86b8275f295..901f41f5ac3 100644
--- a/pkgs/tools/system/filelight/default.nix
+++ b/pkgs/tools/system/filelight/default.nix
@@ -4,9 +4,8 @@ stdenv.mkDerivation {
   name = "filelight-1.0";
 
   src = fetchurl {
-    url = http://kde-apps.org/content/download.php?content=9887&id=1;
+    url = http://www.methylblue.com/filelight/packages/filelight-1.0.tar.bz2;
     sha256 = "1mj5q8i818b6qlmjgfk984agp9n72pxi7p7caixzmcm1c2gd8hq7";
-    name = "filelight-1.0.tar.bz2";
   };
 
   buildInputs = [kdelibs qt x11 zlib perl libpng];
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-28 07:50:15 +0000