commit insserv for openSUSE:Factory
Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at Fri May 14 00:55:39 CEST 2010. -------- --- insserv/insserv.changes 2010-04-30 18:36:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/insserv/insserv.changes 2010-05-07 18:23:10.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 7 17:15:02 CEST 2010 - werner@suse.de + +- Get the value instead the ``X-'' from interactive tag + this fix Debian bug #580564 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.7fpH9C/_old 2010-05-14 00:55:25.000000000 +0200 +++ /var/tmp/diff_new_pack.7fpH9C/_new 2010-05-14 00:55:25.000000000 +0200 @@ -24,7 +24,7 @@ Provides: aaa_base:/sbin/insserv AutoReqProv: on Version: 1.14.0 -Release: 3 +Release: 4 Summary: A Program to Arrange Initialization Scripts Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.bz2 ++++++ insserv-1.14.0.dif ++++++ --- /var/tmp/diff_new_pack.7fpH9C/_old 2010-05-14 00:55:25.000000000 +0200 +++ /var/tmp/diff_new_pack.7fpH9C/_new 2010-05-14 00:55:25.000000000 +0200 @@ -1,29 +1,6 @@ ---- listing.h (revision 75) -+++ listing.h (working copy) -@@ -379,6 +379,8 @@ static inline char * xstrdup(const char *restrict - #define SERV_NOSTOP 0x0100 - #define SERV_CMDLINE 0x0200 - #define SERV_FIRST 0x0400 -+#define SERV_ENFORCE 0x0800 -+#define SERV_WARNED 0x1000 - - /* - * Bits of the runlevels ---- CHANGES (revision 75) -+++ CHANGES (working copy) -@@ -1,4 +1,9 @@ - ------------------------------------------------------------------- -+Fri Apr 30 18:27:29 CEST 2010 - werner@suse.de -+ -+- Add the option of recursive enabling all required services -+ -+------------------------------------------------------------------- - Wed Apr 28 15:29:23 CEST 2010 - werner@suse.de - - - Use savannah as primary site ---- insserv.c (revision 75) -+++ insserv.c (working copy) -@@ -389,8 +389,8 @@ static void reversereq(service_t *restrict serv, u +--- insserv.c ++++ insserv.c 2010-05-07 15:17:41.774926814 +0000 +@@ -389,8 +389,8 @@ static void reversereq(service_t *restri /* * Check required services for name */ @@ -34,7 +11,7 @@ { boolean ret = true; list_t * pos; -@@ -409,12 +409,23 @@ static void reversereq(service_t *restrict serv, u +@@ -409,12 +409,23 @@ static boolean chkrequired(service_t *re must = getorig(must); if ((must->attr.flags & (SERV_CMDLINE|SERV_ENABLED)) == 0) { @@ -60,7 +37,7 @@ if (serv->attr.flags & (SERV_CMDLINE|SERV_ENABLED)) goto out; np_list_for_each(pos, &serv->sort.rev) { -@@ -425,9 +436,8 @@ static void reversereq(service_t *restrict serv, u +@@ -425,9 +436,8 @@ static boolean chkrequired(service_t *re continue; must = rev->serv; must = getorig(must); @@ -71,7 +48,7 @@ serv->name, rev->serv->name); ret = false; } -@@ -476,7 +486,7 @@ static boolean chkdependencies(service_t *restrict +@@ -476,7 +486,7 @@ static boolean chkdependencies(service_t if ((cur->attr.flags & SERV_CMDLINE) && (flags & SERV_CMDLINE)) continue; @@ -80,7 +57,22 @@ name, cur->name); ret = false; } -@@ -1416,7 +1426,7 @@ static uchar scan_lsb_headers(const int dfd, const +@@ -1378,10 +1388,10 @@ static uchar scan_lsb_headers(const int + description = empty; + } + +- if (!interactive && regexecutor(®.interact, COMMON_ARGS) == true) { +- if (val->rm_so < val->rm_eo) { +- *(pbuf+val->rm_eo) = '\0'; +- interactive = xstrdup(pbuf+val->rm_so); ++ if (!interactive && regexecutor(®.interact, COMMON_SHD_ARGS) == true) { ++ if (shl->rm_so < shl->rm_eo) { ++ *(pbuf+shl->rm_eo) = '\0'; ++ interactive = xstrdup(pbuf+shl->rm_so); + } else + interactive = empty; + } +@@ -1416,7 +1426,7 @@ static uchar scan_lsb_headers(const int char *name = basename(path); if (*name == 'S' || *name == 'K') name += 3; @@ -89,7 +81,7 @@ if (!ignore) error("exiting now!\n"); } -@@ -1432,7 +1442,7 @@ static uchar scan_lsb_headers(const int dfd, const +@@ -1432,7 +1442,7 @@ static uchar scan_lsb_headers(const int char *name = basename(path); if (*name == 'S' || *name == 'K') name += 3; @@ -128,7 +120,7 @@ }; static void help(const char *restrict const name) attribute((nonnull(1))); -@@ -2364,6 +2375,8 @@ static void help(const char *restrict const name) +@@ -2364,6 +2375,8 @@ static void help(const char *restrict co printf(" -o <path>, --override <path> Path to replace " OVERRIDEDIR ".\n"); printf(" -c <config>, --config <config> Path to config file.\n"); printf(" -n, --dryrun Do not change the system, only talk about it.\n"); @@ -270,3 +262,14 @@ sprintf(olink, "../init.d/%s", script); if (serv->stopp->lvl & lvl) { # ifndef USE_KILL_IN_BOOT +--- listing.h ++++ listing.h 2010-05-06 22:00:00.000000000 +0000 +@@ -379,6 +379,8 @@ static inline char * xstrdup(const char + #define SERV_NOSTOP 0x0100 + #define SERV_CMDLINE 0x0200 + #define SERV_FIRST 0x0400 ++#define SERV_ENFORCE 0x0800 ++#define SERV_WARNED 0x1000 + + /* + * Bits of the runlevels ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de