Skip to content
This repository
Browse code

Remove a bunch of unreferenced files

Plus a small number of obsolete packages (like old versions of qemu).
  • Loading branch information...
commit 5553546c212152a9cea72e1398b088cda78c7b8b 1 parent f04aa4f
Eelco Dolstra authored November 29, 2012

Showing 113 changed files with 40 additions and 17,586 deletions. Show diff stats Hide diff stats

  1. 37  pkgs/applications/audio/amarok/live.nix
  2. 18  pkgs/applications/editors/jedit/wrapper.nix
  3. 4  pkgs/applications/editors/nedit/default.nix
  4. 22  pkgs/applications/graphics/darktable/libpng-15.patch
  5. 10  pkgs/applications/graphics/kuickshow/builder.sh
  6. 83  pkgs/applications/graphics/rawtherapee/optional-rawzor.patch
  7. 11  pkgs/applications/misc/fetchmail/security-fix.patch
  8. 1  pkgs/applications/misc/gphoto2/src-for-gphotofs.nix
  9. 10  pkgs/applications/misc/krusader/krusader-gcc44.patch
  10. 471  pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch
  11. 13  pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix
  12. 41  pkgs/applications/office/ledger/const.patch
  13. 23  pkgs/applications/science/biology/slr/default.nix
  14. 19  pkgs/applications/version-management/darcs/bash-completion.patch
  15. 28  pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch
  16. 529  pkgs/applications/version-management/git-and-tools/git/glob-path.patch
  17. 23  pkgs/applications/version-management/monotone-viz/1.0.1.nix
  18. 34  pkgs/applications/version-management/monotone-viz/graphviz.patch
  19. 23  pkgs/applications/version-management/rcs/no-root.patch
  20. 15  pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch
  21. 18  pkgs/applications/virtualization/qemu/0.11.0.nix
  22. 19  pkgs/applications/virtualization/qemu/0.13.nix
  23. 19  pkgs/applications/virtualization/qemu/svn-6642.nix
  24. 24  pkgs/applications/window-managers/wmii/builder.sh
  25. 5  pkgs/data/misc/themes/green.nix
  26. 5  pkgs/data/misc/themes/theme-gnu.nix
  27. 10  pkgs/desktops/kde-4.7/kdebindings/perlqt.nix
  28. 10  pkgs/desktops/kde-4.7/kdebindings/smokekde.nix
  29. 60  pkgs/desktops/kde-4.7/kdenetwork/log-feature.diff
  30. 39  pkgs/desktops/kde-4.7/kdesdk/optional-docs.diff
  31. 29  pkgs/desktops/kde-4.7/kipi-plugins.nix
  32. 12  pkgs/development/compilers/gcc/4.0/gcc-4.0.2-cxx.patch
  33. 9  pkgs/development/compilers/jdk/default.nix
  34. 48  pkgs/development/compilers/jdk/jdk6-cygwin.nix
  35. 31  pkgs/development/compilers/ocaml/cvs.nix
  36. 15  pkgs/development/compilers/tiger/builder.sh
  37. 11  pkgs/development/compilers/tiger/default.nix
  38. 31  pkgs/development/interpreters/spidermonkey/builder.sh
  39. 17  pkgs/development/interpreters/toolbus/default.nix
  40. 515  pkgs/development/libraries/cil-aterm/atermprinter.patch
  41. 12  pkgs/development/libraries/cil-aterm/cil-aterm-1.3.3.nix
  42. 593  pkgs/development/libraries/cil-aterm/cil-aterm-1.3.4.patch
  43. 13  pkgs/development/libraries/cracklib/builder.sh
  44. 7  pkgs/development/libraries/cracklib/default.nix
  45. 13  pkgs/development/libraries/freeglut/freeglut-gcc-4.2.patch
  46. 65  pkgs/development/libraries/gtk-sharp-2/dllmap-glue.patch
  47. 20  pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch
  48. 14  pkgs/development/libraries/haskell/mtl/2.1.nix
  49. 14  pkgs/development/libraries/haskell/syb/0.3.5.nix
  50. 13  pkgs/development/libraries/haskell/syb/default.nix
  51. 15  pkgs/development/libraries/haskell/text/0.11.1.12.nix
  52. 37  pkgs/development/libraries/levmar/use-atlas.patch
  53. 32  pkgs/development/libraries/libixp/builder.sh
  54. 17  pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch
  55. 24  pkgs/development/libraries/mesa/swrast-settexbuffer.patch
  56. 20  pkgs/development/libraries/opencv/changeset_r3190.diff
  57. 27  pkgs/development/libraries/opencv/default.nix.edited
  58. 32  pkgs/development/libraries/openmotif/default.nix
  59. 43  pkgs/development/libraries/science/biology/bioconductor/bioconductor.nix
  60. 23  pkgs/development/libraries/taglib/live.nix
  61. 14  pkgs/development/ocaml-modules/lablgtkmathview/configure.patch
  62. 25  pkgs/development/python-modules/python-gudev/default.nix
  63. 15  pkgs/development/python-modules/zope/default.nix
  64. 12  pkgs/development/python-modules/zope/zope_python-2.4.4.patch
  65. 12  pkgs/development/python-modules/zope/zope_python-readline.patch
  66. 12  pkgs/development/tools/analysis/radare/lua.patch
  67. 12  pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
  68. 51  pkgs/development/tools/build-managers/apache-ant/core-builder.sh
  69. 5  pkgs/development/tools/documentation/xdoc/builder.sh
  70. 13  pkgs/development/tools/documentation/xdoc/default.nix
  71. 1  pkgs/development/tools/misc/automake/default.nix
  72. 11  pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
  73. 11  pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
  74. 44  pkgs/games/exult/snapshot.nix
  75. 13  pkgs/misc/emulators/wine/default.upstream
  76. 198  pkgs/misc/ghostscript/libpng-1.5.patch
  77. 59  pkgs/misc/rosegarden/default.nix
  78. 31  pkgs/misc/screensavers/rss-glx/builder.sh
  79. 2  pkgs/misc/screensavers/rss-glx/default.nix
  80. 32  pkgs/os-specific/linux/atheros/inj.patch
  81. 45  pkgs/os-specific/linux/atheros/r3867.nix
  82. 42  pkgs/os-specific/linux/aufs-util/2.1.nix
  83. 48  pkgs/os-specific/linux/aufs/2.1.nix
  84. 13  pkgs/os-specific/linux/kudzu/builder.sh
  85. 13  pkgs/os-specific/linux/kudzu/default.nix
  86. 21  pkgs/os-specific/linux/kudzu/kudzu-python.patch
  87. 11  pkgs/os-specific/linux/libnl/libnl-1.1-flags.patch
  88. 13  pkgs/os-specific/linux/libnl/libnl-1.1-glibc-2.8-ULONG_MAX.patch
  89. 40  pkgs/os-specific/linux/libnl/libnl-1.1-minor-leaks.patch
  90. 80  pkgs/os-specific/linux/libnl/libnl-1.1-vlan-header.patch
  91. 27  pkgs/os-specific/linux/libnl/v1.nix
  92. 19  pkgs/os-specific/linux/libnl/v2.nix
  93. 22  pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh
  94. 13  pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
  95. 13  pkgs/os-specific/linux/ov511/ov511-2.32.patch
  96. 22  pkgs/os-specific/linux/sepolgen/default.nix
  97. 45  pkgs/os-specific/linux/upstart/cfgdir.patch
  98. 23  pkgs/servers/gpm/1.99.6.nix
  99. 14  pkgs/servers/http/myserver/installable-binary.patch
  100. 9  pkgs/servers/x11/xorg/xorgserver.sh
  101. 45  pkgs/tools/archivers/cpio/latest.nix
  102. 10  pkgs/tools/misc/coreutils-5/default.nix
  103. 35  pkgs/tools/misc/coreutils-5/dietlibc.patch
  104. 5  pkgs/tools/misc/findutils/default.nix
  105. 58  pkgs/tools/misc/findutils/dietlibc-hack.patch
  106. 28  pkgs/tools/misc/grub/device-mapper-symlinks.patch
  107. 41  pkgs/tools/misc/mc/mc-4.6.1-bash32-1.patch
  108. 12,671  pkgs/tools/misc/mc/mc-4.6.1-debian_fixes-1.patch
  109. 20  pkgs/tools/misc/ttf2pt1/ttf2pt1-cl-pdf.nix
  110. 12  pkgs/tools/networking/p2p/tahoe-lafs/test-timeout.patch
  111. 80  pkgs/tools/networking/tcng/default.nix
  112. 20  pkgs/tools/security/pinentry/duplicate-glib-defs.patch
  113. 119  pkgs/top-level/all-packages.nix
