https://sources.debian.org/data/main/p/plib/1.8.5-8/debian/patches/05_CVE-2012-4552.diff diff -up plib-1.8.5/src/ssg/ssgParser.cxx~ plib-1.8.5/src/ssg/ssgParser.cxx --- plib-1.8.5/src/ssg/ssgParser.cxx~ 2008-03-11 03:06:23.000000000 +0100 +++ plib-1.8.5/src/ssg/ssgParser.cxx 2012-11-01 15:33:12.424483374 +0100 @@ -57,18 +57,16 @@ void _ssgParser::error( const char *form char msgbuff[ 255 ]; va_list argp; - char* msgptr = msgbuff; - if (linenum) - { - msgptr += sprintf ( msgptr,"%s, line %d: ", - path, linenum ); - } - va_start( argp, format ); - vsprintf( msgptr, format, argp ); + vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); va_end( argp ); - ulSetError ( UL_WARNING, "%s", msgbuff ) ; + if (linenum) + { + ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ; + } else { + ulSetError ( UL_WARNING, "%s", msgbuff ) ; + } } @@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo char msgbuff[ 255 ]; va_list argp; - char* msgptr = msgbuff; - if (linenum) - { - msgptr += sprintf ( msgptr,"%s, line %d: ", - path, linenum ); - } - va_start( argp, format ); - vsprintf( msgptr, format, argp ); + vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); va_end( argp ); - ulSetError ( UL_DEBUG, "%s", msgbuff ) ; + if (linenum) + { + ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ; + } else { + ulSetError ( UL_DEBUG, "%s", msgbuff ) ; + } } // Opens the file and does a few internal calculations based on the spec. ight' method='get' action='/guix/log/gnu/build/shepherd.scm'>
path: root/gnu/build/shepherd.scm
AgeCommit message (Expand)Author
2022-09-02shepherd: Set #o640 permissions for log file of service in container....* gnu/build/shepherd.scm (make-forkexec-constructor/container): Set #o640 permissions for log file. Arun Isaac
2022-05-01Add (guix least-authority)....* guix/least-authority.scm: New file. * Makefile.am (MODULES): Add it. * gnu/build/shepherd.scm (default-mounts): Make public. Ludovic Courtès
2022-04-12shepherd: Add #:supplementary-groups....To support the argument introduced in Shepherd 0.9.0 when defining container-bound services. * gnu/build/shepherd.scm (exec-command*) (make-forkexec-constructor/container): Add '#:supplementary-groups'. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Leo Nikkilä
2022-04-11shepherd: 'fork+exec-command/container' always returns a PID....Fixes a regression introduced in 938448bf40fc77092859352d2243e2d0c236375f whereby 'fork+exec-command/container' would return #t, then used as the running value of the 'guix-daemon' service in the installer. Upon installation completion, stopping the 'guix-daemon' service would fail with wrong-type-arg because that #t would be passed to the 'stop' method in lieu of a PID. * gnu/build/shepherd.scm (fork+exec-command/container): Return a PID rather than #t. Ludovic Courtès
2022-04-11shepherd: 'exec-command*' has a valid default #:directory....Fixes a regression introduced in 938448bf40fc77092859352d2243e2d0c236375f where 'exec-command*' could get #:directory #f, in particular when called by 'fork+exec-command/container'. * gnu/build/shepherd.scm (exec-command*): Add default value for #:directory. Ludovic Courtès
2022-04-07shepherd: Adjust 'fork+exec-command/container' for the Shepherd 0.9....* gnu/build/shepherd.scm (exec-command*): New procedure, with code formerly... (make-forkexec-constructor/container): ... here. Use it. (fork+exec-command/container): Use 'fork+exec-command' only when CONTAINER-SUPPORT? is false or PID is the current process. Ludovic Courtès
2021-08-02build: shepherd: Use autoload to lazily bind Shepherd modules....Instead of imperative module-autoload! directives. * gnu/build/shepherd.scm: Replace module-autoload! directives by autoload arguments for define-module. Maxim Cournoyer
2020-11-05shepherd: Remove dependency on (guix utils)....Since commit 8ce6f4dc2879919c12bc76a2f4b01200af97e019, importing this module in a gexp would pull in (guix config) from the host, thereby leading to non-reproducible derivations. Users in (gnu services ...) do not expect that so simply remove the (guix utils) dependency for now. * gnu/build/shepherd.scm (fork+exec-command/container)[strip-pid]: New procedure. Use it instead of 'strip-keyword-arguments'. Ludovic Courtès