Merge compnerd's patch into previous

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index a87784ee9b333a66153eb393fa0b6632e575ee37..d73617b4f5455e3b14e31b8b733bbf801b2dd157 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.159 2007/04/11 21:30:05 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.160 2007/04/11 21:40:25 cardoe Exp $
+
+  11 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  files/0.5.9/07_malloc_h_for_stdlib_h.patch,
+  -files/0.5.9/08_hald-mallopt-include-malloc.patch:
+  Merge compnerd's patch into previous
 
   11 Apr 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   +files/0.5.9/08_hald-mallopt-include-malloc.patch:

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 6e45ea4aea8f5b0d0cfaee522def3c5b250dcfff..d7da5bb45f705ccb72a5b2c1c6b86b3c17cef3e8 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681
 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681
@@ -34,14 +37,10 @@ AUX 0.5.9/06_freebsd_backend_fix.patch 1855 RMD160 b72d65291d04cc5ebadc24ef697f2
 MD5 65a0a52b23807f81ee2d61d2602256b2 files/0.5.9/06_freebsd_backend_fix.patch 1855
 RMD160 b72d65291d04cc5ebadc24ef697f2e1ae2ab28a8 files/0.5.9/06_freebsd_backend_fix.patch 1855
 SHA256 c8f5149e581cbcd328b70f04532b45f488940ce3b9d779a355600e96f885bed2 files/0.5.9/06_freebsd_backend_fix.patch 1855
-AUX 0.5.9/07_malloc_h_for_stdlib_h.patch 1222 RMD160 73f739410f6e493dee2122c20323f041c73cf73f SHA1 76fd9fc0aa4a68023408647f88772f44155e5659 SHA256 aa4f13cea5ec021ef0581eddee6981ba950e94657db947592b23074a69023ec6
-MD5 3eba439d9fb147f8c2642a6f114741dc files/0.5.9/07_malloc_h_for_stdlib_h.patch 1222
-RMD160 73f739410f6e493dee2122c20323f041c73cf73f files/0.5.9/07_malloc_h_for_stdlib_h.patch 1222
-SHA256 aa4f13cea5ec021ef0581eddee6981ba950e94657db947592b23074a69023ec6 files/0.5.9/07_malloc_h_for_stdlib_h.patch 1222
-AUX 0.5.9/08_hald-mallopt-include-malloc.patch 283 RMD160 2b188fc4427fb905fd5dcc07ec64f9889f404484 SHA1 2a0a87d5362d249ca80c36bd112019167a316b3e SHA256 d1c51a3c99da915a4ca195f577728136b502d61cb6e0d3bc653dad25d416c761
-MD5 a858eb925978d909245cbb63c93ada28 files/0.5.9/08_hald-mallopt-include-malloc.patch 283
-RMD160 2b188fc4427fb905fd5dcc07ec64f9889f404484 files/0.5.9/08_hald-mallopt-include-malloc.patch 283
-SHA256 d1c51a3c99da915a4ca195f577728136b502d61cb6e0d3bc653dad25d416c761 files/0.5.9/08_hald-mallopt-include-malloc.patch 283
+AUX 0.5.9/07_malloc_h_for_stdlib_h.patch 1401 RMD160 2e1140954fd8818d412fc07750f12b25d04f7ada SHA1 8fc34e0f1a81e89465ffbce7881aba597276121f SHA256 04749b15f3349e146523d9ed2571e5362804de5f0320f68cbcc85395debc6554
+MD5 61d44f37a51f2e92054bda4df0b67688 files/0.5.9/07_malloc_h_for_stdlib_h.patch 1401
+RMD160 2e1140954fd8818d412fc07750f12b25d04f7ada files/0.5.9/07_malloc_h_for_stdlib_h.patch 1401
+SHA256 04749b15f3349e146523d9ed2571e5362804de5f0320f68cbcc85395debc6554 files/0.5.9/07_malloc_h_for_stdlib_h.patch 1401
 AUX 0.5.9/95_gentoo_man_page.patch 18159 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 SHA1 f9de30d705eada8e2f631e51b715b9923f732fb4 SHA256 59d81dcb273f3cdc9c7fc9f195331529642fef2c2150b3eeb3fd98ea555b1893
 MD5 f6d115e0eb501aba476f4df965bfeb6c files/0.5.9/95_gentoo_man_page.patch 18159
 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 files/0.5.9/95_gentoo_man_page.patch 18159
@@ -172,10 +171,10 @@ EBUILD hal-0.5.9.ebuild 6383 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 SHA
 MD5 84c3c9a869e9c860b756e033458509da hal-0.5.9.ebuild 6383
 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 hal-0.5.9.ebuild 6383
 SHA256 1734a1121bb33064e8bedadee3682947e654244b381d0032c3a28beed87c2a60 hal-0.5.9.ebuild 6383