37  pkgs/applications/audio/amarok/live.nix
... ...
@@ -1,37 +0,0 @@
1  
-{ stdenv, fetchgit, fetchgitrevision
2  
-, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
3  
-, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
4  
-, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig
5  
-, repository ? "git://git.kde.org/amarok"
6  
-, branch ? "heads/master"
7  
-, rev ? fetchgitrevision repository branch
8  
-, src ? fetchgit {
9  
-    url = repository;
10  
-    rev = rev;
11  
-  }
12  
-}:
13  
-
14  
-stdenv.mkDerivation rec {
15  
-  name = "${pname}-${version}";
16  
-
17  
-  pname = "amarok";
18  
-  version = "live";
19  
-
20  
-  inherit src;
21  
-
22  
-  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
23  
-  buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
24  
-    libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
25  
-    soprano qca2 libmtp liblastfm libgpod pkgconfig ];
26  
-
27  
-  postInstall = ''
28  
-    mkdir -p $out/nix-support
29  
-    echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
30  
-  '';
31  
-  meta = {
32  
-    description = "Popular music player for KDE";
33  
-    license = "GPL";
34  
-    homepage = http://amarok.kde.org;
35  
-    inherit (kdelibs.meta) maintainers;
36  
-  };
37  
-}
18  pkgs/applications/editors/jedit/wrapper.nix
... ...
@@ -1,18 +0,0 @@
1  
-args: with args;
2  
-stdenv.mkDerivation {
3  
-    name = jedit.name+"_startscript";
4  
-
5  
-    java = jre+"/bin/java";
6  
-    jeditjar = jedit+"/lib/jedit.jar";
7  
-
8  
-    phases = "buildPhase";
9  
-
10  
-    buildPhase = "
11  
-mkdir -p \$out/bin
12  
-cat > \$out/bin/${jedit.name} << EOF
13  
-#!/bin/sh
14  
-exec $java -jar $jeditjar \\$*
15  
-EOF
16  
-  chmod +x \$out/bin/${jedit.name}
17  
-";
18  
-}
4  pkgs/applications/editors/nedit/default.nix
... ...
@@ -1,6 +1,6 @@
1 1
 {stdenv, fetchurl, x11, motif, libXpm}:
2 2
 
3  
-assert stdenv.system == "i686-linux";
  3
+assert stdenv.isLinux;
4 4
 
