diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2006-06-24 15:58:25 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2006-06-24 15:58:25 +0000 |
| commit | 7793f28f0f6da2c056b71a23d9502675e04312cb (patch) | |
| tree | ca0527580ce06769b7cdd2edb0d8e53f7dbfa520 /pkgs/os-specific | |
| parent | b3e96cbefc6e56d5c9ac53f3827953ab29041998 (diff) | |
upgrade e2fsprogs to 1.39
svn path=/nixpkgs/trunk/; revision=5517
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/e2fsprogs/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch | 27 |
2 files changed, 31 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix index cc1145a1bd1cf..be734d79af2a8 100644 --- a/pkgs/os-specific/linux/e2fsprogs/default.nix +++ b/pkgs/os-specific/linux/e2fsprogs/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, gettext}: stdenv.mkDerivation { - name = "e2fsprogs-1.38"; + name = "e2fsprogs-1.39"; builder = ./builder.sh; src = fetchurl { - #url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz; - url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.38.tar.gz; - md5 = "d774d4412bfb80d12cf3a4fdfd59de5a"; + url = http://surfnet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.39.tar.gz; + md5 = "06f7806782e357797fad1d34b7ced0c6"; }; configureFlags = "--enable-dynamic-e2fsck --enable-elf-shlibs"; buildInputs = [gettext]; + patches = [./e2fsprogs-1.39_etc.patch]; } diff --git a/pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch b/pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch new file mode 100644 index 0000000000000..0fc5a90eed350 --- /dev/null +++ b/pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch @@ -0,0 +1,27 @@ +diff -ruN e2fsprogs-1.39/misc/Makefile.in e2fsprogs-1.39.new/misc/Makefile.in +--- e2fsprogs-1.39/misc/Makefile.in 2006-03-27 07:58:10.000000000 +0200 ++++ e2fsprogs-1.39.new/misc/Makefile.in 2006-06-24 17:53:48.000000000 +0200 +@@ -223,12 +223,12 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 + + installdirs: +- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)" ++ @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" + @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ + $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ +- $(DESTDIR)$(libdir) $(DESTDIR)/etc ++ $(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)/etc + + install: all $(SMANPAGES) $(UMANPAGES) installdirs + @for i in $(SPROGS); do \ +@@ -291,7 +291,7 @@ + @if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \ + echo " INSTALL_DATA /etc/mke2fs.conf"; \ + $(INSTALL_DATA) $(srcdir)/mke2fs.conf \ +- $(DESTDIR)/etc/mke2fs.conf; \ ++ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ + fi + + install-strip: install |