Clean up upstream code slightly, so it works better.

(Portage version: 2.1_pre6-r3)

5 files changed, 109 insertions, 12 deletions

diff --git a/app-admin/cancd/ChangeLog b/app-admin/cancd/ChangeLog
index 45f53c64d959..1e616f397694 100644
--- a/app-admin/cancd/ChangeLog
+++ b/app-admin/cancd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/cancd
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.3 2005/11/19 01:32:21 robbat2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.4 2006/03/18 01:27:05 robbat2 Exp $
+
+  18 Mar 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/cancd-0.1.0-c-cleanup.patch, cancd-0.1.0-r1.ebuild:
+  Clean up upstream code slightly, so it works better.
 
   19 Nov 2005; Robin H. Johnson <robbat2@gentoo.org>
   files/netconsole-conf.d, files/netconsole-init.d:
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
index 71e4f1bf3704..e96147bbe5b4 100644
--- a/app-admin/cancd/Manifest
+++ b/app-admin/cancd/Manifest
@@ -1,10 +1,33 @@
-MD5 4ca7e3df59e4817fd53a9b61f33f681a cancd-0.1.0.ebuild 962
-MD5 853118bdcac4e0e4a357b07ec8d58545 cancd-0.1.0-r1.ebuild 1067
 MD5 97b53a11e927b2a4e3f54d32169c0454 ChangeLog 755
-MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
-MD5 9a5d79918c491be2c798c61decb6e653 files/netconsole-conf.d 866
-MD5 996e8c720fef5c825552371ad16a2396 files/netconsole-init.d 1624
-MD5 2519af6cc0a0ad63ed00fff3929ed7ad files/digest-cancd-0.1.0 61
+RMD160 1879f66fb4e3d4759ec344017a5b974cc23938c6 ChangeLog 755
+SHA256 dfbed98d7b99aeeeec2137643b9c6b636de29d945f60b30bf9caff9a486d9f48 ChangeLog 755
+MD5 1d5887dcdae64613e7a2db6f2f8a6d7d cancd-0.1.0-r1.ebuild 1365
+RMD160 462317447d580b77d1b8ceba7dd2cf60fce2e480 cancd-0.1.0-r1.ebuild 1365
+SHA256 4f7df1f40a9e888d5c3dbeae7f165e67e9e5b79a5d199ef3d61ba81c2ce192a7 cancd-0.1.0-r1.ebuild 1365
+MD5 4ca7e3df59e4817fd53a9b61f33f681a cancd-0.1.0.ebuild 962
+RMD160 5883222be7e3634115dfebe397a61296f8ee5477 cancd-0.1.0.ebuild 962
+SHA256 3f4ca04d8dc5c12027121cf2647663ac83d994d4f9f1f5843be72483812f3534 cancd-0.1.0.ebuild 962
+MD5 edb149518dd096bd0f0359ba446aac6f files/cancd-0.1.0-c-cleanup.patch 1648
+RMD160 597ace0b1a0baf98d52d0d5bbfea286a14e9c272 files/cancd-0.1.0-c-cleanup.patch 1648
+SHA256 55628aa8e2fabd3aa26bc0023d46562a238047b2f7ad5c8485b88794655f93d7 files/cancd-0.1.0-c-cleanup.patch 1648
 MD5 3b01d1817d6513beed0e000105ae17f7 files/cancd-conf.d 605
+RMD160 77fd3df8932c6beee17c3521515745d1654943eb files/cancd-conf.d 605
+SHA256 bbf84fdba07bde4a61864715e42a76c2b3ad2ecade4ad11b8ca4d557bfa9deb8 files/cancd-conf.d 605
 MD5 c442ca1294fd06f4b84e8ba23180507f files/cancd-init.d 624
