Fix compilation on gcc4 thanks to Patrizio Bassi <hetfield666@gmail.com> (#122002).

(Portage version: 2.0.54)

5 files changed, 151 insertions, 14 deletions

diff --git a/net-dialup/mserver/ChangeLog b/net-dialup/mserver/ChangeLog
index 0fb17386bfb7..0da68fc09aef 100644
--- a/net-dialup/mserver/ChangeLog
+++ b/net-dialup/mserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/mserver
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mserver/ChangeLog,v 1.7 2004/06/24 22:30:17 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mserver/ChangeLog,v 1.8 2006/02/08 18:29:34 mrness Exp $
+
+*mserver-0.5.5-r2 (08 Feb 2006)
+
+  08 Feb 2006; Alin Nastac <mrness@gentoo.org>
+  +files/mserver-0.5.5-gcc4.patch, +mserver-0.5.5-r2.ebuild:
+  Fix compilation on gcc4 thanks to Patrizio Bassi <hetfield666@gmail.com> (#122002).
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mserver-0.5.5-r1.ebuild:
   Add inherit eutils
diff --git a/net-dialup/mserver/Manifest b/net-dialup/mserver/Manifest
index d9422fd9b69b..b3417e034a85 100644
--- a/net-dialup/mserver/Manifest
+++ b/net-dialup/mserver/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3d9676baf1c6ae0101d262bf678015d6 ChangeLog 837
-MD5 ab5275dadb8d579eb9204b98af8fe62f metadata.xml 269
-MD5 98c1afb05da798654bb856057daf8da6 mserver-0.5.5-r1.ebuild 1126
 MD5 946947bd8b3bb6e5521f666607498293 files/digest-mserver-0.5.5-r1 67
+MD5 946947bd8b3bb6e5521f666607498293 files/digest-mserver-0.5.5-r2 67
 MD5 7ec81b751992ca8b635dbe7b983be07c files/mserver-0.5.5-errno.patch 344
+MD5 d14ac2b2c6a89fa068a56a9cefe007fb files/mserver-0.5.5-gcc4.patch 3310
 MD5 b989a733671e0f1d0fe9ecf07d25f548 files/mserver-init 683
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBnwhUjtv59x0+BrURAqemAKD1arUxeXaCSMnVqqEnTXgYPBV2ngCg8dNe
-2rf5kOq+DnntTkXVBiWaK24=
-=LW7+
------END PGP SIGNATURE-----
+MD5 ab5275dadb8d579eb9204b98af8fe62f metadata.xml 269
+MD5 98c1afb05da798654bb856057daf8da6 mserver-0.5.5-r1.ebuild 1126
+MD5 57a9108cebc8837ea8d2b4b96e6d6ab7 mserver-0.5.5-r2.ebuild 1053
diff --git a/net-dialup/mserver/files/digest-mserver-0.5.5-r2 b/net-dialup/mserver/files/digest-mserver-0.5.5-r2
new file mode 100644
index 000000000000..2f40612c72fc
--- /dev/null
+++ b/net-dialup/mserver/files/digest-mserver-0.5.5-r2
@@ -0,0 +1 @@
+MD5 ee4348241ac8e42d6b62c93036ffaf71 c-mserver-0.5.5.tar.gz 213799
diff --git a/net-dialup/mserver/files/mserver-0.5.5-gcc4.patch b/net-dialup/mserver/files/mserver-0.5.5-gcc4.patch
new file mode 100644
index 000000000000..c4ad9ff944aa
--- /dev/null
+++ b/net-dialup/mserver/files/mserver-0.5.5-gcc4.patch
@@ -0,0 +1,96 @@
+diff -Nur mserver-0.5.5.orig/authgen/authgen.c mserver-0.5.5/authgen/authgen.c
+--- mserver-0.5.5.orig/authgen/authgen.c	1999-07-13 02:31:25.000000000 +0300
++++ mserver-0.5.5/authgen/authgen.c	2006-02-08 20:14:51.050323500 +0200
+@@ -19,6 +19,7 @@
+ #define __USE_XOPEN /* Needed for crypt() prototype (on Linux glibc2.1, at least) */
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <time.h>
+ #include <pwd.h>
+ 
+@@ -74,7 +75,7 @@
+ 	salt[1] = 'a';
+ 	salt[2] = '\0';
+ 
+-	(char *) cryptpass = (char *) crypt(passwd, salt);
++	cryptpass = crypt(passwd, salt);
+ 
+ 	chomp (username);
+ 	chomp (cryptpass);
+diff -Nur mserver-0.5.5.orig/mserver/auth.c mserver-0.5.5/mserver/auth.c
+--- mserver-0.5.5.orig/mserver/auth.c	1999-07-13 19:05:41.000000000 +0300
++++ mserver-0.5.5/mserver/auth.c	2006-02-08 20:18:29.407970000 +0200
+@@ -239,7 +239,7 @@
+ 
+ 	if (!auth_getverified())
+ 	{
+-		syslog (LOG_INFO, "User not verified!", userallow);
++		syslog (LOG_INFO, "User not verified!");
+ 		if (config_getvalue_bool("reqauth", false))
+ 		{
+ 			return false;
+diff -Nur mserver-0.5.5.orig/mserver/ipc.c mserver-0.5.5/mserver/ipc.c
+--- mserver-0.5.5.orig/mserver/ipc.c	1999-07-07 03:03:17.000000000 +0300
++++ mserver-0.5.5/mserver/ipc.c	2006-02-08 20:19:30.535790250 +0200
+@@ -16,6 +16,7 @@
+     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
++#include <stdlib.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <errno.h>
+diff -Nur mserver-0.5.5.orig/mserver/list.c mserver-0.5.5/mserver/list.c
+--- mserver-0.5.5.orig/mserver/list.c	1999-07-07 03:03:18.000000000 +0300
++++ mserver-0.5.5/mserver/list.c	2006-02-08 20:15:57.330465750 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <syslog.h>
++#include <string.h>
+ 
+ #include "mserver.h"
+ 
+diff -Nur mserver-0.5.5.orig/mserver/mserver.h mserver-0.5.5/mserver/mserver.h
+--- mserver-0.5.5.orig/mserver/mserver.h	1999-07-07 03:03:22.000000000 +0300
++++ mserver-0.5.5/mserver/mserver.h	2006-02-08 20:14:51.070324750 +0200
+@@ -151,7 +151,7 @@
+ /* Parsing functions */
+ bool parse(const char *);
+ bool parse_init(const char *);
+-int parse_listenon(char *, char [MAXINTERFACES][], char [MAXINTERFACES][]);
++int parse_listenon(char *, char [MAXINTERFACES][1024], char [MAXINTERFACES][1024]);
+ 
+ /* Utility functions */
+ int util_system (const char *);
+diff -Nur mserver-0.5.5.orig/mserver/netload.c mserver-0.5.5/mserver/netload.c
+--- mserver-0.5.5.orig/mserver/netload.c	1999-07-07 03:03:23.000000000 +0300
++++ mserver-0.5.5/mserver/netload.c	2006-02-08 20:23:05.777242000 +0200
+@@ -128,20 +128,20 @@
+ 		

+ 		if (flags == IP_FW_ACCTIN)

+ 		{

+-			sscanf(tmp, "%ld", &in_packets);

++			sscanf(tmp, "%lu", &in_packets);

+ 			tmp = strtok(NULL, " ");

+-			sscanf(tmp, "%ld", &in_bytes);

++			sscanf(tmp, "%lu", &in_bytes);

+ 		}

+ 		else if (flags == IP_FW_ACCTOUT)

+ 		{

+-			sscanf(tmp, "%ld", &out_packets);

++			sscanf(tmp, "%lu", &out_packets);

+ 			tmp = strtok(NULL, " ");

+-			sscanf(tmp, "%ld", &out_bytes);

++			sscanf(tmp, "%lu", &out_bytes);

+ 		}

+ 	}

+ 

+-	syslog(LOG_DEBUG, "IN: %d/%d", in_packets, out_bytes);

+-	syslog(LOG_DEBUG, "OUT: %d/%d", out_packets, out_bytes);

++	syslog(LOG_DEBUG, "IN: %lu/%lu", in_packets, out_bytes);

++	syslog(LOG_DEBUG, "OUT: %lu/%lu", out_packets, out_bytes);

+ 

+ 	fclose(f);

+ 

diff --git a/net-dialup/mserver/mserver-0.5.5-r2.ebuild b/net-dialup/mserver/mserver-0.5.5-r2.ebuild
new file mode 100644
index 000000000000..997c5fb9a434
--- /dev/null
+++ b/net-dialup/mserver/mserver-0.5.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mserver/mserver-0.5.5-r2.ebuild,v 1.1 2006/02/08 18:29:34 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="Daemon that provides control of dial-up links to other PCs on the LAN"
+HOMEPAGE="http://cpwright.com/mserver/"
+SRC_URI="http://cpwright.com/mserver/download/c-${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="sys-libs/pam"
+RDEPEND="net-dialup/ppp"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-errno.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
+src_install() {
+	dosbin mserver/mserver mchat/mchat authgen/authgen checkstat/checkstat
+	doman mchat/mchat.8
+	dodoc mserver/PROTOCOL README docs/index.html
+	newdoc mchat/README README.mchat
+	docinto images
+	dodoc docs/images/*.gif docs/images/*.jpg
+
+	insinto /etc
+	newins mserver/mserver.conf mserver.conf.dist
+
+	insinto /etc/pam.d
+	doins pam/mserver
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/mserver-init mserver"
+}