5 5
 stdenv.mkDerivation {
6 6
   name = "nedit-5.5";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
15 15
   inherit motif;
16 16
   buildInputs = [x11 motif libXpm];
17 17
 
18  
-  buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
  18
+  buildFlags = if stdenv.isLinux then "linux" else "";
19 19
 
20 20
   meta = {
21 21
     homepage = http://www.nedit.org;
22  pkgs/applications/graphics/darktable/libpng-15.patch
... ...
@@ -1,22 +0,0 @@
1  
-commit 5803d31ae7704e0349821dcc20a94a1cddda69f1
2  
-Author: Tim Harder <radhermit@gmail.com>
3  
-Date:   Wed Sep 21 14:13:55 2011 -0700
4  
-
5  
-    Fix build with libpng-1.5
6  
-    
7  
-    Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and
8  
-    Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore
9  
-    via the png.h header.
10  
-
11  
-diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c
12  
-index 40c7d48..c7be566 100644
13  
---- a/src/imageio/format/png.c
14  
-+++ b/src/imageio/format/png.c
15  
-@@ -28,6 +28,7 @@
16  
- #include <stdio.h>
17  
- #include <png.h>
18  
- #include <inttypes.h>
19  
-+#include <zlib.h>
20  
- 
21  
- DT_MODULE(1)
22  
- 
10  pkgs/applications/graphics/kuickshow/builder.sh
... ...
@@ -1,10 +0,0 @@
1  
-source $stdenv/setup
2  
-
3  
-patchPhase=patchPhase
4  
-patchPhase() {
5  
-  sed -e "s@-ljpeg6b@-ljpeg@" -i configure
6  
-}
7  
-
8  
-genericBuild
9  
-
10  
-ln -sv $KDEDIR/share/mimelnk $out/share
83  pkgs/applications/graphics/rawtherapee/optional-rawzor.patch
... ...
@@ -1,83 +0,0 @@
1  
---- a/CMakeLists.txt
2  
-+++ b/CMakeLists.txt
3  
-@@ -1,5 +1,7 @@
4  
- cmake_minimum_required(VERSION 2.6)
5  
- 
6  
-+option (WITH_RAWZOR "Build with Rawzor support" ON)
7  
-+
8  
- add_subdirectory (rtexif)
9  
- add_subdirectory (rtengine)
10  
- add_subdirectory (rtgui)
11  
---- a/rtengine/CMakeLists.txt
12  
-+++ b/rtengine/CMakeLists.txt
13  
-@@ -9,9 +9,13 @@
14  
- IF (WIN32)
15  
-     SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win")
16  
-     SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win")
17  
--    SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a")
18  
-+    SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a")
19  
-+    if (WITH_RAWZOR)
20  
-     ADD_DEFINITIONS (-DRAWZOR_SUPPORT)
21  
-+    SET (EXTRA_LIB "${EXTRA_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a")
22  
-+    endif (WITH_RAWZOR)
23  
- ELSE (WIN32)
24  
-+    if (WITH_RAWZOR)
25  
-     IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
26  
-         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
27  
- 	SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
28  
-@@ -19,10 +23,11 @@
29  
-         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
30  
- 	SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
31  
-     ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
32  
--    pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
33  
--    pkg_check_modules (LCMS REQUIRED lcms)
34  
-     SET (EXTRA_LIB "-lrwz_sdk")
35  
-     ADD_DEFINITIONS (-DRAWZOR_SUPPORT)
36  
-+    endif (WITH_RAWZOR)
37  
-+    pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
38  
-+    pkg_check_modules (LCMS REQUIRED lcms)
39  
- ENDIF (WIN32)
40  
- 
41  
- include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS})
42  
---- a/rtengine/imagedata.cc
43  
-+++ b/rtengine/imagedata.cc
44  
-@@ -19,7 +19,9 @@
45  
- #include <imagedata.h>
46  
- #include <iptcpairs.h>
47  
- #include <glib/gstdio.h>
48  
-+#ifdef RAWZOR_SUPPORT
49  
- #include <rwz_sdk.h>
50  
-+#endif
51  
- 
52  
- using namespace rtengine;
53  
- 
54  
---- a/rtengine/myfile.cc
55  
-+++ b/rtengine/myfile.cc
56  
-@@ -19,7 +19,9 @@
57  
- #include <myfile.h>
58  
- #include <cstdarg>
59  
- #include <glibmm.h>
60  
-+#ifdef RAWZOR_SUPPORT
61  
- #include <rwz_sdk.h>
62  
-+#endif
63  
- 
64  
- IMFILE* fopen (const char* fname) {
65  
- 
66  
---- a/rtgui/CMakeLists.txt
67  
-+++ b/rtgui/CMakeLists.txt
68  
-@@ -75,6 +75,7 @@
69  
-     if (NOT ZLIB_LIBRARIES)
70  
-         message(SEND_ERROR "libz was not found!")
71  
-     endif (NOT ZLIB_LIBRARIES)
72  
-+    if (WITH_RAWZOR)
73  
-     IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
74  
-         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
75  
- 	    SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
76  
-@@ -82,6 +83,7 @@
77  
-         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
78  
- 	    SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
79  
-     ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
80  
-+    endif (WITH_RAWZOR)
81  
- 
82  
- include_directories (/usr/local/lib ${CMAKE_CURRENT_SOURCE_DIR}/../rtengine . ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}
83  
-     ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} )
11  pkgs/applications/misc/fetchmail/security-fix.patch
... ...
@@ -1,11 +0,0 @@
1  
---- old/sink.c	(revision 5118)
2  
-+++ new/sink.c	(revision 5119)
3  
-@@ -262,7 +262,7 @@
4  
-     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
5  
- 
6  
-     /* don't bounce in reply to undeliverable bounces */
7  
--    if (!msg->return_path[0] ||
8  
-+    if (!msg || !msg->return_path[0] ||
9  
- 	strcmp(msg->return_path, "<>") == 0 ||
10  
- 	strcasecmp(msg->return_path, md1) == 0 ||
11  
- 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
1  pkgs/applications/misc/gphoto2/src-for-gphotofs.nix
... ...
@@ -1 +0,0 @@
1  
-{}
10  pkgs/applications/misc/krusader/krusader-gcc44.patch
... ...
@@ -1,10 +0,0 @@
1  
---- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~	2009-04-29 17:13:43.000000000 +0000
2  
-+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp	2009-04-29 17:14:01.000000000 +0000
3  
-@@ -37,6 +37,7 @@
4  
- #include <kio/jobuidelegate.h>
5  
- #include <kio/job.h>
6  
- #include <qapplication.h>
7  
-+#include <cstdio>
8  
- #include <iostream>
9  
- #include <klocale.h>
10  
- #include "virtualcopyjob.h"
471  pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch
... ...
@@ -1,471 +0,0 @@
1  
-diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
2  
-*** xpdf-3.01.orig/goo/gmem.c	Tue Aug 16 22:34:30 2005
3  
---- xpdf-3.01/goo/gmem.c	Tue Jan 17 17:03:57 2006
4  
-***************
5  
-*** 11,16 ****
6  
---- 11,17 ----
7  
-  #include <stdlib.h>
8  
-  #include <stddef.h>
9  
-  #include <string.h>
10  
-+ #include <limits.h>
11  
-  #include "gmem.h"
12  
-  
13  
-  #ifdef DEBUG_MEM
14  
-***************
15  
-*** 63,69 ****
16  
-    int lst;
17  
-    unsigned long *trl, *p;
18  
-  
19  
-!   if (size == 0)
20  
-      return NULL;
21  
-    size1 = gMemDataSize(size);
22  
-    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
23  
---- 64,70 ----
24  
-    int lst;
25  
-    unsigned long *trl, *p;
26  
-  
27  
-!   if (size <= 0)
28  
-      return NULL;
29  
-    size1 = gMemDataSize(size);
30  
-    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
31  
-***************
32  
-*** 86,92 ****
33  
-  #else
34  
-    void *p;
35  
-  
36  
-!   if (size == 0)
37  
-      return NULL;
38  
-    if (!(p = malloc(size))) {
39  
-      fprintf(stderr, "Out of memory\n");
40  
---- 87,93 ----
41  
-  #else
42  
-    void *p;
43  
-  
44  
-!   if (size <= 0)
45  
-      return NULL;
46  
-    if (!(p = malloc(size))) {
47  
-      fprintf(stderr, "Out of memory\n");
48  
-***************
49  
-*** 102,108 ****
50  
-    void *q;
51  
-    int oldSize;
52  
-  
53  
-!   if (size == 0) {
54  
-      if (p)
55  
-        gfree(p);
56  
-      return NULL;
57  
---- 103,109 ----
58  
-    void *q;
59  
-    int oldSize;
60  
-  
61  
-!   if (size <= 0) {
62  
-      if (p)
63  
-        gfree(p);
64  
-      return NULL;
65  
-***************
66  
-*** 120,126 ****
67  
-  #else
68  
-    void *q;
69  
-  
70  
-!   if (size == 0) {
71  
-      if (p)
72  
-        free(p);
73  
-      return NULL;
74  
---- 121,127 ----
75  
-  #else
76  
-    void *q;
77  
-  
78  
-!   if (size <= 0) {
79  
-      if (p)
80  
-        free(p);
81  
-      return NULL;
82  
-***************
83  
-*** 140,147 ****
84  
-  void *gmallocn(int nObjs, int objSize) {
85  
-    int n;
86  
-  
87  
-    n = nObjs * objSize;
88  
-!   if (objSize == 0 || n / objSize != nObjs) {
89  
-      fprintf(stderr, "Bogus memory allocation size\n");
90  
-      exit(1);
91  
-    }
92  
---- 141,151 ----
93  
-  void *gmallocn(int nObjs, int objSize) {
94  
-    int n;
95  
-  
96  
-+   if (nObjs == 0) {
97  
-+     return NULL;
98  
-+   }
99  
-    n = nObjs * objSize;
100  
-!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
101  
-      fprintf(stderr, "Bogus memory allocation size\n");
102  
-      exit(1);
103  
-    }
104  
-***************
105  
-*** 151,158 ****
106  
-  void *greallocn(void *p, int nObjs, int objSize) {
107  
-    int n;
108  
-  
109  
-    n = nObjs * objSize;
110  
-!   if (objSize == 0 || n / objSize != nObjs) {
111  
-      fprintf(stderr, "Bogus memory allocation size\n");
112  
-      exit(1);
113  
-    }
114  
---- 155,168 ----
115  
-  void *greallocn(void *p, int nObjs, int objSize) {
116  
-    int n;
117  
-  
118  
-+   if (nObjs == 0) {
119  
-+     if (p) {
120  
-+       gfree(p);
121  
-+     }
122  
-+     return NULL;
123  
-+   }
124  
-    n = nObjs * objSize;
125  
-!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
126  
-      fprintf(stderr, "Bogus memory allocation size\n");
127  
-      exit(1);
128  
-    }
129  
-diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
130  
-*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc	Tue Aug 16 22:34:31 2005
131  
---- xpdf-3.01/xpdf/JBIG2Stream.cc	Tue Jan 17 17:29:46 2006
132  
-***************
133  
-*** 13,18 ****
134  
---- 13,19 ----
135  
-  #endif
136  
-  
137  
-  #include <stdlib.h>
138  
-+ #include <limits.h>
139  
-  #include "GList.h"
140  
-  #include "Error.h"
141  
-  #include "JArithmeticDecoder.h"
142  
-***************
143  
-*** 681,686 ****
144  
---- 682,691 ----
145  
-    w = wA;
146  
-    h = hA;
147  
-    line = (wA + 7) >> 3;
148  
-+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
149  
-+     data = NULL;
150  
-+     return;
151  
-+   }
152  
-    // need to allocate one extra guard byte for use in combine()
153  
-    data = (Guchar *)gmalloc(h * line + 1);
154  
-    data[h * line] = 0;
155  
-***************
156  
-*** 692,697 ****
157  
---- 697,706 ----
158  
-    w = bitmap->w;
159  
-    h = bitmap->h;
160  
-    line = bitmap->line;
161  
-+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
162  
-+     data = NULL;
163  
-+     return;
164  
-+   }
165  
-    // need to allocate one extra guard byte for use in combine()
166  
-    data = (Guchar *)gmalloc(h * line + 1);
167  
-    memcpy(data, bitmap->data, h * line);
168  
-***************
169  
-*** 720,726 ****
170  
-  }
171  
-  
172  
-  void JBIG2Bitmap::expand(int newH, Guint pixel) {
173  
-!   if (newH <= h) {
174  
-      return;
175  
-    }
176  
-    // need to allocate one extra guard byte for use in combine()
177  
---- 729,735 ----
178  
-  }
179  
-  
180  
-  void JBIG2Bitmap::expand(int newH, Guint pixel) {
181  
-!   if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
182  
-      return;
183  
-    }
184  
-    // need to allocate one extra guard byte for use in combine()
185  
-***************
186  
-*** 2294,2299 ****
187  
---- 2303,2316 ----
188  
-        !readUWord(&stepX) || !readUWord(&stepY)) {
189  
-      goto eofError;
190  
-    }
191  
-+   if (w == 0 || h == 0 || w >= INT_MAX / h) {
192  
-+     error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
193  
-+     return;
194  
-+   }
195  
-+   if (gridH == 0 || gridW >= INT_MAX / gridH) {
196  
-+     error(getPos(), "Bad grid size in JBIG2 halftone segment");
197  
-+     return;
198  
-+   }
199  
-  
200  
-    // get pattern dictionary
201  
-    if (nRefSegs != 1) {
202  
-diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
203  
-*** xpdf-3.01.orig/xpdf/JPXStream.cc	Tue Aug 16 22:34:31 2005
204  
---- xpdf-3.01/xpdf/JPXStream.cc	Tue Jan 17 17:14:06 2006
205  
-***************
206  
-*** 12,17 ****
207  
---- 12,18 ----
208  
-  #pragma implementation
209  
-  #endif
210  
-  
211  
-+ #include <limits.h>
212  
-  #include "gmem.h"
213  
-  #include "Error.h"
214  
-  #include "JArithmeticDecoder.h"
215  
-***************
216  
-*** 818,823 ****
217  
---- 819,830 ----
218  
-  	            / img.xTileSize;
219  
-        img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
220  
-  	            / img.yTileSize;
221  
-+       // check for overflow before allocating memory
222  
-+       if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
223  
-+ 	  img.nXTiles >= INT_MAX / img.nYTiles) {
224  
-+ 	error(getPos(), "Bad tile count in JPX SIZ marker segment");
225  
-+ 	return gFalse;
226  
-+       }
227  
-        img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
228  
-  				      sizeof(JPXTile));
229  
-        for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
230  
-diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
231  
-*** xpdf-3.01.orig/xpdf/Stream.cc	Tue Aug 16 22:34:31 2005
232  
---- xpdf-3.01/xpdf/Stream.cc	Tue Jan 17 17:31:52 2006
233  
-***************
234  
-*** 15,20 ****
235  
---- 15,21 ----
236  
-  #include <stdio.h>
237  
-  #include <stdlib.h>
238  
-  #include <stddef.h>
239  
-+ #include <limits.h>
240  
-  #ifndef WIN32
241  
-  #include <unistd.h>
242  
-  #endif
243  
-***************
244  
-*** 406,418 ****
245  
---- 407,432 ----
246  
-    width = widthA;
247  
-    nComps = nCompsA;
248  
-    nBits = nBitsA;
249  
-+   predLine = NULL;
250  
-+   ok = gFalse;
251  
-  
252  
-    nVals = width * nComps;
253  
-+   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
254  
-+       nComps >= INT_MAX / nBits ||
255  
-+       width >= INT_MAX / nComps / nBits ||
256  
-+       nVals * nBits + 7 < 0) {
257  
-+     return;
258  
-+   }
259  
-    pixBytes = (nComps * nBits + 7) >> 3;
260  
-    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
261  
-+   if (rowBytes <= 0) {
262  
-+     return;
263  
-+   }
264  
-    predLine = (Guchar *)gmalloc(rowBytes);
265  
-    memset(predLine, 0, rowBytes);
266  
-    predIdx = rowBytes;
267  
-+ 
268  
-+   ok = gTrue;
269  
-  }
270  
-  
271  
-  StreamPredictor::~StreamPredictor() {
272  
-***************
273  
-*** 1004,1009 ****
274  
---- 1018,1027 ----
275  
-      FilterStream(strA) {
276  
-    if (predictor != 1) {
277  
-      pred = new StreamPredictor(this, predictor, columns, colors, bits);
278  
-+     if (!pred->isOk()) {
279  
-+       delete pred;
280  
-+       pred = NULL;
281  
-+     }
282  
-    } else {
283  
-      pred = NULL;
284  
-    }
285  
-***************
286  
-*** 1259,1264 ****
287  
---- 1277,1285 ----
288  
-    if (columns < 1) {
289  
-      columns = 1;
290  
-    }
291  
-+   if (columns + 4 <= 0) {
292  
-+     columns = INT_MAX - 4;
293  
-+   }
294  
-    rows = rowsA;
295  
-    endOfBlock = endOfBlockA;
296  
-    black = blackA;
297  
-***************
298  
-*** 2899,2904 ****
299  
---- 2920,2930 ----
300  
-    height = read16();
301  
-    width = read16();
302  
-    numComps = str->getChar();
303  
-+   if (numComps <= 0 || numComps > 4) {
304  
-+     error(getPos(), "Bad number of components in DCT stream");
305  
-+     numComps = 0;
306  
-+     return gFalse;
307  
-+   }
308  
-    if (prec != 8) {
309  
-      error(getPos(), "Bad DCT precision %d", prec);
310  
-      return gFalse;
311  
-***************
312  
-*** 2925,2930 ****
313  
---- 2951,2961 ----
314  
-    height = read16();
315  
-    width = read16();
316  
-    numComps = str->getChar();
317  
-+   if (numComps <= 0 || numComps > 4) {
318  
-+     error(getPos(), "Bad number of components in DCT stream");
319  
-+     numComps = 0;
320  
-+     return gFalse;
321  
-+   }
322  
-    if (prec != 8) {
323  
-      error(getPos(), "Bad DCT precision %d", prec);
324  
-      return gFalse;
325  
-***************
326  
-*** 2947,2952 ****
327  
---- 2978,2988 ----
328  
-  
329  
-    length = read16() - 2;
330  
-    scanInfo.numComps = str->getChar();
331  
-+   if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
332  
-+     error(getPos(), "Bad number of components in DCT stream");
333  
-+     scanInfo.numComps = 0;
334  
-+     return gFalse;
335  
-+   }
336  
-    --length;
337  
-    if (length != 2 * scanInfo.numComps + 3) {
338  
-      error(getPos(), "Bad DCT scan info block");
339  
-***************
340  
-*** 3041,3046 ****
341  
---- 3077,3083 ----
342  
-  	numACHuffTables = index+1;
343  
-        tbl = &acHuffTables[index];
344  
-      } else {
345  
-+       index &= 0x0f;
346  
-        if (index >= numDCHuffTables)
347  
-  	numDCHuffTables = index+1;
348  
-        tbl = &dcHuffTables[index];
349  
-***************
350  
-*** 3827,3832 ****
351  
---- 3864,3873 ----
352  
-      FilterStream(strA) {
353  
-    if (predictor != 1) {
354  
-      pred = new StreamPredictor(this, predictor, columns, colors, bits);
355  
-+     if (!pred->isOk()) {
356  
-+       delete pred;
357  
-+       pred = NULL;
358  
-+     }
359  
-    } else {
360  
-      pred = NULL;
361  
-    }
362  
-diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
363  
-*** xpdf-3.01.orig/xpdf/Stream.h	Tue Aug 16 22:34:31 2005
364  
---- xpdf-3.01/xpdf/Stream.h	Tue Jan 17 17:19:54 2006
365  
-***************
366  
-*** 232,237 ****
367  
---- 232,239 ----
368  
-  
369  
-    ~StreamPredictor();
370  
-  
371  
-+   GBool isOk() { return ok; }
372  
-+ 
373  
-    int lookChar();
374  
-    int getChar();
375  
-  
376  
-***************
377  
-*** 249,254 ****
378  
---- 251,257 ----
379  
-    int rowBytes;			// bytes per line
380  
-    Guchar *predLine;		// line buffer
381  
-    int predIdx;			// current index in predLine
382  
-+   GBool ok;
383  
-  };
384  
-  
385  
-  //------------------------------------------------------------------------
386  
-***************
387  
-*** 527,533 ****
388  
-    short getWhiteCode();
389  
-    short getBlackCode();
390  
-    short lookBits(int n);
391  
-!   void eatBits(int n) { inputBits -= n; }
392  
-  };
393  
-  
394  
-  //------------------------------------------------------------------------
395  
---- 530,536 ----
396  
-    short getWhiteCode();
397  
-    short getBlackCode();
398  
-    short lookBits(int n);
399  
-!   void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
400  
-  };
401  
-  
402  
-  //------------------------------------------------------------------------
403  
-diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
404  
-*** xpdf-3.01.orig/splash/SplashXPathScanner.cc	Tue Aug 16 22:34:31 2005
405  
---- xpdf-3.01/splash/SplashXPathScanner.cc	Wed Feb  1 17:01:14 2006
406  
-***************
407  
-*** 186,192 ****
408  
-  }
409  
-  
410  
-  void SplashXPathScanner::computeIntersections(int y) {
411  
-!   SplashCoord ySegMin, ySegMax, xx0, xx1;
412  
-    SplashXPathSeg *seg;
413  
-    int i, j;
414  
-  
415  
---- 186,192 ----
416  
-  }
417  
-  
418  
-  void SplashXPathScanner::computeIntersections(int y) {
419  
-!   SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
420  
-    SplashXPathSeg *seg;
421  
-    int i, j;
422  
-  
423  
-***************
424  
-*** 236,254 ****
425  
-      } else if (seg->flags & splashXPathVert) {
426  
-        xx0 = xx1 = seg->x0;
427  
-      } else {
428  
-!       if (ySegMin <= y) {
429  
-! 	// intersection with top edge
430  
-! 	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
431  
-        } else {
432  
-! 	// x coord of segment endpoint with min y coord
433  
-! 	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
434  
-        }
435  
-!       if (ySegMax >= y + 1) {
436  
-! 	// intersection with bottom edge
437  
-! 	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
438  
-!       } else {
439  
-! 	// x coord of segment endpoint with max y coord
440  
-! 	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
441  
-        }
442  
-      }
443  
-      if (xx0 < xx1) {
444  
---- 236,262 ----
445  
-      } else if (seg->flags & splashXPathVert) {
446  
-        xx0 = xx1 = seg->x0;
447  
-      } else {
448  
-!       if (seg->x0 < seg->x1) {
449  
-! 	xSegMin = seg->x0;
450  
-! 	xSegMax = seg->x1;
451  
-        } else {
452  
-! 	xSegMin = seg->x1;
453  
-! 	xSegMax = seg->x0;
454  
-        }
455  
-!       // intersection with top edge
456  
-!       xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
457  
-!       // intersection with bottom edge
458  
-!       xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
459  
-!       // the segment may not actually extend to the top and/or bottom edges
460  
-!       if (xx0 < xSegMin) {
461  
-! 	xx0 = xSegMin;
462  
-!       } else if (xx0 > xSegMax) {
463  
-! 	xx0 = xSegMax;
464  
-!       }
465  
-!       if (xx1 < xSegMin) {
466  
-! 	xx1 = xSegMin;
467  
-!       } else if (xx1 > xSegMax) {
468  
-! 	xx1 = xSegMax;
469  
-        }
470  
-      }
471  
-      if (xx0 < xx1) {
13  pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix
... ...
@@ -1,13 +0,0 @@
1  
-[
2  
-{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1lkqiwibxabg5p3k8l0zyzjyysi56dvbbcxp1sybd81hmxf6fzxh";}
3  
-{name="ktp-approver";key="approver";sha256="0bw3i8av55n93ac6phvar03b6rz34wbqrzx7l2vd48d0y5ib0j6m";}
4  
-{name="ktp-auth-handler";key="auth_handler";sha256="0kby9935df474b7jvzzg7v3zvrgml5caf96ps4dcrcvyz91ckd1y";}
5  
-{name="ktp-common-internals";key="common_internals";sha256="1g22b0g9g14dsdl0qkdglgkf26c3pjc96q19kj2kai1i644i8k5h";}
6  
-{name="ktp-contact-applet";key="contact_applet";sha256="0iwr202snsm72xjxv1jb9z24j8ikdx6ljaz5v9i0ha8f8rb1vrp5";}
7  
-{name="ktp-contact-list";key="contact_list";sha256="06y1cw2kkn6ig5qnmzl7bdz9nghpv2c83c9vf9glgbxf77qfg3ms";}
8  
-{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1cdnl4sn34lmm7h7qv8rrkp7ia5gcg2704fqhvpv8n8gxwwhrc1a";}
9  
-{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1ccihqk0pg28v2q6p9dx37ql7hnwdz2060jf1s6p9yyd27fc4is0";}
10  
-{name="ktp-presence-applet";key="presence_applet";sha256="0zgl8z81kmy2a03kzgvvqlr244cw9gw2kfrph1d6ax8zk4fqvxnz";}
11  
-{name="ktp-send-file";key="send_file";sha256="1d1j0klp8dvmldn5c19zqfsxcm5hbaq5fxikpjg0q3j9ib8yh9la";}
12  
-{name="ktp-text-ui";key="text_ui";sha256="0qikjh8ywlnwkfr4nd4hc9b15b824simhdj3n62yd87pmkk3avw6";}
13  
-]
41  pkgs/applications/office/ledger/const.patch
... ...
@@ -1,41 +0,0 @@
1  
-diff --git a/gnucash.cc b/gnucash.cc
2  
-index 7d31526..c4edd77 100644
3  
---- a/gnucash.cc
4  
-+++ b/gnucash.cc
5  
-@@ -201,7 +201,7 @@ static amount_t convert_number(const std::string& number,
6  
- {
7  
-   const char * num = number.c_str();
8  
-
9  
--  if (char * p = std::strchr(num, '/')) {
10  
-+  if (const char * p = std::strchr(num, '/')) {
11  
-     std::string numer_str(num, p - num);
12  
-     std::string denom_str(p + 1);
13  
-
14  
-diff --git a/option.cc b/option.cc
15  
-index 10c23a7..8f2fead 100644
16  
---- a/option.cc
17  
-+++ b/option.cc
18  
-@@ -892,7 +892,7 @@ OPT_BEGIN(market, "V") {
19  
- namespace {
20  
-   void parse_price_setting(const char * optarg)
21  
-   {
22  
--    char * equals = std::strchr(optarg, '=');
23  
-+    const char * equals = std::strchr(optarg, '=');
24  
-     if (! equals)
25  
-       return;
26  
-
27  
-diff --git a/textual.cc b/textual.cc
28  
-index 2033106..d897368 100644
29  
---- a/textual.cc
30  
-+++ b/textual.cc
31  
-@@ -298,8 +298,8 @@ transaction_t * parse_transaction(char * line, account_t * account,
32  
-       DEBUG_PRINT("ledger.textual.parse", "line " << linenum << ": " <<
33  
-		  "Parsed a note '" << xact->note << "'");
34  
-
35  
--      if (char * b = std::strchr(xact->note.c_str(), '['))
36  
--	if (char * e = std::strchr(xact->note.c_str(), ']')) {
37  
-+      if (const char * b = std::strchr(xact->note.c_str(), '['))
38  
-+	if (const char * e = std::strchr(xact->note.c_str(), ']')) {
39  
-	  char buf[256];
40  
-	  std::strncpy(buf, b + 1, e - b - 1);
41  
-	  buf[e - b - 1] = '\0';
23  pkgs/applications/science/biology/slr/default.nix
... ...
@@ -1,23 +0,0 @@
1  
-{stdenv, fetchurl, liblapack}:
2  
-
3  
-stdenv.mkDerivation {
4  
-  name = "slr-1.4.2";
5  
-
6  
-  src = fetchurl {
7  
-    url = http://www.ebi.ac.uk/goldman-srv/SLR/download/v1.4.2/slr_source.tgz;
8  
-    sha256 = "03ak7jsz89zism6gx8fr1dwlwjgcmnrr9m6xgqpr0xzikxid02jp";
9  
-  };
10  
-
11  
-  buildInputs = [ liblapack ];
12  
-  preConfigure = "mkdir bin; cd src";
13  
-  makeFlags = "-f Makefile.linux";
14  
-
15  
-  meta = {
16  
-    description     = "Phylogenetic Analysis by Maximum Likelihood (PAML)";
17  
-    longDescription = ''
18  
-SLR is a program to detect sites in coding DNA that are unusually conserved and/or unusually variable (that is, evolving under purify or positive selection) by analysing the pattern of changes for an alignment of sequences on an evolutionary tree.     
19  
-'';
20  
-    license     = "GPL3";
21  
-    homepage    = http://www.ebi.ac.uk/goldman/SLR/;
22  
-  };
23  
-}
19  pkgs/applications/version-management/darcs/bash-completion.patch
... ...
@@ -1,19 +0,0 @@
1  
-diff --git a/darcs-2.0.0/tools/darcs_completion b/darcs-2.0.0/tools/darcs_completion
2  
-index 10628db..e36476e 100644
3  
---- a/tools/darcs_completion
4  
-+++ b/tools/darcs_completion
5  
-@@ -3,7 +3,6 @@
6  
- # darcs command line completion.
7  
- # Copyright 2002 "David Roundy" <droundy@abridgegame.org>
8  
- #
9  
--have darcs &&
10  
- _darcs()
11  
- {
12  
-     local cur
13  
-@@ -48,5 +47,5 @@ _darcs()
14  
-     return 0
15  
- 
16  
- }
17  
--[ "$have" ] && complete -F _darcs -o default darcs
18  
-+complete -F _darcs -o default darcs
19  
- 
28  pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch
... ...
@@ -1,28 +0,0 @@
1  
-
2  
-make sure `gitman.info' isn't produced since it's broken (duplicate
3  
-node names).
4  
-
5  
-diff --git a/Documentation/Makefile b/Documentation/Makefile
6  
---- a/Documentation/Makefile
7  
-+++ b/Documentation/Makefile
8  
-@@ -84,7 +84,7 @@ man1: $(DOC_MAN1)
9  
- man5: $(DOC_MAN5)
10  
- man7: $(DOC_MAN7)
11  
- 
12  
--info: git.info gitman.info
13  
-+info: git.info
14  
- 
15  
- install: man
16  
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
17  
-@@ -96,10 +96,9 @@ install: man
18  
- 
19  
- install-info: info
20  
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
21  
--	$(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
22  
-+	$(INSTALL) -m 644 git.info $(DESTDIR)$(infodir)
23  
- 	if test -r $(DESTDIR)$(infodir)/dir; then \
24  
- 	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
25  
--	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
26  
- 	else \
27  
- 	  echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
28  
- 	fi
529  pkgs/applications/version-management/git-and-tools/git/glob-path.patch
... ...
@@ -1,529 +0,0 @@
1  
-diff --git a/builtin-add.c b/builtin-add.c
2  
-index bf13aa3..02c6751 100644
3  
---- a/builtin-add.c
4  
-+++ b/builtin-add.c
5  
-@@ -123,6 +123,7 @@ int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
6  
- 	init_revisions(&rev, prefix);
7  
- 	setup_revisions(0, NULL, &rev, NULL);
8  
- 	rev.prune_data = pathspec;
9  
-+	rev.glob_paths = 0; /* git-add has its own filename matching machinery */
10  
- 	rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
11  
- 	rev.diffopt.format_callback = update_callback;
12  
- 	data.flags = flags;
13  
-diff --git a/builtin-blame.c b/builtin-blame.c
14  
-index 9bced3b..237d1fe 100644
15  
---- a/builtin-blame.c
16  
-+++ b/builtin-blame.c
17  
-@@ -343,7 +343,7 @@ static struct origin *find_origin(struct scoreboard *sb,
18  
- 	paths[0] = origin->path;
19  
- 	paths[1] = NULL;
20  
- 
21  
--	diff_tree_setup_paths(paths, &diff_opts);
22  
-+	diff_tree_setup_paths(paths, &diff_opts, 0);
23  
- 	if (diff_setup_done(&diff_opts) < 0)
24  
- 		die("diff-setup");
25  
- 
26  
-@@ -417,7 +417,7 @@ static struct origin *find_rename(struct scoreboard *sb,
27  
- 	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
28  
- 	diff_opts.single_follow = origin->path;
29  
- 	paths[0] = NULL;
30  
--	diff_tree_setup_paths(paths, &diff_opts);
31  
-+	diff_tree_setup_paths(paths, &diff_opts, 0);
32  
- 	if (diff_setup_done(&diff_opts) < 0)
33  
- 		die("diff-setup");
34  
- 
35  
-@@ -1099,7 +1099,7 @@ static int find_copy_in_parent(struct scoreboard *sb,
36  
- 	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
37  
- 
38  
- 	paths[0] = NULL;
39  
--	diff_tree_setup_paths(paths, &diff_opts);
40  
-+	diff_tree_setup_paths(paths, &diff_opts, 0);
41  
- 	if (diff_setup_done(&diff_opts) < 0)
42  
- 		die("diff-setup");
43  
- 
44  
-@@ -2346,6 +2346,11 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
45  
- parse_done:
46  
- 	argc = parse_options_end(&ctx);
47  
- 
48  
-+	if (revs.glob_paths) {
49  
-+		error("git blame does not support `--glob-paths'");
50  
-+		usage_with_options(blame_opt_usage, options);
51  
-+	}
52  
-+
53  
- 	if (!blame_move_score)
54  
- 		blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
55  
- 	if (!blame_copy_score)
56  
-diff --git a/builtin-reset.c b/builtin-reset.c
57  
-index 2e5a886..6026b34 100644
58  
---- a/builtin-reset.c
59  
-+++ b/builtin-reset.c
60  
-@@ -128,14 +128,15 @@ static void update_index_from_diff(struct diff_queue_struct *q,
61  
- }
62  
- 
63  
- static int read_from_tree(const char *prefix, const char **argv,
64  
--		unsigned char *tree_sha1)
65  
-+		unsigned char *tree_sha1, int glob_paths)
66  
- {
67  
- 	struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
68  
- 	int index_fd, index_was_discarded = 0;
69  
- 	struct diff_options opt;
70  
- 
71  
- 	memset(&opt, 0, sizeof(opt));
72  
--	diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt);
73  
-+	diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv),
74  
-+			&opt, glob_paths);
75  
- 	opt.output_format = DIFF_FORMAT_CALLBACK;
76  
- 	opt.format_callback = update_index_from_diff;
77  
- 	opt.format_callback_data = &index_was_discarded;
78  
-@@ -171,6 +172,7 @@ static const char *reset_type_names[] = { "mixed", "soft", "hard", NULL };
79  
- int cmd_reset(int argc, const char **argv, const char *prefix)
80  
- {
81  
- 	int i = 0, reset_type = NONE, update_ref_status = 0, quiet = 0;
82  
-+	int glob_paths = 0;
83  
- 	const char *rev = "HEAD";
84  
- 	unsigned char sha1[20], *orig = NULL, sha1_orig[20],
85  
- 				*old_orig = NULL, sha1_old_orig[20];
86  
-@@ -182,6 +184,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
87  
- 		OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),
88  
- 		OPT_SET_INT(0, "hard", &reset_type,
89  
- 				"reset HEAD, index and working tree", HARD),
90  
-+		OPT_BOOLEAN(0, "glob-paths", &glob_paths,
91  
-+				"match paths with fnmatch"),
92  
- 		OPT_BOOLEAN('q', NULL, &quiet,
93  
- 				"disable showing new HEAD in hard reset and progress message"),
94  
- 		OPT_END()
95  
-@@ -246,7 +250,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
96  
- 		else if (reset_type != NONE)
97  
- 			die("Cannot do %s reset with paths.",
98  
- 					reset_type_names[reset_type]);
99  
--		return read_from_tree(prefix, argv + i, sha1);
100  
-+		return read_from_tree(prefix, argv + i, sha1, glob_paths);
101  
- 	}
102  
- 	if (reset_type == NONE)
103  
- 		reset_type = MIXED; /* by default */
104  
-diff --git a/builtin-update-index.c b/builtin-update-index.c
105  
-index 38eb53c..28b09a3 100644
106  
---- a/builtin-update-index.c
107  
-+++ b/builtin-update-index.c
108  
-@@ -23,6 +23,7 @@ static int allow_replace;
109  
- static int info_only;
110  
- static int force_remove;
111  
- static int verbose;
112  
-+static int glob_paths;
113  
- static int mark_valid_only;
114  
- #define MARK_VALID 1
115  
- #define UNMARK_VALID 2
116  
-@@ -534,7 +535,7 @@ static int do_reupdate(int ac, const char **av,
117  
- 		struct cache_entry *old = NULL;
118  
- 		int save_nr;
119  
- 
120  
--		if (ce_stage(ce) || !ce_path_match(ce, pathspec))
121  
-+		if (ce_stage(ce) || !ce_path_match(ce, pathspec, glob_paths))
122  
- 			continue;
123  
- 		if (has_head)
124  
- 			old = read_one_ent(NULL, head_sha1,
125  
-@@ -659,6 +660,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
126  
- 				force_remove = 1;
127  
- 				continue;
128  
- 			}
129  
-+			if (!strcmp(path, "--glob-paths")) {
130  
-+				glob_paths = 1;
131  
-+				continue;
132  
-+			}
133  
- 			if (!strcmp(path, "-z")) {
134  
- 				line_termination = 0;
135  
- 				continue;
136  
-@@ -702,6 +707,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
137  
- 				usage(update_index_usage);
138  
- 			die("unknown option %s", path);
139  
- 		}
140  
-+		if (glob_paths)
141  
-+			die("--glob-paths without -g");
142  
- 		p = prefix_path(prefix, prefix_length, path);
143  
- 		update_one(p, NULL, 0);
144  
- 		if (set_executable_bit)
145  
-@@ -712,6 +719,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
146  
- 	if (read_from_stdin) {
147  
- 		struct strbuf buf, nbuf;
148  
- 
14