-MD5 2519af6cc0a0ad63ed00fff3929ed7ad files/digest-cancd-0.1.0-r1 61
+RMD160 93588ec35b22084453c14f20bdcd1a0c4db65c1b files/cancd-init.d 624
+SHA256 100342d5bb42b064c7e8cf82d73e45cf6ddfd3f4a44e5df561f6022b3f925ea3 files/cancd-init.d 624
+MD5 2519af6cc0a0ad63ed00fff3929ed7ad files/digest-cancd-0.1.0 61
+RMD160 839c20210a5293a5f6e5332242cc0c5934d13923 files/digest-cancd-0.1.0 61
+SHA256 ddff97f72720b4f5cad043947bb0beb7db2f6a6017844e45a5189d5e1130ebb3 files/digest-cancd-0.1.0 61
+MD5 34f83c837594c23a3da076f50e327bab files/digest-cancd-0.1.0-r1 229
+RMD160 8107475a7129e8dba8b24c87a1be600734592b79 files/digest-cancd-0.1.0-r1 229
+SHA256 0328249d47cf808f53e762764a03f18dbac98e4bb9b582e6e09c1a61407e486b files/digest-cancd-0.1.0-r1 229
+MD5 9a5d79918c491be2c798c61decb6e653 files/netconsole-conf.d 866
+RMD160 68cf7a8a21d258afe9bda39d77fc39d7f911ed98 files/netconsole-conf.d 866
+SHA256 480230a83fade7e2c284936fc8814c07e075d8296e37aa83772f8d8cb3c6ff96 files/netconsole-conf.d 866
+MD5 996e8c720fef5c825552371ad16a2396 files/netconsole-init.d 1624
+RMD160 27267e5c9e409e7aea7fb1af9fb2415aeabf0e91 files/netconsole-init.d 1624
+SHA256 0e89a95b572450577ff1192feae29059ebab9caab99639557cb709bb9b0c401c files/netconsole-init.d 1624
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f metadata.xml 279
+SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543 metadata.xml 279
diff --git a/app-admin/cancd/cancd-0.1.0-r1.ebuild b/app-admin/cancd/cancd-0.1.0-r1.ebuild
index 17570b703c92..cb70b49631fb 100644
--- a/app-admin/cancd/cancd-0.1.0-r1.ebuild
+++ b/app-admin/cancd/cancd-0.1.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r1.ebuild,v 1.1 2005/11/15 19:27:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r1.ebuild,v 1.2 2006/03/18 01:27:05 robbat2 Exp $
+
+inherit eutils
 
 DESCRIPTION="This is the CA NetConsole Daemon, a daemon to receive output from
 the Linux netconsole driver."
@@ -15,10 +17,11 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-c-cleanup.patch
 	# slight makefile cleanup
 	sed -i.orig \
 		-e '/^CFLAGS/s,-g,,' \
-		-e '/^CFLAGS/s,-O2,,' \
+		-e '/^CFLAGS/s,-O2,-Wall -W -Wextra -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wunreachable-code -Wlong-long,' \
 		-e '/rm cancd cancd.o/s,rm,rm -f,' \
 		${S}/Makefile
 }
diff --git a/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch b/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch
new file mode 100644
index 000000000000..47defb3e43b2
--- /dev/null
+++ b/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch
@@ -0,0 +1,65 @@
+diff -Nuar --exclude '*~' --exclude '*.orig' --exclude Makefile cancd-0.1.0/cancd.c cancd-0.1.0.new/cancd.c
+--- cancd-0.1.0/cancd.c	2005-08-18 11:47:48.000000000 -0700
++++ cancd-0.1.0.new/cancd.c	2006-03-17 17:09:46.402025517 -0800
+@@ -199,7 +199,7 @@
+     char *path;
+ };
+ 
+-static int make_tree(const char *path, int mode)
++static int make_tree(const char *path, mode_t mode)
+ {
+     struct stat stat_buf;
+     char *ptr, *tmp;
+@@ -319,7 +319,7 @@
+ static int open_socket()
+ {
+     int rc;
+-    struct sockaddr_in servaddr = {0, };
++    struct sockaddr_in servaddr;
+ 
+     sock_fd = socket(PF_INET, SOCK_DGRAM, 0);
+     if (sock_fd < 0)
+@@ -438,7 +438,7 @@
+     int rc;
+     static int block = 1;
+ 
+-    rc = recvfrom(sock_fd, buf, bufsize, 0,
++    rc = recvfrom(fd, buf, bufsize, 0,
+                   (struct sockaddr *)from, fromlen);
+     if (rc < 0)
+     {
+@@ -569,7 +569,7 @@
+ 
+ static int valid_format()
+ {
+-    struct in_addr addr = {0, };
++    struct in_addr addr;
+     char *name;
+     int rc;
+ 
+@@ -599,9 +599,11 @@
+     exit(rc);
+ }
+ 
++/*
+ extern char *optarg;
+ extern int optopt;
+ extern int opterr;
++*/
+ static int parse_options(int argc, char *argv[])
+ {
+     int c;
+@@ -641,11 +643,11 @@
+                             optarg);
+                     print_usage(-EINVAL);
+                 }
+-                log_prefix = optarg;
++                log_prefix = strdup(optarg);
+                 break;
+ 
+             case 'o':
+-                log_format = optarg;
++                log_format = strdup(optarg);
+                 if (!log_format || !*log_format || !valid_format())
+                 {
+                     fprintf(stderr,
diff --git a/app-admin/cancd/files/digest-cancd-0.1.0-r1 b/app-admin/cancd/files/digest-cancd-0.1.0-r1
index 919c488ecc49..95b1f6071ec9 100644
--- a/app-admin/cancd/files/digest-cancd-0.1.0-r1
+++ b/app-admin/cancd/files/digest-cancd-0.1.0-r1
@@ -1 +1,3 @@
 MD5 3eb4a75cfa4d1a860ea547fdc76c6d4d cancd-0.1.0.tar.gz 7634
+RMD160 9ce93f6ad6340d3fb9d5e3c2b073ae4a77d44782 cancd-0.1.0.tar.gz 7634
+SHA256 aea21e3eadee64d2b76591d272dcd03c566215b2320d7fef5cfe0937c3ef0315 cancd-0.1.0.tar.gz 7634