Fix 64bit implicit pointer conversion

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 402ed5e484158749fa85c5a86d26d04e25b7c382..c6b75ae690aa1135890f526045ccb6956925bb22 100644 (file)
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.129 2010/06/17 20:32:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.130 2010/06/25 10:34:19 hwoarang Exp $
+
+  25 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  nagios-plugins-1.4.14.ebuild,
+  +files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch:
+  Fix 64bit implicit pointer conversion
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org>
   nagios-plugins-1.4.13-r1.ebuild, nagios-plugins-1.4.14.ebuild,

diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index ce0777f439f20fb2cf9b768aa2e7101b020d0c34..d4305591950c62fadc3bc782c224e92a047737eb 100644 (file)
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,11 +1,12 @@
 AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278
 AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229
 AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 RMD160 6090168654e888ce9b5bb1c5c6b493f3a019472d SHA1 db41a7f6b57f1119045fb90707a7a8182225d9b8 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455
+AUX nagios-plugins-1.4.14-implicit-pointer-conversion.patch 486 RMD160 193b213ea168a7b25d16380918a3d82e85d86ce3 SHA1 130256ff58f01ac9cae08edbb2f86a2b90c89247 SHA256 65c06471f1b5085371dac7edf55004924745d342c08c03abe9d39116b6b0c10c
 AUX nagios-plugins-1.4.14-vserver.patch 3509 RMD160 49a84ccf016a707872af94306570d7ff173499b8 SHA1 45c255a947adb07cef9f3f18bf9eb0e511c82937 SHA256 7302c26729d02b00c5b5ac4857136773f348ea0a2b7fbddb8ef701784020c3c8
 DIST nagios-plugins-1.4.13.tar.gz 2279556 RMD160 38de32581581b21e36e047138a94a70a9a031a02 SHA1 fb22eba22095bdd709a65b1477bfb566aac9077e SHA256 592fe3329777e53f8fb526cb61e625a85ae9a1fd850b4039f78a2c460b1607c5
 DIST nagios-plugins-1.4.14.tar.gz 1950729 RMD160 f4e1768d84474fc4fa2b59a52efe320c7cbefb3a SHA1 b9998231f992c92b9370b62f15ac80323042f22c SHA256 b1f0f2c01bab2a320cc7c041106500acfd6a5262ff811a2c31b62608ac6c3352
 EBUILD nagios-plugins-1.4.13-r1.ebuild 4090 RMD160 72faeda3a9f44fa9ab29adc2b6a02cc9860889a2 SHA1 264ba2c18d6aee014081fc19a4a6a42fca10a0f0 SHA256 81f7b466b791e19118f641ed1817e5f4fedd554759dfd3faa1369c75042d9b6b
 EBUILD nagios-plugins-1.4.14-r2.ebuild 4452 RMD160 e1f88f5a50c68b114250655b5bc996516241e674 SHA1 d365f8625163a3ac2228d4edbbdf6423878cf570 SHA256 d151215b6b78ff3e43f1e8c58fef054a67563eef2b793589d2f81907394ddf8c
-EBUILD nagios-plugins-1.4.14.ebuild 4203 RMD160 9c8858bbf16ba589f08a29552ef45e94144df4e7 SHA1 47d900fb50f24ddfa2eb5ca5b701190420a1180b SHA256 85e6024920b79c67adeae1127644318ae510aba1a87087c1eff8a51638755e81
-MISC ChangeLog 7590 RMD160 7ca78ad76fca80dfc8dcf452b453086685d2d8c0 SHA1 983706aa32f4ae0f1d0a904b051ff91275ca1af8 SHA256 02683ab263e5673aa87b267a9f0e63862f63a2d729bc311ba1b13f0d1c6cfa60
+EBUILD nagios-plugins-1.4.14.ebuild 4265 RMD160 e790298a3d94a4b2a8da93aca9adcfdae1d43d0d SHA1 a555a731b70a6328e6e6de7b5345ebff7ed16691 SHA256 12166c6ed5c3b36663631aaa9f00041e10b60c96b4d662c051830de9b77ba807
+MISC ChangeLog 7783 RMD160 c015749bc153742b719bd7e2415c2b897d0a39f1 SHA1 8386ae126fb5780597e8c325462a160256e8ce13 SHA256 9acb7c50c69002a5f3fb7687fddec390ee89aadff964d83a87c9e4ede3227646
 MISC metadata.xml 846 RMD160 c586646ae8e50e5530570a9e7dbdc3bfef074d89 SHA1 4a58e0ba3dde6f44a5227c0c232a0f2d2f06ed1d SHA256 ca1e7a175629f4ce6866ca6408744e222216e12c4ce37c6075bf2ded87916ff7

diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch
new file mode 100644 (file)
index 0000000..ec070fa
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch
@@ -0,0 +1,15 @@
+Index: nagios-plugins-1.4.14/plugins/check_ldap.c
+===================================================================
+--- nagios-plugins-1.4.14.orig/plugins/check_ldap.c
++++ nagios-plugins-1.4.14/plugins/check_ldap.c
+@@ -38,6 +38,10 @@ const char *email = "nagiosplug-devel@li
+ #include <lber.h>
+ #include <ldap.h>
+ 
++ldap_init LDAP_P(( /* deprecated, use ldap_create or ldap_initialize */
++      LDAP_CONST char *host,
++      int port ));
++
+ enum {
+       UNDEFINED = 0,
+ #ifdef HAVE_LDAP_SET_OPTION

diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild
index 5b700262e9658d7e36cdbeb86df82ec8a2e5e5ed..4590823876a567affff8e0cfd810bfdfbe6ef281 100644 (file)
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild,v 1.9 2010/06/17 20:32:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild,v 1.10 2010/06/25 10:34:19 hwoarang Exp $
 
 EAPI=1
 
@@ -52,7 +52,7 @@ src_unpack() {
                EPATCH_OPTS="-p1 -d ${S}" epatch \
                "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
        fi
-
+       epatch "${FILESDIR}"/${P}-implicit-pointer-conversion.patch
        epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
        epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch