[Pkg-sysvinit-commits] r1584 - in sysvinit/trunk/debian: . patches

[Kel Modderman]

Author: kelmo-guest
Date: 2009-08-01 19:46:39 +0000 (Sat, 01 Aug 2009)
New Revision: 1584

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch
Log:
Fix reject hunk of debian/patches/70_compiler_warnings.dpatch to
finx another compile warning.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-08-01 19:26:06 UTC (rev 1583)
+++ sysvinit/trunk/debian/changelog	2009-08-01 19:46:39 UTC (rev 1584)
@@ -52,8 +52,10 @@
   * Remove checkdir, checkroot and buildfromsvn targets from debian/rules.
     The latter is unused by current maintainers and the former can be replaced
     with dh_testdir and dh_testroot instead.
+  * Fix reject hunk of debian/patches/70_compiler_warnings.dpatch to
+    finx another compile warning.
 
- -- Kel Modderman <kel at otaku42.de>  Sun, 02 Aug 2009 05:16:46 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sun, 02 Aug 2009 05:46:21 +1000
 
 sysvinit (2.87dsf-2) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch	2009-08-01 19:26:06 UTC (rev 1583)
+++ sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch	2009-08-01 19:46:39 UTC (rev 1584)
@@ -5,7 +5,16 @@
 
 --- a/src/bootlogd.c
 +++ b/src/bootlogd.c
-@@ -370,7 +370,7 @@
+@@ -136,7 +136,7 @@ static int findtty(char *res, const char
+ 		if (!S_ISCHR(st.st_mode))
+ 			continue;
+ 		if (st.st_rdev == dev) {
+-			if (strlen(ent->d_name) + strlen(startdir) + 1 >= rlen) {
++			if ((int)strlen(ent->d_name) + (int)strlen(startdir) + 1 >= rlen) {
+ 				fprintf(stderr, "bootlogd: console device name too long\n");
+ 				closedir(dir);
+ 				chdir(olddir);
+@@ -370,7 +370,7 @@ void writelog(FILE *fp, unsigned char *p
  				break;
  			case '\t':
  				line.pos += (line.pos / 8 + 1) * 8;
@@ -14,7 +23,7 @@
  					line.pos = sizeof(line.buf) - 1;
  				break;
  			case  32 ... 127:
-@@ -386,7 +386,7 @@
+@@ -386,7 +386,7 @@ void writelog(FILE *fp, unsigned char *p
  		len--;
  
  		tlen = strlen(tmp);
@@ -23,7 +32,7 @@
  			memcpy(line.buf + line.pos, tmp, tlen);
  			line.pos += tlen;
  		}
-@@ -659,7 +659,7 @@
+@@ -659,7 +659,7 @@ int main(int argc, char **argv)
  		else
  			todo = endptr - outptr;
  		if (fp && todo)
@@ -32,29 +41,9 @@
  	}
  
  	if (fp) {
---- /dev/null
-+++ b/src/bootlogd.c.rej
-@@ -0,0 +1,17 @@
-+***************
-+*** 126,132 ****
-+  		fprintf(stderr, "bootlogd: cannot find console device "
-+  			"%d:%d in /dev\n", major(dev), minor(dev));
-+  		r = -1;
-+- 	} else if (strlen(ent->d_name) + 5 >= rlen) {
-+  		fprintf(stderr, "bootlogd: console device name too long\n");
-+  		r = -1;
-+  	} else
-+--- 126,132 ----
-+  		fprintf(stderr, "bootlogd: cannot find console device "
-+  			"%d:%d in /dev\n", major(dev), minor(dev));
-+  		r = -1;
-++ 	} else if ((int)strlen(ent->d_name) + 5 >= rlen) {
-+  		fprintf(stderr, "bootlogd: console device name too long\n");
-+  		r = -1;
-+  	} else
 --- a/src/init.c
 +++ b/src/init.c
-@@ -1256,7 +1256,7 @@
+@@ -1256,7 +1256,7 @@ void read_inittab(void)
  	strncpy(ch->id, id, sizeof(utproto.ut_id) + 1); /* Hack for different libs. */
  	strncpy(ch->process, process, sizeof(ch->process) - 1);
  	if (rlevel[0]) {
@@ -65,7 +54,7 @@
  		}
 --- a/src/last.c
 +++ b/src/last.c
-@@ -322,7 +322,7 @@
+@@ -322,7 +322,7 @@ int dns_lookup(char *result, int size, i
  	 *
  	 *	Ugly.
  	 */
@@ -74,7 +63,7 @@
  		mapped = 1;
  	topnibble = ntohl((unsigned int)a[0]) >> 28;
  
-@@ -453,7 +453,7 @@
+@@ -453,7 +453,7 @@ int list(struct utmp *p, time_t t, int w
  		r = dns_lookup(domain, sizeof(domain), useip, p->ut_addr_v6);
  	if (r < 0) {
  		len = UT_HOSTSIZE;
@@ -85,7 +74,7 @@
  	}
 --- a/src/shutdown.c
 +++ b/src/shutdown.c
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ int init_setenv(char *name, char *value)
  	nl = strlen(name);
  	vl = value ? strlen(value) : 0;
  
@@ -96,7 +85,7 @@
  	memcpy(request.i.data, name, nl);
 --- a/src/sulogin.c
 +++ b/src/sulogin.c
-@@ -282,7 +282,7 @@
+@@ -282,7 +282,7 @@ char *getpasswd(char *crypted)
  	if (read(0, pass, sizeof(pass) - 1) <= 0)
  		ret = NULL;
  	else {