* Fix a bunch of URLs.

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

6 files changed, 51 insertions, 16 deletions

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