Fixes several compiler warnings, output should be much cleaner.

Package-Manager: portage-2.1.2-r11

diff --git a/net-irc/psybnc/ChangeLog b/net-irc/psybnc/ChangeLog
index 4956c93e0ab7ba254baded1ef0ffa0a29a7bb5f7..48eab9a21fd1fec14bc238db25e26b1bb56a17e8 100644 (file)
--- a/net-irc/psybnc/ChangeLog
+++ b/net-irc/psybnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/psybnc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.5 2007/02/26 00:03:08 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.6 2007/02/26 12:35:49 gurligebis Exp $
+
+  26 Feb 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org>:
+  Fixes several compiler warnings, output should be much cleaner.
+
+*psybnc-2.3.2.7-r2 (26 Feb 2007)
 
   26 Feb 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org>:
   Moved away from /opt, fixing bug #154164 .

diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 471ae8f05ee7c660529c0baad7c5609c94788512..5a4f67341e94c806a3a01913d94d6ef4c9656e1e 100644 (file)
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1,3 +1,7 @@
+AUX compile.diff 3231 RMD160 f484b2f3878c4a4da8033a23a26e7b0d75d93f3b SHA1 0bcf8a297512cc568718a1c569d0abbb2c800968 SHA256 e6b301659412519872948ee21958b97c57c21e248dae3d040cefcd61032764ee
+MD5 2124f394dd96767745c213070d934f54 files/compile.diff 3231
+RMD160 f484b2f3878c4a4da8033a23a26e7b0d75d93f3b files/compile.diff 3231
+SHA256 e6b301659412519872948ee21958b97c57c21e248dae3d040cefcd61032764ee files/compile.diff 3231
 AUX psybnc.conf 313 RMD160 446813d0753d5b6d3c7592bd90f83f821a993973 SHA1 f9149567abc499474f482ad46b34a16b5bf8dd90 SHA256 e4b04c86a4a1ed910b6cf21fa834eb1eeed166bb372cffbfe9674613f68a080f
 MD5 8d8566aeb360bde07a233ba58be31029 files/psybnc.conf 313
 RMD160 446813d0753d5b6d3c7592bd90f83f821a993973 files/psybnc.conf 313
@@ -11,14 +15,14 @@ MD5 662031e710eb8a24cfaf056fa581d1a2 files/psybnc.initd 1009
 RMD160 415cc2b29e9fed2f64b671527583c0666c699121 files/psybnc.initd 1009
 SHA256 6ca56b5cdabae78d19710f46be0524bfd451866f7aae0a9c953cab28fde5fcbd files/psybnc.initd 1009
 DIST psyBNC-2.3.2-7.tar.gz 312177 RMD160 6a7311a3219fa005219a815bbbac188c315bd2b2 SHA1 d3d06e05c447f7366761a85af204222eddb55e2d SHA256 be38468b374b0470a5728b154527019b7d613c90dc23a93053fda7cdd93f6519
-EBUILD psybnc-2.3.2.7-r2.ebuild 3738 RMD160 56f4acfd11fcb63a813e76dfacd979580379a337 SHA1 9d5668ba685aa8873fdff89b4fc60adaba6420db SHA256 110f9d15664d998c373ba04f33ee457042efccddab6210709056a0e7fa5fafb5
-MD5 d34e7e1d80f416999caf7b4c731efa78 psybnc-2.3.2.7-r2.ebuild 3738
-RMD160 56f4acfd11fcb63a813e76dfacd979580379a337 psybnc-2.3.2.7-r2.ebuild 3738
-SHA256 110f9d15664d998c373ba04f33ee457042efccddab6210709056a0e7fa5fafb5 psybnc-2.3.2.7-r2.ebuild 3738
-MISC ChangeLog 874 RMD160 f04d9694e0bd2d6847c8e0d676de521c7f723706 SHA1 88bcb5ef69c89d86a2891dfd7326b93929631dce SHA256 7d1d4343f531946e2fd0a94f4ee1319f51c04f86533197c551fe157e38bfa9b3
-MD5 6b347c321d23b87c424c3c830ea006f1 ChangeLog 874
-RMD160 f04d9694e0bd2d6847c8e0d676de521c7f723706 ChangeLog 874
-SHA256 7d1d4343f531946e2fd0a94f4ee1319f51c04f86533197c551fe157e38bfa9b3 ChangeLog 874
+EBUILD psybnc-2.3.2.7-r2.ebuild 3772 RMD160 6ffef1950d944c1fbd9be583cc53a0df5de97c41 SHA1 d217f1af1d1d8d9c4e18373a55cf33e127e1d1fe SHA256 4c5f6c25fb6313193d18d1dcb0718d49783f849a874b81a5e5a376f9afa1ec90
+MD5 09c328a1f4107f5b775f2a41edec816c psybnc-2.3.2.7-r2.ebuild 3772
+RMD160 6ffef1950d944c1fbd9be583cc53a0df5de97c41 psybnc-2.3.2.7-r2.ebuild 3772
+SHA256 4c5f6c25fb6313193d18d1dcb0718d49783f849a874b81a5e5a376f9afa1ec90 psybnc-2.3.2.7-r2.ebuild 3772
+MISC ChangeLog 1038 RMD160 fe95e451d0f434bb32e1b14697bd055b1c4ea87d SHA1 4ba04d8d312c3178e7bfa3e8ae9af58bd7438b40 SHA256 1542ef44dc321eb69534473e22c6516604c50f345b663c234bc2d59a99d4bd65
+MD5 697748797f7ab654071ab553a4e7223d ChangeLog 1038
+RMD160 fe95e451d0f434bb32e1b14697bd055b1c4ea87d ChangeLog 1038
+SHA256 1542ef44dc321eb69534473e22c6516604c50f345b663c234bc2d59a99d4bd65 ChangeLog 1038
 MISC metadata.xml 367 RMD160 aafca01b315e4aa19e1bab99902c09faa8068f5c SHA1 c644390b912576d2859097b0a4c78854dceee43b SHA256 7995a9d90742808ba93e9f868d1f59d6dd1b4055c69e760f5fce95a4de4a94f1
 MD5 f07e68f84e878a8aeea22e5b2584e886 metadata.xml 367
 RMD160 aafca01b315e4aa19e1bab99902c09faa8068f5c metadata.xml 367

