10 files changed, 143 insertions, 72 deletions
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index f2ff4a66a42..ee32654cf8a 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "dmtcp";
-  version = "1.1.4";
+  version = "1.1.8";
 in
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}_${version}.tar.gz";
-    sha256 = "0asqzndy4is285rmd1dw406ar3wkfaaw9ivyrmhx2w5lwf4gl7sk";
+    sha256 = "05klyml5maw3f5rxl3i20fqyvpmx69bh09h7a48y19q3r4nqd8f2";
   };
 
   buildInputs = [ perl python ];
diff --git a/pkgs/os-specific/linux/dmtcp/devel.nix b/pkgs/os-specific/linux/dmtcp/devel.nix
deleted file mode 100644
index cd62455d238..00000000000
--- a/pkgs/os-specific/linux/dmtcp/devel.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{stdenv, fetchsvn, perl, python}:
-
-# Perl and python are needed in order to run the test suite.
-
-let
-  revision = "512";
-in
-
-stdenv.mkDerivation {
-  name = "dmtcp-devel-${revision}";
-
-  src = fetchsvn {
-    url = https://dmtcp.svn.sourceforge.net/svnroot/dmtcp/trunk;
-    rev = revision;
-    sha256 = "77d8fe7f39d661669a58c6bf789886a8b6c8186d68d2b95d8a8791efab2c03b7";
-  };
-
-  buildInputs = [ perl python ];
-
-  doCheck = true;
-
-  preCheck = ''
-    substituteInPlace dmtcp/src/dmtcp_coordinator.cpp \
-      --replace /bin/bash /bin/sh
-    substituteInPlace utils/gdb-add-symbol-file \
-      --replace /bin/bash /bin/sh
-    substituteInPlace test/autotest.py \
-      --replace /usr/bin/env $(type -p env) \
-      --replace /bin/bash $(type -p bash) \
-      --replace /usr/bin/perl $(type -p perl) \
-      --replace /usr/bin/python $(type -p python)
-  '';
-
-  meta = {
-    description = "Distributed MultiThreaded Checkpointing";
-    longDescription = ''
-      DMTCP (Distributed MultiThreaded Checkpointing) is a tool to
-      transparently checkpointing the state of an arbitrary group of
-      programs spread across many machines and connected by sockets. It does
-      not modify the user's program or the operating system.
-    '';
-    homepage = http://dmtcp.sourceforge.net/;
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
index 1554624b3a7..beb14c4c87b 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
@@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }:
 import ./generic.nix (
 
   rec {
-    version = "2.6.27.48";
+    version = "2.6.27.49";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "0l3gyp7z6b2qs30s1xhj8lm1sd8cracz21ixcqpdgs7rspkagdfk";
+      sha256 = "09gnh26gs4bkaj9ib3c5cnmbgj3bhbw7g6b49hz0xrp067slyxai";
     };
 
     features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index b32616572f1..48c4b50a5b6 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -206,11 +206,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.16";
+    version = "2.6.32.17";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
+      sha256 = "12ingi7ml0cw7hjbpaq5mxl4nvi7683kma3d1z0pzrzdd9wngh1x";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
index 86b6e02a292..cab697dc1d7 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
@@ -197,11 +197,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.33.6";
+    version = "2.6.33.7";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "0s7lfm9b6i056gqlj1naqda5lwc540s05ws7m6i2a6s79zgw784i";
+      sha256 = "006shp6fkyzah02a33g1ch1x1svdlkl3kfp2b191c2vrrn6hgyim";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
index ab3ba5bc95c..281fbc5ea1b 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
@@ -194,11 +194,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.34.1";
+    version = "2.6.34.2";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "0v78yvkwr100v7bnrkkabxmpv5hjg1ngrjbr5d0kkzsw4d7bmm5x";
+      sha256 = "1p1s35sffvsdfh5rd5jl8iyin0il690als0q75fszf0fx1bh63sr";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix
new file mode 100644
index 00000000000..4d48c86dd14
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_ccreds/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pam, openssl, db}:
+
+stdenv.mkDerivation {
+  name = "pam_ccreds-10";
+
+  src = fetchurl {
+    url = "http://www.padl.com/download/pam_ccreds.tgz";
+    sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz";
+  };
+  patchPhase = ''
+    sed 's/-o root -g root//' -i Makefile.in
+  '';
+
+  buildInputs = [pam openssl db];
+  meta = {
+    homepage = "http://www.padl.com/OSS/pam_ccreds.html";
+    description = "The pam_ccreds module provides the means for Linux workstations to locally authenticate using an enterprise identity when the network is unavailable.";
+  };
+}
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
new file mode 100644
index 00000000000..62f9b5c119b
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pam, kerberos}:
+
+stdenv.mkDerivation {
+  name = "pam_krb5-2.3.11-1";
+
+  src = fetchurl {
+    url = https://fedorahosted.org/releases/p/a/pam_krb5/pam_krb5-2.3.11-1.tar.gz;
+    sha256 = "1x6wgjzkfkx0h9a7wdgx0jwrdm15npbs79i510lk1n3fyx9lk4mq";
+#    url = http://archives.eyrie.org/software/kerberos/pam-krb5-4.2.tar.gz;
+#    sha256 = "0a0zyd4ddln8yf827qxbfqi1pryxnj0fykfz8lx6nxn2f9pqj1gv";
+  };
+
+  buildInputs = [pam kerberos];
+  meta = {
+#    homepage = "http://www.eyrie.org/~eagle/software/pam-krb5";
+    homepage = "https://fedorahosted.org/pam_krb5/";
+    description = "The pam_krb5 module allows PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC. It can optionally convert Kerberos 5 credentials to Kerberos IV credentials and/or use them to set up AFS tokens for a user's session.";
+  };
+}
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 42e6f0b8c29..ae9ed8bf539 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,23 +1,20 @@
-{stdenv, fetchurl, nasm, perl}:
+{ stdenv, fetchurl, nasm, perl }:
 
