Accepting request 175749 from Base:System

- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch: don't
  free variable whose content is still be used (bnc#819970). (forwarded request 175744 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/175749
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=139
This commit is contained in:
Stephan Kulow 2013-05-15 14:10:43 +00:00 committed by Git OBS Bridge
commit feb1a694e4
5 changed files with 29 additions and 1 deletions

View File

@ -22,7 +22,7 @@ index 84ce87c..cceafc9 100644
+ +
+ if (*parsed_systemctl_options && **parsed_systemctl_options) { + if (*parsed_systemctl_options && **parsed_systemctl_options) {
+ char **k,**a; + char **k,**a;
+ _cleanup_strv_free_ char **new_argv = new(char*, strv_length(argv) + strv_length(parsed_systemctl_options) + 1); + char **new_argv = new(char*, strv_length(argv) + strv_length(parsed_systemctl_options) + 1);
+ new_argv[0] = strdup(argv[0]); + new_argv[0] = strdup(argv[0]);
+ for (k = new_argv+1, a = parsed_systemctl_options; *a; k++, a++) { + for (k = new_argv+1, a = parsed_systemctl_options; *a; k++, a++) {
+ *k = strdup(*a); + *k = strdup(*a);

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed May 15 13:02:05 UTC 2013 - fcrozat@suse.com
- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch: don't
free variable whose content is still be used (bnc#819970).
-------------------------------------------------------------------
Tue May 14 14:22:05 UTC 2013 - fcrozat@suse.com
- Add configure flags to ensure boot.local/halt.local are run on
startup/shutdown.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 13 18:08:41 UTC 2013 - rmilasan@suse.com Mon May 13 18:08:41 UTC 2013 - rmilasan@suse.com

View File

@ -424,6 +424,8 @@ export V=1
--enable-split-usr \ --enable-split-usr \
--disable-static \ --disable-static \
--with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \ --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \
--with-rc-local-script-path-start=/etc/init.d/boot.local \
--with-rc-local-script-path-stop=/etc/init.d/halt.local \
CFLAGS="%{optflags}" CFLAGS="%{optflags}"
make %{?_smp_mflags} make %{?_smp_mflags}

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed May 15 13:02:05 UTC 2013 - fcrozat@suse.com
- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch: don't
free variable whose content is still be used (bnc#819970).
-------------------------------------------------------------------
Tue May 14 14:22:05 UTC 2013 - fcrozat@suse.com
- Add configure flags to ensure boot.local/halt.local are run on
startup/shutdown.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 13 18:08:41 UTC 2013 - rmilasan@suse.com Mon May 13 18:08:41 UTC 2013 - rmilasan@suse.com

View File

@ -419,6 +419,8 @@ export V=1
--enable-split-usr \ --enable-split-usr \
--disable-static \ --disable-static \
--with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \ --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \
--with-rc-local-script-path-start=/etc/init.d/boot.local \
--with-rc-local-script-path-stop=/etc/init.d/halt.local \
CFLAGS="%{optflags}" CFLAGS="%{optflags}"
make %{?_smp_mflags} make %{?_smp_mflags}