-MISC ChangeLog 25503 RMD160 e0a7f6e0c92cd43f1df7217d239fa91d97853fd9 SHA1 4db3e90ed6df91adbfc3030aa6d6c6876f1f155e SHA256 52005e350726bbc334788c2765e407371ad723a8d2d4342afb6e377d8cbd004d
-MD5 acd6c70c4936a8bfa2dfd151f664e119 ChangeLog 25503
-RMD160 e0a7f6e0c92cd43f1df7217d239fa91d97853fd9 ChangeLog 25503
-SHA256 52005e350726bbc334788c2765e407371ad723a8d2d4342afb6e377d8cbd004d ChangeLog 25503
+MISC ChangeLog 25690 RMD160 f004533a2cb09cfa81980d2e42fb77fb4046a8fd SHA1 65bd7d7338e87aa2d342f3a536e5473520a23c15 SHA256 46cd5fd07bfa2d748b99536913dae05566f436da3e4b765385024ec09a3ac8dd
+MD5 76f6821f90b321734bc36b275964f887 ChangeLog 25690
+RMD160 f004533a2cb09cfa81980d2e42fb77fb4046a8fd ChangeLog 25690
+SHA256 46cd5fd07bfa2d748b99536913dae05566f436da3e4b765385024ec09a3ac8dd ChangeLog 25690
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -189,3 +188,10 @@ SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/di
 MD5 75c89219e1c767bdbfa9942258c86827 files/digest-hal-0.5.9 232
 RMD160 6244ab5be8bbc652f1130c2715f32bf881710f31 files/digest-hal-0.5.9 232
 SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/digest-hal-0.5.9 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGHVW6oeSe8B0zEfwRAjzAAJ9imbQLvvWocrobFKS/GSlGE1ST0gCbBK37
+pEykH02nvm725QfOQsuncUs=
+=Ivg7
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/files/0.5.9/07_malloc_h_for_stdlib_h.patch b/sys-apps/hal/files/0.5.9/07_malloc_h_for_stdlib_h.patch
index de1c539d126340d42f2e2259580de5e85795e15f..cfc20c6c06224df6be3023a744d5bde4d1e99f4c 100644 (file)
--- a/sys-apps/hal/files/0.5.9/07_malloc_h_for_stdlib_h.patch
+++ b/sys-apps/hal/files/0.5.9/07_malloc_h_for_stdlib_h.patch
@@ -1,7 +1,7 @@
 Index: b/hald/create_cache.c
 ===================================================================
---- a/hald/create_cache.c      2007-04-11 14:19:13.000000000 -0400
-+++ b/hald/create_cache.c      2007-04-11 15:16:14.000000000 -0400
+--- a/hald/create_cache.c      2007-04-11 15:50:43.000000000 -0400
++++ b/hald/create_cache.c      2007-04-11 17:34:54.000000000 -0400
 @@ -34,8 +34,8 @@
  #include <unistd.h>
  #include <string.h>
@@ -14,9 +14,21 @@ Index: b/hald/create_cache.c
  #include <getopt.h>
 Index: b/hald/hald.c
 ===================================================================
---- a/hald/hald.c      2007-04-11 14:19:13.000000000 -0400
-+++ b/hald/hald.c      2007-04-11 15:16:14.000000000 -0400
-@@ -43,7 +43,6 @@
+--- a/hald/hald.c      2007-04-11 15:50:43.000000000 -0400
++++ b/hald/hald.c      2007-04-11 17:37:29.000000000 -0400
+@@ -30,6 +30,11 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++
++#ifdef HAVE_MALLOPT
++#include <malloc.h>
++#endif
++
+ #include <string.h>
+ #include <unistd.h>
+ #include <getopt.h>
+@@ -43,7 +48,6 @@
  #include <syslog.h>
  #include <sys/time.h>
  #include <sys/resource.h>
@@ -26,8 +38,8 @@ Index: b/hald/hald.c
  #include <dbus/dbus-glib-lowlevel.h>
 Index: b/hald/cache_test.c
 ===================================================================
---- a/hald/cache_test.c        2007-04-11 15:17:04.000000000 -0400
-+++ b/hald/cache_test.c        2007-04-11 15:17:32.000000000 -0400
+--- a/hald/cache_test.c        2007-04-11 15:50:43.000000000 -0400
++++ b/hald/cache_test.c        2007-04-11 17:34:54.000000000 -0400
 @@ -34,7 +34,7 @@
  #include <unistd.h>
  #include <string.h>

diff --git a/sys-apps/hal/files/0.5.9/08_hald-mallopt-include-malloc.patch b/sys-apps/hal/files/0.5.9/08_hald-mallopt-include-malloc.patch
deleted file mode 100644 (file)
index 848bd02..0000000
--- a/sys-apps/hal/files/0.5.9/08_hald-mallopt-include-malloc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hald/hald.c        2007-04-11 16:04:19.000000000 -0500
-+++ hald/hald.c        2007-04-11 16:08:21.000000000 -0500
-@@ -30,6 +30,11 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+
-+#ifdef HAVE_MALLOPT
-+#include <malloc.h>
-+#endif
-+
- #include <string.h>
- #include <unistd.h>
- #include <getopt.h>