[Pkg-sysvinit-commits] r1537 - in sysvinit/trunk/debian: . patches
Petter Reinholdtsen
pere at alioth.debian.org
Sat Jul 25 14:41:28 UTC 2009
Author: pere
Date: 2009-07-25 14:41:27 +0000 (Sat, 25 Jul 2009)
New Revision: 1537
Added:
sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch
sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch
Removed:
sysvinit/trunk/debian/patches/fix-minor-warnings
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/00list
Log:
New patches 60_init_selinux_ifdef and 70_compiler_warnings to get
rid of compiler warnings.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2009-07-24 19:07:35 UTC (rev 1536)
+++ sysvinit/trunk/debian/changelog 2009-07-25 14:41:27 UTC (rev 1537)
@@ -51,6 +51,8 @@
work (Closes: #374038). Based on text proposal from Dan Jacobson.
* New patch 50_bootlogd_devsubdir to change bootlogd to recursively
search /dev/ for the correct terminal device (Closes: #376406).
+ * New patches 60_init_selinux_ifdef and 70_compiler_warnings to get
+ rid of compiler warnings.
-- Petter Reinholdtsen <pere at debian.org> Fri, 24 Jul 2009 11:26:26 +0200
Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list 2009-07-24 19:07:35 UTC (rev 1536)
+++ sysvinit/trunk/debian/patches/00list 2009-07-25 14:41:27 UTC (rev 1537)
@@ -7,8 +7,10 @@
46_pidof_symlinkman
50_bootlogd_devsubdir
54_bootlogd_findptyfail
+60_init_selinux_ifdef
62_init_freebsdterm
#68_init_quiet
+70_compiler_warnings
91_sulogin_lockedpw
94_fstab-decode
96_shutdown_acctoff
Added: sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch (rev 0)
+++ sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch 2009-07-25 14:41:27 UTC (rev 1537)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_init_selinux_ifdef.dpatch by Petter Reinholdtsen
+
+Avoid compiler warning about unused variable when SE Linux is not
+enabled.
+
+Status: Should be sent upstream.
+
+ at DPATCH@
+Index: a/src/init.c
+===================================================================
+--- a/src/init.c (revision 1485)
++++ b/src/init.c (working copy)
+@@ -2615,7 +2615,9 @@
+ char *p;
+ int f;
+ int isinit;
++#ifdef WITH_SELINUX
+ int enforce = 0;
++#endif
+
+ /* Get my own name */
+ if ((p = strrchr(argv[0], '/')) != NULL)
Added: sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch (rev 0)
+++ sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch 2009-07-25 14:41:27 UTC (rev 1537)
@@ -0,0 +1,116 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_compiler_warnings.dpatch by Petter Reinholdtsen
+
+Get rid of some signed/unsigned warnings.
+
+Status: Should be sent upstream.
+
+ at DPATCH@
+diff -urNad trunk~/src/bootlogd.c trunk/src/bootlogd.c
+--- trunk~/src/bootlogd.c 2009-07-25 16:38:56.000000000 +0200
++++ trunk/src/bootlogd.c 2009-07-25 16:39:58.000000000 +0200
+@@ -370,7 +370,7 @@
+ break;
+ case '\t':
+ line.pos += (line.pos / 8 + 1) * 8;
+- if (line.pos >= sizeof(line.buf))
++ if (line.pos >= (int)sizeof(line.buf))
+ line.pos = sizeof(line.buf) - 1;
+ break;
+ case 32 ... 127:
+@@ -386,7 +386,7 @@
+ len--;
+
+ tlen = strlen(tmp);
+- if (tlen && (line.pos + tlen < sizeof(line.buf))) {
++ if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
+ memcpy(line.buf + line.pos, tmp, tlen);
+ line.pos += tlen;
+ }
+@@ -659,7 +659,7 @@
+ else
+ todo = endptr - outptr;
+ if (fp && todo)
+- writelog(fp, outptr, todo);
++ writelog(fp, (unsigned char *)outptr, todo);
+ }
+
+ if (fp) {
+diff -urNad trunk~/src/bootlogd.c.rej trunk/src/bootlogd.c.rej
+--- trunk~/src/bootlogd.c.rej 1970-01-01 01:00:00.000000000 +0100
++++ trunk/src/bootlogd.c.rej 2009-07-25 16:38:57.000000000 +0200
+@@ -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
+diff -urNad trunk~/src/init.c trunk/src/init.c
+--- trunk~/src/init.c 2009-07-25 16:38:56.000000000 +0200
++++ trunk/src/init.c 2009-07-25 16:38:57.000000000 +0200
+@@ -1256,7 +1256,7 @@
+ strncpy(ch->id, id, sizeof(utproto.ut_id) + 1); /* Hack for different libs. */
+ strncpy(ch->process, process, sizeof(ch->process) - 1);
+ if (rlevel[0]) {
+- for(f = 0; f < sizeof(rlevel) - 1 && rlevel[f]; f++) {
++ for(f = 0; f < (int)sizeof(rlevel) - 1 && rlevel[f]; f++) {
+ ch->rlevel[f] = rlevel[f];
+ if (ch->rlevel[f] == 's') ch->rlevel[f] = 'S';
+ }
+diff -urNad trunk~/src/last.c trunk/src/last.c
+--- trunk~/src/last.c 2009-07-25 16:38:26.000000000 +0200
++++ trunk/src/last.c 2009-07-25 16:38:57.000000000 +0200
+@@ -322,7 +322,7 @@
+ *
+ * Ugly.
+ */
+- if (a[0] == 0 && a[1] == 0 && a[2] == htonl (0xffff))
++ if (a[0] == 0 && a[1] == 0 && a[2] == (int32_t)htonl (0xffff))
+ mapped = 1;
+ topnibble = ntohl((unsigned int)a[0]) >> 28;
+
+@@ -453,7 +453,7 @@
+ r = dns_lookup(domain, sizeof(domain), useip, p->ut_addr_v6);
+ if (r < 0) {
+ len = UT_HOSTSIZE;
+- if (len >= sizeof(domain)) len = sizeof(domain) - 1;
++ if (len >= (int)sizeof(domain)) len = sizeof(domain) - 1;
+ domain[0] = 0;
+ strncat(domain, p->ut_host, len);
+ }
+diff -urNad trunk~/src/shutdown.c trunk/src/shutdown.c
+--- trunk~/src/shutdown.c 2009-07-25 16:38:26.000000000 +0200
++++ trunk/src/shutdown.c 2009-07-25 16:38:57.000000000 +0200
+@@ -141,7 +141,7 @@
+ nl = strlen(name);
+ vl = value ? strlen(value) : 0;
+
+- if (nl + vl + 3 >= sizeof(request.i.data))
++ if (nl + vl + 3 >= (int)sizeof(request.i.data))
+ return -1;
+
+ memcpy(request.i.data, name, nl);
+diff -urNad trunk~/src/sulogin.c trunk/src/sulogin.c
+--- trunk~/src/sulogin.c 2009-07-25 16:38:26.000000000 +0200
++++ trunk/src/sulogin.c 2009-07-25 16:38:57.000000000 +0200
+@@ -282,7 +282,7 @@
+ if (read(0, pass, sizeof(pass) - 1) <= 0)
+ ret = NULL;
+ else {
+- for(i = 0; i < sizeof(pass) && pass[i]; i++)
++ for(i = 0; i < (int)sizeof(pass) && pass[i]; i++)
+ if (pass[i] == '\r' || pass[i] == '\n') {
+ pass[i] = 0;
+ break;
Deleted: sysvinit/trunk/debian/patches/fix-minor-warnings
===================================================================
--- sysvinit/trunk/debian/patches/fix-minor-warnings 2009-07-24 19:07:35 UTC (rev 1536)
+++ sysvinit/trunk/debian/patches/fix-minor-warnings 2009-07-25 14:41:27 UTC (rev 1537)
@@ -1,123 +0,0 @@
-Index: src/last.c
-===================================================================
---- src/last.c (revision 290)
-+++ src/last.c (working copy)
-@@ -320,7 +320,7 @@
- *
- * Ugly.
- */
-- if (a[0] == 0 && a[1] == 0 && a[2] == htonl (0xffff))
-+ if (a[0] == 0 && a[1] == 0 && a[2] == (int32_t)htonl (0xffff))
- mapped = 1;
- topnibble = ntohl((unsigned int)a[0]) >> 28;
- if (topnibble < 2 || topnibble > 3 || mapped ||
-@@ -436,7 +436,7 @@
- r = dns_lookup(domain, sizeof(domain), useip, p->ut_addr_v6);
- if (r < 0) {
- len = UT_HOSTSIZE;
-- if (len >= sizeof(domain)) len = sizeof(domain) - 1;
-+ if (len >= (int)sizeof(domain)) len = sizeof(domain) - 1;
- domain[0] = 0;
- strncat(domain, p->ut_host, len);
- }
-Index: src/init.c
-===================================================================
---- src/init.c (revision 290)
-+++ src/init.c (working copy)
-@@ -561,7 +561,8 @@
- * Find out which process(es) this was (were)
- */
- while((pid = waitpid(-1, &st, WNOHANG)) != 0) {
-- if (errno == ECHILD) break;
-+ if (errno == ECHILD)
-+ break;
- for( ch = family; ch; ch = ch->next )
- if ( ch->pid == pid && (ch->flags & RUNNING) ) {
- INITDBG(L_VB,
-@@ -576,9 +577,10 @@
- }
- break;
- }
-- if (ch == NULL)
-+ if (ch == NULL) {
- INITDBG(L_VB, "chld_handler: unknown child %d exited.",
- pid);
-+ }
- }
- errno = saved_errno;
- }
-@@ -1237,7 +1239,7 @@
- strncpy(ch->id, id, sizeof(utproto.ut_id) + 1); /* Hack for different libs. */
- strncpy(ch->process, process, sizeof(ch->process) - 1);
- if (rlevel[0]) {
-- for(f = 0; f < sizeof(rlevel) - 1 && rlevel[f]; f++) {
-+ for(f = 0; f < (int)sizeof(rlevel)-1 && rlevel[f]; f++) {
- ch->rlevel[f] = rlevel[f];
- if (ch->rlevel[f] == 's') ch->rlevel[f] = 'S';
- }
-Index: src/bootlogd.c
-===================================================================
---- src/bootlogd.c (revision 290)
-+++ src/bootlogd.c (working copy)
-@@ -123,7 +123,7 @@
- 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) {
-+ } else if ((int)strlen(ent->d_name) + 5 >= rlen) {
- fprintf(stderr, "bootlogd: console device name too long\n");
- r = -1;
- } else
-@@ -341,7 +341,7 @@
- break;
- case '\t':
- line.pos += (line.pos / 8 + 1) * 8;
-- if (line.pos >= sizeof(line.buf))
-+ if (line.pos >= (int)sizeof(line.buf))
- line.pos = sizeof(line.buf) - 1;
- break;
- case 32 ... 127:
-@@ -357,7 +357,7 @@
- len--;
-
- tlen = strlen(tmp);
-- if (tlen && (line.pos + tlen < sizeof(line.buf))) {
-+ if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
- memcpy(line.buf + line.pos, tmp, tlen);
- line.pos += tlen;
- }
-@@ -609,7 +609,7 @@
- else
- todo = endptr - outptr;
- if (fp && todo)
-- writelog(fp, outptr, todo);
-+ writelog(fp, (unsigned char *)outptr, todo);
- }
-
- if (fp) {
-Index: src/shutdown.c
-===================================================================
---- src/shutdown.c (revision 290)
-+++ src/shutdown.c (working copy)
-@@ -141,7 +141,7 @@
- nl = strlen(name);
- vl = value ? strlen(value) : 0;
-
-- if (nl + vl + 3 >= sizeof(request.i.data))
-+ if (nl + vl + 3 >= (int)sizeof(request.i.data))
- return -1;
-
- memcpy(request.i.data, name, nl);
-Index: src/sulogin.c
-===================================================================
---- src/sulogin.c (revision 290)
-+++ src/sulogin.c (working copy)
-@@ -275,7 +275,7 @@
- if (read(0, pass, sizeof(pass) - 1) <= 0)
- ret = NULL;
- else {
-- for(i = 0; i < sizeof(pass) && pass[i]; i++)
-+ for(i = 0; i < (int)sizeof(pass) && pass[i]; i++)
- if (pass[i] == '\r' || pass[i] == '\n') {
- pass[i] = 0;
- break;
More information about the Pkg-sysvinit-commits
mailing list