[Initscripts-ng-commits] r589 - in /trunk/src/insserv/debian: changelog patches/00list patches/11_more_warnings.dpatch patches/50_sign_warning.dpatch rules
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Wed Feb 6 23:54:33 UTC 2008
Author: pere
Date: Wed Feb 6 23:54:33 2008
New Revision: 589
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=589
Log:
* Update the package description and debconf question text (Closes: #464109).
* New patch 11_more_warnings to activate more warning flags during
build. Obsoletes setting the same flags in debian/rules.
* New patch 50_sign_warning getting rid of some signed/unsigned
compare issues.
Added:
trunk/src/insserv/debian/patches/11_more_warnings.dpatch
trunk/src/insserv/debian/patches/50_sign_warning.dpatch (with props)
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/00list
trunk/src/insserv/debian/rules
Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=589&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Feb 6 23:54:33 2008
@@ -12,7 +12,11 @@
* Removed override file for snmptrapfmt, as the package now include
the LSB header.
* Removed override file save-etc-disk. It is not present in Debian.
- * Update the package description and debconf question text (Closes: #464109)
+ * Update the package description and debconf question text (Closes: #464109).
+ * New patch 11_more_warnings to activate more warning flags during
+ build. Obsoletes setting the same flags in debian/rules.
+ * New patch 50_sign_warning getting rid of some signed/unsigned
+ compare issues.
-- Petter Reinholdtsen <pere at debian.org> Fri, 1 Feb 2008 19:45:46 +0100
Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=589&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Wed Feb 6 23:54:33 2008
@@ -1,3 +1,5 @@
10_nosuse
+11_more_warnings
31_debian_conf
40_segfault_virtprov
+50_sign_warning
Added: trunk/src/insserv/debian/patches/11_more_warnings.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/11_more_warnings.dpatch?rev=589&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/11_more_warnings.dpatch (added)
+++ trunk/src/insserv/debian/patches/11_more_warnings.dpatch Wed Feb 6 23:54:33 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_sign_warning.dpatch by Petter Reinholdtsen
+
+Get rid of signed/unsigned compare warnings visible with gcc option
+-W.
+
+ at DPATCH@
+--- insserv-1.11.0.orig/Makefile
++++ insserv-1.11.0/Makefile
+@@ -28,7 +28,7 @@
+ COPTS = -O2
+ endif
+ endif
+- CFLAGS = -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
++ CFLAGS = -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+ $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe
+ CLOOP = -falign-loops=0
+ CC = gcc
Added: trunk/src/insserv/debian/patches/50_sign_warning.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/50_sign_warning.dpatch?rev=589&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/50_sign_warning.dpatch (added)
+++ trunk/src/insserv/debian/patches/50_sign_warning.dpatch Wed Feb 6 23:54:33 2008
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_sign_warning.dpatch by Petter Reinholdtsen
+
+Get rid of signed/unsigned compare warnings visible with gcc option
+-W.
+
+ at DPATCH@
+--- insserv-1.11.0.orig/insserv.c
++++ insserv-1.11.0/insserv.c
+@@ -1350,7 +1350,7 @@
+ int n;
+
+ n = snprintf(&fullpath[0], sizeof(fullpath), "%s%s/%s", (root && !set_override) ? root : "", dir, name);
+- if (n >= sizeof(fullpath) || n < 0)
++ if (n >= (int)sizeof(fullpath) || n < 0)
+ error("snprintf(): %s\n", strerror(errno));
+
+ if (stat(fullpath, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
+@@ -1456,7 +1456,7 @@
+ #endif /* not SUSE */
+ };
+
+-#define RUNLEVLES (sizeof(runlevel_locations)/sizeof(runlevel_locations[0]))
++#define RUNLEVLES (int)(sizeof(runlevel_locations)/sizeof(runlevel_locations[0]))
+
+ int map_has_runlevels(void)
+ {
+@@ -1847,13 +1847,13 @@
+ regcompiler(&creg.isactive, CONFLINE2, REG_EXTENDED|REG_ICASE);
+
+ n = snprintf(&path[0], sizeof(path), "%s%s", (root && !set_insconf) ? root : "", file);
+- if (n >= sizeof(path) || n < 0)
++ if (n >= (int)sizeof(path) || n < 0)
+ error("snprintf(): %s\n", strerror(errno));
+
+ scan_conf_file(path);
+
+ n = snprintf(&path[0], sizeof(path), "%s%s.d", (root && !set_insconf) ? root : "", file);
+- if (n >= sizeof(path) || n < 0)
++ if (n >= (int)sizeof(path) || n < 0)
+ error("snprintf(): %s\n", strerror(errno));
+
+ n = scandir(path, &namelist, cfgfile_filter, alphasort);
+@@ -1863,7 +1863,7 @@
+ int r;
+
+ r = snprintf(&buf[0], sizeof(buf), "%s/%s", path, namelist[n]->d_name);
+- if (r >= sizeof(buf) || r < 0)
++ if (r >= (int)sizeof(buf) || r < 0)
+ error("snprintf(): %s\n", strerror(errno));
+
+ scan_conf_file(buf);
Propchange: trunk/src/insserv/debian/patches/50_sign_warning.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=589&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Wed Feb 6 23:54:33 2008
@@ -5,8 +5,6 @@
#export DH_VERBOSE=1
PACKAGE = insserv
-
-CFLAGS = -W -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
More information about the Initscripts-ng-commits
mailing list