-stdenv.mkDerivation {
-  name = "syslinux-3.35";
+stdenv.mkDerivation rec {
+  name = "syslinux-4.02";
+  
   src = fetchurl {
-    url = mirror://kernel/linux/utils/boot/syslinux/Old/syslinux-3.35.tar.bz2;
-    sha256 = "16kf2zhd0c4m3ai9xcls2y0ggvajhmzk1g6mv6jrv8nskkg6w0l6";
+    url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2";
+    sha256 = "0zrk6magnrfa7nmdk2rll7xaym9rapwqqgy0wdh3cfscjmcw9kwm";
   };
-  buildInputs = [nasm perl];
 
-  preBuild = "
-    makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include)
+  patches = [ ./perl-deps.patch ];
+  
+  buildInputs = [ nasm perl ];
 
-    # Really dirty hack to get syslinux to build without needing a GCC
-    # with 32-bit libraries and headers.
-    if test \"$system\" = x86_64-linux; then
-        substituteInPlace memdisk/Makefile \\
-            --replace 'all: memdisk e820test' 'all: memdisk'
-        mkdir gnu
-        touch gnu/stubs-32.h
-    fi
-  ";
+  preBuild =
+    ''
+      substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
+      makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl)
+    '';
 }
diff --git a/pkgs/os-specific/linux/syslinux/perl-deps.patch b/pkgs/os-specific/linux/syslinux/perl-deps.patch
new file mode 100644
index 00000000000..82c9820809e
--- /dev/null
+++ b/pkgs/os-specific/linux/syslinux/perl-deps.patch
@@ -0,0 +1,81 @@
+http://git.ipxe.org/ipxe.git/commitdiff/719b498
+
+diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios
+--- syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios	2010-07-21 21:33:13.000000000 +0200
++++ syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios	2010-08-06 23:32:57.000000000 +0200
+@@ -24,11 +24,11 @@
+ 
+ # Padding rules
+ #
+-PAD_rom		= $(PADIMG) --blksize=512 --byte=0xff $@
++PAD_rom		= $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@
+ PAD_hrom	= $(PAD_rom)
+ PAD_xrom	= $(PAD_rom)
+-PAD_dsk		= $(PADIMG) --blksize=512 $@
+-PAD_hd		= $(PADIMG) --blksize=32768 $@
++PAD_dsk		= $(PERL) $(PADIMG) --blksize=512 $@
++PAD_hd		= $(PERL) $(PADIMG) --blksize=32768 $@
+ 
+ # rule to make a non-emulation ISO boot image
+ NON_AUTO_MEDIA	+= iso
+diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile syslinux-4.02/gpxe/src/Makefile
+--- syslinux-4.02-orig/gpxe/src/Makefile	2010-07-21 21:33:13.000000000 +0200
++++ syslinux-4.02/gpxe/src/Makefile	2010-08-06 23:31:15.000000000 +0200
+@@ -31,12 +31,12 @@
+ OBJCOPY		:= $(CROSS_COMPILE)objcopy
+ NM		:= $(CROSS_COMPILE)nm
+ OBJDUMP		:= $(CROSS_COMPILE)objdump
+-PARSEROM	:= $(PERL) ./util/parserom.pl
+-MAKEROM		:= $(PERL) ./util/makerom.pl
+-SYMCHECK	:= $(PERL) ./util/symcheck.pl
+-SORTOBJDUMP	:= $(PERL) ./util/sortobjdump.pl
+-PADIMG		:= $(PERL) ./util/padimg.pl
+-LICENCE		:= $(PERL) ./util/licence.pl
++PARSEROM	:= ./util/parserom.pl
++MAKEROM		:= ./util/makerom.pl
++SYMCHECK	:= ./util/symcheck.pl
++SORTOBJDUMP	:= ./util/sortobjdump.pl
++PADIMG		:= ./util/padimg.pl
++LICENCE		:= ./util/licence.pl
+ NRV2B		:= ./util/nrv2b
+ ZBIN		:= ./util/zbin
+ ELF2EFI32	:= ./util/elf2efi32
+diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile.housekeeping syslinux-4.02/gpxe/src/Makefile.housekeeping
+--- syslinux-4.02-orig/gpxe/src/Makefile.housekeeping	2010-07-21 21:33:13.000000000 +0200
++++ syslinux-4.02/gpxe/src/Makefile.housekeeping	2010-08-06 23:31:49.000000000 +0200
+@@ -456,7 +456,7 @@
+ 		 '\n$(2) : $$($(4)_DEPS)\n' \
+ 		 '\nTAGS : $$($(4)_DEPS)\n' \
+ 		>> $(2)
+-	@$(PARSEROM) $(1) >> $(2)
++	@$(PERL) $(PARSEROM) $(1) >> $(2)
+ 
+ endef
+ 
+@@ -657,7 +657,7 @@
+ 	$(QM)$(ECHO) "  [LD] $@"
+ 	$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
+ 		-Map $(BIN)/$*.tmp.map
+-	$(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
++	$(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
+ 
+ # Keep intermediate object file (useful for debugging)
+ .PRECIOUS : $(BIN)/%.tmp
+@@ -714,7 +714,7 @@
+ 		echo "files are missing a licence declaration:" ;\
+ 		echo $(call unlicensed_deps_list,$<);\
+ 		exit 1,\
+-		$(LICENCE) $(call licence_list,$<))
++		$(PERL) $(LICENCE) $(call licence_list,$<))
+ 
+ # Extract compression information from intermediate object file
+ #
+@@ -941,7 +941,7 @@
+ CLEANUP	+= $(BIN)/symtab
+ 
+ symcheck : $(SYMTAB)
+-	$(SYMCHECK) $<
++	$(PERL) $(SYMCHECK) $<
+ 
+ endif # defined(BIN)
+