Hello community, here is the log from the commit of package nodejs6 for openSUSE:Factory checked in at 2017-08-13 14:57:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs6 (Old) and /work/SRC/openSUSE:Factory/.nodejs6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs6" Sun Aug 13 14:57:12 2017 rev:11 rq:515764 version:6.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs6/nodejs6.changes 2017-07-19 12:21:49.633432091 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs6.new/nodejs6.changes 2017-08-13 14:57:17.816730660 +0200 @@ -1,0 +2,6 @@ +Wed Aug 2 15:16:57 UTC 2017 - [email protected] + +- Fix update-alternative handling in %postun - don't remove + links on upgrades. + +------------------------------------------------------------------- @@ -9 +15 @@ - robust solution is found. (bnc#1048299) + robust solution is found. (bnc#1048299, CVE-2017-11499) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs6.spec ++++++ --- /var/tmp/diff_new_pack.QiA2dX/_old 2017-08-13 14:57:19.144544324 +0200 +++ /var/tmp/diff_new_pack.QiA2dX/_new 2017-08-13 14:57:19.192537589 +0200 @@ -112,11 +112,23 @@ BuildRequires: binutils-gold %endif +%if 6 >= 8 +%if 0%{?sles_version} == 11 +BuildRequires: gcc5-c++ +%define cc_exec gcc-5 +%define cpp_exec g++-5 +%else +BuildRequires: gcc6-c++ +%define cc_exec gcc-6 +%define cpp_exec g++-6 +%endif # node8+ GCC requirements +%else # older than node8 %if 0%{?sles_version} == 11 BuildRequires: gcc48-c++ %else BuildRequires: gcc-c++ %endif +%endif # node7,6,5 BuildRequires: curl BuildRequires: fdupes @@ -255,6 +267,11 @@ export CXX="g++-4.8" %endif +%if 0%{?cc_exec:1} +export CC=%{?cc_exec} +export CXX=%{?cpp_exec} +%endif + ./configure \ --prefix=%{_prefix} \ %if ! %{with intree_openssl} @@ -346,6 +363,12 @@ ln -s %{_sysconfdir}/alternatives/node.1%{ext_man} %{buildroot}%{_mandir}/man1/node.1%{ext_man} ln -s %{_sysconfdir}/alternatives/npm-default %{buildroot}%{_bindir}/npm-default ln -s %{_sysconfdir}/alternatives/npm.1%{ext_man} %{buildroot}%{_mandir}/man1/npm.1%{ext_man} +%if 6 >= 8 +ln -s -f npx-default %{buildroot}%{_sysconfdir}/alternatives/npx-default +ln -s -f npx.1%{ext_man} %{buildroot}%{_sysconfdir}/alternatives/npx.1%{ext_man} +ln -s %{_sysconfdir}/alternatives/npx-default %{buildroot}%{_bindir}/npx-default +ln -s %{_sysconfdir}/alternatives/npx.1%{ext_man} %{buildroot}%{_mandir}/man1/npx.1%{ext_man} +%endif # Check that Node.js isn't completely broken. %check @@ -374,6 +397,14 @@ %ghost %{_sysconfdir}/alternatives/npm-default %ghost %{_sysconfdir}/alternatives/npm.1%{ext_man} +%if 6 >= 8 +%{_bindir}/npx6 +%ghost %{_bindir}/npx-default +%ghost %{_mandir}/man1/npx.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/npx-default +%ghost %{_sysconfdir}/alternatives/npx.1%{ext_man} +%endif + %files devel %defattr(-, root, root) %{_includedir}/node6 @@ -391,14 +422,28 @@ --slave %{_mandir}/man1/node.1%{ext_man} node.1%{ext_man} %{_mandir}/man1/node6.1%{ext_man} %postun -update-alternatives --remove node-default %{_bindir}/node6 +if [ ! -f %{_bindir}/node6 ] ; then + update-alternatives --remove node-default %{_bindir}/node6 +fi %post -n npm6 update-alternatives \ --install %{_bindir}/npm-default npm-default %{_bindir}/npm6 6 \ --slave %{_mandir}/man1/npm.1%{ext_man} npm.1%{ext_man} %{_mandir}/man1/npm6.1%{ext_man} +%if 6 >= 8 +update-alternatives \ + --install %{_bindir}/npx-default npx-default %{_bindir}/npx6 6 \ + --slave %{_mandir}/man1/npx.1%{ext_man} npx.1%{ext_man} %{_mandir}/man1/npx6.1%{ext_man} +%endif %postun -n npm6 -update-alternatives --remove npm-default %{_bindir}/npm6 +if [ ! -f %{_bindir}/npm6 ] ; then + update-alternatives --remove npm-default %{_bindir}/npm6 +fi +%if 6 >= 8 +if [ ! -f %{_bindir}/npx6 ] ; then + update-alternatives --remove npx-default %{_bindir}/npx6 +fi +%endif %changelog