diff --git a/net-irc/psybnc/files/compile.diff b/net-irc/psybnc/files/compile.diff
new file mode 100644 (file)
index 0000000..830fb34
--- /dev/null
+++ b/net-irc/psybnc/files/compile.diff
@@ -0,0 +1,79 @@
+diff -Naurp src/p_blowfish.c src/p_blowfish.c
+--- src/p_blowfish.c   2007-02-26 12:16:53.000000000 +0000
++++ src/p_blowfish.c   2007-02-26 12:17:11.000000000 +0000
+@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)$Id: p_blowfi
+ #include <string.h>
+ #include <config.h>
+ 
+-char *strmncpy(char *dest, char *source, size_t len);
++char *strmncpy(char *dest, const char *source, size_t len);
+ char *lngtxt(int msgnum);
+ 
+ #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
+diff -Naurp src/p_global.h src/p_global.h
+--- src/p_global.h     2007-02-26 12:16:53.000000000 +0000
++++ src/p_global.h     2007-02-26 12:17:11.000000000 +0000
+@@ -972,8 +972,8 @@ int checklogging(int usern);
+ #endif
+ 
+ #ifndef P_MEMORY
+-unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line);
+-void _pfree(void * pointer,char *module, char *function, int line);
++unsigned long *__pmalloc(unsigned long size,const char *module,const char *function,int line);
++void _pfree(void * pointer,char *module, const char *function, int line);
+ struct usert *user(int usern);
+ struct newpeert *newpeer(int usern);
+ struct datalinkt *datalink(int usern);
+@@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char 
+ char *nobreak(char *tobreak);
+ char *randstring(int length);
+ char *strmcat(char *first,char *second);
+-char *strmncpy(char *dest, char *source, unsigned int len);
++char *strmncpy(char *dest, const char *source, unsigned int len);
+ int strmncasecmp(char *one, char *two);
+ int strmcmp(char *one, char *two);
+ int strmwildcmp(char *line, char *wildcard);
+diff -Naurp src/p_memory.c src/p_memory.c
+--- src/p_memory.c     2007-02-26 12:16:53.000000000 +0000
++++ src/p_memory.c     2007-02-26 12:17:11.000000000 +0000
+@@ -32,7 +32,7 @@ FILE *logm=NULL;
+ 
+ /* malloc-wrapper. No memory will log an error entry and kill the bouncer */
+ 
+-unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line)
++unsigned long *__pmalloc(unsigned long size,const char *module,const char *function, int line)
+ {
+     unsigned long *rc;
+     if (!(rc=(unsigned long *)malloc(size)))
+@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
+     return rc;
+ }
+ 
+-void _pfree(unsigned long *pointer, char *module, char *function, int line)
++void _pfree(unsigned long *pointer, char *module, const char *function, int line)
+ {
+ #ifdef LOGALLOC
+     if(logm==NULL)
+diff -Naurp src/p_string.c src/p_string.c
+--- src/p_string.c     2007-02-26 12:16:53.000000000 +0000
++++ src/p_string.c     2007-02-26 12:17:11.000000000 +0000
+@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
+ 
+ /* string copy with len and zero delimit */
+ 
+-char *strmncpy(char *dest, char *source, unsigned int len)
++char *strmncpy(char *dest, const char *source, unsigned int len)
+ {
+     char bf[strlen(source)+2];
+     char *pt;
+diff -Naurp src/match.c src/match.c
+--- src/match.c        2007-02-26 12:26:10.000000000 +0000
++++ src/match.c        2007-02-26 12:26:17.000000000 +0000
+@@ -36,6 +36,7 @@
+ /* Remove the next line to use this in IrcII */
+ #define EGGDROP
+ 
++#include <p_global.h>
+ 
+ /* ===================================================================
+  * Best to leave stuff after this point alone, but go on and change

diff --git a/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild b/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild
index c107c25e729e990631e008b6d336f26315c07625..17cffb47bc6804f123c3b1fad80c109341eb305f 100644 (file)
--- a/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild,v 1.1 2007/02/26 00:03:08 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild,v 1.2 2007/02/26 12:35:49 gurligebis Exp $
 
 inherit eutils versionator toolchain-funcs
 MY_PV="$(replace_version_separator 3 -)"
@@ -28,6 +28,8 @@ src_unpack() {
        unpack ${A}
        cd ${S}
 
+       epatch ${FILESDIR}/compile.diff
+
        # Useless files
        rm -f */INFO