April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit xfce4-power-manager for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2014-04-30 15:12:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old) and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-power-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes 2014-04-13 13:23:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2014-04-30 15:12:40.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Apr 25 11:12:20 UTC 2014 - gber(a)opensuse.org + +- update to current git snapshot 1.2.0+git199 (revision gaf126a4) + - see http://git.xfce.org/xfce/xfce4-power-manager/log/ for a + list of changes +- drop patches that have been included upstream: + xfce4-power-manager-automake-1.13.patch, + xfce4-power-manager-fix-battery-icon-typo.patch, + xfce4-power-manager-fix-brightness-type.patch, + xfce4-power-manager-fix-broken-translations.patch, + xfce4-power-manager-fix-help.patch, + xfce4-power-manager-systemd-inhibit.patch, + xfce4-power-manager-systemd-shutdown-reboot-support.patch, + xfce4-power-manager-systemd-suspend-hibernate-suport.patch, + xfce4-power-manager-upower-0.99.patch +- remove support for openSUSE < 12.3 + +------------------------------------------------------------------- Old: ---- xfce4-power-manager-1.2.0.tar.bz2 xfce4-power-manager-automake-1.13.patch xfce4-power-manager-fix-battery-icon-typo.patch xfce4-power-manager-fix-brightness-type.patch xfce4-power-manager-fix-broken-translations.patch xfce4-power-manager-fix-help.patch xfce4-power-manager-systemd-inhibit.patch xfce4-power-manager-systemd-shutdown-reboot-support.patch xfce4-power-manager-systemd-suspend-hibernate-suport.patch xfce4-power-manager-upower-0.99.patch New: ---- xfce4-power-manager-1.2.0+git199.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.ey7yx2/_old 2014-04-30 15:12:42.000000000 +0200 +++ /var/tmp/diff_new_pack.ey7yx2/_new 2014-04-30 15:12:42.000000000 +0200 @@ -19,32 +19,15 @@ %define panel_version 4.10.0 Name: xfce4-power-manager -Version: 1.2.0 +# git revision gaf126a4 +Version: 1.2.0+git199 Release: 0 Summary: Power Management for the Xfce Desktop Environment License: GPL-2.0+ Group: System/GUI/XFCE Url: http://goodies.xfce.org/projects/applications/xfce4-power-manager -Source0: http://archive.xfce.org/src/apps/xfce4-power-manager/1.2/%{name}-%{version}… +Source0: %{name}-%{version}.tar.bz2 Source1: xfce4-power-manager.xml -# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-help.patch bxo#8846 gber(a)opensuse.org -- Use xfce_dialog_show_help() and remove the bundled documentation -Patch0: xfce4-power-manager-fix-help.patch -# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-broken-translations.patch bnc#788361 gber(a)opensuse.org -- Fix broken format strings in translations causing crashes -Patch1: xfce4-power-manager-fix-broken-translations.patch -# PATCH-FEATURE-UPSTREAM xfce4-power-manager-systemd-inhibit.patch bnc#789057 gber(a)opensuse.org -- Add systemd inhibit support -Patch2: xfce4-power-manager-systemd-inhibit.patch -# PATCH-FIX-UPSTREAM xfce4-power-manager-automake-1.13.patch pgajdos(a)suse.cz -- Add support for automake 1.13 -Patch3: xfce4-power-manager-automake-1.13.patch -# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-brightness-type.patch gber(a)opensuse.org -- Use correct type for prightness property and fix the screen auto-dimming issue and brightness panel plugin issue (backported from upstream git) -Patch4: xfce4-power-manager-fix-brightness-type.patch -# PATCH-FIX-UPSTREAM xfce4-power-manager-systemd-shutdown-reboot-support.patch bxo#10167 -- Add systemd shutdown/reboot support -Patch5: xfce4-power-manager-systemd-shutdown-reboot-support.patch -# PATCH-FIX-UPSTREAM xfce4-power-manager-systemd-suspend-hibernate-suport.patch bxo#9963 -- Add systemd suspend/hibernate support -Patch6: xfce4-power-manager-systemd-suspend-hibernate-suport.patch -# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-battery-icon-typo.patch bxo#8188 bnc#846485 gber(a)opensuse.org -- Fix typo in battery icon name -Patch7: xfce4-power-manager-fix-battery-icon-typo.patch -# PATCH-FIX-OPENSUSE xfce4-power-manager-upower-0.99.patch bnc#873326 seife+obs(a)b1-systems.com -- preliminary patch for supporting upower 0.99.0 (this is not intended as a final fix. needs cleanup.) -Patch42: xfce4-power-manager-upower-0.99.patch BuildRequires: ed BuildRequires: fdupes BuildRequires: intltool @@ -62,21 +45,15 @@ BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfconf-0) -%if 0%{?suse_version} >= 1230 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 -%endif BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrandr) Requires: polkit +Requires: systemd Requires: udisks Requires: upower -%if 0%{?suse_version} >= 1230 -Requires: systemd -%else -Requires: ConsoleKit-x11 -%endif Recommends: %{name}-lang = %{version} Provides: xfce4-power-manager-doc = %{version} Obsoletes: xfce4-power-manager-doc <= 1.2.0 @@ -120,15 +97,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch42 -p1 # show in LXDE as well ed -s src/xfce4-power-manager.desktop.in 2>/dev/null <<'EOF' ,s/^OnlyShowIn=XFCE;/OnlyShowIn=XFCE;LXDE;/ @@ -137,7 +105,7 @@ %build xdt-autogen -%configure \ +%configure --enable-maintainer-mode \ %if 0%{?suse_version} < 1230 --with-sleep-manager=upower \ %endif @@ -153,15 +121,14 @@ %suse_update_desktop_file xfce4-power-manager-settings %suse_update_desktop_file xfce4-power-manager +rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libxfce4brightness.la + rm -rf %{buildroot}/%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}/%{_datadir} -%clean -rm -rf %{buildroot} - %post %desktop_database_post %icon_theme_cache_post @@ -172,7 +139,8 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO +%doc AUTHORS COPYING NEWS README TODO +#%%doc ChangeLog %{_bindir}/xfce4-power-manager %{_bindir}/xfce4-power-manager-settings %{_bindir}/xfce4-power-information @@ -189,8 +157,8 @@ %files -n xfce4-panel-plugin-brightness %defattr(-,root,root) -%{_libdir}/xfce4/panel-plugins/xfce4-brightness-plugin -%{_datadir}/xfce4/panel-plugins/*.desktop +%{_libdir}/xfce4/panel/plugins/libxfce4brightness.so +%{_datadir}/xfce4/panel-plugins/xfce4-brightness-plugin.desktop %files branding-upstream %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit salt for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2014-04-30 15:12:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2014-03-22 09:11:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2014-04-30 15:12:31.000000000 +0200 @@ -1,0 +2,47 @@ +Thu Apr 17 18:06:56 UTC 2014 - aboe76(a)gmail.com + +- Updated to 2014.1.3 + - Fix username detection when su'ed to root on FreeBSD (issue 11628) + - Fix minionfs backend for file.recurse states + - Fix 32-bit packages of different arches than the CPU arch, on 32-bit RHEL/CentOS (issue 11822) + - Fix bug with specifying alternate home dir on user creation (FreeBSD) (issue 11790) + - Don’t reload site module on module refresh for MacOS + - Fix regression with running execution functions in Pillar SLS (issue 11453) + - Fix some modules missing from Windows installer + - Don’t log an error for yum commands that return nonzero exit status on non-failure (issue 11645) + - Fix bug in rabbitmq state (issue 8703) + - Fix missing ssh config options (issue 10604) + - Fix top.sls ordering (issue 10810 and issue 11691) + - Fix salt-key --list all (issue 10982) + - Fix win_servermanager install/remove function (issue 11038) + - Fix interaction with tokens when running commands as root (issue 11223) + - Fix overstate bug with find_job and **kwargs (issue 10503) + - Fix saltenv for aptpkg.mod_repo from pkgrepo state + - Fix environment issue causing file caching problems (issue 11189) + - Fix bug in __parse_key in registry state (issue 11408) + - Add minion auth retry on rejection (issue 10763) + - Fix publish_session updating the encryption key (issue 11493) + - Fix for bad AssertionError raised by GitPython (issue 11473) + - Fix debian_ip to allow disabling and enabling networking on Ubuntu (issue 11164) + - Fix potential memory leak caused by saved (and unused) events (issue 11582) + - Fix exception handling in the MySQL module (issue 11616) + - Fix environment-related error (issue 11534) + - Include psutil on Windows + - Add file.replace and file.search to Windows (issue 11471) + - Add additional file module helpers to Windows (issue 11235) + - Add pid to netstat output on Windows (issue 10782) + - Fix Windows not caching new versions of installers in winrepo (issue 10597) + - Fix hardcoded md5 hashing + - Fix kwargs in salt-ssh (issue 11609) + - Fix file backup timestamps (issue 11745) + - Fix stacktrace on sys.doc with invalid eauth (issue 11293) + - Fix git.latest with test=True (issue 11595) + - Fix file.check_perms hardcoded follow_symlinks (issue 11387) + - Fix certain pkg states for RHEL5/Cent5 machines (issue 11719) +- Packaging: + - python-psutil depencies (more functional modules out of the box) + - python-yaml depencies (more functional modules out of the box) + - python-requests depencies (salt-cloud) + + +------------------------------------------------------------------- Old: ---- salt-2014.1.1.tar.gz New: ---- salt-2014.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.oNBo8K/_old 2014-04-30 15:12:32.000000000 +0200 +++ /var/tmp/diff_new_pack.oNBo8K/_new 2014-04-30 15:12:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: salt -Version: 2014.1.1 +Version: 2014.1.3 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 @@ -31,10 +31,13 @@ BuildRequires: python-Jinja2 BuildRequires: python-M2Crypto BuildRequires: python-PyYAML +BuildRequires: python-yaml BuildRequires: python-devel BuildRequires: python-msgpack-python BuildRequires: python-pycrypto BuildRequires: python-pyzmq +BuildRequires: python-psutil +BuildRequires: python-requests BuildRequires: python-apache-libcloud >= 0.14.0 %if 0%{?sles_version} @@ -62,9 +65,13 @@ Requires: logrotate Requires: python-Jinja2 +Requires: python-yaml Requires: python-PyYAML +Requires: python-yaml Requires: python-apache-libcloud Requires: python-xml +Requires: python-psutil +Requires: python-requests Requires(pre): %fillup_prereq %if 0%{?suse_version} < 1210 Requires(pre): %insserv_prereq @@ -199,7 +206,6 @@ ## documentation cd doc && make html && rm _build/html/.buildinfo && rm _build/html/_images/proxy_minions.png && cd _build/html && chmod -R -x+X * - %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %fdupes %{buildroot}%{_prefix} @@ -256,8 +262,11 @@ ## install SuSEfirewall2 rules install -Dpm 0644 pkg/suse/salt.SuSEfirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt -#%%check -#%%{__python} setup.py test --runtests-opts=-u +%check +# don't test on factory because of ssl2 method deprication +#%%if 0%{?suse_version} < 1310 +%{__python} setup.py test --runtests-opts=-u +#%%endif %preun syndic %if 0%{?_unitdir:1} ++++++ salt-2014.1.1.tar.gz -> salt-2014.1.3.tar.gz ++++++ ++++ 6055 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pumpa for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package pumpa for openSUSE:Factory checked in at 2014-04-30 15:11:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pumpa (Old) and /work/SRC/openSUSE:Factory/.pumpa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pumpa" Changes: -------- --- /work/SRC/openSUSE:Factory/pumpa/pumpa.changes 2014-04-15 11:46:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pumpa.new/pumpa.changes 2014-04-30 15:11:58.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 22 17:54:13 UTC 2014 - sor.alexei(a)meowr.ru + +- Migration to Qt5. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pumpa.spec ++++++ --- /var/tmp/diff_new_pack.C5EqER/_old 2014-04-30 15:11:59.000000000 +0200 +++ /var/tmp/diff_new_pack.C5EqER/_new 2014-04-30 15:11:59.000000000 +0200 @@ -11,26 +11,30 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: pumpa Version: 0.8.3 Release: 0 -License: GPL-3.0+ Summary: A simple pump.io client written in C++/Qt -Url: http://saz.im/software/pumpa.html +License: GPL-3.0+ Group: System/GUI +Url: http://saz.im/software/pumpa.html Source: %{name}-%{version}.tar.gz -BuildRequires: pkg-config +BuildRequires: aspell-devel +BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(QJson) +BuildRequires: pkg-config BuildRequires: update-desktop-files -BuildRequires: fdupes +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Widgets) %description Pumpa is a simple pump.io client written in C++ and Qt @@ -41,7 +45,7 @@ sed -i 's/^Icon=$.*$/Icon=pumpa/' %{name}.desktop %build -qmake -makefile %{name}.pro \ +%{_libqt5_bindir}/qmake -makefile %{name}.pro \ QMAKE_CFLAGS="%{optflags}" \ QMAKE_CXXFLAGS="%{optflags}" make %{?_smp_mflags} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2014-04-30 15:11:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2014-04-14 09:25:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2014-04-30 15:11:45.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Apr 26 20:56:34 UTC 2014 - andreas.stieger(a)gmx.de + +- phpMyAdmin 4.1.14 + * sf#4365 Creating bookmark with multiple queries not working + * sf#4372 Changing browser transformation results in unnecessary + table rebuild + * sf#4375 Group two DB, one's name is the prefix of the other one + * sf#4376 [interface] Login fields show in separate line + +------------------------------------------------------------------- Old: ---- phpMyAdmin-4.1.13-all-languages.tar.bz2 New: ---- phpMyAdmin-4.1.14-all-languages.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.B6sR6m/_old 2014-04-30 15:11:47.000000000 +0200 +++ /var/tmp/diff_new_pack.B6sR6m/_new 2014-04-30 15:11:47.000000000 +0200 @@ -34,7 +34,7 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 4.1.13 +Version: 4.1.14 Release: 0 Url: http://www.phpMyAdmin.net Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-lan… ++++++ phpMyAdmin-4.1.13-all-languages.tar.bz2 -> phpMyAdmin-4.1.14-all-languages.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.1.13-all-languages.tar.bz2 /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.1.14-all-languages.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pg_comparator for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package pg_comparator for openSUSE:Factory checked in at 2014-04-30 15:10:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pg_comparator (Old) and /work/SRC/openSUSE:Factory/.pg_comparator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pg_comparator" Changes: -------- --- /work/SRC/openSUSE:Factory/pg_comparator/pg_comparator.changes 2014-03-06 12:06:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pg_comparator.new/pg_comparator.changes 2014-04-30 15:10:14.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 21 06:46:09 UTC 2014 - aldemir.akpinar(a)gmail.com + +- New Version: 2.2.3 +- Minor Update + +------------------------------------------------------------------- Old: ---- pg_comparator-2.2.2.tgz New: ---- pg_comparator-2.2.3.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pg_comparator.spec ++++++ --- /var/tmp/diff_new_pack.ovQWIQ/_old 2014-04-30 15:10:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ovQWIQ/_new 2014-04-30 15:10:16.000000000 +0200 @@ -22,14 +22,14 @@ %define pgdocdir %{expand:%%(/usr/bin/pg_config --docdir)} Name: pg_comparator -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Summary: A tool to compare and sync tables in different locations License: BSD-3-Clause Group: Development/Libraries Url: http://pgfoundry.org/projects/pg-comparator/ -Source: http://pgfoundry.org/frs/download.php/3597/pg_comparator-%{version}.tgz +Source: http://pgfoundry.org/frs/download.php/3643/pg_comparator-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ pg_comparator-2.2.2.tgz -> pg_comparator-2.2.3.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pg_comparator-2.2.2/pg_comparator new/pg_comparator-2.2.3/pg_comparator --- old/pg_comparator-2.2.2/pg_comparator 2014-01-08 22:24:58.000000000 +0100 +++ new/pg_comparator-2.2.3/pg_comparator 2014-04-19 17:11:43.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# $Id: pg_comparator.pl 1485 2014-01-08 21:24:58Z coelho $ +# $Id: pg_comparator.pl 1494 2014-04-19 15:11:43Z coelho $ # # HELP 1: pg_comparator --man # HELP 2: pod2text pg_comparator @@ -296,6 +296,14 @@ Default is to use temporary tables that are automatically wiped out when the connection is closed. +=item C<--unlogged>, C<--no-unlogged> + +Use unlogged tables for storing checksums. These tables are not transactional, +so it may speed up things a little. However, they are not automatically cleaned +up at the end. See C<--clear> option to request a cleanup. + +Default is not to use unlogged tables. + =item C<--threads> or C<-T>, C<--no-threads> or C<-N> Highly EXPERIMENTAL feature. @@ -857,7 +865,8 @@ If the tables to compare are in the same database, a simple SQL query can extract the differences. Assuming Tables I<T1> and I<T2> with primary key I<id> and non null contents I<data>, then their -differences is summarized by the following query: +differences, that is how I<T1> differs from the reference I<T2>, +is summarized by the following query: SELECT COALESCE(T1.id, T2.id) AS key, CASE WHEN T1.id IS NULL THEN 'DELETE' @@ -1089,6 +1098,13 @@ =over 4 +=item B<version 2.2.3> (r1494 on 2014-04-19) + +Improved documentation. +Add C<--unlogged> option to use unlogged tables. +The I<release> validation was run successfully +on PostgreSQL 9.3.4 and MySQL 5.5.35. + =item B<version 2.2.2> (r1485 on 2014-01-08) Fix some warnings reported by I<Ivan Mincik>. @@ -1344,19 +1360,19 @@ =cut -my $script_version = '2.2.2 (r1485)'; -my $revision = '$Revision: 1485 $'; +my $script_version = '2.2.3 (r1494)'; +my $revision = '$Revision: 1494 $'; $revision =~ tr/0-9//cd; ################################################################# SOME DEFAULTS # various option defaults -my ($verb, $debug, $temp, $ask_pass, $factor, $clear) = (0, 0, 1, 0, 7, 0); +my ($verb, $debug, $temp, $unlog, $ask_pass, $clear) = (0, 0, 1, 0, 0, 0); my ($max_ratio, $max_levels, $report, $threads, $async) = (0.1, 0, 1, 0, 1); my ($cleanup, $size, $usekey, $usenull, $synchronize) = (0, 0, 0, 1, 0); my ($do_it, $do_trans, $prefix, $ckcmp) = (0, 1, 'pgc_cmp', 'create'); my ($maskleft, $name, $key_size, $col_size, $where) = (1, 'none', 0, 0, ''); -my ($expect_warn) = (0); +my ($factor, $expect_warn) = (7, 0); # condition, tests, max size of blobs, data sources... my ($expect, $longreadlen, $source1, $source2, $key_cs, $tup_cs, $do_lock, $env_pass, $max_report, $stats); @@ -1619,8 +1635,9 @@ 'attrs' => {}, # sql-comparison which is null-safe 'safeeq' => ' IS NOT DISTINCT FROM ?', - # sql temporary table + # sql temporary or unlogged table 'temporary' => 'TEMPORARY ', + 'unlogged' => 'UNLOGGED ', # sql drop table 'drop_table' => 'DROP TABLE IF EXISTS', # actual aggregates to use @@ -1692,6 +1709,7 @@ 'attrs' => {}, 'safeeq' => '<=>?', 'temporary' => 'TEMPORARY ', + 'unlogged' => '', # mysql myisam is always unlogged? 'drop_table' => 'DROP TABLE IF EXISTS', 'xor' => 'BIT_XOR', 'sum' => 'SUM', @@ -1741,6 +1759,7 @@ 'attrs' => {}, 'safeeq' => '=?', # ??? 'temporary' => 'TEMPORARY ', + 'unlogged' => 'TEMPORARY ', 'drop_table' => 'DROP TABLE IF EXISTS', 'xor' => 'XOR', 'sum' => 'ISUM',# work around 'SUM' and 'TOTAL' overflow handling @@ -1810,6 +1829,7 @@ 'attrs' => {}, 'safeeq' => ' IS NOT DISTINCT FROM ?', 'temporary' => 'GLOBAL TEMPORARY ', # not dropped... + 'unlogged' => '', # ??? 'drop_table' => 'DROP TABLE', 'xor' => '???', 'sum' => 'SUM', # ??? too clever, detects integer overflows @@ -2364,7 +2384,8 @@ { $count = sql_do($dbh, $db, - "CREATE " . ($temp? $M{$db}{temporary}:'') . + "CREATE " . + ($temp? $M{$db}{temporary}: $unlog? $M{$db}{unlogged}: '') . "TABLE ${name}0 AS $build_checksum"); # count should be available somewhere, # but alas does not seem to be returned by do("CREATE TABLE ... AS ... ") @@ -2373,7 +2394,9 @@ elsif ($ckcmp eq 'insert' or not $M{$db}{create_as}) { sql_do($dbh, $db, - "CREATE ". ($temp? $M{$db}{temporary}: '')."TABLE ${name}0 (". + "CREATE ". + ($temp? $M{$db}{temporary}: $unlog? $M{$db}{unlogged}: '') . + "TABLE ${name}0 (". # KEY CHECKSUM NN? 'kcs ' . ($usekey? col_type($dbh, $dhpbt, $db, "@$pkeys"): $M{$db}{cktype}{4}) . @@ -2462,7 +2485,9 @@ } # create summary table my $create_table = - "CREATE " . ($temp? $M{$db}{temporary}:'') . "TABLE ${name}${level}"; + "CREATE " . + ($temp? $M{$db}{temporary}: $unlog? $M{$db}{unlogged}: '') . + "TABLE ${name}${level}"; # summary table contents my $select = "SELECT " . &{$M{$db}{andop}}($kcs, $masks[$level]) . " AS kcs, " . @@ -2482,7 +2507,7 @@ } # compute_summaries($dbh, $name, @masks) -# globals: $verb $temp $agg $cleanup +# globals: $verb $temp $unlog $agg $cleanup sub compute_summaries($$$$$@) { my ($dbh, $db, $name, $table, $skey, @masks) = @_; @@ -2792,6 +2817,7 @@ }, # auxiliary tables "temporary|temp|tmp|t!" => \$temp, + "unlogged|unlog|U!" => \$unlog, "cleanup!" => \$cleanup, "clear!" => \$clear, "prefix|p=s" => \$prefix, @@ -2831,6 +2857,9 @@ # handle stats option $stats = 'txt' if defined $stats and $stats eq ''; +die "--temporary and --unlogged are exclusive" + if $temp and $unlog; + die "invalid value for stats option: $stats for 'txt' or 'csv'" unless not defined $stats or $stats =~ /^(csv|txt)$/; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit opencv for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2014-04-30 15:10:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opencv" Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2014-04-04 16:39:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2014-04-30 15:10:08.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Apr 6 16:22:56 UTC 2014 - tittiatcoke(a)gmail.com + +- Drop the BuildRequires on libucil and libunicap for Factory. This + stops us from getting ride of Gstreamer 0.10 and besides these two + libraries seem to be unmaintained upstream as that the latest + actions are from 2010 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.aL1H9x/_old 2014-04-30 15:10:11.000000000 +0200 +++ /var/tmp/diff_new_pack.aL1H9x/_new 2014-04-30 15:10:11.000000000 +0200 @@ -48,6 +48,8 @@ BuildRequires: gstreamer-plugins-base-devel %else BuildRequires: gstreamer-0_10-plugins-base-devel +BuildRequires: libucil-devel +BuildRequires: libunicap-devel %endif BuildRequires: libdc1394-devel %if 0%{?suse_version} > 1230 @@ -62,8 +64,6 @@ BuildRequires: libjpeg-devel BuildRequires: libqt4-devel BuildRequires: libtiff-devel -BuildRequires: libucil-devel -BuildRequires: libunicap-devel BuildRequires: libv4l-devel %if 0%{?suse_version} > 1220 BuildRequires: ilmbase-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nmap for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package nmap for openSUSE:Factory checked in at 2014-04-30 15:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nmap (Old) and /work/SRC/openSUSE:Factory/.nmap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nmap" Changes: -------- --- /work/SRC/openSUSE:Factory/nmap/nmap.changes 2014-04-13 13:16:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nmap.new/nmap.changes 2014-04-30 15:09:51.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Apr 26 10:34:06 UTC 2014 - andreas.stieger(a)gmx.de + +- Nmap 6.46 +- NSE: + * Made numerous improvements to ssl-heartbleed to provide + more reliable detection of the vulnerability + * Fix some bugs which could cause snmp-ios-config and + snmp-sysdescr scripts to crash + * Improved performance of citrixlua library when handling large + XML responses containing application lists +- Zenmap: + * Fixed a bug which caused this crash message: "IOError: + [Errno socket error] [Errno 10060] A connection attempt + failed [...]" due to DOCTYPE definition to Nmap's XML output + +------------------------------------------------------------------- Old: ---- nmap-6.45.tar.bz2 nmap-6.45.tar.bz2.asc New: ---- nmap-6.46.tar.bz2 nmap-6.46.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nmap.spec ++++++ --- /var/tmp/diff_new_pack.cy4y2U/_old 2014-04-30 15:09:53.000000000 +0200 +++ /var/tmp/diff_new_pack.cy4y2U/_new 2014-04-30 15:09:53.000000000 +0200 @@ -38,7 +38,7 @@ BuildRequires: gpg-offline %endif Url: http://nmap.org/ -Version: 6.45 +Version: 6.46 Release: 0 Summary: Portscanner License: GPL-2.0+ ++++++ nmap-6.45.tar.bz2 -> nmap-6.46.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/nmap/nmap-6.45.tar.bz2 /work/SRC/openSUSE:Factory/.nmap.new/nmap-6.46.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2014-04-30 15:09:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2014-04-14 09:25:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2014-04-30 15:09:40.000000000 +0200 @@ -1,0 +2,40 @@ +Sat Apr 26 12:18:07 UTC 2014 - wr(a)rosenauer.org + +- update to Firefox 29.0 (bnc#875378) + * MFSA 2014-34/CVE-2014-1518/CVE-2014-1519 + Miscellaneous memory safety hazards + * MFSA 2014-36/CVE-2014-1522 (bmo#995289) + Web Audio memory corruption issues + * MFSA 2014-37/CVE-2014-1523 (bmo#969226) + Out of bounds read while decoding JPG images + * MFSA 2014-38/CVE-2014-1524 (bmo#989183) + Buffer overflow when using non-XBL object as XBL + * MFSA 2014-39/CVE-2014-1525 (bmo#989210) + Use-after-free in the Text Track Manager for HTML video + * MFSA 2014-41/CVE-2014-1528 (bmo#963962) + Out-of-bounds write in Cairo + * MFSA 2014-42/CVE-2014-1529 (bmo#987003) + Privilege escalation through Web Notification API + * MFSA 2014-43/CVE-2014-1530 (bmo#895557) + Cross-site scripting (XSS) using history navigations + * MFSA 2014-44/CVE-2014-1531 (bmo#987140) + Use-after-free in imgLoader while resizing images + * MFSA 2014-45/CVE-2014-1492 (bmo#903885) + Incorrect IDNA domain name matching for wildcard certificates + (fixed by NSS 3.16) + * MFSA 2014-46/CVE-2014-1532 (bmo#966006) + Use-after-free in nsHostResolver + * MFSA 2014-47/CVE-2014-1526 (bmo#988106) + Debugger can bypass XrayWrappers with JavaScript +- rebased patches +- removed obsolete patches + * firefox-browser-css.patch + * mozilla-aarch64-599882cfb998.diff + * mozilla-aarch64-bmo-963028.patch + * mozilla-aarch64-bmo-963029.patch + * mozilla-aarch64-bmo-963030.patch + * mozilla-aarch64-bmo-963031.patch +- requires NSS 3.16 +- added mozilla-icu-strncat.patch to fix post build checks + +------------------------------------------------------------------- @@ -19,2 +58,0 @@ - -- added patches: @@ -21,0 +60 @@ + @@ -27,2 +65,0 @@ -- modified patches: - * mozilla-ppc64le-xpcom.patch @@ -32 +69 @@ -- Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build systm +- Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build system @@ -34,2 +70,0 @@ -- modified patches: - * mozilla-ppc64le-xpcom.patch Old: ---- firefox-28.0-source.tar.xz firefox-browser-css.patch l10n-28.0.tar.xz mozilla-aarch64-599882cfb998.diff mozilla-aarch64-bmo-963028.patch mozilla-aarch64-bmo-963029.patch mozilla-aarch64-bmo-963030.patch mozilla-aarch64-bmo-963031.patch New: ---- firefox-29.0-source.tar.xz l10n-29.0.tar.xz mozilla-icu-strncat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200 @@ -17,7 +17,7 @@ # -%define major 28 +%define major 29 %define mainver %major.0 %define update_channel release @@ -37,6 +37,7 @@ BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel +BuildRequires: makeinfo BuildRequires: python BuildRequires: startup-notification-devel BuildRequires: unzip @@ -51,7 +52,7 @@ BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10.3 -BuildRequires: mozilla-nss-devel >= 3.15.5 +BuildRequires: mozilla-nss-devel >= 3.16 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -64,7 +65,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2014031500 +%define releasedate 2014042500 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -103,6 +104,7 @@ Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch Patch10: mozilla-sle11.patch +Patch11: mozilla-icu-strncat.patch Patch12: mozilla-arm-disable-edsp.patch Patch13: mozilla-ppc.patch Patch14: mozilla-libproxy-compat.patch @@ -114,19 +116,13 @@ Patch20: mozilla-ppc64le-xpcom.patch Patch21: mozilla-ppc64-xpcom.patch # Gecko/Toolkit AArch64 Porting -Patch36: mozilla-aarch64-599882cfb998.diff -Patch37: mozilla-aarch64-bmo-810631.patch -Patch38: mozilla-aarch64-bmo-962488.patch -Patch39: mozilla-aarch64-bmo-963030.patch -Patch40: mozilla-aarch64-bmo-963027.patch -Patch41: mozilla-aarch64-bmo-963028.patch -Patch42: mozilla-aarch64-bmo-963029.patch -Patch43: mozilla-aarch64-bmo-963023.patch -Patch44: mozilla-aarch64-bmo-963024.patch -Patch45: mozilla-aarch64-bmo-963031.patch +Patch30: mozilla-aarch64-bmo-810631.patch +Patch31: mozilla-aarch64-bmo-962488.patch +Patch32: mozilla-aarch64-bmo-963027.patch +Patch33: mozilla-aarch64-bmo-963023.patch +Patch34: mozilla-aarch64-bmo-963024.patch # Firefox/browser -Patch100: firefox-browser-css.patch Patch101: firefox-kde.patch Patch102: firefox-kde-114.patch Patch103: firefox-no-default-ualocale.patch @@ -202,7 +198,7 @@ %package translations-other Summary: Extra translations for Firefox Group: System/Localization -Provides: locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:ach;af;an;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lij;lt;lv;mai;mk;ml;mr;ms;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;vi;xh;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -261,6 +257,7 @@ %if %suse_version < 1120 %patch10 -p1 %endif +%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 @@ -271,19 +268,13 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 # Firefox -%patch100 -p1 %patch101 -p1 %if %suse_version >= 1140 %patch102 -p1 ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_28_0_RELEASE" -VERSION="28.0" +RELEASE_TAG="FIREFOX_29_0_RELEASE" +VERSION="29.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-28.0-source.tar.xz -> firefox-29.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-28.0-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-29.0-source.tar.xz differ: char 25, line 1 ++++++ firefox-kde.patch ++++++ ++++ 1444 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-kde.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-kde.patch ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200 @@ -1,18 +1,18 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent 5c1cb20bb3ad68c77841909461700cbb11707708 +# Parent 5ffbb37bbfc52f549620ff67ce45f218a825cf4e Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -246,17 +246,17 @@ pref("lightweightThemes.update.enabled", - pref("browser.uitour.enabled", false); - pref("browser.uitour.requireSecure", true); - pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/"); - pref("browser.uitour.pinnedTabUrl", "https://support.mozilla.org/%LOCALE%/kb/pinned-tabs-keep-favorite-websites-…"); +@@ -253,17 +253,17 @@ pref("browser.uitour.pinnedTabUrl", "htt + pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/"); pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org"); + pref("browser.customizemode.tip0.shown", false); + pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); + pref("keyword.enabled", true); -pref("general.useragent.locale", "@AB_CD@"); ++++++ l10n-28.0.tar.xz -> l10n-29.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-28.0.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-29.0.tar.xz differ: char 26, line 1 ++++++ mozilla-icu-strncat.patch ++++++ # HG changeset patch # Parent 29be2a4daa0f512d22bde85b97b5460839026571 # User Wolfgang Rosenauer <wr(a)rosenauer.org> From: Jan Engelhardt <jengelh(a)inai.de> Reference: http://bugs.icu-project.org/trac/ticket/7808 diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp --- a/intl/icu/source/tools/pkgdata/pkgdata.cpp +++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp @@ -1975,22 +1975,22 @@ static void loadLists(UPKGOptions *o, UE FILE *p = NULL; size_t n; static char buf[512] = ""; char cmdBuf[1024]; UErrorCode status = U_ZERO_ERROR; const char cmd[] = "icu-config --incpkgdatafile"; /* #1 try the same path where pkgdata was called from. */ - findDirname(progname, cmdBuf, 1024, &status); + findDirname(progname, cmdBuf, sizeof(cmdBuf), &status); if(U_SUCCESS(status)) { if (cmdBuf[0] != 0) { - uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024); + uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf)); } - uprv_strncat(cmdBuf, cmd, 1024); + uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf)); if(verbose) { fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf); } p = popen(cmdBuf, "r"); } if(p == NULL || (n = fread(buf, 1, 511, p)) <= 0) { ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200 @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1115,16 +1116,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1113,16 +1114,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -62,7 +62,7 @@ + + if (nsKDEUtils::kdeSession()) { + for(int i = 0; -+ i < NS_ARRAY_LENGTH(specialFiles); ++ i < MOZ_ARRAY_LENGTH(specialFiles); + ++i ) { + if (*specialFiles[ i ] == '\0') { + specialFiles[ i ] = "kde.js"; @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -1140,17 +1159,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1138,17 +1157,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -89,7 +89,7 @@ ReadExtensionPrefs(path); else - pref_LoadPrefsInDir(path, nullptr, 0); -+ pref_LoadPrefsInDir(path, specialFiles, NS_ARRAY_LENGTH(specialFiles)); ++ pref_LoadPrefsInDir(path, specialFiles, MOZ_ARRAY_LENGTH(specialFiles)); } return NS_OK; } @@ -98,7 +98,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1244,28 +1263,40 @@ static nsresult pref_InitInitialObjects( +@@ -1242,28 +1261,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -122,7 +122,7 @@ + if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? + for(int i = 0; -+ i < NS_ARRAY_LENGTH(specialFiles); ++ i < MOZ_ARRAY_LENGTH(specialFiles); + ++i ) { + if( *specialFiles[ i ] == '\0' ) { + specialFiles[ i ] = "kde.js"; @@ -270,7 +270,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -53,29 +53,33 @@ toolkit.jar: +@@ -55,29 +55,33 @@ toolkit.jar: content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) @@ -764,7 +764,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1332 @@ +@@ -0,0 +1,1334 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -1350,15 +1350,14 @@ + <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> +#elif XP_UNIX -+ pack="end"> -+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> -+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> -+ <xul:spacer anonid="spacer" flex="1"/> -+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> -+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> -+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> -+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> -+ ++ pack="end"> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> ++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1"/> ++ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> ++ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> ++ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> +#else + pack="end"> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> @@ -1808,9 +1807,10 @@ + <handlers> + <handler event="dialogaccept"> + <![CDATA[ -+ if (!this._fireEvent("beforeaccept", this)) -+ return; -+ ++ if (!this._fireEvent("beforeaccept", this)){ ++ return false; ++ } ++ + if (this.type == "child" && window.opener) { + var psvc = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); @@ -1873,6 +1873,8 @@ + .getService(Components.interfaces.nsIPrefService); + psvc.savePrefFile(null); + } ++ ++ return true; + ]]> + </handler> + <handler event="command"> @@ -2617,7 +2619,7 @@ +++ b/uriloader/exthandler/Makefile.in @@ -19,9 +19,10 @@ endif ifdef MOZ_ENABLE_DBUS - LOCAL_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) + OS_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) endif include $(topsrcdir)/config/rules.mk @@ -3029,7 +3031,7 @@ #endif } - nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) + nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile) { @@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c mime_types_description, @@ -3072,14 +3074,14 @@ diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in --- a/widget/gtk/Makefile.in +++ b/widget/gtk/Makefile.in -@@ -4,11 +4,13 @@ +@@ -3,11 +3,13 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. include $(topsrcdir)/config/rules.mk CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS) - CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) \ - $(MOZ_STARTUP_NOTIFICATION_CFLAGS) + CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS) +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + @@ -3452,7 +3454,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp -@@ -30,16 +30,17 @@ +@@ -31,16 +31,17 @@ #include "nsTextFormatter.h" #include "nsVersionComparator.h" #include "nsXPCOMCIDInternal.h" @@ -3470,7 +3472,7 @@ const char* directive; int argc; -@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL +@@ -398,16 +399,17 @@ ParseManifest(NSLocationType type, FileL NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kApplication, "application"); @@ -3488,9 +3490,9 @@ NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); nsAutoString appID; -@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL +@@ -445,42 +447,47 @@ ParseManifest(NSLocationType type, FileL CopyUTF8toUTF16(s, abi); - abi.Insert(PRUnichar('_'), 0); + abi.Insert(char16_t('_'), 0); abi.Insert(osTarget, 0); } } @@ -3499,24 +3501,25 @@ nsAutoString osVersion; + nsAutoString desktop; #if defined(XP_WIN) + #pragma warning(push) + #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; if (GetVersionEx(&info)) { - nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), + nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), info.dwMajorVersion, info.dwMinorVersion); } + desktop = NS_LITERAL_STRING("win"); + #pragma warning(pop) #elif defined(MOZ_WIDGET_COCOA) - SInt32 majorVersion, minorVersion; - if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) && - (Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) { - nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), - majorVersion, - minorVersion); - } + SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); + SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); + nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), + majorVersion, + minorVersion); + desktop = NS_LITERAL_STRING("macosx"); #elif defined(MOZ_WIDGET_GTK) - nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), + nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), gtk_major_version, gtk_minor_version); + desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); @@ -3535,7 +3538,7 @@ char *token; char *newline = buf; -@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL +@@ -562,24 +569,26 @@ ParseManifest(NSLocationType type, FileL TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; @@ -3562,7 +3565,7 @@ #if defined(MOZ_WIDGET_ANDROID) bool tablet = false; if (CheckFlag(kTablet, wtoken, tablet)) { -@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL +@@ -608,16 +617,17 @@ ParseManifest(NSLocationType type, FileL } if (!ok || ++++++ mozilla-ppc64le-build.patch ++++++ ++++ 2554 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-ppc64le-build.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-ppc64le-build.patch ++++++ mozilla-ppc64le-mfbt.patch ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 147a75fe8f8e4a43b66f9716659e1209d7f5a950 +# Parent 46508a61b834f02575c116a508aa37b66d50bd20 # User Ulrich Weigand <uweigand(a)de.ibm.com> Bug 976648 - powerpc64le-linux support - mfbt endian config @@ -38,7 +38,7 @@ - defined(__ppc__) || defined(__hppa) || \ + defined(_POWER) || defined(__hppa) || \ defined(_MIPSEB) || defined(__ARMEB__) || \ - defined(__s390__) || \ + defined(__s390__) || defined(__AARCH64EB__) || \ (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \ (defined(__ia64) && defined(__BIG_ENDIAN__)) # define MOZ_BIG_ENDIAN 1 ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8042,16 +8042,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8113,16 +8113,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -73,54 +73,49 @@ + #include "nsNSSComponent.h" - #include "CertVerifier.h" + #include "ExtendedValidation.h" + #include "NSSCertDBTrustDomain.h" #include "mozilla/Telemetry.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" - #include "nsDirectoryServiceDefs.h" -@@ -1207,18 +1214,35 @@ nsNSSComponent::InitializeNSS() - ConfigureInternalPKCS11Token(); - - // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs - // module by NSS_Initialize because we will load it in InstallLoadableRoots - // later. It also allows us to work around a bug in the system NSS in - // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as - // "/usr/lib/nss/libnssckbi.so". - uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; -- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", -- SECMOD_DB, init_flags); -+ -+ SECStatus init_rv = SECFailure; +@@ -1117,17 +1124,31 @@ nsNSSComponent::InitializeNSS() + if (NS_FAILED(rv)) { + nsPSMInitPanic::SetPanic(); + return NS_ERROR_NOT_AVAILABLE; + } + + SECStatus init_rv = SECFailure; + if (!profileStr.IsEmpty()) { + // First try to initialize the NSS DB in read/write mode. +- SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); +#ifdef MOZ_ENABLE_NSSHELPER + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { -+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", -+ SECMOD_DB, init_flags); ++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); + } else { -+ init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), init_flags); ++ uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; ++ init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); -+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", -+ SECMOD_DB, init_flags); ++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); + } + } +#else -+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", -+ SECMOD_DB, init_flags); ++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); +#endif - + // If that fails, attempt read-only mode. if (init_rv != SECSuccess) { - PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); - - // try to init r/o - init_flags |= NSS_INIT_READONLY; - init_rv = ::NSS_Initialize(profileStr.get(), "", "", - SECMOD_DB, init_flags); + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get())); + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); + } + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); + } diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -245,17 +245,17 @@ endif +@@ -223,17 +223,17 @@ endif ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) SDK_LIBRARY = $(IMPORT_LIBRARY) else ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:51.000000000 +0200 @@ -1,2 +1,2 @@ -REV=5f7c149b07ba +REV=f60bc49e6bd5 REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ toolkit-download-folder.patch ++++++ --- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:51.000000000 +0200 @@ -6,7 +6,12 @@ diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js -@@ -344,7 +344,7 @@ var gMainPane = { +@@ -290,17 +290,17 @@ var gMainPane = { + // and was available as an option in the 1.5 drop down. On XP this + // was in My Documents, on OSX it was in User Docs. In 2.0, we did + // away with the drop down option, although the special label was + // still supported for the folder if it existed. Because it was + // not exposed it was rarely used. // With 3.0, a new desktop folder - 'Downloads' was introduced for // platforms and versions that don't support a default system downloads // folder. See nsDownloadManager for details. @@ -15,14 +20,24 @@ iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); } else { // 'Desktop' + downloadFolder.label = bundlePreferences.getString("desktopFolderName"); + iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop")); + } + downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; + diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi +@@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi + // Vista: + // Downloads + // XP/2K: + // My Documents/Downloads + // Linux: // XDG user dir spec, with a fallback to Home/Downloads nsXPIDLString folderName; -- mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), +- mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"), - getter_Copies(folderName)); + // We don't want localized "Downloads" unless XDG is used + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), @@ -31,3 +46,8 @@ #if defined (XP_MACOSX) rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, + NS_GET_IID(nsIFile), + getter_AddRefs(downloadDir)); + NS_ENSURE_SUCCESS(rv, rv); + #elif defined(XP_WIN) + rv = dirService->Get(NS_WIN_DEFAULT_DOWNLOAD_DIR, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkvtoolnix for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2014-04-30 15:08:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkvtoolnix" Changes: -------- --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes 2014-03-04 22:30:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new/mkvtoolnix.changes 2014-04-30 15:08:54.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 21 10:31:34 UTC 2014 - i(a)marguerite.su + +- update version 6.9.1 + * mkvmerge: bug fix: fixed huge memory usage when probing files + (it was reading the whole file into memory for that). + +------------------------------------------------------------------- Old: ---- mkvtoolnix-6.8.0.tar.xz New: ---- mkvtoolnix-6.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.KBBgrI/_old 2014-04-30 15:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.KBBgrI/_new 2014-04-30 15:08:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: mkvtoolnix -Version: 6.8.0 +Version: 6.9.1 Release: 0 Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL-2.0+ ++++++ mkvtoolnix-6.8.0.tar.xz -> mkvtoolnix-6.9.1.tar.xz ++++++ ++++ 80863 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libserf for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package libserf for openSUSE:Factory checked in at 2014-04-30 15:07:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libserf (Old) and /work/SRC/openSUSE:Factory/.libserf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libserf" Changes: -------- --- /work/SRC/openSUSE:Factory/libserf/libserf.changes 2014-02-11 10:36:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libserf.new/libserf.changes 2014-04-30 15:07:48.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Apr 27 22:02:02 UTC 2014 - andreas.stieger(a)gmx.de + +- Serf 1.3.5 [bnc#875382] + This release fixes a crash during SSL tunnel setup, fixes + Negotiate/Kerberos authentication in some specific scenario's and + brings some other small changes. + * Fix issue: no reverse lookup during Negotiate authentication for + proxies. + * Fix a crash caused by incorrect reuse of the ssltunnel CONNECT + request + * Cancel request if response parsing failed + authn callback set + * Update the expired certificates in the test suite. + +------------------------------------------------------------------- Old: ---- serf-1.3.4.tar.bz2 New: ---- serf-1.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libserf.spec ++++++ --- /var/tmp/diff_new_pack.5wATSl/_old 2014-04-30 15:07:50.000000000 +0200 +++ /var/tmp/diff_new_pack.5wATSl/_new 2014-04-30 15:07:50.000000000 +0200 @@ -19,19 +19,17 @@ %bcond_without gssapi # version 1.2.0 requires apr 1.3.0 or later for apr_socket_addr_get %define minimum_apr_version 1.3.0 - -Name: libserf %define major 1 %define minor 3 -%define SHLIBVER %major.%minor.0 -Version: 1.3.4 +%define SHLIBVER %{major}.%{minor}.0 +Name: libserf +Version: 1.3.5 Release: 0 Summary: High-Performance Asynchronous HTTP Client Library License: Apache-2.0 Group: System/Libraries -Source: https://serf.googlecode.com/svn/src_releases/serf-%version.tar.bz2 Url: https://serf.googlecode.com -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: https://serf.googlecode.com/svn/src_releases/serf-%{version}.tar.bz2 BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: libapr-util1-devel >= %{minimum_apr_version} @@ -42,6 +40,7 @@ BuildRequires: pkgconfig BuildRequires: scons >= 2.3 BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with gssapi} BuildRequires: krb5-devel %endif @@ -52,48 +51,29 @@ read/write communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation. - - - -Authors: --------- - Greg Stein <serf-dev(a)googlegroups.com> - Justin Erenkrantz <serf-dev(a)googlegroups.com> - -%package -n libserf-%major-%major - +%package -n libserf-%{major}-%{major} Summary: High-Performance Asynchronous HTTP Client Library Group: Development/Libraries/C and C++ -%description -n libserf-%major-%major +%description -n libserf-%{major}-%{major} The serf library is a C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It multiplexes connections, running the read/write communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation. - - - -Authors: --------- - Greg Stein <serf-dev(a)googlegroups.com> - Justin Erenkrantz <serf-dev(a)googlegroups.com> - - %package -n libserf-devel - Summary: High-Performance Asynchronous HTTP Client Library Group: Development/Libraries/C and C++ -%if %{with gssapi} -Requires: krb5-devel -%endif Requires: libapr-util1-devel >= %{minimum_apr_version} Requires: libapr1-devel >= %{minimum_apr_version} Requires: libexpat-devel Requires: libopenssl-devel -Requires: libserf-%major-%major = %{version} +Requires: libserf-%{major}-%{major} = %{version} Requires: openldap2-devel Requires: zlib-devel +%if %{with gssapi} +Requires: krb5-devel +%endif %description -n libserf-devel The serf library is a C-based HTTP client library built upon the Apache @@ -101,14 +81,6 @@ read/write communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation. - - - -Authors: --------- - Greg Stein <serf-dev(a)googlegroups.com> - Justin Erenkrantz <serf-dev(a)googlegroups.com> - %prep %setup -q -n "serf-%{version}" @@ -129,7 +101,7 @@ %install scons install --install-sandbox=%{buildroot} -%__rm -f "%{buildroot}%{_libdir}"/lib*.a +rm -f "%{buildroot}%{_libdir}"/lib*.a %check %if 0%{?suse_version} > 1210 @@ -152,7 +124,7 @@ %files -n libserf-devel %defattr(-,root,root) -%_includedir/serf-%{major} +%{_includedir}/serf-%{major} %{_libdir}/libserf-%{major}.so %{_libdir}/pkgconfig/serf-%{major}.pc ++++++ serf-1.3.4.tar.bz2 -> serf-1.3.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/CHANGES new/serf-1.3.5/CHANGES --- old/serf-1.3.4/CHANGES 2014-02-08 20:56:40.000000000 +0100 +++ new/serf-1.3.5/CHANGES 2014-04-27 22:30:56.000000000 +0200 @@ -1,4 +1,11 @@ -Serf 1.3.4 [2014-02-08, from /tags/1.3.4, rxxxx] +Serf 1.3.5 [2014-04-27, from /tags/1.3.5, rxxxx] + Fix issue #125: no reverse lookup during Negotiate authentication for proxies. + Fix a crash caused by incorrect reuse of the ssltunnel CONNECT request (r2316) + Cancel request if response parsing failed + authn callback set (r2319) + Update the expired certificates in the test suite. + + +Serf 1.3.4 [2014-02-08, from /tags/1.3.4, r2310] Fix issue #119: Endless loop during ssl tunnel setup with Negotiate authn Fix issue #123: Can't setup ssl tunnel which sends Connection close header Fix a race condition when initializing OpenSSL from multiple threads (r2263) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/auth/auth.c new/serf-1.3.5/auth/auth.c --- old/serf-1.3.4/auth/auth.c 2013-09-29 08:37:46.000000000 +0200 +++ new/serf-1.3.5/auth/auth.c 2014-04-21 16:56:02.000000000 +0200 @@ -408,6 +408,7 @@ consider the reponse body as invalid and discard it. */ status = discard_body(response); *consumed_response = 1; + if (!APR_STATUS_IS_EOF(status)) { return status; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/auth/auth_spnego.c new/serf-1.3.5/auth/auth_spnego.c --- old/serf-1.3.4/auth/auth_spnego.c 2014-02-04 21:01:07.000000000 +0100 +++ new/serf-1.3.5/auth/auth_spnego.c 2014-04-21 17:00:11.000000000 +0200 @@ -335,8 +335,7 @@ &tmp, &tmp_len, gss_info); } else { - char *proxy_host; - apr_getnameinfo(&proxy_host, conn->ctx->proxy_address, 0); + char *proxy_host = conn->ctx->proxy_address->hostname; status = gss_api_get_credentials(conn, token, token_len, proxy_host, &tmp, &tmp_len, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/outgoing.c new/serf-1.3.5/outgoing.c --- old/serf-1.3.4/outgoing.c 2014-02-04 20:41:14.000000000 +0100 +++ new/serf-1.3.5/outgoing.c 2014-04-21 16:56:02.000000000 +0200 @@ -916,21 +916,22 @@ * themselves by not registering credential callbacks. */ if (request->conn->ctx->cred_cb) { - status = serf__handle_auth_response(&consumed_response, - request, - request->resp_bkt, - request->handler_baton, - pool); + status = serf__handle_auth_response(&consumed_response, + request, + request->resp_bkt, + request->handler_baton, + pool); - /* If there was an error reading the response (maybe there wasn't - enough data available), don't bother passing the response to the - application. + if (SERF_BUCKET_READ_ERROR(status)) { + /* Report the request as 'died'/'cancelled' to the application */ + (void)(*request->handler)(request, + NULL, + request->handler_baton, + pool); + } - If the authentication was tried, but failed, pass the response - to the application, maybe it can do better. */ - if (status) { - return status; - } + if (status) + return status; } if (!consumed_response) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/serf.h new/serf-1.3.5/serf.h --- old/serf-1.3.4/serf.h 2014-02-04 19:57:39.000000000 +0100 +++ new/serf-1.3.5/serf.h 2014-04-02 20:13:22.000000000 +0200 @@ -1062,7 +1062,7 @@ /* Version info */ #define SERF_MAJOR_VERSION 1 #define SERF_MINOR_VERSION 3 -#define SERF_PATCH_VERSION 4 +#define SERF_PATCH_VERSION 5 /* Version number string */ #define SERF_VERSION_STRING APR_STRINGIFY(SERF_MAJOR_VERSION) "." \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/ssltunnel.c new/serf-1.3.5/ssltunnel.c --- old/serf-1.3.4/ssltunnel.c 2014-02-04 20:41:14.000000000 +0100 +++ new/serf-1.3.5/ssltunnel.c 2014-04-02 20:16:53.000000000 +0200 @@ -70,12 +70,11 @@ req_ctx_t *ctx = handler_baton; serf_connection_t *conn = request->conn; - if (! response) { - serf_connection_request_create(conn, - setup_request, - ctx); + /* CONNECT request was cancelled. Assuming that this is during connection + reset, we can safely discard the request as a new one will be created + when setting up the next connection. */ + if (!response) return APR_SUCCESS; - } status = serf_bucket_response_status(response, &sl); if (SERF_BUCKET_READ_ERROR(status)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/test/server/serfcacert.pem new/serf-1.3.5/test/server/serfcacert.pem --- old/serf-1.3.4/test/server/serfcacert.pem 2013-04-18 22:00:01.000000000 +0200 +++ new/serf-1.3.5/test/server/serfcacert.pem 2014-04-21 15:03:13.000000000 +0200 @@ -1,60 +1,25 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1048591 (0x10000f) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite Root CA, CN=Serf Root CA/emailAddress=serfrootca(a)example.com - Validity - Not Before: Apr 18 19:47:06 2013 GMT - Not After : Apr 18 19:47:06 2014 GMT - Subject: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite CA, CN=Serf CA/emailAddress=serfca(a)example.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:bb:2a:03:8e:a3:47:80:8c:c8:f8:b7:1d:4a:3b: - 1f:15:57:52:32:b8:a9:9e:a3:01:ed:0d:88:58:b6: - fa:19:81:92:d1:de:4d:c6:f9:a2:0d:1b:65:68:3a: - 74:32:ae:f3:51:1f:bb:43:fc:27:64:1c:2c:3b:bd: - f5:e8:b1:ef:47:ab:a7:54:1e:d1:5f:49:c9:5f:2f: - a2:78:5e:76:3b:72:9b:c1:e5:33:ce:10:6a:56:cc: - 64:2e:23:22:ef:b7:6a:e0:a8:fc:06:2e:06:ce:56: - b8:8a:de:1b:9b:83:54:6a:9f:c5:16:84:7f:72:f2: - e1:f5:56:51:2d:55:ce:61:dd - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - DD:F9:F5:E9:24:D4:B4:59:CA:4C:E9:98:61:1A:5D:8C:69:D1:CF:13 - X509v3 Authority Key Identifier: - keyid:B2:3E:19:35:C1:C4:4F:23:79:ED:BF:E8:DC:5C:31:03:F0:2F:15:77 - - X509v3 Basic Constraints: - CA:TRUE - Signature Algorithm: sha1WithRSAEncryption - 2a:db:bd:2b:da:8b:c3:e6:bb:6c:f0:7f:2e:1a:50:8a:81:49: - 15:45:88:e8:98:6d:0e:ed:67:8d:31:49:b1:71:50:fc:77:c1: - b9:39:0d:9e:23:ef:cb:e5:04:77:59:b4:0b:54:bd:37:8a:50: - 3b:da:0a:b2:30:f0:ee:04:50:67:e1:15:d0:50:53:7b:bd:96: - 7d:05:3a:e1:fd:85:aa:09:b0:7b:bf:e8:a1:ee:6c:68:2c:51: - a4:0c:f3:1d:9c:0e:4f:53:0c:a6:a3:41:53:0c:3d:58:09:14: - 44:5d:dc:cc:ea:85:de:dd:1f:3b:57:65:29:a2:c4:32:87:6b: - e3:a0 -----BEGIN CERTIFICATE----- -MIIDGDCCAoGgAwIBAgIDEAAPMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJC -RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM -FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGzAZBgNVBAsMElRlc3QgU3VpdGUgUm9v -dCBDQTEVMBMGA1UEAwwMU2VyZiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzZXJm -cm9vdGNhQGV4YW1wbGUuY29tMB4XDTEzMDQxODE5NDcwNloXDTE0MDQxODE5NDcw -NlowgaAxCzAJBgNVBAYTAkJFMRAwDgYDVQQIDAdBbnR3ZXJwMREwDwYDVQQHDAhN -ZWNoZWxlbjEfMB0GA1UECgwWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEWMBQGA1UE -CwwNVGVzdCBTdWl0ZSBDQTEQMA4GA1UEAwwHU2VyZiBDQTEhMB8GCSqGSIb3DQEJ -ARYSc2VyZmNhQGV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB -gQC7KgOOo0eAjMj4tx1KOx8VV1IyuKmeowHtDYhYtvoZgZLR3k3G+aING2VoOnQy -rvNRH7tD/CdkHCw7vfXose9Hq6dUHtFfSclfL6J4XnY7cpvB5TPOEGpWzGQuIyLv -t2rgqPwGLgbOVriK3hubg1Rqn8UWhH9y8uH1VlEtVc5h3QIDAQABo1AwTjAdBgNV -HQ4EFgQU3fn16STUtFnKTOmYYRpdjGnRzxMwHwYDVR0jBBgwFoAUsj4ZNcHETyN5 -7b/o3FwxA/AvFXcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAq270r -2ovD5rts8H8uGlCKgUkVRYjomG0O7WeNMUmxcVD8d8G5OQ2eI+/L5QR3WbQLVL03 -ilA72gqyMPDuBFBn4RXQUFN7vZZ9BTrh/YWqCbB7v+ih7mxoLFGkDPMdnA5PUwym -o0FTDD1YCRREXdzM6oXe3R87V2UposQyh2vjoA== +MIIEHTCCAwWgAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGuMQswCQYDVQQGEwJC +RTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNVBAoT +FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGzAZBgNVBAsTElRlc3QgU3VpdGUgUm9v +dCBDQTEVMBMGA1UEAxMMU2VyZiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzZXJm +cm9vdGNhQGV4YW1wbGUuY29tMB4XDTE0MDQxOTIxMTcyNloXDTE3MDQxODIxMTcy +NlowgaAxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdBbnR3ZXJwMREwDwYDVQQHEwhN +ZWNoZWxlbjEfMB0GA1UEChMWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEWMBQGA1UE +CxMNVGVzdCBTdWl0ZSBDQTEQMA4GA1UEAxMHU2VyZiBDQTEhMB8GCSqGSIb3DQEJ +ARYSc2VyZmNhQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEA3HuEeB7EBW9i7ibiSNWwk3iCgJexF/ggQ+Am2lA7wnAWdnTjFWP+HKqD +o+MH3xkr5dg/SaNWmvV0OFGvIcZRgpoFaBSn+BJ+X6FKzF/S36q8HckAzScjr5KB +hubnSZR98m2jEcWyznGoDBahq+ZozYSJKKwirOhckrfOTWqlQvcjtk8pUdkTK/c8 +8qnDoRFgDuqRZdF8bcZ70bo24R2XnfGhb0T359cN+cfEcUk7UZs22+JvoAxjMB3/ +oODXHammr6+86t3SYTyXGpYnkUpAecVI2wtB61RbAbBt91jifQLijBNtYWfZKqjW +cvW+oNeMuUao479T/e0WZvAkaIsRkQIDAQABo1AwTjAMBgNVHRMEBTADAQH/MB0G +A1UdDgQWBBQQ9mwXNXPt7xaDnB1cV1JWfUxkhTAfBgNVHSMEGDAWgBQ8ffmGwxZN +VX8CrM99b6wUq4qTyDANBgkqhkiG9w0BAQsFAAOCAQEAUDHna1Mb33PCnwPoo46o +/4CypCDEkOsVIOvbFjs5viHL5O1t4/IcjWHv3OmXWar3iVdxe2kirGEcUNJkOldb +vQz70t82WMClD0HkTBvICMOoZyxxds6mkp94GTI5z83AmiNZFCcIoCLs0RFmUXuK +LPnIB6KyS5MY74YgwXZTWlVCtDYDOPfNpAfNgxmtkVhEx4Yv5kdVqc6DLcBIWx04 +qSXsL27091qt8t6g5xpf7rYrrAxyXWXDn7oF05F8ifmgvGekvI33Uj61ZoD1OJHQ +AY7qZcHXZL2pcVTr3xafrnaqUOeiacdHIwq6Hu3KkgLfJ/tjK6eKIxVs+PXj1Wlo +Lg== -----END CERTIFICATE----- Files old/serf-1.3.4/test/server/serfclientcert.p12 and new/serf-1.3.5/test/server/serfclientcert.p12 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/test/server/serfrootcacert.pem new/serf-1.3.5/test/server/serfrootcacert.pem --- old/serf-1.3.4/test/server/serfrootcacert.pem 2013-04-14 23:26:33.000000000 +0200 +++ new/serf-1.3.5/test/server/serfrootcacert.pem 2014-04-21 15:03:13.000000000 +0200 @@ -1,60 +1,25 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 14060582211199810902 (0xc321390661bdbd56) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite Root CA, CN=Serf Root CA/emailAddress=serfrootca(a)example.com - Validity - Not Before: Apr 13 11:19:14 2013 GMT - Not After : Apr 11 11:19:14 2023 GMT - Subject: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite Root CA, CN=Serf Root CA/emailAddress=serfrootca(a)example.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:e1:dd:69:ea:ac:fd:f2:73:81:ec:ed:b6:b1:0e: - 70:23:8c:01:6d:ab:f3:43:ab:0f:fc:8a:6a:23:eb: - 6c:48:37:c9:c0:8f:29:61:00:7e:89:1f:00:d1:68: - dd:70:de:bd:34:32:0e:41:ac:f9:ea:c1:a6:0d:b5: - 65:be:5c:9e:f1:b4:27:54:c1:79:61:63:d4:2d:06: - 11:5f:cc:4c:d9:d3:ef:4e:da:9f:a4:26:16:cb:3f: - 86:f8:21:7d:c5:3a:32:34:c8:cb:85:ad:c4:3f:e4: - b3:ad:8e:a7:67:9e:0c:3b:5a:58:29:5f:ce:96:3b: - e3:f5:ca:42:eb:7b:44:d5:75 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - B2:3E:19:35:C1:C4:4F:23:79:ED:BF:E8:DC:5C:31:03:F0:2F:15:77 - X509v3 Authority Key Identifier: - keyid:B2:3E:19:35:C1:C4:4F:23:79:ED:BF:E8:DC:5C:31:03:F0:2F:15:77 - - X509v3 Basic Constraints: - CA:TRUE - Signature Algorithm: sha1WithRSAEncryption - c3:ec:1f:3e:b1:87:d0:80:10:f9:bf:73:1b:38:d4:b1:b7:80: - 4d:ea:20:c1:79:7d:f5:58:42:11:13:28:ab:b1:b4:0a:88:9c: - 20:4d:9c:b5:5a:41:28:5e:f6:69:5e:55:bb:e2:1a:b9:c6:62: - 38:86:32:7b:93:28:ca:9e:af:d1:06:f9:93:c2:5d:92:c0:25: - 68:6a:e1:fe:85:2a:19:a7:6b:17:4d:23:9a:72:d6:d0:c1:80: - ff:74:10:8b:62:7a:11:c3:9a:87:2a:e4:7d:d1:8c:72:a6:bf: - c1:3b:d8:b8:33:c0:ff:b0:f7:d6:0e:a3:dd:36:fe:8a:41:a0: - 98:cc -----BEGIN CERTIFICATE----- -MIIDLDCCApWgAwIBAgIJAMMhOQZhvb1WMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD -VQQGEwJCRTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAd -BgNVBAoMFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGzAZBgNVBAsMElRlc3QgU3Vp -dGUgUm9vdCBDQTEVMBMGA1UEAwwMU2VyZiBSb290IENBMSUwIwYJKoZIhvcNAQkB -FhZzZXJmcm9vdGNhQGV4YW1wbGUuY29tMB4XDTEzMDQxMzExMTkxNFoXDTIzMDQx -MTExMTkxNFowga4xCzAJBgNVBAYTAkJFMRAwDgYDVQQIDAdBbnR3ZXJwMREwDwYD -VQQHDAhNZWNoZWxlbjEfMB0GA1UECgwWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEb -MBkGA1UECwwSVGVzdCBTdWl0ZSBSb290IENBMRUwEwYDVQQDDAxTZXJmIFJvb3Qg -Q0ExJTAjBgkqhkiG9w0BCQEWFnNlcmZyb290Y2FAZXhhbXBsZS5jb20wgZ8wDQYJ -KoZIhvcNAQEBBQADgY0AMIGJAoGBAOHdaeqs/fJzgezttrEOcCOMAW2r80OrD/yK -aiPrbEg3ycCPKWEAfokfANFo3XDevTQyDkGs+erBpg21Zb5cnvG0J1TBeWFj1C0G -EV/MTNnT707an6QmFss/hvghfcU6MjTIy4WtxD/ks62Op2eeDDtaWClfzpY74/XK -Qut7RNV1AgMBAAGjUDBOMB0GA1UdDgQWBBSyPhk1wcRPI3ntv+jcXDED8C8VdzAf -BgNVHSMEGDAWgBSyPhk1wcRPI3ntv+jcXDED8C8VdzAMBgNVHRMEBTADAQH/MA0G -CSqGSIb3DQEBBQUAA4GBAMPsHz6xh9CAEPm/cxs41LG3gE3qIMF5ffVYQhETKKux -tAqInCBNnLVaQShe9mleVbviGrnGYjiGMnuTKMqer9EG+ZPCXZLAJWhq4f6FKhmn -axdNI5py1tDBgP90EItiehHDmocq5H3RjHKmv8E72LgzwP+w99YOo902/opBoJjM +MIIEKzCCAxOgAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGuMQswCQYDVQQGEwJC +RTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNVBAoT +FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGzAZBgNVBAsTElRlc3QgU3VpdGUgUm9v +dCBDQTEVMBMGA1UEAxMMU2VyZiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzZXJm +cm9vdGNhQGV4YW1wbGUuY29tMB4XDTE0MDQxOTIxMTcyNVoXDTE3MDQxODIxMTcy +NVowga4xCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdBbnR3ZXJwMREwDwYDVQQHEwhN +ZWNoZWxlbjEfMB0GA1UEChMWSW4gU2VyZiB3ZSB0cnVzdCwgSW5jLjEbMBkGA1UE +CxMSVGVzdCBTdWl0ZSBSb290IENBMRUwEwYDVQQDEwxTZXJmIFJvb3QgQ0ExJTAj +BgkqhkiG9w0BCQEWFnNlcmZyb290Y2FAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCsSwBl8wpBCuSvD4EQX1pgOfoKCLlYf0LExusE +x+Kiz7ZemlOvGffHazpLbYA1nMi+sKYe3Y8LTJnMaQm3V3eDG/qP84X6FP8vBlfS +DJCeNoQ3+oZUPLwKzrV9SZh96nXDXWsMYq3wF/4jjl1ZG+Xz3gRVD60ZEblYN9Hn +dPLmnZaMn3K1HHgMqNZPUs+q85/w3BxdcGLU8oaWR6esdMa8jUjcqMAnh0JOz2mg +uiEQex7tafz77whf2WPJ7cxY5fAFnBMM8l35QQA49ZA+I9toVyP7fadMkjB8g4so +o9z/5ODh4sB5YVnFltSTFRFuSj7pau5Yn4wJGlJas5JgmIZjAgMBAAGjUDBOMAwG +A1UdEwQFMAMBAf8wHQYDVR0OBBYEFDx9+YbDFk1VfwKsz31vrBSripPIMB8GA1Ud +IwQYMBaAFDx9+YbDFk1VfwKsz31vrBSripPIMA0GCSqGSIb3DQEBCwUAA4IBAQAE +zB/Uco7La4sgXBxKAbMa75B01eR/3Ur9Xl2eHzQKbsEte1ERXPxtu+bS/WP+5D/A +1OKNVvFr0KqK2xlYXjXrjfgXZEc5nizLtnqHq/iE4PKwfptJFTeIexjv2WK5ErnT +PaF9dWDpwhOjiUcdU9/ILWE3PcIgrffr0VYqNkO7/vPTBablreJbPvT5vDMnm9Fz +cVBDmlUvg7M1+G7XVbk00Y6yenI2j+q1DkAuYBcQb3xjsFdMsVsCN9F6/4BWhS+f +z90CFM3Ndu0xXV8t+cl0mAljluRfxFjTCB7GxgxzKtPYHTQUtUfNKhVohNk4IF1z +sO9kZ8pSTplTJ9Q8hJfi -----END CERTIFICATE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/test/server/serfserver_expired_cert.pem new/serf-1.3.5/test/server/serfserver_expired_cert.pem --- old/serf-1.3.4/test/server/serfserver_expired_cert.pem 2013-05-07 12:59:15.000000000 +0200 +++ new/serf-1.3.5/test/server/serfserver_expired_cert.pem 2014-04-21 15:03:13.000000000 +0200 @@ -1,63 +1,23 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1048596 (0x100014) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite CA, CN=Serf CA/emailAddress=serfca(a)example.com - Validity - Not Before: Nov 20 12:00:00 2010 GMT - Not After : Nov 20 12:00:00 2012 GMT - Subject: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite Server, CN=Serf Server/emailAddress=serfserver(a)example.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:ea:92:6f:ab:ed:ce:e1:c3:a8:2e:3e:03:9e:a0: - d8:c0:e4:df:e3:58:1f:bf:eb:18:23:c8:ca:a5:9a: - f0:f2:b5:97:ce:df:47:15:9a:0e:96:41:cc:b9:92: - 66:0c:f0:11:f7:f1:8f:3c:29:48:31:4a:1d:93:db: - 0a:f0:e9:98:5f:98:ed:07:1c:4e:2e:9f:e3:f3:3f: - 2c:2f:20:d8:f1:5e:8a:8f:3a:aa:3e:9c:f5:99:07: - 8c:a6:e9:9c:df:03:59:c1:ff:37:5a:bf:69:e8:41: - bd:c0:28:66:c4:4b:0a:ab:dd:93:a1:8f:3e:5e:34: - 5c:e6:04:6c:1d:8b:a3:88:6b - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 18:3A:EE:7E:57:49:42:43:23:42:E4:C9:6B:60:E7:64:1B:08:B2:90 - X509v3 Authority Key Identifier: - keyid:DD:F9:F5:E9:24:D4:B4:59:CA:4C:E9:98:61:1A:5D:8C:69:D1:CF:13 - - Signature Algorithm: sha1WithRSAEncryption - 11:b1:e3:27:7c:1b:3a:6b:c7:2e:e4:8e:ed:d4:d3:49:b5:9c: - 8f:06:08:b7:36:9d:8e:da:02:37:e5:59:5e:6b:e5:67:d0:df: - ec:84:dc:b8:92:c4:e4:07:21:92:ff:76:16:45:07:3b:67:c2: - 27:2f:63:1a:ad:60:24:33:21:a9:9b:4e:f4:9c:8e:17:1b:15: - d3:90:4e:22:f3:84:2f:ec:7c:bd:18:ea:cb:ab:bc:97:10:c9: - 53:f4:76:35:94:af:52:93:6e:ba:2e:2d:e4:3b:12:fb:3f:c2: - 10:b1:dd:59:e2:a3:60:56:a7:02:26:d2:6b:1e:23:33:ba:85: - 5f:9d -----BEGIN CERTIFICATE----- -MIIDQTCCAqqgAwIBAgIDEAAUMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJC -RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM -FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsMDVRlc3QgU3VpdGUgQ0Ex -EDAOBgNVBAMMB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl -LmNvbTAeFw0xMDExMjAxMjAwMDBaFw0xMjExMjAxMjAwMDBaMIGsMQswCQYDVQQG -EwJCRTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNV -BAoMFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsMEVRlc3QgU3VpdGUg -U2VydmVyMRQwEgYDVQQDDAtTZXJmIFNlcnZlcjElMCMGCSqGSIb3DQEJARYWc2Vy -ZnNlcnZlckBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -6pJvq+3O4cOoLj4DnqDYwOTf41gfv+sYI8jKpZrw8rWXzt9HFZoOlkHMuZJmDPAR -9/GPPClIMUodk9sK8OmYX5jtBxxOLp/j8z8sLyDY8V6KjzqqPpz1mQeMpumc3wNZ -wf83Wr9p6EG9wChmxEsKq92ToY8+XjRc5gRsHYujiGsCAwEAAaN7MHkwCQYDVR0T -BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh -dGUwHQYDVR0OBBYEFBg67n5XSUJDI0LkyWtg52QbCLKQMB8GA1UdIwQYMBaAFN35 -9ekk1LRZykzpmGEaXYxp0c8TMA0GCSqGSIb3DQEBBQUAA4GBABGx4yd8Gzprxy7k -ju3U00m1nI8GCLc2nY7aAjflWV5r5WfQ3+yE3LiSxOQHIZL/dhZFBztnwicvYxqt -YCQzIambTvScjhcbFdOQTiLzhC/sfL0Y6survJcQyVP0djWUr1KTbrouLeQ7Evs/ -whCx3Vnio2BWpwIm0mseIzO6hV+d +MIIDxzCCAq+gAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYDVQQGEwJC +RTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNVBAoT +FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsTDVRlc3QgU3VpdGUgQ0Ex +EDAOBgNVBAMTB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl +LmNvbTAeFw0xNDA0MTkyMTE3MjZaFw0xMzA0MTkyMTE3MjZaMIGqMQswCQYDVQQG +EwJCRTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNV +BAoTFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsTEVRlc3QgU3VpdGUg +U2VydmVyMRIwEAYDVQQDEwlsb2NhbGhvc3QxJTAjBgkqhkiG9w0BCQEWFnNlcmZz +ZXJ2ZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDPSJs4Dhlb9JpmS50uOfAN0lOFkU89FEU4SAGziNcuevcOM87dsjENMpwMJrC+ +Emepkf5KAFkSRRuIBCms2Hx0Xm/LPRXhXMys2um3U/lkbu+HqPtWwhr9vsA+LjYG +787943qnfSPvOSssedVKkg03HchCzlko+iL3dQfQFyj7/Ew7Lh9K+TiWTnlrCGY9 +gS1NgKK+kEfXoBUp2+Fq1aUiO2wGKNK9ntcan28pIuJljBtI9hEp93Gs95zl2SR8 +e987YIveip2ofXrGEtGGuXftg1VE+jADJNBcByRpRS8cwyFx1sI9JUp/Uj899R49 +r706i9vPwLwwRAlDFB23m2ffAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAD9aCwa9 +LUEF+bZGC5dYAmXDPDJdd/wa+sJcjFKf6/iDYowBMN/Rbd122XwFyPxkRa6jKqBF +0Ub6mVXjjj7/B/nhO7g/ZjrhVBPdlUG8ehoCLtff2lME/BNDysj3dF/gKtJYdl6+ +7dvRenLG/MX8Vg/VBP5ZBLTqPms5VT570nFUidMkIK+tIBwuHFu499SXg1bI/pEF +Jy5sUDXQD+acwDRV1aSnggwykkeH1loFkFmecdHGXip1/XLB0ts7z8lQgPC8PiCT +xflJt4yg1U14oJkz65wrIuBt9m5GeZuca+F+BZQSN+annaXKfrPi7kOYd2BeYiz0 +t4xQp6/lhs52tj8= -----END CERTIFICATE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/test/server/serfserver_future_cert.pem new/serf-1.3.5/test/server/serfserver_future_cert.pem --- old/serf-1.3.4/test/server/serfserver_future_cert.pem 2013-05-07 12:59:15.000000000 +0200 +++ new/serf-1.3.5/test/server/serfserver_future_cert.pem 2014-04-21 15:03:13.000000000 +0200 @@ -1,63 +1,23 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1048597 (0x100015) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite CA, CN=Serf CA/emailAddress=serfca(a)example.com - Validity - Not Before: Nov 20 12:00:00 2023 GMT - Not After : Nov 20 12:00:00 2025 GMT - Subject: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite Server, CN=Serf Server/emailAddress=serfserver(a)example.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:ea:92:6f:ab:ed:ce:e1:c3:a8:2e:3e:03:9e:a0: - d8:c0:e4:df:e3:58:1f:bf:eb:18:23:c8:ca:a5:9a: - f0:f2:b5:97:ce:df:47:15:9a:0e:96:41:cc:b9:92: - 66:0c:f0:11:f7:f1:8f:3c:29:48:31:4a:1d:93:db: - 0a:f0:e9:98:5f:98:ed:07:1c:4e:2e:9f:e3:f3:3f: - 2c:2f:20:d8:f1:5e:8a:8f:3a:aa:3e:9c:f5:99:07: - 8c:a6:e9:9c:df:03:59:c1:ff:37:5a:bf:69:e8:41: - bd:c0:28:66:c4:4b:0a:ab:dd:93:a1:8f:3e:5e:34: - 5c:e6:04:6c:1d:8b:a3:88:6b - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 18:3A:EE:7E:57:49:42:43:23:42:E4:C9:6B:60:E7:64:1B:08:B2:90 - X509v3 Authority Key Identifier: - keyid:DD:F9:F5:E9:24:D4:B4:59:CA:4C:E9:98:61:1A:5D:8C:69:D1:CF:13 - - Signature Algorithm: sha1WithRSAEncryption - 04:6a:2f:a9:fb:18:69:74:ad:3c:24:19:be:81:7e:03:f0:74: - f0:26:7d:b4:74:2a:8b:d3:a8:b3:33:73:af:35:5a:6c:ea:d8: - e9:0e:45:14:57:19:b4:7a:17:e1:b4:9a:3f:7e:7b:9c:c9:1d: - 5d:1f:47:28:18:4b:a6:81:96:e0:99:ee:44:cf:13:1b:a1:aa: - b6:f0:82:91:09:e7:bd:5f:4e:ae:b3:70:38:e4:93:72:6f:25: - bb:ad:d0:a5:e6:db:85:c8:a7:7b:10:cc:c7:16:bf:8b:c2:f3: - c3:9a:35:d0:dd:66:6d:b3:5b:7c:0c:54:f2:1d:c6:f4:4f:75: - 6e:91 -----BEGIN CERTIFICATE----- -MIIDQTCCAqqgAwIBAgIDEAAVMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJC -RTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNVBAoM -FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsMDVRlc3QgU3VpdGUgQ0Ex -EDAOBgNVBAMMB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl -LmNvbTAeFw0yMzExMjAxMjAwMDBaFw0yNTExMjAxMjAwMDBaMIGsMQswCQYDVQQG -EwJCRTEQMA4GA1UECAwHQW50d2VycDERMA8GA1UEBwwITWVjaGVsZW4xHzAdBgNV -BAoMFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsMEVRlc3QgU3VpdGUg -U2VydmVyMRQwEgYDVQQDDAtTZXJmIFNlcnZlcjElMCMGCSqGSIb3DQEJARYWc2Vy -ZnNlcnZlckBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -6pJvq+3O4cOoLj4DnqDYwOTf41gfv+sYI8jKpZrw8rWXzt9HFZoOlkHMuZJmDPAR -9/GPPClIMUodk9sK8OmYX5jtBxxOLp/j8z8sLyDY8V6KjzqqPpz1mQeMpumc3wNZ -wf83Wr9p6EG9wChmxEsKq92ToY8+XjRc5gRsHYujiGsCAwEAAaN7MHkwCQYDVR0T -BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh -dGUwHQYDVR0OBBYEFBg67n5XSUJDI0LkyWtg52QbCLKQMB8GA1UdIwQYMBaAFN35 -9ekk1LRZykzpmGEaXYxp0c8TMA0GCSqGSIb3DQEBBQUAA4GBAARqL6n7GGl0rTwk -Gb6BfgPwdPAmfbR0KovTqLMzc681Wmzq2OkORRRXGbR6F+G0mj9+e5zJHV0fRygY -S6aBluCZ7kTPExuhqrbwgpEJ571fTq6zcDjkk3JvJbut0KXm24XIp3sQzMcWv4vC -88OaNdDdZm2zW3wMVPIdxvRPdW6R +MIIDxzCCAq+gAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYDVQQGEwJC +RTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNVBAoT +FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsTDVRlc3QgU3VpdGUgQ0Ex +EDAOBgNVBAMTB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl +LmNvbTAeFw0yNDA0MTYyMTE3MjZaFw0yNzA0MTYyMTE3MjZaMIGqMQswCQYDVQQG +EwJCRTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNV +BAoTFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsTEVRlc3QgU3VpdGUg +U2VydmVyMRIwEAYDVQQDEwlsb2NhbGhvc3QxJTAjBgkqhkiG9w0BCQEWFnNlcmZz +ZXJ2ZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDPSJs4Dhlb9JpmS50uOfAN0lOFkU89FEU4SAGziNcuevcOM87dsjENMpwMJrC+ +Emepkf5KAFkSRRuIBCms2Hx0Xm/LPRXhXMys2um3U/lkbu+HqPtWwhr9vsA+LjYG +787943qnfSPvOSssedVKkg03HchCzlko+iL3dQfQFyj7/Ew7Lh9K+TiWTnlrCGY9 +gS1NgKK+kEfXoBUp2+Fq1aUiO2wGKNK9ntcan28pIuJljBtI9hEp93Gs95zl2SR8 +e987YIveip2ofXrGEtGGuXftg1VE+jADJNBcByRpRS8cwyFx1sI9JUp/Uj899R49 +r706i9vPwLwwRAlDFB23m2ffAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABp4mfjd +CCixsQkBQAzHIBO8i/UC1XRwYy0Bfjq54PNp608Z6h0Oh2igODJ9y4j69ItgWOda +4jK1xrkUD7p7SFR2WQdEO4hWwq3Rlsknj3SLsyfESzK4vRLO2c2LU1Uyfset5DMP +ty7ja2Bqwy+o86u/vbYfU8fA03xJuFIUrztauhVl3vi64v5y6kUUMRslQQSo7pam +jdDwN1HABeQGY73fAVKRHo+pe5a5yXOJ//wm2cH2CcIbWNbK4BSmBj81fgmgvUPp +JbmQw7+qy4qcifDbiIiCBhTWwgHSozYwtrprQ7vFvnnxO6tjcaHYZYjSNb2yIrEU +r3cl/ZbuP1O0aW4= -----END CERTIFICATE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/test/server/serfservercert.pem new/serf-1.3.5/test/server/serfservercert.pem --- old/serf-1.3.4/test/server/serfservercert.pem 2013-05-17 22:20:35.000000000 +0200 +++ new/serf-1.3.5/test/server/serfservercert.pem 2014-04-21 15:03:13.000000000 +0200 @@ -1,50 +1,23 @@ -Certificate: - Data: - Version: 1 (0x0) - Serial Number: 1048599 (0x100017) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite CA, CN=Serf CA/emailAddress=serfca(a)example.com - Validity - Not Before: May 17 20:09:08 2013 GMT - Not After : May 17 20:09:08 2014 GMT - Subject: C=BE, ST=Antwerp, L=Mechelen, O=In Serf we trust, Inc., OU=Test Suite Server, CN=localhost/emailAddress=serfserver(a)example.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:ea:92:6f:ab:ed:ce:e1:c3:a8:2e:3e:03:9e:a0: - d8:c0:e4:df:e3:58:1f:bf:eb:18:23:c8:ca:a5:9a: - f0:f2:b5:97:ce:df:47:15:9a:0e:96:41:cc:b9:92: - 66:0c:f0:11:f7:f1:8f:3c:29:48:31:4a:1d:93:db: - 0a:f0:e9:98:5f:98:ed:07:1c:4e:2e:9f:e3:f3:3f: - 2c:2f:20:d8:f1:5e:8a:8f:3a:aa:3e:9c:f5:99:07: - 8c:a6:e9:9c:df:03:59:c1:ff:37:5a:bf:69:e8:41: - bd:c0:28:66:c4:4b:0a:ab:dd:93:a1:8f:3e:5e:34: - 5c:e6:04:6c:1d:8b:a3:88:6b - Exponent: 65537 (0x10001) - Signature Algorithm: sha1WithRSAEncryption - 83:26:09:bf:45:7e:ef:a2:94:97:25:78:a9:2c:c9:2f:fb:53: - 61:8b:9b:72:49:dd:81:19:48:ac:5e:b3:e7:f5:c3:31:a6:8a: - 8b:21:20:fd:bd:89:ff:90:b3:11:6e:99:03:48:a3:33:69:e9: - af:91:d8:40:e0:01:9c:42:5b:71:98:41:0c:03:c1:29:92:8a: - 1b:12:51:d9:b2:7b:63:23:03:8b:63:74:fd:6f:9a:c9:4c:c3: - 95:9a:d3:32:1e:6e:1d:e1:a8:1e:16:ea:ce:28:ca:c1:11:c4: - 26:15:dd:7c:b6:1a:ee:7e:00:db:39:ae:4b:94:bc:27:3a:1e: - 20:8b -----BEGIN CERTIFICATE----- -MIICvTCCAiYCAxAAFzANBgkqhkiG9w0BAQUFADCBoDELMAkGA1UEBhMCQkUxEDAO -BgNVBAgMB0FudHdlcnAxETAPBgNVBAcMCE1lY2hlbGVuMR8wHQYDVQQKDBZJbiBT -ZXJmIHdlIHRydXN0LCBJbmMuMRYwFAYDVQQLDA1UZXN0IFN1aXRlIENBMRAwDgYD -VQQDDAdTZXJmIENBMSEwHwYJKoZIhvcNAQkBFhJzZXJmY2FAZXhhbXBsZS5jb20w -HhcNMTMwNTE3MjAwOTA4WhcNMTQwNTE3MjAwOTA4WjCBqjELMAkGA1UEBhMCQkUx -EDAOBgNVBAgMB0FudHdlcnAxETAPBgNVBAcMCE1lY2hlbGVuMR8wHQYDVQQKDBZJ -biBTZXJmIHdlIHRydXN0LCBJbmMuMRowGAYDVQQLDBFUZXN0IFN1aXRlIFNlcnZl -cjESMBAGA1UEAwwJbG9jYWxob3N0MSUwIwYJKoZIhvcNAQkBFhZzZXJmc2VydmVy -QGV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDqkm+r7c7h -w6guPgOeoNjA5N/jWB+/6xgjyMqlmvDytZfO30cVmg6WQcy5kmYM8BH38Y88KUgx -Sh2T2wrw6ZhfmO0HHE4un+PzPywvINjxXoqPOqo+nPWZB4ym6ZzfA1nB/zdav2no -Qb3AKGbESwqr3ZOhjz5eNFzmBGwdi6OIawIDAQABMA0GCSqGSIb3DQEBBQUAA4GB -AIMmCb9Ffu+ilJcleKksyS/7U2GLm3JJ3YEZSKxes+f1wzGmioshIP29if+QsxFu -mQNIozNp6a+R2EDgAZxCW3GYQQwDwSmSihsSUdmye2MjA4tjdP1vmslMw5Wa0zIe -bh3hqB4W6s4oysERxCYV3Xy2Gu5+ANs5rkuUvCc6HiCL +MIIDxzCCAq+gAwIBAgIDAYa0MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYDVQQGEwJC +RTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNVBAoT +FkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xFjAUBgNVBAsTDVRlc3QgU3VpdGUgQ0Ex +EDAOBgNVBAMTB1NlcmYgQ0ExITAfBgkqhkiG9w0BCQEWEnNlcmZjYUBleGFtcGxl +LmNvbTAeFw0xNDA0MTkyMTE3MjZaFw0xNzA0MTgyMTE3MjZaMIGqMQswCQYDVQQG +EwJCRTEQMA4GA1UECBMHQW50d2VycDERMA8GA1UEBxMITWVjaGVsZW4xHzAdBgNV +BAoTFkluIFNlcmYgd2UgdHJ1c3QsIEluYy4xGjAYBgNVBAsTEVRlc3QgU3VpdGUg +U2VydmVyMRIwEAYDVQQDEwlsb2NhbGhvc3QxJTAjBgkqhkiG9w0BCQEWFnNlcmZz +ZXJ2ZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDPSJs4Dhlb9JpmS50uOfAN0lOFkU89FEU4SAGziNcuevcOM87dsjENMpwMJrC+ +Emepkf5KAFkSRRuIBCms2Hx0Xm/LPRXhXMys2um3U/lkbu+HqPtWwhr9vsA+LjYG +787943qnfSPvOSssedVKkg03HchCzlko+iL3dQfQFyj7/Ew7Lh9K+TiWTnlrCGY9 +gS1NgKK+kEfXoBUp2+Fq1aUiO2wGKNK9ntcan28pIuJljBtI9hEp93Gs95zl2SR8 +e987YIveip2ofXrGEtGGuXftg1VE+jADJNBcByRpRS8cwyFx1sI9JUp/Uj899R49 +r706i9vPwLwwRAlDFB23m2ffAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHL9mzR3 +o5K3pTnSVzxE6DE/BiXY1SutA0Bp6r24aiITl7QBn0oeXo+BCm1k46W/7zL7IExQ +sIfd07P5yrgeDlpmI3ciYD9x1Lumxks4j0HJBkVfjE6M0tCj9JTDKDUeyNkaYybL +TN60dlvAaBrtLrpoYOJNFQNNgmZqUhu2VxPXJzMZrgZiv3g4YqBIBLzI64+bBQ5B +Ap/DgzNbyMVDa/+CL1rU2editJTI39uU9feVVB35l5ZCb7cahcxE7y9xMhNx358B +DuGsLXBOs6GHf9h8M+yLr1VjtN7LebkRmwSry/IKB7o6VkWOFXghMLOfSyzBwfFP +EK7YBZc1B+X5xjg= -----END CERTIFICATE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serf-1.3.4/test/server/serfserverkey.pem new/serf-1.3.5/test/server/serfserverkey.pem --- old/serf-1.3.4/test/server/serfserverkey.pem 2013-04-18 22:00:01.000000000 +0200 +++ new/serf-1.3.5/test/server/serfserverkey.pem 2014-04-21 15:03:13.000000000 +0200 @@ -1,17 +1,30 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIOgdKxeTZjDQCAggA -MBQGCCqGSIb3DQMHBAgCe5obSU/JDwSCAoAY2Pdf7Hq0SD+bPHq21ZvDKnX6oMDC -cgcFlFSdooCY0GQn4IkONWCJWkyYDGQ3DJcNev7ZhQdyC0iuSzYDQAlbxrewB1Kh -Aoo8WP/T2iVb86bLhOg7fu+k++LHtQ1xZm9PdY4DC48lbrpX9N+qhGfPDzoYrZY6 -C7b6aCCZfTPrtykuCO14EATw6EixR597NlDOCfZGiIwc3B0OWmp/wMsFbbVljN+Y -whYjSvulXlN+QGLkBYyQMvAWvOJJjK0jCIKzVu+K5wFHteCOjlTrQ9yxfnyuu5KH -gHF9k/fSlKx52XIiiClpGJ5o98U3jiPgBISEsbY+QZfQrNj90BjVcyv3aj6bmXBc -/rIg6O2gpoXRpy+pnuxHGMYwveVBab3Ul7r9qdaG+tiKcGqmq1hrAdOOpeWODGYg -oUQC/iLGEzdtpkYD1+5uKkv06sZ6mSVpMyyrlEp2GB7Z/9GpDuhtES/CK59qY/yV -rG3VJZ9OVHUun3nyw8AcNAWpaciVXXZk79i0vqDS+XamhyZCTZzeDXuSYUzPRmiQ -UUfzQuAPbLOggqF5AJi8W4xMaT/Z2Kai6h72oXr5xVcVYQK/9kNA3nBBIq5o88LF -PSZCWqZ1kOvwyLMnK8wu0oAiVXmk2VrJwdVuVgs0dxf+QOfx4cExYa1T6bVdXAKj -QaJWfLI6iPosaY6g2YGwho7KIJmAkW6I+aWDJ12TwFWz9874Xis3FAbiNJUzPqVT -wCBPk0Yckio+U49hpFYzADENnRtDrzLfjK1n3gsN8GLfqBL9bNM8bD/XyRFuWTb6 -Kz+/rf3aPmra1Q/YFpvQ66E46ciHzAkeVXMamzaZJ+12EzaBuqb4Eeq9 +MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIEVWBqG6vECoCAggA +MBQGCCqGSIb3DQMHBAiAagREZjJEQQSCBMgpHbLBzmAyx9f4YHhRnDdUm4ftQ7bR +6fF7sKxOD7fdJ+jgEB6xYBIlG9Y4+DDDbz3IvZgXIsweauV+WNscxnTHyJequoFL +qKFPY5bEc2hskZYsi/+LfvvguZLFm1vjK08sORYK2Kdy2hwmk3sTPQmgD2T/jZpg +vI1AkB+hXA/6AVJUVqSyAFH8u3WGr8Dxjz69YCQ+K9cPqYXJdWZzAVq/0ibSRkzL +mSLN8VoF810AXkFxCC7DKxg+mgp9dBdR8uuBXZ9fBOz5YCI92thZwd1iYsTetmWa +LoIS8xLMvuBaalAV8oQ7e0xuow6Cx9IjxlQ/sd8N1Xg+Z2vWTwnj9AOFIHU3s/N8 +e9L51Q9p6igZgmNm2N2+pUQ1Y5mest7gfJ1ka07ypSr0yzOnK7L41VCIposZuzyX +psTRy+zpGULsK0lG5mH0r1CZ88G8puwyUOaOk/yUhHgc4ZSOsDbeWdQ8UohHElUA +ZLkxwt2xWgcd8mG+FQnbXQZhDFII/aP/RBe7xfEwSQr8hhyP8fsyRmbuq5YZrkRw +mMyp6kxX8USKmeXxBEm364RdilFgPUN3djf7ljKCPOJ1y5OTzmBQacMbXGhbqBGY +PZUKE6szzsM1IYnrvUwP7Gf5wksR/VYMr1VnnpeBofaOJ0brXNF/MFiBE13afNT7 +JLUjA3QcAfmdYocfBTVQSM7umSBOrM7H6qsX67ye5ccAK9x1HikgxXRoqV/TxFgI +snrXEtiDrve+nvmPYlmgP5RGyl+bAxtGGjT6TZPlfGACb7xytCpNiOK5bNsgMx7F +ukOMiVE+sQJT95WnOJMXSmiSw2HmSBXwjpnEKNOYe+Cram64Vjaa8dFqIZSvUDMW +ihyWAYZrHro4hKmSdeCmrk4rkYH97BxG2Gm/6oRsEDCTgTUn7OYGm5bAmxz0WPSZ +/TQ7oYSQ3jUlX8q8NPhVPeHizjNwGWyYovmAyAzi3uPTIBsaIdeMiENyyZTXnSHq +IkfAGekcQ/IX6VWpZGiS3ilgSqxInSVfByM2gs2thdIQ1WEcDitGsAJxFPjnimjX +1WFk08/6aUDGK30Q9Mm2X3WjSTvCKq8ccd/bwjvQRepvzjRSl1vt6Ngvv88UPH1e +/0GrKcXNkBEoGqZSk4D60BFz0rpyDplaZLFVEj7ET85sHP+h5JYnKCpjqkHKQUuj +VVhVhjk6IGpVQZnbGf4PSoij61NUfwpKS4zfAHg7JQrl+7bUBreXYWg2+qXvxJOE +HrqYt2aQq9ilG3hrDXgU0+KTNpJEdteeH7ypoYcGEmlljDriwbmYs2lZ5QkgHb6t +1ue5WfnxkjTxxjeh3Aeu3QnHogQHwS4e4zzpiJC0xHFgWbsWVi2mSwtS0aZh9d2P +KCpMl8E7lVVDRcgFPn/36b4K9EvAoTfjEtubOU0M2fD1btQF5t0cNCmpnq6hxC0S +onPj3HGRBh6QxcaV+86UESEPQ12TJfzetXT/+KvVFrPLMzUhwmb8j+Ozb5sU6mPC +mCfhtCzyPW7xk0+X+1dmtUKx35MGaJlf2rbp9xEhML6vMx3qIxbO33f0mP0qiz8b +SLTC8P8VLObo9SCY3DeIqhC83DSXsm+taylHpFGZ0sDl8CXrepLyOp+iOSyGiq1W +ZqE= -----END ENCRYPTED PRIVATE KEY----- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit librelp for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package librelp for openSUSE:Factory checked in at 2014-04-30 15:06:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librelp (Old) and /work/SRC/openSUSE:Factory/.librelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librelp" Changes: -------- --- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2014-03-22 09:08:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.librelp.new/librelp.changes 2014-04-30 15:06:42.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Apr 29 17:07:46 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 1.2.7 + - bugfix: librelp was incompatible with C++ without a real reason + - bugfix: potential misadressing in wildcard match + - bugfix: always last wildcard match was reported, not first +- contains changes from 1.2.6 + - report error when preparing for non-anon TLS and this is + unsupported + +------------------------------------------------------------------- Old: ---- librelp-1.2.5.tar.gz New: ---- librelp-1.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librelp.spec ++++++ --- /var/tmp/diff_new_pack.Kj9bF2/_old 2014-04-30 15:06:43.000000000 +0200 +++ /var/tmp/diff_new_pack.Kj9bF2/_new 2014-04-30 15:06:43.000000000 +0200 @@ -16,17 +16,17 @@ # -Name: librelp %define library_name librelp0 -Version: 1.2.5 +Name: librelp +Version: 1.2.7 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://www.librelp.com/ -Source: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz Summary: A reliable logging library License: GPL-3.0+ Group: Development/Libraries/C and C++ +Url: http://www.librelp.com/ +Source: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?sles_version} && 0%{?sles_version} <= 11 BuildRequires: libgnutls-devel >= 2.0.0 %else @@ -53,17 +53,11 @@ provide ample opportunity to extend the protocol without affecting existing applications. - -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com> - - -%package -n %library_name +%package -n %{library_name} Summary: A reliable logging library Group: Development/Libraries/C and C++ -%description -n %library_name +%description -n %{library_name} librelp is an easy to use library for the RELP protocol. RELP in turn provides reliable event logging over the network (and consequently RELP stands for Reliable Event Logging Protocol). RELP was initiated by Rainer Gerhards after @@ -83,15 +77,10 @@ provide ample opportunity to extend the protocol without affecting existing applications. - -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com> - %package devel -Requires: %{library_name} = %{version} Summary: A reliable logging library Group: Development/Libraries/C and C++ +Requires: %{library_name} = %{version} Requires: libgnutls-devel >= 1.4.0 %description devel @@ -114,11 +103,6 @@ provide ample opportunity to extend the protocol without affecting existing applications. - -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com> - %prep %setup -q @@ -127,8 +111,8 @@ make %{?_smp_mflags} %install -%makeinstall -%{__rm} %{buildroot}%{_libdir}/librelp.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm %{buildroot}%{_libdir}/librelp.la %post -n %{library_name} -p /sbin/ldconfig ++++++ librelp-1.2.5.tar.gz -> librelp-1.2.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/ChangeLog new/librelp-1.2.7/ChangeLog --- old/librelp-1.2.5/ChangeLog 2014-03-20 14:23:37.000000000 +0100 +++ new/librelp-1.2.7/ChangeLog 2014-04-28 17:59:02.000000000 +0200 @@ -1,4 +1,22 @@ ---------------------------------------------------------------------- +Version 1.2.7 - 2014-04-29 +- bugfix: librelp was incompatible with C++ without a real reason + Thanks to Ivan Kryak for the patch +- bugfix: potential misadressing in wildcard match + see: https://github.com/rsyslog/librelp/pull/3 + Thanks to Sebastian Schmidt for the patch. +- bugfix: always last wildcard match was reported, not first + see: https://github.com/rsyslog/librelp/pull/4 + Thanks to Sebastian Schmidt for the patch. +---------------------------------------------------------------------- +Version 1.2.6 - 2014-03-20 +- report error when preparing for non-anon TLS and this is unsupported + The error is reported when the processes own certificate is set, + which also turns off anon TLS. We now check if TLS AUTH is supported + and, if not, return an error. This enables better error tracking + in the client, as otherwise the problem is reported much later + or even not at all (in the case of a relp server). +---------------------------------------------------------------------- Version 1.2.5 - 2014-03-20 - permit to use anonymous TLS on platforms where GnuTLS misses certificate verification function. This permits to use at least diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/configure new/librelp-1.2.7/configure --- old/librelp-1.2.5/configure 2014-03-20 14:24:38.000000000 +0100 +++ new/librelp-1.2.7/configure 2014-04-28 17:59:19.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for librelp 1.2.5. +# Generated by GNU Autoconf 2.69 for librelp 1.2.7. # # Report bugs to <rgerhards(a)adiscon.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='librelp' PACKAGE_TARNAME='librelp' -PACKAGE_VERSION='1.2.5' -PACKAGE_STRING='librelp 1.2.5' +PACKAGE_VERSION='1.2.7' +PACKAGE_STRING='librelp 1.2.7' PACKAGE_BUGREPORT='rgerhards(a)adiscon.com' PACKAGE_URL='' @@ -1323,7 +1323,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures librelp 1.2.5 to adapt to many kinds of systems. +\`configure' configures librelp 1.2.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of librelp 1.2.5:";; + short | recursive ) echo "Configuration of librelp 1.2.7:";; esac cat <<\_ACEOF @@ -1508,7 +1508,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -librelp configure 1.2.5 +librelp configure 1.2.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2034,7 +2034,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by librelp $as_me 1.2.5, which was +It was created by librelp $as_me 1.2.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2897,7 +2897,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.5' + VERSION='1.2.7' cat >>confdefs.h <<_ACEOF @@ -2970,7 +2970,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.5' + VERSION='1.2.7' cat >>confdefs.h <<_ACEOF @@ -13321,7 +13321,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by librelp $as_me 1.2.5, which was +This file was extended by librelp $as_me 1.2.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13387,7 +13387,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -librelp config.status 1.2.5 +librelp config.status 1.2.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/configure.ac new/librelp-1.2.7/configure.ac --- old/librelp-1.2.5/configure.ac 2014-03-20 14:21:44.000000000 +0100 +++ new/librelp-1.2.7/configure.ac 2014-04-28 17:58:53.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([librelp], [1.2.5], [rgerhards(a)adiscon.com] +AC_INIT([librelp], [1.2.7], [rgerhards(a)adiscon.com] AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/librelp.h new/librelp-1.2.7/src/librelp.h --- old/librelp-1.2.5/src/librelp.h 2014-03-20 09:02:05.000000000 +0100 +++ new/librelp-1.2.7/src/librelp.h 2014-04-28 17:52:11.000000000 +0200 @@ -50,7 +50,6 @@ typedef struct relpSendbuf_s relpSendbuf_t; typedef struct relpOffers_s relpOffers_t; typedef struct relpOffer_s relpOffer_t; -typedef enum relpCmdEnaState_e relpCmdEnaState_t; /* IDs of librelp objects */ typedef enum relpObjID_e { @@ -85,6 +84,7 @@ eRelpCmdState_Disabled = 5 /**< feature can NOT be used (set during open handshake) */ }; +typedef enum relpCmdEnaState_e relpCmdEnaState_t; /* macro to assert we are dealing with the right relp object */ #ifdef NDEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/relpsrv.c new/librelp-1.2.7/src/relpsrv.c --- old/librelp-1.2.5/src/relpsrv.c 2014-03-14 08:02:16.000000000 +0100 +++ new/librelp-1.2.7/src/relpsrv.c 2014-03-24 15:03:33.000000000 +0100 @@ -349,11 +349,11 @@ CHKRet(relpTcpEnableTLSZip(pTcp)); } relpTcpSetDHBits(pTcp, pThis->dhBits); - relpTcpSetGnuTLSPriString(pTcp, pThis->pristring); - relpTcpSetAuthMode(pTcp, pThis->authmode); - relpTcpSetCACert(pTcp, pThis->caCertFile); - relpTcpSetOwnCert(pTcp, pThis->ownCertFile); - relpTcpSetPrivKey(pTcp, pThis->privKey); + CHKRet(relpTcpSetGnuTLSPriString(pTcp, pThis->pristring)); + CHKRet(relpTcpSetAuthMode(pTcp, pThis->authmode)); + CHKRet(relpTcpSetCACert(pTcp, pThis->caCertFile)); + CHKRet(relpTcpSetOwnCert(pTcp, pThis->ownCertFile)); + CHKRet(relpTcpSetPrivKey(pTcp, pThis->privKey)); CHKRet(relpTcpSetPermittedPeers(pTcp, &(pThis->permittedPeers))); } CHKRet(relpTcpLstnInit(pTcp, (pThis->pLstnPort == NULL) ? (unsigned char*) RELP_DFLT_PORT : pThis->pLstnPort, pThis->ai_family)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/tcp.c new/librelp-1.2.7/src/tcp.c --- old/librelp-1.2.5/src/tcp.c 2014-03-20 09:02:05.000000000 +0100 +++ new/librelp-1.2.7/src/tcp.c 2014-04-22 15:33:25.000000000 +0200 @@ -482,8 +482,12 @@ if(cert == NULL) { pThis->privKeyFile = NULL; } else { - if((pThis->privKeyFile = strdup(cert)) == NULL) - ABORT_FINALIZE(RELP_RET_OUT_OF_MEMORY); +# ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION + if((pThis->privKeyFile = strdup(cert)) == NULL) + ABORT_FINALIZE(RELP_RET_OUT_OF_MEMORY); +# else + ABORT_FINALIZE(RELP_RET_ERR_NO_TLS_AUTH); +# endif } finalize_it: LEAVE_RELPFUNC; @@ -1015,7 +1019,7 @@ * empty. That happens frequently if the domain root (e.g. "example.com.") * is properly given. */ - if(pWildcard->wildcardType == tcpPEER_WILDCARD_EMPTY_COMPONENT) + if(pWildcard != NULL && pWildcard->wildcardType == tcpPEER_WILDCARD_EMPTY_COMPONENT) pWildcard = pWildcard->pNext; if(pWildcard != NULL) { @@ -1049,6 +1053,8 @@ } else { relpTcpChkOnePeerWildcard(pThis->permittedPeers.peer[i].wildcardRoot, peername, pbFoundPositiveMatch); + if (*pbFoundPositiveMatch) + break; } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkgapi for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package libkgapi for openSUSE:Factory checked in at 2014-04-30 15:06:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkgapi (Old) and /work/SRC/openSUSE:Factory/.libkgapi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkgapi" Changes: -------- --- /work/SRC/openSUSE:Factory/libkgapi/libkgapi.changes 2014-03-21 13:33:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkgapi.new/libkgapi.changes 2014-04-30 15:06:29.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 22:28:03 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 2.1.1 + * Bugfix release, no changelog provided + +------------------------------------------------------------------- Old: ---- libkgapi-2.1.0.tar.bz2 New: ---- libkgapi-2.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkgapi.spec ++++++ --- /var/tmp/diff_new_pack.jkLOPr/_old 2014-04-30 15:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.jkLOPr/_new 2014-04-30 15:06:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libkgapi -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Extension for accessing your Google data License: GPL-2.0+ ++++++ libkgapi-2.1.0.tar.bz2 -> libkgapi-2.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/CMakeLists.txt new/libkgapi-2.1.1/CMakeLists.txt --- old/libkgapi-2.1.0/CMakeLists.txt 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/CMakeLists.txt 2014-04-07 23:08:28.000000000 +0200 @@ -2,7 +2,7 @@ set(KGAPI_VERSION_MAJOR 2) set(KGAPI_VERSION_MINOR 1) -set(KGAPI_VERSION_RELEASE 0) +set(KGAPI_VERSION_RELEASE 1) set(KGAPI_VERSION "${KGAPI_VERSION_MAJOR}.${KGAPI_VERSION_MINOR}.${KGAPI_VERSION_RELEASE}") cmake_minimum_required(VERSION 2.8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/authjob.cpp new/libkgapi-2.1.1/libkgapi2/authjob.cpp --- old/libkgapi-2.1.0/libkgapi2/authjob.cpp 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/authjob.cpp 2014-04-07 23:08:28.000000000 +0200 @@ -147,6 +147,16 @@ return d->account; } +void AuthJob::setUsername(const QString& username) +{ + d->username = username; +} + +void AuthJob::setPassword(const QString& password) +{ + d->password = password; +} + void AuthJob::handleReply(const QNetworkReply *reply, const QByteArray& rawData) { Q_UNUSED(reply); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/authjob.h new/libkgapi-2.1.1/libkgapi2/authjob.h --- old/libkgapi-2.1.0/libkgapi2/authjob.h 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/authjob.h 2014-04-07 23:08:28.000000000 +0200 @@ -108,6 +108,34 @@ */ AccountPtr account() const; + /** + * Sets the username that will be used when authenticate is called + * + * The username will be automatically filled in the Google login + * form in the authentication widget. + * + * Be aware that the username will be set every time \sa authenticate is + * called so if you want to change or remove it call \sa setUsername again + * with empty string or \sa clearCredentials. + * + * @param username username to use + */ + void setUsername(const QString &username); + + /** + * Sets the password that will be used when authenticate is called + * + * The password will be automatically filled in the Google login + * form in the authentication widget. + * + * Be aware that the password will be set every time \sa authenticate is + * called so if you want to change or remove it call \sa setPassword again + * with empty string or \sa clearCredentials. + * + * @param password password to use + */ + void setPassword(const QString &password); + protected: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/job.cpp new/libkgapi-2.1.1/libkgapi2/job.cpp --- old/libkgapi-2.1.0/libkgapi2/job.cpp 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/job.cpp 2014-04-07 23:08:28.000000000 +0200 @@ -35,6 +35,7 @@ Job::Private::Private(Job *parent): isRunning(false), error(KGAPI2::NoError), + accessManager(0), maxTimeout(0), q(parent) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-2.1.0/libkgapi2/ui/authwidget_p.cpp new/libkgapi-2.1.1/libkgapi2/ui/authwidget_p.cpp --- old/libkgapi-2.1.0/libkgapi2/ui/authwidget_p.cpp 2014-03-01 18:30:47.000000000 +0100 +++ new/libkgapi-2.1.1/libkgapi2/ui/authwidget_p.cpp 2014-04-07 23:08:28.000000000 +0200 @@ -22,15 +22,16 @@ #include "accountinfo/accountinfofetchjob.h" #include "private/newtokensfetchjob_p.h" +#include <QtWebKit/QWebView> #include <QtWebKit/QWebFrame> #include <QtWebKit/QWebElement> +#include <QtNetwork/QNetworkProxy> #include <qjson/parser.h> #include <KDE/KUrl> #include <KDE/KLocalizedString> #include <KIO/AccessManager> -#include <KDE/KWebView> #include <QDateTime> @@ -71,7 +72,10 @@ progressbar->setValue(0); vbox->addWidget(progressbar); - webview = new KWebView(q); + webview = new QWebView(q); + KIO::AccessManager *m = new KIO::AccessManager(webview); + webview->page()->networkAccessManager()->setProxyFactory(m->proxyFactory()); + vbox->addWidget(webview); connect(webview, SIGNAL(loadProgress(int)), progressbar, SLOT(setValue(int))); connect(webview, SIGNAL(urlChanged(QUrl)), this, SLOT(webviewUrlChanged(QUrl))); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdbi-drivers for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package libdbi-drivers for openSUSE:Factory checked in at 2014-04-30 15:05:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbi-drivers (Old) and /work/SRC/openSUSE:Factory/.libdbi-drivers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdbi-drivers" Changes: -------- --- /work/SRC/openSUSE:Factory/libdbi-drivers/libdbi-drivers.changes 2014-02-11 10:30:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdbi-drivers.new/libdbi-drivers.changes 2014-04-30 15:05:52.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 17 14:57:46 UTC 2014 - jengelh(a)inai.de + +- Update to new git snapshot 0.9.0+git40 +* Support the new datetimex API from libdbi-0.9.0+git21 +* dbd_sqlite3: resolve a stack buffer overflow +- Remove sqlite3.diff, badcode.diff, libdl.diff: merged upstream + +------------------------------------------------------------------- Old: ---- badcode.diff libdbi-drivers-0.9.0.tar.gz libdl.diff sqlite3.diff New: ---- libdbi-drivers-0.9.0.g40.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbi-drivers.spec ++++++ --- /var/tmp/diff_new_pack.lzfW4B/_old 2014-04-30 15:05:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lzfW4B/_new 2014-04-30 15:05:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdbi-drivers # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,38 @@ # -%define libdbi_sover 1 Name: libdbi-drivers -Version: 0.9.0 +Version: 0.9.0.g40 +#Snapshot: libdbi-drivers-0.9.0-40-gb48dd7e Release: 0 Summary: Database drivers for libdbi License: LGPL-2.1+ -Group: System/Libraries -Url: http://libdbi-drivers.sf.net/ +Group: Productivity/Databases/Servers +URL: http://libdbi-drivers.sf.net/ -Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz -Patch1: sqlite3.diff -Patch2: badcode.diff -Patch3: libdl.diff +#Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz +Source: %name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext -BuildRequires: libdbi-devel +BuildRequires: libdbi-devel >= 0.9.0.g21 BuildRequires: libtool BuildRequires: mysql-devel BuildRequires: openjade BuildRequires: postgresql-devel +BuildRequires: sqlite2-devel BuildRequires: sqlite3-devel +BuildRequires: xz +%define build_doc 0 +%if %build_doc +# Only needed when doc is not already prebuilt +BuildRequires: docbook-dsssl-stylesheets +BuildRequires: openjade +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-jadetex +BuildRequires: texlive-pdftex-bin +%endif %description libdbi implements a database-independent abstraction layer in C, @@ -48,7 +57,6 @@ %package dbd-mysql Summary: MySQL driver for libdbi Group: System/Libraries -Requires: libdbi%{libdbi_sover} = %version %description dbd-mysql This driver provides connectivity to MySQL database servers through @@ -59,8 +67,6 @@ %package dbd-pgsql Summary: PostgreSQL driver for libdbi Group: System/Libraries -Requires: libdbi%{libdbi_sover} = %version -Requires: postgresql >= 7.0.3 %description dbd-pgsql This driver provides connectivity to PostgreSQL database servers @@ -68,26 +74,32 @@ a program's driver does not require recompilation or rewriting source code. +%package dbd-sqlite +Summary: SQLite (old) driver for libdbi +Group: System/Libraries + +%description dbd-sqlite +This driver provides connectivity to SQLite database servers through the +libdbi database independent abstraction layer. Switching a program's driver +does not require recompilation or rewriting source code. + %package dbd-sqlite3 Summary: SQLite3 driver for libdbi Group: System/Libraries -Requires: libdbi%{libdbi_sover} = %version -Requires: sqlite %description dbd-sqlite3 -This driver provides connectivity to SQLite database servers through the +This driver provides connectivity to SQLite 3.x database servers through the libdbi database independent abstraction layer. Switching a program's driver does not require recompilation or rewriting source code. %prep -%setup -q -%patch -P 1 -P 2 -P 3 -p1 +%setup -qn %name #ensure license doesn't have a executable permission chmod 644 COPYING # Fake the __DATE__ so we do not needelessly rebuild -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %_sourcedir/%name.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" drivers/*/*.c %build @@ -95,15 +107,15 @@ %configure \ --with-mysql \ --with-pgsql \ - --with-sqlite3 \ - --with-dbi-incdir=%_includedir/dbi \ - --with-dbi-libdir=%{_libdir} \ + --with-sqlite3 --with-sqlite \ + --with-dbi-incdir="%_includedir/dbi" \ + --with-dbi-libdir="%_libdir" \ --disable-static \ - --disable-docs + --docdir="%_docdir/%name" --disable-docs make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +make install DESTDIR="%buildroot" find "%buildroot" -type f -name "*.la" -delete %check @@ -112,19 +124,24 @@ %files dbd-mysql %defattr(-,root,root) %doc COPYING -%dir %{_libdir}/dbd -%{_libdir}/dbd/libdbdmysql.so +%dir %_libdir/dbd +%_libdir/dbd/libdbdmysql.so %files dbd-pgsql %defattr(-,root,root) %doc COPYING -%dir %{_libdir}/dbd -%{_libdir}/dbd/libdbdpgsql.so +%dir %_libdir/dbd +%_libdir/dbd/libdbdpgsql.so + +%files dbd-sqlite +%defattr(-,root,root) +%dir %_libdir/dbd +%_libdir/dbd/libdbdsqlite.so %files dbd-sqlite3 %defattr(-,root,root) %doc COPYING -%dir %{_libdir}/dbd -%{_libdir}/dbd/libdbdsqlite3.so +%dir %_libdir/dbd +%_libdir/dbd/libdbdsqlite3.so %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-04-30 15:05:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-04-14 06:49:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-04-30 15:05:46.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Apr 29 11:21:26 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Split out default cursors into separate oxygen-cursors4 package, + for allowing users they choose between cursors coming from + kdebase4-workspace and future Plasma Next releses + +------------------------------------------------------------------- +Fri Apr 25 19:54:22 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.11.9 + * Bugfix release +- Remove upstreamed patches + - screenlocker-always-show-password-dialog-when-needed.patch + - screenlocker-dont-leak-screensaver-processes.patch + - kdm-fix-resumption-from-console-mode.patch + +------------------------------------------------------------------- Old: ---- kde-workspace-4.11.8.tar.xz kdm-fix-resumption-from-console-mode.patch screenlocker-always-show-password-dialog-when-needed.patch screenlocker-dont-leak-screensaver-processes.patch New: ---- kde-workspace-4.11.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.02FWHf/_old 2014-04-30 15:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.02FWHf/_new 2014-04-30 15:05:47.000000000 +0200 @@ -19,7 +19,7 @@ %define with_multiseat 1 Name: kdebase4-workspace -Version: 4.11.8 +Version: 4.11.9 Release: 0 Summary: The KDE Workspace Components License: GPL-2.0+ @@ -103,8 +103,6 @@ # Patch is based on the changes within GDM to detect running plymouth # and issue a quit to the plymouth daemon Patch15: kdm_plymouth.patch -# PATCH-FIX-UPSTREAM kdm-fix-resumption-from-console-mode.patch (kde#312947, bnc#756198) -Patch16: kdm-fix-resumption-from-console-mode.patch ## Workspace patches # PATCH-FIX-OPENSUSE startkde.diff -- Injects branded startupconfigkeys to users $KDEHOME, and adds %datadir/kde4/env # to list of read enviroments @@ -141,12 +139,6 @@ Patch66: add-calculator-hotkey.patch # PATCH-FIX-OPENSUSE Remove the dependencies on strigi Patch67: remove_strigi.patch -# PATCH-FIX-UPSTREAM screenlocker-always-show-password-dialog-when-needed.patch -- password input dialog was not shown -# under certain circumstances (kde#327947, kde#329076, bnc#864305) -Patch68: screenlocker-always-show-password-dialog-when-needed.patch -# PATCH-FIX-UPSTREAM screenlocker-dont-leak-screensaver-processes.patch -- screensaver processes might keep running in -# background when unlocking the screen (kde#224200, bnc#809835) -Patch69: screenlocker-dont-leak-screensaver-processes.patch # Taken from fedora, additional changes resubmitted to fedora Patch71: kde-workspace-4.11.0-kdm-logind-multiseat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -166,6 +158,7 @@ Requires: xprop # The openSUSE-release package should always be installed, but just to make sure as that kinfocenter needs it Requires: distribution-release +Requires: socat Recommends: kdebase4-SuSE Recommends: kwin Recommends: plasma-addons @@ -184,6 +177,7 @@ Provides: kded-appmenu = %{version} Obsoletes: kded-appmenu < %{version} Requires: appmenu-qt > 0.2.0 +Requires: oxygen-cursors #Akonadi plasma engine is no longer provided Obsoletes: kdebase4-workspace-plasma-engine-akonadi < %{version} Provides: kdebase4-workspace-plasma-engine-akonadi = %{version} @@ -324,6 +318,15 @@ %description -n krandr KDE Screen management tools +%package -n oxygen-cursors4 +Summary: The KDE Workspace Cursors +Group: System/GUI/KDE +Provides: oxygen-cursors = %{version} + +%description -n oxygen-cursors4 +This package contains the default cursor set for a K Desktop Environment +workspace. + %prep %setup -q -n kde-workspace-%{version} ## KDM patches @@ -342,7 +345,6 @@ %patch13 %patch14 -p1 %patch15 -p1 -%patch16 -p1 ## Workspace patches %patch50 %patch51 @@ -360,8 +362,6 @@ %patch65 -p1 %patch66 -p1 %patch67 -p1 -%patch68 -p0 -%patch69 -p1 %if %{with_multiseat} %patch71 -p1 %endif @@ -617,13 +617,8 @@ %{_kde4_datadir}/autostart/ %{_kde4_datadir}/dbus-1/ %{_kde4_datadir}/polkit-1/ -%{_kde4_iconsdir}/Oxygen* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/* -%dir %{_kde4_iconsdir}/KDE_Classic -%dir %{_kde4_iconsdir}/KDE_Classic/cursors -%{_kde4_iconsdir}/KDE_Classic/* -%{_kde4_iconsdir}/KDE_Classic/cursors/* %{_kde4_libdir}/kconf_update_bin/ %{_kde4_libdir}/*.so %{_kde4_libdir}/*.so.* @@ -710,4 +705,10 @@ %exclude %{_kde4_servicesdir}/kded/randrmonitor.desktop %exclude %{_kde4_servicesdir}/randr.desktop +%files -n oxygen-cursors4 +%defattr(-,root,root) +%doc COPYING README +%{_kde4_iconsdir}/Oxygen_*/ +%{_kde4_iconsdir}/KDE_Classic/ + %changelog ++++++ kde-workspace-4.11.8.tar.xz -> kde-workspace-4.11.9.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.11.8.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.11.9.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flash-player for openSUSE:Factory:NonFree
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package flash-player for openSUSE:Factory:NonFree checked in at 2014-04-30 15:05:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/flash-player (Old) and /work/SRC/openSUSE:Factory:NonFree/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/flash-player/flash-player.changes 2014-04-11 13:28:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.flash-player.new/flash-player.changes 2014-04-30 15:05:40.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 15:34:46 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.356 (bnc#875577): + * APSB14-13, CVE-2014-0515 + +------------------------------------------------------------------- Old: ---- flashplayer_11.2.202.350_sa.i386.tar.gz install_flash_player_11.2.202.350_linux.i386.tar.gz install_flash_player_11.2.202.350_linux.x86_64.tar.gz New: ---- flashplayer_11.2.202.356_sa.i386.tar.gz install_flash_player_11.2.202.356_linux.i386.tar.gz install_flash_player_11.2.202.356_linux.x86_64.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flash-player.spec ++++++ --- /var/tmp/diff_new_pack.kBHsl7/_old 2014-04-30 15:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.kBHsl7/_new 2014-04-30 15:05:42.000000000 +0200 @@ -19,7 +19,7 @@ %define build_standalone 1 Name: flash-player -Version: 11.2.202.350 +Version: 11.2.202.356 Release: 0 Summary: Adobe Flash Plugin and Standalone Player License: SUSE-NonFree ++++++ flashplayer_11.2.202.350_sa.i386.tar.gz -> flashplayer_11.2.202.356_sa.i386.tar.gz ++++++ Files old/install_flash_player_linux_sa/flashplayer and new/install_flash_player_linux_sa/flashplayer differ ++++++ install_flash_player_11.2.202.350_linux.i386.tar.gz -> install_flash_player_11.2.202.356_linux.i386.tar.gz ++++++ /work/SRC/openSUSE:Factory:NonFree/flash-player/install_flash_player_11.2.202.350_linux.i386.tar.gz /work/SRC/openSUSE:Factory:NonFree/.flash-player.new/install_flash_player_11.2.202.356_linux.i386.tar.gz differ: char 5, line 1 ++++++ install_flash_player_11.2.202.350_linux.x86_64.tar.gz -> install_flash_player_11.2.202.356_linux.x86_64.tar.gz ++++++ /work/SRC/openSUSE:Factory:NonFree/flash-player/install_flash_player_11.2.202.350_linux.x86_64.tar.gz /work/SRC/openSUSE:Factory:NonFree/.flash-player.new/install_flash_player_11.2.202.356_linux.x86_64.tar.gz differ: char 5, line 1 ++++++ update.sh ++++++ --- /var/tmp/diff_new_pack.kBHsl7/_old 2014-04-30 15:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.kBHsl7/_new 2014-04-30 15:05:42.000000000 +0200 @@ -35,7 +35,7 @@ done sed -i -e "s,Version:.*,Version: $version," ../flash-player.spec ( cd ..; - osc vc -m "Security update to $version: (bnc#XXXXXX)" + osc vc -m "Security update to $version (bnc#XXXXXX):" ) fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit btrfsprogs for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2014-04-30 15:00:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2014-04-14 06:43:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2014-04-30 15:00:47.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 26 09:45:23 UTC 2014 - coolo(a)suse.com + +- own mkinitrd directories + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.dJPGYt/_old 2014-04-30 15:00:48.000000000 +0200 +++ /var/tmp/diff_new_pack.dJPGYt/_new 2014-04-30 15:00:48.000000000 +0200 @@ -159,6 +159,8 @@ %{_sbindir}/mkfs.btrfs %{_sbindir}/btrfs-debug-tree %{_sbindir}/btrfs-show-super +%dir /lib/mkinitrd +%dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-btrfs.sh /lib/mkinitrd/scripts/setup-btrfs.sh # other -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit translation-update-upstream for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package translation-update-upstream for openSUSE:Factory checked in at 2014-04-30 15:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/translation-update-upstream (Old) and /work/SRC/openSUSE:Factory/.translation-update-upstream.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "translation-update-upstream" Changes: -------- --- /work/SRC/openSUSE:Factory/translation-update-upstream/translation-update-upstream.changes 2013-03-22 12:08:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.translation-update-upstream.new/translation-update-upstream.changes 2014-04-30 15:00:45.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 25 09:58:27 UTC 2014 - schwab(a)linux-m68k.org + +- Only process PO header in msgheadermerge + +------------------------------------------------------------------- +Wed Apr 23 09:22:19 UTC 2014 - dmueller(a)suse.com + +- speed up msgheadermerge by factor 20-25 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ translation-update-upstream.spec ++++++ --- /var/tmp/diff_new_pack.bzQ80E/_old 2014-04-30 15:00:47.000000000 +0200 +++ /var/tmp/diff_new_pack.bzQ80E/_new 2014-04-30 15:00:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package translation-update-upstream # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ msgheadermerge ++++++ --- /var/tmp/diff_new_pack.bzQ80E/_old 2014-04-30 15:00:47.000000000 +0200 +++ /var/tmp/diff_new_pack.bzQ80E/_new 2014-04-30 15:00:47.000000000 +0200 @@ -10,8 +10,8 @@ RC=0 # Broken pipe is an expected behavior. Redirect stderr to /dev/null. -msgexec -i $1 $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null -msgexec -i $2 $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null +msggrep --force-po $1 | msgexec $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null +msggrep --force-po $2 | msgexec $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null # If --swap-plural-forms was used, use plural definition from the other header. if test "$6" = --old-plural-forms ; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2014-04-30 15:00:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2014-04-08 17:05:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2014-04-30 15:00:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 16 13:08:38 UTC 2014 - lnussel(a)suse.de + +- remove mkinitrd script for mtab + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20140407.618dd70.tar.xz New: ---- aaa_base-13.2+git20140416.19ef0a1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.duK4cS/_old 2014-04-30 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.duK4cS/_new 2014-04-30 15:00:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: aaa_base -Version: 13.2+git20140407.618dd70 +Version: 13.2+git20140416.19ef0a1 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -174,9 +174,6 @@ /etc/hushlogins %dir /lib/aaa_base /lib/aaa_base/convert_sysctl* -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/boot-mtab.sh /usr/bin/chkconfig /sbin/chkconfig /usr/bin/get_kernel_version ++++++ aaa_base-13.2+git20140407.618dd70.tar.xz -> aaa_base-13.2+git20140416.19ef0a1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20140407.618dd70/files/lib/mkinitrd/scripts/boot-mtab.sh new/aaa_base-13.2+git20140416.19ef0a1/files/lib/mkinitrd/scripts/boot-mtab.sh --- old/aaa_base-13.2+git20140407.618dd70/files/lib/mkinitrd/scripts/boot-mtab.sh 2014-04-07 16:18:41.000000000 +0200 +++ new/aaa_base-13.2+git20140416.19ef0a1/files/lib/mkinitrd/scripts/boot-mtab.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/bin/bash -# -#%stage: setup -#%programs: /bin/ln -#%modules: -#%dontshow - -if test -w /root/etc/ -a ! -L /root/etc/mtab ; then - echo "replacing /etc/mtab with symlink to /proc/self/mounts" - ln -sf /proc/self/mounts /root/etc/mtab -fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit screen for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package screen for openSUSE:Factory checked in at 2014-04-30 15:00:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screen (Old) and /work/SRC/openSUSE:Factory/.screen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "screen" Changes: -------- --- /work/SRC/openSUSE:Factory/screen/screen.changes 2014-04-22 07:35:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.screen.new/screen.changes 2014-04-30 15:00:40.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Apr 17 10:23:40 UTC 2014 - jw(a)suse.com + +- Update to 4.2.0 as released on screen-devel(a)gnu.org yesterday. + Thank you Amadeusz! + * keep libtinfo.diff (from coolo 2011, why exactly?) + * keep global_screenrc.patch (renamed from screen-4.0.2.dif) + * keep screen-man-loginshell.diff (to be upstreamed) + * dropped screen-__P.diff (not needed) + * keep term_too_long.diff (savannah#30880, to be upstreamed) + * keep use_locale.diff (from lnt-sysadmin(a)lists.lrz.de 2012, check?) + * keep screen-4.0.3-ipv6.patch (builtin telnet, to be upstreamed) + * keep screen_enhance_windows_list.patch (to be upstreamed) + * keep screen-poll-zombies.patch (to be upstreamed) + * keep xX_string_escape.patch (renamed from show_all_active.patch, to be upstreamed) + * keep sort_command.patch (from trenn 2011, to be upstreamed) + * added msg_version_3.patch (ouch, incompatible protocol, to be upstreamed) + +- added %rundir with /var/run for 1310 and before; but /run afterwards. + aj advocates /run for Factory; for 1310 it was banned by + suse-filelist-forbidden-fhs23 + +------------------------------------------------------------------- Old: ---- screen-4.0.2.dif screen-4.0.4.tar.gz screen-__P.diff show_all_active.patch New: ---- global_screenrc.patch msg_version_3.patch screen-4.2.0.tar.gz xX_string_escape.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screen.spec ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:42.000000000 +0200 @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1310 +%define rundir /run +%else +%define rundir /var/run +%endif + Url: http://www.gnu.org/software/screen/ Name: screen @@ -28,17 +34,18 @@ %else BuildRequires: utempter %endif +BuildRequires: autoconf +BuildRequires: automake PreReq: %install_info_prereq PreReq: coreutils -Version: 4.0.4 +Version: 4.2.0 Release: 0 Summary: A program to allow multiple screens on a VT100/ANSI Terminal License: GPL-2.0+ Group: System/Console Source: %{name}-%{version}.tar.gz Source1: screen.conf -Patch0: screen-4.0.2.dif -Patch1: screen-__P.diff +Patch0: global_screenrc.patch Patch2: screen-man-loginshell.diff Patch3: screen-4.0.3-ipv6.patch # upstream savannah#30880 @@ -47,8 +54,9 @@ Patch6: libtinfo.diff Patch9: use_locale.diff Patch10: screen-poll-zombies.patch -Patch11: show_all_active.patch +Patch11: xX_string_escape.patch Patch12: screen_enhance_windows_list.patch +Patch13: msg_version_3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,28 +68,49 @@ %prep %setup +# global_screenrc.patch %patch0 -%patch1 +# screen-man-loginshell.diff %patch2 -p1 +# screen-4.0.3-ipv6.patch %patch3 +# term_too_long.diff %patch4 -p1 +# sort_command.patch %patch5 +# libtinfo.diff %patch6 +# use_locale.diff %patch9 -p1 +# screen-poll-zombies.patch %patch10 -p1 +# xX_string_escape.patch %patch11 +# screen_enhance_windows_list.patch %patch12 +# msg_version_3.patch +%patch13 -p1 %build +sh ./autogen.sh + CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ --mandir=%{_mandir} \ - --with-socket-dir='(eff_uid ? "/run/uscreens" : "/run/screens")' \ + --with-socket-dir='(eff_uid ? "%rundir/uscreens" : "%rundir/screens")' \ --with-sys-screenrc=/etc/screenrc \ --with-pty-group=5 \ --enable-use-locale \ --enable-telnet \ --enable-colors256 \ --verbose + +# update Makefile so that make -j becomes reliable +:> osdef.h # so that make depend has a chance +:> comm.h # so that make depend has a chance +make depend # FIXME: this should be self sufficient. +rm osdef.h # so that make will use osdef.sh +rm comm.h # so that make will use comm.sh + make %{?_smp_mflags} %install @@ -92,10 +121,10 @@ mkdir -p $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/usr/lib mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d -mkdir -p $RPM_BUILD_ROOT/run/screens -chmod 755 $RPM_BUILD_ROOT/run/screens -mkdir -p $RPM_BUILD_ROOT/run/uscreens -chmod 1777 $RPM_BUILD_ROOT/run/uscreens +mkdir -p $RPM_BUILD_ROOT%rundir/screens +chmod 755 $RPM_BUILD_ROOT%rundir/screens +mkdir -p $RPM_BUILD_ROOT%rundir/uscreens +chmod 1777 $RPM_BUILD_ROOT%rundir/uscreens install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d @@ -108,8 +137,8 @@ /usr/lib/tmpfiles.d/screen.conf /usr/share/screen/utf8encodings # Created via aaa_base or systemd on system boot -%ghost %dir /run/screens -%ghost %dir /run/uscreens +%ghost %dir %rundir/screens +%ghost %dir %rundir/uscreens %doc %{_infodir}/screen.info*.gz %doc %{_mandir}/man1/screen.1.gz @@ -118,8 +147,8 @@ # Create our dirs immediatly, after a manual package install. # After a reboot systemd/aaa_base will take care. -test -d /run/screens || mkdir -m 755 /run/screens -test -d /run/uscreens || mkdir -m 1777 /run/uscreens +test -d %rundir/screens || mkdir -m 755 %rundir/screens +test -d %rundir/uscreens || mkdir -m 1777 %rundir/uscreens %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz ++++++ global_screenrc.patch ++++++ Index: screenrc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ screenrc 2011-11-21 15:47:46.649112381 +0100 @@ -0,0 +1,4 @@ +# this is the global screenrc file. Handle with care. + +termcapinfo xterm* G0:is=\E[?4l\E>:ti@:te@ +termcapinfo linux me=\E[m:AX ++++++ libtinfo.diff ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:42.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:42.000000000 +0200 @@ -11,18 +11,3 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, LIBS="-lncursesw $olibs" AC_CHECKING(libncursesw) ---- ./configure.orig 2012-06-11 14:43:37.000000000 +0000 -+++ ./configure 2012-06-11 14:45:41.000000000 +0000 -@@ -6296,9 +6296,9 @@ else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- LIBS="-ltermlib $olibs" --{ $as_echo "$as_me:$LINENO: checking libtermlib..." >&5 --$as_echo "$as_me: checking libtermlib..." >&6;} -+ LIBS="-ltinfo $olibs" -+{ $as_echo "$as_me:$LINENO: checking libtinfo..." >&5 -+$as_echo "$as_me: checking libtinfo..." >&6;} - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF ++++++ msg_version_3.patch ++++++ --- screen-4.2.0/screen.h 2014-04-16 23:38:41.000000000 +0200 +++ screen-4.2.0/screen.h.new 2014-04-17 12:13:38.014982957 +0200 @@ -182,8 +182,9 @@ * A few revisions after 8147d08 incorrectly * carried version 1, but should have carried 2. * 2: screen version 4.1.0devel (revisions 8b46d8a upto YYYYYYY) + * 3: screen version 4.2.0 (was incorrectly originally. Patched here) */ -#define MSG_VERSION 2 +#define MSG_VERSION 3 #define MSG_REVISION (('m'<<24) | ('s'<<16) | ('g'<<8) | MSG_VERSION) struct msg ++++++ screen-4.0.4.tar.gz -> screen-4.2.0.tar.gz ++++++ ++++ 15620 lines of diff (skipped) ++++++ screen-poll-zombies.patch ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:43.000000000 +0200 @@ -25,16 +25,6 @@ + { "zombie", ARGS_012 }, + { "zombie_timeout", ARGS_1 } }; ---- ./comm.h.dist.orig 2013-09-13 13:23:15.271279615 +0000 -+++ ./comm.h.dist 2013-09-13 13:23:44.198279564 +0000 -@@ -237,5 +237,6 @@ struct action - #define RC_XON 180 - #define RC_ZMODEM 181 - #define RC_ZOMBIE 182 -+#define RC_ZOMBIE_TIMEOUT 183 - --#define RC_LAST 182 -+#define RC_LAST 183 --- ./doc/screen.1.orig 2013-09-13 13:22:50.993279658 +0000 +++ ./doc/screen.1 2013-09-13 13:23:15.266279615 +0000 @@ -3547,6 +3547,15 @@ Optionally you can put the word \*Qonerr ++++++ use_locale.diff ++++++ --- /var/tmp/diff_new_pack.edf0tV/_old 2014-04-30 15:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.edf0tV/_new 2014-04-30 15:00:43.000000000 +0200 @@ -1,15 +1,3 @@ -diff -Pdpru a/configure b/configure ---- a/configure 2012-09-19 14:44:09.593017471 +0200 -+++ b/configure 2012-09-19 15:20:44.406073384 +0200 -@@ -1338,7 +1339,7 @@ Optional Features: - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-socket-dir disable system wide socket-dir and use ~/.screen instead - --enable-pam enable PAM support -- --enable-locale use localized month/day names -+ --enable-use-locale use localized month/day names - --enable-telnet enable builtin telnet - --enable-colors256 enable support for 256 colors - --enable-rxvt_osc enable support for rxvt OSC codes diff -Pdpru a/configure.in b/configure.in --- a/configure.in 2012-09-19 14:44:09.592017464 +0200 +++ b/configure.in 2012-09-19 15:21:45.555515336 +0200 ++++++ xX_string_escape.patch ++++++ screen: Introduce Xx string escape showing the executed command of a window either only the executed command ('X') or the whole command line ('x') of each window is shown. Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- ./doc/screen.1.orig 2013-09-13 13:26:28.055279274 +0000 +++ ./doc/screen.1 2013-09-13 13:26:41.385279250 +0000 @@ -3747,6 +3747,10 @@ window; with '+' qualifier: starting wit one. .IP W all window numbers and names except the current one +.IP x +the executed command including arguments running in this windows +.IP X +the executed command without arguments running in this windows .IP y last two digits of the year number .IP Y --- ./screen.c.orig 2013-09-13 13:26:28.057279274 +0000 +++ ./screen.c 2013-09-13 13:34:30.151278421 +0000 @@ -2693,6 +2693,20 @@ int rec; } p += strlen(p) - 1; break; + case 'X': case 'x': + *p = 0; + for (i = 0; win && win->w_cmdargs[i]; i++) + { + if (l < strlen(win->w_cmdargs[i]) + 1) + break; + sprintf(p, i ? "%s" : " %s", win->w_cmdargs[i]); + l -= strlen(p); + p += strlen(p); + if (i == 0 && *s == 'X') + break; + } + p--; + break; case 'l': #ifdef LOADAV *p = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-phpunit for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package php5-pear-phpunit for openSUSE:13.1:Update checked in at 2014-04-30 13:52:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/php5-pear-phpunit (Old) and /work/SRC/openSUSE:13.1:Update/.php5-pear-phpunit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='php5-pear-phpunit.2755' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-channel-symfony2.2755 for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package php5-pear-channel-symfony2.2755 for openSUSE:13.1:Update checked in at 2014-04-30 13:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/php5-pear-channel-symfony2.2755 (Old) and /work/SRC/openSUSE:13.1:Update/.php5-pear-channel-symfony2.2755.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-channel-symfony2.2755" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:13.1:Update/.php5-pear-channel-symfony2.2755.new/php5-pear-channel-symfony2.changes 2014-04-30 13:52:08.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Aug 4 11:45:28 UTC 2013 - robert.munteanu(a)gmail.com + +- Initial package + New: ---- channel.xml php5-pear-channel-symfony2.changes php5-pear-channel-symfony2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-channel-symfony2.spec ++++++ # # spec file for package php5-pear-channel-symfony2 # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define peardir %(pear config-get php_dir 2> /dev/null) %define pear_xmldir /var/lib/pear Name: php5-pear-channel-symfony2 Version: 1.0 Release: 0 Summary: Adds pear.symfony.com channel to PEAR License: MIT Group: Development/Libraries/PHP Url: http://pear.symfony.com/ Source0: http://pear.symfony.com/channel.xml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: php-pear Requires: php-pear %description This package adds the pear.symfony.com channel which allows PEAR packages from this channel to be installed. %prep %setup -q -c -T %build # Empty build section, nothing to build %install %{__mkdir_p} %{buildroot}%{pear_xmldir} %{__install} -pm 644 %{SOURCE0} %{buildroot}%{pear_xmldir}/pear.symfony.com.xml %clean %{__rm} -rf %{buildroot} %post if [ $1 -eq 1 ] ; then pear channel-add %{pear_xmldir}/pear.symfony.com.xml > /dev/null || : else pear channel-update %{pear_xmldir}/pear.symfony.com.xml > /dev/null ||: fi %postun if [ $1 -eq 0 ] ; then pear channel-delete pear.symfony-project.com > /dev/null || : fi %files %defattr(-,root,root,-) %{pear_xmldir}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.2752 for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package patchinfo.2752 for openSUSE:13.1:Update checked in at 2014-04-30 13:52:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.2752 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.2752.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.2752" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo incident="2752"> <category>recommended</category> <rating>low</rating> <packager>sax2</packager> <summary>kiwi: Updates package to version 5.05.59</summary> <description>This update fixes the following issue with kiwi: - v5.05.59 released - Fixed message logging * don't log message to already closed file descriptor - Removed done statement from last Kiwi message * The Done message at the last line was confusing, especially when KIWI exited with errors. To keep consistency and since the done message wasn't really needed because the last message is not a task it was also removed for the success messages. - Added runtime check for Boot description * The test looks up the required boot image description according to the selected build type. if no such description exists, the build exit with an error telling the user which rpm package is missing on the build machine</description> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package kiwi for openSUSE:13.1:Update checked in at 2014-04-30 13:52:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/kiwi (Old) and /work/SRC/openSUSE:13.1:Update/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.RHPgjW/_old 2014-04-30 13:52:03.000000000 +0200 +++ /var/tmp/diff_new_pack.RHPgjW/_new 2014-04-30 13:52:03.000000000 +0200 @@ -1 +1 @@ -<link package='kiwi.2676' cicount='copy' /> +<link package='kiwi.2752' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.2769 for openSUSE:13.1:NonFree:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package patchinfo.2769 for openSUSE:13.1:NonFree:Update checked in at 2014-04-30 10:00:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:NonFree:Update/patchinfo.2769 (Old) and /work/SRC/openSUSE:13.1:NonFree:Update/.patchinfo.2769.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.2769" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="875577" tracker="bnc">VUL-0: CVE-2014-0515: flash-player: buffer overflow vulnerability that leads to arbitrary code execution (APSB14-13)</issue> <issue id="CVE-2014-0515" tracker="cve" /> <category>security</category> <rating>critical</rating> <packager>sbrabec</packager> <description>This flash-player update fixes a critical buffer overflow vulnerability that leads to arbitrary code execution. The flash-player package was updated to version 11.2.202.356. * bnc#875577, APSB14-13, CVE-2014-0515 </description> <summary>update for flash-player</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flash-player for openSUSE:13.1:NonFree:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package flash-player for openSUSE:13.1:NonFree:Update checked in at 2014-04-30 10:00:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:NonFree:Update/flash-player (Old) and /work/SRC/openSUSE:13.1:NonFree:Update/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.RCAmZj/_old 2014-04-30 10:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.RCAmZj/_new 2014-04-30 10:00:34.000000000 +0200 @@ -1 +1 @@ -<link package='flash-player.2732' cicount='copy' /> +<link package='flash-player.2769' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flash-player.2769 for openSUSE:13.1:NonFree:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package flash-player.2769 for openSUSE:13.1:NonFree:Update checked in at 2014-04-30 10:00:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:NonFree:Update/flash-player.2769 (Old) and /work/SRC/openSUSE:13.1:NonFree:Update/.flash-player.2769.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player.2769" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:13.1:NonFree:Update/.flash-player.2769.new/flash-player.changes 2014-04-30 10:00:33.000000000 +0200 @@ -0,0 +1,565 @@ +------------------------------------------------------------------- +Tue Apr 29 15:34:46 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.356 (bnc#875577): + * APSB14-13, CVE-2014-0515 + +------------------------------------------------------------------- +Thu Apr 10 13:45:36 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.350: (bnc#872692) + * APSB14-09, CVE-2014-0506, CVE-2014-0507, CVE-2014-0508, + CVE-2014-0509 + +------------------------------------------------------------------- +Wed Mar 12 16:37:21 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.346: (bnc#867808) + * APSB14-08, CVE-2014-0503, CVE-2013-0504 + +------------------------------------------------------------------- +Fri Feb 21 18:25:14 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.341: (bnc#865021) + * APSB14-07, CVE-2014-0498 CVE-2014-0499 CVE-2014-0502 +- Contents of flashplayer_11_sa.i386.tar.gz changed back: + spec file updated, supplementary script (update.sh) updated. + +------------------------------------------------------------------- +Wed Feb 5 18:45:51 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.336: (bnc#862288) + * APSB14-04, CVE-2014-0497 +- Contents of flashplayer_11_sa.i386.tar.gz changed: + spec file updated, supplementary script (update.sh) updated. + +------------------------------------------------------------------- +Wed Jan 15 19:12:15 UTC 2014 - sbrabec(a)suse.com + +- Security update to 11.2.202.335: (bnc#858822) + * APSB14-02, CVE-2014-0491, CVE-2014-0492 + +------------------------------------------------------------------- +Thu Dec 12 18:07:46 UTC 2013 - sbrabec(a)suse.com + +- Security update to 11.2.202.332: (bnc#854881) + * APSB13-28, CVE-2013-5331, CVE-2013-5332 + * Prevents possible remote code execution! + +------------------------------------------------------------------- +Wed Nov 13 19:51:26 UTC 2013 - sbrabec(a)suse.com + +- Security update to 11.2.202.327: (bnc#850220) + * APSB13-26, CVE-2013-5329, CVE-2013-5330 +- Supplementary script (update.sh) update: + * Update to the new web pages layout. + * Use original .tar.gz files released by Adobe. + +------------------------------------------------------------------- +Thu Sep 12 16:27:37 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.310: (bnc#839897) + * APSB13-21, CVE-2013-3361, CVE-2013-3362, CVE-2013-3363, + CVE-2013-5324 + +------------------------------------------------------------------- +Wed Jul 10 14:37:53 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.297: (bnc#828810) + * APSB13-17, CVE-2013-3344, CVE-2013-3345, CVE-2013-3347 + +------------------------------------------------------------------- +Wed Jun 12 14:17:57 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.291: (bnc#824512) + * APSB13-16, CVE-2013-3343 + +------------------------------------------------------------------- +Wed May 15 07:50:58 UTC 2013 - burnus(a)net-b.de + +- Update to 11.2.202.285: (bnc#819916) + * CVE-2013-2728, CVE-2013-3324, CVE-2013-3325, CVE-2013-3326, + CVE-2013-3327, CVE-2013-3328, CVE-2013-3329, CVE-2013-3330, + CVE-2013-3331, CVE-2013-3332, CVE-2013-3333, CVE-2013-3334, + CVE-2013-3335 + +------------------------------------------------------------------- +Wed Apr 10 13:19:35 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.280: (bnc#814635) + * APSB13-11, CVE-2013-1378, CVE-2013-1379, CVE-2013-1380, + CVE-2013-2555 + +------------------------------------------------------------------- +Thu Mar 14 11:01:08 UTC 2013 - burnus(a)net-b.de + +- Use "Licence: SUSE-NonFree" in the spec file. + +------------------------------------------------------------------- +Tue Mar 12 17:42:12 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.275: (bnc#808973) + * APSB13-09, CVE-2013-0646, CVE-2013-0650, CVE-2013-1371, + CVE-2013-1375 + +------------------------------------------------------------------- +Wed Feb 27 16:06:23 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.273: (bnc#806415) + * APSB13-08, CVE-2013-0504, CVE-2013-0643, CVE-2013-0648 + +------------------------------------------------------------------- +Wed Feb 13 14:12:17 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.270: (bnc#803485) + * APSB13-05, CVE-2013-1372, CVE-2013-0645, CVE-2013-1373, + CVE-2013-1369, CVE-2013-1370, CVE-2013-1366, CVE-2013-0649, + CVE-2013-1365, CVE-2013-1374, CVE-2013-1368, CVE-2013-0642, + CVE-2013-0644, CVE-2013-0647, CVE-2013-1367, CVE-2013-0639, + CVE-2013-0638, CVE-2013-0637 + +------------------------------------------------------------------- +Fri Feb 8 14:30:11 UTC 2013 - sbrabec(a)suse.com + +- Update to 11.2.202.262: (bnc#802809) + * APSB13-04, CVE-2013-0633, CVE-2013-0634 + +------------------------------------------------------------------- +Wed Jan 9 07:30:35 UTC 2013 - dmueller(a)suse.com + +- Update to 11.2.202.261: (bnc#797442) + * CVE-2013-0630 + +------------------------------------------------------------------- +Wed Dec 12 09:59:37 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.258: (bnc#794062): + * CVE-2012-5676, CVE-2012-5677, CVE-2012-5678 + +------------------------------------------------------------------- +Tue Nov 6 17:31:27 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.251 (bnc#788450): + * CVE-2012-5274, CVE-2012-5275, CVE-2012-5276, CVE-2012-5277, + CVE-2012-5278, CVE-2012-5279, CVE-2012-5280 + +------------------------------------------------------------------- +Tue Oct 9 05:49:34 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.243: (bnc#784168) + * CVE-2012-5248, CVE-2012-5249, CVE-2012-5250, CVE-2012-5251, + CVE-2012-5252, CVE-2012-5253, CVE-2012-5254, CVE-2012-5255, + CVE-2012-5256, CVE-2012-5257, CVE-2012-5258, CVE-2012-5259, + CVE-2012-5260, CVE-2012-5261, CVE-2012-5262, CVE-2012-5263, + CVE-2012-5264, CVE-2012-5265, CVE-2012-5266, CVE-2012-5267, + CVE-2012-5268, CVE-2012-5269, CVE-2012-5270, CVE-2012-5271, + CVE-2012-5272 + +------------------------------------------------------------------- +Wed Aug 15 10:16:23 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.238: (bnc#775986): + * CVE-2012-1535 + +------------------------------------------------------------------- +Fri Jun 8 21:19:04 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.236: (bnc#766241) + * CVE-2012-2034, CVE-2012-2035, CVE-2012-2036, CVE-2012-2037, + CVE-2012-2038, CVE-2012-2039, CVE-2012-2040) +- remove mms.cfg again, causes crashes for many users (bnc#761975) + +------------------------------------------------------------------- +Fri May 4 17:02:40 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.235: (bnc#760777) + * CVE-2012-0779 + +------------------------------------------------------------------- +Wed Apr 25 18:02:27 UTC 2012 - anixx(a)opensuse.org + +- add file mms.cfg to fix inverted colors when using nvidia drivers + (bnc#758645) + +------------------------------------------------------------------- +Tue Apr 17 10:55:54 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.233: (bnc#757428): + * This release addresses a printing issue that was found + in the previous version of Flash Player. + +------------------------------------------------------------------- +Thu Mar 29 07:58:44 UTC 2012 - dmueller(a)suse.com + +- Update to 11.2.202.228: (bnc#754689) + http://www.adobe.com/support/security/bulletins/apsb12-07.html + + * CVE-2012-0773 ++++ 368 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:NonFree:Update/.flash-player.2769.new/flash-player.changes New: ---- LICENSE README desktop.diff flash-player.changes flash-player.spec flashplayer.desktop flashplayer.png flashplayer_11.1.102.55_sa.x86_64.tar.bz2 flashplayer_11.2.202.356_sa.i386.tar.gz install_flash_player_11.2.202.356_linux.i386.tar.gz install_flash_player_11.2.202.356_linux.x86_64.tar.gz kcm_adobe_flash_player.desktop.patch mms.cfg update.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flash-player.spec ++++++ # # spec file for package flash-player # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define build_standalone 1 Name: flash-player Version: 11.2.202.356 Release: 0 Summary: Adobe Flash Plugin and Standalone Player License: SUSE-NonFree Group: Productivity/Networking/Web/Browsers Url: http://get.adobe.com/flashplayer/ %ifarch %ix86 Source0: install_flash_player_%{version}_linux.i386.tar.gz Source1: flashplayer_%{version}_sa.i386.tar.gz %endif %ifarch x86_64 Source0: install_flash_player_%{version}_linux.x86_64.tar.gz Source1: flashplayer_11.1.102.55_sa.x86_64.tar.bz2 %endif Source2: LICENSE Source3: README Source4: flashplayer.desktop Source5: flashplayer.png Source6: mms.cfg Source99: update.sh NoSource: 99 # PATCH-FIX-OPENSUSE desktop.diff -- Fix desktop file to be GNOME compatible Patch0: desktop.diff # PATCH-FIX-OPENSUSE kcm_adobe_flash_player.desktop.patch asterios.dramis(a)gmail.com -- Make the KCM module X-KDE-System-Settings-Parent-Category entry compatible with newer KDE versions Patch1: kcm_adobe_flash_player.desktop.patch %if 0%{?suse_version} > 1100 BuildRequires: kde4-filesystem %endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # flash player dynamically opens that one and segfaults if not available (2008-11-12) %ifarch %ix86 Requires: libasound.so.2 Requires: libcurl.so.4 %endif %ifarch x86_64 Requires: libasound.so.2()(64bit) Requires: libcurl.so.4()(64bit) %endif Provides: flash-plugin = %{version} %if 0%{?suse_version} >= 1110 # flash 10 does not need libflashsupport and using it can cause device conflicts # just let flash talk with the default alsa plugin - bnc#539656 Provides: libflashsupport = 1.2 Obsoletes: libflashsupport <= 1.2 %ifarch x86_64 Provides: libflashsupport-32bit = 1.2 Obsoletes: libflashsupport-32bit <= 1.2 %endif %endif Provides: netscape-plugins Obsoletes: netscape-plugins BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 %if 0%{!?_kde4_libdir:1} %define _kde4_libdir %{_libdir} %endif %if 0%{!?_kde4_datadir:1} %define _kde4_datadir %{_datadir} %endif %if 0%{!?_kde4_sharedir:1} %define _kde4_sharedir %{_kde4_datadir}/kde4 %endif %if 0%{!?_kde4_modulesdir:1} %define _kde4_modulesdir %{_kde4_libdir}/kde4 %endif %if 0%{!?_kde4_servicesdir:1} %define _kde4_servicesdir %{_kde4_sharedir}/services %endif %description This package contains Adobe's Flash Plugin for the supported Web browsers in addition to a standalone flash player application. %if 0%{?suse_version} > 1100 %package gnome Summary: Adobe Flash Plugin and Standalone Player Settings Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} Supplements: packageand(gnome-session:flash-player) %description gnome This package contains Adobe's Flash Plugin Settings for the GNOME desktop. %package kde4 Summary: Adobe Flash Plugin and Standalone Player Settings Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} Supplements: packageand(kdebase4-session:flash-player) %kde4_runtime_requires %description kde4 This package contains Adobe's Flash Plugin Settings for the KDE 4 desktop. %endif %prep %setup -q -c %{name}-%{version} -a 0 -b 1 %patch0 %patch1 cp %{SOURCE2} . cp %{SOURCE3} . %build %install install -Dpm 0755 libflashplayer.so %{buildroot}%{_libdir}/browser-plugins/libflashplayer.so # bnc#761975 #install -m 644 -D %{SOURCE6} %{buildroot}/etc/adobe/mms.cfg mkdir -p %{buildroot}%{_datadir}/icons rm -rf usr/share/icons/hicolor/24x24 %if 0%{?suse_version} <= 1100 rm -rf usr/share/icons/hicolor/*/apps/flash-player-properties.png %endif cp -a usr/share/icons/* %{buildroot}%{_datadir}/icons %if 0%{?suse_version} > 1100 # KDE frontend install -Dpm 0755 usr/%{_lib}/kde4/kcm_adobe_flash_player.so %{buildroot}%{_kde4_modulesdir}/kcm_adobe_flash_player.so install -Dpm 0644 usr/share/kde4/services/kcm_adobe_flash_player.desktop %{buildroot}%{_kde4_servicesdir}/kcm_adobe_flash_player.desktop # GNOME frontend install -Dpm 0755 usr/bin/flash-player-properties %{buildroot}%{_bindir}/flash-player-properties install -Dpm 0644 usr/share/applications/flash-player-properties.desktop %{buildroot}%{_datadir}/applications/flash-player-properties.desktop %endif %if %build_standalone %if 0%{?suse_version} > 1030 %ifarch %ix86 install -Dpm 0755 install_flash_player_linux_sa/flashplayer %{buildroot}%{_bindir}/flashplayer install -Dpm 0644 %{SOURCE4} %{buildroot}%{_datadir}/applications/flashplayer.desktop install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/flashplayer.png %suse_update_desktop_file flashplayer %endif %endif %endif %if 0%{?suse_version} > 1100 %suse_update_desktop_file flash-player-properties %endif %files %defattr(-,root,root,-) %doc [Rr][eE][aA][dD][Mm][eE]* LICENSE %{_libdir}/browser-plugins/libflashplayer.so #/etc/adobe/mms.cfg #%dir /etc/adobe %if 0%{?suse_version} > 1020 %{_datadir}/icons/hicolor/*x*/apps/flash-player-properties.png %endif %if %build_standalone %if 0%{?suse_version} > 1030 %ifarch %ix86 %{_bindir}/flashplayer %{_datadir}/applications/flashplayer.desktop %{_datadir}/pixmaps/flashplayer.png %endif %endif %endif %if 0%{?suse_version} > 1100 %files gnome %defattr(-,root,root,-) %{_bindir}/flash-player-properties %{_datadir}/applications/flash-player-properties.desktop %files kde4 %defattr(-,root,root,-) %{_kde4_modulesdir}/kcm_adobe_flash_player.so %{_kde4_servicesdir}/kcm_adobe_flash_player.desktop %endif %changelog ++++++ LICENSE ++++++ ADOBE SYSTEMS INCORPORATED Personal Computer Software License Agreement 1. WARRANTY DISCLAIMER, BINDING AGREEMENT AND ADDITIONAL TERMS AND AGREEMENTS. 1.1 WARRANTY DISCLAIMER. THE SOFTWARE AND OTHER INFORMATION IS DELIVERED TO YOU “AS IS” AND WITH ALL FAULTS. ADOBE, ITS SUPPLIERS AND CERTIFICATION AUTHORITIES DO NOT AND CANNOT WARRANT THE PERFORMANCE OR RESULTS YOU MAY OBTAIN BY USING THE SOFTWARE, CERTIFICATE AUTHORITY SERVICES OR OTHER THIRD PARTY OFFERINGS. EXCEPT TO THE EXTENT ANY WARRANTY, CONDITION, REPRESENTATION OR TERM CANNOT OR MAY NOT BE EXCLUDED OR LIMITED BY LAW APPLICABLE TO YOU IN YOUR JURISDICTION, ADOBE AND ITS SUPPLIERS AND CERTIFICATION AUTHORITIES MAKE NO WARRANTIES CONDITIONS, REPRESENTATIONS, OR TERMS (EXPRESS OR IMPLIED WHETHER BY STATUTE, COMMON LAW, CUSTOM, USAGE OR OTHERWISE) AS TO ANY MATTER INCLUDING WITHOUT LIMITATION NONINFRINGEMENT OF THIRD PARTY RIGHTS, MERCHANTABILITY, INTEGRATION, SATISFACTORY QUALITY, OR FITNESS FOR ANY PARTICULAR PURPOSE. THE PROVISIONS OF SECTIONS 1.1 AND 10 SHALL SURVIVE THE TERMINATION OF THIS AGREEMENT, HOWSOEVER CAUSED, BUT THIS SHALL NOT IMPLY OR CREATE ANY CONTINUED RIGHT TO USE THE SOFTWARE AFTER TERMINATION OF THIS AGREEMENT. 1.2 BINDING AGREEMENT: By using, copying or distributing all or any portion of the Adobe Software, you accept all the terms and conditions of this agreement, including, in particular, the provisions on: - Use (Section 3); - Transferability (Section 5); - Connectivity and Privacy (Section 7), including: - Updating, - Local Storage, - Settings Manager, - Peer Assisted Networking Technology, - Content Protection Technology, and - Use of Adobe Online Services; - Warranty Disclaimer (Section 1.1), and; - Liability Limitations (Sections 10 and 17). Upon acceptance, this agreement is enforceable against you and any entity that obtained the Software and on whose behalf it is used. If you do not agree, do not Use the Software. 1.3 http://www.adobe.com/go/thirdparty. Such other terms and conditions will supersede all or portions of this agreement in the event of a conflict with the terms and conditions of this agreement. ADDITIONAL TERMS AND AGREEMENTS. Adobe permits you to Use the Software only in accordance with the terms of this agreement. Use of some third party materials included in the Software may be subject to other terms and conditions typically found in a separate license agreement, a “Read Me” file located near such materials or in the “Third Party Software Notices and/or Additional Terms and Conditions” found at 2. Definitions. “Adobe” means Adobe Systems Incorporated, a Delaware corporation, 345 Park Avenue, San Jose, California 95110, if subsection 12(a) of this agreement applies; otherwise it means Adobe Systems Software Ireland Limited, 4-6 Riverwalk, Citywest Business Campus, Dublin 24, Ireland, a company organized under the laws of Ireland and an affiliate and licensee of Adobe Systems Incorporated. “Compatible Computer” means a Computer that conforms to the system requirements of the Software as specified in the Documentation. “Computer” means a virtual machine or physical personal electronic device that accepts information in digital or similar form and manipulates it for a specific result based on a sequence of instructions. “Personal Computer” or “PC” shall mean a hardware product which is designed and marketed with the primary purpose of operating a wide variety of productivity, entertainment, and other software applications provided by unrelated third party software vendors, which operates depending upon the use of a full function and full feature set computer operating system of the type(s) then in widespread use with hardware to operate general purpose laptop, desktop, server and large format tablet microprocessor based computers. This definition of Personal Computer shall exclude hardware products that are designed and/or marketed to have as their primary purpose any number of the following: television, television receiver, portable media player, audio/video receiver, radio, audio headphone, audio speaker, personal digital assistant (“PDA”), telephone or similar telephony based device, game console, personal video recorder (“PVR”), player for digital versatile disc (“DVD”) or other optical media, video camera, still camera, camcorder, video editing and format conversion device, video image projection device, and shall further exclude any similar type of consumer, professional or industrial device. “Software” means (a) all of the contents of the files (delivered electronically or on physical media), or disk(s) or other media with which this agreement is provided, which may include (i) Adobe or third party computer information or software, including Adobe Reader® (“Adobe Reader”), Adobe® AIR® (“Adobe AIR”), Adobe Flash® Player, Shockwave® Player and Authorware® Player (collectively, Adobe AIR and the Flash, Shockwave and Authorware players are the “Adobe Runtimes”); (ii) related explanatory written materials or files (“Documentation”); and (iii) fonts; and (b) upgrades, modified versions, updates, additions, and copies of the foregoing, provided to you by Adobe at any time (collectively, “Updates”). “Use” means to access, install, download, copy, or otherwise benefit from using the functionality of the Software. 3. Software License. If you obtained the Software from Adobe or one of its authorized licensees, and subject to your compliance with the terms of this agreement, including the restrictions in Section 4, Adobe grants to you a non-exclusive license to Use the Software in the manner and for the purposes described in the Documentation as follows: 3.1 General Use. You may install and Use one copy of the Software on your Compatible Computer. See Section 4 for important restrictions on the Use of the Software. 3.2 Server Use. This agreement does not permit you to install or Use the Software on a computer file server. For information on Use of Software on a computer file server please refer to http://www.adobe.com/go/acrobat_distribute for information about Adobe Reader; or http://www.adobe.com/go/licensing for information about the Adobe Runtimes. 3.3 Distribution. This license does not grant you the right to sublicense or distribute the Software. For information about obtaining the right to distribute the Software on tangible media or through an internal network or with your product or service please refer to http://www.adobe.com/go/acrobat_distribute for information about Adobe Reader; or http://www.adobe.com/go/licensing for information about the Adobe Runtimes. 3.4 Backup Copy. You may make one backup copy of the Software, provided your backup copy is not installed or used other than for archival purposes. You may not transfer the rights to a backup copy unless you transfer all rights in the Software as provided under Section 5. 4. Obligations and Restrictions. 4.1 Adobe Runtime Restrictions. You will not Use any Adobe Runtime on any non-PC device or with any embedded or device version of any operating system. For the avoidance of doubt, and by example only, you may not Use an Adobe Runtime on any (a) mobile device, set top box (STB), handheld, phone, game console, TV, DVD player, media center (other than with Windows XP Media Center Edition and its successors), electronic billboard or other digital signage, Internet appliance or other Internet-connected device, PDA, medical device, ATM, telematic device, gaming machine, home automation system, kiosk, remote control device, or any other consumer electronics device, (b) operator-based mobile, cable, satellite, or television system or (c) other closed system device. No right or license to Use any Adobe Runtime is granted for such prohibited uses. For information on Software license terms for non-PC versions of Adobe Runtimes please visit 4.1.1 AVC Video Restrictions. The Software may contain h.264/AVC video technology, the use of which requires the following notice from MPEG-LA, L.L.C.: THIS SOFTWARE IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL AND NON-COMMERCIAL USE OF A CONSUMER TO (I) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD (“AVC VIDEO”) AND/OR (II) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND NONCOMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE http://www.mpegla.com. 4.2 Adobe Flash Player Restrictions. You will not use Adobe Flash Player with any application or device that circumvents technological measures for the protection of video, audio, and/or data content, including any of Adobe’s secure RTMP measures. No right or license to use Adobe Flash Player is granted for such prohibited uses. 4.3 Adobe Reader Restrictions. 4.3.1 Conversion Restrictions. You will not integrate or use Adobe Reader with any other software, plug-in or enhancement that uses or relies upon Adobe Reader when converting or transforming PDF files into a different format (e.g., a PDF file into a TIFF, JPEG, or SVG file). 4.3.2 Plug-in Restrictions. You will not integrate or use Adobe Reader with any plug-in software not developed in accordance with the Adobe Integration Key License Agreement, more information can be found at http://www.adobe.com/devnet/reader/ikla.html. 4.3.3 Disabled Features. Adobe Reader may contain features or functionalities that are hidden or appear disabled or “grayed out” (the “Disabled Features”). Disabled Features will activate only when opening a PDF document that was created using enabling technology available only from Adobe. You will not access, or attempt to access, any Disabled Features other than through the use of such enabling technologies, nor will you rely on Adobe Reader to create a feature substantially similar to any Disabled Feature or otherwise circumvent the technology that controls activation of any such feature. For more information on disabled features, please refer to http://www.adobe.com/go/readerextensions. 4.4 Notices. You shall not alter or remove any copyright or other proprietary notice that appears on or in the Software. 4.5 No Modification or Reverse Engineering. You shall not modify, adapt, translate or create derivative works based upon the Software. You shall not reverse engineer, decompile, disassemble, or otherwise attempt to discover the source code of the Software. If you are located in the European Union, please refer to the additional terms at the end of this agreement under the header “European Union Provisions,” in Section 16. 5. Transfer. You may not rent, lease, sublicense, assign, or transfer your rights in the Software, or authorize all or any portion of the Software to be copied onto another user’s Computer except as may be expressly permitted by this agreement. You may, however, transfer all your rights to Use the Software to another person or legal entity provided that: (a) you also transfer (i) this agreement, and (ii) the Software and all other software or hardware bundled or pre-installed with the Software, including all copies, Updates, and prior versions, to such person or entity, (b) you retain no copies, including backups and copies stored on a Computer, and (c) the receiving party accepts the terms and conditions of this agreement and any other terms and conditions upon which you obtained a valid license to the Software. Notwithstanding the foregoing, you may not transfer education, pre-release, or not for resale copies of the Software. 6. Intellectual Property Ownership, Reservation of Rights. The Software and any authorized copies that you make are the intellectual property of Adobe and its suppliers. The structure, organization and code of the Software are the valuable intellectually property (e.g. trade secrets and confidential information) of Adobe and its suppliers. The Software is protected by law, including without limitation the copyright laws of the United States and other countries, and by international treaty provisions. Except as expressly stated herein, this agreement does not grant you any intellectual property rights in the Software and all rights not expressly granted are reserved by Adobe and its suppliers. 7. Connectivity and Privacy. You acknowledge and agree to the following: 7.1 Use of PDF Files. When you Use the Software to open a PDF file that has been enabled to display ads, your Computer may connect to a website operated by Adobe, an advertiser, or other third party. Your Internet Protocol address (“IP Address”) is sent when this happens. The party hosting the site may use technology to send (or “serve”) advertising or other electronic content that appears in or near the opened PDF file. The website operator may also use JavaScript, web beacons (also known as action tags or single-pixel gifs), and other technologies to increase and measure the effectiveness of advertisements and to personalize advertising content. Your communication with Adobe websites is governed by the Adobe Online Privacy Policy found at http://www.adobe.com/go/privacy (“Adobe Online Privacy Policy”). Adobe may not have access to or control over features that a third party may use, and the information practices of third party websites are not covered by the Adobe Online Privacy Policy. 7.2 Updating. If your Computer is connected to the Internet, the Software may, without additional notice, check for Updates that are available for automatic download and installation to your Computer and let Adobe know the Software is successfully installed. For Reader, Updates may be automatically downloaded but not installed without additional notice unless you change your preferences to accept automatic installation. Only non-personally identifying information is transmitted to Adobe when this happens, except to the extent that IP Addresses may be considered personally identifiable in some jurisdictions. The use of such information, including your IP Address, as provided by the auto update process is governed by the Adobe Online Privacy Policy. Please consult the Documentation for information about changing default update settings, or online at for Flash Player, http://acrobatsupport.com/turning-off-the-acrobat-updater (or successor website) for Reader, and http://kb2.adobe.com/cps/403/kb403175.html and http://airdownload.adobe.com/air/applications/SettingsManager/SettingsManag… for Adobe AIR. http://www.adobe.com/go/settingsmanager 7.3 Local Storage. Flash Player and Adobe AIR may allow third parties to store certain information on your Computer in a local data file known as a local shared object. The type and amount of information that the third party application requests to be stored in a local shared object can vary by application and such requests are solely controlled by the third party. You can find more information on local shared objects at http://www.adobe.com/go/flashplayer_security. For more information on how to limit or control the storage of local shared objects on your Computer, please visit http://www.adobe.com/go/settmgr_storage_en. 7.4 Settings Manager. Flash Player and Adobe AIR may cause certain user settings to be stored on your Computer as a local shared object. These settings are associated with the instance of Flash Player or Adobe AIR on your Computer, but do not contain personally identifiable information associated with you, and allow you to configure certain settings within the Flash Player including the ability to limit third parties from storing local shared objects. You can find more information on how to configure your version of Flash Player or Adobe AIR, including how to disable local shared objects in the Settings Manager for Flash Player, at http://www.adobe.com/go/settingsmanager, or http://airdownload.adobe.com/air/applications/SettingsManager/SettingsManag… for Adobe AIR. 7.5 Peer Assisted Networking Technology. Adobe Flash Player and Adobe AIR runtimes provide the ability for applications built by third parties to connect to an Adobe Server or Service and permit direct communication between two Adobe Runtime clients or to connect an Adobe Runtime client as part of a peer or distributed network that allows a portion of your resources, such as network bandwidth, to be made directly available to other participants. Prior to joining such peer or distributed network, you will be provided with the opportunity to accept such connectivity. To manage Peer Assisted Networking settings, please go to the Settings Manager at http://www.adobe.com/go/settmgr_networking_en. You can find more information on Peer Assisted Networking at http://www.adobe.com/go/RTMFP. 7.6 Content Protection Technology. If you Use the Adobe Runtimes to access content that has been protected with Adobe Flash Media Rights Management Server or Flash Access software (“Content Protection”), in order to let you play the protected content, the Software may automatically request media usage rights and individualization rights from a rights server on the Internet, and may download and install required components of the Software, including any available Content Protection Updates. You can find more information on Content Protection at http://www.adobe.com/go/protected_content. 7.7 Use of Adobe Online Services. If your Computer is connected to the Internet, the Software may, without additional notice and on an intermittent or regular basis, facilitate your access to content and services that are hosted on websites maintained by Adobe or its affiliates (“Adobe Online Services”). Examples of such Adobe Online Services might include, but are not limited to: Acrobat.com. In some cases an Adobe Online Service might appear as a feature or extension within the Software even though it is hosted on a website. In some cases, access to an Adobe Online Service might require a separate subscription or other fee in order to access it, and/or your assent to additional terms of use. Adobe Online Services might not be available in all languages or to residents of all countries and Adobe may, at any time and for any reason, modify or discontinue the availability of any Adobe Online Service. Adobe also reserves the right to begin charging a fee for access to or use of an Adobe Online Service that was previously offered at no charge. If your Computer is connected to the Internet, the Software may, without additional notice, update downloadable materials from these Adobe Online Services so as to provide immediate availability of these Adobe Online Services even when you are offline. When the Software connects to the Internet, no personally identifiable information is sent except to the extent that IP Addresses may be considered personally identifiable in some jurisdictions. Notwithstanding the foregoing, if you sign on to Acrobat.com your user name and password may be sent to Adobe’s servers and stored by Adobe in accordance with the Acrobat.com Additional Terms of Use. Whenever the Software makes an Internet connection and communicates with an Adobe website, whether automatically or due to explicit user request, the Adobe Online Privacy Policy shall apply. Additionally, unless you are provided with separate terms of use at that time, the Adobe.com Terms of Use (http://www.adobe.com/go/terms) shall apply. Please note that the Adobe Privacy Policy allows tracking of website visits and it addresses in detail the topic of tracking and use of cookies, web beacons and similar devices. 8. Third Party Offerings. You acknowledge and agree to the following: 8.1 Third Party Offerings. The Software may allow you to access and interoperate with third party content, software applications, and data services, including rich Internet applications (“Third Party Offerings”). Your access to and use of any Third Party Offering, including any goods, services, or information, is governed by the terms and conditions respecting such offerings and copyright laws of the United States and other countries. Third Party Offerings are not owned or provided by Adobe. You agree that you will not use any of such Third Party Offerings in violation of copyright laws of the United States or other countries. Adobe or the third party may at any time, for any reason, modify or discontinue the availability of any Third Party Offerings. Adobe does not control, endorse or accept responsibility for Third Party Offerings. Any dealings between you and any third party in connection with a Third Party Offerings, including such party’s privacy policies and use of your personal information, delivery of and payment for goods and services and any other terms, conditions, warranties or representations associated with such dealings, are solely between you and such third party. Third Party Offerings might not be available in all languages or to residents of all countries and Adobe or the third party may, at any time and for any reason, modify or discontinue the availability of any Third Party Offerings. 8.2 EXCEPT AS EXPRESSLY AGREED BY ADOBE OR ITS AFFILIATES OR A THIRD PARTY IN A SEPARATE AGREEMENT, YOUR USE OF ADOBE AND THIRD PARTY OFFERINGS IS AT YOUR OWN RISK UNDER THE WARRANTY AND LIABILITY LIMITATIONS OF SECTIONS 1.1 AND 10. 9. Digital Certificates. You acknowledge and agree to the following: 9.1 Use. Adobe AIR uses digital certificates to help you identify the publisher of Adobe AIR applications created by third parties. Additionally, Adobe AIR uses digital certificates to establish the identity of servers accessed via the Transport Layer Security (TLS) protocol, including access via HTTPS. Adobe Reader uses digital certificates to sign and validate signatures within PDF documents and to validate certified PDF documents. Adobe Runtimes use digital certificates to secure protected content from unauthorized usage. Your Computer may connect to the Internet at the time of validation of a digital certificate in order to download current certificate revocation lists (CRLs) or to update the list of digital certificates. This access may be made both by the Software and by applications based on the Software. Digital certificates are issued by third party certificate authorities, including Adobe Certified Document Services (CDS) vendors listed at http://www.adobe.com/go/partners_cds and Adobe Approved Trust List (AATL) vendors listed at http://www.adobe.com/security/approved-trust-list.html, and individualization vendors found at http://www.adobe.com/go/protected_content (collectively “Certification Authorities”), or can be self-signed. 9.2 Terms and Conditions. Purchase, use and reliance upon digital certificates are the responsibility of you and a Certification Authority. Before you rely upon any certified document, digital signature or Certification Authority services, you should review the applicable terms and conditions under which the relevant Certification Authority provides services, including, for example, any subscriber agreements, relying party agreements, certificate policies and practice statements. See the links on http://www.adobe.com/go/partners_cds for information about Adobe’s CDS vendors and http://www.adobe.com/security/approved-trust-list.html for information about Adobe’s AATL vendors. 9.3 Acknowledgement. You agree that (a) a digital certificate may have been revoked prior to the time of verification, making the digital signature or certificate appear valid when in fact it is not, (b) the security or integrity of a digital certificate may be compromised due to an act or omission by the signer of the document, the applicable Certification Authority, or any other third party, and (c) a certificate may be a self-signed certificate not provided by a Certification Authority. YOU ARE SOLELY RESPONSIBLE FOR DECIDING WHETHER OR NOT TO RELY ON A CERTIFICATE. UNLESS A SEPARATE WRITTEN WARRANTY IS PROVIDED TO YOU BY A CERTIFICATION AUTHORITY, YOU USE DIGITAL CERTIFICATES AT YOUR SOLE RISK. 9.4 Third Party Beneficiaries. You agree that any Certification Authority you rely upon is a third party beneficiary of this agreement and shall have the right to enforce this agreement in its own name as if it were Adobe. 9.5 Indemnity. You agree to hold Adobe and any applicable Certification Authority (except as expressly provided in its terms and conditions) harmless from any and all liabilities, losses, actions, damages, or claims (including all reasonable expenses, costs, and attorneys fees) arising out of or relating to any use of, or reliance on, any service of such authority, including, without limitation (a) reliance on an expired or revoked certificate, (b) improper verification of a certificate, (c) use of a certificate other than as permitted by any applicable terms and conditions, this agreement or applicable law; (d) failure to exercise reasonable judgment under the circumstances in relying on issuer services or certificates or (e) failure to perform any of the obligations as required in the terms and conditions related to the services. 10. Limitation of Liability. IN NO EVENT WILL ADOBE, ITS SUPPLIERS, OR CERTIFICATION AUTHORITIES BE LIABLE TO YOU FOR ANY DAMAGES, CLAIMS OR COSTS WHATSOEVER INCLUDING ANY CONSEQUENTIAL, INDIRECT, INCIDENTAL DAMAGES, OR ANY LOST PROFITS OR LOST SAVINGS, EVEN IF AN ADOBE REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSS, DAMAGES, OR CLAIMS. THE FOREGOING LIMITATIONS AND EXCLUSIONS APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW IN YOUR JURISDICTION. ADOBE’S AGGREGATE LIABILITY AND THAT OF ITS SUPPLIERS AND CERTIFICATION AUTHORITIES UNDER OR IN CONNECTION WITH THIS AGREEMENT SHALL BE LIMITED TO THE AMOUNT PAID FOR THE SOFTWARE, IF ANY. Nothing contained in this agreement limits Adobe’s liability to you in the event of death or personal injury resulting from Adobe’s negligence or for the tort of deceit (fraud). Adobe is acting on behalf of its suppliers and Certification Authorities for the purpose of disclaiming, excluding and/or limiting obligations, warranties and liability as provided in this agreement, but in no other respects and for no other purpose. For further information, please see the jurisdiction specific information at the end of this agreement, if any, or contact Adobe’s Customer Support Department. 11. Export Rules. You agree that the Software will not be shipped, transferred, or exported into any country or used in any manner prohibited by the United States Export Administration Act or any other export laws, restrictions or regulations (collectively the “Export Laws”). In addition, if the Software is identified as export controlled items under the Export Laws, you represent and warrant that you are not a citizen, or otherwise located within, an embargoed nation (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) and that you are not otherwise prohibited under the Export Laws from receiving the Software. All rights to Use the Software are granted on condition that such rights are forfeited if you fail to comply with the terms of this agreement. 12. Governing Law. This agreement will be governed by and construed in accordance with the substantive laws in force: (a) in the State of California, if a license to the Software is obtained when you are in the United States, Canada, or Mexico; or (b) in Japan, if a license to the Software is obtained when you are in Japan, China, Korea, or other Southeast Asian country where all official languages are written in either an ideographic script (e.g., Hanzi, Kanji, or Hanja), and/or other script based upon or similar in structure to an ideographic script, such as Hangul or Kana; or (c) in England, if a license to the Software is obtained when you are in any other jurisdiction not described above. The respective courts of Santa Clara County, California when California law applies, Tokyo District Court in Japan, when Japanese law applies, and the competent courts of England, when the law of England applies, shall each have non-exclusive jurisdiction over all disputes relating to this agreement. This agreement will not be governed by the conflict of law rules of any jurisdiction or the United Nations Convention on Contracts for the International Sale of Goods, the application of which is expressly excluded. 13. General Provisions. If any part of this agreement is found void and unenforceable, it will not affect the validity of the balance of this agreement, which shall remain valid and enforceable according to its terms. This agreement shall not prejudice the statutory rights of any party dealing as a consumer. This agreement may only be modified by a writing signed by an authorized officer of Adobe. Updates may be licensed to you by Adobe with additional or different terms. This is the entire agreement between Adobe and you relating to the Software and it supersedes any prior representations, discussions, undertakings, communications, or advertising relating to the Software. 14. Notice to U.S. Government End Users. For U.S. Government End Users, Adobe agrees to comply with all applicable equal opportunity laws including, if appropriate, the provisions of Executive Order 11246, as amended, Section 402 of the Vietnam Era Veterans Readjustment Assistance Act of 1974 (38 USC 4212), and Section 503 of the Rehabilitation Act of 1973, as amended, and the regulations at 41 CFR Parts 60-1 through 60-60, 60-250, and 60-741. The affirmative action clause and regulations contained in the preceding sentence shall be incorporated by reference in this agreement. 15. Compliance with Licenses. If you are a business or organization, you agree that upon request from Adobe or Adobe’s authorized representative, you will, within thirty (30) days, fully document and certify that use of any and all Software at the time of the request is in conformity with your valid licenses from Adobe. 16. European Union Provisions. Nothing included in this agreement (including Section 4.5) shall limit any non-waivable right to decompile the Software that you may enjoy under mandatory law. For example, if you are located in the European Union (EU), you may have the right upon certain conditions specified in the applicable law to decompile the Software if it is necessary to do so in order to achieve interoperability of the Software with another software program, and you have first asked Adobe in writing to provide the information necessary to achieve such interoperability and Adobe has not made such information available. In addition, such decompilation may only be done by you or someone else entitled to use a copy of the Software on your behalf. Adobe has the right to impose reasonable conditions before providing such information. Any information supplied by Adobe or obtained by you, as permitted hereunder, may only be used by you for the purpose described herein and may not be disclosed to any third party or used to create any software which is substantially similar to the expression of the Software or used for any other act which infringes Adobe or its licensors’ copyright. 17. Specific Provisions and Exceptions. 17.1 Limitation of Liability for Users Residing in Germany and Austria. 17.1.1 If you obtained the Software in Germany or Austria, and you usually reside in such country, then Section 10 does not apply. Instead, subject to the provisions in Section 17.1.2, Adobe’s statutory liability for damages shall be limited as follows: (a) Adobe shall be liable only up to the amount of damages as typically foreseeable at the time of entering into the license agreement in respect of damages caused by a slightly negligent breach of a material contractual obligation and (b) Adobe shall not be liable for damages caused by a slightly negligent breach of a non-material contractual obligation. 17.1.2 The aforesaid limitation of liability shall not apply to any mandatory statutory liability, in particular, to liability under the German Product Liability Act, liability for assuming a specific guarantee or liability for culpably caused personal injuries. 17.1.3 You are required to take all reasonable measures to avoid and reduce damages, in particular to make back-up copies of the Software and your computer data subject to the provisions of this agreement. If you have any questions regarding this agreement, or if you wish to request any information from Adobe, please use the address and contact information included with this product or via the web at http://www.adobe.com to contact the Adobe office serving your jurisdiction. Adobe, Adobe AIR, AIR, Authorware, Flash, Reader, and Shockwave are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries. PlatformClients_PC_WWEULA-en_US-20100108_1657 ++++++ README ++++++ Adobe Systems Incorporated Flash Player 10 for Linux Version 10.0.32.18 2009 Adobe recommends that all users upgrade to the latest version of Adobe Flash Player for the most recent features, bug fixes, and security fixes. For more information on the new features in Flash Player 9, please visit http://www.adobe.com/products/flashplayer/. For more information on system requirements, fixed issues, and known issues, see the release notes at http://www.adobe.com/go/flashplayer_releasenotes. To confirm which version of Flash Player you have currently installed, see http://www.adobe.com/software/flash/about/. Users should only install Players that have been downloaded from trusted sources, such as http://www.adobe.com/. Your use of this player is governed by the Adobe End User License Agreement found at http://www.adobe.com/products/eulas/players/flash/. Privacy ------- Adobe is committed to preserving the privacy of end users. For more information on configuring Client-side privacy visit the Settings Manager Documentation: http://www.adobe.com/go/flashplayerhelp. Installation instructions ------------------------- Installing the plugin tar.gz using Install script: o Unpack the tar.gz file o In terminal, navigate to the unpacked directory and enter: + $ ./flashplayer-installer + Click Enter key and follow prompts Installing the plugin using RPM: o As root, enter in terminal: + # rpm -Uvh <rpm_package_file> + Click Enter key and follow prompts Installing the standalone player: o Unpack the tar.gz file o To execute the standalone player, + Double-click, or + Enter in terminal: ./flashplayer Uninstallation instructions --------------------------- Manual uninstallation (for users who installed the plugin via Install script): o Delete libflashplayer.so binary and flashplayer.xpt file in directory /home/<user>/.mozilla/plugins/ RPM uninstallation: o As root, enter in terminal: + # rpm -e flash-plugin + Click Enter key and follow prompts Technical Issues and Reporting Bugs ----------------------------------- The Adobe Flash Player Support Center at http://www.adobe.com/support/flashplayer/ is a free online resource for support and troubleshooting information. Bug reports may be submitted at http://www.adobe.com/go/wish. To allow us to investigate reported bugs, please include the following information: 1) Platform and version 2) Browser version 3) Reproducible steps including a URL to the web site where the problem was encountered. If we need further information about a bug, you will be contacted. An automated reply will be sent to assure you that we have received your bug report. Due to the volume of mail received, we are not able to individually respond to each report. Legal ----- Adobe(R) Flash(R) Player. Copyright (C) 1996 - 2009 Adobe Systems Incorporated. All Rights Reserved. Protected by U.S. Patent 6,879,327; Patents Pending in the United States and other countries. Adobe and Flash are either trademarks or registered trademarks in the United States and/or other countries. ++++++ desktop.diff ++++++ --- usr/share/applications/flash-player-properties.desktop +++ usr/share/applications/flash-player-properties.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Adobe Flash Player +GenericName=Adobe Flash Player Settings Comment=Preferences for Adobe Flash Player Comment[bg]=Настройки за Adobe Flash Player Comment[ca]=Preferències quant a la Adobe Flash Player @@ -20,5 +21,5 @@ Terminal=false Type=Application StartupNotify=true -Categories=Settings;GNOME;GTK;X-GNOME-PersonalSettings; +Categories=Settings;Network;WebBrowser;GNOME;GTK;X-GNOME-PersonalSettings; NotShowIn=KDE; ++++++ flashplayer.desktop ++++++ [Desktop Entry] Type=Application Encoding=UTF-8 Name=FlashPlayer GenericName=Flash Standalone Player Comment=Flash Standalone Player Icon=flashplayer Exec=flashplayer Terminal=false Categories=GTK;Application;AudioVideo;Audio;Video;Player; MimeType=application/x-shockwave-flash; ++++++ kcm_adobe_flash_player.desktop.patch ++++++ --- usr/share/kde4/services/kcm_adobe_flash_player.desktop.orig 2011-08-03 09:35:44.000000000 +0300 +++ usr/share/kde4/services/kcm_adobe_flash_player.desktop 2011-08-27 22:00:25.800000030 +0300 @@ -8,7 +8,7 @@ X-KDE-Library=kcm_adobe_flash_player X-KDE-ParentApp=kcontrol -X-KDE-System-Settings-Parent-Category=personal +X-KDE-System-Settings-Parent-Category=personal-information X-KDE-Weight=10 Name=Adobe Flash Player ++++++ mms.cfg ++++++ EnableLinuxHWVideoDecode=1 ++++++ update.sh ++++++ #!/bin/bash # vim: sw=4 et t=$(mktemp -d XXXXXXX) set -e pushd $t &>/dev/null tar xf ../install_flash_player_11*_linux.i386.tar.gz libflashplayer.so md5sum libflashplayer.so > ORIG_FLASH rm libflashplayer.so # fetch the current download url download_url=$(curl -s 'http://get.adobe.com/flashplayer/download/?installer=Flash_Player_11.2_for_…' | egrep -o 'http:\/\/fpdownload.macromedia.com\/get\/flashplayer\/pdc\/11.*\/install_flash_player_11_linux.i386.tar.gz') echo "Trying download $download_url"; wget $download_url tar xf install_flash_player_11_linux.i386.tar.gz libflashplayer.so md5sum libflashplayer.so > NEW_FLASH if cmp -s ORIG_FLASH NEW_FLASH; then echo "no new update available" else echo "*** NEW flashplugin UPDATE AVAILABLE!" version=$(strings libflashplayer.so | grep "LNX 11," | cut -d' ' -f2 | sed -e 's#,#.#g') echo "new version is $version" download_url=$(echo $download_url | sed -e 's,i386,ARCH,') for arch in i386 x86_64; do wget -q $(echo $download_url | sed -e "s,ARCH,$arch,") mv install_flash_player_11_linux.$arch.tar.gz install_flash_player_${version}_linux.$arch.tar.gz mv install_flash_player_${version}_linux.$arch.tar.gz .. done sed -i -e "s,Version:.*,Version: $version," ../flash-player.spec ( cd ..; osc vc -m "Security update to $version (bnc#XXXXXX):" ) fi for arch in i386; do tar xf ../flashplayer_*_sa.$arch.tar.gz install_flash_player_linux_sa/flashplayer md5sum install_flash_player_linux_sa/flashplayer > ORIG_FLASH rm install_flash_player_linux_sa/flashplayer rm -rf install_flash_player_linux_sa wget http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11… tar xvf flashplayer_11_sa.$arch.tar.gz md5sum install_flash_player_linux_sa/flashplayer > NEW_FLASH if cmp -s ORIG_FLASH NEW_FLASH; then echo "no new update available" else echo "*** NEW flashplayer UPDATE AVAILABLE!" version=$(strings install_flash_player_linux_sa/flashplayer | grep "LNX 11," | cut -d' ' -f2 | sed -e 's#,#.#g') echo "new version is $version" mv flashplayer_11_sa.$arch.tar.gz flashplayer_${version}_sa.$arch.tar.gz mv flashplayer_${version}_sa.$arch.tar.gz .. fi done popd &>/dev/null rm -rf $t

1 0

commit flash-player for openSUSE:12.3:NonFree:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package flash-player for openSUSE:12.3:NonFree:Update checked in at 2014-04-30 10:00:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:NonFree:Update/flash-player (Old) and /work/SRC/openSUSE:12.3:NonFree:Update/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.uIfc4t/_old 2014-04-30 10:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.uIfc4t/_new 2014-04-30 10:00:32.000000000 +0200 @@ -1 +1 @@ -<link package='flash-player.2732' cicount='copy' /> +<link package='flash-player.2769' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seamonkey for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package seamonkey for openSUSE:13.1:Update checked in at 2014-04-30 08:17:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/seamonkey (Old) and /work/SRC/openSUSE:13.1:Update/.seamonkey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seamonkey" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.KhziXY/_old 2014-04-30 08:18:16.000000000 +0200 +++ /var/tmp/diff_new_pack.KhziXY/_new 2014-04-30 08:18:16.000000000 +0200 @@ -1 +1 @@ -<link package='seamonkey.2550' cicount='copy' /> +<link package='seamonkey.2691' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seamonkey for openSUSE:12.3:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package seamonkey for openSUSE:12.3:Update checked in at 2014-04-30 08:17:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/seamonkey (Old) and /work/SRC/openSUSE:12.3:Update/.seamonkey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "seamonkey" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.HXIxyq/_old 2014-04-30 08:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.HXIxyq/_new 2014-04-30 08:18:10.000000000 +0200 @@ -1 +1 @@ -<link package='seamonkey.2550' cicount='copy' /> +<link package='seamonkey.2691' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird for openSUSE:13.1:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:13.1:Update checked in at 2014-04-30 08:17:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/MozillaThunderbird (Old) and /work/SRC/openSUSE:13.1:Update/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.kNB4L2/_old 2014-04-30 08:18:03.000000000 +0200 +++ /var/tmp/diff_new_pack.kNB4L2/_new 2014-04-30 08:18:03.000000000 +0200 @@ -1 +1 @@ -<link package='MozillaThunderbird.2538' cicount='copy' /> +<link package='MozillaThunderbird.2691' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird for openSUSE:12.3:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:12.3:Update checked in at 2014-04-30 08:17:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/MozillaThunderbird (Old) and /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.fYAJrd/_old 2014-04-30 08:17:56.000000000 +0200 +++ /var/tmp/diff_new_pack.fYAJrd/_new 2014-04-30 08:17:56.000000000 +0200 @@ -1 +1 @@ -<link package='MozillaThunderbird.2538' cicount='copy' /> +<link package='MozillaThunderbird.2691' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird.2691 for openSUSE:12.3:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package MozillaThunderbird.2691 for openSUSE:12.3:Update checked in at 2014-04-30 08:17:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/MozillaThunderbird.2691 (Old) and /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.2691.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird.2691" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.2691.new/MozillaThunderbird.changes 2014-04-30 08:17:51.000000000 +0200 @@ -0,0 +1,1944 @@ +------------------------------------------------------------------- +Tue Mar 18 21:45:43 UTC 2014 - wr(a)rosenauer.org + +- update to Thunderbird 24.4.0 (bnc#868603) + * MFSA 2014-15/CVE-2014-1493/CVE-2014-1494 + Miscellaneous memory safety hazards + * MFSA 2014-17/CVE-2014-1497 (bmo#966311) + Out of bounds read during WAV file decoding + * MFSA 2014-26/CVE-2014-1508 (bmo#963198) + Information disclosure through polygon rendering in MathML + * MFSA 2014-27/CVE-2014-1509 (bmo#966021) + Memory corruption in Cairo during PDF font rendering + * MFSA 2014-28/CVE-2014-1505 (bmo#941887) + SVG filters information disclosure through feDisplacementMap + * MFSA 2014-29/CVE-2014-1510/CVE-2014-1511 (bmo#982906, bmo#982909) + Privilege escalation using WebIDL-implemented APIs + * MFSA 2014-30/CVE-2014-1512 (bmo#982957) + Use-after-free in TypeObject + * MFSA 2014-31/CVE-2014-1513 (bmo#982974) + Out-of-bounds read/write through neutering ArrayBuffer objects + * MFSA 2014-32/CVE-2014-1514 (bmo#983344) + Out-of-bounds write through TypedArrayObject after neutering + +------------------------------------------------------------------- +Mon Feb 3 16:07:28 UTC 2014 - wr(a)rosenauer.org + +- update to Thunderbird 24.3.0 (bnc#861847) + * MFSA 2014-01/CVE-2014-1477/CVE-2014-1478 + Miscellaneous memory safety hazards (rv:27.0 / rv:24.3) + * MFSA 2014-02/CVE-2014-1479 (bmo#911864) + Clone protected content with XBL scopes + * MFSA 2014-04/CVE-2014-1482 (bmo#943803) + Incorrect use of discarded images by RasterImage + * MFSA 2014-08/CVE-2014-1486 (bmo#942164) + Use-after-free with imgRequestProxy and image proccessing + * MFSA 2014-09/CVE-2014-1487 (bmo#947592) + Cross-origin information leak through web workers + * MFSA 2014-12/CVE-2014-1490/CVE-2014-1491 + (bmo#934545, bmo#930874, bmo#930857) + NSS ticket handling issues + * MFSA 2014-13/CVE-2014-1481(bmo#936056) + Inconsistent JavaScript handling of access to Window objects +- requires NSS 3.15.4 +- renamed ppc64le patches to streamline with Firefox package + +------------------------------------------------------------------- +Fri Dec 13 21:29:16 UTC 2013 - uweigand(a)de.ibm.com + +- Add support for powerpc64le-linux. + * ppc64le-support.patch: general support + * libffi-ppc64le.patch: libffi backport + * xpcom-ppc64le.patch: port xpcom + +------------------------------------------------------------------- +Sun Dec 8 10:18:03 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.2.0 (bnc#854370) + * requires NSS 3.15.3.1 or higher + * MFSA 2013-104/CVE-2013-5609/CVE-2013-5610 + Miscellaneous memory safety hazards + * MFSA 2013-108/CVE-2013-5616 (bmo#938341) + Use-after-free in event listeners + * MFSA 2013-109/CVE-2013-5618 (bmo#926361) + Use-after-free during Table Editing + * MFSA 2013-111/CVE-2013-6671 (bmo#930281) + Segmentation violation when replacing ordered list elements + * MFSA 2013-113/CVE-2013-6673 (bmo#970380) + Trust settings for built-in roots ignored during EV certificate + validation + * MFSA 2013-114/CVE-2013-5613 (bmo#930381, bmo#932449) + Use-after-free in synthetic mouse movement + * MFSA 2013-115/CVE-2013-5615 (bmo#929261) + GetElementIC typed array stubs can be generated outside observed + typesets + * MFSA 2013-116/CVE-2013-6629/CVE-2013-6630 (bmo#891693) + JPEG information leak + * MFSA 2013-117 (bmo#946351) + Mis-issued ANSSI/DCSSI certificate + (fixed via NSS 3.15.3.1) + +------------------------------------------------------------------- +Tue Nov 19 08:08:00 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.1.1 + * requires NSPR 4.10.2 and NSS 3.15.3 for security reasons + * fix binary compatibility issues for patch level updates + (bmo#927073) + +------------------------------------------------------------------- +Thu Oct 24 17:18:23 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.1.0 (bnc#847708) + * requires NSS 3.15.2 or above + * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592 + Miscellaneous memory safety hazards + * MFSA 2013-94/CVE-2013-5593 (bmo#868327) + Spoofing addressbar through SELECT element + * MFSA 2013-95/CVE-2013-5604 (bmo#914017) + Access violation with XSLT and uninitialized data + * MFSA 2013-96/CVE-2013-5595 (bmo#916580) + Improperly initialized memory and overflows in some JavaScript + functions + * MFSA 2013-97/CVE-2013-5596 (bmo#910881) + Writing to cycle collected object during image decoding + * MFSA 2013-98/CVE-2013-5597 (bmo#918864) + Use-after-free when updating offline cache + * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601 + (bmo#915210, bmo#915576, bmo#916685) + Miscellaneous use-after-free issues found through ASAN fuzzing + * MFSA 2013-101/CVE-2013-5602 (bmo#897678) + Memory corruption in workers + * MFSA 2013-102/CVE-2013-5603 (bmo#916404) + Use-after-free in HTML document templates + +------------------------------------------------------------------- +Thu Oct 10 14:43:22 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.0.1 + * fqdn for smtp server name was not accepted (bmo#913785) + * fixed crash in PL_strncasecmp (bmo#917955) +- update Enigmail to 1.6 + * The passphrase timeout configuration in Enigmail is now read and + written from/to gpg-agent. + * New dialog to change the expiry date of keys + * New function to search for the OpenPGP keys of all Address Book + entries on a keyserver + * removed obsolete enigmail-build.patch + +------------------------------------------------------------------- +Sat Sep 14 20:32:28 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.0 (bnc#840485) + * MFSA 2013-76/CVE-2013-1718/CVE-2013-1719 + Miscellaneous memory safety hazards + * MFSA 2013-77/CVE-2013-1720 (bmo#888820) + Improper state in HTML5 Tree Builder with templates + * MFSA 2013-79/CVE-2013-1722 (bmo#893308) + Use-after-free in Animation Manager during stylesheet cloning + * MFSA 2013-80/CVE-2013-1723 (bmo#891292) + NativeKey continues handling key messages after widget is destroyed + * MFSA 2013-81/CVE-2013-1724 (bmo#894137) + Use-after-free with select element + * MFSA 2013-82/CVE-2013-1725 (bmo#876762) + Calling scope for new Javascript objects can lead to memory corruption + * MFSA 2013-85/CVE-2013-1728 (bmo#883686) + Uninitialized data in IonMonkey + * MFSA 2013-88/CVE-2013-1730 (bmo#851353) + Compartment mismatch re-attaching XBL-backed nodes + * MFSA 2013-89/CVE-2013-1732 (bmo#883514) + Buffer overflow with multi-column, lists, and floats + * MFSA 2013-90/CVE-2013-1735/CVE-2013-1736 (bmo#898871, bmo#906301) + Memory corruption involving scrolling + * MFSA 2013-91/CVE-2013-1737 (bmo#907727) + User-defined properties on DOM proxies get the wrong "this" object + * MFSA 2013-92/CVE-2013-1738 (bmo#887334, bmo#882897) + GC hazard with default compartments and frame chain restoration +- moved greek to common translation package +- require NSPR 4.10 and NSS 3.15.1 +- add GStreamer build requirements for Gecko +- added enigmail-build.patch to fix TB packaging (bmo#886095) +- removed obsolete patches: + * enigmail-old-gcc.patch + * mozilla-gcc43-enums.patch + * mozilla-gcc43-template_hacks.patch + * mozilla-gcc43-templates_instantiation.patch + * ppc-xpcshell.patch + +------------------------------------------------------------------- +Fri Aug 2 06:01:03 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 17.0.8 (bnc#833389) + * MFSA 2013-63/CVE-2013-1701 + Miscellaneous memory safety hazards + * MFSA 2013-68/CVE-2013-1709 (bmo#838253) + Document URI misrepresentation and masquerading + * MFSA 2013-69/CVE-2013-1710 (bmo#871368) + CRMF requests allow for code execution and XSS attacks + * MFSA 2013-72/CVE-2013-1713 (bmo#887098) + Wrong principal used for validating URI for some Javascript + components + * MFSA 2013-73/CVE-2013-1714 (bmo#879787) + Same-origin bypass with web workers and XMLHttpRequest + * MFSA 2013-75/CVE-2013-1717 (bmo#406541, bmo#738397) + Local Java applets may read contents of local file system + +------------------------------------------------------------------- +Wed Jul 17 17:28:39 UTC 2013 - wr(a)rosenauer.org + +- update Enigmail to 1.5.2 + * bugfix release + +------------------------------------------------------------------- +Mon Jun 24 10:17:22 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 17.0.7 (bnc#825935) + * MFSA 2013-49/CVE-2013-1682 + Miscellaneous memory safety hazards ++++ 1747 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.2691.new/MozillaThunderbird.changes New: ---- MozillaThunderbird.changes MozillaThunderbird.spec _constraints add-plugins.sh.in compare-locales.tar.bz2 create-tar.sh enigmail-1.6.tar.gz find-external-requires.sh kde.js l10n-24.4.0.tar.bz2 libffi-ppc64le.patch mozilla-arm-disable-edsp.patch mozilla-kde.patch mozilla-language.patch mozilla-nongnome-proxies.patch mozilla-ppc.patch mozilla-shared-nss-db.patch mozilla.sh.in ppc64le-support.patch suse-default-prefs.js tb-develdirs.patch tb-ssldap.patch thunderbird-24.4.0-source.tar.bz2 thunderbird-rpmlintrc thunderbird-shared-nss-db.patch thunderbird.desktop xpcom-ppc64le.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ # # spec file for package MozillaThunderbird # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2014 Wolfgang Rosenauer <wr(a)rosenauer.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define mainversion 24.4.0 %define update_channel release %define gstreamer_ver 0.10 %define with_kde 1 Name: MozillaThunderbird BuildRequires: Mesa-devel BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hunspell-devel BuildRequires: libcurl-devel BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel BuildRequires: mozilla-nspr-devel >= 4.10.2 BuildRequires: mozilla-nss-devel >= 3.15.4 BuildRequires: nss-shared-helper-devel BuildRequires: python BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip %if %suse_version > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %endif Version: %{mainversion} Release: 0 %define releasedate 2014031500 Provides: thunderbird = %{version} %if %{with_kde} # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 Provides: mozilla-kde4-version = %{kde_helper_version} %endif Summary: The Stand-Alone Mozilla Mail Component License: MPL-2.0 Group: Productivity/Networking/Email/Clients Url: http://www.mozilla.org/products/thunderbird/ Source: thunderbird-%{version}-source.tar.bz2 Source1: thunderbird.desktop Source2: add-plugins.sh.in Source3: mozilla.sh.in Source4: l10n-%{version}.tar.bz2 #Source5: shipped-locales Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: thunderbird-rpmlintrc Source9: enigmail-1.6.tar.gz Source10: create-tar.sh Source11: compare-locales.tar.bz2 Source12: kde.js # Gecko/Toolkit Patch1: mozilla-shared-nss-db.patch Patch2: mozilla-language.patch Patch3: mozilla-nongnome-proxies.patch Patch4: mozilla-kde.patch Patch5: mozilla-arm-disable-edsp.patch Patch7: mozilla-ppc.patch Patch8: libffi-ppc64le.patch Patch9: xpcom-ppc64le.patch Patch10: ppc64le-support.patch # Thunderbird/mail Patch20: tb-ssldap.patch Patch21: tb-develdirs.patch Patch22: thunderbird-shared-nss-db.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh Recommends: libcanberra0 ### build options %define build_enigmail 1 %ifnarch ppc ppc64 ppc64le %arm %define crashreporter 1 %else %define crashreporter 0 %endif %define has_system_cairo 0 %define localize 1 ### build options end %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE7} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Conflicts: thunderbird-esr %define progname thunderbird %define progdir %{_prefix}/%_lib/thunderbird %define libgssapi libgssapi_krb5.so.2 %if %suse_version > 1130 %define desktop_file_name thunderbird %else %define desktop_file_name %{name} %endif %description Mozilla Thunderbird is a redesign of the Mozilla Mail component. It is written using the XUL user interface language and designed to be cross-platform. It is a stand-alone application instead of part of the Mozilla application suite. %if %localize %package translations-common Summary: Common translations for MozillaThunderbird License: MPL-2.0 Group: System/Localization Provides: locale(%{name}:ar;ca;cs;da;de;el;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} %description translations-common This package contains several optional languages for the user interface of MozillaThunderbird. %package translations-other Summary: Extra translations for MozillaThunderbird License: MPL-2.0 Group: System/Localization Provides: locale(%{name}:ast;be;bg;bn_BD;br;et;eu;fy_NL;ga_IE;gd;gl;he;hr;hy_AM;id;is;lt;nn_NO;pa_IN;rm;ro;si;sk;sl;sq;sr;ta_LK;tr;uk;vi) PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other This package contains several optional languages for the user interface of MozillaThunderbird. %endif %package devel Summary: Mozilla Thunderbird SDK License: MPL-2.0 Group: Development/Libraries/Other Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) PreReq: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel) PreReq: %{name} = %{mainversion} %description devel Software Development Kit to build plugins/extensions against Thunderbird. %if %crashreporter %package buildsymbols Summary: Breakpad buildsymbols for %{name} License: MPL-2.0 Group: Development/Debug %description buildsymbols This subpackage contains the Breakpad created and compatible debugging symbols meant for upload to Mozilla's crash collector database. %endif %if %build_enigmail %package -n enigmail Version: 1.6.0+%{mainversion} Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ Group: Productivity/Networking/Email/Clients Url: http://www.enigmail.net/ Requires: /usr/bin/gpg %if %suse_version > 1110 Requires: pinentry-gui %else Requires: pinentry-dialog %endif Conflicts: thunderbird-esr %description -n enigmail This package contains the Enigmail OpenPGP Addon for Thunderbird and SeaMonkey. %endif %prep %if %build_enigmail %setup -n thunderbird -q -b 4 -b 11 -b 9 %else %setup -n thunderbird -q -b 4 -b 11 %endif # xulrunner patches pushd mozilla %patch1 -p1 %patch2 -p1 %patch3 -p1 %if %{with_kde} %patch4 -p1 %endif %patch5 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 popd # comm-central patches %patch20 -p1 %patch21 -p1 %patch22 -p1 %build # no need to add build time to binaries modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + # %if %{with_kde} kdehelperversion=$(cat mozilla/toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) if test "$kdehelperversion" != %{kde_helper_version}; then echo fix kde helper version in the .spec file exit 1 fi %endif export SUSE_ASNEEDED=0 export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 %if %{update_channel} == "esr" export MOZ_ESR=1 %endif export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" %ifarch ppc64 ppc64le export CFLAGS="$CFLAGS -mminimal-toc" %endif export CXXFLAGS="$CFLAGS" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig # cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MILESTONE_RELEASE=1 mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj ac_add_options --enable-application=mail ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{progdir} ac_add_options --includedir=%{_includedir} ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-optimize ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n ac_add_options --disable-updater #ac_add_options --with-system-png # no apng support ac_add_options --enable-system-hunspell ac_add_options --disable-installer ac_add_options --disable-mochitest ac_add_options --enable-startup-notification ac_add_options --enable-official-branding ac_add_options --disable-necko-wifi ac_add_options --enable-update-channel=%{update_channel} EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG ac_add_options --disable-gnomevfs ac_add_options --enable-gio EOF %endif %if %suse_version < 1220 cat << EOF >> $MOZCONFIG ac_add_options --disable-gstreamer EOF %endif %if %has_system_cairo cat << EOF >> $MOZCONFIG ac_add_options --enable-system-cairo EOF %endif %if ! %crashreporter cat << EOF >> $MOZCONFIG ac_add_options --disable-crashreporter EOF %endif # Disable neon for arm as it does not build correctly %ifarch %arm cat << EOF >> $MOZCONFIG ac_add_options --disable-neon EOF %endif make -f client.mk build # ### enigmail build %if %build_enigmail cp -r $RPM_BUILD_DIR/enigmail $RPM_BUILD_DIR/thunderbird/mailnews/extensions/ pushd $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail ./makemake -r -o '../../../../obj' popd pushd $RPM_BUILD_DIR/obj/mailnews/extensions/enigmail make make xpi popd %endif %install cd ../obj make -C mail/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 # copy tree into RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{progdir} cp -rf $RPM_BUILD_DIR/obj/mozilla/dist/thunderbird/* \ $RPM_BUILD_ROOT%{progdir} %if %{with_kde} # install kde.js install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js # make sure that instantApply is true by default # (TODO: mozilla-kde.patch needs to be improved to really not load kde.js in non-KDE envs) echo 'pref("browser.preferences.instantApply", true);' > $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-thunderbird.js %endif # build additional locales %if %localize %if 0%{?SOURCE5:1} cp %SOURCE5 ../thunderbird/mail/locales/shipped-locales %endif rm -f %{_tmppath}/translations.* touch %{_tmppath}/translations.{common,other} for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/all-locales); do case $locale in ja-JP-mac|en-US) # locales not to be included in translations package ;; *) pushd $RPM_BUILD_DIR/compare-locales PYTHONPATH=lib \ scripts/compare-locales -m ../l10n-merged/$locale \ ../thunderbird/mail/locales/l10n.ini ../l10n $locale popd LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ make -C mail/locales langpack-$locale || continue cp -rL mozilla/dist/xpi-stage/locale-$locale \ $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)thunderbird.mozilla.org # remove prefs and profile defaults from langpack rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)thunderbird.mozilla.org/defaults # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do [ "$_match" = "$locale" ] && _matched=1 done [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other echo %{progdir}/extensions/langpack-$locale(a)thunderbird.mozilla.org \ >> %{_tmppath}/translations.$_l10ntarget esac done %endif # overwrite the mozilla start-script and link it to /usr/bin mkdir --parents $RPM_BUILD_ROOT%{_bindir}/ sed "s:%%PREFIX:%{_prefix}:g s:%%PROGDIR:%{progdir}:g s:%%APPNAME:thunderbird:g s:%%PROFILE:.thunderbird:g" \ %{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT%{_bindir}/%{progname} # freedesktop definition mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications install -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_file_name}.desktop # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ %{SOURCE2} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh chmod 755 $RPM_BUILD_ROOT%{progdir}/add-plugins.sh # apply SUSE defaults sed -e 's,RPM_VERSION,%{mainversion},g s,GSSAPI,%{libgssapi},g' \ %{SOURCE6} > suse-default-prefs cp suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-opensuse.js rm suse-default-prefs # use correct locale for useragent cat > $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); EOF ########## # DEVEL # mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{progname} chmod a+x mozilla/dist/sdk/bin/*.py cp -rL mozilla/dist/sdk/bin/* $RPM_BUILD_ROOT%{_libdir}/%{progname}/ cp -rL mozilla/dist/sdk/lib/*.a $RPM_BUILD_ROOT%{_libdir}/%{progname}/ cp -rL mozilla/dist/idl/* $RPM_BUILD_ROOT%{_includedir}/%{progname}/ cp -rL mozilla/dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{progname}/ #mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ #install -m 755 $RPM_BUILD_DIR/thunderbird/mozilla/build/unix/thunderbird-*.pc \ # $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ #rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc #ln -sf nss.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc ########## # ADDONS # # install enigmail to extension dir %if %build_enigmail cp -L mozilla/dist/bin/enigmail-*.xpi $RPM_BUILD_ROOT%{progdir} # Thunderbird location _enig_dir=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{847b3a00-7ab1-11d4-8f02-006008948af5\} mkdir -p $_enig_dir (cd $_enig_dir; unzip $RPM_BUILD_ROOT%{progdir}/enigmail-*.xpi) # SeaMonkey location mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\} (cd $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}; \ ln -s ../\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{847b3a00-7ab1-11d4-8f02-006008948af5\} ) # remove unwanted build artifacts rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-locale.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-en-US.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-skin.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/installed-chrome.txt rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmime.jar rm -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so rm -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt rm -f $RPM_BUILD_ROOT%{progdir}/components/enig* rm -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so rm -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt rm -rf $RPM_BUILD_ROOT%{progdir}/defaults/preferences/ rm -rf $RPM_BUILD_ROOT%{progdir}/platform/ rm -rf $RPM_BUILD_ROOT%{progdir}/wrappers/ rm -f $RPM_BUILD_ROOT%{progdir}/enigmail*.xpi %endif # # remove spurious executable bits find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \; find $RPM_BUILD_ROOT%{_libdir}/%{progname} \ -name "*.js" -o \ -name "*.jsm" -o \ -name "*.rdf" -o \ -name "*.properties" -o \ -name "*.dtd" -o \ -name "*.css" | xargs chmod a-x # remove mkdir.done files from installed base find $RPM_BUILD_ROOT%{progdir} -name ".mkdir.done" | xargs rm # for size in 16 22 24 32 48 256; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/ ln -sf %{progdir}/chrome/icons/default/default$size.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{progname}.png done %suse_update_desktop_file %{desktop_file_name} Network Email GTK # excluded files rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird rm -f $RPM_BUILD_ROOT%{progdir}/removed-files rm -f $RPM_BUILD_ROOT%{progdir}/precomplete rm -f $RPM_BUILD_ROOT%{progdir}/updater rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini rm -f $RPM_BUILD_ROOT%{progdir}/update.locale rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* rm -f $RPM_BUILD_ROOT%{progdir}/nspr-config # Some sites use different partitions for /usr/(lib|lib64) and /usr/share. Since you # can't create hardlinks across partitions, we'll do this more than once. %fdupes $RPM_BUILD_ROOT%{progdir} %fdupes $RPM_BUILD_ROOT%{_libdir}/mozilla %fdupes $RPM_BUILD_ROOT%{_datadir} %fdupes $RPM_BUILD_ROOT%{_includedir} %if %crashreporter SYMBOLS_NAME="thunderbird-%{mainversion}-%{release}.%{_arch}-%{suse_version}-symbols" make buildsymbols \ SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \ SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME" if [ -e mozilla/dist/*symbols.zip ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/ cp mozilla/dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ fi %endif %clean rm -rf $RPM_BUILD_ROOT %if %localize rm -rf %{_tmppath}/translations.* %endif %triggerin -- myspell-dictionary %progdir/add-plugins.sh > /dev/null 2>&1 exit 0 %triggerpostun -- myspell-dictionary %progdir/add-plugins.sh > /dev/null 2>&1 exit 0 %post %progdir/add-plugins.sh > /dev/null 2>&1 %if %suse_version > 1130 %icon_theme_cache_post %endif # remove enigmail on updates if [ -e %progdir/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} ]; then rm -rf %progdir/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} fi exit 0 %posttrans if [ -e %progdir/add-plugins.sh ]; then %progdir/add-plugins.sh > /dev/null 2>&1 fi exit 0 %preun if [ "$1" = "0" ]; then # deinstallation rm -f %{progdir}/dictionaries/* fi exit 0 %postun %if %suse_version > 1130 %icon_theme_cache_postun %endif exit 0 %files %defattr(-,root,root) %attr(755,root,root) %{progdir}/%{progname}.sh %attr(755,root,root) %{progdir}/add-plugins.sh %dir %{progdir} %{progdir}/application.ini %{progdir}/blocklist.xml %{progdir}/chrome.manifest %{progdir}/dependentlibs.list %{progdir}/*.so %{progdir}/mozilla-xremote-client %{progdir}/omni.ja %{progdir}/platform.ini %{progdir}/plugin-container %{progdir}/run-mozilla.sh %{progdir}/thunderbird-bin # crashreporter files %if %crashreporter %{progdir}/crashreporter %{progdir}/crashreporter.ini %{progdir}/Throbber-small.gif %endif %{progdir}/components/ %dir %{progdir}/chrome/ %{progdir}/chrome/icons/ %dir %{progdir}/dictionaries/ %{progdir}/defaults/ %dir %{progdir}/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/isp/ %{progdir}/searchplugins/ %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/icons/hicolor/*/apps/%{progname}.png %{_bindir}/%{progname} %if %localize %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) %endif %files devel %defattr(-,root,root) %{_libdir}/%{progname}/*.a %{_libdir}/%{progname}/*.py %{_libdir}/%{progname}/*.pyc %{_libdir}/%{progname}/ply/ %{_libdir}/%{progname}/xpcshell #%{_libdir}/pkgconfig/*.pc %{_includedir}/%{progname}/ %if %build_enigmail %files -n enigmail %defattr(-,root,root) %dir %{_libdir}/mozilla %{_libdir}/mozilla/extensions/ %endif %if %crashreporter %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/ %endif %changelog ++++++ add-plugins.sh.in ++++++ #! /bin/sh # Copyright (c) 2008 Wolfgang Rosenauer. All rights reserved. # # check if we are started as root # only one of UID and USER must be set correctly if test "$UID" != 0 -a "$USER" != root; then echo "You must be root to start $0." exit 1 fi PREFIX="%PROGDIR" # dictionaries MYSPELL=/usr/share/myspell MOZ_SPELL=$PREFIX/dictionaries if [ -d $MOZ_SPELL ] ; then if [ -d $MYSPELL ] ; then for dict in $MYSPELL/??[-_]??.aff ; do # check is it is really the file or it is a string which contain '??_??' if ! [ -e $dict ] ; then continue fi # the dict file name dict_file=`echo ${dict##*/}` # the dict file has a valid name lang=`echo ${dict_file:0:2}` country=`echo ${dict_file:3:2}` # check for .dic file if [ ! -r $MYSPELL/${lang}[-_]${country}.dic ] ; then continue fi # create links if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.aff ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.aff \ $MOZ_SPELL/${lang}-${country}.aff fi if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.dic ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.dic \ $MOZ_SPELL/${lang}-${country}.dic fi done echo "-> added myspell dictionaries" fi # remove broken links for dict in $MOZ_SPELL/*.{aff,dic} ; do if ! [ -r $dict ] ; then rm -f $dict fi done fi ++++++ create-tar.sh ++++++ #!/bin/bash CHANNEL="esr24" BRANCH="releases/comm-$CHANNEL" RELEASE_TAG="THUNDERBIRD_24_4_0_RELEASE" VERSION="24.4.0" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird pushd thunderbird hg update -r $RELEASE_TAG echo "running client.py..." [ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" # temporary! _extra="--mozilla-repo=http://hg.mozilla.org/releases/mozilla-$CHANNEL $_extra" python client.py checkout --skip-chatzilla --skip-venkman $_extra popd echo "creating archive..." tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird # l10n # http://l10n.mozilla.org/dashboard/?tree=tb30x -> shipped-locales echo "fetching locales..." if [ -e shipped-locales ]; then SHIPPED_LOCALES=shipped-locales else SHIPPED_LOCALES=thunderbird/mail/locales/all-locales fi test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' $SHIPPED_LOCALES); do case $locale in ja-JP-mac|en-US) ;; *) echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 \ --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=browser --exclude=calendar \ --exclude=suite \ l10n # compare-locales hg clone http://hg.mozilla.org/build/compare-locales tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales ++++++ find-external-requires.sh ++++++ #!/bin/sh # Finds requirements provided outside of the current file set filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" ) provides=$( echo "$filelist" | /usr/lib/rpm/find-provides ) echo "$filelist" \ | /usr/lib/rpm/find-requires \ | grep -F -v "$provides" \ | sort -u ++++++ kde.js ++++++ pref("browser.preferences.instantApply", false); ++++++ libffi-ppc64le.patch ++++++ ++++ 3750 lines (skipped) ++++++ mozilla-arm-disable-edsp.patch ++++++ # HG changeset patch # User Adrian Schröter <adrian(a)suse.de> # Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f disable ESDP support (no BNC or BMO reference yet :-() diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h --- a/xpcom/glue/arm.h +++ b/xpcom/glue/arm.h @@ -143,17 +143,17 @@ namespace mozilla { extern bool NS_COM_GLUE neon_enabled; #endif #endif } #if defined(MOZILLA_PRESUME_EDSP) # define MOZILLA_MAY_SUPPORT_EDSP 1 inline bool supports_edsp() { return true; } -#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \ +#elif 0 \ && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) inline bool supports_edsp() { return arm_private::edsp_enabled; } #else inline bool supports_edsp() { return false; } #endif #if defined(MOZILLA_PRESUME_ARMV6) # define MOZILLA_MAY_SUPPORT_ARMV6 1 ++++++ mozilla-kde.patch ++++++ ++++ 3726 lines (skipped) ++++++ mozilla-language.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent df748bfc0eaca6dedf086cfd7167392416bfae27 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp @@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void) nsRefPtr<nsLocale> resultLocale(new nsLocale()); NS_ENSURE_TRUE_VOID(resultLocale); #ifdef MOZ_WIDGET_QT const char* lang = QLocale::system().name().toUtf8(); #else // Get system configuration const char* lang = getenv("LANG"); + const char* language = getenv("LANGUAGE"); #endif nsAutoString xpLocale, platformLocale; nsAutoString category, category_platform; int i; for( i = 0; i < LocaleListLength; i++ ) { nsresult result; @@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); } } if (NS_FAILED(result)) { return; } + // LANGUAGE is overriding LC_MESSAGES + if (i == LC_MESSAGES && language && *language) { + CopyASCIItoUTF16(language, platformLocale); + result = nsPosixLocale::GetXPLocale(language, xpLocale); + } resultLocale->AddCategory(category, xpLocale); resultLocale->AddCategory(category_platform, platformLocale); } mSystemLocale = do_QueryInterface(resultLocale); mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX #ifdef XP_OS2 ++++++ mozilla-nongnome-proxies.patch ++++++ From: Wolfgang Rosenauer Subject: Do not use gconf for proxy settings if not running within Gnome Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v retrieving revision 1.1 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp @@ -50,24 +50,28 @@ nsUnixSystemProxySettings::GetMainThread // dbus prevents us from being threadsafe, but this routine should not block anyhow *aMainThreadOnly = true; return NS_OK; } nsresult nsUnixSystemProxySettings::Init() { - mSchemeProxySettings.Init(5); - mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); - if (mGSettings) { - mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), - getter_AddRefs(mProxySettings)); - } - if (!mProxySettings) { - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + // only use GSettings if that is a GNOME session + const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); + if (sessionType && !strcmp(sessionType, "gnome")) { + mSchemeProxySettings.Init(5); + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + if (mGSettings) { + mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), + getter_AddRefs(mProxySettings)); + } + if (!mProxySettings) { + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + } } return NS_OK; } bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { ++++++ mozilla-ppc.patch ++++++ # HG changeset patch # Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf # User Wolfgang Rosenauer <wr(a)rosenauer.org> Bug 746112 - RegExp hang on ppc64 in execute. Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h --- a/js/src/yarr/YarrInterpreter.h +++ b/js/src/yarr/YarrInterpreter.h @@ -162,17 +162,17 @@ struct ByteTerm { , m_invert(invert) { atom.characterClass = characterClass; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; } - ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) + ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(false) { atom.subpatternId = subpatternId; atom.parenthesesDisjunction = parenthesesInfo; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; @@ -183,17 +183,17 @@ struct ByteTerm { : type(type) , m_capture(false) , m_invert(invert) { atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; } - ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) + ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { atom.subpatternId = subpatternId; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h --- a/js/src/yarr/YarrPattern.h +++ b/js/src/yarr/YarrPattern.h @@ -180,17 +180,17 @@ struct PatternTerm { , m_capture(false) , m_invert(invert) { characterClass = charClass; quantityType = QuantifierFixedCount; quantityCount = 1; } - PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) + PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { parentheses.disjunction = disjunction; parentheses.subpatternId = subpatternId; parentheses.isCopy = false; parentheses.isTerminal = false; diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/jemalloc.c @@ -1099,17 +1099,17 @@ struct arena_s { static unsigned ncpus; #endif /* * When MALLOC_STATIC_SIZES is defined most of the parameters * controlling the malloc behavior are defined as compile-time constants * for best performance and cannot be altered at runtime. */ -#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) +#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__)) #define MALLOC_STATIC_SIZES 1 #endif #ifdef MALLOC_STATIC_SIZES /* * VM page size. It must divide the runtime CPU page size or the code * will abort. diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h --- a/mfbt/double-conversion/utils.h +++ b/mfbt/double-conversion/utils.h @@ -50,17 +50,17 @@ // the result is equal to 89255e-22. // The best way to test this, is to create a division-function and to compare // the output of the division with the expected result. (Inlining must be // disabled.) // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) #if defined(_M_X64) || defined(__x86_64__) || \ defined(__ARMEL__) || defined(__avr32__) || \ defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || defined(__powerpc__) || \ + defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 ++++++ mozilla-shared-nss-db.patch ++++++ From: Hans Petter Jansson <hpj(a)copyleft.no> Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz dnl ======================================================== MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' AC_SUBST(MOZ_HARFBUZZ_LIBS) dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, + [MOZ_ENABLE_NSSHELPER=1], + [MOZ_ENABLE_NSSHELPER=]) + +if test "$MOZ_ENABLE_NSSHELPER"; then + AC_DEFINE(MOZ_ENABLE_NSSHELPER) +fi +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) + +dnl ======================================================== dnl SIL Graphite dnl ======================================================== MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' AC_SUBST(MOZ_GRAPHITE_LIBS) dnl ======================================================== dnl OTS dnl ======================================================== diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -18,10 +18,13 @@ LIBXUL_LIBRARY = 1 CSRCS += md4.c DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ $(NULL) +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) + include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -3,16 +3,23 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifdef MOZ_LOGGING #define FORCE_PR_LOG 1 #endif +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif + #include "nsNSSComponent.h" #include "CertVerifier.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsICertOverrideService.h" @@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs // module by NSS_Initialize because we will load it in InstallLoadableRoots // later. It also allows us to work around a bug in the system NSS in // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", - SECMOD_DB, init_flags); + SECStatus init_rv = SECFailure; +#ifdef MOZ_ENABLE_NSSHELPER + if (PR_GetEnv("MOZ_TB_NO_NSSHELPER")) { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } else { + init_rv = ::nsshelp_open_db ("Thunderbird", profileStr.get(), init_flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } + } +#else + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); +#endif if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); if (supress_warning_preference) { which_nss_problem = problem_none; } else { diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif EXTRA_DSO_LDOPTS += $(LIBS_DIR) DEFINES += -DIMPL_XREAPI -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) OS_LIBS += \ -framework SystemConfiguration \ -framework QTKit \ -framework IOKit \ -F/System/Library/PrivateFrameworks -framework CoreUI \ ++++++ mozilla.sh.in ++++++ #!/bin/sh # # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # The Original Code is mozilla.org Code. # # The Initial Developer of the Original Code is # Netscape Communications Corporation. # Portions created by the Initial Developer are Copyright (C) 1998 # the Initial Developer. All Rights Reserved. # # Contributor(s): # Wolfgang Rosenauer <wolfgang.rosenauer(a)suse.de> # <wr(a)rosenauer.org> # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), # in which case the provisions of the GPL or the LGPL are applicable instead # of those above. If you wish to allow use of your version of this file only # under the terms of either the GPL or the LGPL, and not to allow others to # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** ## ## Usage: ## ## $ mozilla [args] ## ## This script is meant to run a mozilla program from the mozilla ## rpm installation. ## ## The script will setup all the environment voodoo needed to make ## mozilla work. cmdname=`basename $0` ## ## Variables ## MOZ_DIST_BIN="%PREFIX" MOZ_DIST_LIB="%PROGDIR" MOZ_APPNAME="%APPNAME" MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME-bin" MOZ_APP_LAUNCHER="$MOZ_DIST_LIB/$MOZ_APPNAME.sh" if [ "$0" = "$MOZ_APP_LAUNCHER" ]; then [ -h "/usr/bin/$MOZ_APPNAME" ] && \ _link=$(readlink -f "/usr/bin/$MOZ_APPNAME") if [ "$_link" = "$MOZ_APP_LAUNCHER" ]; then export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi else export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi mozilla_lib=`file $MOZ_PROGRAM` LIB=lib echo $mozilla_lib | grep -q -E 'ELF.64-bit.*(x86-64|S/390|PowerPC)' && LIB=lib64 BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins if [ ! -d $BROWSER_PLUGIN_DIR ]; then BROWSER_PLUGIN_DIR=/opt/netscape/plugins fi MOZILLA_FIVE_HOME="$MOZ_DIST_LIB" export MOZILLA_FIVE_HOME LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ## if [ -z "$MOZ_PLUGIN_PATH" ]; then export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR else # make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null _retval=$? if [ ${_retval} -ne 0 ]; then export MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$BROWSER_PLUGIN_DIR fi fi # disable Gnome crash dialog (doesn't make sense anyway) export GNOME_DISABLE_CRASH_DIALOG=1 moz_debug=0 script_args="" pass_arg_count=0 while [ $# -gt $pass_arg_count ] do case "$1" in -d | --debugger) moz_debugger=$2; if [ "${moz_debugger}" != "" ]; then shift 2 moz_debug=1 else echo "-d requires an argument" exit 1 fi ;; *) # Move the unrecognized argument to the end of the list. arg="$1" shift set -- "$@" "$arg" pass_arg_count=`expr $pass_arg_count + 1` ;; esac done if [ $moz_debug -eq 1 ]; then tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; } trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 echo -e "set args ${1+"$@"}\nrun" > $tmpfile echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile" exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile else exec $MOZ_PROGRAM "$@" fi ++++++ ppc64le-support.patch ++++++ Index: mozilla/configure.in =================================================================== --- mozilla.orig/configure.in +++ mozilla/configure.in @@ -1084,7 +1084,7 @@ case "$OS_TEST" in CPU_ARCH=x86 ;; -powerpc64 | ppc64) +powerpc64 | ppc64 | powerpc64le | ppc64le) CPU_ARCH=ppc64 ;; Index: mozilla/js/src/configure.in =================================================================== --- mozilla.orig/js/src/configure.in +++ mozilla/js/src/configure.in @@ -915,7 +915,7 @@ case "$OS_TEST" in CPU_ARCH=x86 ;; -powerpc64 | ppc64) +powerpc64 | ppc64 | powerpc64le | ppc64le) CPU_ARCH=ppc64 ;; Index: mozilla/mfbt/Endian.h =================================================================== --- mozilla.orig/mfbt/Endian.h +++ mozilla/mfbt/Endian.h @@ -91,7 +91,7 @@ # else # error "CPU type is unknown" # endif -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__) # if __LITTLE_ENDIAN__ # define MOZ_LITTLE_ENDIAN 1 # elif __BIG_ENDIAN__ @@ -119,8 +119,7 @@ * cases. */ #elif defined(__sparc) || defined(__sparc__) || \ - defined(_POWER) || defined(__powerpc__) || \ - defined(__ppc__) || defined(__hppa) || \ + defined(_POWER) || defined(__hppa) || \ defined(_MIPSEB) || defined(__ARMEB__) || \ defined(__s390__) || \ (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \ Index: mozilla/js/src/jscpucfg.h =================================================================== --- mozilla.orig/js/src/jscpucfg.h +++ mozilla/js/src/jscpucfg.h @@ -31,7 +31,7 @@ # define JS_BYTES_PER_WORD 4 # define JS_BITS_PER_WORD_LOG2 5 -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__) # if __LITTLE_ENDIAN__ # define IS_LITTLE_ENDIAN 1 # undef IS_BIG_ENDIAN @@ -93,8 +93,7 @@ # endif #elif defined(__sparc) || defined(__sparc__) || \ - defined(_POWER) || defined(__powerpc__) || \ - defined(__ppc__) || defined(__hppa) || \ + defined(_POWER) || defined(__hppa) || \ defined(_MIPSEB) || defined(_BIG_ENDIAN) /* IA64 running HP-UX will have _BIG_ENDIAN defined. * IA64 running Linux will have endian.h and be handled above. Index: mozilla/js/src/assembler/wtf/Platform.h =================================================================== --- mozilla.orig/js/src/assembler/wtf/Platform.h +++ mozilla/js/src/assembler/wtf/Platform.h @@ -165,16 +165,22 @@ || defined(__POWERPC__) \ || defined(_M_PPC) \ || defined(__PPC) +#if !defined(__ppc64__) && !defined(__PPC64__) #define WTF_CPU_PPC 1 +#endif +#if !defined(__LITTLE_ENDIAN__) #define WTF_CPU_BIG_ENDIAN 1 #endif +#endif /* WTF_CPU_PPC64 - PowerPC 64-bit */ #if defined(__ppc64__) \ || defined(__PPC64__) #define WTF_CPU_PPC64 1 +#if !defined(__LITTLE_ENDIAN__) #define WTF_CPU_BIG_ENDIAN 1 #endif +#endif /* WTF_CPU_SH4 - SuperH SH-4 */ #if defined(__SH4__) Index: mozilla/nsprpub/pr/include/md/_linux.cfg =================================================================== --- mozilla.orig/nsprpub/pr/include/md/_linux.cfg +++ mozilla/nsprpub/pr/include/md/_linux.cfg @@ -29,8 +29,13 @@ #ifdef __powerpc64__ +#ifdef __LITTLE_ENDIAN__ +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#else #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 +#endif #define IS_64 #define PR_BYTES_PER_BYTE 1 @@ -75,8 +80,13 @@ #elif defined(__powerpc__) +#ifdef __LITTLE_ENDIAN__ +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#else #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 +#endif #define PR_BYTES_PER_BYTE 1 #define PR_BYTES_PER_SHORT 2 Index: mozilla/media/webrtc/trunk/webrtc/typedefs.h =================================================================== --- mozilla.orig/media/webrtc/trunk/webrtc/typedefs.h +++ mozilla/media/webrtc/trunk/webrtc/typedefs.h @@ -52,13 +52,23 @@ #elif defined(__powerpc64__) #define WEBRTC_ARCH_PPC64 1 #define WEBRTC_ARCH_64_BITS 1 +#ifdef __LITTLE_ENDIAN__ +#define WEBRTC_ARCH_LITTLE_ENDIAN +#define WEBRTC_LITTLE_ENDIAN +#else #define WEBRTC_ARCH_BIG_ENDIAN #define WEBRTC_BIG_ENDIAN +#endif #elif defined(__ppc__) || defined(__powerpc__) #define WEBRTC_ARCH_PPC 1 #define WEBRTC_ARCH_32_BITS 1 +#ifdef __LITTLE_ENDIAN__ +#define WEBRTC_ARCH_LITTLE_ENDIAN +#define WEBRTC_LITTLE_ENDIAN +#else #define WEBRTC_ARCH_BIG_ENDIAN #define WEBRTC_BIG_ENDIAN +#endif #elif defined(__sparc64__) #define WEBRTC_ARCH_SPARC 1 #define WEBRTC_ARCH_64_BITS 1 ++++++ suse-default-prefs.js ++++++ pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); pref("font.name.monospace.x-unicode", "monospace"); pref("network.negotiate-auth.gsslib", "GSSAPI"); pref("print.print_edge_top", 14); // 1/100 of an inch pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch pref("intl.locale.matchOS", true); // do not disable system-global or app-global extensions pref("extensions.autoDisableScopes", 3); pref("extensions.shownSelectionUI", true); ++++++ tb-develdirs.patch ++++++ diff --git a/config/baseconfig.mk b/config/baseconfig.mk index 636b9aa..b350c75 100644 --- a/config/baseconfig.mk +++ b/config/baseconfig.mk @@ -1,7 +1,7 @@ INCLUDED_AUTOCONF_MK = 1 -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir := $(includedir)/$(MOZ_APP_NAME) +idldir = $(datadir)/idl/$(MOZ_APP_NAME) installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) MOZILLA_SRCDIR = $(topsrcdir)/mozilla ++++++ tb-ssldap.patch ++++++ diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in --- a/mail/installer/package-manifest.in +++ b/mail/installer/package-manifest.in @@ -268,16 +268,17 @@ #ifdef XP_WIN32 @BINPATH@/nsldap32v60@DLL_SUFFIX@ @BINPATH@/nsldappr32v60@DLL_SUFFIX@ @BINPATH@/nsldif32v60@DLL_SUFFIX@ #else @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@ssldap60@DLL_SUFFIX@ #endif ; login manager @BINPATH@/components/loginmgr.xpt @BINPATH@/components/nsLoginInfo.js @BINPATH@/components/nsLoginManager.js @BINPATH@/components/nsLoginManagerPrompter.js @BINPATH@/components/passwordmgr.manifest ++++++ thunderbird-rpmlintrc ++++++ addFilter("no-jar-manifest") ++++++ thunderbird-shared-nss-db.patch ++++++ From: Hans Petter Jansson <hpj(a)copyleft.no> Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in --- a/mail/app/Makefile.in +++ b/mail/app/Makefile.in @@ -61,16 +61,17 @@ LOCAL_INCLUDES += \ $(NULL) DEFINES += -DXPCOM_GLUE STL_FLAGS= LIBS += \ $(EXTRA_DSO_LIBS) \ $(XPCOM_STANDALONE_GLUE_LDOPTS) \ + $(NSSHELPER_LIBS) \ $(NULL) ifdef MOZ_LINKER LIBS += $(MOZ_ZLIB_LIBS) endif ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG ++++++ thunderbird.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Name=Thunderbird GenericName=Mail/News Client Comment=Mail/News Client TryExec=thunderbird Exec=thunderbird %u Icon=thunderbird Terminal=false Type=Application StartupNotify=true MimeType=x-scheme-handler/mailto; ++++++ xpcom-ppc64le.patch ++++++ Index: mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/moz.build +++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -198,6 +198,13 @@ if CONFIG['OS_TEST'] == 'powerpc64': 'xptcstubs_ppc64_linux.cpp', ] +if CONFIG['OS_TEST'] == 'powerpc64le': + if CONFIG['OS_ARCH'] == 'Linux': + CPP_SOURCES += [ + 'xptcinvoke_ppc64_linux.cpp', + 'xptcstubs_ppc64_linux.cpp', + ] + if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'): if CONFIG['OS_ARCH'] == 'NetBSD': CPP_SOURCES += [ Index: mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -166,7 +166,7 @@ endif # # Linux/PPC64 # -ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) +ifneq (,$(filter Linuxpowerpc64 Linuxpowerpc64le FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp endif Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s @@ -17,12 +17,29 @@ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 .set f30,30; .set f31,31 +#if _CALL_ELF == 2 +#define STACK_TOC 28 +#define STACK_PARAMS 96 +#else +#define STACK_TOC 40 +#define STACK_PARAMS 112 +#endif # # NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, # uint32_t paramCount, nsXPTCVariant* params) # +#if _CALL_ELF == 2 + .section ".text" + .type NS_InvokeByIndex,@function + .globl NS_InvokeByIndex + .align 2 +NS_InvokeByIndex: +0: addis 2,12,(.TOC.-0b)@ha + addi 2,2,(.TOC.-0b)@l + .localentry NS_InvokeByIndex,.-NS_InvokeByIndex +#else .section ".toc","aw" .section ".text" .align 2 @@ -34,6 +51,7 @@ NS_InvokeByIndex: .previous .type NS_InvokeByIndex,@function .NS_InvokeByIndex: +#endif mflr 0 std 0,16(r1) @@ -56,7 +74,7 @@ NS_InvokeByIndex: # (-23*8).(-16*8).(-3*8)..(r31) # +stack frame, -unused stack params, +regs storage, +1 for alignment - addi r7,r5,((112/8)-7+7+13+3+1) + addi r7,r5,((STACK_PARAMS/8)-7+7+13+3+1) rldicr r7,r7,3,59 # multiply by 8 and mask with ~15 neg r7,r7 stdux r1,r1,r7 @@ -72,7 +90,7 @@ NS_InvokeByIndex: subi r3,r31,(23*8) # r3 --> GPRS subi r4,r31,(16*8) # r4 --> FPRS - addi r7,r1,112 # r7 --> params + addi r7,r1,STACK_PARAMS # r7 --> params bl invoke_copy_to_stack nop @@ -83,14 +101,18 @@ NS_InvokeByIndex: sldi r30,r30,3 # Find function descriptor add r9,r9,r30 - ld r9,0(r9) + ld r12,0(r9) - ld r0,0(r9) # Actual address from fd. - std r2,40(r1) # Save r2 (TOC pointer) + std r2,STACK_TOC(r1) # Save r2 (TOC pointer) +#if _CALL_ELF == 2 + mtctr r12 +#else + ld r0,0(r12) # Actual address from fd. mtctr 0 - ld r11,16(r9) # Environment pointer from fd. - ld r2,8(r9) # TOC pointer from fd. + ld r11,16(r12) # Environment pointer from fd. + ld r2,8(r12) # TOC pointer from fd. +#endif # Load FP and GP registers as required ld r4, -(23*8)(r31) @@ -117,7 +139,7 @@ NS_InvokeByIndex: bctrl # Do it - ld r2,40(r1) # Load our own TOC pointer + ld r2,STACK_TOC(r1) # Load our own TOC pointer ld r1,0(r1) # Revert stack frame ld 0,16(r1) # Reload lr ld 29,-24(r1) # Restore NVGPRS @@ -126,7 +148,11 @@ NS_InvokeByIndex: mtlr 0 blr +#if _CALL_ELF == 2 + .size NS_InvokeByIndex,.-NS_InvokeByIndex +#else .size NS_InvokeByIndex,.-.NS_InvokeByIndex +#endif # Magic indicating no need for an executable stack .section .note.GNU-stack, "", @progbits ; .previous Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp @@ -74,7 +74,9 @@ invoke_copy_to_stack(uint64_t* gpregs, fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles } else { float *p = (float *)d; +#ifndef __LITTLE_ENDIAN__ p++; +#endif *p = s->val.f; } } Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s @@ -17,6 +17,27 @@ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 .set f30,30; .set f31,31 +#if _CALL_ELF == 2 +#define STACK_PARAMS 96 +#else +#define STACK_PARAMS 112 +#endif + +#if _CALL_ELF == 2 + .section ".text" + .type SharedStub,@function + .globl SharedStub + # Make the symbol hidden so that the branch from the stub does + # not go via a PLT. This is not only better for performance, + # but may be necessary to avoid linker errors since there is + # no place to restore the TOC register in a sibling call. + .hidden SharedStub + .align 2 +SharedStub: +0: addis 2,12,(.TOC.-0b)@ha + addi 2,2,(.TOC.-0b)@l + .localentry SharedStub,.-SharedStub +#else .section ".text" .align 2 .globl SharedStub @@ -29,6 +50,7 @@ SharedStub: .type SharedStub,@function .SharedStub: +#endif mflr r0 std r4, -56(r1) # Save all GPRS @@ -55,7 +77,7 @@ SharedStub: subi r6,r1,56 # r6 --> gprData subi r7,r1,160 # r7 --> fprData - addi r5,r1,112 # r5 --> extra stack args + addi r5,r1,STACK_PARAMS # r5 --> extra stack args std r0, 16(r1) @@ -75,7 +97,11 @@ SharedStub: mtlr r0 blr +#if _CALL_ELF == 2 + .size SharedStub,.-SharedStub +#else .size SharedStub,.-.SharedStub +#endif # Magic indicating no need for an executable stack .section .note.GNU-stack, "", @progbits ; .previous Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp @@ -83,7 +83,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles else { float *p = (float *)ap; +#ifndef __LITTLE_ENDIAN__ p++; +#endif dp->val.f = *p; } } else { /* integer type or pointer */ @@ -153,6 +155,43 @@ PrepareAndDispatch(nsXPTCStubBase* self, // etc. // Use assembler directives to get the names right... +#if _CALL_ELF == 2 +# define STUB_ENTRY(n) \ +__asm__ ( \ + ".section \".text\" \n\t" \ + ".align 2 \n\t" \ + ".if "#n" < 10 \n\t" \ + ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ +"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ + "0: addis 2,12,.TOC.-0b@ha \n\t" \ + "addi 2,2,.TOC.-0b@l \n\t" \ + ".localentry _ZN14nsXPTCStubBase5Stub"#n"Ev,.-_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ + \ + ".elseif "#n" < 100 \n\t" \ + ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ +"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ + "0: addis 2,12,.TOC.-0b@ha \n\t" \ + "addi 2,2,.TOC.-0b@l \n\t" \ + ".localentry _ZN14nsXPTCStubBase6Stub"#n"Ev,.-_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ + \ + ".elseif "#n" < 1000 \n\t" \ + ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ +"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ + "0: addis 2,12,.TOC.-0b@ha \n\t" \ + "addi 2,2,.TOC.-0b@l \n\t" \ + ".localentry _ZN14nsXPTCStubBase7Stub"#n"Ev,.-_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ + \ + ".else \n\t" \ + ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ + ".endif \n\t" \ + \ + "li 11,"#n" \n\t" \ + "b SharedStub \n" \ +); +#else # define STUB_ENTRY(n) \ __asm__ ( \ ".section \".toc\",\"aw\" \n\t" \ @@ -195,6 +234,7 @@ __asm__ ( "li 11,"#n" \n\t" \ "b SharedStub \n" \ ); +#endif #define SENTINEL_ENTRY(n) \ nsresult nsXPTCStubBase::Sentinel##n() \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2014-04-29 17:36:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2014-02-26 06:59:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2014-04-29 17:36:32.000000000 +0200 @@ -1,0 +2,39 @@ +Fri Apr 18 19:08:23 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.17 development snapshot + - More implementations for the Task Scheduler. + - C runtime made more compatible by sharing source files. + - Fixes in the Mac OS X joystick support. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Fri Apr 4 21:15:06 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.16 development snapshot + - More regression test fixes. + - String arrays better supported in the IDL compiler. + - Initial stubs for DirectX Video Acceleration. + - Various bug fixes. + +------------------------------------------------------------------- +Fri Mar 21 22:56:05 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.15 development snapshot + - New Task Scheduler service. + - Many regression test fixes. + - Support for exception unwinding in VBScript. + - Various bug fixes. + +------------------------------------------------------------------- +Fri Mar 7 21:41:41 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.14 development snapshot + - More Task Scheduler support. + - Improvements for AVI encoding support. + - More VisualBasic interfaces in MSXML. + - Support for deflate content encoding in Wininet. + - Some fixes for monochrome printers. + - Various bug fixes. + +------------------------------------------------------------------- Old: ---- wine-1.7.13.tar.bz2 wine-1.7.13.tar.bz2.sign New: ---- wine-1.7.17.tar.bz2 wine-1.7.17.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.6SiJ85/_old 2014-04-29 17:36:34.000000000 +0200 +++ /var/tmp/diff_new_pack.6SiJ85/_new 2014-04-29 17:36:34.000000000 +0200 @@ -55,7 +55,7 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.13 +Version: 1.7.17 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-1.7.13.tar.bz2 -> wine-1.7.17.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.7.13.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.7.17.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ ++++ 1789 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/wine/winetricks ++++ and /work/SRC/openSUSE:Factory/.wine.new/winetricks -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ponysay for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package ponysay for openSUSE:Factory checked in at 2014-04-29 17:35:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ponysay (Old) and /work/SRC/openSUSE:Factory/.ponysay.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ponysay" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:Factory/.ponysay.new/ponysay.changes 2014-04-29 17:35:48.000000000 +0200 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Sat Apr 26 15:47:56 UTC 2014 - andreas.stieger(a)gmx.de + +- spec cleanup +- add source URLs + +------------------------------------------------------------------- + +Sat Apr 6 12:34:23 UTC 2014 - sor.alexei(a)meowr.ru + +- Initial package. New: ---- info-direntry.patch ponysay-3.0.1.tar.gz ponysay.changes ponysay.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ponysay.spec ++++++ # # spec file for package ponysay # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ponysay Version: 3.0.1 Release: 0 Summary: Cowsay reimplemention for ponies License: GPL-3.0+ Group: Amusements/Toys/Other Url: https://github.com/erkin/ponysay Source: https://github.com/erkin/%{name}/archive/%{version}.tar.gz#/%{name}-%{versi… # PATCH-FIX-OPENSUSE info-direntry.patch sor.alexei(a)meowr.ru -- Adds @direntry to ponysay.info. Patch0: info-direntry.patch BuildRequires: fdupes BuildRequires: python3-devel BuildRequires: texinfo Requires: python3 Requires(post): info Requires(preun): info BuildArch: noarch %description ponysay as an awesome terminal application to display ponies speaking messages in your terminal. It has many features; you can use its info manual to explore them. %prep %setup -q %patch0 -p1 %build # Nothing to build. %install python3 setup.py --prefix=%{_prefix} --dest-dir=%{buildroot} --freedom=partial --with-everything --with-pdf=%{_docdir}/%{name}/ install rm -rf %{buildroot}%{_infodir}/dir %{buildroot}%{_datadir}/licenses/ %fdupes %{buildroot}/%{_datadir}/%{name} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %install_info --info-dir=%{_infodir} %{_infodir}/%{name}-tool.info%{ext_info} %install_info --info-dir=%{_infodir} %{_infodir}/ponythink.info%{ext_info} %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-tool.info%{ext_info} %install_info_delete --info-dir=%{_infodir} %{_infodir}/ponythink.info%{ext_info} %files %defattr(-,root,root) %doc CHANGELOG CONTRIBUTING COPYING CREDITS LICENSE README.md %{_bindir}/pony* %{_datadir}/%{name}/ %{_infodir}/*.gz %{_mandir}/man6/* %{_mandir}/*/man6/* %{_datadir}/bash-completion/ %{_datadir}/zsh/ %{_datadir}/fish/ %changelog ++++++ info-direntry.patch ++++++ --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -14,6 +14,10 @@ @synindex op vr @synindex cp pg +@dircategory Miscellaneous +@direntry +* ponysay: (ponysay). Ponies for your terminal +@end direntry @copying This manual is for ponysay -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libeXosip2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package libeXosip2 for openSUSE:Factory checked in at 2014-04-29 17:35:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libeXosip2 (Old) and /work/SRC/openSUSE:Factory/.libeXosip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libeXosip2" Changes: -------- --- /work/SRC/openSUSE:Factory/libeXosip2/libeXosip2.changes 2013-07-17 10:25:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libeXosip2.new/libeXosip2.changes 2014-04-29 17:35:30.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 28 08:29:28 UTC 2014 - meissner(a)suse.com + +- libeXosip2-sslverifypaths.patch: set default SSL verify locations (bnc#871099) +- build with -O2 (--disable-debug) + +------------------------------------------------------------------- New: ---- libeXosip2-sslverifypaths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libeXosip2.spec ++++++ --- /var/tmp/diff_new_pack.DK04Pz/_old 2014-04-29 17:35:31.000000000 +0200 +++ /var/tmp/diff_new_pack.DK04Pz/_new 2014-04-29 17:35:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libeXosip2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,8 @@ Version: 3.5.0 Release: 0 Url: http://savannah.nongnu.org/forum/forum.php?forum_id=3778 - Source: libeXosip2-%{version}.tar.bz2 +Patch0: libeXosip2-sslverifypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glibc-devel BuildRequires: libopenssl-devel @@ -73,10 +73,11 @@ %prep %setup -q -n libeXosip2-%{version} +%patch0 -p1 %build #./autogen.sh -%configure --disable-static +%configure --disable-static --disable-debug make %install ++++++ libeXosip2-sslverifypaths.patch ++++++ Index: libeXosip2-3.5.0/src/eXtl_tls.c =================================================================== --- libeXosip2-3.5.0.orig/src/eXtl_tls.c +++ libeXosip2-3.5.0/src/eXtl_tls.c @@ -977,10 +977,13 @@ SSL_CTX *initialize_client_ctx(const cha /* Load the CAs we trust */ if (! (SSL_CTX_load_verify_locations - (ctx, eXosip_tls_ctx_params.root_ca_cert, 0))) + (ctx, eXosip_tls_ctx_params.root_ca_cert, 0))) { OSIP_TRACE(osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, "eXosip: Couldn't read CA list\n")); + /* fallback to whatever the system has */ + SSL_CTX_set_default_verify_paths(ctx); + } { int verify_mode = SSL_VERIFY_NONE; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi-config-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-04-29 17:35:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-config-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2014-03-25 13:23:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-04-29 17:35:24.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 11:23:50 UTC 2014 - coolo(a)suse.com + +- create a PIDFILE for systemd even for live installer (2nd greatest + hack of all times) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm-liveinstall.patch ++++++ --- /var/tmp/diff_new_pack.m0H1eO/_old 2014-04-29 17:35:25.000000000 +0200 +++ /var/tmp/diff_new_pack.m0H1eO/_new 2014-04-29 17:35:25.000000000 +0200 @@ -20,7 +20,7 @@ - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + if cat /proc/cmdline | grep -q liveinstall; then + [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit -+ /usr/lib/YaST2/startup/YaST2.call live-installer ++ startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call live-installer + else + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at 2014-04-29 17:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old) and /work/SRC/openSUSE:Factory/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2014-04-18 12:37:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2014-04-29 17:34:14.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 25 10:03:55 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Make sure to depend on libkgapi2 version, against which the + package was built + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.K7WOXI/_old 2014-04-29 17:34:15.000000000 +0200 +++ /var/tmp/diff_new_pack.K7WOXI/_new 2014-04-29 17:34:15.000000000 +0200 @@ -55,6 +55,7 @@ Suggests: korganizer Suggests: ktimetracker Suggests: libkdepim4 +Requires: libkgapi2-2 >= %( echo `rpm -q --queryformat '%{VERSION}' libkgapi-devel`) BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_akonadi_requires %kde4_pimlibs_requires -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtkwave for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package gtkwave for openSUSE:Factory checked in at 2014-04-29 17:33:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkwave (Old) and /work/SRC/openSUSE:Factory/.gtkwave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkwave" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkwave/gtkwave.changes 2014-03-22 09:07:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gtkwave.new/gtkwave.changes 2014-04-29 17:33:20.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 29 10:17:50 UTC 2014 - dmitry_r(a)opensuse.org + +- Update to version 3.3.59 + * Use Duff's Device for 8 byte -> 1 byte binary value compression + algorithm in FST writer. + * Updated man page for gtkwave.1 indicating that XID is in hex. + * Allow decimal conversions on popcnt filtered vectors that are + greater than 64 bits (they will never overflow). + +------------------------------------------------------------------- Old: ---- gtkwave-3.3.58.tar.gz New: ---- gtkwave-3.3.59.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkwave.spec ++++++ --- /var/tmp/diff_new_pack.KEvM1z/_old 2014-04-29 17:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.KEvM1z/_new 2014-04-29 17:33:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: gtkwave -Version: 3.3.58 +Version: 3.3.59 Release: 0 Summary: Waveform viewer for Ditital Signals License: GPL-2.0+ ++++++ gtkwave-3.3.58.tar.gz -> gtkwave-3.3.59.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/ChangeLog new/gtkwave-3.3.59/ChangeLog --- old/gtkwave-3.3.58/ChangeLog 2014-03-16 06:31:40.000000000 +0100 +++ new/gtkwave-3.3.59/ChangeLog 2014-04-26 19:55:01.000000000 +0200 @@ -1461,3 +1461,13 @@ Change [1] at end of struct to C99 [] notation with appropriate allocation size modification. System_profiler speed fix for OSX. +3.3.59 26apr14 Use Duff's Device for 8 byte -> 1 byte binary value compression + algorithm in FST writer. + Warnings fixes from cppcheck. + Moved MinGW for FST to using different windows tempfile + generation instead of tmpfile(). + Removed fflush() in FST for MinGW in places that can cause + crashes with read only files. + Updated man page for gtkwave.1 indicating that XID is in hex. + Allow decimal conversions on popcnt filtered vectors that are + greater than 64 bits (they will never overflow). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/LICENSE.TXT new/gtkwave-3.3.59/LICENSE.TXT --- old/gtkwave-3.3.58/LICENSE.TXT 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/LICENSE.TXT 2014-03-21 19:23:34.000000000 +0100 @@ -1,6 +1,6 @@ ########################################################################## -GTKWave 3.3.58 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell. +GTKWave 3.3.59 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell. Portions of GTKWave are Copyright (C) 1999-2014 Udi Finkelstein. Context support is Copyright (C) 2007-2014 Kermin Elliott Fleming. Trace group support is Copyright (C) 2009-2014 Donald Baltus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/configure new/gtkwave-3.3.59/configure --- old/gtkwave-3.3.58/configure 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/configure 2014-03-21 19:23:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gtkwave 3.3.58. +# Generated by GNU Autoconf 2.69 for gtkwave 3.3.59. # # Report bugs to <bybell(a)rocketmail.com>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='gtkwave' PACKAGE_TARNAME='gtkwave' -PACKAGE_VERSION='3.3.58' -PACKAGE_STRING='gtkwave 3.3.58' +PACKAGE_VERSION='3.3.59' +PACKAGE_STRING='gtkwave 3.3.59' PACKAGE_BUGREPORT='bybell(a)rocketmail.com' PACKAGE_URL='' @@ -1382,7 +1382,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtkwave 3.3.58 to adapt to many kinds of systems. +\`configure' configures gtkwave 3.3.59 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtkwave 3.3.58:";; + short | recursive ) echo "Configuration of gtkwave 3.3.59:";; esac cat <<\_ACEOF @@ -1593,7 +1593,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtkwave configure 3.3.58 +gtkwave configure 3.3.59 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2237,7 +2237,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtkwave $as_me 3.3.58, which was +It was created by gtkwave $as_me 3.3.59, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3104,7 +3104,7 @@ # Define the identity of the package. PACKAGE='gtkwave' - VERSION='3.3.58' + VERSION='3.3.59' cat >>confdefs.h <<_ACEOF @@ -10959,7 +10959,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtkwave $as_me 3.3.58, which was +This file was extended by gtkwave $as_me 3.3.59, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11025,7 +11025,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtkwave config.status 3.3.58 +gtkwave config.status 3.3.59 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/configure.ac new/gtkwave-3.3.59/configure.ac --- old/gtkwave-3.3.58/configure.ac 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/configure.ac 2014-03-21 19:23:34.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(gtkwave, 3.3.58, bybell(a)rocketmail.com) +AC_INIT(gtkwave, 3.3.59, bybell(a)rocketmail.com) AC_CONFIG_SRCDIR([src/vcd.c]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/contrib/bundle_for_osx/Info-gtkwave.plist new/gtkwave-3.3.59/contrib/bundle_for_osx/Info-gtkwave.plist --- old/gtkwave-3.3.58/contrib/bundle_for_osx/Info-gtkwave.plist 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/contrib/bundle_for_osx/Info-gtkwave.plist 2014-03-21 19:23:34.000000000 +0100 @@ -8,7 +8,7 @@ <key>CFBundleExecutable</key> <string>gtkwave</string> <key>CFBundleGetInfoString</key> - <string>3.3.58, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string> + <string>3.3.59, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string> <key>CFBundleIconFile</key> <string>gtkwave.icns</string> <key>CFBundleIdentifier</key> @@ -18,11 +18,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>3.3.58</string> + <string>3.3.59</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>3.3.58</string> + <string>3.3.59</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1999 - 2014 Tony Bybell, GNU General Public License.</string> <key>LSMinimumSystemVersion</key> Files old/gtkwave-3.3.58/doc/gtkwave.odt and new/gtkwave-3.3.59/doc/gtkwave.odt differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/man/gtkwave.1 new/gtkwave-3.3.59/man/gtkwave.1 --- old/gtkwave-3.3.58/man/gtkwave.1 2012-03-24 20:47:01.000000000 +0100 +++ new/gtkwave-3.3.59/man/gtkwave.1 2014-04-22 15:05:17.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "GTKWAVE" "1" "3.3.29" "Anthony Bybell" "Simulation Wave Viewer" +.TH "GTKWAVE" "1" "3.3.59" "Anthony Bybell" "Simulation Wave Viewer" .SH "NAME" .LP gtkwave \- Visualization tool for VCD, LXT, LXT2, VZT, FST, and GHW files @@ -94,7 +94,7 @@ Specifies delay in milliseconds between successive executions of the repscript. Default is 500. .TP \fB\-X\fR,\fB\-\-xid\fR <\fIXID\fP> -Specify XID of window for a GtkPlug to connect to. GTKWave does not directly render to a window but instead renders into a +Specify XID (in hexadecimal) of window for a GtkPlug to connect to. GTKWave does not directly render to a window but instead renders into a GtkPlug expecting a GtkSocket at the other end. Note that there are issues with accelerators working properly so menus are disabled in the componentized version of GTKWave when it functions as a plug-in. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/baseconvert.c new/gtkwave-3.3.59/src/baseconvert.c --- old/gtkwave-3.3.58/src/baseconvert.c 2014-02-25 22:36:14.000000000 +0100 +++ new/gtkwave-3.3.59/src/baseconvert.c 2014-04-26 19:55:01.000000000 +0200 @@ -330,7 +330,7 @@ if(GLOBALS->show_base) { *(pnt++)='"'; } *(pnt)=0x00; /* scan build : remove dead increment */ } -else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64))) +else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64)&&(!(flags&TR_POPCNT)))) { char *parse; @@ -990,7 +990,7 @@ if(GLOBALS->show_base) { *(pnt++)='"'; } *(pnt)=0x00; /* scan build : remove dead increment */ } -else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64))) +else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64)&&(!(flags&TR_POPCNT)))) { char *parse; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/file.c new/gtkwave-3.3.59/src/file.c --- old/gtkwave-3.3.58/src/file.c 2013-10-31 03:43:36.000000000 +0100 +++ new/gtkwave-3.3.59/src/file.c 2014-04-11 01:23:04.000000000 +0200 @@ -174,7 +174,7 @@ } else { - sprintf(lpstrFilter, "%s%c%s%c%s%c%s%c", pattn, 0, pattn, 0, "All", 0, "*.*"); + sprintf(lpstrFilter, "%s%c%s%c%s%c%s%c", pattn, 0, pattn, 0, "All", 0, "*.*", 0); /* cppcheck */ ofn.nFilterIndex = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/ghwlib.c new/gtkwave-3.3.59/src/ghwlib.c --- old/gtkwave-3.3.58/src/ghwlib.c 2014-03-02 00:05:21.000000000 +0100 +++ new/gtkwave-3.3.59/src/ghwlib.c 2014-04-11 01:23:04.000000000 +0200 @@ -524,7 +524,10 @@ e->wkt = ghw_wkt_unknown; e->name = ghw_read_strid (h); if (ghw_read_uleb128 (h, (uint32_t *)&e->nbr) != 0) - return -1; + { + free(e); /* cppcheck */ + return -1; + } e->lits = (const char **) calloc (1, e->nbr * sizeof (char *)); if (h->flag_verbose > 1) printf ("enum %s:", e->name); @@ -568,13 +571,20 @@ int ix; if (ghw_read_uleb128 (h, &ph->nbr_units) != 0) - return -1; + { + free(ph); /* cppcheck */ + return -1; + } ph->units = calloc (ph->nbr_units, sizeof (struct ghw_unit)); for (ix = 0; ix < ph->nbr_units; ix++) { ph->units[ix].name = ghw_read_strid (h); if (ghw_read_lsleb128 (h, &ph->units[ix].val) < 0) - return -1; + { + free(ph->units); /* missed by cppcheck */ + free(ph); /* missed by cppcheck */ + return -1; + } } } if (h->flag_verbose > 1) @@ -606,7 +616,10 @@ arr->name = ghw_read_strid (h); arr->el = ghw_read_typeid (h); if (ghw_read_uleb128 (h, (uint32_t *)&arr->nbr_dim) != 0) - return -1; + { + free(arr); /* cppcheck */ + return -1; + } arr->dims = (union ghw_type **) calloc (arr->nbr_dim, sizeof (union ghw_type *)); for (j = 0; j < arr->nbr_dim; j++) @@ -650,7 +663,10 @@ rec->kind = t; rec->name = ghw_read_strid (h); if (ghw_read_uleb128 (h, (uint32_t *)&rec->nbr_fields) != 0) - return -1; + { + free(rec); /* cppcheck */ + return -1; + } rec->el = calloc (rec->nbr_fields, sizeof (struct ghw_record_element)); nbr_el = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/helpers/fst/fstapi.c new/gtkwave-3.3.59/src/helpers/fst/fstapi.c --- old/gtkwave-3.3.58/src/helpers/fst/fstapi.c 2014-03-18 23:26:22.000000000 +0100 +++ new/gtkwave-3.3.59/src/helpers/fst/fstapi.c 2014-04-21 08:21:59.000000000 +0200 @@ -26,6 +26,7 @@ * FST_DYNAMIC_ALIAS_DISABLE : dynamic aliases are not processed * FST_DYNAMIC_ALIAS2_DISABLE : new encoding for dynamic aliases is not generated * FST_WRITEX_DISABLE : fast write I/O routines are disabled + * FST_DISABLE_DUFFS_DEVICE : only if indirect branches are incredibly bad on host arch * * possible enables: * @@ -51,6 +52,10 @@ #include <pthread.h> #endif +#ifdef __MINGW32__ +#include <windows.h> +#endif + #if HAVE_ALLOCA_H #include <alloca.h> #elif defined(__GNUC__) @@ -139,8 +144,14 @@ #endif #endif - -/* the recoded "extra" values... */ +/* + * the recoded "extra" values... + * note that FST_RCV_Q is currently unused and is for future expansion. + * its intended use is as another level of escape such that any arbitrary + * value can be stored as the value: { time_delta, 8 bits, FST_RCV_Q }. + * this is currently not implemented so that the branchless decode is: + * uint32_t shcnt = 2 << (vli & 1); tdelta = vli >> shcnt; + */ #define FST_RCV_X (1 | (0<<1)) #define FST_RCV_Z (1 | (1<<1)) #define FST_RCV_H (1 | (2<<1)) @@ -148,6 +159,7 @@ #define FST_RCV_W (1 | (4<<1)) #define FST_RCV_L (1 | (5<<1)) #define FST_RCV_D (1 | (6<<1)) +#define FST_RCV_Q (1 | (7<<1)) #define FST_RCV_STR "xzhuwl-?" /* 01234567 */ @@ -163,6 +175,82 @@ } +/* + * system-specific temp file handling + */ +#ifdef __MINGW32__ + +static FILE* tmpfile_open(char **nam) +{ +char *fname = NULL; +TCHAR szTempFileName[MAX_PATH]; +TCHAR lpTempPathBuffer[MAX_PATH]; +DWORD dwRetVal = 0; +UINT uRetVal = 0; +FILE *fh = NULL; + +dwRetVal = GetTempPath(MAX_PATH, lpTempPathBuffer); +if((dwRetVal > MAX_PATH) || (dwRetVal == 0)) + { + fprintf(stderr, "GetTempPath() failed in "__FILE__" line %d, exiting.\n", __LINE__); + exit(255); + } + else + { + uRetVal = GetTempFileName(lpTempPathBuffer, TEXT("FSTW"), 0, szTempFileName); + if (uRetVal == 0) + { + fprintf(stderr, "GetTempFileName() failed in "__FILE__" line %d, exiting.\n", __LINE__); + exit(255); + } + else + { + fname = strdup(szTempFileName); + } + } + +if(fname) + { + if(nam) { *nam = fname; } + fh = unlink_fopen("fname", "w+b"); + } + +return(fh); +} + +#else + +static FILE* tmpfile_open(char **nam) +{ +FILE *f = tmpfile(); /* replace with mkstemp() + fopen(), etc if this is not good enough */ +if(nam) { *nam = NULL; } +return(f); +} + +#endif + + +static void tmpfile_close(FILE **f, char **nam) +{ +if(f) + { + if(*f) { fclose(*f); *f = NULL; } + } + +if(nam) + { + if(*nam) + { + unlink(*nam); + free(*nam); + *nam = NULL; + } + } +} + +/*****************************************/ + + /* * to remove warn_unused_result compile time messages * (in the future there needs to be results checking) @@ -694,6 +782,11 @@ uint32_t path_array_count; unsigned fseek_failed : 1; + +char *geom_handle_nam; +char *valpos_handle_nam; +char *curval_handle_nam; +char *tchn_handle_nam; }; @@ -1010,7 +1103,8 @@ xc->compress_hier = use_compressed_hier; fstDetermineBreakSize(xc); -if((!nam)||(!(xc->handle=unlink_fopen(nam, "w+b")))) +if((!nam)|| + (!(xc->handle=unlink_fopen(nam, "w+b")))) { free(xc); xc=NULL; @@ -1024,14 +1118,13 @@ strcpy(hf + flen, ".hier"); xc->hier_handle = unlink_fopen(hf, "w+b"); - xc->geom_handle = tmpfile(); /* .geom */ - xc->valpos_handle = tmpfile(); /* .offs */ - xc->curval_handle = tmpfile(); /* .bits */ - xc->tchn_handle = tmpfile(); /* .tchn */ + xc->geom_handle = tmpfile_open(&xc->geom_handle_nam); /* .geom */ + xc->valpos_handle = tmpfile_open(&xc->valpos_handle_nam); /* .offs */ + xc->curval_handle = tmpfile_open(&xc->curval_handle_nam); /* .bits */ + xc->tchn_handle = tmpfile_open(&xc->tchn_handle_nam); /* .tchn */ xc->vchg_alloc_siz = xc->fst_break_size + xc->fst_break_add_size; xc->vchg_mem = malloc(xc->vchg_alloc_siz); - free(hf); if(xc->hier_handle && xc->geom_handle && xc->valpos_handle && xc->curval_handle && xc->vchg_mem && xc->tchn_handle) { xc->filename = strdup(nam); @@ -1047,15 +1140,18 @@ } else { - if(xc->hier_handle) fclose(xc->hier_handle); - if(xc->geom_handle) fclose(xc->geom_handle); - if(xc->valpos_handle) fclose(xc->valpos_handle); - if(xc->curval_handle) fclose(xc->curval_handle); - if(xc->tchn_handle) fclose(xc->tchn_handle); + fclose(xc->handle); + if(xc->hier_handle) { fclose(xc->hier_handle); unlink(hf); } + tmpfile_close(&xc->geom_handle, &xc->geom_handle_nam); + tmpfile_close(&xc->valpos_handle, &xc->valpos_handle_nam); + tmpfile_close(&xc->curval_handle, &xc->curval_handle_nam); + tmpfile_close(&xc->tchn_handle, &xc->tchn_handle_nam); free(xc->vchg_mem); free(xc); xc=NULL; } + + free(hf); } return(xc); @@ -1161,7 +1257,7 @@ #endif #endif -if((!xc)||(xc->vchg_siz <= 1)||(xc->already_in_flush)) return; +if((xc->vchg_siz <= 1)||(xc->already_in_flush)) return; xc->already_in_flush = 1; /* should really do this with a semaphore */ xc->section_header_only = 0; @@ -1291,6 +1387,8 @@ if(is_binary) { unsigned char acc = 0; +#ifdef FST_DISABLE_DUFFS_DEVICE + /* old algorithm */ int shift = 7 - ((vm4ip[1]-1) & 7); for(idx=vm4ip[1]-1;idx>=0;idx--) { @@ -1303,6 +1401,24 @@ acc = 0; } } +#else + /* new algorithm */ + idx = ((vm4ip[1]+7) & ~7); + switch(vm4ip[1] & 7) + { + case 0: do { acc = (pnt[idx+7-8] & 1) << 0; + case 7: acc |= (pnt[idx+6-8] & 1) << 1; + case 6: acc |= (pnt[idx+5-8] & 1) << 2; + case 5: acc |= (pnt[idx+4-8] & 1) << 3; + case 4: acc |= (pnt[idx+3-8] & 1) << 4; + case 3: acc |= (pnt[idx+2-8] & 1) << 5; + case 2: acc |= (pnt[idx+1-8] & 1) << 6; + case 1: acc |= (pnt[idx+0-8] & 1) << 7; + *(--scratchpnt) = acc; + idx -= 8; + } while(idx); + } +#endif scratchpnt = fstCopyVarint32ToLeft(scratchpnt, (time_delta << 1)); } @@ -1660,7 +1776,7 @@ #endif free(xc->valpos_mem); free(xc->vchg_mem); -fclose(xc->tchn_handle); +tmpfile_close(&xc->tchn_handle, &xc->tchn_handle_nam); free(xc); return(NULL); @@ -1703,7 +1819,7 @@ } xc->tchn_cnt = xc->tchn_idx = 0; - xc->tchn_handle = tmpfile(); + xc->tchn_handle = tmpfile_open(&xc->tchn_handle_nam); /* child thread will deallocate file/name */ fstWriterFseeko(xc, xc->tchn_handle, 0, SEEK_SET); fstFtruncate(fileno(xc->tchn_handle), 0); @@ -1975,11 +2091,11 @@ fstWriterUint64(xc->handle, xc->secnum); fflush(xc->handle); - if(xc->tchn_handle) { fclose(xc->tchn_handle); xc->tchn_handle = NULL; } + tmpfile_close(&xc->tchn_handle, &xc->tchn_handle_nam); free(xc->vchg_mem); xc->vchg_mem = NULL; - if(xc->curval_handle) { fclose(xc->curval_handle); xc->curval_handle = NULL; } - if(xc->valpos_handle) { fclose(xc->valpos_handle); xc->valpos_handle = NULL; } - if(xc->geom_handle) { fclose(xc->geom_handle); xc->geom_handle = NULL; } + tmpfile_close(&xc->curval_handle, &xc->curval_handle_nam); + tmpfile_close(&xc->valpos_handle, &xc->valpos_handle_nam); + tmpfile_close(&xc->geom_handle, &xc->geom_handle_nam); if(xc->hier_handle) { fclose(xc->hier_handle); xc->hier_handle = NULL; } if(xc->handle) { @@ -2988,6 +3104,9 @@ int writex_fd; unsigned char writex_buf[FST_WRITEX_MAX]; #endif + +char *f_nam; +char *fh_nam; }; @@ -3465,7 +3584,6 @@ static int fstVcdIDForFwrite(char *buf, unsigned int value) { char *pnt = buf; -unsigned int vmod; /* zero is illegal for a value...it is assumed they start at one */ while (value) @@ -3508,14 +3626,16 @@ sprintf(fnam, "%s.hier_%d_%p", xc->filename, getpid(), (void *)xc); fstReaderFseeko(xc, xc->f, xc->hier_pos, SEEK_SET); uclen = fstReaderUint64(xc->f); +#ifndef __MINGW32__ fflush(xc->f); - +#endif if(htyp == FST_BL_HIER) { fstReaderFseeko(xc, xc->f, xc->hier_pos, SEEK_SET); uclen = fstReaderUint64(xc->f); +#ifndef __MINGW32__ fflush(xc->f); - +#endif zfd = dup(fileno(xc->f)); zhandle = gzdopen(zfd, "rb"); if(!zhandle) @@ -3532,7 +3652,9 @@ fstReaderFseeko(xc, xc->f, xc->hier_pos - 8, SEEK_SET); /* get section len */ clen = fstReaderUint64(xc->f) - 16; uclen = fstReaderUint64(xc->f); +#ifndef __MINGW32__ fflush(xc->f); +#endif } #ifndef __MINGW32__ @@ -3540,10 +3662,11 @@ if(!xc->fh) #endif { - xc->fh = tmpfile(); + xc->fh = tmpfile_open(&xc->fh_nam); free(fnam); fnam = NULL; if(!xc->fh) { + tmpfile_close(&xc->fh, &xc->fh_nam); free(mem); return(0); } @@ -4131,9 +4254,9 @@ fcomp = fopen(hf, "w+b"); if(!fcomp) { - fcomp = tmpfile(); + fcomp = tmpfile_open(&xc->f_nam); free(hf); hf = NULL; - if(!fcomp) return(0); + if(!fcomp) { tmpfile_close(&fcomp, &xc->f_nam); return(0); } } #if defined(FST_MACOSX) @@ -4152,7 +4275,9 @@ #endif fstReaderFseeko(xc, xc->f, 1+8+8, SEEK_SET); +#ifndef __MINGW32__ fflush(xc->f); +#endif zfd = dup(fileno(xc->f)); zhandle = gzdopen(zfd, "rb"); @@ -4501,12 +4626,12 @@ if(xc->fh) { - fclose(xc->fh); xc->fh = NULL; + tmpfile_close(&xc->fh, &xc->fh_nam); } if(xc->f) { - fclose(xc->f); xc->f = NULL; + tmpfile_close(&xc->f, &xc->f_nam); if(xc->filename_unpacked) { unlink(xc->filename_unpacked); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/helpers/vcd2fst.c new/gtkwave-3.3.59/src/helpers/vcd2fst.c --- old/gtkwave-3.3.58/src/helpers/vcd2fst.c 2014-02-18 00:46:26.000000000 +0100 +++ new/gtkwave-3.3.59/src/helpers/vcd2fst.c 2014-04-21 08:21:59.000000000 +0200 @@ -55,6 +55,20 @@ static uint32_t var_direction_idx = 0; static unsigned char *var_direction = NULL; + +static void *realloc_2(void *ptr, size_t siz) /* cppcheck */ +{ +void *pnt = realloc(ptr, siz); +if(!pnt) + { + fprintf(stderr, "ERROR: Out of memory in realloc(), exiting!\n"); /* normally free(ptr) here */ + exit(255); + } + +return(pnt); +} + + /*********************************************************/ /*** vvv extload component type name determination vvv ***/ /*********************************************************/ @@ -380,7 +394,7 @@ while(((*wbuf)[*len] != 1) && !feof(f)) { /* fprintf(stderr, "overflow %d\n", (int)(*len)); */ - *wbuf = realloc(*wbuf, (*len) * 2 + 1); + *wbuf = realloc_2(*wbuf, (*len) * 2 + 1); (*wbuf)[(*len) * 2] = 1; fgets_rc = fgets(*wbuf + (*len), (*len) + 1, f); @@ -507,6 +521,7 @@ { printf("Could not open '%s', exiting.\n", vname); free(bin_fixbuff); bin_fixbuff = NULL; + free(vname); free(fstname); exit(255); } @@ -516,6 +531,8 @@ { printf("Could not open '%s', exiting.\n", fstname); free(bin_fixbuff); bin_fixbuff = NULL; + free(vname); free(fstname); + fclose(f); exit(255); } @@ -1350,7 +1367,7 @@ if(node_len >= bin_fixbuff_len) { bin_fixbuff_len = node_len + 1; - bin_fixbuff = realloc(bin_fixbuff, bin_fixbuff_len); + bin_fixbuff = realloc_2(bin_fixbuff, bin_fixbuff_len); } memset(bin_fixbuff, buf[1] != '1' ? buf[1] : '0', delta); @@ -1376,7 +1393,7 @@ if(node_len >= bin_fixbuff_len) { bin_fixbuff_len = node_len + 1; - bin_fixbuff = realloc(bin_fixbuff, bin_fixbuff_len); + bin_fixbuff = realloc_2(bin_fixbuff, bin_fixbuff_len); } memset(bin_fixbuff, buf[1] != '1' ? buf[1] : '0', delta); @@ -1428,7 +1445,7 @@ if(p_len >= bin_fixbuff_len) { bin_fixbuff_len = p_len + 1; - bin_fixbuff = realloc(bin_fixbuff, bin_fixbuff_len); + bin_fixbuff = realloc_2(bin_fixbuff, bin_fixbuff_len); } pnt = bin_fixbuff; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/helpers/vzt_read.c new/gtkwave-3.3.59/src/helpers/vzt_read.c --- old/gtkwave-3.3.58/src/helpers/vzt_read.c 2014-03-01 23:50:23.000000000 +0100 +++ new/gtkwave-3.3.59/src/helpers/vzt_read.c 2014-04-11 01:23:04.000000000 +0200 @@ -1436,7 +1436,7 @@ vpa->lt = lt; vpa->b = b; -vzt_rd_pthread_create(lt, &b->pth, &b->pth_attr, vzt_rd_decompress_blk_pth_actual, vpa); +vzt_rd_pthread_create(lt, &b->pth, &b->pth_attr, vzt_rd_decompress_blk_pth_actual, vpa); /* cppcheck misfires thinking vpa is not freed even though vzt_rd_decompress_blk_pth_actual() does it */ } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/ptranslate.c new/gtkwave-3.3.59/src/ptranslate.c --- old/gtkwave-3.3.58/src/ptranslate.c 2012-01-05 21:52:20.000000000 +0100 +++ new/gtkwave-3.3.59/src/ptranslate.c 2014-04-11 01:23:04.000000000 +0200 @@ -140,8 +140,8 @@ if((strlen(abs_path) == 0)||(!result)) { status_text("Could not find filter process!\n"); + pclose(stream); /* cppcheck */ return; - } pclose(stream); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/ttranslate.c new/gtkwave-3.3.59/src/ttranslate.c --- old/gtkwave-3.3.58/src/ttranslate.c 2014-03-04 00:59:31.000000000 +0100 +++ new/gtkwave-3.3.59/src/ttranslate.c 2014-04-11 01:23:04.000000000 +0200 @@ -159,6 +159,7 @@ if((strlen(abs_path) == 0)||(!result)) { status_text("Could not find transaction filter process!\n"); + pclose(stream); /* cppcheck */ return; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cups-filters for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2014-04-29 17:33:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups-filters (Old) and /work/SRC/openSUSE:Factory/.cups-filters.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cups-filters" Changes: -------- --- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2014-04-26 09:59:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2014-04-29 17:33:16.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Apr 28 10:49:21 CEST 2014 - jsmeix(a)suse.de + +- Version upgrade to 1.0.53 + Changes in 1.0.53: + * foomatic-rip: Fixed segfault when creating log file, see + https://bugs.linuxfoundation.org/show_bug.cgi?id=1206 + * cups-browsed: SECURITY FIX: Fix on usage of the + "BrowseAllow" directive in cups-browsed.conf. Before, if the + argument of a "BrowseAllow" directive is not understood it + is treated as the directive not having been there, allowing + any host if this was the only "BrowseAllow" directive. Now + we treat this as a directive which no host can fulfill, not + allowing any host if it was the only one. No "BrowseAllow" + directive means access for all, as before, see + https://bugs.linuxfoundation.org/show_bug.cgi?id=1204 + (bnc#871327 therein comment#23 and subsequent comments). + * cups-browsed: SECURITY FIX: Further improvement on the fix + in 1.0.51 as it was insufficient. In addition, some fixes + against OOB access are done + (bnc#871327 therein comment#30 and subsequent comments). +- Removed the "# BrowseAllow cups.example.com" example line in + /etc/cups/cups-browsed.conf because hostnames do not work, see + https://bugs.linuxfoundation.org/show_bug.cgi?id=1205 + +------------------------------------------------------------------- Old: ---- cups-filters-1.0.52.tar.gz New: ---- cups-filters-1.0.53.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-filters.spec ++++++ --- /var/tmp/diff_new_pack.xRLVt2/_old 2014-04-29 17:33:17.000000000 +0200 +++ /var/tmp/diff_new_pack.xRLVt2/_new 2014-04-29 17:33:17.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Summary: OpenPrinting CUPS filters, backends, and cups-browsed License: GPL-2.0 and GPL-2.0+ and GPL-3.0 and MIT Group: Hardware/Printing @@ -35,7 +36,7 @@ # and also run: zypper vcmp 'next version' 'current version' # e.g. zypper vcmp '1.0.49' '1.0.49.20140326' -> 1.0.49 is older than 1.0.49.20140326 # and zypper vcmp '1.0.50' '1.0.49.20140326' -> 1.0.50 is newer than 1.0.49.20140326 -Version: 1.0.52 +Version: 1.0.53 Release: 0 # tarball_version is used below to specify the directory via "setup -n": # Special tarball_version needed for current cups-filters e.g. "define tarball_version 9.10rc1". @@ -60,6 +61,7 @@ # pdftops BuildRequires: poppler-tools # pdftoijs, pdftoopvp, pdftoraster +BuildRequires: ghostscript-mini-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libpoppler-cpp0 @@ -67,7 +69,6 @@ BuildRequires: libpoppler-glib-devel BuildRequires: libtiff-devel BuildRequires: zlib-devel -BuildRequires: ghostscript-mini-devel # libijs BuildRequires: fontconfig-devel BuildRequires: freetype2-devel @@ -85,9 +86,9 @@ # autogen.sh BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool -BuildRequires: glibc-devel BuildRequires: gcc-c++ +BuildRequires: glibc-devel +BuildRequires: libtool BuildRequires: systemd %systemd_requires # test requires @@ -152,12 +153,16 @@ and software developed independently of Apple, especially filters for the PDF-centric printing workflow introduced by OpenPrinting and a daemon -to browse Bonjour broadcasts of remote CUPS printers +to browse broadcasts of remote CUPS printers and makes these printers available locally. %package ghostscript Summary: OpenPrinting CUPS filters for Ghostscript Group: Hardware/Printing +# Provide the well known generic name "gstoraster" so that it is easier for users +# to find or install the RPM package name "cups-filters-ghostscript" that actually provides it +# e.g. via "zypper search gstoraster" or "zypper install gstoraster": +Provides: gstoraster %description ghostscript Since Ghostscript version 9.10 the CUPS filters @@ -167,10 +172,10 @@ The binary RPM sub-package cups-filters-ghostscript provides only those CUPS filters for Ghostscript. This way cups-filters-ghostscript can be used -with the traditional CUPS up to version 1.5.4 +with the traditional CUPS up to version 1.5 where the other filters, backends, and cups-browsed from cups-filters would cause conflicts because -CUPS <= 1.5.4 already provides them. In contrast +CUPS <= 1.5 already provides them. In contrast for CUPS versions since 1.6 the whole cups-filters is usually needed (but not strictly required). @@ -192,7 +197,8 @@ # and all required packages are provided on the same repository: Requires: cups-filters-ghostscript = %{version}-%{release} # Provide the well known generic name "foomatic-rip" so that it is easier for users -# to find the RPM package name "cups-filters-foomatic-rip" that actually provides it: +# to find or install the RPM package name "cups-filters-foomatic-rip" that actually provides it +# e.g. via "zypper search foomatic-rip" or "zypper install foomatic-rip": Provides: foomatic-rip # Provide foomatic-filters with the exact foomatic_rip_version # see https://bugzilla.novell.com/show_bug.cgi?id=870621 @@ -220,7 +226,8 @@ # the CUPS Browsing functionality is provided by the cupsd # because it can be disabled for the cupsd up to CUPS 1.5.4. # Provide the well known generic name "cups-browsed" so that it is easier for users -# to find the RPM package name "cups-filters-cups-browsed" that actually provides it: +# to find or install the RPM package name "cups-filters-cups-browsed" that actually provides it +# e.g. via "zypper search cups-browsed" or "zypper install cups-browsed": Provides: cups-browsed %description cups-browsed @@ -230,7 +237,7 @@ to provide again basic CUPS Browsing functionality. This way basic CUPS Browsing works on clients with CUPS >= 1.6 when there are remote CUPS servers -of version 1.5 and older in the network. +of CUPS version 1.5 and older in the network. For each reported remote CUPS queue cups-browsed creates a local raw queue pointing to the remote queue so that it appears in local print dialogs and is also available @@ -290,6 +297,13 @@ %install make install DESTDIR=%{buildroot} +# As band-aid for now remove the "# BrowseAllow cups.example.com" example line in cups-browsed.conf +# because currently hostnames do not work, see https://bugs.linuxfoundation.org/show_bug.cgi?id=1205 +if grep -q '^# BrowseAllow cups.example.com' %{buildroot}%{_sysconfdir}/cups/cups-browsed.conf +then sed -i -e '/^# BrowseAllow cups.example.com/d' %{buildroot}%{_sysconfdir}/cups/cups-browsed.conf +else echo "No longer '# BrowseAllow cups.example.com' in cups-browsed.conf - clean up cups-filters.spec" + exit 9 +fi # https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc mkdir __doc mv %{buildroot}%{_datadir}/doc/cups-filters/* __doc ++++++ cups-filters-1.0.52.tar.gz -> cups-filters-1.0.53.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/INSTALL new/cups-filters-1.0.53/INSTALL --- old/cups-filters-1.0.52/INSTALL 2014-04-07 21:56:59.000000000 +0200 +++ new/cups-filters-1.0.53/INSTALL 2014-04-25 15:30:24.000000000 +0200 @@ -1,4 +1,4 @@ -INSTALL - OpenPrinting CUPS Filters v1.0.52 - 2014-04-07 +INSTALL - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25 -------------------------------------------------------- This file describes how to compile and install OpenPrinting CUPS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/Makefile.in new/cups-filters-1.0.53/Makefile.in --- old/cups-filters-1.0.52/Makefile.in 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/Makefile.in 2014-04-25 16:13:35.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -1646,8 +1646,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -2270,14 +2270,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -4345,10 +4345,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -4390,9 +4396,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/NEWS new/cups-filters-1.0.53/NEWS --- old/cups-filters-1.0.52/NEWS 2014-04-07 21:56:31.000000000 +0200 +++ new/cups-filters-1.0.53/NEWS 2014-04-25 16:00:57.000000000 +0200 @@ -1,6 +1,23 @@ -NEWS - OpenPrinting CUPS Filters v1.0.52 - 2014-04-07 +NEWS - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25 ----------------------------------------------------- +CHANGES IN V1.0.53 + + - foomatic-rip: Fixed segfault when creating log file (Bug + #1206). + - cups-browsed: SECURITY FIX: Fix on usage of the + "BrowseAllow" directive in cups-browsed.conf. Before, if the + argument of a "BrowseAllow" directive is not understood it + is treated as the directive not having been there, allowing + any host if this was the only "BrowseAllow" directive. Now + we treat this as a directive which no host can fulfill, not + allowing any host if it was the only one. No "BrowseAllow" + directive means access for all, as before (Bug #1204). + - cups-browsed: SECURITY FIX: Further improvement on the fix + in 1.0.51 as it was insufficient. In addition, some fixes + against OOB access are done. Thanks to Sebastian Krahmer for + the patch (SUSE/Novell bug #871327). + CHANGES IN V1.0.52 - texttopdf: Make sure that margin changes for prettyprint diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/README new/cups-filters-1.0.53/README --- old/cups-filters-1.0.52/README 2014-04-07 21:56:44.000000000 +0200 +++ new/cups-filters-1.0.53/README 2014-04-25 15:29:21.000000000 +0200 @@ -1,4 +1,4 @@ -README - OpenPrinting CUPS Filters v1.0.52 - 2014-04-07 +README - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25 ------------------------------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/aclocal.m4 new/cups-filters-1.0.53/aclocal.m4 --- old/cups-filters-1.0.52/aclocal.m4 2014-04-07 21:58:37.000000000 +0200 +++ new/cups-filters-1.0.53/aclocal.m4 2014-04-25 16:13:34.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -192,10 +192,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -211,7 +211,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -578,6 +578,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -686,7 +692,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake(a)gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -694,7 +741,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -806,38 +852,6 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -908,6 +922,70 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/config.h.in new/cups-filters-1.0.53/config.h.in --- old/cups-filters-1.0.52/config.h.in 2014-04-07 21:58:38.000000000 +0200 +++ new/cups-filters-1.0.53/config.h.in 2014-04-25 16:13:50.000000000 +0200 @@ -160,9 +160,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/configure new/cups-filters-1.0.53/configure --- old/cups-filters-1.0.52/configure 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/configure 2014-04-25 16:13:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for cups-filters 1.0.52. +# Generated by GNU Autoconf 2.69 for cups-filters 1.0.53. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='cups-filters' PACKAGE_TARNAME='cups-filters' -PACKAGE_VERSION='1.0.52' -PACKAGE_STRING='cups-filters 1.0.52' +PACKAGE_VERSION='1.0.53' +PACKAGE_STRING='cups-filters 1.0.53' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1438,7 +1438,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cups-filters 1.0.52 to adapt to many kinds of systems. +\`configure' configures cups-filters 1.0.53 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1508,7 +1508,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cups-filters 1.0.52:";; + short | recursive ) echo "Configuration of cups-filters 1.0.53:";; esac cat <<\_ACEOF @@ -1698,7 +1698,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cups-filters configure 1.0.52 +cups-filters configure 1.0.53 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2305,7 +2305,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cups-filters $as_me 1.0.52, which was +It was created by cups-filters $as_me 1.0.53, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2741,7 +2741,7 @@ #serial 11 -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -3256,7 +3256,7 @@ # Define the identity of the package. PACKAGE='cups-filters' - VERSION='1.0.52' + VERSION='1.0.53' cat >>confdefs.h <<_ACEOF @@ -3307,6 +3307,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake(a)gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4148,6 +4189,65 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4725,131 +4825,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7428,7 +7403,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7453,7 +7428,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7472,7 +7450,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -17921,7 +17902,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17967,7 +17948,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17991,7 +17972,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18036,7 +18017,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18060,7 +18041,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -19331,7 +19312,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cups-filters $as_me 1.0.52, which was +This file was extended by cups-filters $as_me 1.0.53, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19397,7 +19378,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cups-filters config.status 1.0.52 +cups-filters config.status 1.0.53 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/configure.ac new/cups-filters-1.0.53/configure.ac --- old/cups-filters-1.0.52/configure.ac 2014-04-07 21:57:15.000000000 +0200 +++ new/cups-filters-1.0.53/configure.ac 2014-04-25 15:30:43.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([cups_filters_version_major],[1]) m4_define([cups_filters_version_minor],[0]) -m4_define([cups_filters_version_micro],[52]) +m4_define([cups_filters_version_micro],[53]) m4_define([cups_filters_version],[cups_filters_version_major.cups_filters_version_minor.cups_filters_version_micro]) # ============= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/filter/foomatic-rip/foomaticrip.c new/cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c --- old/cups-filters-1.0.52/filter/foomatic-rip/foomaticrip.c 2014-02-10 23:21:21.000000000 +0100 +++ new/cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c 2014-04-25 15:57:42.000000000 +0200 @@ -736,7 +736,8 @@ debug = 1; if (debug) { - int fd = mkstemp (LOG_FILE "-XXXXXX.log"); + sprintf(tmp, "%s-XXXXXX.log", LOG_FILE); + int fd = mkstemps (tmp, 4); if (fd != -1) logh = fdopen(fd, "w"); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/ltmain.sh new/cups-filters-1.0.53/ltmain.sh --- old/cups-filters-1.0.52/ltmain.sh 2014-04-07 21:58:35.000000000 +0200 +++ new/cups-filters-1.0.53/ltmain.sh 2014-04-25 16:13:32.000000000 +0200 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/m4/libtool.m4 new/cups-filters-1.0.53/m4/libtool.m4 --- old/cups-filters-1.0.52/m4/libtool.m4 2014-04-07 21:58:35.000000000 +0200 +++ new/cups-filters-1.0.53/m4/libtool.m4 2014-04-25 16:13:32.000000000 +0200 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/missing new/cups-filters-1.0.53/missing --- old/cups-filters-1.0.52/missing 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/missing 2014-04-25 16:13:35.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/test-driver new/cups-filters-1.0.53/test-driver --- old/cups-filters-1.0.52/test-driver 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/test-driver 2014-04-25 16:13:35.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2013-07-13.22; # UTC # Copyright (C) 2011-2013 Free Software Foundation, Inc. # @@ -44,13 +44,12 @@ Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. @@ -69,10 +68,23 @@ --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; + *) break;; esac shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='[0;31m' # Red. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/utils/cups-browsed.c new/cups-filters-1.0.53/utils/cups-browsed.c --- old/cups-filters-1.0.52/utils/cups-browsed.c 2014-04-02 01:27:02.000000000 +0200 +++ new/cups-filters-1.0.53/utils/cups-browsed.c 2014-04-24 22:52:34.000000000 +0200 @@ -95,7 +95,8 @@ /* Data structure for browse allow/deny rules */ typedef enum allow_type_e { ALLOW_IP, - ALLOW_NET + ALLOW_NET, + ALLOW_INVALID } allow_type_t; typedef struct allow_s { allow_type_t type; @@ -420,7 +421,7 @@ p->name, p->uri); goto fail; } - + #if 0 uri_status = httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), @@ -584,7 +585,7 @@ /* * Remove all illegal characters and replace each group of such characters - * by a single dash + * by a single dash, return a free()-able string. * * mode = 0: Only allow letters, numbers, and dashes, for turning make/model * info into a valid print queue name or inro a string which can @@ -613,6 +614,11 @@ return NULL; str = strdup(str_orig); + + /* for later str[strlen(str)-1] access */ + if (strlen(str) < 1) + return str; + for (i = 0, j = 0; i < strlen(str); i++, j++) { if (((str[i] >= 'A') && (str[i] <= 'Z')) || ((str[i] >= 'a') && (str[i] <= 'z')) || @@ -636,11 +642,14 @@ /* Cut off trailing dashes */ while (str[strlen(str)-1] == '-') str[strlen(str)-1] = '\0'; + /* Cut off leading dashes */ - while (str[0] == '-') - str ++; + i = 0; + while (str[i] == '-') + ++i; - return str; + /* keep a free()-able string. +1 for trailing \0 */ + return memmove(str, str + i, strlen(str) - i + 1); } gboolean handle_cups_queues(gpointer unused) { @@ -737,7 +746,7 @@ } if (default_printer_name) break; - } + } } if (default_printer_name && !strcasecmp(default_printer_name, p->name)) { @@ -955,43 +964,52 @@ void *txt) { char uri[HTTP_MAX_URI]; - char *remote_queue, *remote_host, *pdl = NULL; + char *remote_queue = NULL, *remote_host = NULL, *pdl = NULL; #ifdef HAVE_AVAHI char *fields[] = { "product", "usb_MDL", "ty", NULL }, **f; - AvahiStringList *entry; - char *key, *value; + AvahiStringList *entry = NULL; + char *key = NULL, *value = NULL; #endif /* HAVE_AVAHI */ remote_printer_t *p; - char *backup_queue_name, *local_queue_name = NULL; - cups_dest_t *dests, *dest; + char *backup_queue_name = NULL, *local_queue_name = NULL; + cups_dest_t *dests = NULL, *dest = NULL; int i, num_dests, is_cups_queue; - const char *val; + size_t hl = 0; + const char *val = NULL; is_cups_queue = 0; + memset(uri, 0, sizeof(uri)); + /* Determine the device URI of the remote printer */ - httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), + httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri) - 1, (strcasestr(type, "_ipps") ? "ipps" : "ipp"), NULL, host, port, "/%s", resource); - /* Find the remote host name */ - remote_host = strdup(host); - if (!strcmp(remote_host + strlen(remote_host) - 6, ".local")) - remote_host[strlen(remote_host) - 6] = '\0'; - if (!strcmp(remote_host + strlen(remote_host) - 7, ".local.")) - remote_host[strlen(remote_host) - 7] = '\0'; + /* Find the remote host name. + * Used in constructing backup_queue_name, so need to sanitize. + * strdup() is called inside remove_bad_chars() and result is free()-able. + */ + remote_host = remove_bad_chars(host, 1); + hl = strlen(remote_host); + if (hl > 6 && !strcmp(remote_host + hl - 6, ".local")) + remote_host[hl - 6] = '\0'; + if (hl > 7 && !strcmp(remote_host + hl - 7, ".local.")) + remote_host[hl - 7] = '\0'; /* Check by the resource whether the discovered printer is a CUPS queue */ if (!strncmp(resource, "printers/", 9)) { /* This is a remote CUPS queue, use the remote queue name for the local queue */ is_cups_queue = 1; - remote_queue = resource + 9; + /* Not directly used in script generation input later, but taken from packet, + * so better safe than sorry. (consider second loop with backup_queue_name) */ + remote_queue = remove_bad_chars(resource + 9, 0); debug_printf("cups-browsed: Found CUPS queue: %s on host %s.\n", remote_queue, remote_host); } else { /* This is an IPP-based network printer */ is_cups_queue = 0; /* Determine the queue name by the model */ - remote_queue = "printer"; + remote_queue = strdup("printer"); #ifdef HAVE_AVAHI if (txt) { for (f = fields; *f; f ++) { @@ -1018,7 +1036,7 @@ /* Check if there exists already a CUPS queue with the requested name Try name@host in such a case and if this is also taken, ignore the printer */ - if ((backup_queue_name = malloc((strlen(remote_queue) + + if ((backup_queue_name = malloc((strlen(remote_queue) + strlen(remote_host) + 2) * sizeof(char))) == NULL) { debug_printf("cups-browsed: ERROR: Unable to allocate memory.\n"); @@ -1045,6 +1063,8 @@ uri); free (remote_host); free (backup_queue_name); + free (pdl); + free (remote_queue); cupsFreeDests(num_dests, dests); return; } @@ -1082,6 +1102,8 @@ local_queue_name); free (backup_queue_name); free (remote_host); + free (pdl); + free (remote_queue); cupsFreeDests(num_dests, dests); return; } @@ -1157,6 +1179,8 @@ free (backup_queue_name); free (remote_host); + free (pdl); + free (remote_queue); if (p) debug_printf("cups-browsed: Bonjour IDs: Service name: \"%s\", " @@ -1228,7 +1252,7 @@ } /* Clean up */ - + avahi_free(rp_key); avahi_free(rp_value); avahi_free(adminurl_key); @@ -1422,7 +1446,7 @@ avahi_client_free(client); client = NULL; } - if (glib_poll) { + if (glib_poll) { avahi_glib_poll_free(glib_poll); glib_poll = NULL; } @@ -1551,12 +1575,18 @@ char local_resource[HTTP_MAX_URI]; char *c; + memset(scheme, 0, sizeof(scheme)); + memset(username, 0, sizeof(username)); + memset(host, 0, sizeof(host)); + memset(resource, 0, sizeof(resource)); + memset(local_resource, 0, sizeof(local_resource)); + httpSeparateURI (HTTP_URI_CODING_ALL, uri, - scheme, sizeof(scheme), - username, sizeof(username), - host, sizeof(host), + scheme, sizeof(scheme) - 1, + username, sizeof(username) - 1, + host, sizeof(host) - 1, &port, - resource, sizeof(resource)); + resource, sizeof(resource)- 1); /* Check this isn't one of our own broadcasts */ for (iface = cupsArrayFirst (netifs); @@ -1600,6 +1630,9 @@ allow; allow = cupsArrayNext (browseallow)) { switch (allow->type) { + case ALLOW_INVALID: + break; + case ALLOW_IP: switch (srcaddr->sa_family) { case AF_INET: @@ -1665,7 +1698,12 @@ char remote_host[256]; char uri[1024]; char info[1024]; - char *c; + char *c = NULL, *end = NULL; + + memset(packet, 0, sizeof(packet)); + memset(remote_host, 0, sizeof(remote_host)); + memset(uri, 0, sizeof(uri)); + memset(info, 0, sizeof(info)); srclen = sizeof (srcaddr); got = recvfrom (browsesocket, packet, sizeof (packet) - 1, 0, @@ -1678,7 +1716,7 @@ } packet[got] = '\0'; - httpAddrString (&srcaddr, remote_host, sizeof (remote_host)); + httpAddrString (&srcaddr, remote_host, sizeof (remote_host) - 1); /* Check this packet is allowed */ if (!allowed ((struct sockaddr *) &srcaddr)) { @@ -1696,28 +1734,42 @@ } info[0] = '\0'; + + /* do not read OOB */ + end = packet + sizeof(packet); c = strchr (packet, '\"'); + if (c >= end) + return TRUE; + if (c) { /* Skip location field */ - for (c++; *c != '\"'; c++) + for (c++; c < end && *c != '\"'; c++) ; + if (c >= end) + return TRUE; + if (*c == '\"') { - for (c++; isspace(*c); c++) + for (c++; c < end && isspace(*c); c++) ; } + if (c >= end) + return TRUE; + /* Is there an info field? */ if (*c == '\"') { int i; c++; for (i = 0; - i < sizeof (info) - 1 && *c != '\"'; + i < sizeof (info) - 1 && *c != '\"' && c < end; i++, c++) info[i] = *c; info[i] = '\0'; } } + if (c >= end) + return TRUE; found_cups_printer (remote_host, uri, info); recheck_timer (); @@ -1926,7 +1978,7 @@ while (attr && ippGetGroupTag(attr) == IPP_TAG_PRINTER) { const char *attrname = ippGetName(attr); int value_tag = ippGetValueTag(attr); - + if (!strcmp(attrname, "printer-type") && value_tag == IPP_TAG_ENUM) { type = ippGetInteger(attr, 0); @@ -2424,6 +2476,8 @@ char *p; struct in_addr addr; allow_t *allow = calloc (1, sizeof (allow_t)); + if (value == NULL) + goto fail; p = strchr (value, '/'); if (p) { char *s = strdup (value); @@ -2466,7 +2520,8 @@ return 0; fail: - free (allow); + allow->type = ALLOW_INVALID; + cupsArrayAdd (browseallow, allow); return 1; } @@ -2570,7 +2625,7 @@ BrowsePoll[NumBrowsePoll++] = b; } } - } else if (!strcasecmp(line, "BrowseAllow") && value) { + } else if (!strcasecmp(line, "BrowseAllow")) { if (read_browseallow_value (value)) debug_printf ("cups-browsed: BrowseAllow value \"%s\" not understood\n", value); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-oss for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package alsa-oss for openSUSE:Factory checked in at 2014-04-29 17:33:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-oss (Old) and /work/SRC/openSUSE:Factory/.alsa-oss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-oss" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-oss/alsa-oss.changes 2013-05-28 07:24:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-oss.new/alsa-oss.changes 2014-04-29 17:33:10.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 28 17:03:38 CEST 2014 - tiwai(a)suse.de + +- Fix for dmix with unaligned sample rate: + 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch + 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch + +------------------------------------------------------------------- +Mon Apr 28 12:28:36 CEST 2014 - tiwai(a)suse.de + +- Revert 0001-Fix-path-to-libaoss.so.patch, as this causes + regressions on multi-arch (bnc#874331) + +------------------------------------------------------------------- Old: ---- 0001-Fix-path-to-libaoss.so.patch New: ---- 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-oss.spec ++++++ --- /var/tmp/diff_new_pack.NhcVgR/_old 2014-04-29 17:33:11.000000000 +0200 +++ /var/tmp/diff_new_pack.NhcVgR/_new 2014-04-29 17:33:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package alsa-oss # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,8 +29,9 @@ Source2: baselibs.conf # Patch: alsa-oss-hg-fixes.diff # upstream fixes -Patch1: 0001-Fix-path-to-libaoss.so.patch Patch2: 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch +Patch3: 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch +Patch4: 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch Url: http://www.alsa-project.org/ %ifarch s390x Recommends: %{name}-32bit = %{version} @@ -44,8 +45,9 @@ %prep %setup -q -n %{name}-%{package_version} # %patch -p1 -%patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build autoreconf -fi ++++++ 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch ++++++ >From 40357524a04019173d7073b683ebc2465c3db30a Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Mon, 28 Apr 2014 16:54:29 +0200 Subject: [PATCH] Fix the argument passed to snd_pcm_dump_setup() Although it's currently disabled via ifdef, better to fix it so that any other people won't fall into the same hole like me. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- alsa/pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index 19b67e0fe8e4..fdf99337997f 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -308,8 +308,8 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; #if 0 - if (alsa_oss_debug) - snd_pcm_dump_setup(pcm, stderr); + if (alsa_oss_debug && alsa_oss_debug_out) + snd_pcm_dump_setup(pcm, alsa_oss_debug_out); #endif if (err < 0) return err; -- 1.9.2 ++++++ 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch ++++++ >From 22dc53a906f3550b4ad0ce82684d98228d95713c Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Mon, 28 Apr 2014 16:57:18 +0200 Subject: [PATCH] Workaround for aoss + dmix with unaligned rates When an OSS stream is setup (e.g. two periods) with a rate that doesn't align with the fixed rate of the slave PCM, dmix can't establish the hw_params properly. As a dirty workaround, set either only min or max periods so that they don't conflict with each other. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=874342 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- alsa/pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index fdf99337997f..c23d0423fc86 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -263,10 +263,11 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; periods_min = 2; - err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); - if (err < 0) - return err; - if (dsp->maxfrags > 0) { + if (!dsp->maxfrags) { + err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); + if (err < 0) + return err; + } else { unsigned int periods_max = periods_min > dsp->maxfrags ? periods_min : dsp->maxfrags; err = snd_pcm_hw_params_set_periods_max(pcm, hw, -- 1.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit filesystem for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '14

28 Apr '14

Hello community, here is the log from the commit of package filesystem for openSUSE:Factory checked in at 2014-04-28 09:05:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filesystem (Old) and /work/SRC/openSUSE:Factory/.filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "filesystem" Changes: -------- --- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2014-04-22 07:35:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.filesystem.new/filesystem.changes 2014-04-28 09:05:49.000000000 +0200 @@ -2,39 +1,0 @@ -Fri Apr 11 14:02:07 CEST 2014 - ro(a)suse.de - -- change /sys to mode 0555 (bnc#871640) - -------------------------------------------------------------------- -Wed Mar 12 10:19:17 CET 2014 - ro(a)suse.de - -- make /var/lock a symlink to /run/lock (bnc#867873) - -------------------------------------------------------------------- -Fri Mar 7 11:11:05 CET 2014 - ro(a)suse.de - -- use lazy umount - -------------------------------------------------------------------- -Thu Mar 6 01:03:53 CET 2014 - ro(a)suse.de - -- use os.execute("umount ...") instead of posix.umount("...") - bnc#866964 - -------------------------------------------------------------------- -Mon Mar 3 11:48:31 CET 2014 - ro(a)suse.de - -- change pre to pretrans for directory/symlink conversion - -------------------------------------------------------------------- -Fri Feb 28 13:56:47 CET 2014 - ro(a)suse.de - -- drop /var/lib/pam_devperm (bnc#866234) - -------------------------------------------------------------------- -Thu Feb 27 18:48:24 CET 2014 - ro(a)suse.de - -- replace /var/run by symlink to /run -- try to handle case where /var/run is a bind-mount -- extend lua script in preinstall to handle this transition -- bnc#865893 - -------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.rJsMOk/_old 2014-04-28 09:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.rJsMOk/_new 2014-04-28 09:05:50.000000000 +0200 @@ -189,26 +189,9 @@ exit 1 } -%pretrans -p <lua> +%pre -p <lua> os.remove ("/usr/include/X11") os.remove ("/usr/lib/X11") -st = posix.stat("/var/run") -if st and st.type == "directory" then - sta = posix.stat("/var/run/systemd") - if sta and sta.type == "directory" then - os.execute("umount -l /var/run") - end - os.rename("/var/run","/var/run.old") - posix.symlink("/run","/var/run") - os.execute("rm -rf /var/run.old") -end -st = posix.stat("/var/lock") -if st and st.type == "directory" then - os.execute("umount -l /var/lock") - os.rename("/var/lock","/var/lock.old") - posix.symlink("/run/lock","/var/lock") - os.execute("rm -rf /var/lock.old") -end %files -f filesystem.list ++++++ directory.list ++++++ --- /var/tmp/diff_new_pack.rJsMOk/_old 2014-04-28 09:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.rJsMOk/_new 2014-04-28 09:05:50.000000000 +0200 @@ -68,14 +68,13 @@ 0700 root root /root/.gnupg 0755 root root /root/bin 0755 root root /run -0775 root lock /run/lock 0755 root root /sbin 0755 root root /selinux 0755 root root /srv/ftp 0755 root root /srv/www 0755 root root /srv/www/cgi-bin 0755 root root /srv/www/htdocs -0555 root root /sys +0755 root root /sys 1777 root root /tmp 0755 root root /usr 0755 root root /usr/bin @@ -171,7 +170,10 @@ 0755 root root /var/games 0755 root root /var/lib/misc 0755 nobody root /var/lib/nobody +0700 root root /var/lib/pam_devperm 0755 wwwrun root /var/lib/wwwrun +1775 root lock /var/lock +0755 root root /var/run 0755 root root /var/spool 0755 lp lp /var/spool/lpd 0770 mail mail /var/spool/clientmqueue ++++++ filesystem.links ++++++ --- /var/tmp/diff_new_pack.rJsMOk/_old 2014-04-28 09:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.rJsMOk/_new 2014-04-28 09:05:50.000000000 +0200 @@ -1,12 +1,7 @@ # links to be created init.d /etc/rc.d ../var/tmp /usr/tmp +../lock /var/spool/locks # Required for FHS 2.1 spool/mail /var/mail -# systemd -../run /var/run -../run/lock /var/lock -# modify -../../run/lock /var/spool/locks - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmnl for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libmnl for openSUSE:Factory checked in at 2014-04-26 19:35:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmnl (Old) and /work/SRC/openSUSE:Factory/.libmnl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmnl" Changes: -------- --- /work/SRC/openSUSE:Factory/libmnl/libmnl.changes 2012-12-14 09:33:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmnl.new/libmnl.changes 2014-04-26 19:35:09.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 24 07:32:10 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline, source validator already + does that + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmnl.spec ++++++ --- /var/tmp/diff_new_pack.SgKKCQ/_old 2014-04-26 19:35:10.000000000 +0200 +++ /var/tmp/diff_new_pack.SgKKCQ/_new 2014-04-26 19:35:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libmnl # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Release: 0 Url: http://netfilter.org/projects/libmnl/ +#Freecode-URL: http://freecode.com/projects/libmnl/ #Git-Clone: git://git.netfilter.org/libmnl Source: ftp://ftp.netfilter.org/pub/libmnl/%name-%version.tar.bz2 Source2: ftp://ftp.netfilter.org/pub/libmnl/%name-%version.tar.bz2.sig @@ -34,9 +35,6 @@ #git#BuildRequires: autoconf, automake >= 1.6 BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libmnl is a minimalistic user-space library oriented to Netlink @@ -69,9 +67,6 @@ that allows you to re-use code and to avoid re-inventing the wheel. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-video-modesetting for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package xf86-video-modesetting for openSUSE:Factory checked in at 2014-04-26 19:35:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-modesetting (Old) and /work/SRC/openSUSE:Factory/.xf86-video-modesetting.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-modesetting" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-modesetting/xf86-video-modesetting.changes 2014-03-18 13:38:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-modesetting.new/xf86-video-modesetting.changes 2014-04-26 19:35:08.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 01:47:38 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-modesetting.spec ++++++ --- /var/tmp/diff_new_pack.mJ4584/_old 2014-04-26 19:35:09.000000000 +0200 +++ /var/tmp/diff_new_pack.mJ4584/_new 2014-04-26 19:35:09.000000000 +0200 @@ -27,6 +27,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +BuildRequires: pkgconfig(xorg-macros) BuildRequires: pkgconfig(xorg-server) BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-video-nouveau for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package xf86-video-nouveau for openSUSE:Factory checked in at 2014-04-26 19:35:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-nouveau (Old) and /work/SRC/openSUSE:Factory/.xf86-video-nouveau.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-nouveau" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-nouveau/xf86-video-nouveau.changes 2014-01-13 13:52:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-nouveau.new/xf86-video-nouveau.changes 2014-04-26 19:35:07.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 01:45:29 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-nouveau.spec ++++++ --- /var/tmp/diff_new_pack.gU89zl/_old 2014-04-26 19:35:08.000000000 +0200 +++ /var/tmp/diff_new_pack.gU89zl/_new 2014-04-26 19:35:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-nouveau # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,6 +23,7 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libdrm) >= 2.4.25 BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.25 +BuildRequires: pkgconfig(xorg-macros) Url: http://nouveau.freedesktop.org/wiki/ Version: 1.0.10 Release: 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2014-04-26 19:35:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2014-04-11 14:40:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2014-04-26 19:35:03.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 01:36:46 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires + +------------------------------------------------------------------- Old: ---- xorg-server-1.15.99.902.tar.bz2 New: ---- xorg-server-1.15.99.902.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.S18NVP/_old 2014-04-26 19:35:04.000000000 +0200 +++ /var/tmp/diff_new_pack.S18NVP/_new 2014-04-26 19:35:04.000000000 +0200 @@ -18,7 +18,7 @@ Name: xorg-x11-server -%define dirsuffix 1.15.99.902 +%define dirsuffix 1.15.99.902.2 Summary: X License: MIT @@ -41,8 +41,11 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0 +BuildRequires: pkgconfig(compositeproto) BuildRequires: pkgconfig(damageproto) >= 1.1 BuildRequires: pkgconfig(dmx) >= 1.0.99.1 +BuildRequires: pkgconfig(dri2proto) +BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(epoxy) >= 1.1 BuildRequires: pkgconfig(fixesproto) >= 4.1 BuildRequires: pkgconfig(fontconfig) @@ -50,6 +53,7 @@ BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(fontutil) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(inputproto) >= 1.9.99.902 BuildRequires: pkgconfig(kbproto) >= 1.0.3 @@ -57,8 +61,11 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 BuildRequires: pkgconfig(pixman-1) >= 0.24 +BuildRequires: pkgconfig(presentproto) BuildRequires: pkgconfig(randrproto) >= 1.2.99.3 BuildRequires: pkgconfig(renderproto) >= 0.11 +BuildRequires: pkgconfig(resourceproto) +BuildRequires: pkgconfig(scrnsaverproto) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xau) @@ -71,11 +78,14 @@ BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xext) >= 1.0.99.4 BuildRequires: pkgconfig(xextproto) >= 7.1.99 +BuildRequires: pkgconfig(xf86driproto) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xfont) >= 1.4.2 BuildRequires: pkgconfig(xi) >= 1.2.99.1 +BuildRequires: pkgconfig(xineramaproto) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xorg-macros) BuildRequires: pkgconfig(xp) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xprintutil) @@ -163,7 +173,6 @@ %package sdk Summary: X Group: System/Libraries -Requires: xorg-x11-proto-devel Requires: xorg-x11-server Requires: pkgconfig(fontconfig) Requires: pkgconfig(fontenc) ++++++ xorg-server-1.15.99.902.tar.bz2 -> xorg-server-1.15.99.902.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/configure.ac new/xorg-server-1.15.99.902.2/configure.ac --- old/xorg-server-1.15.99.902/configure.ac 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/configure.ac 2014-04-19 01:30:18.000000000 +0200 @@ -629,7 +629,7 @@ dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=no]) +AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=no]) AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes]) AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/glamor/glamor_fbo.c new/xorg-server-1.15.99.902.2/glamor/glamor_fbo.c --- old/xorg-server-1.15.99.902/glamor/glamor_fbo.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/glamor/glamor_fbo.c 2014-04-19 01:30:18.000000000 +0200 @@ -367,10 +367,11 @@ if (flag == GLAMOR_CREATE_PIXMAP_MAP) goto no_tex; - if (flag == GLAMOR_CREATE_PIXMAP_FIXUP) - cache_flag = GLAMOR_CACHE_EXACT_SIZE; - else - cache_flag = 0; + /* Tiling from textures requires exact pixmap sizes. As we don't + * know which pixmaps will be used as tiles, just allocate + * everything at the requested size + */ + cache_flag = GLAMOR_CACHE_EXACT_SIZE; fbo = glamor_pixmap_fbo_cache_get(glamor_priv, w, h, format, cache_flag); if (fbo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/kdrive/linux/linux.c new/xorg-server-1.15.99.902.2/hw/kdrive/linux/linux.c --- old/xorg-server-1.15.99.902/hw/kdrive/linux/linux.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/kdrive/linux/linux.c 2014-04-19 01:30:18.000000000 +0200 @@ -68,13 +68,16 @@ struct stat st; __uid_t u; __gid_t g; + int r; if (stat(file, &st) < 0) return; u = getuid(); g = getgid(); - if (st.st_uid != u || st.st_gid != g) - chown(file, u, g); + if (st.st_uid != u || st.st_gid != g) { + r = chown(file, u, g); + (void) r; + } } static int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/kdrive/src/kdrive.c new/xorg-server-1.15.99.902.2/hw/kdrive/src/kdrive.c --- old/xorg-server-1.15.99.902/hw/kdrive/src/kdrive.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/kdrive/src/kdrive.c 2014-04-19 01:30:18.000000000 +0200 @@ -118,10 +118,17 @@ { if (kdSwitchCmd) { char *command; + int ret; if (asprintf(&command, "%s %s", kdSwitchCmd, reason) == -1) return; - system(command); + + /* Ignore the return value from system; I'm not sure + * there's anything more useful to be done when + * it fails + */ + ret = system(command); + (void) ret; free(command); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/.gitignore new/xorg-server-1.15.99.902.2/hw/xfree86/.gitignore --- old/xorg-server-1.15.99.902/hw/xfree86/.gitignore 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/xfree86/.gitignore 2014-04-19 01:30:18.000000000 +0200 @@ -1,4 +1,5 @@ Xorg +Xorg.wrap Xorg.sh xorg.conf.example sdksyms.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/dri/dri.c new/xorg-server-1.15.99.902.2/hw/xfree86/dri/dri.c --- old/xorg-server-1.15.99.902/hw/xfree86/dri/dri.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/xfree86/dri/dri.c 2014-04-19 01:30:18.000000000 +0200 @@ -177,19 +177,15 @@ memset(&tmp, 0, sizeof(tmp)); /* Check the DRM lib version. - * drmGetLibVersion was not supported in version 1.0, so check for - * symbol first to avoid possible crash or hang. */ drmlibmajor = 1; drmlibminor = 0; - if (xf86LoaderCheckSymbol("drmGetLibVersion")) { - drmlibv = drmGetLibVersion(-1); - if (drmlibv != NULL) { - drmlibmajor = drmlibv->version_major; - drmlibminor = drmlibv->version_minor; - drmFreeVersion(drmlibv); - } + drmlibv = drmGetLibVersion(-1); + if (drmlibv != NULL) { + drmlibmajor = drmlibv->version_major; + drmlibminor = drmlibv->version_minor; + drmFreeVersion(drmlibv); } /* Check if the libdrm can handle falling back to loading based on name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Makefile.am new/xorg-server-1.15.99.902.2/hw/xfree86/man/Makefile.am --- old/xorg-server-1.15.99.902/hw/xfree86/man/Makefile.am 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Makefile.am 2014-04-19 01:30:18.000000000 +0200 @@ -5,4 +5,6 @@ if SUID_WRAPPER appman_PRE += Xorg.wrap.man fileman_PRE += Xwrapper.config.man +else +EXTRA_DIST += Xorg.wrap.man Xwrapper.config.man endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Xorg.wrap.man new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xorg.wrap.man --- old/xorg-server-1.15.99.902/hw/xfree86/man/Xorg.wrap.man 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xorg.wrap.man 2014-04-19 01:30:18.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Xwrapper.wrap.1 +.\" Xwrapper.wrap.__appmansuffix__ .\" .\" Copyright 2014 Red Hat, Inc. .\" @@ -26,7 +26,7 @@ .\" .\" shorthand for double quote that works everywhere. .ds q \N'34' -.TH Xorg.wrap 1 __xorgversion__ +.TH Xorg.wrap __appmansuffix__ __xorgversion__ .SH NAME Xorg.wrap \- Xorg X server binary wrapper .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Xwrapper.config.man new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xwrapper.config.man --- old/xorg-server-1.15.99.902/hw/xfree86/man/Xwrapper.config.man 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xwrapper.config.man 2014-04-19 01:30:18.000000000 +0200 @@ -1 +1 @@ -.so man1/Xorg.wrap.1 +.so man__appmansuffix__/Xorg.wrap.__appmansuffix__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/xorg-wrapper.c new/xorg-server-1.15.99.902.2/hw/xfree86/xorg-wrapper.c --- old/xorg-server-1.15.99.902/hw/xfree86/xorg-wrapper.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/xfree86/xorg-wrapper.c 2014-04-19 01:30:18.000000000 +0200 @@ -25,6 +25,7 @@ #include "dix-config.h" +#include <errno.h> #include <fcntl.h> #include <limits.h> #include <stdint.h> @@ -34,12 +35,17 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#include <sys/consio.h> +#endif #include <unistd.h> -#include <drm/drm.h> +#include <drm.h> #include <xf86drm.h> /* For DRM_DEV_NAME */ #define CONFIG_FILE SYSCONFDIR "/X11/Xwrapper.config" +static const char *progname; + enum { ROOT_ONLY, CONSOLE_ONLY, ANYBODY }; /* KISS non locale / LANG parsing isspace version */ @@ -88,18 +94,21 @@ /* Split in a key + value pair */ equals = strchr(stripped, '='); if (!equals) { - fprintf(stderr, "Syntax error at %s line %d\n", CONFIG_FILE, line); + fprintf(stderr, "%s: Syntax error at %s line %d\n", progname, + CONFIG_FILE, line); exit(1); } *equals = 0; key = strip(stripped); /* To remove trailing whitespace from key */ value = strip(equals + 1); /* To remove leading whitespace from val */ if (!key[0]) { - fprintf(stderr, "Missing key at %s line %d\n", CONFIG_FILE, line); + fprintf(stderr, "%s: Missing key at %s line %d\n", progname, + CONFIG_FILE, line); exit(1); } if (!value[0]) { - fprintf(stderr, "Missing value at %s line %d\n", CONFIG_FILE, line); + fprintf(stderr, "%s: Missing value at %s line %d\n", progname, + CONFIG_FILE, line); exit(1); } @@ -113,8 +122,8 @@ *allowed = ANYBODY; else { fprintf(stderr, - "Invalid value '%s' for 'allowed_users' at %s line %d\n", - value, CONFIG_FILE, line); + "%s: Invalid value '%s' for 'allowed_users' at %s line %d\n", + progname, value, CONFIG_FILE, line); exit(1); } } @@ -127,8 +136,8 @@ *needs_root_rights = -1; else { fprintf(stderr, - "Invalid value '%s' for 'needs_root_rights' at %s line %d\n", - value, CONFIG_FILE, line); + "%s: Invalid value '%s' for 'needs_root_rights' at %s line %d\n", + progname, value, CONFIG_FILE, line); exit(1); } } @@ -136,18 +145,45 @@ /* Backward compatibility with older Debian Xwrapper, ignore */ } else { - fprintf(stderr, "Invalid key '%s' at %s line %d\n", key, - CONFIG_FILE, line); + fprintf(stderr, "%s: Invalid key '%s' at %s line %d\n", key, + progname, CONFIG_FILE, line); exit(1); } } fclose(f); } +static int on_console(int fd) +{ +#if defined(__linux__) + struct stat st; + int r; + + r = fstat(fd, &st); + if (r == 0 && S_ISCHR(st.st_mode) && major(st.st_rdev) == 4) + return 1; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + int idx; + + if (ioctl(fd, VT_GETINDEX, &idx) != -1) + return 1; +#else +#warning This program needs porting to your kernel. + static int seen; + + if (!seen) { + fprintf(stderr, "%s: Unable to determine if running on a console\n", + progname); + seen = 1; + } +#endif + + return 0; +} + int main(int argc, char *argv[]) { struct drm_mode_card_res res; - struct stat st; char buf[PATH_MAX]; int i, r, fd; int kms_cards = 0; @@ -155,6 +191,8 @@ int allowed = CONSOLE_ONLY; int needs_root_rights = -1; + progname = argv[0]; + parse_config(&allowed, &needs_root_rights); /* For non root users check if they are allowed to run the X server */ @@ -168,8 +206,7 @@ case CONSOLE_ONLY: /* Some of stdin / stdout / stderr maybe redirected to a file */ for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) { - r = fstat(i, &st); - if (r == 0 && S_ISCHR(st.st_mode) && major(st.st_rdev) == 4) + if (on_console(i)) break; } if (i > STDERR_FILENO) { @@ -207,11 +244,13 @@ uid_t realuid = getuid(); if (setresgid(-1, realgid, realgid) != 0) { - perror("Could not drop setgid privileges"); + fprintf(stderr, "%s: Could not drop setgid privileges: %s\n", + progname, strerror(errno)); exit(1); } if (setresuid(-1, realuid, realuid) != 0) { - perror("Could not drop setuid privileges"); + fprintf(stderr, "%s: Could not drop setuid privileges: %s\n", + progname, strerror(errno)); exit(1); } } @@ -220,12 +259,14 @@ /* Check if the server is executable by our real uid */ if (access(buf, X_OK) != 0) { - perror("Missing execute permissions for " SUID_WRAPPER_DIR "Xorg.bin"); + fprintf(stderr, "%s: Missing execute permissions for %s/Xorg.bin: %s\n", + progname, SUID_WRAPPER_DIR, strerror(errno)); exit(1); } argv[0] = buf; (void) execv(argv[0], argv); - perror("Failed to execute " SUID_WRAPPER_DIR "/Xorg.bin"); + fprintf(stderr, "%s: Failed to execute %s/Xorg.bin: %s\n", + progname, SUID_WRAPPER_DIR, strerror(errno)); exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xquartz/X11Controller.m new/xorg-server-1.15.99.902.2/hw/xquartz/X11Controller.m --- old/xorg-server-1.15.99.902/hw/xquartz/X11Controller.m 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/hw/xquartz/X11Controller.m 2014-04-19 01:30:18.000000000 +0200 @@ -942,9 +942,8 @@ /* shutdown the X server, it will exit () for us. */ DarwinSendDDXEvent(kXquartzQuit, 0); - /* In case it doesn't, exit anyway after a while. */ - remain = 10000000; - while ((remain = usleep(remain)) > 0) ; + /* In case it doesn't, exit anyway after 5s. */ + [NSThread sleepForTimeInterval:5.0]; exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/os/connection.c new/xorg-server-1.15.99.902.2/os/connection.c --- old/xorg-server-1.15.99.902/os/connection.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/os/connection.c 2014-04-19 01:30:18.000000000 +0200 @@ -353,9 +353,12 @@ { #if !defined(WIN32) if (displayfd >= 0) { - write(displayfd, display, strlen(display)); - write(displayfd, "\n", 1); + if (write(displayfd, display, strlen(display)) != strlen(display)) + FatalError("Cannot write display number to fd %d\n", displayfd); + if (write(displayfd, "\n", 1) != 1) + FatalError("Cannot write display number to fd %d\n", displayfd); close(displayfd); + displayfd = -1; } if (RunFromSmartParent) { if (ParentProcess > 1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/os/log.c new/xorg-server-1.15.99.902.2/os/log.c --- old/xorg-server-1.15.99.902/os/log.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/os/log.c 2014-04-19 01:30:18.000000000 +0200 @@ -491,13 +491,14 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line) { static Bool newline = TRUE; + int ret; if (verb < 0 || logVerbosity >= verb) - write(2, buf, len); + ret = write(2, buf, len); if (verb < 0 || logFileVerbosity >= verb) { if (inSignalContext && logFileFd >= 0) { - write(logFileFd, buf, len); + ret = write(logFileFd, buf, len); #ifndef WIN32 if (logFlush && logSync) fsync(logFileFd); @@ -529,6 +530,11 @@ bufferPos += len; } } + + /* There's no place to log an error message if the log write + * fails... + */ + (void) ret; } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/os/utils.c new/xorg-server-1.15.99.902.2/os/utils.c --- old/xorg-server-1.15.99.902/os/utils.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/os/utils.c 2014-04-19 01:30:18.000000000 +0200 @@ -313,7 +313,8 @@ if (lfd < 0) FatalError("Could not create lock file in %s\n", tmp); snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid()); - (void) write(lfd, pid_str, 11); + if (write(lfd, pid_str, 11) != 11) + FatalError("Could not write pid to lock file in %s\n", tmp); (void) fchmod(lfd, 0444); (void) close(lfd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/test/.gitignore new/xorg-server-1.15.99.902.2/test/.gitignore --- old/xorg-server-1.15.99.902/test/.gitignore 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/test/.gitignore 2014-04-19 01:30:18.000000000 +0200 @@ -4,6 +4,7 @@ list misc os +sdksyms.c string touch xfree86 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/test/Makefile.am new/xorg-server-1.15.99.902.2/test/Makefile.am --- old/xorg-server-1.15.99.902/test/Makefile.am 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/test/Makefile.am 2014-04-19 01:30:18.000000000 +0200 @@ -41,7 +41,7 @@ libxservertest_la_LIBADD = $(XSERVER_LIBS) if XORG -nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c +nodist_libxservertest_la_SOURCES = sdksyms.c libxservertest_la_LIBADD += \ $(top_builddir)/hw/xfree86/loader/libloader.la \ $(top_builddir)/hw/xfree86/os-support/libxorgos.la \ @@ -55,6 +55,12 @@ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ @XORG_LIBS@ +BUILT_SOURCES = sdksyms.c +CLEANFILES = sdksyms.c + +sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c + $(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c + if DRI libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/test/signal-logging.c new/xorg-server-1.15.99.902.2/test/signal-logging.c --- old/xorg-server-1.15.99.902/test/signal-logging.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/test/signal-logging.c 2014-04-19 01:30:18.000000000 +0200 @@ -178,9 +178,14 @@ LogInit(log_file_path, NULL); assert(f = fopen(log_file_path, "r")); -#define read_log_msg(msg) \ - fgets(read_buf, sizeof(read_buf), f); \ - msg = strchr(read_buf, ']') + 2; /* advance past [time.stamp] */ +#define read_log_msg(msg) do { \ + msg = fgets(read_buf, sizeof(read_buf), f); \ + assert(msg != NULL); \ + msg = strchr(read_buf, ']'); \ + assert(msg != NULL); \ + assert(strlen(msg) > 2); \ + msg = msg + 2; /* advance past [time.stamp] */ \ + } while (0) /* boring test message */ LogMessageVerbSigSafe(X_ERROR, -1, "test message\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/xkb/xkmread.c new/xorg-server-1.15.99.902.2/xkb/xkmread.c --- old/xorg-server-1.15.99.902/xkb/xkmread.c 2014-04-08 23:25:18.000000000 +0200 +++ new/xorg-server-1.15.99.902.2/xkb/xkmread.c 2014-04-19 01:30:18.000000000 +0200 @@ -1204,7 +1204,8 @@ } return 0; } - fread(file_info, SIZEOF(xkmFileInfo), 1, file); + if (fread(file_info, SIZEOF(xkmFileInfo), 1, file) != 1) + return 0; size_toc = file_info->num_toc; if (size_toc > max_toc) { DebugF("Warning! Too many TOC entries; last %d ignored\n", @@ -1212,7 +1213,8 @@ size_toc = max_toc; } for (i = 0; i < size_toc; i++) { - fread(&toc[i], SIZEOF(xkmSectionInfo), 1, file); + if (fread(&toc[i], SIZEOF(xkmSectionInfo), 1, file) != 1) + return 0; } return 1; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit font-util for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package font-util for openSUSE:Factory checked in at 2014-04-26 19:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/font-util (Old) and /work/SRC/openSUSE:Factory/.font-util.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "font-util" Changes: -------- --- /work/SRC/openSUSE:Factory/font-util/font-util.changes 2013-03-28 13:11:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.font-util.new/font-util.changes 2014-04-26 19:34:19.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 01:15:08 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Remove superfluous BuildRequire, Require + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ font-util.spec ++++++ --- /var/tmp/diff_new_pack.iHJI3C/_old 2014-04-26 19:34:20.000000000 +0200 +++ /var/tmp/diff_new_pack.iHJI3C/_new 2014-04-26 19:34:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package font-util # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,9 +26,7 @@ Source: http://xorg.freedesktop.org/archive/individual/font/%{name}-%{version}.tar.… Source1: http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT BuildRequires: pkgconfig -BuildRequires: xorg-x11-proto-devel BuildRequires: pkgconfig(xorg-macros) >= 1.8 -Requires: xorg-x11-proto-devel # Package was named xorg-x11-fonts-devel until 12.2 # We use 7.7 for Provides/Obsoletes, since we're renaming the packages when # X11R7.7 is in RC1, and xorg-x11-fonts-devel was version 7.6 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xtrans for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package xtrans for openSUSE:Factory checked in at 2014-04-26 19:34:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtrans (Old) and /work/SRC/openSUSE:Factory/.xtrans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtrans" Changes: -------- --- /work/SRC/openSUSE:Factory/xtrans/xtrans.changes 2014-04-06 07:10:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xtrans.new/xtrans.changes 2014-04-26 19:34:18.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 00:34:39 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Remove superfluous Require + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtrans.spec ++++++ --- /var/tmp/diff_new_pack.IIFXgu/_old 2014-04-26 19:34:19.000000000 +0200 +++ /var/tmp/diff_new_pack.IIFXgu/_new 2014-04-26 19:34:19.000000000 +0200 @@ -28,7 +28,6 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(xorg-macros) >= 1.12 BuildRequires: pkgconfig(xshmfence) -Requires: xorg-x11-proto-devel # Package was named xorg-x11-xtrans-devel until 12.2 # We use 7.7 for Provides/Obsoletes, since we're renaming the packages when # X11R7.7 is in RC1, and xorg-x11-xtrans-devel was version 7.6 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2014-04-26 19:34:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2014-04-09 13:01:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2014-04-26 19:34:17.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 00:19:50 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires, remove old xorg-x11-*-devel packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.KELat0/_old 2014-04-26 19:34:18.000000000 +0200 +++ /var/tmp/diff_new_pack.KELat0/_new 2014-04-26 19:34:18.000000000 +0200 @@ -64,14 +64,18 @@ %if %llvm_r600 BuildRequires: libelf-devel %endif +BuildRequires: imake BuildRequires: libexpat-devel BuildRequires: libtalloc-devel BuildRequires: libtool BuildRequires: libxml2-python BuildRequires: pkgconfig BuildRequires: python-base -BuildRequires: xorg-x11-util-devel +BuildRequires: pkgconfig(dri2proto) +BuildRequires: pkgconfig(dri3proto) +BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(libdrm) >= 2.4.24 +BuildRequires: pkgconfig(presentproto) BuildRequires: pkgconfig(xshmfence) %ifarch %arm BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.43 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-util-devel for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package xorg-x11-util-devel for openSUSE:Factory checked in at 2014-04-26 19:34:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-util-devel (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-util-devel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-util-devel" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-util-devel/xorg-x11-util-devel.changes 2012-05-08 12:06:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-util-devel.new/xorg-x11-util-devel.changes 2014-04-26 19:34:16.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 23:35:31 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Remove a superfluous Require + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-util-devel.spec ++++++ --- /var/tmp/diff_new_pack.Vg4Yp9/_old 2014-04-26 19:34:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Vg4Yp9/_new 2014-04-26 19:34:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-util-devel # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Group: Development/Libraries/X11 Url: http://xorg.freedesktop.org/ Source0: README.meta -Requires: xorg-x11-proto-devel + ## Requires of packages that we split away from xorg-x11-util-devel Requires: gccmakedep Requires: imake -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxcb for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libxcb for openSUSE:Factory checked in at 2014-04-26 19:34:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxcb (Old) and /work/SRC/openSUSE:Factory/.libxcb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxcb" Changes: -------- --- /work/SRC/openSUSE:Factory/libxcb/libxcb.changes 2014-03-22 19:46:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libxcb.new/libxcb.changes 2014-04-26 19:34:15.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 24 23:26:43 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to a newer snapshot +- Add missing BuildRequires + +------------------------------------------------------------------- Old: ---- libxcb-1.10-4ffa6f8.tar.bz2 New: ---- libxcb-1.10-29e419c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxcb.spec ++++++ --- /var/tmp/diff_new_pack.2nSTA3/_old 2014-04-26 19:34:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2nSTA3/_new 2014-04-26 19:34:15.000000000 +0200 @@ -28,7 +28,7 @@ #Git-Clone: git://anongit.freedesktop.org/xcb/libxcb #Git-Web: http://cgit.freedesktop.org/xcb/libxcb/ #DL-URL: http://xcb.freedesktop.org/dist/ -Source: %{name}-%{version}-4ffa6f8.tar.bz2 +Source: %{name}-%{version}-29e419c.tar.bz2 Patch1: bug-262309_xcb-xauthlocalhostname.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +42,7 @@ BuildRequires: pkgconfig(pthread-stubs) BuildRequires: pkgconfig(xau) >= 0.99.2 BuildRequires: pkgconfig(xcb-proto) >= 1.10 +BuildRequires: pkgconfig(xorg-macros) >= 1.18 #optional#BuildRequires: pkgconfig(xdmcp) %if 0%{?suse_version} >= 1210 BuildRequires: xsltproc ++++++ libxcb-1.10-4ffa6f8.tar.bz2 -> libxcb-1.10-29e419c.tar.bz2 ++++++ ++++ 68242 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libXcomposite for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libXcomposite for openSUSE:Factory checked in at 2014-04-26 19:34:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXcomposite (Old) and /work/SRC/openSUSE:Factory/.libXcomposite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXcomposite" Changes: -------- --- /work/SRC/openSUSE:Factory/libXcomposite/libXcomposite.changes 2013-04-14 10:34:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXcomposite.new/libXcomposite.changes 2014-04-26 19:34:14.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 23:21:30 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXcomposite.spec ++++++ --- /var/tmp/diff_new_pack.VBGu3V/_old 2014-04-26 19:34:15.000000000 +0200 +++ /var/tmp/diff_new_pack.VBGu3V/_new 2014-04-26 19:34:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libXcomposite # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(compositeproto) >= 0.4 BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xextproto) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxshmfence for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libxshmfence for openSUSE:Factory checked in at 2014-04-26 19:34:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxshmfence (Old) and /work/SRC/openSUSE:Factory/.libxshmfence.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxshmfence" Changes: -------- --- /work/SRC/openSUSE:Factory/libxshmfence/libxshmfence.changes 2013-12-11 17:22:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libxshmfence.new/libxshmfence.changes 2014-04-26 19:34:13.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 18:25:35 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Add missing BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxshmfence.spec ++++++ --- /var/tmp/diff_new_pack.Fpnw9m/_old 2014-04-26 19:34:14.000000000 +0200 +++ /var/tmp/diff_new_pack.Fpnw9m/_new 2014-04-26 19:34:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libxshmfence # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,9 @@ Name: libxshmfence Version: 1.1 -%define lname libxshmfence1 Release: 0 +%define lname libxshmfence1 Summary: A tiny library that exposes a event API on top of Linux futexes -# Placeholder License, please fill in the real one, but which one? License: HPND Group: Development/Libraries/C and C++ Url: http://xorg.freedesktop.org/ @@ -36,7 +35,7 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(xorg-macros) >= 1.8 - +BuildRequires: pkgconfig(xproto) %description This is a tiny library that exposes a event API on top of Linux @@ -80,7 +79,6 @@ make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la - %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hwinfo for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2014-04-26 19:34:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2014-03-31 20:43:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2014-04-26 19:34:12.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 25 10:17:15 CEST 2014 - snwint(a)suse.de + +- don't dump netcard eeprom by default (bnc #875021) +- 21.4 + +------------------------------------------------------------------- Old: ---- hwinfo-21.3.tar.bz2 New: ---- hwinfo-21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.mVhv4I/_old 2014-04-26 19:34:12.000000000 +0200 +++ /var/tmp/diff_new_pack.mVhv4I/_new 2014-04-26 19:34:13.000000000 +0200 @@ -36,9 +36,9 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 21.3 +Version: 21.4 Release: 0 -Source: hwinfo-21.3.tar.bz2 +Source: hwinfo-21.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ hwinfo-21.3.tar.bz2 -> hwinfo-21.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.3/VERSION new/hwinfo-21.4/VERSION --- old/hwinfo-21.3/VERSION 2014-03-31 11:12:56.000000000 +0200 +++ new/hwinfo-21.4/VERSION 2014-04-25 10:17:11.000000000 +0200 @@ -1 +1 @@ -21.3 +21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.3/changelog new/hwinfo-21.4/changelog --- old/hwinfo-21.3/changelog 2014-03-31 11:12:57.000000000 +0200 +++ new/hwinfo-21.4/changelog 2014-04-25 10:17:13.000000000 +0200 @@ -1,4 +1,7 @@ -2014-03-31: HEAD +2014-04-24: HEAD + - don't dump netcard eeprom by default (bnc #875021) + +2014-03-31: 21.3 - Merge pull request #3 from openSUSE/bnc853635 - Removed an unnecessary newline from dump_line call. - Removed an unnecessary newline from dump_line call. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.3/src/hd/hd.c new/hwinfo-21.4/src/hd/hd.c --- old/hwinfo-21.3/src/hd/hd.c 2014-03-24 12:24:57.000000000 +0100 +++ new/hwinfo-21.4/src/hd/hd.c 2014-04-24 18:16:51.000000000 +0200 @@ -1835,7 +1835,6 @@ if(hd_probe_feature(hd_data, pr_bios_vram)) hd_data->flags.biosvram = 1; hd_set_probe_feature(hd_data, pr_bios_acpi); hd_set_probe_feature(hd_data, pr_modules_pata); - hd_set_probe_feature(hd_data, pr_net_eeprom); hd_data->flags.pata = hd_probe_feature(hd_data, pr_modules_pata) ? 1 : 0; hd_set_probe_feature(hd_data, pr_x86emu); if(!get_probe_val_list(hd_data, pr_x86emu)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-04-26 19:34:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-04-14 06:43:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-04-26 19:34:04.000000000 +0200 @@ -1,0 +2,314 @@ +Thu Apr 24 23:51:59 CEST 2014 - ms(a)suse.de + +- v5.06.79 released + +------------------------------------------------------------------- +Thu Apr 24 22:35:50 CEST 2014 - ms(a)suse.de + +- Fixed value and handling for profile variable kiwi_allFreeVolume + * If a volume with size="all" is specified and in addition this + volume takes a custom volume name with a custom mountpoint, + the variable was setup with the kiwi default volume naming + schema but not with the real volume name which lead to a + boot problem when kiwi could not find the volume + +------------------------------------------------------------------- +Thu Apr 24 14:00:55 CEST 2014 - ms(a)suse.de + +- v5.06.78 released + +------------------------------------------------------------------- +Thu Apr 24 13:56:07 CEST 2014 - ms(a)suse.de + +- Allow ext4 as boot filesystem + +------------------------------------------------------------------- +Thu Apr 24 11:22:00 CEST 2014 - thardeck(a)suse.de + +- Use existing credentials name for repositories + * Don't add a credentials name to repositories if there is already one + +------------------------------------------------------------------- +Thu Apr 24 09:04:55 CEST 2014 - ms(a)suse.de + +- Fixed pxePartitionInputGeneric + In case of a raid setup via pxeboot the required partition type 'fd' + is not explicitly provided in the PART line of the client config. + Instead the raid information is given in an additional RAID variable. + Thus the pxePartitionInputGeneric function has to set the partition + type 'fd' if the RAID variable is set too. + +------------------------------------------------------------------- +Wed Apr 23 14:59:55 CEST 2014 - ms(a)suse.de + +- Follow up fix for partedGetPartitionID + * return if no partition label could be detected + +------------------------------------------------------------------- +Wed Apr 23 14:41:45 CEST 2014 - ms(a)suse.de + +- Make partedGetPartitionID more robust + * If we can't find a partition label for the disk don't proceed + checking for a partition ID and return an unknown ID 'xx' + +------------------------------------------------------------------- +Wed Apr 23 14:15:27 CEST 2014 - ms(a)suse.de + +- Fixed message displayed in __checkCorrectRootFSPermissons + LSB standard does not prescribe UID and GID values + +------------------------------------------------------------------- +Wed Apr 23 10:22:12 CEST 2014 - ms(a)suse.de + +- Fixed __checkCorrectRootFSPermissons runtime check + * Don't check for root/root permissions in root's home + It's ok to have custom files with custom permissions + there + +------------------------------------------------------------------- +Wed Apr 23 10:17:48 CEST 2014 - ms(a)suse.de + +- Fixed recovery grub2 setup + * don't use fixed class and theme names + +------------------------------------------------------------------- +Wed Apr 23 10:10:07 CEST 2014 - ms(a)suse.de + +- Use suse parted 'type' command extension to setup swap partition + type. This is done because the upstream way of setting swap type + is broken in the suse parted. + +------------------------------------------------------------------- +Tue Apr 22 19:11:02 CEST 2014 - ms(a)suse.de + +- Fixed message displayed when the partition table is created/updated. + Even in the case of creating a new partition table the message said + something about repartition of the disk which is misleading. Thus + the message changed to just tell the user about a partition + process happening now + +------------------------------------------------------------------- +Tue Apr 22 11:02:14 CEST 2014 - ms(a)suse.de + +- v5.06.77 released + +------------------------------------------------------------------- +Tue Apr 22 00:32:42 CEST 2014 - ms(a)suse.de + +- Fixed cache creation in --init-cache mode + +------------------------------------------------------------------- +Sun Apr 20 10:57:41 CEST 2014 - ms(a)suse.de + +- Fixed --bootcd post processing mode + +------------------------------------------------------------------- +Sun Apr 20 10:25:42 CEST 2014 - ms(a)suse.de + +- Fixed --bootusb post processing mode + +------------------------------------------------------------------- +Thu Apr 17 16:01:59 CEST 2014 - ms(a)suse.de + +- v5.06.76 released + +------------------------------------------------------------------- +Thu Apr 17 15:56:46 CEST 2014 - ms(a)suse.de + +- Fixed __hasBootDescription() runtime check for pxe type + The type in the XML is 'pxe' but the boot description is + named 'netboot' + +------------------------------------------------------------------- +Thu Apr 17 12:32:08 CEST 2014 - ms(a)suse.de + +- v5.06.75 released + +------------------------------------------------------------------- +Thu Apr 17 12:10:47 CEST 2014 - ms(a)suse.de + +- Remove suseCloneRunlevel calls from EC2 and Xen guest + templates. They are obsolete since sysVInit has been + replaced with systemd + +------------------------------------------------------------------- +Thu Apr 17 12:06:36 CEST 2014 - ms(a)suse.de + +- Update service support functions + * remove obsolete suseCloneRunlevel and suseActivateServices + * use chkconfig instead of insserv + * enhance suseService to be called with on|off and + sysVInit runlevels like chkconfig supports it. For + systemd this value would be ignored + +------------------------------------------------------------------- +Thu Apr 17 11:38:13 CEST 2014 - ms(a)suse.de + +- Update baseSetRunlevel() function + * support custom systemd target names + +------------------------------------------------------------------- +Thu Apr 17 10:31:03 CEST 2014 - ms(a)suse.de + +- Use linuxefi/initrdefi grub2 commands only for EFI secure boot + +------------------------------------------------------------------- +Wed Apr 16 13:38:19 CEST 2014 - adrian(a)suse.de + +- installed prod file parsing is not important anymore + + disable horrible code for openSUSE 13.2 and SLE 12 :) + +------------------------------------------------------------------- +Wed Apr 16 12:36:16 CEST 2014 - ms(a)suse.de + +- v5.06.74 released + +------------------------------------------------------------------- +Wed Apr 16 12:27:14 CEST 2014 - ms(a)suse.de + +- Fixed legacy boot support for EFI install stick images (git #341) + +------------------------------------------------------------------- +Wed Apr 16 12:12:57 CEST 2014 - ms(a)suse.de + +- Fixed build of install stick in EFI firmware mode (git #341) + +------------------------------------------------------------------- +Wed Apr 16 09:45:04 CEST 2014 - ms(a)suse.de + +- Update media collect code to match coding style and + conventions as well as remove/rewrite comments which + are obviosly wrong with regards to the current code + +------------------------------------------------------------------- +Wed Apr 16 09:03:01 CEST 2014 - adrian(a)suse.de + +- fix parsing of product summary label on new openSUSE 13.2/SLE12 medias + +------------------------------------------------------------------- +Tue Apr 15 16:59:53 CEST 2014 - ms(a)suse.de + +- v5.06.73 released + +------------------------------------------------------------------- +Tue Apr 15 15:54:51 CEST 2014 - adrian(a)suse.de + +- drop .channel files for products, generate .report files instead ++++ 130 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.85Ip4A/_old 2014-04-26 19:34:06.000000000 +0200 +++ /var/tmp/diff_new_pack.85Ip4A/_new 2014-04-26 19:34:06.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.71 +Version: 5.06.79 Release: 0 # requirements to build packages BuildRequires: diffutils ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ ++++ 4046 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnfnetlink for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libnfnetlink for openSUSE:Factory checked in at 2014-04-26 19:34:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnfnetlink (Old) and /work/SRC/openSUSE:Factory/.libnfnetlink.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnfnetlink" Changes: -------- --- /work/SRC/openSUSE:Factory/libnfnetlink/libnfnetlink.changes 2012-12-14 09:39:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnfnetlink.new/libnfnetlink.changes 2014-04-26 19:34:02.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnfnetlink.spec ++++++ --- /var/tmp/diff_new_pack.zErVHv/_old 2014-04-26 19:34:03.000000000 +0200 +++ /var/tmp/diff_new_pack.zErVHv/_new 2014-04-26 19:34:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnfnetlink # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnfnetlink/ +#Freecode-URL: http://freecode.com/projects/libnfnetlink/ #Git-Clone: git://git.netfilter.org/libnfnetlink #DL-URL: ftp://ftp.netfilter.org/pub/libnfnetlink/ Source: http://netfilter.org/projects/libnfnetlink/files/%name-%version.tar.bz2 @@ -36,9 +37,6 @@ #BuildRequires: automake >= 1.6 #BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnfnetlink is the low-level library for netfilter related @@ -83,9 +81,6 @@ libnetfilter_log, libnetfilter_queue or libnetfilter_conntrack. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iptables for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package iptables for openSUSE:Factory checked in at 2014-04-26 19:33:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iptables (Old) and /work/SRC/openSUSE:Factory/.iptables.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iptables" Changes: -------- --- /work/SRC/openSUSE:Factory/iptables/iptables.changes 2013-11-25 16:02:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iptables.new/iptables.changes 2014-04-26 19:34:01.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway) + +------------------------------------------------------------------- +Wed Apr 23 16:20:02 UTC 2014 - dmueller(a)suse.com + +- remove dependency on sgmltool: doesn't seem to be used + and reduces rebuild time on aarch64 by 8 hours + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptables.spec ++++++ --- /var/tmp/diff_new_pack.OBXmrF/_old 2014-04-26 19:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.OBXmrF/_new 2014-04-26 19:34:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iptables # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,9 +38,6 @@ Patch4: iptables-apply-mktemp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -BuildRequires: sgmltool -%endif %if 0%{?fedora_version} || 0%{?centos_version} BuildRequires: sgml-common %endif @@ -50,15 +47,12 @@ %if 0%{?suse_version} BuildRequires: fdupes %endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 %endif -%if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?fedora_version} || 0%{?centos_version} || 0%{?redhat_version} -BuildRequires: libnetfilter_conntrack >= 1.0.4 +%if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?centos_version} || 0%{?redhat_version} +BuildRequires: libnetfilter_conntrack-devel >= 1.0.4 BuildRequires: libnfnetlink-devel >= 1.0.0 %endif Requires: xtables-plugins = %version @@ -143,7 +137,6 @@ xtables --variable=xtlibdir). %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %patch -P 3 -P 4 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-lxml for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package python-lxml for openSUSE:Factory checked in at 2014-04-26 19:33:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-lxml (Old) and /work/SRC/openSUSE:Factory/.python-lxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-lxml" Changes: -------- --- /work/SRC/openSUSE:Factory/python-lxml/python-lxml.changes 2014-03-11 09:23:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-lxml.new/python-lxml.changes 2014-04-26 19:33:59.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Apr 24 06:48:15 UTC 2014 - toms(a)opensuse.org + +- Spec file changes: + Added BuildRequires for python-cssselect + +- Update to version 3.3.5: + ** Features added + n/a + ** Bugs fixed + - HTML cleaning could fail to strip javascript links that mix + control characters into the link scheme. + ** Other changes + n/a + +- Changes in version 3.3.4: + ** Features added + - Source line numbers above 65535 are available on Elements when + using libxml2 2.9 or later. + ** Bugs fixed + - lxml.html.fragment_fromstring() failed for bytes input in Py3. + ** Other changes + n/a + +See also http://lxml.de/3.3/changes-3.3.5.html + +------------------------------------------------------------------- Old: ---- lxml-3.3.3.tgz lxmldoc-3.3.3.pdf New: ---- lxml-3.3.5.tgz lxmldoc-3.3.5.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-lxml.spec ++++++ --- /var/tmp/diff_new_pack.OPYqNU/_old 2014-04-26 19:33:59.000000000 +0200 +++ /var/tmp/diff_new_pack.OPYqNU/_new 2014-04-26 19:33:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-lxml -Version: 3.3.3 +Version: 3.3.5 Release: 0 Summary: Powerful and Pythonic XML processing library License: BSD-3-Clause and GPL-2.0+ @@ -30,6 +30,8 @@ BuildRequires: python-Cython >= 0.20 BuildRequires: python-devel BuildRequires: python-setuptools +# Needed for test cases: +BuildRequires: python-cssselect Requires: python-cssselect BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 ++++++ lxml-3.3.3.tgz -> lxml-3.3.5.tgz ++++++ ++++ 28721 lines of diff (skipped) ++++++ lxmldoc-3.3.3.pdf -> lxmldoc-3.3.5.pdf ++++++ (binary differes) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openssh for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at 2014-04-26 17:02:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssh (Old) and /work/SRC/openSUSE:Factory/.openssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssh" Changes: -------- --- /work/SRC/openSUSE:Factory/openssh/openssh.changes 2014-04-17 14:43:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openssh.new/openssh.changes 2014-04-26 17:02:04.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 24 01:33:45 UTC 2014 - pcerny(a)suse.com + +- curve25519 key exchange fix (-curve25519-6.6.1p1.patch) +- patch re-ordering (-audit3-key_auth_usage-fips.patch, + -audit4-kex_results-fips.patch) + +------------------------------------------------------------------- Old: ---- openssh-6.6p1-audit3_fips-key_auth_usage.patch openssh-6.6p1-audit4_fips-kex_results.patch New: ---- openssh-6.6p1-audit3-key_auth_usage-fips.patch openssh-6.6p1-audit4-kex_results-fips.patch openssh-6.6p1-curve25519-6.6.1p1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -108,6 +108,7 @@ Source8: sysconfig.ssh Source9: sshd-gen-keys-start Source10: sshd.service +Patch0: openssh-6.6p1-curve25519-6.6.1p1.patch Patch1: openssh-6.6p1-key-converter.patch Patch2: openssh-6.6p1-X11-forwarding.patch Patch3: openssh-6.6p1-lastlog.patch @@ -128,9 +129,9 @@ Patch18: openssh-6.6p1-audit1-remove_duplicit_audit.patch Patch19: openssh-6.6p1-audit2-better_audit_of_user_actions.patch Patch20: openssh-6.6p1-audit3-key_auth_usage.patch -Patch21: openssh-6.6p1-audit3_fips-key_auth_usage.patch +Patch21: openssh-6.6p1-audit3-key_auth_usage-fips.patch Patch22: openssh-6.6p1-audit4-kex_results.patch -Patch23: openssh-6.6p1-audit4_fips-kex_results.patch +Patch23: openssh-6.6p1-audit4-kex_results-fips.patch Patch24: openssh-6.6p1-audit5-session_key_destruction.patch Patch25: openssh-6.6p1-audit6-server_key_destruction.patch Patch26: openssh-6.6p1-audit7-libaudit_compat.patch @@ -180,6 +181,7 @@ %prep %setup -q +%patch0 -p2 #patch1 -p2 %patch2 -p2 %patch3 -p2 ++++++ openssh-6.6p1-X_forward_with_disabled_ipv6.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 73eb63cbbd603bf8c13995c478333c1b5a2a020a +# Parent 1055b218140c3cc19228c47878a68740363d80dd Do not throw away already open sockets for X11 forwarding if another socket family is not available for bind() ++++++ openssh-6.6p1-audit2-better_audit_of_user_actions.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -849,7 +849,7 @@ diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c --- a/openssh-6.6p1/sshd.c +++ b/openssh-6.6p1/sshd.c -@@ -2529,13 +2529,14 @@ cleanup_exit(int i) +@@ -2532,13 +2532,14 @@ cleanup_exit(int i) if (kill(pmonitor->m_pid, SIGKILL) != 0 && errno != ESRCH) error("%s: kill(%d): %s", __func__, ++++++ openssh-6.6p1-audit3-key_auth_usage-fips.patch ++++++ # HG changeset patch # Parent 5482d21e8bd06309af51dea77a5f3668859fb2a0 diff --git a/openssh-6.6p1/auth-rsa.c b/openssh-6.6p1/auth-rsa.c --- a/openssh-6.6p1/auth-rsa.c +++ b/openssh-6.6p1/auth-rsa.c @@ -94,16 +94,20 @@ int auth_rsa_verify_response(Key *key, BIGNUM *challenge, u_char response[SSH_DIGEST_MAX_LENGTH]) { u_char buf[2 * SSH_DIGEST_MAX_LENGTH], mdbuf[SSH_DIGEST_MAX_LENGTH]; struct ssh_digest_ctx *md; int len; int dgst; size_t dgst_len; + int rv; +#ifdef SSH_AUDIT_EVENTS + char *fp; +#endif /* don't allow short keys */ if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { error("%s: RSA modulus too small: %d < minimum %d bits", __func__, BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE); return (0); } @@ -121,22 +125,28 @@ auth_rsa_verify_response(Key *key, BIGNU if ((md = ssh_digest_start(dgst)) == NULL || ssh_digest_update(md, buf, 2 * dgst_len) < 0 || ssh_digest_update(md, session_id, dgst_len) < 0 || ssh_digest_final(md, mdbuf, sizeof(mdbuf)) < 0) fatal("%s: md5 failed", __func__); ssh_digest_free(md); /* Verify that the response is the original challenge. */ - if (timingsafe_bcmp(response, mdbuf, dgst_len) != 0) { - /* Wrong answer. */ - return (0); + rv = timingsafe_bcmp(response, mdbuf, dgst_len) == 0; + +#ifdef SSH_AUDIT_EVENTS + fp = key_fingerprint(key, key_fp_type_select(), SSH_FP_HEX); + if (audit_keyusage(1, "ssh-rsa1", RSA_size(key->rsa) * 8, fp, rv) == 0) { + debug("unsuccessful audit"); + rv = 0; } - /* Correct answer. */ - return (1); + free(fp); +#endif + + return rv; } /* * Performs the RSA authentication challenge-response dialog with the client, * and returns true (non-zero) if the client gave the correct answer to * our challenge; returns zero if the client gives a wrong answer. */ ++++++ openssh-6.6p1-audit4-kex_results-fips.patch ++++++ # HG changeset patch # Parent 274a545b591567f1378c1086ad3ba40c911a8bd6 diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in --- a/openssh-6.6p1/Makefile.in +++ b/openssh-6.6p1/Makefile.in @@ -72,17 +72,18 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ ssh-pkcs11.o krl.o smult_curve25519_ref.o \ kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ ssh-ed25519.o digest-openssl.o hmac.o \ sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ - fips.o + fips.o \ + auditstub.o SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ sshconnect.o sshconnect1.o sshconnect2.o mux.o \ roaming_common.o roaming_client.o SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ audit.o audit-bsm.o audit-linux.o platform.o \ sshpty.o sshlogin.o servconf.o serverloop.o \ diff --git a/openssh-6.6p1/cipher.c b/openssh-6.6p1/cipher.c --- a/openssh-6.6p1/cipher.c +++ b/openssh-6.6p1/cipher.c @@ -54,30 +54,16 @@ /* compatibility with old or broken OpenSSL versions */ #include "openbsd-compat/openssl-compat.h" extern const EVP_CIPHER *evp_ssh1_bf(void); extern const EVP_CIPHER *evp_ssh1_3des(void); extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int); -struct Cipher { - char *name; - int number; /* for ssh1 only */ - u_int block_size; - u_int key_len; - u_int iv_len; /* defaults to block_size */ - u_int auth_len; - u_int discard_len; - u_int flags; -#define CFLAG_CBC (1<<0) -#define CFLAG_CHACHAPOLY (1<<1) - const EVP_CIPHER *(*evptype)(void); -}; - static const struct Cipher ciphers_all[] = { { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc }, { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf }, { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc }, { "blowfish-cbc", diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c --- a/openssh-6.6p1/sshd.c +++ b/openssh-6.6p1/sshd.c @@ -119,16 +119,18 @@ #endif #include "monitor_wrap.h" #include "roaming.h" #include "ssh-sandbox.h" #include "version.h" #include "fips.h" +#include "audit.h" + #ifdef LIBWRAP #include <tcpd.h> #include <syslog.h> int allow_severity; int deny_severity; #endif /* LIBWRAP */ #ifndef O_NOCTTY ++++++ openssh-6.6p1-audit5-session_key_destruction.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -942,7 +942,7 @@ verbose("Closing connection to %.500s port %d", remote_ip, remote_port); #ifdef USE_PAM -@@ -2523,26 +2532,38 @@ do_ssh2_kex(void) +@@ -2526,26 +2535,38 @@ do_ssh2_kex(void) #endif debug("KEX done"); } ++++++ openssh-6.6p1-audit6-server_key_destruction.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -721,7 +721,7 @@ BN_clear_free(session_key_int); /* Set the session key. From this on all communications will be encrypted. */ -@@ -2553,16 +2603,18 @@ cleanup_exit(int i) +@@ -2556,16 +2606,18 @@ cleanup_exit(int i) debug("Killing privsep child %d", pmonitor->m_pid); if (kill(pmonitor->m_pid, SIGKILL) != 0 && errno != ESRCH) ++++++ openssh-6.6p1-curve25519-6.6.1p1.patch ++++++ # Date: Sun, 20 Apr 2014 17:14:08 +1000 (EST) # From: Damien Miller <djm(a)mindrot.org> # To: openssh-unix-dev(a)mindrot.org # Subject: bad bignum encoding for curve25519-sha256(a)libssh.org # Message-ID: <alpine.BSO.2.11.1404201713390.26134(a)natsu.mindrot.org> # # Hi, # # So I screwed up when writing the support for the curve25519 KEX method # that doesn't depend on OpenSSL's BIGNUM type - a bug in my code left # leading zero bytes where they should have been skipped. The impact of # this is that OpenSSH 6.5 and 6.6 will fail during key exchange with a # peer that implements curve25519-sha256(a)libssh.org properly about 0.2% # of the time (one in every 512ish connections). # # We've fixed this for OpenSSH 6.7 by avoiding the curve25519-sha256 # key exchange for previous versions, but I'd recommend distributors # of OpenSSH apply this patch so the affected code doesn't become # too entrenched in LTS releases. # # The patch fixes the bug and makes OpenSSH identify itself as 6.6.1 so as # to distinguish itself from the incorrect versions so the compatibility # code to disable the affected KEX isn't activated. # # I've committed this on the 6.6 branch too. # # Apologies for the hassle. # # -d diff --git a/openssh-6.6p1/bufaux.c b/openssh-6.6p1/bufaux.c --- a/openssh-6.6p1/bufaux.c +++ b/openssh-6.6p1/bufaux.c @@ -1,9 +1,9 @@ -/* $OpenBSD: bufaux.c,v 1.56 2014/02/02 03:44:31 djm Exp $ */ +/* $OpenBSD: bufaux.c,v 1.57 2014/04/16 23:22:45 djm Exp $ */ /* * Author: Tatu Ylonen <ylo(a)cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo(a)cs.hut.fi>, Espoo, Finland * All rights reserved * Auxiliary functions for storing and retrieving various data types to/from * Buffers. * * As far as I am concerned, the code I have written for this software @@ -367,16 +367,19 @@ buffer_get_bignum2_as_string(Buffer *buf void buffer_put_bignum2_from_string(Buffer *buffer, const u_char *s, u_int l) { u_char *buf, *p; int pad = 0; if (l > 8 * 1024) fatal("%s: length %u too long", __func__, l); + /* Skip leading zero bytes */ + for (; l > 0 && *s == 0; l--, s++) + ; p = buf = xmalloc(l + 1); /* * If most significant bit is set then prepend a zero byte to * avoid interpretation as a negative number. */ if (l > 0 && (s[0] & 0x80) != 0) { *p++ = '\0'; pad = 1; diff --git a/openssh-6.6p1/compat.c b/openssh-6.6p1/compat.c --- a/openssh-6.6p1/compat.c +++ b/openssh-6.6p1/compat.c @@ -90,16 +90,19 @@ compat_datafellows(const char *version) SSH_OLD_FORWARD_ADDR}, { "OpenSSH_2.*," "OpenSSH_3.0*," "OpenSSH_3.1*", SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR}, { "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR }, { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, { "OpenSSH_4*", 0 }, { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT}, + { "OpenSSH_6.6.1*", SSH_NEW_OPENSSH}, + { "OpenSSH_6.5*," + "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD}, { "OpenSSH*", SSH_NEW_OPENSSH }, { "*MindTerm*", 0 }, { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE| SSH_BUG_FIRSTKEX }, { "2.1 *", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| @@ -246,22 +249,34 @@ compat_cipher_proposal(char *cipher_prop debug2("%s: original cipher proposal: %s", __func__, cipher_prop); cipher_prop = filter_proposal(cipher_prop, "aes*"); debug2("%s: compat cipher proposal: %s", __func__, cipher_prop); if (*cipher_prop == '\0') fatal("No supported ciphers found"); return cipher_prop; } - char * compat_pkalg_proposal(char *pkalg_prop) { if (!(datafellows & SSH_BUG_RSASIGMD5)) return pkalg_prop; debug2("%s: original public key proposal: %s", __func__, pkalg_prop); pkalg_prop = filter_proposal(pkalg_prop, "ssh-rsa"); debug2("%s: compat public key proposal: %s", __func__, pkalg_prop); if (*pkalg_prop == '\0') fatal("No supported PK algorithms found"); return pkalg_prop; } +char * +compat_kex_proposal(char *kex_prop) +{ + if (!(datafellows & SSH_BUG_CURVE25519PAD)) + return kex_prop; + debug2("%s: original KEX proposal: %s", __func__, kex_prop); + kex_prop = filter_proposal(kex_prop, "curve25519-sha256(a)libssh.org"); + debug2("%s: compat KEX proposal: %s", __func__, kex_prop); + if (*kex_prop == '\0') + fatal("No supported key exchange algorithms found"); + return kex_prop; +} + diff --git a/openssh-6.6p1/compat.h b/openssh-6.6p1/compat.h --- a/openssh-6.6p1/compat.h +++ b/openssh-6.6p1/compat.h @@ -54,20 +54,22 @@ #define SSH_BUG_DUMMYCHAN 0x00100000 #define SSH_BUG_EXTEOF 0x00200000 #define SSH_BUG_PROBE 0x00400000 #define SSH_BUG_FIRSTKEX 0x00800000 #define SSH_OLD_FORWARD_ADDR 0x01000000 #define SSH_BUG_RFWD_ADDR 0x02000000 #define SSH_NEW_OPENSSH 0x04000000 #define SSH_BUG_DYNAMIC_RPORT 0x08000000 +#define SSH_BUG_CURVE25519PAD 0x10000000 void enable_compat13(void); void enable_compat20(void); void compat_datafellows(const char *); int proto_spec(const char *); char *compat_cipher_proposal(char *); char *compat_pkalg_proposal(char *); +char *compat_kex_proposal(char *); extern int compat13; extern int compat20; extern int datafellows; #endif diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c --- a/openssh-6.6p1/sshconnect2.c +++ b/openssh-6.6p1/sshconnect2.c @@ -190,16 +190,18 @@ ssh_kex2(char *host, struct sockaddr *ho else { /* Prefer algorithms that we already have keys for */ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( order_hostkeyalgs(host, hostaddr, port)); } if (options.kex_algorithms != NULL) myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + myproposal[PROPOSAL_KEX_ALGS]); if (options.rekey_limit || options.rekey_interval) packet_set_rekey_limits((u_int32_t)options.rekey_limit, (time_t)options.rekey_interval); /* start key exchange */ kex = kex_setup(myproposal); kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; diff --git a/openssh-6.6p1/sshd.c b/openssh-6.6p1/sshd.c --- a/openssh-6.6p1/sshd.c +++ b/openssh-6.6p1/sshd.c @@ -2457,16 +2457,19 @@ do_ssh2_kex(void) myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; } else if (options.compression == COMP_DELAYED) { myproposal[PROPOSAL_COMP_ALGS_CTOS] = myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib(a)openssh.com"; } if (options.kex_algorithms != NULL) myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + myproposal[PROPOSAL_KEX_ALGS]); + if (options.rekey_limit || options.rekey_interval) packet_set_rekey_limits((u_int32_t)options.rekey_limit, (time_t)options.rekey_interval); myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( list_hostkey_types()); /* start key exchange */ diff --git a/openssh-6.6p1/version.h b/openssh-6.6p1/version.h --- a/openssh-6.6p1/version.h +++ b/openssh-6.6p1/version.h @@ -1,6 +1,6 @@ /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */ -#define SSH_VERSION "OpenSSH_6.6" +#define SSH_VERSION "OpenSSH_6.6.1" #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE ++++++ openssh-6.6p1-fingerprint_hash.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent a3a898b117b0f726e6cc923f18463de8e45e74f5 +# Parent 8b2615db484b7061edd15f3bee36958f790f790e # select fingerprint hash algorithms based on the environment variable # SSH_FP_TYPE_ENVVAR and append it to hex and randomart fingerprints @@ -690,7 +690,7 @@ diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c --- a/openssh-6.6p1/sshconnect2.c +++ b/openssh-6.6p1/sshconnect2.c -@@ -577,17 +577,17 @@ input_userauth_pk_ok(int type, u_int32_t +@@ -579,17 +579,17 @@ input_userauth_pk_ok(int type, u_int32_t goto done; } if (key->type != pktype) { @@ -709,7 +709,7 @@ * moved to the end of the queue. this also avoids confusion by * duplicate keys */ -@@ -988,17 +988,17 @@ sign_and_send_pubkey(Authctxt *authctxt, +@@ -990,17 +990,17 @@ sign_and_send_pubkey(Authctxt *authctxt, Buffer b; u_char *blob, *signature; u_int bloblen, slen; ++++++ openssh-6.6p1-fips-checks.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,17 @@ # HG changeset patch -# Parent 12ad7b6077ef9c6b3a3a53b4f0084c3eb2f80fe7 +# Parent 717873621cf4991164c61caafd9ac07473231f10 +# Simple implementation of FIPS 140-2 selfchecks. Use OpenSSL to generate and +# verify checksums of binaries. Any hash iused in OpenSSH can be used (MD5 would +# obviously be a poor choice, since OpenSSL would barf and abort immediately in +# FIPS mode). SHA-2 seems to be a reasonable choice. +# +# The logic of the checks is as follows: decide whether FIPS mode is mandated +# (either by checking /proc/sys/crypto/fips_enabled or envoroinment variable +# SSH_FORCE_FIPS. In FIPS mode, checksums are required to match (inability to +# retrieve pre-calculated hash is a fatal error). In non-FIPS mode the checks +# still must be performed, unless the hashes are not installed. Thus if the hash +# file is not found (or the hash matches), proceed in non-FIPS mode and abort +# otherwise. diff --git a/openssh-6.6p1/fips-check.c b/openssh-6.6p1/fips-check.c new file mode 100644 ++++++ openssh-6.6p1-fips.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -2,7 +2,7 @@ # when OpenSSL is detected to be running in FIPS mode # # HG changeset patch -# Parent ff04a9a96b7c41e99445c68d91911a9a1474ffa2 +# Parent 844066cb9c0ec2b10eb1ace7134f7bced7cc802d diff --git a/openssh-6.6p1/Makefile.in b/openssh-6.6p1/Makefile.in --- a/openssh-6.6p1/Makefile.in @@ -66,7 +66,7 @@ + u_char buf[2 * SSH_DIGEST_MAX_LENGTH], mdbuf[SSH_DIGEST_MAX_LENGTH]; struct ssh_digest_ctx *md; int len; -+ int dgst; ++ int dgst; + size_t dgst_len; /* don't allow short keys */ @@ -78,7 +78,7 @@ } - /* The response is MD5 of decrypted challenge plus session id. */ -+ dgst = fips_correct_dgst(SSH_DIGEST_MD5); ++ dgst = fips_correct_dgst(SSH_DIGEST_MD5); + dgst_len = ssh_digest_bytes(dgst); + + /* The response is a hash of decrypted challenge plus session id. ++++++ openssh-6.6p1-gssapi_key_exchange.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent b50b01e06558d268ae59e8be8c1a41fde44fc70d +# Parent 0b2761bdc8c2071a11ca24387c3f58be2fdbaa5e diff --git a/openssh-6.6p1/ChangeLog.gssapi b/openssh-6.6p1/ChangeLog.gssapi new file mode 100644 @@ -3239,14 +3239,14 @@ myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; } else if (fips_mode()) { -@@ -203,32 +228,63 @@ ssh_kex2(char *host, struct sockaddr *ho - /* Prefer algorithms that we already have keys for */ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = +@@ -205,32 +230,63 @@ ssh_kex2(char *host, struct sockaddr *ho compat_pkalg_proposal( order_hostkeyalgs(host, hostaddr, port)); } if (options.kex_algorithms != NULL) myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + myproposal[PROPOSAL_KEX_ALGS]); +#ifdef GSSAPI + /* If we've got GSSAPI algorithms, then we also support the @@ -3291,7 +3291,7 @@ + kex->gss_host = options.gss_server_identity; + } else { + kex->gss_host = gss_host; -+ } ++ } + } +#endif + @@ -3303,7 +3303,7 @@ debug("Roaming not allowed by server"); options.use_roaming = 0; } -@@ -308,31 +364,37 @@ int userauth_hostbased(Authctxt *); +@@ -310,31 +366,37 @@ int userauth_hostbased(Authctxt *); #ifdef GSSAPI int userauth_gssapi(Authctxt *authctxt); @@ -3341,7 +3341,7 @@ {"gssapi", userauth_gssapi, NULL, -@@ -624,29 +686,41 @@ done: +@@ -626,29 +688,41 @@ done: int userauth_gssapi(Authctxt *authctxt) { @@ -3385,7 +3385,7 @@ if (!ok) return 0; -@@ -735,18 +809,18 @@ process_gssapi_token(void *ctxt, gss_buf +@@ -737,18 +811,18 @@ process_gssapi_token(void *ctxt, gss_buf } /* ARGSUSED */ @@ -3406,7 +3406,7 @@ /* Setup our OID */ oidv = packet_get_string(&oidlen); -@@ -845,16 +919,58 @@ input_gssapi_error(int type, u_int32_t p +@@ -847,16 +921,58 @@ input_gssapi_error(int type, u_int32_t p lang=packet_get_string(NULL); packet_check_eom(); @@ -3655,7 +3655,7 @@ * mode; it is just annoying to have the server exit just when you * are about to discover the bug. */ -@@ -2559,24 +2674,73 @@ do_ssh2_kex(void) +@@ -2562,24 +2677,73 @@ do_ssh2_kex(void) if (options.rekey_limit || options.rekey_interval) packet_set_rekey_limits((u_int32_t)options.rekey_limit, ++++++ openssh-6.6p1-gssapimitm.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -356,7 +356,7 @@ diff --git a/openssh-6.6p1/sshconnect2.c b/openssh-6.6p1/sshconnect2.c --- a/openssh-6.6p1/sshconnect2.c +++ b/openssh-6.6p1/sshconnect2.c -@@ -316,16 +316,21 @@ static char *authmethods_get(void); +@@ -318,16 +318,21 @@ static char *authmethods_get(void); Authmethod authmethods[] = { #ifdef GSSAPI @@ -378,7 +378,7 @@ NULL}, {"publickey", userauth_pubkey, -@@ -683,17 +688,19 @@ process_gssapi_token(void *ctxt, gss_buf +@@ -685,17 +690,19 @@ process_gssapi_token(void *ctxt, gss_buf packet_put_string(send_tok.value, send_tok.length); packet_send(); ++++++ openssh-6.6p1-seccomp_getuid.patch ++++++ --- /var/tmp/diff_new_pack.5tvv9G/_old 2014-04-26 17:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.5tvv9G/_new 2014-04-26 17:02:05.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 47040f4641d43b039f19c8c902b0259729bb88e2 +# Parent bde6f1a808f345e141a976ebc3e37903c81a09cb add 'getuid' syscall to list of allowed ones to prevent the sanboxed thread from being killed by the seccomp filter -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-04-26 17:02:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2014-03-23 22:29:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-04-26 17:02:01.000000000 +0200 @@ -1,0 +2,36 @@ +Thu Apr 24 23:08:48 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 3.0.0~rc4 + * Revise and format policy CMP0025 and CMP0047 docs + * Do not warn by default when policy CMP0025 or CMP0047 is not set + * CMakeDetermineVSServicePack: Format documentation + * CMakeDetermineVSServicePack: Match versions more robustly + * CMakeDetermineVSServicePack: Add VS 11 update 4 + * Fortran: Detect pointer size on Intel archs with PGI (#14870) + * CMakeRCInformation: Do not mention 'Fortran' in documentation + * CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865) + * Drop /lib32 and /lib64 from link directories and RPATH (#14875) + * cmArchiveWrite: Handle NULL error string (#14882) + * Policies: omit warnings about unset policies when they are + actually set to NEW + * Qt4Macros: Make QT4_CREATE_MOC_COMMAND a function + * create_test_sourcelist: Initialize variable at declaration + * Help: Fix typo in cmake-qt manual. + +------------------------------------------------------------------- +Wed Apr 23 17:15:17 UTC 2014 - dmueller(a)suse.com + +- fix build on SLE11 +- remove dependency on system curl: this is not a security + senstive app and the system curl comes quite late in the + build cycle +- remove nonsensical checks for %{sles_version} + +------------------------------------------------------------------- +Wed Mar 26 17:33:28 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 3.0.0~rc3 + * QtDialog: Fix Qt 5 build on non-Windows + * Disallow INTERFACE libraries with add_custom_command(TARGET) + +------------------------------------------------------------------- cmake.changes: same change Old: ---- cmake-3.0.0-rc2.tar.gz New: ---- cmake-3.0.0-rc4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.ZqqdBU/_old 2014-04-26 17:02:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ZqqdBU/_new 2014-04-26 17:02:02.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake-gui -Version: 3.0.0~rc2 +Version: 3.0.0~rc4 Release: 0 -%define rversion 3.0.0-rc2 +%define rversion 3.0.0-rc4 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/cmake-%{rversion}.tar.gz Summary: CMake graphical user interface ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.ZqqdBU/_old 2014-04-26 17:02:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ZqqdBU/_new 2014-04-26 17:02:02.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake -Version: 3.0.0~rc2 +Version: 3.0.0~rc4 Release: 0 -%define rversion 3.0.0-rc2 +%define rversion 3.0.0-rc4 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz Source1: cmake.macros @@ -33,19 +33,15 @@ %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif -%if 0%{?sles_version} != 10 +%if 0%{?suse_version} > 1110 BuildRequires: libarchive-devel +BuildRequires: libbz2-devel %endif BuildRequires: libexpat-devel -%else -BuildRequires: expat-devel %endif -BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: ncurses-devel -BuildRequires: openssl-devel BuildRequires: zlib-devel -BuildRequires: pkgconfig(bzip2) Requires: make @@ -64,16 +60,13 @@ --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ -%if 0%{?suse_version} && !0%{?sles_version} --system-libs \ -%else - --system-curl \ - --system-expat \ - --system-zlib \ - --system-bzip2 \ + --no-system-curl \ +%if 0%{?suse_version} <= 1110 --no-system-libarchive \ %endif --parallel=0%jobs \ + --verbose \ --no-qt-gui make VERBOSE=1 %{?_smp_mflags} @@ -102,6 +95,7 @@ %{_bindir}/ccmake %{_datadir}/cmake %{_libdir}/cmake +%dir %{_datadir}/aclocal %{_datadir}/aclocal/cmake.m4 %doc %{_datadir}/doc/packages/%{name} ++++++ cmake-3.0.0-rc2.tar.gz -> cmake-3.0.0-rc4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/manual/cmake-qt.7.rst new/cmake-3.0.0-rc4/Help/manual/cmake-qt.7.rst --- old/cmake-3.0.0-rc2/Help/manual/cmake-qt.7.rst 2014-03-17 19:18:28.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/manual/cmake-qt.7.rst 2014-04-16 19:54:40.000000000 +0200 @@ -173,7 +173,7 @@ that the qtmain.lib static library shipped with Qt will be linked by all dependent executables which have the :prop_tgt:`WIN32_EXECUTABLE` enabled. -Do disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for +To disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for Qt 5 based targets or ``QT4_NO_LINK_QTMAIN`` target property for Qt 4 based targets. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst new/cmake-3.0.0-rc4/Help/manual/cmake-variables.7.rst --- old/cmake-3.0.0-rc2/Help/manual/cmake-variables.7.rst 2014-03-17 19:18:28.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/manual/cmake-variables.7.rst 2014-04-16 19:54:40.000000000 +0200 @@ -131,6 +131,7 @@ /variable/CMAKE_MODULE_PATH /variable/CMAKE_NOT_USING_CONFIG_FLAGS /variable/CMAKE_POLICY_DEFAULT_CMPNNNN + /variable/CMAKE_POLICY_WARNING_CMPNNNN /variable/CMAKE_PREFIX_PATH /variable/CMAKE_PROGRAM_PATH /variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/policy/CMP0025.rst new/cmake-3.0.0-rc4/Help/policy/CMP0025.rst --- old/cmake-3.0.0-rc2/Help/policy/CMP0025.rst 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/policy/CMP0025.rst 2014-04-16 19:54:40.000000000 +0200 @@ -1,21 +1,27 @@ CMP0025 ------- -Compiler id for Apple Clang is now AppleClang. +Compiler id for Apple Clang is now ``AppleClang``. -CMake >= 3.0 recognize that Apple Clang is a different compiler +CMake 3.0 and above recognize that Apple Clang is a different compiler than upstream Clang and that they have different version numbers. -CMake now prefers to present this to projects by setting -CMAKE_<LANG>_COMPILER_ID to "AppleClang" instead of "Clang". However, -existing projects may assume the compiler id for Apple Clang is just -"Clang" as it was in CMake < 3.0. Therefore this policy determines -for Apple Clang which compiler id to report in -CMAKE_<LANG>_COMPILER_ID after <LANG> is enabled by the project() or -enable_language() command. +CMake now prefers to present this to projects by setting the +:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``AppleClang`` instead +of ``Clang``. However, existing projects may assume the compiler id for +Apple Clang is just ``Clang`` as it was in CMake versions prior to 3.0. +Therefore this policy determines for Apple Clang which compiler id to +report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after +language ``<LANG>`` is enabled by the :command:`project` or +:command:`enable_language` command. The policy must be set prior +to the invocation of either command. -The OLD behavior for this policy is to use compiler id "Clang". The -NEW behavior for this policy is to use compiler id "AppleClang". +The OLD behavior for this policy is to use compiler id ``Clang``. The +NEW behavior for this policy is to use compiler id ``AppleClang``. -This policy was introduced in CMake version 3.0. CMake version -|release| warns when the policy is not set and uses OLD behavior. Use -the cmake_policy command to set it to OLD or NEW explicitly. +This policy was introduced in CMake version 3.0. Use the +:command:`cmake_policy` command to set this policy to OLD or NEW explicitly. +Unlike most policies, CMake version |release| does *not* warn +by default when this policy is not set and simply uses OLD behavior. +See documentation of the +:variable:`CMAKE_POLICY_WARNING_CMP0025 <CMAKE_POLICY_WARNING_CMP<NNNN>>` +variable to control the warning. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/policy/CMP0047.rst new/cmake-3.0.0-rc4/Help/policy/CMP0047.rst --- old/cmake-3.0.0-rc2/Help/policy/CMP0047.rst 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/policy/CMP0047.rst 2014-04-16 19:54:40.000000000 +0200 @@ -1,16 +1,28 @@ CMP0047 ------- -Use QCC compiler id for the qcc drivers on QNX. +Use ``QCC`` compiler id for the qcc drivers on QNX. -CMake 2.8.12 and lower assigned the QNX qcc and QCC compiler drivers the "GNU" -compiler id. +CMake 3.0 and above recognize that the QNX qcc compiler driver is +different from the GNU compiler. +CMake now prefers to present this to projects by setting the +:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``QCC`` instead +of ``GNU``. However, existing projects may assume the compiler id for +QNX qcc is just ``GNU`` as it was in CMake versions prior to 3.0. +Therefore this policy determines for QNX qcc which compiler id to +report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after +language ``<LANG>`` is enabled by the :command:`project` or +:command:`enable_language` command. The policy must be set prior +to the invocation of either command. -The OLD behavior for this policy is to use the "GNU" compiler id for the qcc -and QCC compiler drivers. The NEW behavior for this policy is to use the "QCC" -compiler id for those drivers. +The OLD behavior for this policy is to use the ``GNU`` compiler id +for the qcc and QCC compiler drivers. The NEW behavior for this policy +is to use the ``QCC`` compiler id for those drivers. -This policy was introduced in CMake version 3.0. -CMake version |release| warns when the policy is not set and uses -OLD behavior. Use the cmake_policy command to set it to OLD or -NEW explicitly. +This policy was introduced in CMake version 3.0. Use the +:command:`cmake_policy` command to set this policy to OLD or NEW explicitly. +Unlike most policies, CMake version |release| does *not* warn +by default when this policy is not set and simply uses OLD behavior. +See documentation of the +:variable:`CMAKE_POLICY_WARNING_CMP0047 <CMAKE_POLICY_WARNING_CMP<NNNN>>` +variable to control the warning. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst new/cmake-3.0.0-rc4/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst --- old/cmake-3.0.0-rc2/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst 2014-04-16 19:54:40.000000000 +0200 @@ -0,0 +1,17 @@ +CMAKE_POLICY_WARNING_CMP<NNNN> +------------------------------ + +Explicitly enable or disable the warning when CMake Policy ``CMP<NNNN>`` +is not set. This is meaningful only for the few policies that do not +warn by default: + +* ``CMAKE_POLICY_WARNING_CMP0025`` controls the warning for + policy :policy:`CMP0025`. +* ``CMAKE_POLICY_WARNING_CMP0047`` controls the warning for + policy :policy:`CMP0047`. + +This variable should not be set by a project in CMake code. Project +developers running CMake may set this variable in their cache to +enable the warning (e.g. ``-DCMAKE_POLICY_WARNING_CMP<NNNN>=ON``). +Alternatively, running :manual:`cmake(1)` with the ``--debug-output`` +or ``--trace`` option will also enable the warning. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeDetermineVSServicePack.cmake new/cmake-3.0.0-rc4/Modules/CMakeDetermineVSServicePack.cmake --- old/cmake-3.0.0-rc2/Modules/CMakeDetermineVSServicePack.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/CMakeDetermineVSServicePack.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -2,15 +2,15 @@ # CMakeDetermineVSServicePack # --------------------------- # -# Determine the Visual Studio service pack of the 'cl' in use. +# Deprecated. Do not use. # -# The functionality of this module has been superseded by the platform -# variable CMAKE_<LANG>_COMPILER_VERSION that contains the compiler -# version number. +# The functionality of this module has been superseded by the +# :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable that contains +# the compiler version number. # -# Usage: +# Determine the Visual Studio service pack of the 'cl' in use. # -# :: +# Usage:: # # if(MSVC) # include(CMakeDetermineVSServicePack) @@ -21,14 +21,12 @@ # endif() # # Function DetermineVSServicePack sets the given variable to one of the -# following values or an empty string if unknown: -# -# :: +# following values or an empty string if unknown:: # # vc80, vc80sp1 # vc90, vc90sp1 # vc100, vc100sp1 -# vc110, vc110sp1, vc110sp2 +# vc110, vc110sp1, vc110sp2, vc110sp3, vc110sp4 #============================================================================= # Copyright 2009-2013 Kitware, Inc. @@ -68,6 +66,8 @@ set(_version "vc110sp2") elseif(${_cl_version} VERSION_EQUAL "17.00.60610.1") set(_version "vc110sp3") + elseif(${_cl_version} VERSION_EQUAL "17.00.61030") + set(_version "vc110sp4") else() set(_version "") endif() @@ -86,27 +86,14 @@ OUTPUT_QUIET ) - string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" - _cl_version "${_output}") - - if(_cl_version) - string(REGEX MATCHALL "[0-9]+" - _cl_version_list "${_cl_version}") - list(GET _cl_version_list 0 _major) - list(GET _cl_version_list 1 _minor) - list(GET _cl_version_list 2 _patch) - list(GET _cl_version_list 3 _tweak) - + if(_output MATCHES "Compiler Version (([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)") + set(_cl_version ${CMAKE_MATCH_1}) + set(_major ${CMAKE_MATCH_2}) + set(_minor ${CMAKE_MATCH_3}) if("${_major}${_minor}" STREQUAL "${MSVC_VERSION}") - set(_cl_version ${_major}.${_minor}.${_patch}.${_tweak}) - else() - unset(_cl_version) - endif() - endif() - - if(_cl_version) set(${_SUCCESS_VAR} true PARENT_SCOPE) set(${_VERSION_VAR} ${_cl_version} PARENT_SCOPE) + endif() endif() endif() endfunction() @@ -127,20 +114,9 @@ file(REMOVE "${CMAKE_BINARY_DIR}/return0.cc") - string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" - _cl_version "${_output}") - - if(_cl_version) - string(REGEX MATCHALL "[0-9]+" - _cl_version_list "${_cl_version}") - - list(GET _cl_version_list 0 _major) - list(GET _cl_version_list 1 _minor) - list(GET _cl_version_list 2 _patch) - list(GET _cl_version_list 3 _tweak) - + if(_output MATCHES "Compiler Version (([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)") set(${_SUCCESS_VAR} true PARENT_SCOPE) - set(${_VERSION_VAR} ${_major}.${_minor}.${_patch}.${_tweak} PARENT_SCOPE) + set(${_VERSION_VAR} "${CMAKE_MATCH_1}" PARENT_SCOPE) endif() endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeFortranCompilerABI.F new/cmake-3.0.0-rc4/Modules/CMakeFortranCompilerABI.F --- old/cmake-3.0.0-rc2/Modules/CMakeFortranCompilerABI.F 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/CMakeFortranCompilerABI.F 2014-04-16 19:54:40.000000000 +0200 @@ -10,11 +10,15 @@ PRINT *, 'INFO:sizeof_dptr[8]' #elif defined(_M_AMD64) PRINT *, 'INFO:sizeof_dptr[8]' +#elif defined(__x86_64__) + PRINT *, 'INFO:sizeof_dptr[8]' #elif defined(_ILP32) PRINT *, 'INFO:sizeof_dptr[4]' #elif defined(_M_IX86) PRINT *, 'INFO:sizeof_dptr[4]' +#elif defined(__i386__) + PRINT *, 'INFO:sizeof_dptr[4]' #elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8 PRINT *, 'INFO:sizeof_dptr[8]' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/CMakeRCInformation.cmake new/cmake-3.0.0-rc4/Modules/CMakeRCInformation.cmake --- old/cmake-3.0.0-rc2/Modules/CMakeRCInformation.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/CMakeRCInformation.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -13,15 +13,16 @@ # License text for the above reference.) -# This file sets the basic flags for the Fortran language in CMake. +# This file sets the basic flags for the Windows Resource Compiler. # It also loads the available platform file for the system-compiler # if it exists. # make sure we don't use CMAKE_BASE_NAME from somewhere else set(CMAKE_BASE_NAME) -get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE) -if("${CMAKE_BASE_NAME}" MATCHES "windres") - set(CMAKE_BASE_NAME "windres") +if(CMAKE_RC_COMPILER MATCHES "windres[^/]*$") + set(CMAKE_BASE_NAME "windres") +else() + get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE) endif() set(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) @@ -30,7 +31,7 @@ set (CMAKE_RC_FLAGS "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}" CACHE STRING - "Flags for Fortran compiler.") + "Flags for Windows Resource Compiler.") # These are the only types of flags that should be passed to the rc # command, if COMPILE_FLAGS is used on a target this will be used diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/Platform/UnixPaths.cmake new/cmake-3.0.0-rc4/Modules/Platform/UnixPaths.cmake --- old/cmake-3.0.0-rc2/Modules/Platform/UnixPaths.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/Platform/UnixPaths.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -83,7 +83,7 @@ ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /usr/lib /usr/lib32 /usr/lib64 + /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake new/cmake-3.0.0-rc4/Modules/Qt4Macros.cmake --- old/cmake-3.0.0-rc2/Modules/Qt4Macros.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Modules/Qt4Macros.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -103,7 +103,7 @@ # helper macro to set up a moc rule -macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target) +function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target) # For Windows, create a parameters file to work around command line length limit # Pass the parameters in a file. Set the working directory to # be that containing the parameters file and reference it by @@ -144,7 +144,7 @@ DEPENDS ${infile} ${_moc_working_dir} VERBATIM) -endmacro () +endfunction () macro (QT4_GENERATE_MOC infile outfile ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/CMakeVersion.cmake new/cmake-3.0.0-rc4/Source/CMakeVersion.cmake --- old/cmake-3.0.0-rc2/Source/CMakeVersion.cmake 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/CMakeVersion.cmake 2014-04-16 19:54:40.000000000 +0200 @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 2) +set(CMake_VERSION_RC 4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt new/cmake-3.0.0-rc4/Source/QtDialog/CMakeLists.txt --- old/cmake-3.0.0-rc2/Source/QtDialog/CMakeLists.txt 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/QtDialog/CMakeLists.txt 2014-04-16 19:54:40.000000000 +0200 @@ -28,7 +28,7 @@ qt5_add_resources(${ARGN}) endmacro() set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES}) - set(QT_QTMAIN_LIBRARY Qt5::WinMain) + set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES}) # Remove this when the minimum version of Qt is 4.6. add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddCustomTargetCommand.cxx new/cmake-3.0.0-rc4/Source/cmAddCustomTargetCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmAddCustomTargetCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmAddCustomTargetCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -165,10 +165,13 @@ if (!nameOk) { cmake::MessageType messageType = cmake::AUTHOR_WARNING; + cmOStringStream e; bool issueMessage = false; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -180,9 +183,6 @@ } if (issueMessage) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; e << "The target name \"" << targetName << "\" is reserved or not valid for certain " "CMake features, such as generator expressions, and may result " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddExecutableCommand.cxx new/cmake-3.0.0-rc4/Source/cmAddExecutableCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmAddExecutableCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmAddExecutableCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -79,10 +79,13 @@ if (!nameOk) { cmake::MessageType messageType = cmake::AUTHOR_WARNING; + cmOStringStream e; bool issueMessage = false; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -94,9 +97,6 @@ } if (issueMessage) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; e << "The target name \"" << exename << "\" is reserved or not valid for certain " "CMake features, such as generator expressions, and may result " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmAddLibraryCommand.cxx new/cmake-3.0.0-rc4/Source/cmAddLibraryCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmAddLibraryCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmAddLibraryCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -214,11 +214,17 @@ if (!nameOk) { cmake::MessageType messageType = cmake::AUTHOR_WARNING; + cmOStringStream e; bool issueMessage = false; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037)) { case cmPolicies::WARN: - issueMessage = type != cmTarget::INTERFACE_LIBRARY; + if(type != cmTarget::INTERFACE_LIBRARY) + { + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; + issueMessage = true; + } case cmPolicies::OLD: break; case cmPolicies::NEW: @@ -229,9 +235,6 @@ } if (issueMessage) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; e << "The target name \"" << libName << "\" is reserved or not valid for certain " "CMake features, such as generator expressions, and may result " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmArchiveWrite.cxx new/cmake-3.0.0-rc4/Source/cmArchiveWrite.cxx --- old/cmake-3.0.0-rc2/Source/cmArchiveWrite.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmArchiveWrite.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -18,6 +18,13 @@ #include <cm_libarchive.h> //---------------------------------------------------------------------------- +static std::string cm_archive_error_string(struct archive* a) +{ + const char* e = archive_error_string(a); + return e? e : "unknown error"; +} + +//---------------------------------------------------------------------------- class cmArchiveWrite::Entry { struct archive_entry* Object; @@ -60,7 +67,7 @@ if(archive_write_set_compression_none(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_none: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -68,7 +75,7 @@ if(archive_write_set_compression_compress(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_compress: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -76,7 +83,7 @@ if(archive_write_set_compression_gzip(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_gzip: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -84,7 +91,7 @@ if(archive_write_set_compression_bzip2(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_bzip2: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -92,7 +99,7 @@ if(archive_write_set_compression_lzma(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_lzma: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -100,7 +107,7 @@ if(archive_write_set_compression_xz(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_compression_xz: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -109,7 +116,7 @@ if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK) { this->Error = "archive_read_disk_set_standard_lookup: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return;; } #endif @@ -119,7 +126,7 @@ if(archive_write_set_format_zip(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_format_zip: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -127,7 +134,7 @@ if(archive_write_set_format_pax_restricted(this->Archive) != ARCHIVE_OK) { this->Error = "archive_write_set_format_pax_restricted: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } break; @@ -137,7 +144,7 @@ if (archive_write_set_bytes_in_last_block(this->Archive, 1)) { this->Error = "archive_write_set_bytes_in_last_block: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } @@ -147,7 +154,7 @@ 0) != ARCHIVE_OK) { this->Error = "archive_write_open: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return; } } @@ -235,7 +242,7 @@ if(archive_read_disk_entry_from_file(this->Disk, e, -1, 0) != ARCHIVE_OK) { this->Error = "archive_read_disk_entry_from_file: "; - this->Error += archive_error_string(this->Disk); + this->Error += cm_archive_error_string(this->Disk); return false; } // Clear acl and xattr fields not useful for distribution. @@ -245,7 +252,7 @@ if(archive_write_header(this->Archive, e) != ARCHIVE_OK) { this->Error = "archive_write_header: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return false; } @@ -292,7 +299,7 @@ if(archive_write_data(this->Archive, buffer, nnext) != nnext_s) { this->Error = "archive_write_data: "; - this->Error += archive_error_string(this->Archive); + this->Error += cm_archive_error_string(this->Archive); return false; } nleft -= nnext; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx new/cmake-3.0.0-rc4/Source/cmComputeTargetDepends.cxx --- old/cmake-3.0.0-rc2/Source/cmComputeTargetDepends.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmComputeTargetDepends.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -349,9 +349,12 @@ cmMakefile *makefile = depender->GetMakefile(); cmake::MessageType messageType = cmake::AUTHOR_WARNING; bool issueMessage = false; + cmOStringStream e; switch(depender->GetPolicyStatusCMP0046()) { case cmPolicies::WARN: + e << (makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -364,9 +367,7 @@ if(issueMessage) { cmake* cm = this->GlobalGenerator->GetCMakeInstance(); - cmOStringStream e; - e << (makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n"; + e << "The dependency target \"" << dependee_name << "\" of target \"" << depender->GetName() << "\" does not exist."; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmGlobalGenerator.cxx new/cmake-3.0.0-rc4/Source/cmGlobalGenerator.cxx --- old/cmake-3.0.0-rc2/Source/cmGlobalGenerator.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmGlobalGenerator.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -759,7 +759,8 @@ switch(mf->GetPolicyStatus(cmPolicies::CMP0025)) { case cmPolicies::WARN: - if(!this->CMakeInstance->GetIsInTryCompile()) + if(!this->CMakeInstance->GetIsInTryCompile() && + mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0025")) { cmOStringStream w; w << policies->GetPolicyWarning(cmPolicies::CMP0025) << "\n" @@ -790,7 +791,8 @@ switch(mf->GetPolicyStatus(cmPolicies::CMP0047)) { case cmPolicies::WARN: - if(!this->CMakeInstance->GetIsInTryCompile()) + if(!this->CMakeInstance->GetIsInTryCompile() && + mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0047")) { cmOStringStream w; w << policies->GetPolicyWarning(cmPolicies::CMP0047) << "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmIncludeCommand.cxx new/cmake-3.0.0-rc4/Source/cmIncludeCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmIncludeCommand.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmIncludeCommand.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -98,11 +98,14 @@ if (gg->IsExportedTargetsFile(fname_abs)) { const char *modal = 0; + cmOStringStream e; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0024)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -114,9 +117,6 @@ } if (modal) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n"; e << "The file\n " << fname_abs << "\nwas generated by the export() " "command. It " << modal << " not be used as the argument to the " "include() command. Use ALIAS targets instead to refer to targets " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmLocalGenerator.cxx new/cmake-3.0.0-rc4/Source/cmLocalGenerator.cxx --- old/cmake-3.0.0-rc2/Source/cmLocalGenerator.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmLocalGenerator.cxx 2014-04-16 19:54:40.000000000 +0200 @@ -263,7 +263,8 @@ for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t) { - if (t->second->Target->IsImported()) + if (t->second->Target->IsImported() + || t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY) { continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmMakefile.cxx new/cmake-3.0.0-rc4/Source/cmMakefile.cxx --- old/cmake-3.0.0-rc2/Source/cmMakefile.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmMakefile.cxx 2014-04-16 19:54:41.000000000 +0200 @@ -893,9 +893,12 @@ { cmake::MessageType messageType = cmake::AUTHOR_WARNING; bool issueMessage = false; + cmOStringStream e; switch(this->GetPolicyStatus(cmPolicies::CMP0040)) { case cmPolicies::WARN: + e << (this->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -908,9 +911,6 @@ if(issueMessage) { - cmOStringStream e; - e << (this->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n"; e << "The target name \"" << target << "\" is unknown in this context."; IssueMessage(messageType, e.str().c_str()); } @@ -926,6 +926,14 @@ this->IssueMessage(cmake::FATAL_ERROR, e.str()); return; } + if(ti->second.GetType() == cmTarget::INTERFACE_LIBRARY) + { + cmOStringStream e; + e << "Target \"" << target << "\" is an INTERFACE library " + "that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands."; + this->IssueMessage(cmake::FATAL_ERROR, e.str()); + return; + } // Add the command to the appropriate build step for the target. std::vector<std::string> no_output; cmCustomCommand cc(this, no_output, depends, @@ -4342,6 +4350,22 @@ return this->GetPolicies()->GetPolicyStatus(id); } +//---------------------------------------------------------------------------- +bool cmMakefile::PolicyOptionalWarningEnabled(std::string const& var) +{ + // Check for an explicit CMAKE_POLICY_WARNING_CMP<NNNN> setting. + if(!var.empty()) + { + if(const char* val = this->GetDefinition(var.c_str())) + { + return cmSystemTools::IsOn(val); + } + } + // Enable optional policy warnings with --debug-output or --trace. + cmake* cm = this->GetCMakeInstance(); + return cm->GetDebugOutput() || cm->GetTrace(); +} + bool cmMakefile::SetPolicy(const char *id, cmPolicies::PolicyStatus status) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmMakefile.h new/cmake-3.0.0-rc4/Source/cmMakefile.h --- old/cmake-3.0.0-rc2/Source/cmMakefile.h 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmMakefile.h 2014-04-16 19:54:41.000000000 +0200 @@ -875,6 +875,8 @@ std::set<cmStdString> const & GetSystemIncludeDirectories() const { return this->SystemIncludeDirectories; } + bool PolicyOptionalWarningEnabled(std::string const& var); + protected: // add link libraries and directories to the target void AddGlobalLinkInformation(const char* name, cmTarget& target); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmTarget.cxx new/cmake-3.0.0-rc4/Source/cmTarget.cxx --- old/cmake-3.0.0-rc2/Source/cmTarget.cxx 2014-03-17 19:18:29.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmTarget.cxx 2014-04-16 19:54:41.000000000 +0200 @@ -2636,11 +2636,14 @@ { return true; } + cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0026)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -2653,9 +2656,6 @@ if (modal) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n"; e << "The LOCATION property " << modal << " not be read from target \"" << this->GetName() << "\". Use the target name directly with " "add_custom_command, or use the generator expression $<TARGET_FILE>, " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Source/cmTargetLinkLibrariesCommand.cxx new/cmake-3.0.0-rc4/Source/cmTargetLinkLibrariesCommand.cxx --- old/cmake-3.0.0-rc2/Source/cmTargetLinkLibrariesCommand.cxx 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Source/cmTargetLinkLibrariesCommand.cxx 2014-04-16 19:54:41.000000000 +0200 @@ -103,11 +103,14 @@ if (this->Target->GetType() == cmTarget::UTILITY) { + cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0039)) { case cmPolicies::WARN: + e << this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0039) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -119,9 +122,7 @@ } if (modal) { - cmOStringStream e; - e << this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0039) << "\n" + e << "Utility target \"" << this->Target->GetName() << "\" " << modal << " not be used as the target of a target_link_libraries call."; this->Makefile->IssueMessage(messageType, e.str().c_str()); @@ -373,11 +374,14 @@ ? cmTarget::KeywordTLLSignature : cmTarget::PlainTLLSignature; if (!this->Target->PushTLLCommandTrace(sig)) { + cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0023)) { case cmPolicies::WARN: + e << this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0023) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -390,14 +394,12 @@ if(modal) { - cmOStringStream e; // If the sig is a keyword form and there is a conflict, the existing // form must be the plain form. const char *existingSig = (sig == cmTarget::KeywordTLLSignature ? "plain" : "keyword"); - e << this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0023) << "\n" + e << "The " << existingSig << " signature for target_link_libraries " "has already been used with the target \"" << this->Target->GetName() << "\". All uses of " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Templates/TestDriver.cxx.in new/cmake-3.0.0-rc4/Templates/TestDriver.cxx.in --- old/cmake-3.0.0-rc2/Templates/TestDriver.cxx.in 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Templates/TestDriver.cxx.in 2014-04-16 19:54:41.000000000 +0200 @@ -58,7 +58,7 @@ int main(int ac, char *av[]) { - int i, NumTests, testNum, partial_match; + int i, NumTests, testNum = 0, partial_match; char *arg, *test_name; int count; int testToRun = -1; @@ -81,7 +81,6 @@ } printf("To run a test, enter the test number: "); fflush(stdout); - testNum = 0; if( scanf("%d", &testNum) != 1 ) { printf("Couldn't parse that input as a number\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0026-CONFIG-LOCATION-NEW.cmake:7 $get_target_property$: - Policy CMP0026 is not set: Disallow use of the LOCATION target property. - Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - The LOCATION property may not be read from target "somelib". Use the target name directly with add_custom_command, or use the generator expression \$<TARGET_FILE>, as appropriate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0026-LOCATION-CONFIG-NEW.cmake:7 $get_target_property$: - Policy CMP0026 is not set: Disallow use of the LOCATION target property. - Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - The LOCATION property may not be read from target "somelib". Use the target name directly with add_custom_command, or use the generator expression \$<TARGET_FILE>, as appropriate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0026-NEW.cmake:7 $get_target_property$: - Policy CMP0026 is not set: Disallow use of the LOCATION target property. - Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - The LOCATION property may not be read from target "somelib". Use the target name directly with add_custom_command, or use the generator expression \$<TARGET_FILE>, as appropriate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0037-NEW-colon.cmake:4 $add_library$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "lib:colon" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -11,11 +6,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-colon.cmake:5 $add_executable$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "exe:colon" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -23,11 +13,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-colon.cmake:6 $add_custom_target$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "custom:colon" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,20 +1,10 @@ CMake Error at CMP0037-NEW-reserved.cmake:4 $add_library$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "all" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. Call Stack $most recent call first$: CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-reserved.cmake:5 $add_executable$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "clean" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -22,11 +12,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-reserved.cmake:6 $add_custom_target$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "help" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. Call Stack $most recent call first$: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0037-NEW-space.cmake:4 $add_library$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "lib with spaces" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -11,11 +6,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-space.cmake:5 $add_executable$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "exe with spaces" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. @@ -23,11 +13,6 @@ CMakeLists.txt:3 $include$ + CMake Error at CMP0037-NEW-space.cmake:6 $add_custom_target$: - Policy CMP0037 is not set: Target names should not be reserved and should - match a validity pattern. Run "cmake --help-policy CMP0037" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The target name "custom with spaces" is reserved or not valid for certain CMake features, such as generator expressions, and may result in undefined behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0039-NEW.cmake:7 $target_link_libraries$: - Policy CMP0039 is not set: Utility targets may not have link dependencies. - Run "cmake --help-policy CMP0039" for policy details. Use the cmake_policy - command to set the policy and suppress this warning. - Utility target "utility" must not be used as the target of a target_link_libraries call. Call Stack $most recent call first$: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0040/CMP0040-NEW-missing-target-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0040-NEW-missing-target.cmake:3 $add_custom_command$: - Policy CMP0040 is not set: The target in the TARGET signature of - add_custom_command must exist. Run "cmake --help-policy CMP0040" for - policy details. Use the cmake_policy command to set the policy and - suppress this warning. -+ The target name "foobar" is unknown in this context. Call Stack $most recent call first$: CMakeLists.txt:3 $include$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt 2014-03-17 19:18:30.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt 2014-04-16 19:54:41.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at CMP0046-NEW-missing-dependency.cmake:4 $add_dependencies$: - Policy CMP0046 is not set: Error on non-existent dependency in - add_dependencies. Run "cmake --help-policy CMP0046" for policy details. - Use the cmake_policy command to set the policy and suppress this warning. -+ The dependency target "bar" of target "foo" does not exist. Call Stack $most recent call first$: CMakeLists.txt:3 $include$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/include/CMP0024-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/include/CMP0024-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/include/CMP0024-NEW-stderr.txt 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/include/CMP0024-NEW-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -1,8 +1,4 @@ CMake Error at subdir2/CMakeLists.txt:2 $include$: - Policy CMP0024 is not set: Disallow include export result. Run "cmake - --help-policy CMP0024" for policy details. Use the cmake_policy command to - set the policy and suppress this warning. - The file .*/Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/RunCMakeTest.cmake new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/RunCMakeTest.cmake --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/RunCMakeTest.cmake 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/RunCMakeTest.cmake 2014-04-16 19:54:42.000000000 +0200 @@ -8,3 +8,4 @@ run_cmake(global-interface) run_cmake(genex_link) run_cmake(add_dependencies) +run_cmake(add_custom_command-TARGET) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt 2014-04-16 19:54:42.000000000 +0200 @@ -0,0 +1 @@ +1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -0,0 +1,5 @@ +CMake Error at add_custom_command-TARGET.cmake:4 $add_custom_command$: + Target "iface" is an INTERFACE library that may not have PRE_BUILD, + PRE_LINK, or POST_BUILD commands. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake --- old/cmake-3.0.0-rc2/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake 2014-04-16 19:54:42.000000000 +0200 @@ -0,0 +1,6 @@ + +add_library(iface INTERFACE) + +add_custom_command(TARGET iface + COMMAND "${CMAKE_COMMAND}" -E echo test +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0023-NEW-2.cmake:11 $target_link_libraries$: - Policy CMP0023 is not set: Plain and keyword target_link_libraries - signatures cannot be mixed. Run "cmake --help-policy CMP0023" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The plain signature for target_link_libraries has already been used with the target "foo". All uses of target_link_libraries with a target must be either all-keyword or all-plain. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt --- old/cmake-3.0.0-rc2/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt 2014-03-17 19:18:31.000000000 +0100 +++ new/cmake-3.0.0-rc4/Tests/RunCMake/target_link_libraries/CMP0023-NEW-stderr.txt 2014-04-16 19:54:42.000000000 +0200 @@ -1,9 +1,4 @@ CMake Error at CMP0023-NEW.cmake:11 $target_link_libraries$: - Policy CMP0023 is not set: Plain and keyword target_link_libraries - signatures cannot be mixed. Run "cmake --help-policy CMP0023" for policy - details. Use the cmake_policy command to set the policy and suppress this - warning. - The plain signature for target_link_libraries has already been used with the target "foo". All uses of target_link_libraries with a target must be either all-keyword or all-plain. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openexr for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package openexr for openSUSE:Factory checked in at 2014-04-26 17:01:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openexr (Old) and /work/SRC/openSUSE:Factory/.openexr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openexr" Changes: -------- --- /work/SRC/openSUSE:Factory/openexr/openexr.changes 2013-11-28 18:52:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openexr.new/openexr.changes 2014-04-26 17:01:59.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openexr.spec ++++++ --- /var/tmp/diff_new_pack.HyS9TF/_old 2014-04-26 17:02:00.000000000 +0200 +++ /var/tmp/diff_new_pack.HyS9TF/_new 2014-04-26 17:02:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openexr # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,9 +31,6 @@ Url: http://www.openexr.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake -%if 0%{suse_version} >= 1220 -BuildRequires: gpg-offline -%endif BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ @@ -112,7 +109,6 @@ This package contains a documentation %prep -%{?gpg_verify: %gpg_verify %{S:1}} %setup -q %patch0 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdrm for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2014-04-26 17:01:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdrm" Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2014-04-15 07:35:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdrm.new/libdrm.changes 2014-04-26 17:01:58.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 24 09:46:48 UTC 2014 - sndirsch(a)suse.com + +- u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch: + * No longer hardcode path for drm.h include in qxl_drm.h, i.e. + handle it the same as in other <driver>_drm.h files; change + required for KMS support in xf86-video-qxl (bnc#870501) + +------------------------------------------------------------------- New: ---- u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.ud3Y6c/_old 2014-04-26 17:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.ud3Y6c/_new 2014-04-26 17:01:59.000000000 +0200 @@ -40,6 +40,7 @@ # PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c Patch1: libdrm-implicit-defs.diff Patch2: u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch +Patch3: u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.63 @@ -165,6 +166,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ++++++ u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch ++++++ >From ef61a3e62f87443a7384883b87cc01ec488e4823 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <sndirsch(a)suse.de> Date: Wed, 23 Apr 2014 16:35:19 +0200 Subject: [PATCH] No longer hardcode path for drm.h include in qxl_drm.h. \#include "drm/drm.h" --> #include "drm.h" (same as in other <driver>_drm.h files) --- include/drm/qxl_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h index 5d7de70..1e331a8 100644 --- a/include/drm/qxl_drm.h +++ b/include/drm/qxl_drm.h @@ -25,7 +25,7 @@ #define QXL_DRM_H #include <stddef.h> -#include "drm/drm.h" +#include "drm.h" /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-vm for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2014-04-26 17:01:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-vm" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2014-04-06 09:55:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2014-04-26 17:01:57.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 23 15:29:15 MDT 2014 - carnold(a)suse.com + +- bnc#874633 - yast2 virtualization fails to configure bridge +- bnc#874426 - One of the notice window is empty after launching + "Install Hypervisor and Tools" in Yast2 +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-vm-3.1.6.tar.bz2 New: ---- yast2-vm-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.3YwpGN/_old 2014-04-26 17:01:58.000000000 +0200 +++ /var/tmp/diff_new_pack.3YwpGN/_new 2014-04-26 17:01:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-vm-3.1.6.tar.bz2 -> yast2-vm-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.6/package/yast2-vm.changes new/yast2-vm-3.1.7/package/yast2-vm.changes --- old/yast2-vm-3.1.6/package/yast2-vm.changes 2014-04-04 09:51:48.000000000 +0200 +++ new/yast2-vm-3.1.7/package/yast2-vm.changes 2014-04-23 23:37:42.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Apr 23 15:29:15 MDT 2014 - carnold(a)suse.com + +- bnc#874633 - yast2 virtualization fails to configure bridge +- bnc#874426 - One of the notice window is empty after launching + "Install Hypervisor and Tools" in Yast2 +- 3.1.7 + +------------------------------------------------------------------- Wed Apr 2 16:13:41 MDT 2014 - carnold(a)suse.com - bnc#871633 - yast2 virtualization fails to install xen pattern diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.6/package/yast2-vm.spec new/yast2-vm-3.1.7/package/yast2-vm.spec --- old/yast2-vm-3.1.6/package/yast2-vm.spec 2014-04-04 09:51:48.000000000 +0200 +++ new/yast2-vm-3.1.7/package/yast2-vm.spec 2014-04-23 23:37:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.6 +Version: 3.1.7 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.6/src/modules/VM_XEN.rb new/yast2-vm-3.1.7/src/modules/VM_XEN.rb --- old/yast2-vm-3.1.6/src/modules/VM_XEN.rb 2014-04-04 09:51:48.000000000 +0200 +++ new/yast2-vm-3.1.7/src/modules/VM_XEN.rb 2014-04-23 23:37:42.000000000 +0200 @@ -360,22 +360,43 @@ end end + result = true if isOpenSuse == true packages = ["patterns-openSUSE-xen_server"] if install_xen_server packages = packages + ["xen-tools xen-libs libvirt-daemon-xen tigervnc"] if install_xen_tools packages = packages + ["patterns-openSUSE-kvm_server"] if install_kvm_server packages = packages + ["libvirt-daemon-qemu tigervnc"] if install_kvm_tools packages = packages + ["libvirt-daemon-lxc pm-utils"] if install_lxc - Package.DoInstall(common_vm_packages + packages ) + result = Package.DoInstall(common_vm_packages + packages) + if result == false + Report.Error(_("Package installation failed\n")) + return false + end else - Package.DoInstall(["libvirt-daemon-lxc pm-utils"]) if install_lxc + if install_lxc + result = Package.DoInstall(["libvirt-daemon-lxc"]) + if result == false + Report.Error(_("Package installation failed for lxc\n")) + return false + end + end if isSLED == true - Package.DoInstall(["pattern-sled-virtualization_client"]) if install_client_tools + result = Package.DoInstall(["pattern-sled-virtualization_client"]) if install_client_tools + if result == false + Report.Error(_("Package installation failed for sled client pattern\n")) + return false + end else - Package.DoInstall(["patterns-sles-xen_server"]) if install_xen_server - Package.DoInstall(["patterns-sles-xen_tools"]) if install_xen_tools - Package.DoInstall(["patterns-sles-kvm_server"]) if install_kvm_server - Package.DoInstall(["patterns-sles-kvm_tools"]) if install_kvm_tools + packages = [] + packages = packages + ["patterns-sles-xen_server"] if install_xen_server + packages = packages + ["patterns-sles-xen_tools"] if install_xen_tools + packages = packages + ["patterns-sles-kvm_server"] if install_kvm_server + packages = packages + ["patterns-sles-kvm_tools"] if install_kvm_tools + result = Package.DoInstall(packages) + if result == false + Report.Error(_("Package installation failed for sles patterns\n")) + return false + end end end @@ -532,6 +553,7 @@ "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu." ) message_xen_ready = _("Xen Hypervisor and tools are installed.") + message_client_ready = _("Virtualization client tools are installed.") message_lxc_ready = _("Libvirt LXC components are installed.") message = "" @@ -544,9 +566,6 @@ message.concat(message_xen_reboot) message.concat("\n\n") end - if install_lxc - message.concat(message_lxc_ready) - end else if install_xen message.concat(message_xen_ready) @@ -556,9 +575,13 @@ message.concat(message_kvm_reboot) message.concat("\n\n") end - if install_lxc - message.concat(message_lxc_ready) - end + end + if install_client_tools + message.concat(message_client_ready) + message.concat("\n\n") + end + if install_lxc + message.concat(message_lxc_ready) end Popup.LongMessage(message) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cryptsetup for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at 2014-04-26 17:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cryptsetup (Old) and /work/SRC/openSUSE:Factory/.cryptsetup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cryptsetup" Changes: -------- --- /work/SRC/openSUSE:Factory/cryptsetup/cryptsetup.changes 2013-12-19 12:39:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cryptsetup.new/cryptsetup.changes 2014-04-26 17:01:56.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 23 16:08:09 UTC 2014 - dmueller(a)suse.com + +- remove dependency on gpg-offline (source_validator already + checks for gpg integrity) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.mwUEt6/_old 2014-04-26 17:01:57.000000000 +0200 +++ /var/tmp/diff_new_pack.mwUEt6/_new 2014-04-26 17:01:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cryptsetup # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,9 +31,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: device-mapper-devel BuildRequires: e2fsprogs-devel -%if 0%{?suse_version} > 1220 -BuildRequires: gpg-offline -%endif BuildRequires: libgcrypt-devel BuildRequires: libselinux-devel BuildRequires: libtool @@ -77,9 +74,6 @@ time via the config file /etc/crypttab. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:1} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ntfs-3g_ntfsprogs for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package ntfs-3g_ntfsprogs for openSUSE:Factory checked in at 2014-04-26 17:01:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntfs-3g_ntfsprogs (Old) and /work/SRC/openSUSE:Factory/.ntfs-3g_ntfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ntfs-3g_ntfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.changes 2013-05-27 09:54:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ntfs-3g_ntfsprogs.new/ntfs-3g_ntfsprogs.changes 2014-04-26 17:01:54.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Apr 22 23:53:03 UTC 2014 - tabraham(a)suse.com + +- Upgrade to STABLE Version 2014.2.15 (February 23, 2014) + libntfs: added use of hd library to get the legacy BIOS geometry + libntfs: switched to /proc/mounts for checking existing mounts + libntfs: fixed usa checking by ntfsck on 4K sector disks + libntfs: fixed processing compressed data beyond file size (Windows 8 compliance) + libntfs: fixed expanding a resident attribute without inserting holes + libntfs: allow DACLs to not have any ACE + libntfs: ignore unmapped regions when checking whether sparse + libntfs: upgraded the Win32 interface for use with ntfsprogs + ntfsresize: enabled relocating the MFT when shrinking a volume + ntfsresize: fixed trying to update the MFT and Bitmap on a test run + ntfsresize: fixed updating all the MFT runs in a relocated MFT + ntfsresize: set the backup boot sector when the size is reliable + ntfsresize: reserved a single sector for the backup boot sector + ntfsundelete: output the modification time when scanning files + ntfsundelete: ported to Windows + ntfsclone: fixed wiping fragmented metadata when creating a metadata image + ntfsclone: allowed cloning a file system despite allocation errors + ntfsclone: fixed bad copying of the backup boot sector + ntfsclone: ported to Windows + ntfsdecrypt: made compatible with libgrypt-1.6 + +------------------------------------------------------------------- Old: ---- ntfs-3g_ntfsprogs-2013.1.13.tgz New: ---- ntfs-3g_ntfsprogs-2014.2.15.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntfs-3g_ntfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.iKD6fT/_old 2014-04-26 17:01:55.000000000 +0200 +++ /var/tmp/diff_new_pack.iKD6fT/_new 2014-04-26 17:01:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ntfs-3g_ntfsprogs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,13 @@ # -%define soname 84 +%define soname 85 Name: ntfs-3g_ntfsprogs Summary: NTFS Support in Userspace License: GPL-2.0+ Group: System/Filesystems -Version: 2013.1.13 +Version: 2014.2.15 Release: 0 Source: http://tuxera.com/opensource/%{name}-%{version}.tgz Source1: buildall.sh ++++++ ntfs-3g_ntfsprogs-2013.1.13.tgz -> ntfs-3g_ntfsprogs-2014.2.15.tgz ++++++ ++++ 76916 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-setuptools for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package python-setuptools for openSUSE:Factory checked in at 2014-04-26 17:01:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-setuptools (Old) and /work/SRC/openSUSE:Factory/.python-setuptools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-setuptools" Changes: -------- --- /work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes 2014-03-23 22:29:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-setuptools.new/python-setuptools.changes 2014-04-26 17:01:53.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Apr 17 11:57:05 UTC 2014 - toddrme2178(a)gmail.com + +- Update to version 3.4.4 + * Issue #184: Correct failure where find_package over-matched + packages when directory traversal isn't short-circuited. +- Update to version 3.4.3 + * Issue #183: Really fix test command with Python 3.1. +- Update to version 3.4.2 + * Issue #183: Fix additional regression in test command on + Python 3.1. +- Update to version 3.4.1 + * Issue #180: Fix regression in test command not caught + by py.test-run tests. +- Update to version 3.4 + * Issue #176: Add parameter to the test command to support a + custom test runner: --test-runner or -r. + * Issue #177: Now assume most common invocation to install + command on platforms/environments without stack support + (issuing a warning). Setuptools now installs naturally on + IronPython. Behavior on CPython should be unchanged. +- Remove %check, which now depends on pytest and thus introduces + a dependency loop (setuptools->pytest->py->setuptools) + +------------------------------------------------------------------- Old: ---- setuptools-3.3.tar.gz New: ---- setuptools-3.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setuptools.spec ++++++ --- /var/tmp/diff_new_pack.k7Goqi/_old 2014-04-26 17:01:54.000000000 +0200 +++ /var/tmp/diff_new_pack.k7Goqi/_new 2014-04-26 17:01:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-setuptools -Version: 3.3 +Version: 3.4.4 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages @@ -65,9 +65,6 @@ touch %{buildroot}%{_sysconfdir}/alternatives/easy_install ln -sf %{_sysconfdir}/alternatives/easy_install %{buildroot}/%{_bindir}/easy_install -%check -python setup.py test - %post update-alternatives \ --install %{_bindir}/easy_install easy_install %{_bindir}/easy_install-%{py_ver} 20 ++++++ setuptools-3.3.tar.gz -> setuptools-3.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/CHANGES (links).txt new/setuptools-3.4.4/CHANGES (links).txt --- old/setuptools-3.3/CHANGES (links).txt 2014-03-16 10:04:35.000000000 +0100 +++ new/setuptools-3.4.4/CHANGES (links).txt 2014-04-11 06:50:39.000000000 +0200 @@ -2,6 +2,42 @@ CHANGES ======= +----- +3.4.4 +----- + +* `Issue #184 <https://bitbucket.org/pypa/setuptools/issue/184>`_: Correct failure where find_package over-matched packages + when directory traversal isn't short-circuited. + +----- +3.4.3 +----- + +* `Issue #183 <https://bitbucket.org/pypa/setuptools/issue/183>`_: Really fix test command with Python 3.1. + +----- +3.4.2 +----- + +* `Issue #183 <https://bitbucket.org/pypa/setuptools/issue/183>`_: Fix additional regression in test command on Python 3.1. + +----- +3.4.1 +----- + +* `Issue #180 <https://bitbucket.org/pypa/setuptools/issue/180>`_: Fix regression in test command not caught by py.test-run tests. + +--- +3.4 +--- + +* `Issue #176 <https://bitbucket.org/pypa/setuptools/issue/176>`_: Add parameter to the test command to support a custom test + runner: --test-runner or -r. +* `Issue #177 <https://bitbucket.org/pypa/setuptools/issue/177>`_: Now assume most common invocation to install command on + platforms/environments without stack support (issuing a warning). Setuptools + now installs naturally on IronPython. Behavior on CPython should be + unchanged. + --- 3.3 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/CHANGES.txt new/setuptools-3.4.4/CHANGES.txt --- old/setuptools-3.3/CHANGES.txt 2014-03-16 09:02:09.000000000 +0100 +++ new/setuptools-3.4.4/CHANGES.txt 2014-04-11 06:44:36.000000000 +0200 @@ -2,6 +2,42 @@ CHANGES ======= +----- +3.4.4 +----- + +* Issue #184: Correct failure where find_package over-matched packages + when directory traversal isn't short-circuited. + +----- +3.4.3 +----- + +* Issue #183: Really fix test command with Python 3.1. + +----- +3.4.2 +----- + +* Issue #183: Fix additional regression in test command on Python 3.1. + +----- +3.4.1 +----- + +* Issue #180: Fix regression in test command not caught by py.test-run tests. + +--- +3.4 +--- + +* Issue #176: Add parameter to the test command to support a custom test + runner: --test-runner or -r. +* Issue #177: Now assume most common invocation to install command on + platforms/environments without stack support (issuing a warning). Setuptools + now installs naturally on IronPython. Behavior on CPython should be + unchanged. + --- 3.3 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/PKG-INFO new/setuptools-3.4.4/PKG-INFO --- old/setuptools-3.3/PKG-INFO 2014-03-16 10:04:38.000000000 +0100 +++ new/setuptools-3.4.4/PKG-INFO 2014-04-11 06:50:42.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools -Version: 3.3 +Version: 3.4.4 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://pypi.python.org/pypi/setuptools Author: Python Packaging Authority @@ -222,6 +222,42 @@ CHANGES ======= + ----- + 3.4.4 + ----- + + * `Issue #184 <https://bitbucket.org/pypa/setuptools/issue/184>`_: Correct failure where find_package over-matched packages + when directory traversal isn't short-circuited. + + ----- + 3.4.3 + ----- + + * `Issue #183 <https://bitbucket.org/pypa/setuptools/issue/183>`_: Really fix test command with Python 3.1. + + ----- + 3.4.2 + ----- + + * `Issue #183 <https://bitbucket.org/pypa/setuptools/issue/183>`_: Fix additional regression in test command on Python 3.1. + + ----- + 3.4.1 + ----- + + * `Issue #180 <https://bitbucket.org/pypa/setuptools/issue/180>`_: Fix regression in test command not caught by py.test-run tests. + + --- + 3.4 + --- + + * `Issue #176 <https://bitbucket.org/pypa/setuptools/issue/176>`_: Add parameter to the test command to support a custom test + runner: --test-runner or -r. + * `Issue #177 <https://bitbucket.org/pypa/setuptools/issue/177>`_: Now assume most common invocation to install command on + platforms/environments without stack support (issuing a warning). Setuptools + now installs naturally on IronPython. Behavior on CPython should be + unchanged. + --- 3.3 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/docs/setuptools.txt new/setuptools-3.4.4/docs/setuptools.txt --- old/setuptools-3.3/docs/setuptools.txt 2014-03-16 09:53:16.000000000 +0100 +++ new/setuptools-3.4.4/docs/setuptools.txt 2014-04-08 01:07:02.000000000 +0200 @@ -276,7 +276,7 @@ A boolean (True or False) flag specifying whether the project can be safely installed and run from a zip file. If this argument is not supplied, the ``bdist_egg`` command will have to analyze all of your - project's contents for possible problems each time it buids an egg. + project's contents for possible problems each time it builds an egg. ``install_requires`` A string or list of strings specifying what other distributions need to @@ -426,9 +426,9 @@ ``setup()`` arguments, but that's just a normal distutils thing.) Anyway, ``find_packages()`` walks the target directory, filtering by inclusion -patterns, and finds Python -packages by looking for ``__init__.py`` files. It then filters the list of -packages using the exclusion patterns. +patterns, and finds Python packages (any directory). On Python 3.2 and +earlier, packages are only recognized if they include an ``__init__.py`` file. +Finally, exclusion patterns are applied to remove matching packages. Inclusion and exclusion patterns are package names, optionally including wildcards. For @@ -2435,7 +2435,7 @@ -------------------------------- -Extending and Reusing Distribute +Extending and Reusing Setuptools -------------------------------- Creating ``distutils`` Extensions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/ez_setup.py new/setuptools-3.4.4/ez_setup.py --- old/setuptools-3.3/ez_setup.py 2014-03-16 09:01:53.000000000 +0100 +++ new/setuptools-3.4.4/ez_setup.py 2014-04-08 01:14:18.000000000 +0200 @@ -31,7 +31,7 @@ except ImportError: USER_SITE = None -DEFAULT_VERSION = "3.3" +DEFAULT_VERSION = "3.4.4" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): @@ -181,7 +181,7 @@ try: try: subprocess.check_call(cmd, stdout=devnull, stderr=devnull) - except: + except Exception: return False finally: devnull.close() @@ -199,7 +199,7 @@ try: try: subprocess.check_call(cmd, stdout=devnull, stderr=devnull) - except: + except Exception: return False finally: devnull.close() @@ -217,7 +217,7 @@ try: try: subprocess.check_call(cmd, stdout=devnull, stderr=devnull) - except: + except Exception: return False finally: devnull.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setup.cfg new/setuptools-3.4.4/setup.cfg --- old/setuptools-3.3/setup.cfg 2014-03-16 10:04:38.000000000 +0100 +++ new/setuptools-3.4.4/setup.cfg 2014-04-11 06:50:42.000000000 +0200 @@ -22,3 +22,6 @@ [wheel] universal = 1 +[pytest] +addopts = --ignore tests/manual_test.py --ignore tests/shlib_test + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setup.py new/setuptools-3.4.4/setup.py --- old/setuptools-3.3/setup.py 2014-03-15 13:37:21.000000000 +0100 +++ new/setuptools-3.4.4/setup.py 2014-04-08 01:07:02.000000000 +0200 @@ -4,6 +4,7 @@ import os import sys import textwrap +import contextlib # Allow to run setup.py from another directory. os.chdir(os.path.dirname(os.path.abspath(__file__))) @@ -63,22 +64,27 @@ class test(_test): """Specific test class to avoid rewriting the entry_points.txt""" def run(self): + with self._save_entry_points(): + _test.run(self) + + @contextlib.contextmanager + def _save_entry_points(self): entry_points = os.path.join('setuptools.egg-info', 'entry_points.txt') if not os.path.exists(entry_points): - _test.run(self) - return # even though _test.run will raise SystemExit + yield + return # save the content - with open(entry_points) as f: + with open(entry_points, 'rb') as f: ep_content = f.read() - # run the test + # run the tests try: - _test.run(self) + yield finally: # restore the file - with open(entry_points, 'w') as f: + with open(entry_points, 'wb') as f: f.write(ep_content) @@ -103,6 +109,8 @@ package_data.setdefault('setuptools', []).extend(['*.exe']) package_data.setdefault('setuptools.command', []).extend(['*.xml']) +pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else [] + setup_params = dict( name="setuptools", version=main_ns['__version__'], @@ -144,6 +152,7 @@ "packages = setuptools.dist:check_packages", "dependency_links = setuptools.dist:assert_string_list", "test_loader = setuptools.dist:check_importable", + "test_runner = setuptools.dist:check_importable", "use_2to3 = setuptools.dist:assert_bool", "convert_2to3_doctests = setuptools.dist:assert_string_list", "use_2to3_fixers = setuptools.dist:assert_string_list", @@ -196,7 +205,12 @@ 'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip…', ], scripts = [], - # tests_require = "setuptools[ssl]", + tests_require = [ + 'setuptools[ssl]', + 'pytest', + ], + setup_requires = [ + ] + pytest_runner, ) if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/__init__.py new/setuptools-3.4.4/setuptools/__init__.py --- old/setuptools-3.3/setuptools/__init__.py 2014-03-16 09:02:09.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/__init__.py 2014-04-11 06:43:17.000000000 +0200 @@ -12,6 +12,7 @@ from setuptools.extension import Extension from setuptools.dist import Distribution, Feature, _get_unpatched from setuptools.depends import Require +from setuptools.compat import filterfalse __all__ = [ 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', @@ -28,45 +29,87 @@ # Standard package names for fixer packages lib2to3_fixer_packages = ['lib2to3.fixes'] -def find_packages(where='.', exclude=(), include=()): - """Return a list all Python packages found within directory 'where' - 'where' should be supplied as a "cross-platform" (i.e. URL-style) path; it - will be converted to the appropriate local path syntax. 'exclude' is a - sequence of package names to exclude; '*' can be used as a wildcard in the - names, such that 'foo.*' will exclude all subpackages of 'foo' (but not - 'foo' itself). - - 'include' is a sequence of package names to include. If it's specified, - only the named packages will be included. If it's not specified, all found - packages will be included. 'include' can contain shell style wildcard - patterns just like 'exclude'. - - The list of included packages is built up first and then any explicitly - excluded packages are removed from it. - """ - out = [] - stack=[(convert_path(where), '')] - include = list(include) - exclude = list(exclude) + ['ez_setup', '*__pycache__'] - while stack: - where,prefix = stack.pop(0) - for name in os.listdir(where): - fn = os.path.join(where,name) - looks_like_package = ( - '.' not in name - and os.path.isdir(fn) - and os.path.isfile(os.path.join(fn, '__init__.py')) - ) - if looks_like_package: - pkg_name = prefix + name - if (not include or - any(fnmatchcase(pkg_name, pat) for pat in include)): - out.append(pkg_name) - stack.append((fn, pkg_name + '.')) - for pat in exclude: - out = [item for item in out if not fnmatchcase(item,pat)] - return out +class PackageFinder(object): + @classmethod + def find(cls, where='.', exclude=(), include=('*',)): + """Return a list all Python packages found within directory 'where' + + 'where' should be supplied as a "cross-platform" (i.e. URL-style) + path; it will be converted to the appropriate local path syntax. + 'exclude' is a sequence of package names to exclude; '*' can be used + as a wildcard in the names, such that 'foo.*' will exclude all + subpackages of 'foo' (but not 'foo' itself). + + 'include' is a sequence of package names to include. If it's + specified, only the named packages will be included. If it's not + specified, all found packages will be included. 'include' can contain + shell style wildcard patterns just like 'exclude'. + + The list of included packages is built up first and then any + explicitly excluded packages are removed from it. + """ + out = cls._find_packages_iter(convert_path(where)) + out = cls.require_parents(out) + includes = cls._build_filter(*include) + excludes = cls._build_filter('ez_setup', '*__pycache__', *exclude) + out = filter(includes, out) + out = filterfalse(excludes, out) + return list(out) + + @staticmethod + def require_parents(packages): + """ + Exclude any apparent package that apparently doesn't include its + parent. + + For example, exclude 'foo.bar' if 'foo' is not present. + """ + found = [] + for pkg in packages: + base, sep, child = pkg.rpartition('.') + if base and base not in found: + continue + found.append(pkg) + yield pkg + + @staticmethod + def _all_dirs(base_path): + """ + Return all dirs in base_path, relative to base_path + """ + for root, dirs, files in os.walk(base_path): + for dir in dirs: + yield os.path.relpath(os.path.join(root, dir), base_path) + + @classmethod + def _find_packages_iter(cls, base_path): + dirs = cls._all_dirs(base_path) + suitable = filterfalse(lambda n: '.' in n, dirs) + return ( + path.replace(os.path.sep, '.') + for path in suitable + if cls._looks_like_package(os.path.join(base_path, path)) + ) + + @staticmethod + def _looks_like_package(path): + return os.path.isfile(os.path.join(path, '__init__.py')) + + @staticmethod + def _build_filter(*patterns): + """ + Given a list of patterns, return a callable that will be true only if + the input matches one of the patterns. + """ + return lambda name: any(fnmatchcase(name, pat=pat) for pat in patterns) + +class PEP420PackageFinder(PackageFinder): + @staticmethod + def _looks_like_package(path): + return True + +find_packages = PackageFinder.find setup = distutils.core.setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/command/bdist_egg.py new/setuptools-3.4.4/setuptools/command/bdist_egg.py --- old/setuptools-3.3/setuptools/command/bdist_egg.py 2014-03-06 15:48:25.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/command/bdist_egg.py 2014-04-08 01:14:18.000000000 +0200 @@ -3,7 +3,10 @@ Build .egg distributions""" # This module should be kept compatible with Python 2.3 -import sys, os, marshal +import sys +import os +import marshal +import textwrap from setuptools import Command from distutils.dir_util import remove_tree, mkpath try: @@ -32,21 +35,17 @@ return filename def write_stub(resource, pyfile): - f = open(pyfile,'w') - f.write('\n'.join([ - "def __bootstrap__():", - " global __bootstrap__, __loader__, __file__", - " import sys, pkg_resources, imp", - " __file__ = pkg_resources.resource_filename(__name__,%r)" - % resource, - " __loader__ = None; del __bootstrap__, __loader__", - " imp.load_dynamic(__name__,__file__)", - "__bootstrap__()", - "" # terminal \n - ])) - f.close() - - + _stub_template = textwrap.dedent(""" + def __bootstrap__(): + global __bootstrap__, __loader__, __file__ + import sys, pkg_resources, imp + __file__ = pkg_resources.resource_filename(__name__, %r) + __loader__ = None; del __bootstrap__, __loader__ + imp.load_dynamic(__name__,__file__) + __bootstrap__() + """).lstrip() + with open(pyfile, 'w') as f: + f.write(_stub_template % resource) class bdist_egg(Command): @@ -56,41 +55,24 @@ user_options = [ ('bdist-dir=', 'b', "temporary directory for creating the distribution"), - ('plat-name=', 'p', - "platform name to embed in generated filenames " - "(default: %s)" % get_build_platform()), + ('plat-name=', 'p', "platform name to embed in generated filenames " + "(default: %s)" % get_build_platform()), ('exclude-source-files', None, - "remove all .py files from the generated egg"), + "remove all .py files from the generated egg"), ('keep-temp', 'k', - "keep the pseudo-installation tree around after " + - "creating the distribution archive"), + "keep the pseudo-installation tree around after " + + "creating the distribution archive"), ('dist-dir=', 'd', - "directory to put final built distributions in"), + "directory to put final built distributions in"), ('skip-build', None, - "skip rebuilding everything (for testing/debugging)"), + "skip rebuilding everything (for testing/debugging)"), ] boolean_options = [ 'keep-temp', 'skip-build', 'exclude-source-files' ] - - - - - - - - - - - - - - - - - def initialize_options (self): + def initialize_options(self): self.bdist_dir = None self.plat_name = None self.keep_temp = 0 @@ -99,7 +81,6 @@ self.egg_output = None self.exclude_source_files = None - def finalize_options(self): ei_cmd = self.ei_cmd = self.get_finalized_command("egg_info") self.egg_info = ei_cmd.egg_info @@ -124,13 +105,6 @@ self.egg_output = os.path.join(self.dist_dir, basename+'.egg') - - - - - - - def do_install_data(self): # Hack for packages that install data to install's --install-lib self.get_finalized_command('install').install_lib = self.bdist_dir @@ -156,11 +130,9 @@ finally: self.distribution.data_files = old - def get_outputs(self): return [self.egg_output] - def call_command(self,cmdname,**kw): """Invoke reinitialized command `cmdname` with keyword args""" for dirname in INSTALL_DIRECTORY_ATTRS: @@ -171,7 +143,6 @@ self.run_command(cmdname) return cmd - def run(self): # Generate metadata first self.run_command("egg_info") @@ -179,7 +150,8 @@ # pull their data path from the install_lib command. log.info("installing library code to %s" % self.bdist_dir) instcmd = self.get_finalized_command('install') - old_root = instcmd.root; instcmd.root = None + old_root = instcmd.root + instcmd.root = None if self.distribution.has_c_libraries() and not self.skip_build: self.run_command('build_clib') cmd = self.call_command('install_lib', warn_dir=0) @@ -242,7 +214,7 @@ # Make the archive make_zipfile(self.egg_output, archive_root, verbose=self.verbose, - dry_run=self.dry_run, mode=self.gen_header()) + dry_run=self.dry_run, mode=self.gen_header()) if not self.keep_temp: remove_tree(self.bdist_dir, dry_run=self.dry_run) @@ -250,9 +222,6 @@ getattr(self.distribution,'dist_files',[]).append( ('bdist_egg',get_python_version(),self.egg_output)) - - - def zap_pyfiles(self): log.info("Removing .py files from temporary directory") for base,dirs,files in walk_egg(self.bdist_dir): @@ -269,8 +238,6 @@ log.warn("zip_safe flag not set; analyzing archive contents...") return analyze_egg(self.bdist_dir, self.stubs) - - def gen_header(self): epm = EntryPoint.parse_map(self.distribution.entry_points or '') ep = epm.get('setuptools.installation',{}).get('eggsecutable') @@ -311,7 +278,6 @@ f.close() return 'a' - def copy_metadata_to(self, target_dir): "Copy metadata (egg info) to the target_dir" # normalize the path (so that a forward-slash in egg_info will @@ -355,8 +321,6 @@ NATIVE_EXTENSIONS = dict.fromkeys('.dll .so .dylib .pyd'.split()) - - def walk_egg(egg_dir): """Walk an unpacked egg's contents, skipping the metadata directory""" walker = os.walk(egg_dir) @@ -391,7 +355,9 @@ if safe is None or bool(safe) != flag: os.unlink(fn) elif safe is not None and bool(safe)==flag: - f=open(fn,'wt'); f.write('\n'); f.close() + f = open(fn,'wt') + f.write('\n') + f.close() safety_flags = { True: 'zip-safe', @@ -410,8 +376,10 @@ skip = 8 # skip magic & date else: skip = 12 # skip magic & date & file size - f = open(filename,'rb'); f.read(skip) - code = marshal.load(f); f.close() + f = open(filename,'rb') + f.read(skip) + code = marshal.load(f) + f.close() safe = True symbols = dict.fromkeys(iter_symbols(code)) for bad in ['__file__', '__path__']: @@ -451,39 +419,6 @@ log.warn("Please ask the author to include a 'zip_safe'" " setting (either True or False) in the package's setup.py") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Attribute names of options for commands that might need to be convinced to # install to the egg build directory @@ -492,8 +427,7 @@ ] def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=None, - mode='w' -): + mode='w'): """Create a zip file from all the files under 'base_dir'. The output zip file will be named 'base_dir' + ".zip". Uses either the "zipfile" Python module (if available) or the InfoZIP "zip" utility (if installed @@ -526,4 +460,3 @@ for dirname, dirs, files in os.walk(base_dir): visit(None, dirname, files) return zip_filename -# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/command/bdist_rpm.py new/setuptools-3.4.4/setuptools/command/bdist_rpm.py --- old/setuptools-3.3/setuptools/command/bdist_rpm.py 2014-02-12 04:53:22.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/command/bdist_rpm.py 2014-04-08 01:07:02.000000000 +0200 @@ -1,51 +1,29 @@ -# This is just a kludge so that bdist_rpm doesn't guess wrong about the -# distribution name and version, if the egg_info command is going to alter -# them, another kludge to allow you to build old-style non-egg RPMs, and -# finally, a kludge to track .rpm files for uploading when run on Python <2.5. - from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm -import sys, os class bdist_rpm(_bdist_rpm): + """ + Override the default bdist_rpm behavior to do the following: - def initialize_options(self): - _bdist_rpm.initialize_options(self) - self.no_egg = None - - if sys.version<"2.5": - # Track for uploading any .rpm file(s) moved to self.dist_dir - def move_file(self, src, dst, level=1): - _bdist_rpm.move_file(self, src, dst, level) - if dst==self.dist_dir and src.endswith('.rpm'): - getattr(self.distribution,'dist_files',[]).append( - ('bdist_rpm', - src.endswith('.src.rpm') and 'any' or sys.version[:3], - os.path.join(dst, os.path.basename(src))) - ) + 1. Run egg_info to ensure the name and version are properly calculated. + 2. Always run 'install' using --single-version-externally-managed to + disable eggs in RPM distributions. + 3. Replace dash with underscore in the version numbers for better RPM + compatibility. + """ def run(self): - self.run_command('egg_info') # ensure distro name is up-to-date - _bdist_rpm.run(self) - - - - - - - - - - - + # ensure distro name is up-to-date + self.run_command('egg_info') + _bdist_rpm.run(self) def _make_spec_file(self): version = self.distribution.get_version() rpmversion = version.replace('-','_') spec = _bdist_rpm._make_spec_file(self) - line23 = '%define version '+version - line24 = '%define version '+rpmversion - spec = [ + line23 = '%define version ' + version + line24 = '%define version ' + rpmversion + spec = [ line.replace( "Source0: %{name}-%{version}.tar", "Source0: %{name}-%{unmangled_version}.tar" @@ -55,28 +33,10 @@ ).replace( "%setup", "%setup -n %{name}-%{unmangled_version}" - ).replace(line23,line24) + ).replace(line23, line24) for line in spec ] - spec.insert(spec.index(line24)+1, "%define unmangled_version "+version) + insert_loc = spec.index(line24) + 1 + unmangled_version = "%define unmangled_version " + version + spec.insert(insert_loc, unmangled_version) return spec - - - - - - - - - - - - - - - - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/command/egg_info.py new/setuptools-3.4.4/setuptools/command/egg_info.py --- old/setuptools-3.3/setuptools/command/egg_info.py 2014-02-12 04:53:22.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/command/egg_info.py 2014-04-08 01:07:02.000000000 +0200 @@ -369,10 +369,10 @@ data = ep elif ep is not None: data = [] - for section, contents in ep.items(): + for section, contents in sorted(ep.items()): if not isinstance(contents,basestring): contents = EntryPoint.parse_group(section, contents) - contents = '\n'.join(map(str,contents.values())) + contents = '\n'.join(sorted(map(str,contents.values()))) data.append('[%s]\n%s\n\n' % (section,contents)) data = ''.join(data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/command/install.py new/setuptools-3.4.4/setuptools/command/install.py --- old/setuptools-3.3/setuptools/command/install.py 2014-03-15 13:37:21.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/command/install.py 2014-04-08 01:07:02.000000000 +0200 @@ -1,6 +1,8 @@ import setuptools -import sys +import inspect import glob +import warnings +import platform from distutils.command.install import install as _install from distutils.errors import DistutilsArgError @@ -52,26 +54,39 @@ if self.old_and_unmanageable or self.single_version_externally_managed: return _install.run(self) - # Attempt to detect whether we were called from setup() or by another - # command. If we were called by setup(), our caller will be the - # 'run_command' method in 'distutils.dist', and *its* caller will be - # the 'run_commands' method. If we were called any other way, our - # immediate caller *might* be 'run_command', but it won't have been - # called by 'run_commands'. This is slightly kludgy, but seems to - # work. - # - caller = sys._getframe(2) - caller_module = caller.f_globals.get('__name__','') - caller_name = caller.f_code.co_name - - if caller_module != 'distutils.dist' or caller_name!='run_commands': - # We weren't called from the command line or setup(), so we - # should run in backward-compatibility mode to support bdist_* - # commands. + if not self._called_from_setup(inspect.currentframe()): + # Run in backward-compatibility mode to support bdist_* commands. _install.run(self) else: self.do_egg_install() + @staticmethod + def _called_from_setup(run_frame): + """ + Attempt to detect whether run() was called from setup() or by another + command. If called by setup(), the parent caller will be the + 'run_command' method in 'distutils.dist', and *its* caller will be + the 'run_commands' method. If called any other way, the + immediate caller *might* be 'run_command', but it won't have been + called by 'run_commands'. Return True in that case or if a call stack + is unavailable. Return False otherwise. + """ + if run_frame is None: + msg = "Call stack not available. bdist_* commands may fail." + warnings.warn(msg) + if platform.python_implementation() == 'IronPython': + msg = "For best results, pass -X:Frames to enable call stack." + warnings.warn(msg) + return True + res = inspect.getouterframes(run_frame)[2] + caller, = res[:1] + info = inspect.getframeinfo(caller) + caller_module = caller.f_globals.get('__name__', '') + return ( + caller_module == 'distutils.dist' + and info.function == 'run_commands' + ) + def do_egg_install(self): easy_install = self.distribution.get_command_class('easy_install') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/command/test.py new/setuptools-3.4.4/setuptools/command/test.py --- old/setuptools-3.3/setuptools/command/test.py 2014-03-06 15:48:25.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/command/test.py 2014-04-08 01:14:18.000000000 +0200 @@ -1,10 +1,15 @@ +import unittest +from unittest import TestLoader + from setuptools import Command from distutils.errors import DistutilsOptionError import sys from pkg_resources import (resource_listdir, resource_exists, normalize_path, working_set, _namespace_packages, add_activation_listener, require, EntryPoint) -from unittest import TestLoader + +from setuptools.py31compat import unittest_main + class ScanningLoader(TestLoader): @@ -16,26 +21,24 @@ the return value to the tests. """ tests = [] - if module.__name__!='setuptools.tests.doctest': # ugh - tests.append(TestLoader.loadTestsFromModule(self,module)) + if module.__name__ != 'setuptools.tests.doctest': # ugh + tests.append(TestLoader.loadTestsFromModule(self, module)) if hasattr(module, "additional_tests"): tests.append(module.additional_tests()) if hasattr(module, '__path__'): for file in resource_listdir(module.__name__, ''): - if file.endswith('.py') and file!='__init__.py': - submodule = module.__name__+'.'+file[:-3] + if file.endswith('.py') and file != '__init__.py': + submodule = module.__name__ + '.' + file[:-3] else: - if resource_exists( - module.__name__, file+'/__init__.py' - ): + if resource_exists(module.__name__, file + '/__init__.py'): submodule = module.__name__+'.'+file else: continue tests.append(self.loadTestsFromName(submodule)) - if len(tests)!=1: + if len(tests) != 1: return self.suiteClass(tests) else: return tests[0] # don't create a nested suite for only one return @@ -51,12 +54,14 @@ ('test-module=','m', "Run 'test_suite' in specified module"), ('test-suite=','s', "Test suite to run (e.g. 'some_module.test_suite')"), + ('test-runner=', 'r', "Test runner to use"), ] def initialize_options(self): self.test_suite = None self.test_module = None self.test_loader = None + self.test_runner = None def finalize_options(self): @@ -64,7 +69,7 @@ if self.test_module is None: self.test_suite = self.distribution.test_suite else: - self.test_suite = self.test_module+".test_suite" + self.test_suite = self.test_module + ".test_suite" elif self.test_module: raise DistutilsOptionError( "You may specify a module or a suite, but not both" @@ -75,12 +80,18 @@ if self.verbose: self.test_args.insert(0,'--verbose') if self.test_loader is None: - self.test_loader = getattr(self.distribution,'test_loader',None) + self.test_loader = getattr(self.distribution, 'test_loader', None) if self.test_loader is None: self.test_loader = "setuptools.command.test:ScanningLoader" + if self.test_runner is None: + self.test_runner = getattr(self.distribution, 'test_runner', None) def with_project_on_sys_path(self, func): - if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False): + with_2to3 = ( + sys.version_info >= (3,) + and getattr(self.distribution, 'use_2to3', False) + ) + if with_2to3: # If we run 2to3 we can not do this inplace: # Ensure metadata is up-to-date @@ -135,8 +146,6 @@ self.with_project_on_sys_path(self.run_tests) def run_tests(self): - import unittest - # Purge modules under test from sys.modules. The test loader will # re-import them from the build location. Required when 2to3 is used # with namespace packages. @@ -152,10 +161,19 @@ del_modules.append(name) list(map(sys.modules.__delitem__, del_modules)) - loader_ep = EntryPoint.parse("x="+self.test_loader) - loader_class = loader_ep.load(require=False) - cks = loader_class() - unittest.main( + unittest_main( None, None, [unittest.__file__]+self.test_args, - testLoader = cks + testLoader=self._resolve_as_ep(self.test_loader), + testRunner=self._resolve_as_ep(self.test_runner), ) + + @staticmethod + def _resolve_as_ep(val): + """ + Load the indicated attribute value, called, as a as if it were + specified as an entry point. + """ + if val is None: + return + parsed = EntryPoint.parse("x=" + val) + return parsed.load(require=False)() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/py31compat.py new/setuptools-3.4.4/setuptools/py31compat.py --- old/setuptools-3.3/setuptools/py31compat.py 2014-03-06 15:48:25.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/py31compat.py 2014-04-08 01:14:18.000000000 +0200 @@ -1,3 +1,6 @@ +import sys +import unittest + __all__ = ['get_config_vars', 'get_path'] try: @@ -35,3 +38,15 @@ except OSError: #removal errors are not the only possible pass self.name = None + + +unittest_main = unittest.main + +_PY31 = (3, 1) <= sys.version_info[:2] < (3, 2) +if _PY31: + # on Python 3.1, translate testRunner==None to TextTestRunner + # for compatibility with Python 2.6, 2.7, and 3.2+ + def unittest_main(*args, **kwargs): + if 'testRunner' in kwargs and kwargs['testRunner'] is None: + kwargs['testRunner'] = unittest.TextTestRunner + return unittest.main(*args, **kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/tests/test_easy_install.py new/setuptools-3.4.4/setuptools/tests/test_easy_install.py --- old/setuptools-3.3/setuptools/tests/test_easy_install.py 2014-03-15 13:37:21.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/tests/test_easy_install.py 2014-04-08 01:14:18.000000000 +0200 @@ -23,6 +23,7 @@ from pkg_resources import Distribution as PRDistribution import setuptools.tests.server import pkg_resources +from .py26compat import skipIf class FakeDist(object): def get_entry_map(self, group): @@ -225,6 +226,9 @@ else: del os.environ['PYTHONPATH'] + @skipIf(sys.version_info < (3, 4), + "Test fails on Python 3.3 and earlier due to bug in inspect but only " + "when run under setup.py test") def test_setup_requires(self): """Regression test for Distribute issue #318 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/tests/test_find_packages.py new/setuptools-3.4.4/setuptools/tests/test_find_packages.py --- old/setuptools-3.3/setuptools/tests/test_find_packages.py 2014-03-16 09:53:16.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/tests/test_find_packages.py 2014-04-08 01:20:00.000000000 +0200 @@ -4,8 +4,10 @@ import tempfile import unittest +import setuptools from setuptools import find_packages +find_420_packages = setuptools.PEP420PackageFinder.find class TestFindPackages(unittest.TestCase): @@ -63,6 +65,11 @@ packages = find_packages(self.dist_dir) self.assertEqual(packages, ['pkg', 'pkg.subpkg']) + def test_exclude(self): + self._touch('__init__.py', self.pkg_dir) + packages = find_packages(self.dist_dir, exclude=('pkg.*',)) + assert packages == ['pkg'] + def test_include_excludes_other(self): """ If include is specified, other packages should be excluded. @@ -80,3 +87,45 @@ self._touch('file.dat', data_dir) packages = find_packages(self.dist_dir) self.assertTrue('pkg.some.data' not in packages) + + def test_dir_with_packages_in_subdir_is_excluded(self): + """ + Ensure that a package in a non-package such as build/pkg/__init__.py + is excluded. + """ + build_dir = self._mkdir('build', self.dist_dir) + build_pkg_dir = self._mkdir('pkg', build_dir) + self._touch('__init__.py', build_pkg_dir) + packages = find_packages(self.dist_dir) + self.assertTrue('build.pkg' not in packages) + + def _assert_packages(self, actual, expected): + self.assertEqual(set(actual), set(expected)) + + def test_pep420_ns_package(self): + packages = find_420_packages( + self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets']) + self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + + def test_pep420_ns_package_no_includes(self): + packages = find_420_packages( + self.dist_dir, exclude=['pkg.subpkg.assets']) + self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg']) + + def test_pep420_ns_package_no_includes_or_excludes(self): + packages = find_420_packages(self.dist_dir) + expected = [ + 'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets'] + self._assert_packages(packages, expected) + + def test_regular_package_with_nested_pep420_ns_packages(self): + self._touch('__init__.py', self.pkg_dir) + packages = find_420_packages( + self.dist_dir, exclude=['docs', 'pkg.subpkg.assets']) + self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + + def test_pep420_ns_package_no_non_package_dirs(self): + shutil.rmtree(self.docs_dir) + shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets')) + packages = find_420_packages(self.dist_dir) + self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools/version.py new/setuptools-3.4.4/setuptools/version.py --- old/setuptools-3.3/setuptools/version.py 2014-03-16 09:01:53.000000000 +0100 +++ new/setuptools-3.4.4/setuptools/version.py 2014-04-08 01:14:18.000000000 +0200 @@ -1 +1 @@ -__version__ = '3.3' +__version__ = '3.4.4' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools.egg-info/PKG-INFO new/setuptools-3.4.4/setuptools.egg-info/PKG-INFO --- old/setuptools-3.3/setuptools.egg-info/PKG-INFO 2014-03-16 10:04:36.000000000 +0100 +++ new/setuptools-3.4.4/setuptools.egg-info/PKG-INFO 2014-04-11 06:50:41.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools -Version: 3.3 +Version: 3.4.4 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://pypi.python.org/pypi/setuptools Author: Python Packaging Authority @@ -222,6 +222,42 @@ CHANGES ======= + ----- + 3.4.4 + ----- + + * `Issue #184 <https://bitbucket.org/pypa/setuptools/issue/184>`_: Correct failure where find_package over-matched packages + when directory traversal isn't short-circuited. + + ----- + 3.4.3 + ----- + + * `Issue #183 <https://bitbucket.org/pypa/setuptools/issue/183>`_: Really fix test command with Python 3.1. + + ----- + 3.4.2 + ----- + + * `Issue #183 <https://bitbucket.org/pypa/setuptools/issue/183>`_: Fix additional regression in test command on Python 3.1. + + ----- + 3.4.1 + ----- + + * `Issue #180 <https://bitbucket.org/pypa/setuptools/issue/180>`_: Fix regression in test command not caught by py.test-run tests. + + --- + 3.4 + --- + + * `Issue #176 <https://bitbucket.org/pypa/setuptools/issue/176>`_: Add parameter to the test command to support a custom test + runner: --test-runner or -r. + * `Issue #177 <https://bitbucket.org/pypa/setuptools/issue/177>`_: Now assume most common invocation to install command on + platforms/environments without stack support (issuing a warning). Setuptools + now installs naturally on IronPython. Behavior on CPython should be + unchanged. + --- 3.3 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools.egg-info/SOURCES.txt new/setuptools-3.4.4/setuptools.egg-info/SOURCES.txt --- old/setuptools-3.3/setuptools.egg-info/SOURCES.txt 2014-03-16 10:04:38.000000000 +0100 +++ new/setuptools-3.4.4/setuptools.egg-info/SOURCES.txt 2014-04-11 06:50:42.000000000 +0200 @@ -59,9 +59,7 @@ setuptools.egg-info/PKG-INFO setuptools.egg-info/SOURCES.txt setuptools.egg-info/dependency_links.txt -setuptools.egg-info/dependency_links.txt.orig setuptools.egg-info/entry_points.txt -setuptools.egg-info/entry_points.txt.orig setuptools.egg-info/requires.txt setuptools.egg-info/requires.txt.orig setuptools.egg-info/top_level.txt @@ -146,7 +144,6 @@ setuptools/tests/svn_data/svn18_info.xml tests/api_tests.txt tests/manual_test.py -tests/test_ez_setup.py tests/test_pkg_resources.py tests/shlib_test/hello.c tests/shlib_test/hello.pyx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools.egg-info/dependency_links.txt.orig new/setuptools-3.4.4/setuptools.egg-info/dependency_links.txt.orig --- old/setuptools-3.3/setuptools.egg-info/dependency_links.txt.orig 2014-03-16 08:58:41.000000000 +0100 +++ new/setuptools-3.4.4/setuptools.egg-info/dependency_links.txt.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790 -https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools.egg-info/entry_points.txt new/setuptools-3.4.4/setuptools.egg-info/entry_points.txt --- old/setuptools-3.3/setuptools.egg-info/entry_points.txt 2014-03-16 10:04:36.000000000 +0100 +++ new/setuptools-3.4.4/setuptools.egg-info/entry_points.txt 2014-04-11 06:50:41.000000000 +0200 @@ -1,62 +1,63 @@ -[setuptools.installation] -eggsecutable = setuptools.command.easy_install:bootstrap +[console_scripts] +easy_install = setuptools.command.easy_install:main +easy_install-3.4 = setuptools.command.easy_install:main + +[distutils.commands] +alias = setuptools.command.alias:alias +bdist_egg = setuptools.command.bdist_egg:bdist_egg +bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm +bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst +build_ext = setuptools.command.build_ext:build_ext +build_py = setuptools.command.build_py:build_py +develop = setuptools.command.develop:develop +easy_install = setuptools.command.easy_install:easy_install +egg_info = setuptools.command.egg_info:egg_info +install = setuptools.command.install:install +install_egg_info = setuptools.command.install_egg_info:install_egg_info +install_lib = setuptools.command.install_lib:install_lib +install_scripts = setuptools.command.install_scripts:install_scripts +register = setuptools.command.register:register +rotate = setuptools.command.rotate:rotate +saveopts = setuptools.command.saveopts:saveopts +sdist = setuptools.command.sdist:sdist +setopt = setuptools.command.setopt:setopt +test = setuptools.command.test:test +upload_docs = setuptools.command.upload_docs:upload_docs [distutils.setup_keywords] -packages = setuptools.dist:check_packages +convert_2to3_doctests = setuptools.dist:assert_string_list +dependency_links = setuptools.dist:assert_string_list +eager_resources = setuptools.dist:assert_string_list entry_points = setuptools.dist:check_entry_points -test_suite = setuptools.dist:check_test_suite -include_package_data = setuptools.dist:assert_bool exclude_package_data = setuptools.dist:check_package_data -convert_2to3_doctests = setuptools.dist:assert_string_list extras_require = setuptools.dist:check_extras +include_package_data = setuptools.dist:assert_bool install_requires = setuptools.dist:check_requirements -use_2to3_fixers = setuptools.dist:assert_string_list -zip_safe = setuptools.dist:assert_bool namespace_packages = setuptools.dist:check_nsp +package_data = setuptools.dist:check_package_data +packages = setuptools.dist:check_packages test_loader = setuptools.dist:check_importable -use_2to3 = setuptools.dist:assert_bool -eager_resources = setuptools.dist:assert_string_list -dependency_links = setuptools.dist:assert_string_list +test_runner = setuptools.dist:check_importable +test_suite = setuptools.dist:check_test_suite tests_require = setuptools.dist:check_requirements -package_data = setuptools.dist:check_package_data +use_2to3 = setuptools.dist:assert_bool use_2to3_exclude_fixers = setuptools.dist:assert_string_list - -[setuptools.file_finders] -svn_cvs = setuptools.command.sdist:_default_revctrl - -[distutils.commands] -setopt = setuptools.command.setopt:setopt -easy_install = setuptools.command.easy_install:easy_install -bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst -register = setuptools.command.register:register -test = setuptools.command.test:test -install_scripts = setuptools.command.install_scripts:install_scripts -install = setuptools.command.install:install -alias = setuptools.command.alias:alias -bdist_egg = setuptools.command.bdist_egg:bdist_egg -build_py = setuptools.command.build_py:build_py -install_lib = setuptools.command.install_lib:install_lib -rotate = setuptools.command.rotate:rotate -bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm -egg_info = setuptools.command.egg_info:egg_info -develop = setuptools.command.develop:develop -install_egg_info = setuptools.command.install_egg_info:install_egg_info -build_ext = setuptools.command.build_ext:build_ext -sdist = setuptools.command.sdist:sdist -saveopts = setuptools.command.saveopts:saveopts -upload_docs = setuptools.command.upload_docs:upload_docs +use_2to3_fixers = setuptools.dist:assert_string_list +zip_safe = setuptools.dist:assert_bool [egg_info.writers] -namespace_packages.txt = setuptools.command.egg_info:overwrite_arg -eager_resources.txt = setuptools.command.egg_info:overwrite_arg -entry_points.txt = setuptools.command.egg_info:write_entries PKG-INFO = setuptools.command.egg_info:write_pkg_info -depends.txt = setuptools.command.egg_info:warn_depends_obsolete dependency_links.txt = setuptools.command.egg_info:overwrite_arg -top_level.txt = setuptools.command.egg_info:write_toplevel_names +depends.txt = setuptools.command.egg_info:warn_depends_obsolete +eager_resources.txt = setuptools.command.egg_info:overwrite_arg +entry_points.txt = setuptools.command.egg_info:write_entries +namespace_packages.txt = setuptools.command.egg_info:overwrite_arg requires.txt = setuptools.command.egg_info:write_requirements +top_level.txt = setuptools.command.egg_info:write_toplevel_names -[console_scripts] -easy_install = setuptools.command.easy_install:main -easy_install-3.4 = setuptools.command.easy_install:main +[setuptools.file_finders] +svn_cvs = setuptools.command.sdist:_default_revctrl + +[setuptools.installation] +eggsecutable = setuptools.command.easy_install:bootstrap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools.egg-info/entry_points.txt.orig new/setuptools-3.4.4/setuptools.egg-info/entry_points.txt.orig --- old/setuptools-3.3/setuptools.egg-info/entry_points.txt.orig 2014-03-16 08:59:06.000000000 +0100 +++ new/setuptools-3.4.4/setuptools.egg-info/entry_points.txt.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -[setuptools.installation] -eggsecutable = setuptools.command.easy_install:bootstrap - -[setuptools.file_finders] -svn_cvs = setuptools.command.sdist:_default_revctrl - -[distutils.setup_keywords] -tests_require = setuptools.dist:check_requirements -entry_points = setuptools.dist:check_entry_points -namespace_packages = setuptools.dist:check_nsp -eager_resources = setuptools.dist:assert_string_list -use_2to3_fixers = setuptools.dist:assert_string_list -packages = setuptools.dist:check_packages -package_data = setuptools.dist:check_package_data -test_loader = setuptools.dist:check_importable -convert_2to3_doctests = setuptools.dist:assert_string_list -dependency_links = setuptools.dist:assert_string_list -extras_require = setuptools.dist:check_extras -zip_safe = setuptools.dist:assert_bool -install_requires = setuptools.dist:check_requirements -include_package_data = setuptools.dist:assert_bool -use_2to3_exclude_fixers = setuptools.dist:assert_string_list -test_suite = setuptools.dist:check_test_suite -use_2to3 = setuptools.dist:assert_bool -exclude_package_data = setuptools.dist:check_package_data - -[egg_info.writers] -namespace_packages.txt = setuptools.command.egg_info:overwrite_arg -dependency_links.txt = setuptools.command.egg_info:overwrite_arg -PKG-INFO = setuptools.command.egg_info:write_pkg_info -entry_points.txt = setuptools.command.egg_info:write_entries -eager_resources.txt = setuptools.command.egg_info:overwrite_arg -requires.txt = setuptools.command.egg_info:write_requirements -depends.txt = setuptools.command.egg_info:warn_depends_obsolete -top_level.txt = setuptools.command.egg_info:write_toplevel_names - -[distutils.commands] -test = setuptools.command.test:test -install = setuptools.command.install:install -egg_info = setuptools.command.egg_info:egg_info -sdist = setuptools.command.sdist:sdist -upload_docs = setuptools.command.upload_docs:upload_docs -build_py = setuptools.command.build_py:build_py -bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst -setopt = setuptools.command.setopt:setopt -install_lib = setuptools.command.install_lib:install_lib -bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm -rotate = setuptools.command.rotate:rotate -bdist_egg = setuptools.command.bdist_egg:bdist_egg -install_scripts = setuptools.command.install_scripts:install_scripts -alias = setuptools.command.alias:alias -install_egg_info = setuptools.command.install_egg_info:install_egg_info -easy_install = setuptools.command.easy_install:easy_install -build_ext = setuptools.command.build_ext:build_ext -saveopts = setuptools.command.saveopts:saveopts -register = setuptools.command.register:register -develop = setuptools.command.develop:develop - -[console_scripts] -easy_install-3.4 = setuptools.command.easy_install:main -easy_install = setuptools.command.easy_install:main - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools.egg-info/requires.txt.orig new/setuptools-3.4.4/setuptools.egg-info/requires.txt.orig --- old/setuptools-3.3/setuptools.egg-info/requires.txt.orig 2014-03-16 08:58:41.000000000 +0100 +++ new/setuptools-3.4.4/setuptools.egg-info/requires.txt.orig 2014-04-11 06:40:55.000000000 +0200 @@ -1,7 +1,7 @@ -[ssl:sys_platform=='win32'] -wincertstore==0.2 - [certs] -certifi==1.0.1 \ No newline at end of file +certifi==1.0.1 + +[ssl:sys_platform=='win32'] +wincertstore==0.2 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/setuptools.egg-info/top_level.txt new/setuptools-3.4.4/setuptools.egg-info/top_level.txt --- old/setuptools-3.3/setuptools.egg-info/top_level.txt 2014-03-16 10:04:36.000000000 +0100 +++ new/setuptools-3.4.4/setuptools.egg-info/top_level.txt 2014-04-11 06:50:41.000000000 +0200 @@ -1,4 +1,4 @@ -_markerlib pkg_resources -setuptools easy_install +setuptools +_markerlib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/tests/test_ez_setup.py new/setuptools-3.4.4/tests/test_ez_setup.py --- old/setuptools-3.3/tests/test_ez_setup.py 2014-02-12 04:53:22.000000000 +0100 +++ new/setuptools-3.4.4/tests/test_ez_setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -import sys -import os -import tempfile -import unittest -import shutil -import copy - -CURDIR = os.path.abspath(os.path.dirname(__file__)) -TOPDIR = os.path.split(CURDIR)[0] -sys.path.insert(0, TOPDIR) - -from ez_setup import (use_setuptools, _build_egg, _python_cmd, _do_download, - _install, DEFAULT_URL, DEFAULT_VERSION) -import ez_setup - -class TestSetup(unittest.TestCase): - - def urlopen(self, url): - return open(self.tarball, 'rb') - - def setUp(self): - self.old_sys_path = copy.copy(sys.path) - self.cwd = os.getcwd() - self.tmpdir = tempfile.mkdtemp() - os.chdir(TOPDIR) - _python_cmd("setup.py", "-q", "egg_info", "-RDb", "''", "sdist", - "--dist-dir", "%s" % self.tmpdir) - tarball = os.listdir(self.tmpdir)[0] - self.tarball = os.path.join(self.tmpdir, tarball) - from setuptools.compat import urllib2 - urllib2.urlopen = self.urlopen - - def tearDown(self): - shutil.rmtree(self.tmpdir) - os.chdir(self.cwd) - sys.path = copy.copy(self.old_sys_path) - - def test_build_egg(self): - # making it an egg - egg = _build_egg('Egg to be built', self.tarball, self.tmpdir) - - # now trying to import it - sys.path[0] = egg - import setuptools - self.assertTrue(setuptools.__file__.startswith(egg)) - - def test_do_download(self): - tmpdir = tempfile.mkdtemp() - _do_download(DEFAULT_VERSION, DEFAULT_URL, tmpdir, 1) - import setuptools - self.assertTrue(setuptools.bootstrap_install_from.startswith(tmpdir)) - - def test_install(self): - def _faked(*args): - return True - ez_setup.python_cmd = _faked - _install(self.tarball) - - def test_use_setuptools(self): - self.assertEqual(use_setuptools(), None) - -if __name__ == '__main__': - unittest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-3.3/tests/test_pkg_resources.py new/setuptools-3.4.4/tests/test_pkg_resources.py --- old/setuptools-3.3/tests/test_pkg_resources.py 2014-02-12 04:53:22.000000000 +0100 +++ new/setuptools-3.4.4/tests/test_pkg_resources.py 2014-04-08 01:07:02.000000000 +0200 @@ -2,6 +2,8 @@ import tempfile import os import zipfile +import datetime +import time import pkg_resources @@ -10,6 +12,16 @@ except NameError: unicode = str +def timestamp(dt): + """ + Return a timestamp for a local, naive datetime instance. + """ + try: + return dt.timestamp() + except AttributeError: + # Python 3.2 and earlier + return time.mktime(dt.timetuple()) + class EggRemover(unicode): def __call__(self): if self in sys.path: @@ -20,6 +32,9 @@ class TestZipProvider(object): finalizers = [] + ref_time = datetime.datetime(2013, 5, 12, 13, 25, 0) + "A reference time for a file modification" + @classmethod def setup_class(cls): "create a zip egg and add it to sys.path" @@ -27,11 +42,11 @@ zip_egg = zipfile.ZipFile(egg, 'w') zip_info = zipfile.ZipInfo() zip_info.filename = 'mod.py' - zip_info.date_time = 2013, 5, 12, 13, 25, 0 + zip_info.date_time = cls.ref_time.timetuple() zip_egg.writestr(zip_info, 'x = 3\n') zip_info = zipfile.ZipInfo() zip_info.filename = 'data.dat' - zip_info.date_time = 2013, 5, 12, 13, 25, 0 + zip_info.date_time = cls.ref_time.timetuple() zip_egg.writestr(zip_info, 'hello, world!') zip_egg.close() egg.close() @@ -55,11 +70,13 @@ manager = pkg_resources.ResourceManager() zp = pkg_resources.ZipProvider(mod) filename = zp.get_resource_filename(manager, 'data.dat') - assert os.stat(filename).st_mtime == 1368379500 + actual = datetime.datetime.fromtimestamp(os.stat(filename).st_mtime) + assert actual == self.ref_time f = open(filename, 'w') f.write('hello, world?') f.close() - os.utime(filename, (1368379500, 1368379500)) + ts = timestamp(self.ref_time) + os.utime(filename, (ts, ts)) filename = zp.get_resource_filename(manager, 'data.dat') f = open(filename) assert f.read() == 'hello, world!' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lvm2 for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2014-04-26 17:01:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lvm2" Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/lvm2.changes 2014-04-11 14:40:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lvm2.new/lvm2.changes 2014-04-26 17:01:51.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Apr 16 09:11:32 UTC 2014 - trenn(a)suse.de + +- Switch from mkinitrd to dracut + - Dracut already has a lvm module and takes care that the right stuff is + include into initrd, therefore remove: + - mkinitrd-lvm2-boot.sh + - mkinitrd-lvm2-setup.sh + mkinitrd scripts from sources + - Add dracut macros in %post and %posttrans to ensure initrd recreation +- Remove unneeded comments in .spec file +- Do not compile in DATE and TIME to avoid build unneeded retriggering in obs + Add: cmirrord_remove_date_time_from_compilation.patch + +------------------------------------------------------------------- Old: ---- mkinitrd-lvm2-boot.sh mkinitrd-lvm2-setup.sh New: ---- cmirrord_remove_date_time_from_compilation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.hvy8dL/_old 2014-04-26 17:01:52.000000000 +0200 +++ /var/tmp/diff_new_pack.hvy8dL/_new 2014-04-26 17:01:52.000000000 +0200 @@ -25,11 +25,11 @@ BuildRequires: libselinux-devel BuildRequires: libudev-devel BuildRequires: readline-devel +BuildRequires: suse-module-tools BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(udev) Requires: device-mapper >= 1.02.25 Provides: lvm -PreReq: /sbin/mkinitrd Version: 2.02.98 Release: 0.<RELEASE11> Summary: Logical Volume Manager Tools @@ -38,8 +38,6 @@ Source: ftp://sources.redhat.com/pub/%{name}/LVM2.%{version}.tgz Source42: ftp://sources.redhat.com/pub/%{name}/LVM2.%{version}.tgz.asc Source1: lvm.conf -Source4: mkinitrd-lvm2-setup.sh -Source5: mkinitrd-lvm2-boot.sh Source8: clvmd.ocf Source10: cmirrord.ocf Source14: baselibs.conf @@ -100,6 +98,8 @@ Patch88: clvmd-Avoid-a-3-way-deadlock-in-dead-client-cleanup.patch Patch89: 0001-clvmd-avoid-logging-in-signal-handler.patch +# Never upstream +Patch90: cmirrord_remove_date_time_from_compilation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Not a real replacement but we drop evms Provides: evms = 2.5.5 @@ -153,6 +153,7 @@ %patch87 -p1 %patch88 -p1 %patch89 -p1 +%patch90 -p1 %build #set path so that thin_check can be found @@ -193,10 +194,6 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/metadata install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/lvm mkdir -p $RPM_BUILD_ROOT/etc/init.d -#install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-lvm2.sh -install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-lvm2.sh install -m755 -D %{S:8} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/clvmd install -m755 -D %{S:10} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/cmirrord @@ -227,11 +224,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share rm $RPM_BUILD_ROOT/etc/lvm/cache/.cache -# these files are put into their own devel package -##remove lvm-devel parts -#rm -f $RPM_BUILD_ROOT/usr/include/lvm2cmd.h -#rm -f $RPM_BUILD_ROOT/usr/include/lvm2app.h -#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/lvm2app.pc #remove device-mapper man page rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/dm* #remove device-mapper systemd events @@ -249,16 +241,18 @@ %post /sbin/ldconfig -[ -x /sbin/mkinitrd ] && /sbin/mkinitrd +%{?regenerate_initrd_post} %service_add_post blk-availability.service lvm2-monitor.service %service_add_post lvm2-lvmetad.socket +%posttrans +%{?regenerate_initrd_posttrans} + %preun %service_del_preun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service lvm2-lvmetad.socket %postun /sbin/ldconfig -[ -x /sbin/mkinitrd ] && /sbin/mkinitrd %service_del_postun lvm2-lvmetad.service %files @@ -268,8 +262,6 @@ %dir /etc/lvm/backup %dir /etc/lvm/archive %dir /etc/lvm/metadata -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts %{_udevdir}/rules.d/11-dm-lvm.rules %{_udevdir}/rules.d/69-dm-lvm-metad.rules %{_unitdir}/blk-availability.service @@ -278,8 +270,6 @@ %{_unitdir}/lvm2-lvmetad.service %{_tmpfilesdir}/lvm2.conf %config /etc/lvm/lvm.conf -/lib/mkinitrd/scripts/setup-lvm2.sh -/lib/mkinitrd/scripts/boot-lvm2.sh /usr/lib/systemd/system-generators/lvm2-activation-generator /sbin/blkdeactivate /sbin/fsadm ++++++ cmirrord_remove_date_time_from_compilation.patch ++++++ cmirrord: Do not compile in Data and Time to avoid build retriggering in obs Signed-off-by: Thomas Renninger <trenn(a)suse.de> Index: LVM2.2.02.98/daemons/cmirrord/clogd.c =================================================================== --- LVM2.2.02.98.orig/daemons/cmirrord/clogd.c +++ LVM2.2.02.98/daemons/cmirrord/clogd.c @@ -42,7 +42,6 @@ int main(int argc __attribute__((unused) kill(getppid(), SIGTERM); LOG_PRINT("Starting cmirrord:"); - LOG_PRINT(" Built: "__DATE__" "__TIME__"\n"); LOG_DBG(" Compiled with debugging."); while (!exit_now) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sg3_utils for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package sg3_utils for openSUSE:Factory checked in at 2014-04-26 17:01:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sg3_utils (Old) and /work/SRC/openSUSE:Factory/.sg3_utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sg3_utils" Changes: -------- --- /work/SRC/openSUSE:Factory/sg3_utils/sg3_utils.changes 2014-04-14 06:42:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sg3_utils.new/sg3_utils.changes 2014-04-26 17:01:50.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 15 20:11:54 UTC 2014 - spargaonkar(a)suse.com + +- added patch sginfo-inq-fields-strip-blank.patch + sg3_utils: Strip out trailing info from vendor info products fields in inq + bnc#863357 + +- added patches: + * sginfo-inq-fields-strip-blank.patch +------------------------------------------------------------------- New: ---- sginfo-inq-fields-strip-blank.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sg3_utils.spec ++++++ --- /var/tmp/diff_new_pack.lFEhBp/_old 2014-04-26 17:01:51.000000000 +0200 +++ /var/tmp/diff_new_pack.lFEhBp/_new 2014-04-26 17:01:51.000000000 +0200 @@ -27,6 +27,7 @@ Source: http://sg.danny.cz/sg/p/%name-%{version}.tar.xz Patch1: 0001-Split-59-scsi-sg_utils.rules-for-multipath-support.patch +Patch2: sginfo-inq-fields-strip-blank.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: udev BuildRequires: xz @@ -82,6 +83,7 @@ %prep %setup -q -n %{name}-%{version} %patch1 -p1 +%patch2 -p1 %build %configure --disable-static --with-pic ++++++ sginfo-inq-fields-strip-blank.patch ++++++ From: Shirish Pargaonkar <spargaonkar(a)suse.com> Subject: sg3_utils: Strip out trailing info from vendor info products fields in inquiry commit 1756f3b04d4c45d7a0d78e128786b2a1c619565e Date: Tue Apr 15 10:31:23 2014 -0500 Reference: bnc#863357 sginfo <device> prints out various fields such as Vendor and Product in INQUIRY response with spaces (0x20) characters. This can confuse scripts some users have. Strip out those trailing spaces (if any). signed-of-by: Shirish Pargaonkar <spargaonkar(a)suse.com> --- diff --git a/src/sginfo.c b/src/sginfo.c index b27f117..b9f3f77 100644 --- a/src/sginfo.c +++ b/src/sginfo.c @@ -155,6 +155,7 @@ static char *device_name; #define MAX_BUFFER_SIZE MAX_RESP10_SIZE #define INQUIRY_RESP_INITIAL_LEN 36 +#define MAX_INQFIELD_LEN 17 #define MAX_HEADS 127 #define HEAD_SORT_TOKEN 0x55 @@ -3139,11 +3140,23 @@ do_user_page(struct mpage_info * mpi, int decode_in_hex) return status; } +static void +inqfieldname(unsigned char *deststr, const unsigned char *srcbuf, int maxlen) +{ + int i; + + memset(deststr, '\0', MAX_INQFIELD_LEN); + for (i = maxlen - 1; i >= 0 && isspace(srcbuf[i]); --i) + ; + memcpy(deststr, srcbuf, i + 1); +} + static int do_inquiry(int * peri_type, int * resp_byte6, int inquiry_verbosity) { int status; unsigned char cmd[6]; + unsigned char fieldname[MAX_INQFIELD_LEN]; unsigned char *pagestart; struct scsi_cmnd_io sci; @@ -3214,14 +3227,17 @@ do_inquiry(int * peri_type, int * resp_byte6, int inquiry_verbosity) } if (x_interface) printf("\n"); - printf("%s%.8s\n", (!x_interface ? "Vendor: " : ""), - pagestart + 8); + inqfieldname(fieldname, pagestart + 8, 8); + printf("%s%s\n", (!x_interface ? "Vendor: " : ""), + fieldname); - printf("%s%.16s\n", (!x_interface ? "Product: " : ""), - pagestart + 16); + inqfieldname(fieldname, pagestart + 16, 16); + printf("%s%s\n", (!x_interface ? "Product: " : ""), + fieldname); - printf("%s%.4s\n", (!x_interface ? "Revision level: " : ""), - pagestart + 32); + inqfieldname(fieldname, pagestart + 32, 4); + printf("%s%s\n", (!x_interface ? "Revision level: " : ""), + fieldname); printf("\n"); return status; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sqlite3 for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package sqlite3 for openSUSE:Factory checked in at 2014-04-26 17:01:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sqlite3 (Old) and /work/SRC/openSUSE:Factory/.sqlite3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sqlite3" Changes: -------- --- /work/SRC/openSUSE:Factory/sqlite3/sqlite3.changes 2014-04-06 09:55:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sqlite3.new/sqlite3.changes 2014-04-26 17:01:49.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 23 08:12:14 UTC 2014 - tittiatcoke(a)gmail.com + +- Build SQLite with the unlock_notify API, which is now required + for the akonadi QSQLITE3 driver. "-DSQLITE_ENABLE_UNLOCK_NOTIFY" + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlite3.spec ++++++ --- /var/tmp/diff_new_pack.P5O6gi/_old 2014-04-26 17:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.P5O6gi/_new 2014-04-26 17:01:49.000000000 +0200 @@ -124,7 +124,7 @@ ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html %build -export CFLAGS="%optflags -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS4" +export CFLAGS="%optflags -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_UNLOCK_NOTIFY" %configure --disable-static make -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-country for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2014-04-26 17:01:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2014-04-13 13:13:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2014-04-26 17:01:47.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 23 08:59:09 CEST 2014 - jsuchome(a)suse.cz + +- do not try to save settings when user did not change them + (bnc#850571) +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-country-3.1.8.tar.bz2 New: ---- yast2-country-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.1WXMaO/_old 2014-04-26 17:01:48.000000000 +0200 +++ /var/tmp/diff_new_pack.1WXMaO/_new 2014-04-26 17:01:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.1.8.tar.bz2 -> yast2-country-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.8/package/yast2-country.changes new/yast2-country-3.1.9/package/yast2-country.changes --- old/yast2-country-3.1.8/package/yast2-country.changes 2014-04-10 12:35:41.000000000 +0200 +++ new/yast2-country-3.1.9/package/yast2-country.changes 2014-04-23 09:30:42.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 23 08:59:09 CEST 2014 - jsuchome(a)suse.cz + +- do not try to save settings when user did not change them + (bnc#850571) +- 3.1.9 + +------------------------------------------------------------------- Thu Apr 10 09:41:15 UTC 2014 - mvidner(a)suse.com - Ensure that the title stays on top during the installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.8/package/yast2-country.spec new/yast2-country-3.1.9/package/yast2-country.spec --- old/yast2-country-3.1.8/package/yast2-country.spec 2014-04-10 12:35:41.000000000 +0200 +++ new/yast2-country-3.1.9/package/yast2-country.spec 2014-04-23 09:30:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.8/timezone/src/include/timezone/dialogs.rb new/yast2-country-3.1.9/timezone/src/include/timezone/dialogs.rb --- old/yast2-country-3.1.8/timezone/src/include/timezone/dialogs.rb 2014-04-10 12:35:41.000000000 +0200 +++ new/yast2-country-3.1.9/timezone/src/include/timezone/dialogs.rb 2014-04-23 09:30:42.000000000 +0200 @@ -973,7 +973,7 @@ changed_time = true if timezone != timezone_old timezone_old = timezone hwclock_s_old = @hwclock_s - SetTimezone(@hwclock_s, timezone, ret == :next, changed_time) + SetTimezone(@hwclock_s, timezone, ret == :next && (changed_time || @hwclock_s != @hwclock_s_initial), changed_time) end if ret == :next -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openssl for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at 2014-04-26 17:01:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl (Old) and /work/SRC/openSUSE:Factory/.openssl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Changes: -------- --- /work/SRC/openSUSE:Factory/openssl/openssl.changes 2014-04-18 11:07:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openssl.new/openssl.changes 2014-04-26 17:01:46.000000000 +0200 @@ -1,0 +2,47 @@ +Sun Apr 20 00:53:34 UTC 2014 - crrodriguez(a)opensuse.org + +- Build everything with full RELRO (-Wl,-z,relro,-z,now) +- Remove -fstack-protector from the hardcoded build options + it is already in RPM_OPT_FLAGS and is replaced by + -fstack-protector-strong with gcc 4.9 + +------------------------------------------------------------------- +Sun Apr 20 00:49:25 UTC 2014 - crrodriguez(a)opensuse.org + +- Remove the "gmp" and "capi" shared engines, nobody noticed + but they are just dummies that do nothing. + +------------------------------------------------------------------- +Sat Apr 19 22:29:10 UTC 2014 - crrodriguez(a)opensuse.org + +- Use enable-rfc3779 to allow projects such as rpki.net + to work in openSUSE and match the functionality + available in Debian/Fedora/etc + +------------------------------------------------------------------- +Sat Apr 19 22:22:01 UTC 2014 - crrodriguez(a)opensuse.org + +- openssl-buffreelistbug-aka-CVE-2010-5298.patch fix + CVE-2010-5298 and disable the internal BUF_FREELISTS + functionality. it hides bugs like heartbleed and is + there only for systems on which malloc() free() are slow. + +- ensure we export MALLOC_CHECK and PERTURB during the test + suite, now that the freelist functionality is disabled it + will help to catch bugs before they hit users. + +------------------------------------------------------------------- +Sat Apr 19 03:45:20 UTC 2014 - crrodriguez(a)opensuse.org + +- openssl-libssl-noweakciphers.patch do not offer "export" + or "low" quality ciphers by default. using such ciphers + is not forbidden but requires an explicit request + +------------------------------------------------------------------- +Fri Apr 18 14:07:47 UTC 2014 - crrodriguez(a)opensuse.org + +- openssl-gcc-attributes.patch: fix thinko, CRYPTO_realloc_clean does + not return memory of "num * old_num" but only "num" size + fortunately this function is currently unused. + +------------------------------------------------------------------- New: ---- openssl-buffreelistbug-aka-CVE-2010-5298.patch openssl-libssl-noweakciphers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.Nrfoy5/_old 2014-04-26 17:01:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Nrfoy5/_new 2014-04-26 17:01:47.000000000 +0200 @@ -65,6 +65,8 @@ Patch17: openssl-1.0.1e-fips-ctor.patch Patch18: openssl-1.0.1e-new-fips-reqs.patch Patch19: openssl-gcc-attributes.patch +Patch20: openssl-buffreelistbug-aka-CVE-2010-5298.patch +Patch21: openssl-libssl-noweakciphers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -171,6 +173,8 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 +%patch21 -p1 cp -p %{S:10} . cp -p %{S:11} . echo "adding/overwriting some entries in the 'table' hash in Configure" @@ -220,6 +224,7 @@ fips \ %if 0%{suse_version} > 1310 no-ssl2 \ +enable-rfc3779 \ %endif %ifarch x86_64 enable-ec_nistp_64_gcc_128 \ @@ -232,18 +237,16 @@ --openssldir=%{ssletcdir} \ $RPM_OPT_FLAGS -O3 -std=gnu99 \ -Wa,--noexecstack \ +-Wl,-z,relro,-z,now \ -fomit-frame-pointer \ -DTERMIO \ -DPURIFY \ -DSSL_FORBID_ENULL \ -D_GNU_SOURCE \ +-DOPENSSL_NO_BUF_FREELISTS \ $(getconf LFS_CFLAGS) \ -%ifnarch hppa aarch64 --Wall \ --fstack-protector " -%else -Wall " -%endif + # #%{!?do_profiling:%define do_profiling 0} #%if %do_profiling @@ -278,7 +281,8 @@ # These files are just there for the make test below... crypto/fips/fips_standalone_hmac libcrypto.so.1.0.0 > .libcrypto.so.1.0.0.hmac crypto/fips/fips_standalone_hmac libssl.so.1.0.0 > .libssl.so.1.0.0.hmac - +export MALLOC_CHECK_=3 +export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) LD_LIBRARY_PATH=`pwd` make test FIPSCANLIB="" %ifnarch armv4l LD_LIBRARY_PATH=`pwd` make test @@ -401,7 +405,7 @@ ln -sf /%{_lib}/libssl.so.%{num_version} ./libssl.so ln -sf /%{_lib}/libcrypto.so.%{num_version} ./libcrypto.so -for engine in 4758cca atalla nuron sureware ubsec cswift chil aep; do +for engine in 4758cca atalla nuron sureware ubsec cswift chil aep gmp capi; do rm %{buildroot}/%{_lib}/engines/lib$engine.so done ++++++ openssl-buffreelistbug-aka-CVE-2010-5298.patch ++++++ --- openssl-1.0.1g.orig/ssl/s3_pkt.c +++ openssl-1.0.1g/ssl/s3_pkt.c @@ -1055,8 +1055,8 @@ start: { s->rstate=SSL_ST_READ_HEADER; rr->off=0; - if (s->mode & SSL_MODE_RELEASE_BUFFERS) - ssl3_release_read_buffer(s); + if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0) + ssl3_release_read_buffer(s); } } return(n); ++++++ openssl-gcc-attributes.patch ++++++ --- /var/tmp/diff_new_pack.Nrfoy5/_old 2014-04-26 17:01:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Nrfoy5/_new 2014-04-26 17:01:47.000000000 +0200 @@ -27,7 +27,7 @@ void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file, - int line); -void *CRYPTO_remalloc(void *addr,int num, const char *file, int line); -+ int line) __attribute__((alloc_size(2, 3))); ++ int line) __attribute__((alloc_size(3))); +void *CRYPTO_remalloc(void *addr,int num, const char *file, int line) __attribute__((alloc_size(2))); void OPENSSL_cleanse(void *ptr, size_t len); ++++++ openssl-libssl-noweakciphers.patch ++++++ --- openssl-1.0.1g.orig/ssl/ssl.h +++ openssl-1.0.1g/ssl/ssl.h @@ -331,7 +331,7 @@ extern "C" { /* The following cipher list is used by default. * It also is substituted when an application-defined cipher list string * starts with 'DEFAULT'. */ -#define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:!SSLv2" +#define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:!SSLv2:!EXPORT:!LOW" /* As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always * starts with a reasonable order, and all we have to do for DEFAULT is * throwing out anonymous and unencrypted ciphersuites! -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dos2unix for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package dos2unix for openSUSE:Factory checked in at 2014-04-26 17:01:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dos2unix (Old) and /work/SRC/openSUSE:Factory/.dos2unix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dos2unix" Changes: -------- --- /work/SRC/openSUSE:Factory/dos2unix/dos2unix.changes 2014-01-07 16:20:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dos2unix.new/dos2unix.changes 2014-04-26 17:01:44.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 22 22:09:20 UTC 2014 - tabraham(a)suse.com + +- Update to 6.0.5 + * Dos2unix is part of the Translation Project (TP). + All translations go via the Translation Project. + See http://translationproject.org/ + * New translations of UI messages: Brazilian Portuguese, Chinese (traditional), + Danish, French, Hungarian, Polish, Serbian, Ukrainian, Vietnamese. + * New translations of the manual: Brazilian Portuguese, French, German, + Polish, Ukrainian. + * Generated man pages are included in the source package to prevent + compilation problems with very old or very new perl/pod2man versions. + * Manuals are now generated from gettext PO files with po4a for easier + translation. + * All manuals are now in UTF-8 encoding. + * Skip symbolic links on Windows by default (same as on Unix). + +------------------------------------------------------------------- Old: ---- dos2unix-6.0.4.tar.gz New: ---- dos2unix-6.0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dos2unix.spec ++++++ --- /var/tmp/diff_new_pack.pOc9rF/_old 2014-04-26 17:01:44.000000000 +0200 +++ /var/tmp/diff_new_pack.pOc9rF/_new 2014-04-26 17:01:44.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Text converters to and from DOS/MAC to UNIX License: BSD-3-Clause Group: Productivity/Text/Convertors -Version: 6.0.4 +Version: 6.0.5 Release: 0 Url: http://waterlan.home.xs4all.nl/dos2unix.html Source: http://waterlan.home.xs4all.nl/dos2unix/dos2unix-%{version}.tar.gz @@ -60,5 +60,7 @@ %doc %{_mandir}/*/unix2dos.1* %doc %lang(nl) %dir %_mandir/nl %doc %lang(es) %dir %_mandir/es +%doc %lang(uk) %dir %_mandir/uk +%doc %lang(pl) %dir %_mandir/pl %changelog ++++++ dos2unix-6.0.4.tar.gz -> dos2unix-6.0.5.tar.gz ++++++ ++++ 37590 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcsc-lite for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at 2014-04-26 17:01:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-lite (Old) and /work/SRC/openSUSE:Factory/.pcsc-lite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcsc-lite" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-lite/pcsc-lite.changes 2013-10-21 12:31:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-lite.new/pcsc-lite.changes 2014-04-26 17:01:42.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Apr 22 13:55:53 UTC 2014 - wr(a)rosenauer.org + +- removed rc script from 13.1 and above +- do not use polkit for now + +------------------------------------------------------------------- +Sat Feb 15 20:52:47 UTC 2014 - wr(a)rosenauer.org + +- Updated to version 1.8.11 + * Add polkit support. See doc/README.polkit + * /etc/reader.conf: CHANNELID and DEVICENAME are both optional but + not at the same time + * Some other minor improvements and bug corrections + +------------------------------------------------------------------- +Sun Dec 1 18:23:59 UTC 2013 - wr(a)rosenauer.org + +- remove dependency on sysvinit(syslog) starting with 13.1 + +------------------------------------------------------------------- Old: ---- pcsc-lite-1.8.10.tar.bz2 pcsc-lite-1.8.10.tar.bz2.asc New: ---- pcsc-lite-1.8.11.tar.bz2 pcsc-lite-1.8.11.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.7yOdiB/_old 2014-04-26 17:01:43.000000000 +0200 +++ /var/tmp/diff_new_pack.7yOdiB/_new 2014-04-26 17:01:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pcsc-lite # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,7 @@ %define ifddir %{_libdir}/readers BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: polkit-devel BuildRequires: readline-devel %if %suse_version >= 1120 BuildRequires: libudev-devel @@ -36,7 +37,7 @@ %if %suse_version > 1220 BuildRequires: gpg-offline %endif -Version: 1.8.10 +Version: 1.8.11 Release: 0 Requires(pre): pwdutils Url: http://pcsclite.alioth.debian.org/ @@ -53,9 +54,10 @@ Source7: %{name}-%{version}.tar.bz2.asc Source8: %{name}.keyring Patch0: systemd-service.patch -Requires(post): %insserv_prereq %fillup_prereq -%if %suse_version > 1130 +Requires(post): %fillup_prereq +%if %suse_version < 1310 PreReq: sysvinit(syslog) +Requires(post): %insserv_prereq %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define USER scard @@ -155,8 +157,12 @@ sed s:@ifddir@:%{ifddir}: <pcsc-lite-reader-conf >$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf # this program is noinst in the package #install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/ +%if %suse_version < 1310 install -D -m 755 pcsc-lite-init $RPM_BUILD_ROOT%{_initrddir}/pcscd ln -sf %{_initrddir}/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd +%else +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpcscd +%endif mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pcscd mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} @@ -186,13 +192,19 @@ /bin/systemctl try-restart pcscd.service || : /bin/systemctl restart pcscd.socket || : %endif +%if %suse_version < 1310 %fillup_and_insserv -y -n pcscd pcscd +%else +%fillup_only pcscd +%endif %preun %if %suse_version > 1140 %service_del_preun pcscd.service pcscd.socket %endif +%if %suse_version < 1310 %stop_on_removal pcscd +%endif %postun %if %suse_version > 1140 @@ -202,8 +214,10 @@ /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %endif +%if %suse_version < 1310 %restart_on_update pcscd %insserv_cleanup +%endif %post -n libpcsclite1 -p /sbin/ldconfig @@ -225,6 +239,7 @@ %{_docdir}/%{name}/README %{_docdir}/%{name}/README.DAEMON %{_docdir}/%{name}/README.SUSE +%{_docdir}/%{name}/README.polkit %{_docdir}/%{name}/SECURITY %{_docdir}/%{name}/TODO %doc %{_mandir}/man?/*.* @@ -235,10 +250,13 @@ %if %suse_version > 1140 %_unitdir/* %endif +%if %suse_version < 1310 %{_initrddir}/pcscd +%endif /var/adm/fillup-templates/sysconfig.pcscd # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen(). %{_libdir}/libpcsclite.so +#%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy %files -n libpcsclite1 %defattr(-,root,root) ++++++ pcsc-lite-1.8.10.tar.bz2 -> pcsc-lite-1.8.11.tar.bz2 ++++++ ++++ 4973 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-04-26 11:45:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-04-13 13:13:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-04-26 11:45:24.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Apr 25 07:15:25 UTC 2014 - mfilka(a)suse.com + +- bnc#872319 + - accelerated dhcp automatic configuration which is done during + initial phase of installer +- 3.1.50 + +------------------------------------------------------------------- +Thu Apr 17 11:44:20 UTC 2014 - mfilka(a)suse.com + +- fixed terminology confusion. "Alias name" turned into "IPv4 + Address Label". "Alias name" is obsolete since kernel 2.0.0 +- 3.1.49 + +------------------------------------------------------------------- +Thu Apr 17 08:18:58 UTC 2014 - mfilka(a)suse.com + +- bnc#870406 + - fixed assigning device name in ifcfg created during installation +- 3.1.48 + +------------------------------------------------------------------- +Mon Apr 14 16:46:02 UTC 2014 - mfilka(a)suse.com + +- bnc#873149 + - manual network configuration dialog changed to Next / Back + dialog +- 3.1.47 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.46.tar.bz2 New: ---- yast2-network-3.1.50.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.6ht7lQ/_old 2014-04-26 11:45:25.000000000 +0200 +++ /var/tmp/diff_new_pack.6ht7lQ/_new 2014-04-26 11:45:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.46 +Version: 3.1.50 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.46.tar.bz2 -> yast2-network-3.1.50.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/package/yast2-network.changes new/yast2-network-3.1.50/package/yast2-network.changes --- old/yast2-network-3.1.46/package/yast2-network.changes 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/package/yast2-network.changes 2014-04-25 14:38:44.000000000 +0200 @@ -1,10 +1,40 @@ ------------------------------------------------------------------- +Fri Apr 25 07:15:25 UTC 2014 - mfilka(a)suse.com + +- bnc#872319 + - accelerated dhcp automatic configuration which is done during + initial phase of installer +- 3.1.50 + +------------------------------------------------------------------- +Thu Apr 17 11:44:20 UTC 2014 - mfilka(a)suse.com + +- fixed terminology confusion. "Alias name" turned into "IPv4 + Address Label". "Alias name" is obsolete since kernel 2.0.0 +- 3.1.49 + +------------------------------------------------------------------- +Thu Apr 17 08:18:58 UTC 2014 - mfilka(a)suse.com + +- bnc#870406 + - fixed assigning device name in ifcfg created during installation +- 3.1.48 + +------------------------------------------------------------------- +Mon Apr 14 16:46:02 UTC 2014 - mfilka(a)suse.com + +- bnc#873149 + - manual network configuration dialog changed to Next / Back + dialog +- 3.1.47 + +------------------------------------------------------------------- Fri Apr 4 13:12:27 UTC 2014 - mfilka(a)suse.com - bnc#868187 - implemented heuristics for setting DHCLIENT_SET_DEFAULT_ROUTE during autoconfiguration in installation --3.1.46 +- 3.1.46 ------------------------------------------------------------------- Fri Apr 4 12:41:36 UTC 2014 - jreidinger(a)suse.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/package/yast2-network.spec new/yast2-network-3.1.50/package/yast2-network.spec --- old/yast2-network-3.1.46/package/yast2-network.spec 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/package/yast2-network.spec 2014-04-25 14:38:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.46 +Version: 3.1.50 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/Makefile.am new/yast2-network-3.1.50/src/Makefile.am --- old/yast2-network-3.1.46/src/Makefile.am 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/Makefile.am 2014-04-25 14:38:44.000000000 +0200 @@ -111,7 +111,8 @@ ylib_DATA = \ lib/network/edit_nic_name.rb \ lib/network/confirm_virt_proposal.rb \ - lib/network/install_inf_convertor.rb + lib/network/install_inf_convertor.rb \ + lib/network/network_autoconfiguration.rb EXTRA_DIST = \ $(module_DATA) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/clients/inst_setup_dhcp.rb new/yast2-network-3.1.50/src/clients/inst_setup_dhcp.rb --- old/yast2-network-3.1.46/src/clients/inst_setup_dhcp.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/clients/inst_setup_dhcp.rb 2014-04-25 14:38:44.000000000 +0200 @@ -1,154 +1,6 @@ +require "yast" +require "network/network_autoconfiguration" -#enclose client into own namespace to prevent messing global namespace -module SetupDHCPClient - - include Yast - - Yast.import "LanItems" - Yast.import "NetworkInterfaces" - - BASH_PATH = Path.new(".target.bash") - - def self.network_cards - LanItems.Read - LanItems.GetNetcardNames - end - - # Makes DHCP setup persistent - # - # instsys currently uses wicked as network services "manager" (including - # dhcp client). wicked is currently able to configure a card for dhcp leases - # only via loading config from file. All other ways are workarounds and - # needn't to work when wickedd* services are already running - def self.setup_dhcp card - index = LanItems.FindDeviceIndex(card) - - if index == -1 - raise "Failed to save configuration for device #{card}" - end - - LanItems.current = index - LanItems.SetItem - - #tricky part if ifcfg is not set - # yes, this code smell and show bad API of LanItems - if !LanItems.IsCurrentConfigured - NetworkInterfaces.Add - current = LanItems.Items[LanItems.current] - current["ifcfg"] = card - end - - LanItems.bootproto = "dhcp" - LanItems.startmode = "auto" - - LanItems.Commit - end - - def self.reload_config(card) - SCR.Execute(BASH_PATH, "wicked ifreload '#{card}'") == 0 - end - - def self.delete_config(devname) - LanItems.delete_dev(devname) - end - - def self.write_configuration - NetworkInterfaces.Write("") - end - - def self.activate_changes(devnames) - return false if !write_configuration - - # workaround for gh#yast/yast-core#74 (https://github.com/yast/yast-core/issues/74) - NetworkInterfaces.CleanCacheRead() - - devnames.map { |d| reload_config(d) } - end - - def self.configured?(devname) - # TODO: - # one day there should be LanItems.IsItemConfigured, but we currently - # miss index -> devname translation. As this LanItems internal structure - # will be subject of refactoring, we will use NetworkInterfaces directly. - # It currently doesn't hurt as it currently writes configuration for both - # wicked even sysconfig. - NetworkInterfaces.Check(devname) - end - - # Checks if given device is active - # - # active device <=> a device which is reported as "up" by wicked - def self.active_config?(devname) - wicked_query = "wicked ifstatus --brief #{devname} | grep 'up$'" - SCR.Execute(BASH_PATH, wicked_query) == 0 - end - - # Returns list of servers used for internet reachability test - # - # Basicaly servers with product release notes should be used. - def self.target_servers - ["scc.suse.com"] - end - - # Check if given device can reach some of reference servers - def self.set_default_route_flag_if_wan_dev?(devname) - set_default_route_flag(devname, "yes") - activate_changes([devname]) - - reached = target_servers.any? do |server| - ping_cmd = "ping -I #{devname} -c 3 #{server}" - SCR.Execute(BASH_PATH, ping_cmd) == 0 - end - - log.info("Release notes can be reached via #{devname}: #{reached}") - - if !reached - set_default_route_flag(devname, "no") - activate_changes([devname]) - end - - reached - end - - # Sets sysconfig's DHCLIENT_SET_DEFAULT_ROUTE option for given device - # - # @param [String] devname name of device as seen by system (e.g. enp0s3) - # @param [String] value "yes" or "no", as in sysconfig - def self.set_default_route_flag(devname, value) - item_id = LanItems.FindDeviceIndex(devname) - LanItems.SetItemSysconfigOpt(item_id, "DHCLIENT_SET_DEFAULT_ROUTE", value) - end - - include Logger - - dhcp_cards = network_cards.select { |c| !configured?(c) } - log.info "Candidates for enabling DHCP: #{dhcp_cards}" - - # TODO time consuming, some progress would be nice - dhcp_cards.each { |d| setup_dhcp(d) } - - activate_changes(dhcp_cards) - - # drop devices without dhcp lease - inactive_devices = dhcp_cards.select { |c| ! active_config?(c) } - log.info "Inactive devices: #{inactive_devices}" - - inactive_devices.each { |c| delete_config(c) } - - # setup route flag - active_devices = dhcp_cards - inactive_devices - - if active_devices.size == 1 - # just one dhcp device, nothing to care of - set_default_route_flag(active_devices.first, "yes") - else - # try to find just one dhcp aware device for allowing default route - # if there is more than one dhcp devices enabled for setting default - # route (DHCLIENT_SET_DEFAULT_ROUTE = "yes"). bnc#868187 - active_devices.find { |d| set_default_route_flag_if_wan_dev?(d) } - end - - activate_changes(dhcp_cards) -end +Yast::NetworkAutoconfiguration.instance.configure_dhcp :next diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/include/network/lan/address.rb new/yast2-network-3.1.50/src/include/network/lan/address.rb --- old/yast2-network-3.1.46/src/include/network/lan/address.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/include/network/lan/address.rb 2014-04-25 14:38:44.000000000 +0200 @@ -93,7 +93,7 @@ Opt(:notify), Header( # Table header label - _("Alias Name"), + _("IPv4 Address Label"), # Table header label _("IP Address"), # Table header label diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/include/network/lan/complex.rb new/yast2-network-3.1.50/src/include/network/lan/complex.rb --- old/yast2-network-3.1.46/src/include/network/lan/complex.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/include/network/lan/complex.rb 2014-04-25 14:38:44.000000000 +0200 @@ -635,6 +635,19 @@ ret end + # Evaluates if user should be asked again according dialogs result value + # + # it is basically useful if user aborts dialog and he has done some + # changes already. Calling this function may results in confirmation + # popup. + def input_done?(ret) + if ret == :abort && LanItems.modified + return ReallyAbort() + else + return true + end + end + def MainDialog(init_tab) caption = _("Network Settings") widget_descr = { @@ -660,47 +673,47 @@ :to => "map <string, map <string, any>>" ) ) + help = CWM.MergeHelps(w) contents = CWM.PrepareDialog(contents, w) + running_installer = Mode.installation || Mode.update Wizard.SetContentsButtons( caption, contents, help, Label.BackButton, - Label.OKButton + running_installer ? Label.NextButton : Label.OKButton ) - Wizard.SetNextButton(:next, Label.OKButton) - Wizard.SetAbortButton(:abort, Label.CancelButton) - Wizard.HideBackButton - ret = nil - while true - ret = CWM.Run(w, {}) - if ret == :abort - next if LanItems.modified && !ReallyAbort() - return ret - end - return ret + if running_installer + Wizard.SetAbortButton(:abort, Label.AbortButton) + else + Wizard.SetAbortButton(:abort, Label.CancelButton) + Wizard.HideBackButton end - nil + begin + ret = CWM.Run(w, {}) + end while !input_done?(ret) + + return ret end - end private - def overview_buttons - ret = {} + def overview_buttons + ret = {} - # User should be able to configure existing devices during installation. - # This can be achieved via "Edit" button on automatically detected - # devices. Advanced configuration should be postponed to installed system. - # Therefor adding devices is not available during installation - ret[:add] = Label.AddButton if !Mode.installation - ret[:edit] = Label.EditButton - ret[:delete] = Label.DeleteButton + # User should be able to configure existing devices during installation. + # This can be achieved via "Edit" button on automatically detected + # devices. Advanced configuration should be postponed to installed system. + # Therefor adding devices is not available during installation + ret[:add] = Label.AddButton if !Mode.installation + ret[:edit] = Label.EditButton + ret[:delete] = Label.DeleteButton - ret - end + ret + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/include/network/lan/help.rb new/yast2-network-3.1.50/src/include/network/lan/help.rb --- old/yast2-network-3.1.46/src/include/network/lan/help.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/include/network/lan/help.rb 2014-04-25 14:38:44.000000000 +0200 @@ -263,16 +263,16 @@ "additional" => # Aliases dialog help 1/4 _( - "<big>Additional Addresses</big>\nConfigure additional addresses of an interface (its aliases) in this table.\n" + "<big>Additional Addresses</big>\nConfigure additional addresses of an interface in this table.\n" ) + # Aliases dialog help 2/4 _( - "Enter an Alias Name, an IP Address, and\nthe Netmask." + "Enter an IPv4 Address Label, an IP Address, and\nthe Netmask." ) + # Aliases dialog help 3/4 _( - "Alias Name is optional and legacy.The total\n" + - " length of interface name (inclusive of the colon and label) is\n" + + "IPv4 Address Label, formerly known as Alias Name, is optional and legacy. The total\n" + + " length of interface name (inclusive of the colon and label) is\n" + " limited to 15 characters and the obsolete ifconfig utility truncates it after 9 characters." ) + # Aliases dialog help 3/4, #83766 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/include/network/lan/virtual.rb new/yast2-network-3.1.50/src/include/network/lan/virtual.rb --- old/yast2-network-3.1.46/src/include/network/lan/virtual.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/include/network/lan/virtual.rb 2014-04-25 14:38:44.000000000 +0200 @@ -211,7 +211,7 @@ HSpacing(1), VBox( # TextEntry label - TextEntry(Id(:name), _("Alias &Name"), Ops.get_string(entry, 1, "")), + TextEntry(Id(:name), _("IPv4 &Address Label"), Ops.get_string(entry, 1, "")), # TextEntry label TextEntry( Id(:ipaddr), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/include/network/lan/wizards.rb new/yast2-network-3.1.50/src/include/network/lan/wizards.rb --- old/yast2-network-3.1.46/src/include/network/lan/wizards.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/include/network/lan/wizards.rb 2014-04-25 14:38:44.000000000 +0200 @@ -59,16 +59,28 @@ "write" => [lambda { WriteDialog() }, true] } - sequence = { - "ws_start" => "read", - "read" => { :abort => :abort, :next => "main" }, - "main" => { :abort => :abort, :next => "packages" }, - "packages" => { :abort => :abort, :next => "write" }, - "write" => { :abort => :abort, :next => :next } - } + if Mode.installation || Mode.update + sequence = { + "ws_start" => "read", + "read" => { :abort => :abort, :back => :back, :next => "main" }, + "main" => { :abort => :abort, :back => :back, :next => "packages" }, + "packages" => { :abort => :abort, :back => :back, :next => "write" }, + "write" => { :abort => :abort, :back => :back, :next => :next } + } + + Wizard.OpenNextBackDialog + else + sequence = { + "ws_start" => "read", + "read" => { :abort => :abort, :next => "main" }, + "main" => { :abort => :abort, :next => "packages" }, + "packages" => { :abort => :abort, :next => "write" }, + "write" => { :abort => :abort, :next => :next } + } - Wizard.OpenCancelOKDialog - Wizard.SetDesktopTitleAndIcon("lan") + Wizard.OpenCancelOKDialog + Wizard.SetDesktopTitleAndIcon("lan") + end ret = Sequencer.Run(aliases, sequence) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/include/network/routines.rb new/yast2-network-3.1.50/src/include/network/routines.rb --- old/yast2-network-3.1.46/src/include/network/routines.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/include/network/routines.rb 2014-04-25 14:38:44.000000000 +0200 @@ -28,6 +28,9 @@ # module Yast module NetworkRoutinesInclude + include I18n + include Yast + def initialize_network_routines(include_target) Yast.import "UI" @@ -1015,18 +1018,18 @@ end def SetLinkUp(dev_name) - Run(Builtins.sformat("ip link set %1 up", dev_name)) + Run("ip link set #{dev_name} up") end def SetLinkDown(dev_name) - Run(Builtins.sformat("ip link set %1 down", dev_name)) + Run("ip link set #{dev_name} down") end def SetAllLinksUp interfaces = GetAllInterfaces() - ret = Ops.greater_than(Builtins.size(interfaces), 0) + ret = !interfaces.empty? - Builtins.foreach(interfaces) do |ifc| + interfaces.each do |ifc| Builtins.y2milestone("Setting link up for interface %1", ifc) ret = SetLinkUp(ifc) && ret end @@ -1034,6 +1037,27 @@ ret end + # Checks if given device has carrier + # + # @return [boolean] true if device has carrier + def has_carrier?(dev_name) + SCR.Read( + path(".target.string"), + "/sys/class/net/#{dev_name}/carrier" + ).to_i != 0 + end + + # Checks if device is physically connected to a network + # + # It does neccessary steps which might be needed for proper initialization + # of devices driver. + # + # @return [boolean] true if physical layer is connected + def phy_connected?(dev_name) + # SetLinkUp ensures that driver is properly initialized + SetLinkUp(dev_name) && has_carrier?(dev_name) + end + def validPrefixOrNetmask(ip, mask) valid_mask = false if Builtins.substring(mask, 0, 1) == "/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/include/network/runtime.rb new/yast2-network-3.1.50/src/include/network/runtime.rb --- old/yast2-network-3.1.46/src/include/network/runtime.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/include/network/runtime.rb 2014-04-25 14:38:44.000000000 +0200 @@ -29,44 +29,21 @@ module Yast module NetworkRuntimeInclude def initialize_network_runtime(include_target) - - Yast.import "Arch" - Yast.import "Desktop" - Yast.import "Mode" - Yast.import "NetworkInterfaces" - Yast.import "Package" - Yast.import "Service" - Yast.import "PackageSystem" - textdomain "network" end - # Run SuSEconfig - # @return true if success - def RunSuSEconfig + # Runs external script which updates MTA's configuration. + # + # Currently supported MTAs: + # - sendmail + # - postfix + def update_mta_config Builtins.y2milestone("Updating sendmail and/or postfix configuration.") SCR.Execute( path(".target.bash"), "/usr/lib/sendmail.d/update 2>/dev/null" ) SCR.Execute(path(".target.bash"), "/usr/sbin/config.postfix 2>/dev/null") - true - end - - # Link detection - # @return true if link found - # @see #ethtool(8) - def HasLink - ifname = "eth0" - - command = Builtins.sformat( - "ethtool %1 | grep -q 'Link detected: no'", - ifname - ) - if Convert.to_integer(SCR.Execute(path(".target.bash"), command)) == 1 - return false - end - true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.50/src/lib/network/install_inf_convertor.rb --- old/yast2-network-3.1.46/src/lib/network/install_inf_convertor.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/lib/network/install_inf_convertor.rb 2014-04-25 14:38:44.000000000 +0200 @@ -11,6 +11,8 @@ BASH_PATH = Path.new(".target.bash") + # Class for accessing /etc/install.inf. + # See http://en.opensuse.org/SDB:Linuxrc_install.inf class InstallInf INSTALL_INF = Path.new(".etc.install_inf") @@ -364,12 +366,13 @@ def create_device_name_ifcfg(hardware) device_name = dev_name - hw_name = BuildDescription( - NetworkInterfaces.device_type(device_name), - NetworkInterfaces.device_num(device_name), - { "dev_name" => device_name }, - hardware - ) + # authoritative sources of device name are: + # - hwinfo + # - install.inf + # nobody else was able to edit device name so far (so ifcfg["NAME"]) + # is empty + hw_name = HardwareName(hardware, device_name) + hw_name = InstallInf["NetCardName"] || "" if hw_name.empty? return "" if hw_name.empty? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/lib/network/network_autoconfiguration.rb new/yast2-network-3.1.50/src/lib/network/network_autoconfiguration.rb --- old/yast2-network-3.1.46/src/lib/network/network_autoconfiguration.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.50/src/lib/network/network_autoconfiguration.rb 2014-04-25 14:38:44.000000000 +0200 @@ -0,0 +1,171 @@ +# encoding: utf-8 + +require "yast" + +module Yast + + # The class is responsible for generating / proposing automatic + # configuration during installation workflow + class NetworkAutoconfiguration + include Singleton + include Logger + include Yast + + Yast.import "LanItems" + Yast.import "NetworkInterfaces" + + BASH_PATH = Path.new(".target.bash") + + def configure_dhcp + Yast.include self, "network/routines.rb" + + # find out network devices suitable for dhcp autoconfiguration. + # Such device has to: + # - be unconfigured + # - physically connected to a network (it speeds up initialization phase of + # installer - bnc#872319) + dhcp_cards = network_cards.select { |c| !configured?(c) && phy_connected?(c) } + log.info "Candidates for enabling DHCP: #{dhcp_cards}" + + # TODO time consuming, some progress would be nice + dhcp_cards.each { |d| setup_dhcp(d) } + + # FIXME this can be really slow as it calls wicked one-by-one. So for n devices + # connected to a network but without dhcp it takes n * <dhcp lease wait timeout>. + activate_changes(dhcp_cards) + + # drop devices without dhcp lease + inactive_devices = dhcp_cards.select { |c| ! active_config?(c) } + log.info "Inactive devices: #{inactive_devices}" + + inactive_devices.each { |c| delete_config(c) } + + # setup route flag + active_devices = dhcp_cards - inactive_devices + + if active_devices.size == 1 + # just one dhcp device, nothing to care of + set_default_route_flag(active_devices.first, "yes") + else + # try to find just one dhcp aware device for allowing default route + # if there is more than one dhcp devices enabled for setting default + # route (DHCLIENT_SET_DEFAULT_ROUTE = "yes"). bnc#868187 + active_devices.find { |d| set_default_route_flag_if_wan_dev?(d) } + end + + activate_changes(dhcp_cards) + end + + private + def network_cards + LanItems.Read + LanItems.GetNetcardNames + end + + # Makes DHCP setup persistent + # + # instsys currently uses wicked as network services "manager" (including + # dhcp client). wicked is currently able to configure a card for dhcp leases + # only via loading config from file. All other ways are workarounds and + # needn't to work when wickedd* services are already running + def setup_dhcp card + index = LanItems.FindDeviceIndex(card) + + if index == -1 + raise "Failed to save configuration for device #{card}" + end + + LanItems.current = index + LanItems.SetItem + + #tricky part if ifcfg is not set + # yes, this code smell and show bad API of LanItems + if !LanItems.IsCurrentConfigured + NetworkInterfaces.Add + current = LanItems.Items[LanItems.current] + current["ifcfg"] = card + end + + LanItems.bootproto = "dhcp" + LanItems.startmode = "auto" + + LanItems.Commit + end + + def reload_config(card) + SCR.Execute(BASH_PATH, "wicked ifreload '#{card}'") == 0 + end + + def delete_config(devname) + LanItems.delete_dev(devname) + end + + def write_configuration + NetworkInterfaces.Write("") + end + + def activate_changes(devnames) + return false if !write_configuration + + # workaround for gh#yast/yast-core#74 (https://github.com/yast/yast-core/issues/74) + NetworkInterfaces.CleanCacheRead() + + devnames.map { |d| reload_config(d) } + end + + def configured?(devname) + # TODO: + # one day there should be LanItems.IsItemConfigured, but we currently + # miss index -> devname translation. As this LanItems internal structure + # will be subject of refactoring, we will use NetworkInterfaces directly. + # It currently doesn't hurt as it currently writes configuration for both + # wicked even sysconfig. + NetworkInterfaces.Check(devname) + end + + # Checks if given device is active + # + # active device <=> a device which is reported as "up" by wicked + def active_config?(devname) + wicked_query = "wicked ifstatus --brief #{devname} | grep 'up$'" + SCR.Execute(BASH_PATH, wicked_query) == 0 + end + + # Returns list of servers used for internet reachability test + # + # Basicaly servers with product release notes should be used. + def target_servers + ["scc.suse.com"] + end + + # Check if given device can reach some of reference servers + def set_default_route_flag_if_wan_dev?(devname) + set_default_route_flag(devname, "yes") + activate_changes([devname]) + + reached = target_servers.any? do |server| + ping_cmd = "ping -I #{devname} -c 3 #{server}" + SCR.Execute(BASH_PATH, ping_cmd) == 0 + end + + log.info("Release notes can be reached via #{devname}: #{reached}") + + if !reached + set_default_route_flag(devname, "no") + activate_changes([devname]) + end + + reached + end + + # Sets sysconfig's DHCLIENT_SET_DEFAULT_ROUTE option for given device + # + # @param [String] devname name of device as seen by system (e.g. enp0s3) + # @param [String] value "yes" or "no", as in sysconfig + def set_default_route_flag(devname, value) + item_id = LanItems.FindDeviceIndex(devname) + LanItems.SetItemSysconfigOpt(item_id, "DHCLIENT_SET_DEFAULT_ROUTE", value) + end + + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/modules/DNS.rb new/yast2-network-3.1.50/src/modules/DNS.rb --- old/yast2-network-3.1.46/src/modules/DNS.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/modules/DNS.rb 2014-04-25 14:38:44.000000000 +0200 @@ -429,7 +429,7 @@ ProgressNextStage(_("Updating configuration...")) # Finish him - RunSuSEconfig() + update_mta_config Builtins.sleep(sl) # if(SCR::Read(.target.size, resolv_conf) < 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/src/modules/Lan.rb new/yast2-network-3.1.50/src/modules/Lan.rb --- old/yast2-network-3.1.46/src/modules/Lan.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/src/modules/Lan.rb 2014-04-25 14:38:44.000000000 +0200 @@ -664,7 +664,7 @@ return false if Abort() # Progress step 10 ProgressNextStage(_("Updating configuration...")) - RunSuSEconfig() if !@write_only + update_mta_config if !@write_only Builtins.sleep(sl) if NetworkService.is_network_manager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/test/Makefile.am new/yast2-network-3.1.50/test/Makefile.am --- old/yast2-network-3.1.46/test/Makefile.am 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/test/Makefile.am 2014-04-25 14:38:44.000000000 +0200 @@ -7,7 +7,8 @@ new_device_startmode_test.rb \ widgets_test.rb \ install_inf_convertor_test.rb \ - lan_items_helpers_test.rb + lan_items_helpers_test.rb \ + link_handlers_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/test/install_inf_convertor_test.rb new/yast2-network-3.1.50/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.46/test/install_inf_convertor_test.rb 2014-04-07 11:32:47.000000000 +0200 +++ new/yast2-network-3.1.50/test/install_inf_convertor_test.rb 2014-04-25 14:38:44.000000000 +0200 @@ -89,6 +89,7 @@ before(:each) do @device = "enp0s3" @netconfig = "dhcp" + @netcardname = "Network card name" @install_inf_convertor = Yast::InstallInfConvertor.instance @@ -100,6 +101,9 @@ Yast::InstallInfConvertor::InstallInf .stub(:[]) .with("NetConfig") { @netconfig } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("NetCardName") { @netcardname } end describe "#dev_name" do @@ -122,7 +126,7 @@ expect(ifcfg = @install_inf_convertor.send(:create_ifcfg)).not_to be_empty expect(ifcfg).to match /BOOTPROTO='dhcp4'/ expect(ifcfg).to match /STARTMODE='onboot'/ - expect(ifcfg).to match /NAME='.*'/ + expect(ifcfg).to match /NAME='#{@netcardname}'/ end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.46/test/link_handlers_test.rb new/yast2-network-3.1.50/test/link_handlers_test.rb --- old/yast2-network-3.1.46/test/link_handlers_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.50/test/link_handlers_test.rb 2014-04-25 14:38:44.000000000 +0200 @@ -0,0 +1,23 @@ +#!/usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" + +describe "phy_connected?" do + before(:each) do + Yast.include self, "network/routines.rb" + + Yast::SCR.stub(:Execute).with(path(".target.bash"), //) { 0 } + end + + it "returns true if PHY layer is available" do + Yast::SCR.stub(:Read).with(path(".target.string"), /\/sys\/class\/net/) { 1 } + expect(phy_connected?("enp0s3")).to eql true + end + + it "returns false if PHY layer is available" do + Yast::SCR.stub(:Read).with(path(".target.string"), /\/sys\/class\/net/) { 0 } + expect(phy_connected?("enp0s3")).to eql false + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-04-26 11:45:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2014-04-15 07:35:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-04-26 11:45:22.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Apr 25 12:58:44 CEST 2014 - snwint(a)suse.de + +- handle SUSEConnect, add var/lock symlink +- 14.81 + +------------------------------------------------------------------- +Fri Apr 25 10:20:25 CEST 2014 - snwint(a)suse.de + +- add tar to initrd +- added virtio_scsi to ppc modules (bnc #874681) +- add xz to initrd +- remove /etc/os-release +- root.file_list: ignore zypper, add optional skelcd-control-SLES-for-VMware +- ignore zypper, add optional skelcd-control-SLES-for-VMware +- 14.80 + +------------------------------------------------------------------- +Tue Apr 22 10:35:17 CEST 2014 - snwint(a)suse.de + +- log wickedd output +- added --stop options to service_start script (bnc #873057) +- patch file removed: sysvinit.diff + +------------------------------------------------------------------- +Mon Apr 21 09:13:17 UTC 2014 - coolo(a)suse.com + +- sysvinit no longer required: sysvinit.diff + +------------------------------------------------------------------- +Tue Apr 15 14:38:14 CEST 2014 - snwint(a)suse.de + +- add rpc user (bnc #873173) + +------------------------------------------------------------------- Old: ---- installation-images-14.77.tar.bz2 New: ---- installation-images-14.81.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.zRkl94/_old 2014-04-26 11:45:23.000000000 +0200 +++ /var/tmp/diff_new_pack.zRkl94/_new 2014-04-26 11:45:23.000000000 +0200 @@ -45,6 +45,7 @@ BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini %endif +BuildRequires: sysvinit-tools BuildRequires: haveged BuildRequires: raleway-fonts BuildRequires: kdump @@ -205,7 +206,6 @@ BuildRequires: strace BuildRequires: syslogd BuildRequires: systemd-sysvinit -BuildRequires: sysvinit BuildRequires: tcpd-devel BuildRequires: telnet BuildRequires: telnet-server @@ -356,10 +356,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.77 +Version: 14.81 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.77.tar.bz2 +Source: installation-images-14.81.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.77.tar.bz2 -> installation-images-14.81.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/VERSION new/installation-images-14.81/VERSION --- old/installation-images-14.77/VERSION 2014-04-14 14:59:03.000000000 +0200 +++ new/installation-images-14.81/VERSION 2014-04-25 12:58:34.000000000 +0200 @@ -1 +1 @@ -14.77 +14.81 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/changelog new/installation-images-14.81/changelog --- old/installation-images-14.77/changelog 2014-04-14 14:59:08.000000000 +0200 +++ new/installation-images-14.81/changelog 2014-04-25 12:58:38.000000000 +0200 @@ -1,4 +1,25 @@ -2014-04-14: HEAD +2014-04-25: HEAD + - handle SUSEConnect, add var/lock symlink + +2014-04-24: 14.80 + - add tar to initrd + - added virtio_scsi to ppc modules (bnc #874681) + - add xz to initrd + - Merge branch 'master' of github.com:openSUSE/installation-images + - remove /etc/os-release + - Merge pull request #13 from lslezak/ignore_zypper + - root.file_list: ignore zypper, add optional skelcd-control-SLES-for-VMware + - ignore zypper, add optional skelcd-control-SLES-for-VMware + +2014-04-22: 14.79 + - log wickedd output + - sysvinit is no more + - added --stop options to service_start script (bnc #873057) + +2014-04-15: 14.78 + - add rpc user + +2014-04-14: 14.77 - deal with unnecessary links to /usr/sbin/service 2014-04-08: 14.76 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/initrd/initrd.file_list new/installation-images-14.81/data/initrd/initrd.file_list --- old/installation-images-14.77/data/initrd/initrd.file_list 2014-04-07 10:09:04.000000000 +0200 +++ new/installation-images-14.81/data/initrd/initrd.file_list 2014-04-25 11:46:58.000000000 +0200 @@ -3,7 +3,7 @@ d var/run var/spool var/run/libstorage var/tmp var/log/YaST2 var/adm/mount d var/lib/YaST2 var/lib/hardware/unique-keys var/lib/autoinstall d var/run/hotplug var/cache/fontconfig -d var/lib/sshd var/lib/empty var/run/ntp var/lib/rpcbind +d var/lib/sshd var/lib/empty var/run/ntp d var/cache/sax/files var/cache/sax/sysp/rdbms var/cache/xfine var/cache/zypp var/lib/sax d etc/sysconfig d etc/sysconfig/hardware @@ -83,7 +83,6 @@ openssl: ignore permissions: ignore pinentry: ignore -rpcbind: ignore ?suspend: ignore update-alternatives: ignore ?dracut: ignore @@ -115,6 +114,7 @@ sysconfig-netconfig: sg3_utils: systemd-presets-branding-<base_theme>: +tar: if arch eq 'aarch64' qemu-linux-aarch64: @@ -311,6 +311,9 @@ /usr/bin/gzip /usr/bin/gunzip +xz: + /usr/bin/xz + gawk: /usr/bin/gawk s gawk usr/bin/awk @@ -376,8 +379,8 @@ filesystem: /var/spool/locks - /var/lock /run + s /run/lock /var/lock # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -418,6 +421,11 @@ nscd: E prein +# we just want the user & group entries +rpcbind: + /var/lib + E prein + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # @@ -507,6 +515,18 @@ endif +# certificates are prepared in base.file_list +# here we ust copy the files from there +# the packages are listed here just so they show up in the package list later +ca-certificates: nodeps + # do nothing + t tmp + +ca-certificates-mozilla: nodeps + # copy ssl certificates + e cp -a /etc/ssl etc + e cp -a /var/lib/ca-certificates var/lib + : include theme.file_list @@ -524,10 +544,6 @@ # historical static device nodes x devz /devz -# copy ssl certificates -e cp -a /etc/ssl etc -e cp -a /var/lib/ca-certificates var/lib - # mtab is symlink now r /etc/mtab s /proc/self/mounts /etc/mtab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/initrd/scripts/early_setup new/installation-images-14.81/data/initrd/scripts/early_setup --- old/installation-images-14.77/data/initrd/scripts/early_setup 2014-01-24 11:37:10.000000000 +0100 +++ new/installation-images-14.81/data/initrd/scripts/early_setup 2014-04-17 11:29:39.000000000 +0200 @@ -32,7 +32,9 @@ if [ -x usr/sbin/wickedd ] ; then echo "Starting wicked" - /usr/sbin/wickedd - for i in /usr/lib/wicked/bin/wickedd-* ; do $i ; done + { + /usr/sbin/wickedd + for i in /usr/lib/wicked/bin/wickedd-* ; do $i ; done + } >/var/log/wickedd.log 2>&1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/initrd/service_start new/installation-images-14.81/data/initrd/service_start --- old/installation-images-14.77/data/initrd/service_start 2014-03-28 13:21:42.000000000 +0100 +++ new/installation-images-14.81/data/initrd/service_start 2014-04-16 13:37:26.000000000 +0200 @@ -6,9 +6,11 @@ sub usage; my $opt_show; +my $opt_stop; GetOptions( 'show' => \$opt_show, + 'stop' => \$opt_stop, 'help' => sub { usage 0 }, ) || usage 1; @@ -42,14 +44,25 @@ for (@todo) { $cmd .= ". $_\n" if s/^EnvironmentFile=[\-@]*// } for (@todo) { $cmd .= "export $1\n" if /^Environment=(.+)/ } -for (@todo) { $cmd .= "$_\n" if s/^ExecStartPre=[\-@]*// } -for (@todo) { $cmd .= "$_$suffix\n" if s/^ExecStart=[\-@]*// } +if($opt_stop) { + for (@todo) { $cmd .= "$_\n" if s/^ExecStop=[\-@]*// } + for (@todo) { $cmd .= "$_\n" if s/^ExecStopPost=[\-@]*// } +} +else { + for (@todo) { $cmd .= "$_\n" if s/^ExecStartPre=[\-@]*// } + for (@todo) { $cmd .= "$_$suffix\n" if s/^ExecStart=[\-@]*// } + for (@todo) { $cmd .= "$_\n" if s/^ExecStartPost=[\-@]*// } +} if($opt_show) { print $cmd; } else { - open $f, "| /bin/sh >/var/log/service_start.log 2>&1"; + if(open $f, ">>/var/log/service_start.log") { + print $f "=== $service " . ($opt_stop ? "stop" : "start") . " ===\n"; + close $f; + } + open $f, "| /bin/sh >>/var/log/service_start.log 2>&1"; print $f $cmd; exit $? >> 8 if !close $f; } @@ -63,11 +76,15 @@ sub usage { print <<"= = = = = = = ="; -Usage: service_start SERVICE -Start systemd service SERVICE. +Usage: service_start [OPTIONS] SERVICE +Start or stop systemd service SERVICE. + +Note: this is a simplified tool that may or may not work for a particular +service. Options: - --show Don't run service but show necessary commands. + --stop Stop service. + --show Don't start/stop service but show necessary commands. --help Write this help text. = = = = = = = = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/root/root.file_list new/installation-images-14.81/data/root/root.file_list --- old/installation-images-14.77/data/root/root.file_list 2014-04-08 13:26:50.000000000 +0200 +++ new/installation-images-14.81/data/root/root.file_list 2014-04-25 11:58:21.000000000 +0200 @@ -24,6 +24,11 @@ r /usr/bin/ld s ld.bfd /usr/bin/ld +TEMPLATE SUSEConnect: + / + # avoid update-alternatives + s SUSEConnect-0.0.14 /usr/bin/SUSEConnect + TEMPLATE rubygem-.*: /usr/*/ruby/gems/*/gems/*/lib /usr/*/ruby/gems/*/specifications @@ -74,6 +79,11 @@ ?dracut: ignore ?mkinitrd: ignore yast2-schema: ignore +# handle yast2-registration -> suse-connect -> zypper dependency, +# yast does not need zypper, just suse-connect, so ignore it +?zypper: ignore +# already in initrd +ca-certificates-mozilla: ignore if arch eq 'aarch64' qemu-linux-aarch64: @@ -142,8 +152,6 @@ systemd-presets-branding-<base_theme>: systemd-sysvinit: systemd: -sysvinit: -tar: usbutils: util-linux: vim: @@ -166,6 +174,7 @@ # pull in yast2 installation related packages via package deps ?skelcd-control-openSUSE: ?skelcd-control-SLES: +?skelcd-control-SLES-for-VMware: ?skelcd-control-SLED: rpm: @@ -594,6 +603,9 @@ # remove these, we don't want them symlinked r root mnt tmp proc usr/libexec +# remove /etc/os-release so it's not used accidentally +r /etc/os-release + x /usr/lib/YaST/.Reh /usr/lib/YaST2 x etc/inst_setup /sbin/inst_setup x etc/adddir /sbin/adddir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/etc/module.config new/installation-images-14.81/etc/module.config --- old/installation-images-14.77/etc/module.config 2014-04-04 15:22:52.000000000 +0200 +++ new/installation-images-14.81/etc/module.config 2014-04-23 17:12:57.000000000 +0200 @@ -385,6 +385,7 @@ [ppc] +virtio_scsi rsxx rtas_flash,"rtas_flash" mii,"-MII interface library",- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/lib/AddFiles.pm new/installation-images-14.81/lib/AddFiles.pm --- old/installation-images-14.77/lib/AddFiles.pm 2014-02-18 08:51:26.000000000 +0100 +++ new/installation-images-14.81/lib/AddFiles.pm 2014-04-25 11:13:23.000000000 +0200 @@ -559,7 +559,7 @@ warn "$Script: failed to link $1 to $2"; } elsif(/^s\s+(\S+)\s+(\S+)$/) { - SUSystem "ln -s $1 $dir/$2" and + SUSystem "ln -sf $1 $dir/$2" and warn "$Script: failed to symlink $1 to $2"; } elsif(/^m\s+(\S+)\s+(\S+)$/) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-04-26 11:45:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-04-14 06:43:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-04-26 11:45:21.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Apr 25 10:14:48 CEST 2014 - snwint(a)suse.de + +- signature checking of compressed driver updates now works (bnc #836366) +- support unpacking of tar archives +- support xz compression +- reworked filesystem type detection, added tar +- apply timeout option to wicked +- 4.2.20 + +------------------------------------------------------------------- +Tue Apr 22 10:44:29 CEST 2014 - snwint(a)suse.de + +- Fix for bnc #843438. +- Add KVM detection on s390x. +- If running under KVM on s390x, only offer a virtio network device. +- remove linuxrc-revert-chzdev.patch + +------------------------------------------------------------------- +Mon Apr 14 06:27:44 UTC 2014 - mpost(a)suse.com + +- Temporarily revert the changes made to use chzdev until the code + is more mature. linuxrc-revert-chzdev.patch. + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.18.tar.bz2 New: ---- linuxrc-4.2.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.EZYUIq/_old 2014-04-26 11:45:22.000000000 +0200 +++ /var/tmp/diff_new_pack.EZYUIq/_new 2014-04-26 11:45:22.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.18 +Version: 4.2.20 Release: 0 -Source: linuxrc-4.2.18.tar.bz2 +Source: linuxrc-4.2.20.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.18.tar.bz2 -> linuxrc-4.2.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/VERSION new/linuxrc-4.2.20/VERSION --- old/linuxrc-4.2.18/VERSION 2014-04-11 14:25:05.000000000 +0200 +++ new/linuxrc-4.2.20/VERSION 2014-04-25 10:14:44.000000000 +0200 @@ -1 +1 @@ -4.2.18 +4.2.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/auto2.c new/linuxrc-4.2.20/auto2.c --- old/linuxrc-4.2.18/auto2.c 2014-03-26 08:09:51.000000000 +0100 +++ new/linuxrc-4.2.20/auto2.c 2014-04-24 14:35:53.000000000 +0200 @@ -420,14 +420,14 @@ #endif err = url_read_file_anywhere( url, NULL, NULL, file_name, NULL, - URL_FLAG_UNZIP + URL_FLAG_NODIGEST + URL_FLAG_PROGRESS + (config.secure ? URL_FLAG_CHECK_SIG : 0) + URL_FLAG_NODIGEST + URL_FLAG_PROGRESS + (config.secure ? URL_FLAG_CHECK_SIG : 0) ); if(err && !config.sig_failed) { str_copy(&url->path, path2); err = url_read_file_anywhere( url, NULL, NULL, file_name, NULL, - URL_FLAG_UNZIP + URL_FLAG_NODIGEST + URL_FLAG_PROGRESS + (config.secure ? URL_FLAG_CHECK_SIG : 0) + URL_FLAG_NODIGEST + URL_FLAG_PROGRESS + (config.secure ? URL_FLAG_CHECK_SIG : 0) ); } fprintf(stderr, "err2 = %d\n", err); @@ -1091,7 +1091,7 @@ "driverupdate", file_name = strdup(new_download()), "Loading Driver Update", - URL_FLAG_UNZIP + URL_FLAG_NODIGEST + URL_FLAG_KEEP_MOUNTED + (config.secure ? URL_FLAG_CHECK_SIG : 0) + URL_FLAG_NODIGEST + URL_FLAG_KEEP_MOUNTED + (config.secure ? URL_FLAG_CHECK_SIG : 0) ); if(!err) err = util_mount_ro(file_name, config.mountpoint.update, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/changelog new/linuxrc-4.2.20/changelog --- old/linuxrc-4.2.18/changelog 2014-04-11 14:25:07.000000000 +0200 +++ new/linuxrc-4.2.20/changelog 2014-04-25 10:14:46.000000000 +0200 @@ -1,4 +1,24 @@ -2014-04-11: HEAD +2014-04-24: HEAD + - Merge branch 'netx' + - minor corrections + - fix some bugs in last patch and add logging + - Signature checking of compressed driver updates now works (bnc #836366). + - We do this by delaying the uncompression and handling it in util_mount(). + - Before we uncompressed while downloading. + - support unpacking of tar archives + - support xz compression + - reworked filesystem type detection, added tar + - apply timeout option to wicked + +2014-04-22: 4.2.19 + - fix compiler warning + - Merge pull request #7 from openSUSE/s390xkvm + - Fix for bnc #843438. + - Fix for bnc #843438. + Add KVM detection on s390x. + If running under KVM on s390x, only offer a virtio network device. + +2014-04-11: 4.2.18 - simplify s390x hypervisor detection code - fix include - passing ssl_verify option to yast (bnc #807799) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/dialog.c new/linuxrc-4.2.20/dialog.c --- old/linuxrc-4.2.18/dialog.c 2014-03-20 12:59:45.000000000 +0100 +++ new/linuxrc-4.2.20/dialog.c 2014-04-24 14:35:36.000000000 +0200 @@ -104,6 +104,7 @@ { di_390net_escon, "ESCON" }, { di_390net_iucv, "Inter-User Communication Vehicle (IUCV)" }, { di_390net_hsi, "Hipersockets" }, + { di_390net_virtio, "VirtIO Ethernet CCW Device"}, { di_390net_sep, "#--------------------" }, { di_ctc_compat, "Compatibility mode (default)" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/dialog.h new/linuxrc-4.2.20/dialog.h --- old/linuxrc-4.2.18/dialog.h 2013-12-04 12:07:39.000000000 +0100 +++ new/linuxrc-4.2.20/dialog.h 2014-04-24 14:35:36.000000000 +0200 @@ -85,6 +85,7 @@ di_390net_escon, di_390net_iucv, di_390net_hsi, + di_390net_virtio, di_390net_eth, di_390net_qdio, di_390net_lcs, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/file.c new/linuxrc-4.2.20/file.c --- old/linuxrc-4.2.18/file.c 2014-04-11 14:04:54.000000000 +0200 +++ new/linuxrc-4.2.20/file.c 2014-04-24 14:35:53.000000000 +0200 @@ -33,7 +33,6 @@ #include "auto2.h" #include "rootimage.h" #include "display.h" -#include "fstype.h" #include "keyboard.h" #include "url.h" @@ -887,7 +886,7 @@ for(sl = config.partitions; sl; sl = sl->next) { if(sl->key) { sprintf(buf, "/dev/%s", sl->key); - t = fstype(buf); + t = util_fstype(buf, NULL); if(t && !strcmp(t, "swap")) { if(!--i) { char *argv[2] = { }; @@ -909,7 +908,7 @@ if(strstr(s, "/dev/") != s) { sprintf(s = buf, "/dev/%s", f->value); } - t = fstype(s); + t = util_fstype(s, NULL); if(t && !strcmp(t, "swap")) { argv[1] = s; fprintf(stderr, "swapon %s\n", s); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/fstype.c new/linuxrc-4.2.20/fstype.c --- old/linuxrc-4.2.18/fstype.c 2013-11-18 14:06:40.000000000 +0100 +++ new/linuxrc-4.2.20/fstype.c 2014-04-24 14:35:53.000000000 +0200 @@ -17,7 +17,7 @@ * detect *fat and then assume vfat, so perhaps /etc/filesystems isnt * so useful anymore.] * - * 1999-02-22 Arkadiusz Mi�kiewicz <misiek(a)pld.ORG.PL> + * 1999-02-22 Arkadiusz Miśkiewicz <misiek(a)pld.ORG.PL> * added Native Language Support * * 2000-12-01 Sepp Wijnands <mrrazz(a)garbage-coderz.net> @@ -44,385 +44,411 @@ #include "global.h" -#define ALL_TYPES - -#define SIZE(a) (sizeof(a)/sizeof(a[0])) +/* + * Most file system types can be recognized by a `magic' number + * in the superblock. Note that the order of the tests is + * significant: by coincidence a filesystem can have the + * magic numbers for several file system types simultaneously. + * For example, the romfs magic lives in the 1st sector; + * xiafs does not touch the 1st sector and has its magic in + * the 2nd sector; ext2 does not touch the first two sectors. + */ -/* Most file system types can be recognized by a `magic' number - in the superblock. Note that the order of the tests is - significant: by coincidence a filesystem can have the - magic numbers for several file system types simultaneously. - For example, the romfs magic lives in the 1st sector; - xiafs does not touch the 1st sector and has its magic in - the 2nd sector; ext2 does not touch the first two sectors. */ - -static inline unsigned short -swapped(unsigned short a) { - return (a>>8) | (a<<8); +static inline unsigned short swapped(unsigned short a) +{ + return (a>>8) | (a<<8); } -static inline int -assemble4le(unsigned char *p) { - return (p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24)); + +static inline int assemble4le(unsigned char *p) +{ + return (p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24)); } /* - char *guess_fstype_from_superblock(const char *device); + char *guess_fstype_from_superblock(const char *device); - Probes the device and attempts to determine the type of filesystem - contained within. + Probes the device and attempts to determine the type of filesystem + contained within. - Original routine by <jmorriso(a)bogomips.ww.ubc.ca>; made into a function - for mount(8) by Mike Grupenhoff <kashmir(a)umiacs.umd.edu>. - Corrected the test for xiafs - aeb - Read the superblock only once - aeb - Added a very weak heuristic for vfat - aeb - Added iso9660, minix-v2, romfs, qnx4, udf, vxfs, swap - aeb - Added a test for high sierra (iso9660) - quinlan(a)bucknell.edu - Added ufs from a patch by jj. But maybe there are several types of ufs? - Added ntfs from a patch by Richard Russon. - Added xfs - 2000-03-21 Martin K. Petersen <mkp(a)linuxcare.com> - Added cramfs, hfs, hpfs, adfs - Sepp Wijnands <mrrazz(a)garbage-coderz.net> - Added ext3 - Andrew Morton - Added jfs - Christoph Hellwig - Added sysv - Tim Launchbury + Original routine by <jmorriso(a)bogomips.ww.ubc.ca>; made into a function + for mount(8) by Mike Grupenhoff <kashmir(a)umiacs.umd.edu>. + Corrected the test for xiafs - aeb + Read the superblock only once - aeb + Added a very weak heuristic for vfat - aeb + Added iso9660, minix-v2, romfs, qnx4, udf, vxfs, swap - aeb + Added a test for high sierra (iso9660) - quinlan(a)bucknell.edu + Added ufs from a patch by jj. But maybe there are several types of ufs? + Added ntfs from a patch by Richard Russon. + Added xfs - 2000-03-21 Martin K. Petersen <mkp(a)linuxcare.com> + Added cramfs, hfs, hpfs, adfs - Sepp Wijnands <mrrazz(a)garbage-coderz.net> + Added ext3 - Andrew Morton + Added jfs - Christoph Hellwig + Added sysv - Tim Launchbury */ -#ifdef ALL_TYPES -/* udf magic - I find that trying to mount garbage as an udf fs - causes a very large kernel delay, almost killing the machine. - So, we do not try udf unless there is positive evidence that it - might work. Try iso9660 first, it is much more likely. - Strings below taken from ECMA 167. */ -static char -*udf_magic[] = { "BEA01", "BOOT2", "CD001", "CDW02", "NSR02", - "NSR03", "TEA01" }; - -static int -may_be_udf(const char *id) { - char **m; - - for (m = udf_magic; m - udf_magic < (ssize_t) SIZE(udf_magic); m++) - if (!strncmp(*m, id, 5)) - return 1; - return 0; +/* + * udf magic - I find that trying to mount garbage as an udf fs + * causes a very large kernel delay, almost killing the machine. + * So, we do not try udf unless there is positive evidence that it + * might work. Try iso9660 first, it is much more likely. + * Strings below taken from ECMA 167. + */ +static int may_be_udf(const char *id) +{ + char *udf_magic[] = { + "BEA01", "BOOT2", "CD001", "CDW02", "NSR02", "NSR03", "TEA01" + }; + char **m; + + for(m = udf_magic; m - udf_magic < sizeof udf_magic / sizeof *udf_magic; m++) { + if(!strncmp(*m, id, 5)) return 1; + } + + return 0; } -#endif -static int -may_be_swap(const char *s) { - return (strncmp(s-10, "SWAP-SPACE", 10) == 0 || - strncmp(s-10, "SWAPSPACE2", 10) == 0); + +static int may_be_swap(const char *s) +{ + return !strncmp(s - 10, "SWAP-SPACE", 10) || !strncmp(s - 10, "SWAPSPACE2", 10); } -static int is_reiserfs_magic_string (struct reiserfs_super_block * rs) + +static int is_reiserfs_magic_string(struct reiserfs_super_block * rs) { - return (!strncmp (rs->s_magic, REISERFS_SUPER_MAGIC_STRING, - strlen ( REISERFS_SUPER_MAGIC_STRING)) || - !strncmp (rs->s_magic, REISER2FS_SUPER_MAGIC_STRING, - strlen ( REISER2FS_SUPER_MAGIC_STRING))); + return + !strncmp(rs->s_magic, REISERFS_SUPER_MAGIC_STRING, strlen(REISERFS_SUPER_MAGIC_STRING)) || + !strncmp(rs->s_magic, REISER2FS_SUPER_MAGIC_STRING, strlen(REISER2FS_SUPER_MAGIC_STRING)); } -char * -fstype(const char *device) { - int fd; - char *type = NULL; - union { - struct minix_super_block ms; - struct ext_super_block es; - struct ext2_super_block e2s; - struct vxfs_super_block vs; - } sb; /* stuff at 1024 */ + +char *fstype(const char *device) +{ + int fd; + char *type = NULL; + struct stat64 statbuf; + + /* + * opening and reading an arbitrary unknown path can have + * undesired side effects - first check that `device' refers + * to a block device + */ + if( + stat64(device, &statbuf) || + !(S_ISBLK(statbuf.st_mode) || S_ISREG(statbuf.st_mode)) + ) { + return 0; + } + + fd = open(device, O_RDONLY | O_LARGEFILE); + /* try harder */ + if(fd < 0 && errno == ENOMEDIUM) fd = open(device, O_RDONLY | O_LARGEFILE); + if(fd < 0) { + if(config.debug) perror(device); + return 0; + } + + /* + * do seeks and reads in disk order, otherwise a very short + * partition may cause a failure because of read error + */ + + if(!type) { union { - struct xiafs_super_block xiasb; - char romfs_magic[8]; - char qnx4fs_magic[10]; /* ignore first 4 bytes */ - long bfs_magic; - struct ntfs_super_block ntfssb; - struct fat_super_block fatsb; - struct xfs_super_block xfsb; - struct cramfs_super_block cramfssb; - unsigned char data[512]; + struct xiafs_super_block xiasb; + char romfs_magic[8]; + char qnx4fs_magic[10]; /* ignore first 4 bytes */ + long bfs_magic; + struct ntfs_super_block ntfssb; + struct fat_super_block fatsb; + struct xfs_super_block xfsb; + struct cramfs_super_block cramfssb; + unsigned char data[512]; } xsb; -#ifdef ALL_TYPES - struct ufs_super_block ufssb; -#endif + + /* block 0 */ + if( + lseek(fd, 0, SEEK_SET) == 0 && + read(fd, &xsb, sizeof xsb) == sizeof xsb + ) { + if(xiafsmagic(xsb.xiasb) == _XIAFS_SUPER_MAGIC) { + type = "xiafs"; + } + else if(!strncmp(xsb.romfs_magic, "-rom1fs-", 8)) { + type = "romfs"; + } + else if(!strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC, 4)) { + type = "xfs"; + } + else if(!strncmp(xsb.qnx4fs_magic+4, "QNX4FS", 6)) { + type = "qnx4"; + } + else if(xsb.bfs_magic == 0x1badface) { + type = "bfs"; + } + else if(!strncmp(xsb.ntfssb.s_magic, NTFS_SUPER_MAGIC, sizeof xsb.ntfssb.s_magic)) { + type = "ntfs"; + } + else if( + cramfsmagic(xsb.cramfssb) == CRAMFS_SUPER_MAGIC || + cramfsmagic(xsb.cramfssb) == CRAMFS_SUPER_MAGIC_BIG + ) { + type = "cramfs"; + } + else if( + xsb.data[0x1fe] == 0x55 && + xsb.data[0x1ff] == 0xaa && + xsb.data[0x0b] == 0 && /* bytes per sector, bits 0-7 */ + ( + ( /* FAT12/16 */ + xsb.data[0x26] == 0x29 && ( + !strncmp(xsb.fatsb.s_fs, "FAT12 ", 8) || + !strncmp(xsb.fatsb.s_fs, "FAT16 ", 8) + ) + ) || + ( /* FAT32 */ + xsb.data[0x42] == 0x29 && + !strncmp(xsb.fatsb.s_fs2, "FAT32 ", 8) + ) + ) + ) { + type = "vfat"; + } + } + } + + if(!type) { + char buf[6]; + + if( + lseek(fd, 0, SEEK_SET) == 0 && + read(fd, buf, sizeof buf) == sizeof buf + ) { + if(!memcmp(buf, "070701", 6) || !memcmp(buf, "\xc7\x71", 2)) type = "cpio"; + else if(!memcmp(buf, "hsqs", 4) || !memcmp(buf, "sqsh", 4)) type = "squashfs"; + else if(!memcmp(buf, "\xed\xab\xee\xdb", 4) && buf[4] >= 3) type = "rpm"; + } + } + + if(!type) { /* sector 1 */ + struct sysv_super_block svsb; + + if( + lseek(fd, 512 , SEEK_SET) == 512 && + read(fd, &svsb, sizeof svsb) == sizeof svsb && + sysvmagic(svsb) == SYSV_SUPER_MAGIC + ) { + type = "sysv"; + } + } + + if(!type) { /* block 1 */ union { - struct iso_volume_descriptor iso; - struct hs_volume_descriptor hs; - } isosb; - struct reiserfs_super_block reiserfssb; /* block 64 or 8 */ - struct jfs_super_block jfssb; /* block 32 */ -#ifdef ALL_TYPES + struct minix_super_block ms; + struct ext_super_block es; + struct ext2_super_block e2s; + struct vxfs_super_block vs; + } sb; + + if( + lseek(fd, 1024, SEEK_SET) == 1024 && + read(fd, &sb, sizeof sb) == sizeof sb + ) { + /* + * ext2 has magic in little-endian on disk, so "swapped" is + * superfluous; however, there have existed strange byteswapped + * PPC ext2 systems + */ + if( + ext2magic(sb.e2s) == EXT2_SUPER_MAGIC || + ext2magic(sb.e2s) == EXT2_PRE_02B_MAGIC || + ext2magic(sb.e2s) == swapped(EXT2_SUPER_MAGIC) + ) { + type = "ext2"; + + if( + (assemble4le(sb.e2s.s_feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) && + assemble4le(sb.e2s.s_journal_inum) != 0 + ) { + type = "ext3"; + + if((assemble4le(sb.e2s.s_feature_incompat) & EXT4_FEATURE_INCOMPAT_EXTENTS)) { + type = "ext4"; + } + } + } + else if( + minixmagic(sb.ms) == MINIX_SUPER_MAGIC || + minixmagic(sb.ms) == MINIX_SUPER_MAGIC2 || + minixmagic(sb.ms) == MINIX2_SUPER_MAGIC || + minixmagic(sb.ms) == MINIX2_SUPER_MAGIC2 + ) { + type = "minix"; + } + else if(extmagic(sb.es) == EXT_SUPER_MAGIC) { + type = "ext"; + } + else if(vxfsmagic(sb.vs) == VXFS_SUPER_MAGIC) { + type = "vxfs"; + } + } + } + + if(!type) { /* block 1 */ struct hfs_super_block hfssb; - struct hpfs_super_block hpfssb; - struct sysv_super_block svsb; -#endif - struct stat64 statbuf; - /* opening and reading an arbitrary unknown path can have - undesired side effects - first check that `device' refers - to a block device */ - if (stat64 (device, &statbuf) || !(S_ISBLK(statbuf.st_mode) || S_ISREG(statbuf.st_mode))) - return 0; - - fd = open(device, O_RDONLY | O_LARGEFILE); - /* try harder */ - if (fd < 0 && errno == ENOMEDIUM) fd = open(device, O_RDONLY | O_LARGEFILE); - if (fd < 0) { - if(config.debug) perror(device); - return 0; - } - - /* do seeks and reads in disk order, otherwise a very short - partition may cause a failure because of read error */ - - if (!type) { - /* block 0 */ - if (lseek(fd, 0, SEEK_SET) != 0 - || read(fd, (char *) &xsb, sizeof(xsb)) != sizeof(xsb)) - goto io_error; - - if (xiafsmagic(xsb.xiasb) == _XIAFS_SUPER_MAGIC) - type = "xiafs"; -#ifdef ALL_TYPES - else if(!strncmp(xsb.romfs_magic, "-rom1fs-", 8)) - type = "romfs"; -#endif - else if(!strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC, 4)) - type = "xfs"; -#ifdef ALL_TYPES - else if(!strncmp(xsb.qnx4fs_magic+4, "QNX4FS", 6)) - type = "qnx4"; - else if(xsb.bfs_magic == 0x1badface) - type = "bfs"; - else if(!strncmp(xsb.ntfssb.s_magic, NTFS_SUPER_MAGIC, - sizeof(xsb.ntfssb.s_magic))) - type = "ntfs"; -#endif - else if(cramfsmagic(xsb.cramfssb) == CRAMFS_SUPER_MAGIC || - cramfsmagic(xsb.cramfssb) == CRAMFS_SUPER_MAGIC_BIG) - type = "cramfs"; - else if( - xsb.data[0x1fe] == 0x55 && - xsb.data[0x1ff] == 0xaa && - xsb.data[0x0b] == 0 && /* bytes per sector, bits 0-7 */ - ( - ( /* FAT12/16 */ - xsb.data[0x26] == 0x29 && ( - !strncmp(xsb.fatsb.s_fs, "FAT12 ", 8) || - !strncmp(xsb.fatsb.s_fs, "FAT16 ", 8) - ) - ) || - ( /* FAT32 */ - xsb.data[0x42] == 0x29 && - !strncmp(xsb.fatsb.s_fs2, "FAT32 ", 8) - ) - ) - ) - type = "vfat"; + /* + * also check if block size is equal to 512 bytes, + * since the hfs driver currently only has support + * for block sizes of 512 bytes long, and to be + * more accurate (sb magic is only a short int) + */ + if( + lseek(fd, 0x400, SEEK_SET) == 0x400 && + read(fd, &hfssb, sizeof hfssb) == sizeof hfssb && + ( + (hfsmagic(hfssb) == HFS_SUPER_MAGIC && hfsblksize(hfssb) == 0x20000) || + (swapped(hfsmagic(hfssb)) == HFS_SUPER_MAGIC && hfsblksize(hfssb) == 0x200) + ) + ) { + type = "hfs"; } + } + + if(!type) { /* block 8 */ + struct ufs_super_block ufssb; - if(!type) { - char buf[7]; + if( + lseek(fd, 8192, SEEK_SET) == 8192 && + read(fd, &ufssb, sizeof ufssb) == sizeof ufssb && + ufsmagic(ufssb) == UFS_SUPER_MAGIC /* also test swapped version? */ + ) { + type = "ufs"; + } + } + + if(!type) { /* block 8 */ + struct reiserfs_super_block reiserfssb; + + if( + lseek(fd, REISERFS_OLD_DISK_OFFSET_IN_BYTES, SEEK_SET) == REISERFS_OLD_DISK_OFFSET_IN_BYTES && + read(fd, &reiserfssb, sizeof(reiserfssb)) == sizeof(reiserfssb) && + is_reiserfs_magic_string(&reiserfssb) + ) { + type = "reiserfs"; + } + } - if( - lseek(fd, 0, SEEK_SET) != 0 || - read(fd, buf, sizeof buf - 1) != sizeof buf - 1 - ) goto io_error; + if(!type) { /* block 8 */ + struct hpfs_super_block hpfssb; - buf[sizeof buf - 1] = 0; - if(!strcmp(buf, "070701")) type = "cpio"; - else if(!memcmp(buf, "hsqs", 4) || !memcmp(buf, "sqsh", 4)) type = "squashfs"; - else if(!memcmp(buf, "\xed\xab\xee\xdb", 4) && buf[4] >= 3) type = "rpm"; + if( + lseek(fd, 0x2000, SEEK_SET) == 0x2000 && + read(fd, &hpfssb, sizeof hpfssb) == sizeof hpfssb && + hpfsmagic(hpfssb) == HPFS_SUPER_MAGIC + ) { + type = "hpfs"; + } + } + + if(!type) { /* block 32 */ + struct jfs_super_block jfssb; + + if( + lseek(fd, JFS_SUPER1_OFF, SEEK_SET) == JFS_SUPER1_OFF && + read(fd, &jfssb, sizeof jfssb) == sizeof jfssb && + !strncmp(jfssb.s_magic, JFS_MAGIC, 4) + ) { + type = "jfs"; } + } -#ifdef ALL_TYPES - if (!type) { - /* sector 1 */ - if (lseek(fd, 512 , SEEK_SET) != 512 - || read(fd, (char *) &svsb, sizeof(svsb)) != sizeof(svsb)) - goto io_error; - if (sysvmagic(svsb) == SYSV_SUPER_MAGIC ) - type = "sysv"; - } -#endif - - if (!type) { - unsigned ntype = 0; - char *type_str[] = { "ext2", "ext3", "ext4" }; - - /* block 1 */ - if (lseek(fd, 1024, SEEK_SET) != 1024 || - read(fd, (char *) &sb, sizeof(sb)) != sizeof(sb)) - goto io_error; - - /* ext2 has magic in little-endian on disk, so "swapped" is - superfluous; however, there have existed strange byteswapped - PPC ext2 systems */ - if (ext2magic(sb.e2s) == EXT2_SUPER_MAGIC || - ext2magic(sb.e2s) == EXT2_PRE_02B_MAGIC || - ext2magic(sb.e2s) == swapped(EXT2_SUPER_MAGIC)) { - ntype = 2; - - /* maybe even ext3? */ - if ((assemble4le(sb.e2s.s_feature_compat) - & EXT3_FEATURE_COMPAT_HAS_JOURNAL) && - assemble4le(sb.e2s.s_journal_inum) != 0) - ntype = 3; - - /* maybe ext4 */ - if((assemble4le(sb.e2s.s_feature_incompat) - & EXT4_FEATURE_INCOMPAT_EXTENTS) && ntype == 3) - ntype = 4; - - if(ntype) type = type_str[ntype - 2]; - } - - else if (minixmagic(sb.ms) == MINIX_SUPER_MAGIC || - minixmagic(sb.ms) == MINIX_SUPER_MAGIC2 || - minixmagic(sb.ms) == MINIX2_SUPER_MAGIC || - minixmagic(sb.ms) == MINIX2_SUPER_MAGIC2) - type = "minix"; - -#ifdef ALL_TYPES - else if (extmagic(sb.es) == EXT_SUPER_MAGIC) - type = "ext"; -#endif - - else if (vxfsmagic(sb.vs) == VXFS_SUPER_MAGIC) - type = "vxfs"; - } - -#ifdef ALL_TYPES - if (!type) { - /* block 1 */ - if (lseek(fd, 0x400, SEEK_SET) != 0x400 - || read(fd, (char *) &hfssb, sizeof(hfssb)) != sizeof(hfssb)) - goto io_error; - - /* also check if block size is equal to 512 bytes, - since the hfs driver currently only has support - for block sizes of 512 bytes long, and to be - more accurate (sb magic is only a short int) */ - if ((hfsmagic(hfssb) == HFS_SUPER_MAGIC && - hfsblksize(hfssb) == 0x20000) || - (swapped(hfsmagic(hfssb)) == HFS_SUPER_MAGIC && - hfsblksize(hfssb) == 0x200)) - type = "hfs"; - } -#endif - -#ifdef ALL_TYPES - if (!type) { - /* block 8 */ - if (lseek(fd, 8192, SEEK_SET) != 8192 - || read(fd, (char *) &ufssb, sizeof(ufssb)) != sizeof(ufssb)) - goto io_error; - - if (ufsmagic(ufssb) == UFS_SUPER_MAGIC) /* also test swapped version? */ - type = "ufs"; - } -#endif - - if (!type) { - /* block 8 */ - if (lseek(fd, REISERFS_OLD_DISK_OFFSET_IN_BYTES, SEEK_SET) != - REISERFS_OLD_DISK_OFFSET_IN_BYTES - || read(fd, (char *) &reiserfssb, sizeof(reiserfssb)) != - sizeof(reiserfssb)) - goto io_error; - if (is_reiserfs_magic_string(&reiserfssb)) - type = "reiserfs"; - } - -#ifdef ALL_TYPES - if (!type) { - /* block 8 */ - if (lseek(fd, 0x2000, SEEK_SET) != 0x2000 - || read(fd, (char *) &hpfssb, sizeof(hpfssb)) != sizeof(hpfssb)) - goto io_error; - - if (hpfsmagic(hpfssb) == HPFS_SUPER_MAGIC) - type = "hpfs"; - } -#endif - - if (!type) { - /* block 32 */ - if (lseek(fd, JFS_SUPER1_OFF, SEEK_SET) != JFS_SUPER1_OFF - || read(fd, (char *) &jfssb, sizeof(jfssb)) != sizeof(jfssb)) - goto io_error; - if (!strncmp(jfssb.s_magic, JFS_MAGIC, 4)) - type = "jfs"; - } - - if (!type) { - /* block 32 */ - if (lseek(fd, 0x8000, SEEK_SET) != 0x8000 - || read(fd, (char *) &isosb, sizeof(isosb)) != sizeof(isosb)) - goto io_error; - - if(strncmp(isosb.iso.id, ISO_STANDARD_ID, sizeof(isosb.iso.id)) == 0 - || strncmp(isosb.hs.id, HS_STANDARD_ID, sizeof(isosb.hs.id)) == 0) - type = "iso9660"; -#ifdef ALL_TYPES - else if (may_be_udf(isosb.iso.id)) - type = "udf"; -#endif - } - - if (!type) { - /* block 64 */ - if (lseek(fd, REISERFS_DISK_OFFSET_IN_BYTES, SEEK_SET) != - REISERFS_DISK_OFFSET_IN_BYTES - || read(fd, (char *) &reiserfssb, sizeof(reiserfssb)) != - sizeof(reiserfssb)) - goto io_error; - if (is_reiserfs_magic_string(&reiserfssb)) - type = "reiserfs"; - } - - if (!type) { - char buf[8]; - if ( - lseek(fd, 0x10040, SEEK_SET) == 0x10040 && - read(fd, buf, sizeof buf) == sizeof buf && - !memcmp(buf, "_BHRfS_M", sizeof buf) - ) { - type = "btrfs"; - } + if(!type) { /* block 32 */ + union { + struct iso_volume_descriptor iso; + struct hs_volume_descriptor hs; + } isosb; + + if( + lseek(fd, 0x8000, SEEK_SET) == 0x8000 && + read(fd, &isosb, sizeof isosb) == sizeof isosb + ) { + if( + !strncmp(isosb.iso.id, ISO_STANDARD_ID, sizeof(isosb.iso.id)) || + !strncmp(isosb.hs.id, HS_STANDARD_ID, sizeof(isosb.hs.id)) + ) { + type = "iso9660"; + } + else if(may_be_udf(isosb.iso.id)) { + type = "udf"; + } + } + } + + if(!type) { /* block 64 */ + struct reiserfs_super_block reiserfssb; + + if( + lseek(fd, REISERFS_DISK_OFFSET_IN_BYTES, SEEK_SET) == REISERFS_DISK_OFFSET_IN_BYTES && + read(fd, &reiserfssb, sizeof reiserfssb) == sizeof reiserfssb && + is_reiserfs_magic_string(&reiserfssb) + ) { + type = "reiserfs"; + } + } + + if(!type) { + char buf[8]; + + if( + lseek(fd, 0x10040, SEEK_SET) == 0x10040 && + read(fd, buf, sizeof buf) == sizeof buf && + !memcmp(buf, "_BHRfS_M", sizeof buf) + ) { + type = "btrfs"; + } + } + + if(!type) { + char buf[6]; + + if( + lseek(fd, 0x101, SEEK_SET) == 0x101 && + read(fd, buf, sizeof buf) == sizeof buf && + !memcmp(buf, "ustar", 6 /* with \0 */) + ) { + type = "tar"; + } + } + + if(!type) { + /* + * perhaps the user tries to mount the swap space + * on a new disk; warn her before she does mke2fs on it + */ + int pagesize = getpagesize(); + int rd; + char buf[pagesize + 32768]; + + rd = pagesize; + if(rd < 8192) rd = 8192; + if(rd > sizeof buf) rd = sizeof buf; + if( + lseek(fd, 0, SEEK_SET) == 0 && + read(fd, buf, rd) == rd && + ( + may_be_swap(buf + pagesize) || + may_be_swap(buf + 4096) || + may_be_swap(buf + 8192) + ) + ) { + type = "swap"; } + } - if (!type) { - /* perhaps the user tries to mount the swap space - on a new disk; warn her before she does mke2fs on it */ - int pagesize = getpagesize(); - int rd; - char buf[pagesize + 32768]; - - rd = pagesize; - if (rd < 8192) - rd = 8192; - if (rd > (int) sizeof(buf)) - rd = sizeof(buf); - if (lseek(fd, 0, SEEK_SET) != 0 - || read(fd, buf, rd) != rd) - goto io_error; - if (may_be_swap(buf+pagesize) || - may_be_swap(buf+4096) || may_be_swap(buf+8192)) - type = "swap"; - } - - close (fd); - return(type); - -io_error: -// if (errno) -// perror(device); -// else -// fprintf(stderr, "fstype: error while guessing filesystem type\n"); - close(fd); - return 0; + close(fd); + + return type; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/global.h new/linuxrc-4.2.20/global.h --- old/linuxrc-4.2.18/global.h 2014-04-11 09:49:55.000000000 +0200 +++ new/linuxrc-4.2.20/global.h 2014-04-24 14:35:53.000000000 +0200 @@ -368,7 +368,7 @@ unsigned kexec_reboot:1; /* kexec to installed system (just passed to yast) */ unsigned nomodprobe:1; /* disable modprobe */ unsigned y2gdb:1; /* pass to yast */ - unsigned squash:1; /* convert cpio/rpm to squashfs after download */ + unsigned squash:1; /* convert archive files to squashfs after download */ unsigned keepinstsysconfig:1; /* don't reload instsys config data */ unsigned device_by_id:1; /* use /dev/disk/by-id device names */ unsigned usesax2:1; /* just passed to yast */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/install.c new/linuxrc-4.2.20/install.c --- old/linuxrc-4.2.18/install.c 2013-12-03 11:41:26.000000000 +0100 +++ new/linuxrc-4.2.20/install.c 2014-04-24 14:35:53.000000000 +0200 @@ -45,7 +45,6 @@ #include "install.h" #include "settings.h" #include "auto2.h" -#include "fstype.h" #include "url.h" #ifndef MNT_DETACH @@ -427,7 +426,7 @@ sprintf(buf, "%s (%s)", sl->key, blk_ident(long_dev(sl->key))); - type = fstype(long_dev(sl->key)); + type = util_fstype(long_dev(sl->key), NULL); if(type && !strcmp(type, "swap")) { values1[item_cnt1] = strdup(sl->key); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/linuxrc.c new/linuxrc-4.2.20/linuxrc.c --- old/linuxrc-4.2.18/linuxrc.c 2014-04-11 14:23:16.000000000 +0200 +++ new/linuxrc-4.2.20/linuxrc.c 2014-04-24 14:35:53.000000000 +0200 @@ -44,6 +44,7 @@ #include "scsi_rename.h" #include "checkmedia.h" #include "url.h" +#include <sys/utsname.h> #if defined(__alpha__) || defined(__ia64__) #define SIGNAL_ARGS int signum, int x, struct sigcontext *scp @@ -96,6 +97,7 @@ { "scsi_rename", scsi_rename_main }, { "lndir", util_lndir_main }, { "extend", util_extend_main }, + { "fstype", util_fstype_main }, }; #endif @@ -712,6 +714,13 @@ config.hwp.hypervisor = "Unknown"; } } + else { + struct utsname utsinfo; + + uname(&utsinfo); + if(!strncmp(utsinfo.machine, "s390x", sizeof "s390x" - 1 )) config.hwp.hypervisor="KVM"; + else config.hwp.hypervisor="Reallyunknown"; + } #endif /* add cmdline to info file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/net.c new/linuxrc-4.2.20/net.c --- old/linuxrc-4.2.18/net.c 2014-04-11 13:49:26.000000000 +0200 +++ new/linuxrc-4.2.20/net.c 2014-04-24 14:35:53.000000000 +0200 @@ -1353,7 +1353,7 @@ IUCV is available for use unless the driver is already loaded. So, if we're running on z/VM we always load it, no matter what. */ #if defined(__s390__) || defined(__s390x__) - if(strncmp(config.hwp.hypervisor,"z/VM",4)==0) { + if(!strncmp(config.hwp.hypervisor, "z/VM", sizeof "z/VM" - 1 )) { dia_info(&win, "We are running on z/VM", MSGTYPE_INFO); dia_info(&win, "Loading the IUCV network driver", MSGTYPE_INFO); mod_modprobe("netiucv",""); @@ -1871,9 +1871,12 @@ net_apply_ethtool(config.net.device, config.net.hwaddr); - // FIXME: config.net.dhcp_timeout - - sprintf(cmd, "wicked ifup %s", config.net.device); + if(config.net.dhcp_timeout_set) { + sprintf(cmd, "wicked ifup --timeout %d %s", config.net.dhcp_timeout, config.net.device); + } + else { + sprintf(cmd, "wicked ifup %s", config.net.device); + } sprintf(file, "/var/run/wicked/leaseinfo.%s.dhcp.ipv4", config.net.device); @@ -2440,7 +2443,8 @@ break; default: return -1; - } else { /* no hd_t entry -> ask */ + } + else { /* no hd_t entry -> ask */ dia_item_t di; dia_item_t items[] = { di_390net_osa, @@ -2451,14 +2455,18 @@ di_390net_iucv, di_none }; - + if(!strncmp(config.hwp.hypervisor, "KVM", sizeof "KVM" - 1)) { + items[0] = di_390net_virtio; + items[1] = di_none; + } + IFNOTAUTO(config.hwp.type) { di = dia_menu2("Please select the type of your network device.", 60, 0, items, config.hwp.type?:di_390net_iucv); config.hwp.type = di; - } else di = config.hwp.type; + } + else di = config.hwp.type; } - - + /* hwcfg parms common to all devices */ config.hwp.startmode="auto"; config.hwp.module_options=""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/url.c new/linuxrc-4.2.20/url.c --- old/linuxrc-4.2.18/url.c 2014-03-26 08:09:51.000000000 +0100 +++ new/linuxrc-4.2.20/url.c 2014-04-24 14:35:53.000000000 +0200 @@ -158,7 +158,7 @@ free(buf); } url_data->err = 103; - snprintf(url_data->err_buf, url_data->err_buf_len, "gzip: command terminated"); + snprintf(url_data->err_buf, url_data->err_buf_len, "%s: command terminated", url_data->compressed); } // fprintf(stderr, "close = %d\n", i); } @@ -217,17 +217,17 @@ (url_data->buf.len == url_data->buf.max || url_data->flush) && url_data->buf.len >= 11 ) { - if( - url_data->unzip && - url_data->buf.data[0] == 0x1f && - url_data->buf.data[1] == 0x8b - ) { - url_data->gzip = 1; + if(url_data->unzip) { + str_copy(&url_data->compressed, compress_type(url_data->buf.data)); + } - if((url_data->buf.data[3] & 0x08)) { - i = strnlen((char *) url_data->buf.data + 10, url_data->buf.len - 10); - if(i < url_data->buf.len - 10) { - url_data->orig_name = strdup((char *) url_data->buf.data + 10); + if(url_data->compressed) { + if(!strcmp(url_data->compressed, "gzip")) { + if((url_data->buf.data[3] & 0x08)) { + i = strnlen((char *) url_data->buf.data + 10, url_data->buf.len - 10); + if(i < url_data->buf.len - 10) { + url_data->orig_name = strdup((char *) url_data->buf.data + 10); + } } } } @@ -256,7 +256,7 @@ if(url_data->buf.len == url_data->buf.max || url_data->flush) { if(!url_data->file_opened) { url_data->file_opened = 1; - if(url_data->gzip) { + if(url_data->compressed) { url_data->tmp_file = strdup("/tmp/foo_XXXXXX"); tmp = mkstemp(url_data->tmp_file); if(tmp > 0) { @@ -267,7 +267,9 @@ dup2(fd, 1); dup2(tmp, 2); url_data->pipe_fd = fd; - url_data->f = popen("gzip -dc", "w"); + char cmd[64]; + snprintf(cmd, sizeof cmd, "%s -dc", url_data->compressed); + url_data->f = popen(cmd, "w"); dup2(fd1, 1); dup2(fd2, 2); url_data->zp_total = url_data->image_size << 10; @@ -913,6 +915,7 @@ free(url_data->tmp_file); free(url_data->buf.data); free(url_data->label); + free(url_data->compressed); free(url_data); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/url.h new/linuxrc-4.2.20/url.h --- old/linuxrc-4.2.18/url.h 2013-11-18 14:06:40.000000000 +0100 +++ new/linuxrc-4.2.20/url.h 2014-04-24 14:35:53.000000000 +0200 @@ -17,12 +17,12 @@ unsigned zp_now, zp_total; unsigned z_progress:1; unsigned flush:1; - unsigned gzip:1; unsigned cramfs:1; unsigned file_opened:1; unsigned unzip:1; unsigned label_shown:1; unsigned optional:1; + char *compressed; // program name used for compression, if any char *label; int percent; int pipe_fd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/util.c new/linuxrc-4.2.20/util.c --- old/linuxrc-4.2.18/util.c 2014-04-11 13:51:30.000000000 +0200 +++ new/linuxrc-4.2.20/util.c 2014-04-24 14:35:53.000000000 +0200 @@ -2400,6 +2400,36 @@ } +int util_fstype_main(int argc, char **argv) +{ + char *s, buf[64], *compr, *archive; + + argv++; argc--; + + if(!argc) return fprintf(stderr, "usage: fstype blockdevice\n"), 1; + + while(argc--) { + s = fstype(*argv); + if( + !s && + (compr = compressed_archive(*argv, &archive)) + ) { + if(archive) { + snprintf(buf, sizeof buf, "%s.%s", archive, compr); + s = buf; + } + else { + s = compr; + } + } + printf("%s: %s\n", *argv, s ?: "unknown fs"); + argv++; + } + + return 0; +} + + /* * Return fs name. If we have to load a module first, return it in *module. */ @@ -2420,6 +2450,7 @@ if( !strcmp(type, "cpio") || + !strcmp(type, "tar") || !strcmp(type, "rpm") || (config.ntfs_3g && !strcmp(type, "ntfs")) ) { @@ -2596,6 +2627,7 @@ int util_mount(char *dev, char *dir, unsigned long flags, slist_t *file_list) { char *type, *loop_dev, *cmd = NULL, *module, *tmp_dev, *cpio_opts = NULL, *s, *buf = NULL; + char *compr = NULL; int err = -1; struct stat64 sbuf; @@ -2630,9 +2662,15 @@ type = util_fstype(dev, &module); if(module) mod_modprobe(module, NULL); + if(!type) compr = compressed_archive(dev, &type); + + fprintf(stderr, "%s: type = %s.%s\n", dev, type ?: "", compr ?: ""); + + LXRC_WAIT + if( type && - (!strcmp(type, "cpio") || !strcmp(type, "rpm")) + (!strcmp(type, "cpio") || !strcmp(type, "tar") || !strcmp(type, "rpm")) ) { char *buf = NULL; char *msg; @@ -2654,9 +2692,18 @@ } if(!strcmp(type, "cpio")) { - strprintf(&buf, "cd %s ; cpio %s < %s", dir, cpio_opts, dev); + if(compr) { + strprintf(&buf, "cd %s ; %s -dc %s | cpio %s", dir, compr, dev, cpio_opts); + } + else { + strprintf(&buf, "cd %s ; cpio %s < %s", dir, cpio_opts, dev); + } msg = "cpio"; } + else if(!strcmp(type, "tar")) { + strprintf(&buf, "cd %s ; tar -xpf %s", dir, dev); + msg = "tar"; + } else { strprintf(&buf, "cd %s ; rpm2cpio %s | cpio %s", dir, dev, cpio_opts); msg = "rpm unpacking"; @@ -4649,3 +4696,74 @@ ) config.net.ptp = 1; } + +/* + * buf: at least 6 bytes + */ +char *compress_type(void *buf) +{ + if(!memcmp(buf, "\x1f\x8b", 2)) { + return "gzip"; + } + + if(!memcmp(buf, "\xfd""7zXZ", 6) /* yes, including final \0 */) { + return "xz"; + } + + return NULL; +} + + +char *compressed_file(char *name) +{ + int fd; + char buf[8]; + char *compr = NULL; + + fd = open(name, O_RDONLY | O_LARGEFILE); + + if(fd >= 0) { + if(read(fd, buf, sizeof buf) == sizeof buf) { + compr = compress_type(buf); + } + + close(fd); + } + else { + if(config.debug) perror(name); + } + + return compr; +} + + +char *compressed_archive(char *name, char **archive) +{ + char *compr = compressed_file(name); + char buf1[64], buf2[0x108]; + FILE *f; + char *type = NULL; + + if(!archive) return compr; + + if(compr) { + snprintf(buf1, sizeof buf1, "%s -dc %s", compr, name); + + if((f = popen(buf1, "r"))) { + if(fread(buf2, 1, sizeof buf2, f) == sizeof buf2) { + if(!memcmp(buf2, "070701", 6)) type = "cpio"; + if(!memcmp(buf2, "\xc7\x71", 2)) type = "cpio"; + if(!memcmp(buf2 + 0x101, "ustar", 6 /* with \0 */)) type = "tar"; + } + + pclose(f); + } + } + + *archive = type; + + if(config.debug) fprintf(stderr, "%s = %s.%s\n", name, type ?: "", compr ?: ""); + + return compr; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.18/util.h new/linuxrc-4.2.20/util.h --- old/linuxrc-4.2.18/util.h 2014-04-11 13:39:52.000000000 +0200 +++ new/linuxrc-4.2.20/util.h 2014-04-24 14:35:53.000000000 +0200 @@ -77,6 +77,7 @@ void util_free_mem(void); void util_update_meminfo(void); +int util_fstype_main(int argc, char **argv); char *util_fstype(char *dev, char **module); int util_mount(char *dev, char *dir, unsigned long flags, slist_t *file_list); int util_mount_ro(char *dev, char *dir, slist_t *file_list); @@ -154,3 +155,7 @@ void check_ptp(void); +char *compress_type(void *buf); +char *compressed_file(char *name); +char *compressed_archive(char *name, char **archive); + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-theme for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2014-04-26 11:45:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old) and /work/SRC/openSUSE:Factory/.yast2-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-theme" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-SLE.changes 2014-04-05 14:42:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-SLE.changes 2014-04-26 11:45:19.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Apr 24 06:44:46 UTC 2014 - jsrain(a)suse.cz + +- graphics and style adjustments by Ken Wimer (bnc#868722) +- 3.1.17 + +------------------------------------------------------------------- +Wed Apr 23 08:55:46 UTC 2014 - jsrain(a)suse.cz + +- added style for header bar with logo (bnc#868722) +- 3.1.16 + +------------------------------------------------------------------- +Wed Apr 16 09:40:01 CEST 2014 - locilka(a)suse.com + +- New dialog labels, text hightlighting, BarGraph, Tab shifting + buttons (by Ken Wimer) + (bnc#869727, bnc#868268) +- 3.1.15 + +------------------------------------------------------------------- yast2-theme.changes: same change Old: ---- yast2-theme-3.1.14.tar.bz2 New: ---- yast2-theme-3.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme-SLE.spec ++++++ --- /var/tmp/diff_new_pack.41Oqyf/_old 2014-04-26 11:45:21.000000000 +0200 +++ /var/tmp/diff_new_pack.41Oqyf/_new 2014-04-26 11:45:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-theme-SLE -Version: 3.1.14 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build yast2-theme.spec: same change ++++++ yast2-theme-3.1.14.tar.bz2 -> yast2-theme-3.1.17.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-3.1.14.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-3.1.17.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-04-26 11:45:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-04-13 13:13:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-04-26 11:45:17.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 22 13:55:01 CEST 2014 - aschnell(a)suse.de + +- moved lock file to /run/libstorage + +------------------------------------------------------------------- +Fri Apr 11 18:10:00 CEST 2014 - aschnell(a)suse.de + +- removed workaround for blkid file-system misdetection + (bnc#869359) +- 2.25.12 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.11.tar.bz2 New: ---- libstorage-2.25.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.fAqgBQ/_old 2014-04-26 11:45:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fAqgBQ/_new 2014-04-26 11:45:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.11 +Version: 2.25.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 @@ -90,8 +90,8 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -install -d -m 755 $RPM_BUILD_ROOT/var/run/libstorage -touch $RPM_BUILD_ROOT/var/run/libstorage/lock +install -d -m 755 $RPM_BUILD_ROOT/run/libstorage +touch $RPM_BUILD_ROOT/run/libstorage/lock %{find_lang} libstorage @@ -153,7 +153,7 @@ %files -n libstorage5 -f libstorage.lang %defattr(-,root,root) %{_libdir}/libstorage.so.* -%ghost /var/run/libstorage +%ghost /run/libstorage /var/adm/fillup-templates/sysconfig.storage-libstorage %doc %dir %{prefix}/share/doc/packages/libstorage %doc %{prefix}/share/doc/packages/libstorage/AUTHORS ++++++ libstorage-2.25.11.tar.bz2 -> libstorage-2.25.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/VERSION new/libstorage-2.25.12/VERSION --- old/libstorage-2.25.11/VERSION 2014-03-25 14:10:55.000000000 +0100 +++ new/libstorage-2.25.12/VERSION 2014-04-14 10:23:54.000000000 +0200 @@ -1 +1 @@ -2.25.11 +2.25.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/libstorage.spec.in new/libstorage-2.25.12/libstorage.spec.in --- old/libstorage-2.25.11/libstorage.spec.in 2014-04-08 14:04:19.000000000 +0200 +++ new/libstorage-2.25.12/libstorage.spec.in 2014-04-22 14:12:23.000000000 +0200 @@ -82,8 +82,8 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -install -d -m 755 $RPM_BUILD_ROOT/var/run/libstorage -touch $RPM_BUILD_ROOT/var/run/libstorage/lock +install -d -m 755 $RPM_BUILD_ROOT/run/libstorage +touch $RPM_BUILD_ROOT/run/libstorage/lock %{find_lang} libstorage @@ -145,7 +145,7 @@ %files -n libstorage@LIBVERSION_MAJOR@ -f libstorage.lang %defattr(-,root,root) %{_libdir}/libstorage.so.* -%ghost /var/run/libstorage +%ghost /run/libstorage /var/adm/fillup-templates/sysconfig.storage-libstorage %doc %dir %{prefix}/share/doc/packages/libstorage %doc %{prefix}/share/doc/packages/libstorage/AUTHORS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/Lock.cc new/libstorage-2.25.12/storage/Lock.cc --- old/libstorage-2.25.11/storage/Lock.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.12/storage/Lock.cc 2014-04-22 14:12:23.000000000 +0200 @@ -33,6 +33,9 @@ #include "storage/Lock.h" +#define LOCKDIR "/run/libstorage" + + namespace storage { @@ -56,12 +59,12 @@ y2mil("getting " << (readonly ? "read-only" : "read-write") << " lock"); - if (mkdir("/var/run/libstorage", 0755) == -1 && errno != EEXIST) + if (mkdir(LOCKDIR, 0755) == -1 && errno != EEXIST) { y2err("creating directory for lock-file failed: " << strerror(errno)); } - fd = open("/var/run/libstorage/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT | O_CLOEXEC, + fd = open(LOCKDIR "/lock", (readonly ? O_RDONLY : O_WRONLY) | O_CREAT | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); if (fd < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/Storage.cc new/libstorage-2.25.12/storage/Storage.cc --- old/libstorage-2.25.11/storage/Storage.cc 2014-03-21 17:06:30.000000000 +0100 +++ new/libstorage-2.25.12/storage/Storage.cc 2014-04-15 12:13:27.000000000 +0200 @@ -4310,7 +4310,6 @@ ret = co.addNfs(nfsDev, 0, opts, "", nfs4); if( instsys() ) { - SystemCmd c; string prog_name = RPCBINDBIN; //We don't have rpcbind (#423026, #427428) ... @@ -4321,8 +4320,9 @@ prog_name = PORTMAPBIN; } + SystemCmd c; c.execute( prog_name ); - c.execute( "/usr/sbin/rpc.statd" ); + c.execute(RPCSTATDBIN); } if( ret==0 && (ret=co.vBegin()->mount( mdir ))==0 ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/StorageDefines.h new/libstorage-2.25.12/storage/StorageDefines.h --- old/libstorage-2.25.11/storage/StorageDefines.h 2014-02-24 14:59:33.000000000 +0100 +++ new/libstorage-2.25.12/storage/StorageDefines.h 2014-04-15 12:13:27.000000000 +0200 @@ -84,6 +84,7 @@ #define GREPBIN "/usr/bin/grep" #define PORTMAPBIN "/sbin/portmap" #define RPCBINDBIN "/sbin/rpcbind" +#define RPCSTATDBIN "/usr/sbin/rpc.statd" #define NTFSRESIZEBIN "/usr/sbin/ntfsresize" #define XFSGROWFSBIN "/usr/sbin/xfs_growfs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/SystemInfo/CmdBlkid.cc new/libstorage-2.25.12/storage/SystemInfo/CmdBlkid.cc --- old/libstorage-2.25.11/storage/SystemInfo/CmdBlkid.cc 2014-03-19 11:11:26.000000000 +0100 +++ new/libstorage-2.25.12/storage/SystemInfo/CmdBlkid.cc 2014-04-14 10:23:54.000000000 +0200 @@ -110,17 +110,6 @@ } } - i = m.find("SEC_TYPE"); - if (i != m.end()) - { - map<string, FsType>::const_iterator it2 = fs_table.find(i->second); - if (it2 != fs_table.end()) - { - entry.is_fs = true; - entry.fs_type = it2->second; - } - } - if (entry.is_fs) { i = m.find("UUID"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/storage/gen_md5sum.cc new/libstorage-2.25.12/storage/gen_md5sum.cc --- old/libstorage-2.25.11/storage/gen_md5sum.cc 2014-04-08 14:05:38.000000000 +0200 +++ new/libstorage-2.25.12/storage/gen_md5sum.cc 2014-04-22 14:12:26.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "277120fc472f2cc939a01a797317df12" -#define SOURCES_MD5_DATE " Tue 8 Apr 14:05:38 CEST 2014 " +#define SOURCES_MD5SUM "ce93c2502ebd3b2b7021850a607862fa" +#define SOURCES_MD5_DATE " Tue 22 Apr 14:12:26 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.11/testsuite/single.out/blkid.out new/libstorage-2.25.12/testsuite/single.out/blkid.out --- old/libstorage-2.25.11/testsuite/single.out/blkid.out 2014-03-19 11:11:26.000000000 +0100 +++ new/libstorage-2.25.12/testsuite/single.out/blkid.out 2014-04-14 10:23:54.000000000 +0200 @@ -16,5 +16,5 @@ data[/dev/sda2] -> is_luks:true luks_uuid:f98def5a-6553-49a1-940d-df55a77d7d28 parse3 -data[/dev/dasda1] -> is_fs:true fs_type:ext2 fs_uuid:ab43b144-37e2-4e9c-8369-6df220f055b0 +data[/dev/dasda1] -> is_fs:true fs_type:ext4 fs_uuid:ab43b144-37e2-4e9c-8369-6df220f055b0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-pkg-bindings for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2014-04-26 11:45:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-pkg-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2014-04-13 13:13:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2014-04-26 11:45:15.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 22 12:40:55 UTC 2014 - lslezak(a)suse.cz + +- remeber the base product NVRA (instead of the zypp product + reference which might be invalidated) to properly create the + /etc/products.d/baseproduct symlink (bnc#873885) +- 3.1.9 + +------------------------------------------------------------------- +Tue Apr 15 14:48:45 UTC 2014 - lslezak(a)suse.cz + +- fixed repeated service save problem (bnc#873198, bnc#873683#c7) +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.1.7.tar.bz2 New: ---- yast2-pkg-bindings-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.1PdtvQ/_old 2014-04-26 11:45:16.000000000 +0200 +++ /var/tmp/diff_new_pack.1PdtvQ/_new 2014-04-26 11:45:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.1PdtvQ/_old 2014-04-26 11:45:16.000000000 +0200 +++ /var/tmp/diff_new_pack.1PdtvQ/_new 2014-04-26 11:45:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-3.1.7.tar.bz2 -> yast2-pkg-bindings-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings-devel-doc.spec 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings-devel-doc.spec 2014-04-22 16:21:42.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 3.1.7 +Version: 3.1.9 Release: 0 License: GPL-2.0 Group: Documentation/HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.changes 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.changes 2014-04-22 16:21:42.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Apr 22 12:40:55 UTC 2014 - lslezak(a)suse.cz + +- remeber the base product NVRA (instead of the zypp product + reference which might be invalidated) to properly create the + /etc/products.d/baseproduct symlink (bnc#873885) +- 3.1.9 + +------------------------------------------------------------------- +Tue Apr 15 14:48:45 UTC 2014 - lslezak(a)suse.cz + +- fixed repeated service save problem (bnc#873198, bnc#873683#c7) +- 3.1.8 + +------------------------------------------------------------------- Wed Apr 2 15:11:58 UTC 2014 - lslezak(a)suse.cz - properly initialize "autorefresh_skipped" attribute (leaving it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-3.1.7/package/yast2-pkg-bindings.spec 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/package/yast2-pkg-bindings.spec 2014-04-22 16:21:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/BaseProduct.cc new/yast2-pkg-bindings-3.1.9/src/BaseProduct.cc --- old/yast2-pkg-bindings-3.1.7/src/BaseProduct.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.9/src/BaseProduct.cc 2014-04-22 16:21:42.000000000 +0200 @@ -0,0 +1,22 @@ +/* + * File: BaseProduct.cc + * Author: lslezak(a)suse.cz + * + */ + +#include "BaseProduct.h" + +BaseProduct::BaseProduct( + const std::string& product_name, + const zypp::Edition& product_edition, + const zypp::Arch& product_arch, + const std::string& source_repo_alias +) : + name(product_name), + edition(product_edition), + arch(product_arch), + repo_alias(source_repo_alias) +{ +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/BaseProduct.h new/yast2-pkg-bindings-3.1.9/src/BaseProduct.h --- old/yast2-pkg-bindings-3.1.7/src/BaseProduct.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.9/src/BaseProduct.h 2014-04-22 16:21:42.000000000 +0200 @@ -0,0 +1,37 @@ +/* + * File: BaseProduct.h + * Author: lslezak(a)suse.cz + * + * Remember the attributes of the base product for creating the + * /etc/products.d/baseproduct symlink. + * + * (Note: zypp::Product reference cannot be used as it might be invalidated + * after adding/removing repositories or at target reload after commit.) + */ + +#ifndef BASEPRODUCT_H +#define BASEPRODUCT_H + +#include <string> +#include <zypp/Edition.h> +#include <zypp/Arch.h> + +class BaseProduct { + +public: + BaseProduct( + const std::string& product_name, + const zypp::Edition& product_edition, + const zypp::Arch& product_arch, + const std::string& source_repo_alias + ); + + std::string name; + // zypp::Edition contains both version and release + zypp::Edition edition; + zypp::Arch arch; + std::string repo_alias; +}; + +#endif /* BASEPRODUCT_H */ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Makefile.am new/yast2-pkg-bindings-3.1.9/src/Makefile.am --- old/yast2-pkg-bindings-3.1.7/src/Makefile.am 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Makefile.am 2014-04-22 16:21:42.000000000 +0200 @@ -53,6 +53,7 @@ ServiceManager.cc ServiceManager.h \ Service.cc \ Network.cc \ + BaseProduct.h BaseProduct.cc \ HelpTexts.h i18n.h log.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Package.cc new/yast2-pkg-bindings-3.1.9/src/Package.cc --- old/yast2-pkg-bindings-3.1.7/src/Package.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Package.cc 2014-04-22 16:21:42.000000000 +0200 @@ -2643,6 +2643,53 @@ return MPS2YCPMap( ducounter.disk_usage( pkg ) ); } + +zypp::Product::constPtr PkgFunctions::FindInstalledBaseProduct() +{ + // access to the Pool of Selectables + zypp::ResPoolProxy selectablePool(zypp::ResPool::instance().proxy()); + + // iterate over zypp::Products + for_(product_it, selectablePool.byKindBegin<zypp::Product>(), + selectablePool.byKindEnd<zypp::Product>()) + { + // search an installed product + for_(installed_product_it, (*product_it)->installedBegin(), + (*product_it)->installedEnd()) + { + // get the resolvable + zypp::ResObject::constPtr res = *installed_product_it; + + // check if NVRA matches the base product + if (res && res->name() == base_product->name && + res->edition() == base_product->edition && + res->arch() == base_product->arch) + + { + zypp::Product::constPtr product = + boost::dynamic_pointer_cast<const zypp::Product>(res); + + if (product) + { + y2milestone("Found installed base product: %s-%s-%s (%s)", + product->name().c_str(), + product->edition().asString().c_str(), + product->arch().asString().c_str(), + product->summary().c_str() + ); + + return product; + } + } + } + } + + // matching installed product was not found + y2error("Cannot find the installed base product"); + + return NULL; +} + // helper function - create a symbolic link to the created base product (by SourceCreateBase() function) // returns 'true' on success // see http://en.opensuse.org/Product_Management/Code11/installed @@ -2653,7 +2700,10 @@ y2milestone("Creating symlink for the base product..."); // get the package - zypp::sat::Solvable refsolvable = base_product->referencePackage(); + zypp::Product::constPtr installed_product = FindInstalledBaseProduct(); + if (!installed_product) return false; + + zypp::sat::Solvable refsolvable = installed_product->referencePackage(); if (refsolvable != zypp::sat::Solvable::noSolvable) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.cc new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.cc --- old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.cc 2014-04-22 16:21:42.000000000 +0200 @@ -141,6 +141,7 @@ if (base_product) { + delete base_product; base_product = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.h new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.h --- old/yast2-pkg-bindings-3.1.7/src/PkgFunctions.h 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgFunctions.h 2014-04-22 16:21:42.000000000 +0200 @@ -55,6 +55,7 @@ #include <i18n.h> #include "ServiceManager.h" +#include "BaseProduct.h" #include "PkgError.h" class PkgProgress; @@ -160,7 +161,9 @@ bool aliasExists(const std::string &alias, const std::list<zypp::RepoInfo> &reps) const; - zypp::Product::constPtr FindBaseProduct(const std::string &alias) const; + // remember the base product attributes for finding it later in + // the installed system + void RememberBaseProduct(const std::string &alias); zypp::RepoManager* CreateRepoManager(); @@ -224,7 +227,7 @@ ServiceManager service_manager; - zypp::Product::constPtr base_product; + BaseProduct* base_product; std::vector<zypp::filesystem::TmpDir> tmp_dirs; @@ -260,6 +263,9 @@ // helper for installing/removing/upgrading a resolvable bool ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action); + // it finds the resolvable using attributes saved earlier by RememberBaseProduct + zypp::Product::constPtr FindInstalledBaseProduct(); + public: // general /* TYPEINFO: void(string) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgService.cc new/yast2-pkg-bindings-3.1.9/src/PkgService.cc --- old/yast2-pkg-bindings-3.1.7/src/PkgService.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgService.cc 2014-04-16 11:31:36.000000000 +0200 @@ -54,3 +54,7 @@ return _old_alias; } +void PkgService::setOrigAlias(const std::string& orig_alias) +{ + _old_alias = orig_alias; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/PkgService.h new/yast2-pkg-bindings-3.1.9/src/PkgService.h --- old/yast2-pkg-bindings-3.1.7/src/PkgService.h 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/PkgService.h 2014-04-16 11:31:36.000000000 +0200 @@ -40,6 +40,7 @@ std::string origAlias() const; + void setOrigAlias(const std::string& orig_alias); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/ServiceManager.cc new/yast2-pkg-bindings-3.1.9/src/ServiceManager.cc --- old/yast2-pkg-bindings-3.1.7/src/ServiceManager.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/ServiceManager.cc 2014-04-16 11:31:36.000000000 +0200 @@ -53,7 +53,7 @@ } } -void ServiceManager::SaveServices(zypp::RepoManager &repomgr) const +void ServiceManager::SaveServices(zypp::RepoManager &repomgr) { for_ (it, _known_services.begin(), _known_services.end()) { @@ -75,9 +75,9 @@ } } -bool ServiceManager::SaveService(const std::string &alias, zypp::RepoManager &repomgr) const +bool ServiceManager::SaveService(const std::string &alias, zypp::RepoManager &repomgr) { - PkgServices::const_iterator serv_it = _known_services.find(alias); + PkgServices::iterator serv_it = _known_services.find(alias); if (serv_it == _known_services.end()) { @@ -287,7 +287,7 @@ return _known_services.size(); } -void ServiceManager::SavePkgService(const PkgService &s_known, zypp::RepoManager &repomgr) const +void ServiceManager::SavePkgService(PkgService &s_known, zypp::RepoManager &repomgr) const { const std::string alias(s_known.alias()); const zypp::ServiceInfo s_stored = repomgr.getService(alias); @@ -305,6 +305,8 @@ y2milestone("Adding new service %s", alias.c_str()); // add the service repomgr.addService(s_known); + // set the old alias to properly save it next time + s_known.setOrigAlias(alias); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/ServiceManager.h new/yast2-pkg-bindings-3.1.9/src/ServiceManager.h --- old/yast2-pkg-bindings-3.1.7/src/ServiceManager.h 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/ServiceManager.h 2014-04-16 11:31:36.000000000 +0200 @@ -42,9 +42,9 @@ void LoadServices(const zypp::RepoManager &repomgr); - void SaveServices(zypp::RepoManager &repomgr) const; + void SaveServices(zypp::RepoManager &repomgr); - bool SaveService(const std::string &alias, zypp::RepoManager &repomgr) const; + bool SaveService(const std::string &alias, zypp::RepoManager &repomgr); bool AddService(const std::string &alias, const std::string &url); @@ -70,7 +70,7 @@ private: // internal helper method - void SavePkgService(const PkgService &s_known, zypp::RepoManager &repomgr) const; + void SavePkgService(PkgService &s_known, zypp::RepoManager &repomgr) const; // current alias -> PkgService for convenient search by alias typedef std::map<std::string, PkgService> PkgServices; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Source_Create.cc new/yast2-pkg-bindings-3.1.9/src/Source_Create.cc --- old/yast2-pkg-bindings-3.1.7/src/Source_Create.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Source_Create.cc 2014-04-22 16:21:42.000000000 +0200 @@ -674,7 +674,7 @@ if (base && !base_product) { y2milestone("Searching a base product..."); - base_product = FindBaseProduct(repo->repoInfo().alias()); + RememberBaseProduct(repo->repoInfo().alias()); } } catch ( const zypp::Exception& excpt) @@ -709,7 +709,7 @@ if (base && !base_product) { y2milestone("Searching the base product..."); - base_product = FindBaseProduct(repo->repoInfo().alias()); + RememberBaseProduct(repo->repoInfo().alias()); } } } @@ -872,10 +872,8 @@ return ret; } -zypp::Product::constPtr PkgFunctions::FindBaseProduct(const std::string &alias) const +void PkgFunctions::RememberBaseProduct(const std::string &alias) { - zypp::Product::constPtr product = NULL; - // access to the Pool of Selectables zypp::ResPoolProxy selectablePool(zypp::ResPool::instance().proxy()); @@ -891,35 +889,28 @@ // check the repository if (res && res->repoInfo().alias() == alias) { - product = boost::dynamic_pointer_cast<const zypp::Product>(res); + zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(res); if (product) { - break; + y2milestone("Found base product: %s-%s-%s (%s)", + product->name().c_str(), + product->edition().asString().c_str(), + product->arch().asString().c_str(), + product->summary().c_str() + ); + + base_product = new BaseProduct( + product->name(), + product->edition(), + product->arch(), + alias + ); } } } - - if (product) - { - break; - } } // no product in the pool - if (!product) - { - y2error("No base product has been found"); - } - else - { - y2milestone("Found base product: %s %s (%s-%s)", - product->summary().c_str(), - product->edition().asString().c_str(), - product->name().c_str(), - product->edition().asString().c_str() - ); - } - - return product; + y2error("No base product has been found"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.7/src/Source_Set.cc new/yast2-pkg-bindings-3.1.9/src/Source_Set.cc --- old/yast2-pkg-bindings-3.1.7/src/Source_Set.cc 2014-04-02 20:25:49.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.9/src/Source_Set.cc 2014-04-22 16:21:42.000000000 +0200 @@ -374,9 +374,10 @@ repo->setDeleted(); // removing the base product repository? - if (base_product && base_product->repoInfo().alias() == repo_alias) + if (base_product && base_product->repo_alias == repo_alias) { y2warning("Resetting the base product, the base product repository has been removed"); + delete base_product; base_product = NULL; } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ruby-bindings for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-ruby-bindings for openSUSE:Factory checked in at 2014-04-26 11:45:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ruby-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ruby-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-03-21 12:14:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new/yast2-ruby-bindings.changes 2014-04-26 11:45:13.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 22 09:31:18 UTC 2014 - jreidinger(a)suse.com + +- Fix hang out of YaST2 in Turkish locale(bnc#852242) +- 3.1.16 + +------------------------------------------------------------------- Old: ---- yast2-ruby-bindings-3.1.15.tar.bz2 New: ---- yast2-ruby-bindings-3.1.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ruby-bindings.spec ++++++ --- /var/tmp/diff_new_pack.rW18w5/_old 2014-04-26 11:45:15.000000000 +0200 +++ /var/tmp/diff_new_pack.rW18w5/_new 2014-04-26 11:45:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 ++++++ yast2-ruby-bindings-3.1.15.tar.bz2 -> yast2-ruby-bindings-3.1.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.changes --- old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.changes 2014-03-14 20:50:36.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.changes 2014-04-22 14:36:42.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 22 09:31:18 UTC 2014 - jreidinger(a)suse.com + +- Fix hang out of YaST2 in Turkish locale(bnc#852242) +- 3.1.16 + +------------------------------------------------------------------- Fri Mar 14 15:33:30 UTC 2014 - mvidner(a)suse.com - Show the caller in the Internal error popup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.spec --- old/yast2-ruby-bindings-3.1.15/package/yast2-ruby-bindings.spec 2014-03-14 20:50:36.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.16/package/yast2-ruby-bindings.spec 2014-04-22 14:36:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.15/src/binary/Y2RubyComponent.cc new/yast2-ruby-bindings-3.1.16/src/binary/Y2RubyComponent.cc --- old/yast2-ruby-bindings-3.1.15/src/binary/Y2RubyComponent.cc 2014-03-14 20:50:36.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.16/src/binary/Y2RubyComponent.cc 2014-04-22 14:36:42.000000000 +0200 @@ -94,6 +94,9 @@ size_t size = res.size(); if (size==0) return res; + // convert always in C locale (bnc#852242) + char *old_locale = strdup(setlocale(LC_ALL, NULL)); + setlocale(LC_ALL, "C"); res[0] = tolower(res[0]); //first character and first char after :: is lowercase without underscore for(size_t i = res.find("::"); i!= string::npos; i = res.find("::",i+1)) @@ -111,5 +114,7 @@ res.replace(i,1,tmp); //replace upper by _lower } } + setlocale(LC_ALL, old_locale); + free(old_locale); return res; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2014-04-26 11:45:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2014-04-13 13:13:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2014-04-26 11:45:12.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 22 07:33:01 UTC 2014 - mchang(a)suse.com + +- enable btrfs snapshot booting on ppc +- remove suse_btrfs_grub2_install.sh as it's no longer used +- 0.812 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.811.tar.xz New: ---- perl-Bootloader-0.812.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.7pspqO/_old 2014-04-26 11:45:13.000000000 +0200 +++ /var/tmp/diff_new_pack.7pspqO/_new 2014-04-26 11:45:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.811 +Version: 0.812 Release: 0 Requires: coreutils Requires: e2fsprogs ++++++ perl-Bootloader-0.811.tar.xz -> perl-Bootloader-0.812.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/perl-Bootloader.changes new/perl-Bootloader-0.812/perl-Bootloader.changes --- old/perl-Bootloader-0.811/perl-Bootloader.changes 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/perl-Bootloader.changes 2014-04-22 11:43:36.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 22 07:33:01 UTC 2014 - mchang(a)suse.com + +- enable btrfs snapshot booting on ppc +- remove suse_btrfs_grub2_install.sh as it's no longer used +- 0.812 + +------------------------------------------------------------------- Wed Apr 9 15:06:33 CEST 2014 - snwint(a)suse.de - drop old log /var/log/YaST2/perl-BL-standalone-log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/src/Core/GRUB2.pm new/perl-Bootloader-0.812/src/Core/GRUB2.pm --- old/perl-Bootloader-0.811/src/Core/GRUB2.pm 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/src/Core/GRUB2.pm 2014-04-22 11:43:36.000000000 +0200 @@ -979,7 +979,7 @@ my $suse_btrfs = delete $globinfo{"suse_btrfs"} || ""; # per default enable btrfs snapshot boot configs only on i386-pc # other architectures (s390, ppc) are planned but not ready - if ($suse_btrfs eq "" and $self->{'target'} eq "i386-pc") { + if ($suse_btrfs eq "" and $self->{'target'} =~ /(i386-pc|powerpc-ieee1275)/) { $suse_btrfs = "true"; } # $root = " root=$root" if $root ne ""; @@ -1341,20 +1341,6 @@ next; } - if ($glob{suse_btrfs} eq "true" and -e "/usr/sbin/suse_btrfs_grub2_install.sh") { - # enable btrfs snapshot boot configs only on i386-pc - # other architectures (s390, ppc) are planned but not ready - if ($self->{'target'} eq "i386-pc") { - my $rootfs = qx(/usr/sbin/grub2-probe -t fs /); - my $bootfs = qx(/usr/sbin/grub2-probe -t fs /boot); - chomp $rootfs; - chomp $bootfs; - if ($rootfs eq "btrfs" and $bootfs eq "btrfs") { - $cmd = "/usr/sbin/suse_btrfs_grub2_install.sh"; - } - } - } - my $ret = $self->RunCommand ("$cmd $opt"); return 0 if (0 != $ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.812/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.811/src/Core/GRUB2EFI.pm 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/src/Core/GRUB2EFI.pm 2014-04-22 11:43:36.000000000 +0200 @@ -911,14 +911,6 @@ if ($self->{secure_boot}) { $opt = "--config-file=/boot/grub2/grub.cfg"; $cmd = "/usr/sbin/shim-install"; - } elsif ($glob{suse_btrfs} eq "true" and -e "/usr/sbin/suse_btrfs_grub2_install.sh") { - my $rootfs = qx(/usr/sbin/grub2-probe -t fs /); - my $bootfs = qx(/usr/sbin/grub2-probe -t fs /boot); - chomp $rootfs; - chomp $bootfs; - if ($rootfs eq "btrfs" and $bootfs eq "btrfs") { - $cmd = "/usr/sbin/suse_btrfs_grub2_install.sh"; - } } $ret = $self->RunCommand ("$cmd $opt"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.811/version new/perl-Bootloader-0.812/version --- old/perl-Bootloader-0.811/version 2014-04-10 11:12:33.000000000 +0200 +++ new/perl-Bootloader-0.812/version 2014-04-22 11:43:36.000000000 +0200 @@ -1 +1 @@ -0.811 +0.812 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-04-26 11:45:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-04-13 13:13:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-04-26 11:45:11.000000000 +0200 @@ -1,0 +2,54 @@ +Tue Apr 22 08:44:57 UTC 2014 - jreidinger(a)suse.com + +- Use correct check for partition setup for grub2 on s390 + (bnc#873951) +- 3.1.29 + +------------------------------------------------------------------- +Thu Apr 17 14:46:17 UTC 2014 - jreidinger(a)suse.com + +- do not complain for missing bios order on s390(bnc#874106) +- 3.1.28 + +------------------------------------------------------------------- +Thu Apr 17 11:18:31 UTC 2014 - jreidinger(a)suse.com + +- improve logging if setting kernel paramater failed to help with + bnc#873996 +- remove graphic adapter configuration on s390 (bnc#874010) +- 3.1.27 + +------------------------------------------------------------------- +Wed Apr 16 19:49:56 UTC 2014 - jreidinger(a)suse.com + +- allow switching to grub2 also on ppc +- Do not raise exception for grub2efi on non-pc architectures + (bnc#873861) +- 3.1.26 + +------------------------------------------------------------------- +Wed Apr 16 12:11:53 UTC 2014 - jreidinger(a)suse.com + +- fix crash on s390 due to missing loader widget(bnc#873911) +- 3.1.25 + +------------------------------------------------------------------- +Tue Apr 15 10:52:27 UTC 2014 - jreidinger(a)suse.com + +- fix proposing when proposal do not change (bnc#873620) +- 3.1.24 + +------------------------------------------------------------------- +Tue Apr 15 10:38:17 UTC 2014 - jreidinger(a)suse.com + +- cleaning up deprecated code to improve stability and maintenance + of code +- 3.1.23 + +------------------------------------------------------------------- +Tue Apr 15 08:33:29 UTC 2014 - mchang(a)suse.com + +- remove error if boot directory on xfs file system (bnc#864370) +- 3.1.22 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.21.tar.bz2 New: ---- yast2-bootloader-3.1.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.qJXJZj/_old 2014-04-26 11:45:12.000000000 +0200 +++ /var/tmp/diff_new_pack.qJXJZj/_new 2014-04-26 11:45:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.21 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.21.tar.bz2 -> yast2-bootloader-3.1.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/package/yast2-bootloader.changes new/yast2-bootloader-3.1.29/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.21/package/yast2-bootloader.changes 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/package/yast2-bootloader.changes 2014-04-22 11:18:41.000000000 +0200 @@ -1,4 +1,58 @@ ------------------------------------------------------------------- +Tue Apr 22 08:44:57 UTC 2014 - jreidinger(a)suse.com + +- Use correct check for partition setup for grub2 on s390 + (bnc#873951) +- 3.1.29 + +------------------------------------------------------------------- +Thu Apr 17 14:46:17 UTC 2014 - jreidinger(a)suse.com + +- do not complain for missing bios order on s390(bnc#874106) +- 3.1.28 + +------------------------------------------------------------------- +Thu Apr 17 11:18:31 UTC 2014 - jreidinger(a)suse.com + +- improve logging if setting kernel paramater failed to help with + bnc#873996 +- remove graphic adapter configuration on s390 (bnc#874010) +- 3.1.27 + +------------------------------------------------------------------- +Wed Apr 16 19:49:56 UTC 2014 - jreidinger(a)suse.com + +- allow switching to grub2 also on ppc +- Do not raise exception for grub2efi on non-pc architectures + (bnc#873861) +- 3.1.26 + +------------------------------------------------------------------- +Wed Apr 16 12:11:53 UTC 2014 - jreidinger(a)suse.com + +- fix crash on s390 due to missing loader widget(bnc#873911) +- 3.1.25 + +------------------------------------------------------------------- +Tue Apr 15 10:52:27 UTC 2014 - jreidinger(a)suse.com + +- fix proposing when proposal do not change (bnc#873620) +- 3.1.24 + +------------------------------------------------------------------- +Tue Apr 15 10:38:17 UTC 2014 - jreidinger(a)suse.com + +- cleaning up deprecated code to improve stability and maintenance + of code +- 3.1.23 + +------------------------------------------------------------------- +Tue Apr 15 08:33:29 UTC 2014 - mchang(a)suse.com + +- remove error if boot directory on xfs file system (bnc#864370) +- 3.1.22 + +------------------------------------------------------------------- Thu Apr 10 11:18:51 UTC 2014 - jreidinger(a)suse.com - drop not-supported bootloaders except grub1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/package/yast2-bootloader.spec new/yast2-bootloader-3.1.29/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.21/package/yast2-bootloader.spec 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/package/yast2-bootloader.spec 2014-04-22 11:18:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.21 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/clients/bootloader_proposal.rb new/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb --- old/yast2-bootloader-3.1.21/src/clients/bootloader_proposal.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb 2014-04-22 11:18:41.000000000 +0200 @@ -47,16 +47,27 @@ Bootloader.Reset end - if Bootloader.getLoaderType == "grub2" - if !Mode.update - if !Bootloader.proposed_cfg_changed && !Mode.autoinst - Bootloader.blRead(true, true) - BootCommon.was_read = true - end + # proposal not changed by user so repropose it from scratch + if !Bootloader.proposed_cfg_changed && !Mode.autoinst + Builtins.y2milestone "Proposal not modified, so repropose from scratch" + Bootloader.ResetEx(false) + end + if Mode.update + if ["grub2", "grub2-efi"].include? Bootloader.getLoaderType + Builtins.y2milestone "update of grub2, do not repropose" + Bootloader.blRead(true, true) + else + BootCommon.setLoaderType(nil) + Bootloader.Reset Bootloader.Propose end + else + # in installation always propose missing stuff + Bootloader.Propose + end + if Bootloader.getLoaderType == "grub2" @ret["links"] = [ "enable_boot_mbr", "disable_boot_mbr", @@ -65,25 +76,8 @@ "enable_boot_boot", "disable_boot_boot" ] - elsif Bootloader.getLoaderType == "grub2-efi" - if !Mode.update - if !Bootloader.proposed_cfg_changed && !Mode.autoinst - Bootloader.blRead(true, true) - BootCommon.was_read = true - end - - Bootloader.Propose - end - else - # repropose if grub2 is not used during upgrade - if Mode.update - Builtins.y2milestone("Cfg not changed before, recreating") - Bootloader.ResetEx(false) - BootCommon.setLoaderType(nil) - end - - Bootloader.Propose end + # to make sure packages will get installed BootCommon.setLoaderType(BootCommon.getLoaderType(false)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -662,11 +662,6 @@ Builtins.y2milestone("/boot is in logical partition: %1", is_logical) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = BootCommon.KeepMBR(BootCommon.mbrDisk) - # if is primary, store bootloader there exit = 0 @@ -699,7 +694,7 @@ Ops.set( BootCommon.globals, "generic_mbr", - out != "vista" && !keep_mbr ? "true" : "false" + out != "vista" ? "true" : "false" ) if out == "vista" Builtins.y2milestone("Vista MBR...") @@ -719,15 +714,6 @@ selected_location = :mbr end - if keep_mbr - if is_logical && extended != nil - selected_location = :extended - else - selected_location = BootStorage.BootPartitionDevice != - BootStorage.RootPartitionDevice ? :boot : :root - end - end - SetBootloaderDevice(selected_location) if !Builtins.contains( BootStorage.getPartitionList(:boot, "grub"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub/options.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub/options.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub/options.rb 2014-04-22 11:18:41.000000000 +0200 @@ -370,6 +370,7 @@ ) ), "init" => fun_ref(method(:InitConsole), "void (string)"), + "handle" => fun_ref(method(:HandleConsole), "void (string, map)"), "store" => fun_ref(method(:StoreConsole), "void (string, map)"), "help" => Ops.get(@grub_help_messages, "serial", "") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/dialogs.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/dialogs.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/dialogs.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/dialogs.rb 2014-04-22 11:18:41.000000000 +0200 @@ -68,6 +68,7 @@ def kernel_tab widgets = ["vgamode", "append", "append_failsafe", "console"] widgets.delete("console") if Arch.s390 # there is no console on s390 (bnc#868909) + widgets.delete("vgamode") if Arch.s390 # there is no graphic adapter on s390 (bnc#874010) { "id" => "kernel_tab", @@ -282,6 +283,8 @@ @_grub2_widgets = { "loader_location" => grubBootLoaderLocationWidget } when /ppc/ @_grub2_widgets = { "loader_location" => grub_on_ppc_location } + when /s390/ + @_grub2_widgets = {} #no loader location for s390 as it is automatic else raise "unsuppoted architecture #{Arch.architecture}" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/grub2/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -668,11 +668,6 @@ ) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = BootCommon.KeepMBR(BootCommon.mbrDisk) - # if is primary, store bootloader there exit = 0 @@ -705,7 +700,7 @@ Ops.set( BootCommon.globals, "generic_mbr", - out != "vista" && !keep_mbr ? "true" : "false" + out != "vista" ? "true" : "false" ) if out == "vista" Builtins.y2milestone("Vista MBR...") @@ -725,19 +720,7 @@ selected_location = :mbr end - if keep_mbr - if is_logical && extended != nil - selected_location = :extended - else - selected_location = BootStorage.BootPartitionDevice != - BootStorage.RootPartitionDevice ? :boot : :root - end - end - if is_logical_and_btrfs - if keep_mbr - Builtins.y2milestone("force to use mbr even if keep_mbr is suggested") - end Builtins.y2milestone( "/boot is on logical parititon and uses btrfs, mbr is favored in this situration" ) @@ -1074,7 +1057,7 @@ BootStorage.ProposeDeviceMap md_mbr = BootStorage.addMDSettingsToGlobals Ops.set(BootCommon.globals, "boot_md_mbr", md_mbr) if md_mbr != "" - BootCommon.InitializeLibrary(true, "grub") + BootCommon.InitializeLibrary(true, "grub2") end if !Mode.autoinst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/i386.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/i386.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/i386.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/i386.rb 2014-04-22 11:18:41.000000000 +0200 @@ -105,21 +105,6 @@ @_thinkpad_mbr end - # Keep the MBR contents on the specified disk? Check whether the contents - # should be kept because ot contains vendor-specific data - # @param [String] disk string the disk to be checked - # @return [Boolean] true to keep the contents - def KeepMBR(disk) - # FIXME: see bug #464485 there is problem with detection of - # MBR the 3rd byte is 0 after recovery thinkpad notebook with - # recovery CD, next missing cooperate with Lenovo there also - # missing any specification about Lenovo's changes in MBR - - Builtins.y2milestone("Skip checking of MBR for thinkpad sequence") - - false - end - # Add the partition holding firmware to bootloader? # @param [String] disk string the disk to be checked # @return [Boolean] true if firmware partition is to be added @@ -127,61 +112,6 @@ !ThinkPadMBR(disk) end - # Display bootloader summary - # @return a list of summary lines - def i386Summary - ret = Summary() - order_sum = DiskOrderSummary() - ret = Builtins.add(ret, order_sum) if order_sum != nil - deep_copy(ret) - end - - # Propose the boot loader location for i386 (and similar) platform - def i386LocationProposal - if !@was_proposed - DetectDisks() - @del_parts = BootStorage.getPartitionList( - :deleted, - getLoaderType(false) - ) - # check whether edd is loaded; if not: load it - lsmod_command = "lsmod | grep edd" - Builtins.y2milestone("Running command %1", lsmod_command) - lsmod_out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), lsmod_command) - ) - Builtins.y2milestone("Command output: %1", lsmod_out) - edd_loaded = Ops.get_integer(lsmod_out, "exit", 0) == 0 - if !edd_loaded - command = "/sbin/modprobe edd" - Builtins.y2milestone("Loading EDD module, running %1", command) - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), command) - ) - Builtins.y2milestone("Command output: %1", out) - end - end - - # refresh device map - if (BootStorage.device_mapping == nil || - Builtins.size(BootStorage.device_mapping) == 0) && - getLoaderType(false) == "grub" - BootStorage.ProposeDeviceMap - end - - if DisksChanged() && !Mode.autoinst - if askLocationResetPopup(@loader_device) - @selected_location = nil - @loader_device = nil - Builtins.y2milestone("Reconfiguring locations") - DetectDisks() - end - end - - nil - end - - # Do updates of MBR after the bootloader is installed # @return [Boolean] true on success def PostUpdateMBR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lib_iface.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lib_iface.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lib_iface.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lib_iface.rb 2014-04-22 11:18:41.000000000 +0200 @@ -272,24 +272,6 @@ res_data.unlink end - # Display the log file written by the underlying bootloader libraries - def bootloaderError(error) - bl_logfile = "/var/log/YaST2/y2log_bootloader" - bl_log = Convert.to_string(SCR.Read(path(".target.string"), bl_logfile)) - - errorWithLogPopup( - Builtins.sformat( - # error popup - label, %1 is bootloader name - _("Error occurred while installing %1."), - getLoaderName(getLoaderType(false), :summary) - ), - bl_log - ) - Builtins.y2error("%1", error) - - nil - end - # Read the files from the system to internal cache of the library # @param [Boolean] avoid_reading_device_map do not read the device map, but use internal # data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lilolike.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lilolike.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/lilolike.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/lilolike.rb 2014-04-22 11:18:41.000000000 +0200 @@ -48,33 +48,6 @@ ] end - # Check whether disk settings were changed since last checking - # @return [Boolean] true if needs to recheck - def DisksChanged - return false if Mode.config - mp = Storage.GetMountPoints - actual_root = Ops.get_string(mp, ["/", 0], "") - actual_boot = Ops.get_string(mp, ["/boot", 0], actual_root) - - # don't change configuration if '/' and '/boot' were not changed - # and location is "floppy", "mbr" or "boot" - if actual_boot == BootStorage.BootPartitionDevice && - actual_root == BootStorage.RootPartitionDevice && - @selected_location != "custom" && - @selected_location != "" && - @selected_location != nil - return false - end - - all_partitions = BootStorage.getPartitionList(:boot, getLoaderType(false)) - - if !Builtins.contains(all_partitions, @loader_device) - Builtins.y2milestone("Location should be set again") - return true - end - false - end - # FindMbrDisk() # try to find the system's mbr device # @return [String] mbr device @@ -186,11 +159,6 @@ Builtins.y2milestone("/boot is in logical partition: %1", is_logical) Builtins.y2milestone("The extended partition: %1", extended) - # keep_mbr, if the MBR contains special code that needs to be kept, - # like Thinkpad boot code (and ATM only Thinkpad boot code - # is recognized) - keep_mbr = KeepMBR(@loader_device) - exit = 0 # if is primary, store bootloader there if disk_is_mbr && !is_logical @@ -198,29 +166,11 @@ @loader_device = BootStorage.BootPartitionDevice @activate = true @activate_changed = true - - # check if there is raid and if it soft-raid select correct device for analyse MBR - # bnc #398356 - if Ops.greater_than(Builtins.size(needed_devices), 1) - disk = soft_MDraid_boot_disk(partitions) - end - disk = Ops.get_string(dp, "disk", "") if disk == "" - out = examineMBR(disk) - - @repl_mbr = out != "vista" && !keep_mbr elsif Ops.greater_than(Builtins.size(needed_devices), 1) @loader_device = "mbr_md" @selected_location = "mbr_md" end - if keep_mbr - if is_logical && extended != nil - @loader_device = extended - else - @loader_device = BootStorage.BootPartitionDevice - end - @selected_location = "boot" - end if !Builtins.contains( BootStorage.getPartitionList(:boot, getLoaderType(false)), @loader_device @@ -494,7 +444,6 @@ parts = BootStorage.getPartitionList(:parts_old, getLoaderType(false)) if @partitioning_last_change != Storage.GetTargetChangeTime && @files_edited displayFilesEditedPopup - @files_edited_warned = true return end @@ -670,19 +619,6 @@ nil end - - # Update sections of bootloader menu (removes obsolete thinks and - # place for ugly hacks (but doesn't efect zypper dup)) - # modifies internal structures - # label update is done in perl-Bootloader during updating kernel - # Purpose is don't break anything, but expect that previous state is - # working - def UpdateSections - Builtins.foreach(@sections) do |section| - end - - nil - end # Update global options of bootloader # modifies internal sreuctures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/misc.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/misc.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/misc.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/misc.rb 2014-04-22 11:18:41.000000000 +0200 @@ -650,222 +650,6 @@ Builtins.toset(ret) end - # Get last change time of file - # @param [String] filename string name of file - # @return [String] last change date as YYYY-MM-DD-HH-MM-SS - def getFileChangeDate(filename) - stat = Convert.to_map(SCR.Read(path(".target.stat"), filename)) - ctime = Ops.get_integer(stat, "ctime", 0) - command = Builtins.sformat( - "date --date='1970-01-01 00:00:00 %1 seconds' +\"%%Y-%%m-%%d-%%H-%%M-%%S\"", - ctime - ) - out = Convert.to_map(SCR.Execute(path(".target.bash_output"), command)) - c_time = Ops.get_string(out, "stdout", "") - Builtins.y2debug("File %1: last change %2", filename, c_time) - c_time - end - - # Save current MBR to /boot/backup_mbr - # Also save to /var/lib/YaST2/backup_boot_sectors/%device, if some - # existing, rename it - # @param [String] device string name of device - def saveMBR(device) - device_file = Builtins.mergestring(Builtins.splitstring(device, "/"), "_") - device_file_path = Ops.add( - "/var/lib/YaST2/backup_boot_sectors/", - device_file - ) - device_file_path_to_logs = Ops.add("/var/log/YaST2/", device_file) - SCR.Execute( - path(".target.bash"), - "test -d /var/lib/YaST2/backup_boot_sectors || mkdir /var/lib/YaST2/backup_boot_sectors" - ) - if Ops.greater_than(SCR.Read(path(".target.size"), device_file_path), 0) - contents = Convert.convert( - SCR.Read(path(".target.dir"), "/var/lib/YaST2/backup_boot_sectors"), - :from => "any", - :to => "list <string>" - ) - contents = Builtins.filter(contents) do |c| - Builtins.regexpmatch( - c, - Builtins.sformat("%1-.*-.*-.*-.*-.*-.*", device_file) - ) - end - contents = Builtins.sort(contents) - index = 0 - siz = Builtins.size(contents) - while Ops.less_than(Ops.add(index, 10), siz) - SCR.Execute( - path(".target.remove"), - Builtins.sformat( - "/var/lib/YaST2/backup_boot_sectors/%1", - Ops.get(contents, index, "") - ) - ) - index = Ops.add(index, 1) - end - change_date = getFileChangeDate(device_file_path) - SCR.Execute( - path(".target.bash"), - Builtins.sformat("/bin/mv %1 %1-%2", device_file_path, change_date) - ) - end - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - device_file_path - ) - ) - # save MBR to yast2 log directory - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - device_file_path_to_logs - ) - ) - if device == @mbrDisk - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/bin/dd if=%1 of=%2 bs=512 count=1 2>&1", - device, - "/boot/backup_mbr" - ) - ) - - # save thinkpad MBR - if ThinkPadMBR(device) - device_file_path_thinkpad = Ops.add(device_file_path, "thinkpadMBR") - Builtins.y2milestone("Backup thinkpad MBR") - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "cp %1 %2 2>&1", - device_file_path, - device_file_path_thinkpad - ) - ) - end - end - - nil - end - - # Update contents of MBR (active partition and booting code) - # FIXME move tis function to lilolike.ycp - # @return [Boolean] true on success - def updateMBR - # FIXME: do the real thing in perl_Bootloader - if getLoaderType(false) == "grub" - @activate = Ops.get(@globals, "activate", "false") == "true" - @repl_mbr = Ops.get(@globals, "generic_mbr", "false") == "true" - end - - Builtins.y2milestone( - "Updating disk system area, activate partition: %1, replace MBR: %2", - @activate, - @repl_mbr - ) - if @backup_mbr - Builtins.y2milestone( - "Doing MBR backup: MBR Disk: %1, loader device: %2", - @mbrDisk, - @loader_device - ) - disks_to_rewrite = Convert.convert( - Builtins.toset( - Builtins.merge(getMbrsToRewrite, [@mbrDisk, @loader_device]) - ), - :from => "list", - :to => "list <string>" - ) - Builtins.y2milestone( - "Creating backup of boot sectors of %1", - disks_to_rewrite - ) - Builtins.foreach(disks_to_rewrite) { |d| saveMBR(d) } - end - ret = true - # if the bootloader stage 1 is not installed in the MBR, but - # ConfigureLocation() asked us to replace some problematic existing - # MBR, then overwrite the boot code (only, not the partition list!) in - # the MBR with a generic (currently DOS?) bootloader - if @repl_mbr && @loader_device != @mbrDisk - PackageSystem.Install("syslinux") if !Stage.initial - Builtins.y2milestone( - "Updating code in MBR: MBR Disk: %1, loader device: %2", - @mbrDisk, - @loader_device - ) - disks_to_rewrite = getMbrsToRewrite - Builtins.foreach(disks_to_rewrite) do |d| - Builtins.y2milestone("Copying generic MBR code to %1", d) - # added fix 446 -> 440 Vista booting problem bnc # 396444 - command = Builtins.sformat( - "/bin/dd bs=440 count=1 if=%1 of=%2", - "/usr/share/syslinux/mbr.bin", - d - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), command) - ) - exit = Ops.get_integer(out, "exit", 0) - Builtins.y2milestone("Command output: %1", out) - ret = ret && 0 == exit - end - end - - Builtins.foreach(getPartitionsToActivate) do |m_activate| - num = Ops.get_integer(m_activate, "num", 0) - mbr_dev = Ops.get_string(m_activate, "mbr", "") - if num != 0 && mbr_dev != "" - # if primary partition - if !Ops.is_integer?(num) || Ops.less_or_equal(num, 4) - Builtins.y2milestone("Activating partition %1 on %2", num, mbr_dev) - # FIXME: this is the most rotten code since molded sliced bread - # move to bootloader/Core/GRUB.pm or similar - # TESTME: make sure that parted does not destroy BSD - # slices (#suse24740): cf. section 5.1 of "info parted": - # Parted only supports the BSD disk label system. - # Parted is unlikely to support the partition slice - # system in the future because the semantics are rather - # strange, and don't work like "normal" partition tables - # do. - # string command = sformat - # ("/usr/sbin/parted -s %1 set %2 boot on", mbr_dev, num); - # As a workaround for #167602, moved back to - # /sbin/activate, because it does not cause the kernel to - # forget about an activated extended partition (it changes - # the data on disk without using any ioctl). - # FIXME: investigate proper handling of the activate flag - # (kernel ioctls in parted etc.) and fix parted - command = Builtins.sformat( - "/usr/sbin/parted -s %1 set %2 boot on", - mbr_dev, - num - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - WFM.Execute(path(".local.bash_output"), command) - ) - exit = Ops.get_integer(out, "exit", 0) - Builtins.y2milestone("Command output: %1", out) - ret = ret && 0 == exit - end - else - Builtins.y2error("Cannot activate %1", m_activate) - end - end if @activate - ret - end - # Rewrite current MBR with /var/lib/YaST2/backup_boot_sectors/%device # Warning!!! don't use for bootsectors, 440 bytes of sector are written # @param [String] device string device to rewrite MBR to @@ -1052,21 +836,6 @@ @additional_failsafe_params end - # Get additional kernel parameters from control file - # @return [String] additional kernel parameters - def GetAdditionalKernelParams - ProductFeatures.GetStringFeature( - "globals", - "additional_kernel_parameters" - ) - end - - # Get additional kernel parameters splitted to a list - # @return a list of additional kernel parameters - def ListAdditionalKernelParams - ListKernelParamsInLine(GetAdditionalKernelParams()) - end - # Update graphical bootloader to contain help text of current language # And make the selected installation language default # @return [Boolean] true on success diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/popups.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/popups.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/popups.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/popups.rb 2014-04-22 11:18:41.000000000 +0200 @@ -41,20 +41,6 @@ end # Display question - # @param [String] name string name of currently selected section (to clone) - # @return [Boolean] true if answered yes - def askClone(name) - # yes-no popup - Popup.YesNo( - Builtins.sformat( - _( - "Clone the selected section '%1' instead\nof creating a new empty section?\n" - ), - name - ) - ) - end - # Display question # @return [Boolean] true if answered yes def confirmAbortPopup # yes-no popup question @@ -66,17 +52,6 @@ end # Display question - # @return [Boolean] true if answered yes - def resetSectsPopup - # yes-no popup question - Popup.YesNo( - _( - "Really reset your settings for sections?\nAll your changes made in section management will be lost.\n" - ) - ) - end - - # Display question # @param [String] title string section title # @return [Boolean] true if answered yes def confirmSectionDeletePopup(title) @@ -84,23 +59,6 @@ Popup.YesNo(Builtins.sformat(_("Really delete section %1?"), title)) end - # Display question - # @return [Boolean] true if answered yes - def resetAllPopup - # yes-no popup question - Popup.YesNo( - _("Really reset all\nyour settings? All your changes will be lost.\n") - ) - end - - # Display error - def setLocationErrorPopup - # error popup - Report.Error(_("Set the boot loader location.")) - - nil - end - # Display error def emptyPasswdErrorPopup # error popup @@ -274,24 +232,6 @@ ) end - - # Display popup - def displayGfxMenuChangePopup - # message popup, gfxmenu is option name, leave as is - Popup.Message( - _("The disk settings have changed.\nCheck the gfxmenu settings.\n") - ) - - nil - end - - # Display yes-no popup - # @return true if confirmed - def confirmOptionDeletePopup - # yes-no popup - Popup.YesNo(_("Really delete the selected option?")) - end - # Display error popup with log # @param [String] header string error header # @param [String] log string logfile contents @@ -321,50 +261,6 @@ nil end - - # Display popup - def displayNoSupportPopup - # message popup - Popup.Message(_("Sorry, there are currently\nno options to set here.")) - - nil - end - - # Display popup - def noBootloaderPopup - # error report - Report.Error(_("Unable to install the boot loader.")) - - nil - end - - # Display popup - # @param [String] bootloader string printable name of used bootloader - def floppyWrittenPopup(bootloader) - confirm_boot_msg = Misc.boot_msg - # data saved to floppy disk - # popup, %1 is bootloader name - msg = Builtins.sformat( - _("The %1 boot sector has been written to the floppy disk."), - bootloader - ) - msg = Ops.add( - Ops.add(msg, "\n"), - # popup - continuing - alternative 1 ... - _( - "Leave the floppy disk in the drive. The system will now be rebooted." - ) - ) - - if Ops.greater_than(Builtins.size(confirm_boot_msg), 0) - msg = Ops.add(Ops.add(msg, "\n\n"), confirm_boot_msg) - end - Misc.boot_msg = "" - # empty that Misc::boot_msg indicate the message has been displayed - Popup.TimedOKCancel(msg, 10) - - nil - end # Display popup - confirmation befopre restoring MBR # @param [String] device string device to restore to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/include/bootloader/routines/wizards.rb new/yast2-bootloader-3.1.29/src/include/bootloader/routines/wizards.rb --- old/yast2-bootloader-3.1.21/src/include/bootloader/routines/wizards.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/include/bootloader/routines/wizards.rb 2014-04-22 11:18:41.000000000 +0200 @@ -38,7 +38,6 @@ ) ) end - bl = Bootloader.getLoaderType # run generic sequence aliases = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/lib/bootloader/grub2base.rb new/yast2-bootloader-3.1.29/src/lib/bootloader/grub2base.rb --- old/yast2-bootloader-3.1.21/src/lib/bootloader/grub2base.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/lib/bootloader/grub2base.rb 2014-04-22 11:18:41.000000000 +0200 @@ -53,8 +53,6 @@ def Update Read(true, true) - #we don't handle sections, grub2 section create them for us - #BootCommon::UpdateSections (); BootCommon.UpdateGlobals nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootCommon.rb new/yast2-bootloader-3.1.29/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.21/src/modules/BootCommon.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootCommon.rb 2014-04-22 11:18:41.000000000 +0200 @@ -48,14 +48,6 @@ # map of global options and types for new perl-Bootloader interface @global_options = {} - # map of section options and types for new perl-Bootloader interface - @section_options = {} - - # boolean value indicate if "/" is on logical - # and primary /boot doesn't exist - - @boot_device_on_logical = false - # map of global options and values @globals = {} @@ -107,39 +99,21 @@ @current_section = {} - # Option types for different bootloaders - @opt_types = {} - # device holding MBR for bootloader @mbrDisk = "" - # was currently edited section changed (== true) - @one_section_changed = false - # Backup original MBR before installing bootloader @backup_mbr = false # Activate bootloader partition during installation? @activate = false - - # FATE #303548 - Grub: limit device.map to devices detected by BIOS - # Ask user if he wants to edit again bootloader settings - # It is used if device.map is limited and "boot" disk is out of range - # The range is the first 8 devices - @ask_user = false - - # Replace MBR with generic code after bootloader installation? - @repl_mbr = false - # Kernel parameters at previous detection @kernelCmdLine = "" # were settings changed (== true) @changed = false - - @edited_files = {} # common variables # type of bootloader to configure/being configured @@ -163,9 +137,6 @@ # summary dialog state - # Show verbose summary output - @verbose = false - # ui help variables @@ -194,8 +165,6 @@ @location_changed = false # Were configuration files manually edited and chamged? @files_edited = false - # Has been files edited warning already shown? - @files_edited_warned = false # time of last change of partitioning @partitioning_last_change = 0 # true if memtest was removed by user (manually) during the installation @@ -272,37 +241,6 @@ ret end - - # Get the size of memory for XEN's domain 0 - # @return the memory size in kB - def Dom0MemorySize - memory = Convert.convert( - SCR.Read(path(".probe.memory")), - :from => "any", - :to => "list <map>" - ) - - Builtins.y2milestone("memory: %1", memory) - memory_size = 0 - - Builtins.foreach(memory) do |info| - # internal class, main memory - if Ops.get_integer(info, "class_id", 0) == 257 && - Ops.get_integer(info, "sub_class_id", 0) == 2 - minf = Ops.get_list(info, ["resource", "phys_mem"], []) - Builtins.foreach(minf) do |i| - memory_size = Ops.add(memory_size, Ops.get_integer(i, "range", 0)) - end - end - end - - # size in kB lowered 64 MB for XEN itself - memory_size = Ops.subtract(Ops.divide(memory_size, 1024), 64 * 1024) - Builtins.y2milestone("Memory size for XEN domain 0: %1", memory_size) - memory_size - end - - # Create section for linux kernel # @param [String] title string the section name to create (untranslated) # @return a map describing the section @@ -506,7 +444,6 @@ "device_map" => BootStorage.remapDeviceMap(BootStorage.device_mapping) } if !(@loader_type == "grub" || @loader_type == "grub2") - Ops.set(exp, "repl_mbr", @repl_mbr) Ops.set(exp, "activate", @activate) end @@ -521,11 +458,7 @@ @globals = Ops.get_map(settings, "global", {}) @sections = Ops.get_list(settings, "sections", []) - # FIXME: for grub, repl_mbr is replaced by globals["generic_mbr"]; same - # for activate; remove the following when no bootloader uses these - # variables any more if !(@loader_type == "grub" || @loader_type == "grub2") - @repl_mbr = Ops.get_boolean(settings, "repl_mbr", false) @activate = Ops.get_boolean(settings, "activate", false) end BootStorage.device_mapping = Ops.get_map(settings, "device_map", {}) @@ -595,7 +528,6 @@ @sections = [] @globals = {} # DetectDisks (); - @repl_mbr = false @activate = false @activate_changed = false @removed_sections = [] @@ -769,75 +701,15 @@ # Display bootloader summary # @return a list of summary lines def Summary - if getLoaderType(false) == "none" + bl = getLoaderType(false) + if bl == "none" return [ HTML.Colorize(getLoaderName(getLoaderType(false), :summary), "red") ] end - targetMap = Storage.GetTargetMap - boot_target = Ops.get_map(targetMap, @loader_device, {}) - target_name = "" - if boot_target == {} - target_name = @loader_device - if target_name == "mbr_md" - mbrs = Builtins.maplist( - Md2Partitions(BootStorage.BootPartitionDevice) - ) do |d, id| - p_dev = Storage.GetDiskPartition(d) - Ops.get_string(p_dev, "disk", "") - end - # summary part, %1 is a list of device names - target_name = Builtins.sformat( - _("Master boot records of disks %1"), - Builtins.mergestring(mbrs, ", ") - ) - end - else - target_name = Ops.get_string(boot_target, "name", "disk") - end - target_name = AddMbrToDescription(target_name, @loader_device) - - result = [] - # summary text, %1 is bootloader name (eg. LILO) - result = Builtins.add( - result, - Builtins.sformat( - _("Boot Loader Type: %1"), - getLoaderName(getLoaderType(false), :summary) - ) - ) - # summary text, location is location description (eg. /dev/hda) - result = Builtins.add( - result, - Builtins.sformat(_("Location: %1"), target_name) - ) - sects = [] - Builtins.foreach(@sections) do |s| - title = Ops.get_string(s, "name", "") - # section name "suffix" for default section - _def = title == Ops.get(@globals, "default", "") ? _(" (default)") : "" - sects = Builtins.add( - sects, - String.EscapeTags(Builtins.sformat("+ %1%2", title, _def)) - ) - end - # summary text. %1 is list of bootloader sections - result = Builtins.add( - result, - Builtins.sformat( - _("Sections: %1"), - Builtins.mergestring(sects, " ") - ) - ) - if @loader_device == "/dev/null" - # summary text - result = Builtins.add( - result, - _("Do not install boot loader; just create \nconfiguration files") - ) - end - deep_copy(result) + # each Boot* should have own summary, that can differ + raise "Not implemented for bootloader \"#{bl}\"" end # Update read settings to new version of configuration files @@ -1106,7 +978,7 @@ ) end end - if Arch.s390 + if Arch.s390 || Arch.ppc ret = ["grub2"] end # in order not to display it twice when "none" is selected @@ -1151,8 +1023,6 @@ end publish :variable => :global_options, :type => "map <string, any>" - publish :variable => :section_options, :type => "map <string, any>" - publish :variable => :boot_device_on_logical, :type => "boolean" publish :variable => :globals, :type => "map <string, string>" publish :variable => :sections, :type => "list <map <string, any>>" publish :variable => :cached_settings_base_data_change_time, :type => "integer" @@ -1163,19 +1033,13 @@ publish :variable => :current_section_name, :type => "string" publish :variable => :current_section_index, :type => "integer" publish :variable => :current_section, :type => "map <string, any>" - publish :variable => :opt_types, :type => "map <string, map <string, string>>" publish :variable => :mbrDisk, :type => "string" - publish :variable => :one_section_changed, :type => "boolean" publish :variable => :backup_mbr, :type => "boolean" publish :variable => :activate, :type => "boolean" - publish :variable => :ask_user, :type => "boolean" - publish :variable => :repl_mbr, :type => "boolean" publish :variable => :kernelCmdLine, :type => "string" publish :variable => :changed, :type => "boolean" - publish :variable => :edited_files, :type => "map <string, string>" publish :variable => :del_parts, :type => "list <string>" publish :variable => :write_settings, :type => "map" - publish :variable => :verbose, :type => "boolean" publish :variable => :other_bl, :type => "map" publish :variable => :activate_changed, :type => "boolean" publish :variable => :save_all, :type => "boolean" @@ -1183,12 +1047,9 @@ publish :variable => :was_read, :type => "boolean" publish :variable => :location_changed, :type => "boolean" publish :variable => :files_edited, :type => "boolean" - publish :variable => :files_edited_warned, :type => "boolean" publish :variable => :partitioning_last_change, :type => "integer" publish :variable => :removed_sections, :type => "list <string>" - publish :variable => :read_default_section_name, :type => "string" publish :variable => :update_section_types, :type => "list <string>" - publish :variable => :bootloaders, :type => "list <string>" publish :variable => :enable_md_array_redundancy, :type => "boolean" publish :variable => :enable_selinux, :type => "boolean" publish :function => :getLoaderType, :type => "string (boolean)" @@ -1218,17 +1079,13 @@ publish :function => :getKernelParamFromLine, :type => "string (string, string)" publish :function => :setKernelParamToLine, :type => "string (string, string, string)" publish :function => :myToInteger, :type => "integer (any)" - publish :function => :updateMBR, :type => "boolean ()" publish :function => :restoreMBR, :type => "boolean (string)" publish :function => :UpdateKernelParams, :type => "string (string)" publish :function => :getSwapPartitions, :type => "map <string, integer> ()" publish :function => :translateSectionTitle, :type => "string (string)" publish :function => :UpdateInstallationKernelParameters, :type => "void ()" publish :function => :GetAdditionalFailsafeParams, :type => "string ()" - publish :function => :GetAdditionalKernelParams, :type => "string ()" - publish :function => :ListAdditionalKernelParams, :type => "list <string> ()" publish :function => :UpdateGfxMenuContents, :type => "boolean ()" - publish :function => :MemtestPresent, :type => "boolean ()" publish :function => :BootloaderInstallable, :type => "boolean ()" publish :function => :PartitionInstallable, :type => "boolean ()" publish :function => :findRelativeDefaultLinux, :type => "string ()" @@ -1240,23 +1097,17 @@ publish :function => :GetSerialFromAppend, :type => "void ()" publish :function => :UpdateProposalFromClient, :type => "boolean ()" publish :function => :DiskOrderSummary, :type => "string ()" - publish :function => :DisksChanged, :type => "boolean ()" - publish :function => :KeepMBR, :type => "boolean (string)" publish :function => :AddFirmwareToBootloader, :type => "boolean (string)" - publish :function => :i386Summary, :type => "list <string> ()" - publish :function => :i386LocationProposal, :type => "void ()" publish :function => :PostUpdateMBR, :type => "boolean ()" publish :function => :FindMBRDisk, :type => "string ()" publish :function => :Md2Partition, :type => "string (string)" publish :function => :RunDelayedUpdates, :type => "void ()" publish :function => :FixGlobals, :type => "void ()" publish :function => :FixSections, :type => "void (void ())" - publish :function => :UpdateSections, :type => "void ()" publish :function => :UpdateGlobals, :type => "void ()" publish :function => :RemoveUnexistentSections, :type => "void (string, string)" publish :function => :UpdateAppend, :type => "void ()" publish :function => :UpdateGfxMenu, :type => "void ()" - publish :function => :DefineMultipath, :type => "boolean (map <string, string>)" publish :function => :SetDiskInfo, :type => "void ()" publish :function => :InitializeLibrary, :type => "boolean (boolean, string)" publish :function => :SetSections, :type => "boolean (list <map <string, any>>)" @@ -1264,18 +1115,14 @@ publish :function => :SetGlobal, :type => "boolean (map <string, string>)" publish :function => :GetGlobal, :type => "map <string, string> ()" publish :function => :SetDeviceMap, :type => "boolean (map <string, string>)" - publish :function => :GetDeviceMap, :type => "map <string, string> ()" - publish :function => :bootloaderError, :type => "void (string)" publish :function => :ReadFiles, :type => "boolean (boolean)" publish :function => :CommitSettings, :type => "boolean ()" publish :function => :UpdateBootloader, :type => "boolean ()" - publish :function => :SetSecureBoot, :type => "boolean (boolean)" publish :function => :InitializeBootloader, :type => "boolean ()" publish :function => :GetFilesContents, :type => "map <string, string> ()" publish :function => :SetFilesContents, :type => "boolean (map <string, string>)" publish :function => :XenPresent, :type => "boolean ()" publish :function => :isTrustedGrub, :type => "boolean ()" - publish :function => :Dom0MemorySize, :type => "integer ()" publish :function => :Export, :type => "map ()" publish :function => :Import, :type => "boolean (map)" publish :function => :Read, :type => "boolean (boolean, boolean)" @@ -1284,7 +1131,6 @@ publish :function => :Save, :type => "boolean (boolean, boolean, boolean)" publish :function => :Update, :type => "void ()" publish :function => :Write, :type => "boolean ()" - publish :function => :setCurrentLoaderAttribs, :type => "void (string)" publish :function => :setLoaderType, :type => "void (string)" publish :function => :setSystemSecureBootStatus, :type => "void (boolean)" publish :function => :Section2Index, :type => "integer (string)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB.rb 2014-04-22 11:18:41.000000000 +0200 @@ -799,7 +799,6 @@ def Update Read(true, true) - BootCommon.UpdateSections BootCommon.UpdateGlobals nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB2.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb 2014-04-22 11:18:41.000000000 +0200 @@ -122,10 +122,7 @@ BootCommon.globals["boot_custom"] = partition when /s390/ - zipl_partition = Storage.GetEntryForMountpoint("/boot/zipl") - raise "missing separate /boot/zipl partition" if zipl_partition.empty? - - BootCommon.globals["boot_custom"] = zipl_partition["device"] + Builtins.y2milestone "no partition needed for grub2 on s390" else raise "unsuported architecture #{Arch.architecture}" end @@ -140,7 +137,7 @@ end prep_partitions = partitions.select do |partition| - partition["fsid"] == 0x41 + [0x41, 0x108].include? partition["fsid"] end y2milestone "detected prep partitions #{prep_partitions.inspect}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootGRUB2EFI.rb new/yast2-bootloader-3.1.29/src/modules/BootGRUB2EFI.rb --- old/yast2-bootloader-3.1.21/src/modules/BootGRUB2EFI.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootGRUB2EFI.rb 2014-04-22 11:18:41.000000000 +0200 @@ -103,14 +103,15 @@ # Constructor def BootGRUB2EFI - if Arch.i386 + if Arch.i386 packages = ["grub2-i386-efi"] elsif Arch.x86_64 packages = ["grub2-x86_64-efi", "shim", "mokutil"] else - raise "no grub packages for EFI available for this architecture" + # do not raise exception as we call constructor everywhere even if it doesn't make sense + packages = [] end - + Ops.set( BootCommon.bootloader_attribs, "grub2-efi", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/BootSupportCheck.rb new/yast2-bootloader-3.1.29/src/modules/BootSupportCheck.rb --- old/yast2-bootloader-3.1.21/src/modules/BootSupportCheck.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/BootSupportCheck.rb 2014-04-22 11:18:41.000000000 +0200 @@ -225,20 +225,9 @@ ) end end - if Ops.get(p, "used_fs") == :xfs - AddNewProblem( - _( - "The /boot directory is on an XFS filesystem. System may not boot." - ) - ) - Builtins.y2error("The /boot directory is on an XFS filesystem") - result = false - raise Break - else - found_boot = true - Builtins.y2milestone("/boot filesystem is OK") - raise Break - end + found_boot = true + Builtins.y2milestone("/boot filesystem is OK") + raise Break end end raise Break if !result || found_boot @@ -263,22 +252,32 @@ # @return [Boolean] true on success def CheckBios_ID - ret = true + return true if Arch.s390 # s390 do not have bios boot order (bnc#874106) + if BootStorage.bois_id_missing AddNewProblem( _( "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\"" ) ) - ret = false + return false end - ret + + return true end - # Check that the root partition is reachable - def RootPartition - true + def check_zipl_part + boot_part = Storage.GetEntryForMountpoint("/boot/zipl") + boot_part = Storage.GetEntryForMountpoint("/boot") if boot_part.empty? + boot_part = Storage.GetEntryForMountpoint("/") if boot_part.empty? + + if [:ext2, :ext3, :ext4].include? boot_part["used_fs"] + return true + else + AddNewProblem(_( "Missing ext partition for booting. Cannot install boot code.")) + return false + end end # GRUB-related check @@ -291,7 +290,9 @@ # GRUB2-related check def GRUB2 - GRUB() + ret = GRUB() + # ensure that s390 have ext* partition for booting (bnc#873951) + ret &&= check_zipl_part if Arch.s390 end # GRUB2EFI-related check @@ -315,9 +316,6 @@ # detect correct bootloader type supported = CorrectLoaderType() && supported - # check whether root partition can be reached - supported = RootPartition() && supported - # check specifics for individual loaders if lt == "grub" supported = GRUB() && supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.21/src/modules/Bootloader.rb new/yast2-bootloader-3.1.29/src/modules/Bootloader.rb --- old/yast2-bootloader-3.1.21/src/modules/Bootloader.rb 2014-04-10 14:03:42.000000000 +0200 +++ new/yast2-bootloader-3.1.29/src/modules/Bootloader.rb 2014-04-22 11:18:41.000000000 +0200 @@ -1050,16 +1050,27 @@ elsif section == "LINUX_DEFAULT" section = getProposedDefaultSection end - return false if section == nil + if section.nil? + Builtins.y2error("section is nil, so kernel parameter cannot be set") + return false + end + sectnum = -1 index = -1 Builtins.foreach(BootCommon.sections) do |s| - index = Ops.add(index, 1) + index += 1 sectnum = index if Ops.get_string(s, "name", "") == section end - return false if sectnum == -1 - slabel = "" - return false if (key == "vga" || key == "root") && value == "true" + if sectnum == -1 + Builtins.y2error "Cannot find given section #{section} in sections #{BootCommon.sections.inspect}" + return false + end + + if (key == "vga" || key == "root") && value == "true" + Builtins.y2error "invalid values passed as kernel param #{key.inspect} => #{value.inspect}" + return false + end + if Builtins.contains(["root", "vga"], key) if value != "false" if key == "vga" @@ -1095,8 +1106,8 @@ Ops.set(BootCommon.sections, [sectnum, "__changed"], true) end BootCommon.changed = true - ret = true - ret + + return true end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit firmwarekit for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package firmwarekit for openSUSE:Factory checked in at 2014-04-26 11:45:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firmwarekit (Old) and /work/SRC/openSUSE:Factory/.firmwarekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "firmwarekit" Changes: -------- --- /work/SRC/openSUSE:Factory/firmwarekit/firmwarekit.changes 2012-03-20 11:26:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.firmwarekit.new/firmwarekit.changes 2014-04-26 11:45:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 21 09:11:01 UTC 2014 - coolo(a)suse.com + +- remove buildrequire on sysvinit - not needed at all + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firmwarekit.spec ++++++ --- /var/tmp/diff_new_pack.HekW6c/_old 2014-04-26 11:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.HekW6c/_new 2014-04-26 11:45:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package firmwarekit # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,46 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: firmwarekit -BuildRequires: bash coreutils dhcp-client findutils gawk gdb glib2-devel -BuildRequires: grep iproute2 module-init-tools ncurses-devel newt newt-devel -BuildRequires: perl pkgconfig sed sharutils slang-devel sysvinit -BuildRequires: acpica dmidecode -BuildRequires: termcap util-linux wget xorg-x11-util-devel +BuildRequires: acpica +BuildRequires: bash +BuildRequires: coreutils +BuildRequires: dhcp-client +BuildRequires: dmidecode +BuildRequires: findutils +BuildRequires: gawk +BuildRequires: gdb +BuildRequires: glib2-devel +BuildRequires: grep +BuildRequires: iproute2 +BuildRequires: module-init-tools +BuildRequires: ncurses-devel +BuildRequires: newt +BuildRequires: newt-devel +BuildRequires: perl +BuildRequires: pkgconfig +BuildRequires: sed +BuildRequires: sharutils +BuildRequires: slang-devel +BuildRequires: termcap +BuildRequires: util-linux +BuildRequires: wget +BuildRequires: xorg-x11-util-devel Url: http://www.linuxfirmwarekit.org Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines -Version: 3 -Release: 45 License: LGPL-2.1+ Group: System/Boot -AutoReqProv: on +Version: 3 +Release: 0 PreReq: gzip -Requires: acpica dmidecode -Requires: hwinfo util-linux powertop +Requires: acpica +Requires: dmidecode +Requires: hwinfo +Requires: powertop +Requires: util-linux Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines +Group: System/Boot BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 Source0: %{name}-r%{version}.tar.bz2 @@ -61,12 +81,6 @@ related bugs. If you have an ACPI error/warning, run this tool and provide output for bug tracking information - - -Authors: --------- - Intel - %prep %setup -q -n linuxfirmwarekit %patch0 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2014-04-26 11:45:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2014-04-13 13:13:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2014-04-26 11:45:08.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 08:34:35 UTC 2014 - mfilka(a)suse.com + +- bnc#872903 + - fixed internal error (missing IsManaged method) +- 3.1.22 + +------------------------------------------------------------------- Old: ---- yast2-users-3.1.21.tar.bz2 New: ---- yast2-users-3.1.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.PWOx9u/_old 2014-04-26 11:45:09.000000000 +0200 +++ /var/tmp/diff_new_pack.PWOx9u/_new 2014-04-26 11:45:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.1.21.tar.bz2 -> yast2-users-3.1.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/package/yast2-users.changes new/yast2-users-3.1.22/package/yast2-users.changes --- old/yast2-users-3.1.21/package/yast2-users.changes 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/package/yast2-users.changes 2014-04-18 10:43:45.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 08:34:35 UTC 2014 - mfilka(a)suse.com + +- bnc#872903 + - fixed internal error (missing IsManaged method) +- 3.1.22 + +------------------------------------------------------------------- Thu Apr 4 15:06:27 UTC 2014 - ckornacker(a)suse.com - hide Kerberos passwords from process list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/package/yast2-users.spec new/yast2-users-3.1.22/package/yast2-users.spec --- old/yast2-users-3.1.21/package/yast2-users.spec 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/package/yast2-users.spec 2014-04-18 10:43:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.21/src/clients/inst_auth.rb new/yast2-users-3.1.22/src/clients/inst_auth.rb --- old/yast2-users-3.1.21/src/clients/inst_auth.rb 2014-04-07 10:42:50.000000000 +0200 +++ new/yast2-users-3.1.22/src/clients/inst_auth.rb 2014-04-18 10:43:45.000000000 +0200 @@ -69,7 +69,7 @@ Builtins.y2debug("net_devices: %1", @net_devices) @found = Ops.greater_than(Builtins.size(@net_devices), 0) || - NetworkService.IsManaged + NetworkService.is_network_manager if !@found && Builtins.size(Ldap.initial_defaults) == 0 Builtins.y2milestone( -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation-control for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-installation-control for openSUSE:Factory checked in at 2014-04-26 11:45:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old) and /work/SRC/openSUSE:Factory/.yast2-installation-control.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation-control" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes 2014-04-05 14:43:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation-control.new/yast2-installation-control.changes 2014-04-26 11:45:07.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 10:17:58 CEST 2014 - locilka(a)suse.com + +- Added software->default_patterns - patterns selected for + installation by default (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-installation-control-3.1.5.tar.bz2 New: ---- yast2-installation-control-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation-control.spec ++++++ --- /var/tmp/diff_new_pack.97P9ri/_old 2014-04-26 11:45:08.000000000 +0200 +++ /var/tmp/diff_new_pack.97P9ri/_new 2014-04-26 11:45:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-control-3.1.5.tar.bz2 -> yast2-installation-control-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/control/control.rnc new/yast2-installation-control-3.1.6/control/control.rnc --- old/yast2-installation-control-3.1.5/control/control.rnc 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/control/control.rnc 2014-04-18 10:42:40.000000000 +0200 @@ -259,6 +259,7 @@ | software_packages | kernel_packages | packages_transmogrify + | default_patterns ## Whether it is allowed to delete a package during upgrade delete_old_packages = element delete_old_packages { BOOLEAN } @@ -368,6 +369,9 @@ element package { text }+ } +## Comma and/or space-separated list of default patterns selected for installation +default_patterns = element default_patterns { text } + ## Software / Package-manager related variables software = element software { software_elements* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/control/control.rng new/yast2-installation-control-3.1.6/control/control.rng --- old/yast2-installation-control-3.1.5/control/control.rng 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/control/control.rng 2014-04-18 10:42:40.000000000 +0200 @@ -496,6 +496,7 @@ <ref name="software_packages"/> <ref name="kernel_packages"/> <ref name="packages_transmogrify"/> + <ref name="default_patterns"/> </choice> </define> <define name="delete_old_packages"> @@ -770,6 +771,12 @@ </oneOrMore> </element> </define> + <define name="default_patterns"> + <a:documentation>Comma and/or space-separated list of default patterns selected for installation</a:documentation> + <element name="default_patterns"> + <text/> + </element> + </define> <define name="software"> <a:documentation>Software / Package-manager related variables</a:documentation> <element name="software"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/package/yast2-installation-control.changes new/yast2-installation-control-3.1.6/package/yast2-installation-control.changes --- old/yast2-installation-control-3.1.5/package/yast2-installation-control.changes 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/package/yast2-installation-control.changes 2014-04-18 10:42:40.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 10:17:58 CEST 2014 - locilka(a)suse.com + +- Added software->default_patterns - patterns selected for + installation by default (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- Wed Apr 2 13:38:56 UTC 2014 - jreidinger(a)suse.com - add element for separate ssh service enablement (bnc#865056) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.5/package/yast2-installation-control.spec new/yast2-installation-control-3.1.6/package/yast2-installation-control.spec --- old/yast2-installation-control-3.1.5/package/yast2-installation-control.spec 2014-04-02 15:51:49.000000000 +0200 +++ new/yast2-installation-control-3.1.6/package/yast2-installation-control.spec 2014-04-18 10:42:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-04-26 11:45:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-04-12 21:58:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-04-26 11:45:05.000000000 +0200 @@ -1,0 +2,35 @@ +Thu Apr 17 13:56:31 UTC 2014 - werner(a)suse.de + +- Extend avoid-divide-by-zero-sigtrap.patch to make the crash + handler know about SIGTRAP and SIGSYS + +------------------------------------------------------------------- +Thu Apr 17 13:37:06 UTC 2014 - werner(a)suse.de + +- Add avoid-divide-by-zero-sigtrap.patch which fixes bnc#867663 + that is a divide by zero on a jobless system + +------------------------------------------------------------------- +Wed Apr 16 10:17:13 UTC 2014 - werner(a)suse.de + +- Use latest regenerate-initrd rpm macros (fate#313506) +- Add rescue-emergency-target-conflicts.patch to avoid that + emergency and rescue sulogin are fighting on console + +------------------------------------------------------------------- +Tue Apr 15 12:19:24 UTC 2014 - werner(a)suse.de + +- Modify systemd-sleep-grub to let hybrid-sleep.target work even + on XEN, changes from Thomas Blume (bnc#873432) + +------------------------------------------------------------------- +Mon Apr 14 13:55:36 UTC 2014 - werner(a)suse.de + +- Add backported upstream patch + 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +- Add patch systemd-detect-xendom.patch from Thomas Blume + to be able to detect XEN dom0 as well as domU +- systemd conflicts with sysvinit, ven if the package systemd-sysvinit + does already conflict with sysvinit-init (bnc#873444) + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch avoid-divide-by-zero-sigtrap.patch rescue-emergency-target-conflicts.patch systemd-detect-xendom.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -45,6 +45,7 @@ BuildRequires: binutils-gold %endif %endif +BuildRequires: config(suse-module-tools) %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets %endif @@ -104,6 +105,9 @@ %endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) +%if 0%{?suse_version} > 1310 +Conflicts: sysvinit +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs @@ -375,6 +379,14 @@ Patch193: portmap-wants-rpcbind-socket.patch # PATCH-FIX-USTREAM added at 2014/03/11 Patch194: 0007-dbus-suppress-duplicate-and-misleading-messages.patch +# PATCH-FIX-USTREAM added at 2014/03/14 +Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +# PATCH-FIX-SUSE Detect XEN dom0 as well as domU +Patch196: systemd-detect-xendom.patch +# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console +Patch197: rescue-emergency-target-conflicts.patch +# PATCH-FIX-SUSE Avoid a divide by zero sigtrap +Patch198: avoid-divide-by-zero-sigtrap.patch # UDEV PATCHES # ============ @@ -463,6 +475,17 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} +Requires(post): sed +Requires(post): systemd +%if %{defined regenerate_initrd_post} +Requires(post): coreutils +Requires(postun): coreutils +Requires(posttrans): suse-module-tools +Requires(posttrans): /sbin/mkinitrd +%else +Requires(post): /sbin/mkinitrd +Requires(postun): /sbin/mkinitrd +%endif Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 @@ -737,6 +760,10 @@ %patch192 -p1 %patch193 -p1 %patch194 -p0 +%patch195 -p0 +%patch196 -p1 +%patch197 -p1 +%patch198 -p1 # udev patches %patch1001 -p1 @@ -1121,9 +1148,14 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi @@ -1135,12 +1167,22 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi +%if %{defined regenerate_initrd_post} +%posttrans -n %{udevpkgname} +%regenerate_initrd_posttrans +%endif + %post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig %postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -40,6 +40,7 @@ BuildRequires: binutils-gold %endif %endif +BuildRequires: config(suse-module-tools) %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets %endif @@ -99,6 +100,9 @@ %endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) +%if 0%{?suse_version} > 1310 +Conflicts: sysvinit +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs @@ -370,6 +374,14 @@ Patch193: portmap-wants-rpcbind-socket.patch # PATCH-FIX-USTREAM added at 2014/03/11 Patch194: 0007-dbus-suppress-duplicate-and-misleading-messages.patch +# PATCH-FIX-USTREAM added at 2014/03/14 +Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch +# PATCH-FIX-SUSE Detect XEN dom0 as well as domU +Patch196: systemd-detect-xendom.patch +# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console +Patch197: rescue-emergency-target-conflicts.patch +# PATCH-FIX-SUSE Avoid a divide by zero sigtrap +Patch198: avoid-divide-by-zero-sigtrap.patch # UDEV PATCHES # ============ @@ -458,6 +470,17 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} +Requires(post): sed +Requires(post): systemd +%if %{defined regenerate_initrd_post} +Requires(post): coreutils +Requires(postun): coreutils +Requires(posttrans): suse-module-tools +Requires(posttrans): /sbin/mkinitrd +%else +Requires(post): /sbin/mkinitrd +Requires(postun): /sbin/mkinitrd +%endif Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 @@ -732,6 +755,10 @@ %patch192 -p1 %patch193 -p1 %patch194 -p0 +%patch195 -p0 +%patch196 -p1 +%patch197 -p1 +%patch198 -p1 # udev patches %patch1001 -p1 @@ -1116,9 +1143,14 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi @@ -1130,12 +1162,22 @@ if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then echo "Skipping recreation of existing initial ramdisks, due" echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend" +%if %{defined regenerate_initrd_post} + else + %regenerate_initrd_post +%else elif [ -x /sbin/mkinitrd ]; then [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup /sbin/mkinitrd || : +%endif fi fi +%if %{defined regenerate_initrd_post} +%posttrans -n %{udevpkgname} +%regenerate_initrd_posttrans +%endif + %post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig %postun -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig ++++++ 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch ++++++ Based on b2103dccb354de3f38c49c14ccb637bdf665e40f Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Sat, 5 Apr 2014 13:59:01 -0400 Subject: [PATCH] reduce the amount of messages logged to /dev/kmsg when "debug" is specified --- src/core/main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- src/core/main.c +++ src/core/main.c 2014-04-14 13:50:48.490814738 +0000 @@ -412,12 +412,8 @@ static int parse_proc_cmdline_word(const if (arg_show_status == _SHOW_STATUS_UNSET) arg_show_status = SHOW_STATUS_AUTO; } else if (streq(word, "debug")) { - /* Log to kmsg, the journal socket will fill up before the - * journal is started and tools running during that time - * will block with every log message for for 60 seconds, - * before they give up. */ - log_set_max_level(LOG_DEBUG); - log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_KMSG); + if (detect_container(NULL) > 0) + log_set_target(LOG_TARGET_CONSOLE); } else if (!in_initrd()) { unsigned i; ++++++ avoid-divide-by-zero-sigtrap.patch ++++++ Nasty bug reported on bnc#867663 --- systemd-210/src/core/manager.c +++ systemd-210/src/core/manager.c 2014-04-17 13:29:07.366236714 +0000 @@ -1780,7 +1780,8 @@ static int manager_dispatch_jobs_in_prog assert(m); assert(source); - manager_print_jobs_in_progress(m); + if (m->n_running_jobs > 0) + manager_print_jobs_in_progress(m); next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC; r = sd_event_source_set_time(source, next); --- systemd-210/src/shared/def.h +++ systemd-210/src/shared/def.h 2014-04-17 13:47:10.946234983 +0000 @@ -37,7 +37,7 @@ #define SYSTEMD_CGROUP_CONTROLLER "name=systemd" -#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT +#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT,SIGTRAP,SIGSYS #define SIGNALS_IGNORE SIGPIPE #define DIGITS "0123456789" ++++++ rescue-emergency-target-conflicts.patch ++++++ --- systemd-210/units/emergency.target +++ systemd-210/units/emergency.target 2014-04-15 11:11:18.618235831 +0000 @@ -10,4 +10,5 @@ Description=Emergency Mode Documentation=man:systemd.special(7) Requires=emergency.service After=emergency.service +Conflicts=getty.target rescue.target AllowIsolate=yes --- systemd-210/units/rescue.target +++ systemd-210/units/rescue.target 2014-04-15 11:14:40.606808928 +0000 @@ -10,7 +10,8 @@ Description=Rescue Mode Documentation=man:systemd.special(7) Requires=sysinit.target rescue.service After=sysinit.target rescue.service -Conflicts=getty.target +Conflicts=getty.target emergency.target +Before=emergency.target AllowIsolate=yes [Install] ++++++ systemd-detect-xendom.patch ++++++ diff -Naur systemd-210/src/shared/virt.c systemd-210-mod/src/shared/virt.c --- systemd-210/src/shared/virt.c 2014-02-24 15:38:03.909784909 +0100 +++ systemd-210/src/shared/virt.c 2014-04-10 13:48:05.568766957 +0200 @@ -149,7 +149,7 @@ /* Returns a short identifier for the various VM implementations */ int detect_vm(const char **id) { - _cleanup_free_ char *hvtype = NULL, *cpuinfo_contents = NULL; + _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL; static thread_local int cached_found = -1; static thread_local const char *cached_id = NULL; const char *_id = NULL; @@ -166,13 +166,18 @@ /* Try high-level hypervisor sysfs file first: * * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */ - r = read_one_line_file("/sys/hypervisor/type", &hvtype); + r = read_one_line_file("/proc/xen/capabilities", &domcap); if (r >= 0) { - if (streq(hvtype, "xen")) { - _id = "xen"; + if (strstr(domcap, "control_d")) { + r = 0; + _id = "xen-dom0"; + } else { r = 1; - goto finish; + _id = "xen-domU"; } + + goto finish; + } else if (r != -ENOENT) return r; ++++++ systemd-sleep-grub ++++++ --- /var/tmp/diff_new_pack.VDrpn2/_old 2014-04-26 11:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VDrpn2/_new 2014-04-26 11:45:07.000000000 +0200 @@ -50,10 +50,10 @@ fi ;; - linux*noresume*) + linux*noresume*|module*xen*noresume*) echo " Skipping grub entry #${J}, because it has the noresume option" >&2 ;; - linux*root=*) + linux*root=*|module*xen*root=*) local ROOT ROOT=${LINE#*root=} DUMMY=($ROOT) @@ -77,7 +77,7 @@ # DEBUG "Found kernel entry #${I}: '${DUMMY[1]##*/}'" INFO let I++ ;; - linux*) + linux*|module*xen*) # a kernel without "root="? We better skip that one... echo " Skipping grub entry #${J}, because it has no root= option" >&2 ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2014-04-26 11:45:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2014-03-06 19:18:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-04-26 11:45:02.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 17 15:00:25 CEST 2014 - aschnell(a)suse.de + +- fixed parent of snapshot generated by rollback + +------------------------------------------------------------------- +Thu Apr 10 10:17:49 CEST 2014 - aschnell(a)suse.de + +- added rollback support (fate#317062) +- version 0.2.2 + +------------------------------------------------------------------- +Thu Apr 03 17:49:12 CEST 2014 - aschnell(a)suse.de + +- fixed execution of grub plugin (bnc#871880) + +------------------------------------------------------------------- +Tue Apr 01 20:04:33 CEST 2014 - aschnell(a)suse.de + +- allow to add snapshots subvolume to fstab (for fate#317062) + +------------------------------------------------------------------- @@ -30 +51 @@ -- 0.2.1 +- version 0.2.1 @@ -37 +58 @@ -- 0.2.0 +- version 0.2.0 @@ -54 +75 @@ -- 0.1.8 +- version 0.1.8 @@ -77 +98 @@ -- 0.1.7 +- version 0.1.7 @@ -88 +109 @@ -- 0.1.6 +- version 0.1.6 @@ -101 +122 @@ -- 0.1.5 +- version 0.1.5 Old: ---- snapper-0.2.1.tar.bz2 New: ---- snapper-0.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.pwTK3b/_old 2014-04-26 11:45:03.000000000 +0200 +++ /var/tmp/diff_new_pack.pwTK3b/_new 2014-04-26 11:45:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: snapper -Version: 0.2.1 +Version: 0.2.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -27,6 +27,12 @@ BuildRequires: libacl-devel BuildRequires: libtool BuildRequires: libxml2-devel +%if 0%{?suse_version} > 1230 +BuildRequires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +BuildRequires: libmount-devel >= 2.24 +%endif BuildRequires: pkg-config %if ! 0%{?mandriva_version} BuildRequires: dbus-1-devel @@ -75,6 +81,9 @@ ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} \ --docdir=%{prefix}/share/doc/packages/snapper \ +%if 0%{?suse_version} <= 1310 + --disable-rollback \ +%endif --disable-silent-rules --disable-ext4 make %{?jobs:-j%jobs} @@ -160,6 +169,12 @@ Requires: libsnapper2 = %version Requires: libstdc++-devel Requires: libxml2-devel +%if 0%{?suse_version} > 1230 +Requires: libbtrfs-devel +%endif +%if 0%{?suse_version} > 1310 +Requires: libmount-devel >= 2.24 +%endif Summary: Header files and documentation for libsnapper Group: Development/Languages/C and C++ ++++++ snapper-0.2.1.tar.bz2 -> snapper-0.2.2.tar.bz2 ++++++ ++++ 3409 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-slp for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-slp for openSUSE:Factory checked in at 2014-04-26 11:45:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slp (Old) and /work/SRC/openSUSE:Factory/.yast2-slp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slp" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slp/yast2-slp.changes 2014-03-21 12:13:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-slp.new/yast2-slp.changes 2014-04-26 11:45:01.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 16 15:13:13 UTC 2014 - vmoravec(a)suse.com + +- Correct summary and description in spec file (bnc#868453) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-slp-3.1.5.tar.bz2 New: ---- yast2-slp-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.TJptcw/_old 2014-04-26 11:45:02.000000000 +0200 +++ /var/tmp/diff_new_pack.TJptcw/_new 2014-04-26 11:45:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,14 +39,13 @@ Requires: yast2 Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - SLP Agent and Browser +Summary: YaST2 - SLP Agent and Library License: GPL-2.0+ Group: System/YaST Url: https://github.com/yast/yast-slp %description -This module enables YaST modules to register services with SLP. -Additionally, it offers a simple browser of SLP registered services. +This package provides YaST modules to lookup/advertise services with SLP. %prep %setup -n %{name}-%{version} ++++++ yast2-slp-3.1.5.tar.bz2 -> yast2-slp-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.5/package/yast2-slp.changes new/yast2-slp-3.1.6/package/yast2-slp.changes --- old/yast2-slp-3.1.5/package/yast2-slp.changes 2014-03-11 10:24:19.000000000 +0100 +++ new/yast2-slp-3.1.6/package/yast2-slp.changes 2014-04-16 16:27:35.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 16 15:13:13 UTC 2014 - vmoravec(a)suse.com + +- Correct summary and description in spec file (bnc#868453) +- 3.1.6 + +------------------------------------------------------------------- Mon Mar 10 14:13:13 UTC 2014 - vmoravec(a)suse.com - Fix dns resolution exception (bnc#867357) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.5/package/yast2-slp.spec new/yast2-slp-3.1.6/package/yast2-slp.spec --- old/yast2-slp-3.1.5/package/yast2-slp.spec 2014-03-11 10:24:19.000000000 +0100 +++ new/yast2-slp-3.1.6/package/yast2-slp.spec 2014-04-16 16:27:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,12 +34,11 @@ Requires: openslp yast2 Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - SLP Agent and Browser +Summary: YaST2 - SLP Agent and Library Url: https://github.com/yast/yast-slp %description -This module enables YaST modules to register services with SLP. -Additionally, it offers a simple browser of SLP registered services. +This package provides YaST modules to lookup/advertise services with SLP. %prep %setup -n %{name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-hardware-detection for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-hardware-detection for openSUSE:Factory checked in at 2014-04-26 11:44:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-hardware-detection (Old) and /work/SRC/openSUSE:Factory/.yast2-hardware-detection.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-hardware-detection" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-hardware-detection/yast2-hardware-detection.changes 2013-11-18 14:59:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-hardware-detection.new/yast2-hardware-detection.changes 2014-04-26 11:45:00.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 16 11:31:23 CEST 2014 - snwint(a)suse.de + +- update hardware agent to use the latest libhd flags (bnc #841170) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-hardware-detection-3.1.1.tar.bz2 New: ---- yast2-hardware-detection-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-hardware-detection.spec ++++++ --- /var/tmp/diff_new_pack.Ep8Mdf/_old 2014-04-26 11:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Ep8Mdf/_new 2014-04-26 11:45:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-hardware-detection # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-hardware-detection -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,7 +27,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool # needed for all yast packages -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # autodocs BuildRequires: doxygen # testsuite ++++++ yast2-hardware-detection-3.1.1.tar.bz2 -> yast2-hardware-detection-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/VERSION new/yast2-hardware-detection-3.1.2/VERSION --- old/yast2-hardware-detection-3.1.1/VERSION 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/agent/HwParse.cc new/yast2-hardware-detection-3.1.2/agent/HwParse.cc --- old/yast2-hardware-detection-3.1.1/agent/HwParse.cc 2013-11-04 16:09:53.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/agent/HwParse.cc 2014-04-16 11:48:36.000000000 +0200 @@ -710,6 +710,31 @@ out->add (YCPString ("hotpluggable"), YCPBoolean (true)); } + if (hd->is.dualport) + { + out->add (YCPString ("dualport"), YCPBoolean (true)); + } + + if (hd->is.fcoe) + { + out->add (YCPString ("fcoe"), YCPBoolean (true)); + } + + if (hd->is.fcoe_offload) + { + out->add (YCPString ("fcoeoffload"), YCPBoolean (true)); + } + + if (hd->is.iscsi_offload) + { + out->add (YCPString ("iscsioffload"), YCPBoolean (true)); + } + + if (hd->is.storage_only) + { + out->add (YCPString ("storageonly"), YCPBoolean (true)); + } + // hd detail if (hd->detail) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.changes new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.changes --- old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.changes 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.changes 2014-04-16 11:48:36.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 16 11:31:23 CEST 2014 - snwint(a)suse.de + +- update hardware agent to use the latest libhd flags (bnc #841170) +- 3.1.2 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger(a)suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.spec new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.spec --- old/yast2-hardware-detection-3.1.1/package/yast2-hardware-detection.spec 2013-11-15 13:26:55.000000000 +0100 +++ new/yast2-hardware-detection-3.1.2/package/yast2-hardware-detection.spec 2014-04-16 11:48:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-hardware-detection -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool # needed for all yast packages -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # autodocs BuildRequires: doxygen # testsuite -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dracut for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-04-26 11:44:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-04-12 21:33:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-04-26 11:44:58.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Apr 16 09:56:31 CEST 2014 - hare(a)suse.de + +- Enable multipath correctly during booting (bnc#873686) + Add: 0022-90multipath-Fixup-service-file-for-booting.patch + +------------------------------------------------------------------- +Mon Apr 14 14:19:49 UTC 2014 - pwieczorkiewicz(a)suse.com + +- fix-iscsi-firmware.patch: + Fix according to dracut-037 updates (iscsistarted-iscsi:). + +------------------------------------------------------------------- +Mon Apr 14 09:00:26 UTC 2014 - pwieczorkiewicz(a)suse.com + +- add_dracuts_network_params_for_iscsi.patch: + Add missing dracut's cmdline parameters to make network mandatory + and boot using iBFT when present. Without them iBFT booting does + not work. + +------------------------------------------------------------------- New: ---- 0022-90multipath-Fixup-service-file-for-booting.patch add_dracuts_network_params_for_iscsi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200 @@ -57,6 +57,8 @@ Patch31: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch Patch32: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch Patch33: 0021-90multipath-install-correct-multipath-rules.patch +Patch34: add_dracuts_network_params_for_iscsi.patch +Patch35: 0022-90multipath-Fixup-service-file-for-booting.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -118,6 +120,8 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 %build %configure\ ++++++ 0022-90multipath-Fixup-service-file-for-booting.patch ++++++ >From 10eda256afc1f1de0bffa26afdbdcf04394aeeeb Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Wed, 16 Apr 2014 09:35:28 +0200 Subject: 90multipath: Fixup service file for booting 'Type=forking' caused systemd to immediately terminate the entire process, and not creating any device maps. So we should be using 'Type=simple' here. References: bnc#873686 Signed-off-by: Hannes Reinecke <hare(a)suse.de> --- modules.d/90multipath/module-setup.sh | 4 ++-- modules.d/90multipath/multipathd.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh index 508241e..0149df9 100755 --- a/modules.d/90multipath/module-setup.sh +++ b/modules.d/90multipath/module-setup.sh @@ -92,8 +92,8 @@ install() { if dracut_module_included "systemd"; then inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service" - mkdir -p "${initdir}${systemdsystemconfdir}/sysinit.target.wants" - ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemconfdir}/sysinit.target.wants/multipathd.service" + mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants" + ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service" "${initdir}${systemdsystemunitdir}/sysinit.target.wants/multipathd.service" else inst_hook pre-trigger 02 "$moddir/multipathd.sh" inst_hook cleanup 02 "$moddir/multipathd-stop.sh" diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service index 01e497c..50a0883 100644 --- a/modules.d/90multipath/multipathd.service +++ b/modules.d/90multipath/multipathd.service @@ -5,9 +5,9 @@ DefaultDependencies=no Conflicts=shutdown.target [Service] -Type=forking +Type=simple ExecStartPre=/sbin/modprobe dm-multipath -ExecStart=/sbin/multipathd +ExecStart=/sbin/multipathd -s -d ExecReload=/sbin/multipathd reconfigure ExecStop=/sbin/multipathd shutdown -- 1.8.1.4 ++++++ add_dracuts_network_params_for_iscsi.patch ++++++ Index: dracut-037/modules.d/95iscsi/module-setup.sh =================================================================== --- dracut-037.orig/modules.d/95iscsi/module-setup.sh 2014-03-19 17:16:08.000000000 +0100 +++ dracut-037/modules.d/95iscsi/module-setup.sh 2014-04-14 13:40:02.560200357 +0200 @@ -39,6 +39,22 @@ depends() { installkernel() { local _arch=$(uname -m) + install_ibft() { + local IBFT_NICS="ethernet" + local IBFT_ROOT="/sys/firmware/ibft" + + # When iBFT is detected: + # - mark network as mandatory + # - specify firmware booting cmdline parameter + if [ -d "${IBFT_ROOT}/${IBFT_NICS}"* ]; then + echo "rd.neednet=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" + echo "rd.iscsi.firmware=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" + fi + } + + # Detect iBFT and perform mandatory steps + install_ibft + instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs iscsi_module_filter() { ++++++ fix-iscsi-firmware.patch ++++++ --- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200 @@ -8,16 +8,12 @@ modules.d/95iscsi/parse-iscsiroot.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh -index 4be9d56..ec7764e 100755 ---- a/modules.d/95iscsi/parse-iscsiroot.sh -+++ b/modules.d/95iscsi/parse-iscsiroot.sh -@@ -61,10 +61,9 @@ fi - - # iscsi_firmware does not need argument checking - if [ -n "$iscsi_firmware" ] ; then -- netroot=${netroot:-iscsi:} -+ netroot=${netroot:-iscsi} +Index: dracut-037/modules.d/95iscsi/parse-iscsiroot.sh +=================================================================== +--- dracut-037.orig/modules.d/95iscsi/parse-iscsiroot.sh 2014-03-19 17:16:08.000000000 +0100 ++++ dracut-037/modules.d/95iscsi/parse-iscsiroot.sh 2014-04-15 11:49:40.922075002 +0200 +@@ -64,7 +64,6 @@ if [ -n "$iscsi_firmware" ] ; then + netroot=${netroot:-iscsi:} modprobe -q iscsi_boot_sysfs 2>/dev/null modprobe -q iscsi_ibft - initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'" @@ -33,6 +29,3 @@ fi fi --- -1.8.1.4 - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2014-04-26 11:44:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2014-04-12 22:03:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2014-04-26 11:44:56.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 15 08:36:46 UTC 2014 - tchvatal(a)suse.com + +- Fix sorting of RC kernels to be older than first regular of the + series. Fixes bnc#827531. + +- added patches: + * grub2-use-rpmsort-for-version-sorting.patch + +------------------------------------------------------------------- New: ---- grub2-use-rpmsort-for-version-sorting.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.D2OAl1/_old 2014-04-26 11:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.D2OAl1/_new 2014-04-26 11:44:58.000000000 +0200 @@ -139,6 +139,7 @@ Patch36: 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch Patch38: grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch +Patch39: grub2-use-rpmsort-for-version-sorting.patch # Btrfs snapshot booting related patches Patch101: 0002-btrfs-add-ability-to-boot-from-subvolumes.patch Patch102: 0003-cmdline-add-envvar-loader_cmdline_append.patch @@ -329,6 +330,7 @@ %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 ++++++ grub2-use-rpmsort-for-version-sorting.patch ++++++ diff -urN grub-2.02~beta2.old/util/grub-mkconfig_lib.in grub-2.02~beta2/util/grub-mkconfig_lib.in --- grub-2.02~beta2.old/util/grub-mkconfig_lib.in 2014-04-11 15:20:42.451394845 +0200 +++ grub-2.02~beta2/util/grub-mkconfig_lib.in 2014-04-11 15:58:02.940618803 +0200 @@ -229,7 +229,7 @@ version_test_numeric_a="$version_test_numeric_b" version_test_numeric_b="$version_test_numeric_c" fi - if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then + if [ "`printf '%s\n' "$version_test_gt_a" "$version_test_gt_b" | /usr/lib/rpm/rpmsort -r | head -n1`" = "$version_test_gt_a" ] ; then return 0 else return 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ntp-client for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2014-04-26 11:44:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ntp-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2014-04-05 14:43:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2014-04-26 11:44:55.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 09:58:18 CEST 2014 - locilka(a)suse.com + +- Fixed evaluation of starting the NTP service (bnc#872389) +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.1.7.tar.bz2 New: ---- yast2-ntp-client-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.kxEHeC/_old 2014-04-26 11:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.kxEHeC/_new 2014-04-26 11:44:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.7 +Version: 3.1.8 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ ++++++ yast2-ntp-client-3.1.7.tar.bz2 -> yast2-ntp-client-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.changes 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.changes 2014-04-15 10:11:35.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 15 09:58:18 CEST 2014 - locilka(a)suse.com + +- Fixed evaluation of starting the NTP service (bnc#872389) +- 3.1.8 + +------------------------------------------------------------------- Thu Apr 3 11:52:14 UTC 2014 - jreidinger(a)suse.com - change path for ntptimeset(bnc#871367) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.7/package/yast2-ntp-client.spec 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/package/yast2-ntp-client.spec 2014-04-15 10:11:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.7 +Version: 3.1.8 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb new/yast2-ntp-client-3.1.8/src/modules/NtpClient.rb --- old/yast2-ntp-client-3.1.7/src/modules/NtpClient.rb 2014-04-03 14:25:50.000000000 +0200 +++ new/yast2-ntp-client-3.1.8/src/modules/NtpClient.rb 2014-04-15 10:11:35.000000000 +0200 @@ -870,11 +870,15 @@ Report.Error(Message.CannotAdjustService("NTP")) end - if @run_service && !@write_only && Service.Restart(@service_name) - # error report - Report.Error(_("Cannot restart the NTP daemon.")) + if @run_service + unless @write_only + # error report + Report.Error(_("Cannot restart the NTP daemon.")) unless Service.Restart(@service_name) + end + else + Service.Stop(@service_name) end - Service.Stop(@service_name) if !@run_service + if @synchronize_time SCR.Write( path(".target.string"), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yum for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yum for openSUSE:Factory checked in at 2014-04-26 11:44:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yum (Old) and /work/SRC/openSUSE:Factory/.yum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yum" Changes: -------- --- /work/SRC/openSUSE:Factory/yum/yum.changes 2014-03-15 17:35:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yum.new/yum.changes 2014-04-26 11:44:54.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 14 12:54:31 UTC 2014 - adrian(a)suse.de + +- fix "repotag" support in modifyrepo + new patch: yum-3.4.3-fix-repo-tag.patch +- include debian build descriptions, since we require this + for travis-ci testing + +------------------------------------------------------------------- New: ---- debian.changelog debian.rules debian.series debian.tar.gz yum-3.4.3-fix-repo-tag.patch yum.dsc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.HcUBhb/_old 2014-04-26 11:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HcUBhb/_new 2014-04-26 11:44:55.000000000 +0200 @@ -38,6 +38,8 @@ Patch7: %{name}-3.4.3-updatesd-dbus-conf-syntax.patch # PATCH-FIX-UPSTREAM Patch8: %{name}-3.4.3-speedup-bnc810074.patch +# PATCH-FIX-OPENSUSE +Patch9: %{name}-3.4.3-fix-repo-tag.patch BuildRequires: dbus-1 BuildRequires: intltool BuildRequires: python-devel @@ -93,10 +95,11 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 +%patch3 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Fix non-executable scripts rpmlint issue: sed -i "s|#!.*/usr/bin/python.*||" rpmUtils/{arch,__init__,miscutils,oldUtils,transaction,updates}.py ++++++ debian.changelog ++++++ yum (2011.10.10-1) unstable; urgency=low * initial debian packaging for travis -- Adrian Schroeter <adrian(a)suse.de> Tue, 11 Jun 2013 19:30:22 +0200 ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany # This file and all modifications and additions to the pristine package # are under the same license as the package itself. # # Please submit bugfixes or commens via http://bugs.opensuse.org # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 configure: configure-stamp configure-stamp: touch configure-stamp build: build-stamp build-stamp: configure-stamp touch build-stamp clean: dh $@ install: install-stamp install-stamp: dh install dh_perl dh_gencontrol -a dh_md5sums -a dh_builddeb -a touch $@ override_dh_auto_test: true override_dh_auto_install: make install DESTDIR=/.build.packages/BUILD/debian/yum cd yum && make install 'PKGDIR=$$(PYLIBDIR)/$$(PACKAGE)' DESTDIR=/.build.packages/BUILD/debian/yum cd rpmUtils && make install 'PKGDIR=$$(PYLIBDIR)/$$(PACKAGE)' DESTDIR=/.build.packages/BUILD/debian/yum binary-arch: binary-indep: install dh $@ binary: binary-arch binary-indep .PHONY: binary binary-arch binary-indep install clean build ++++++ debian.series ++++++ # Patch series file for quilt, created by quilt setup # Source: yum-3.4.3.tar.gz # Patchdir: yum-3.4.3 # yum-3.4.3-license-to-confirm.patch yum-3.4.3-suse-changelogs.patch yum-3.4.3-suse-missing-tags.patch yum-3.4.3-add-lib-cpp-file.patch yum-3.4.3-updatesd-dbus-conf-syntax.patch yum-3.4.3-speedup-bnc810074.patch yum-3.4.3-fix-repo-tag.patch ++++++ yum-3.4.3-fix-repo-tag.patch ++++++ --- a/yum/repoMDObject.py.orig 2014-04-14 16:38:41.520300670 +0000 +++ b/yum/repoMDObject.py 2014-04-14 16:40:58.680570788 +0000 @@ -187,6 +187,8 @@ class RepoMD: child_name = ns_cleanup(child.tag) if child_name == 'content': self.tags['content'].add(child.text) + if child_name == 'repo': + self.tags['repo'].add(child.text) if child_name == 'distro': cpeid = child.attrib.get('cpeid', '') distro = self.tags['distro'].setdefault(cpeid,set()) @@ -218,6 +220,8 @@ class RepoMD: print 'revision: %s' % self.revision if self.tags['content']: print 'tags content: %s' % ", ".join(sorted(self.tags['content'])) + if self.tags['repo']: + print 'tags repo: %s' % ", ".join(sorted(self.tags['repo'])) if self.tags['distro']: for distro in sorted(self.tags['distro']): print 'tags distro: %s' % distro ++++++ yum-3.4.3-suse-missing-tags.patch ++++++ --- /var/tmp/diff_new_pack.HcUBhb/_old 2014-04-26 11:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HcUBhb/_new 2014-04-26 11:44:55.000000000 +0200 @@ -1,5 +1,5 @@ ---- ./yum/mdparser.py.orig 2014-03-13 11:04:20.753615026 +0000 -+++ ./yum/mdparser.py 2014-03-13 11:04:51.698614971 +0000 +--- a/yum/mdparser.py.orig 2014-03-13 11:04:20.753615026 +0000 ++++ b/yum/mdparser.py 2014-03-13 11:04:51.698614971 +0000 @@ -155,7 +155,8 @@ class PrimaryEntry(BaseEntry): p[name] = child.text ++++++ yum.dsc ++++++ Format: 1.0 Source: yum Version: 3.4.3 Binary: yum Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all Standards-Version: 3.7.2 Build-Depends: debhelper (>= 4), python-dev, python-libxml2, python-rpm, python-urlgrabber, python-sqlitecachec -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-iscsi-client for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2014-04-26 11:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes 2014-04-13 13:13:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2014-04-26 11:44:53.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 14 12:28:33 CEST 2014 - gs(a)suse.de + +- reintroduce exception in case of socket not found + (Requires: open-iscsi is bug-fix for bnc #872049) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-3.1.5.tar.bz2 New: ---- yast2-iscsi-client-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.i9IxIp/_old 2014-04-26 11:44:54.000000000 +0200 +++ /var/tmp/diff_new_pack.i9IxIp/_new 2014-04-26 11:44:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-client-3.1.5.tar.bz2 -> yast2-iscsi-client-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.changes 2014-04-14 13:23:39.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 14 12:28:33 CEST 2014 - gs(a)suse.de + +- reintroduce exception in case of socket not found + (Requires: open-iscsi is bug-fix for bnc #872049) +- 3.1.6 + +------------------------------------------------------------------- Tue Apr 8 14:37:23 CEST 2014 - gs(a)suse.de - don't throw exception if socket not found (bnc #872049) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/package/yast2-iscsi-client.spec 2014-04-14 13:23:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.6/src/modules/IscsiClientLib.rb --- old/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb 2014-04-09 12:00:48.000000000 +0200 +++ new/yast2-iscsi-client-3.1.6/src/modules/IscsiClientLib.rb 2014-04-14 13:23:40.000000000 +0200 @@ -999,7 +999,8 @@ startIScsid else # find socket (only in installed system) - @iscsid_socket = SystemdSocket.find("iscsid") + # throw exception if socket not found + @iscsid_socket = SystemdSocket.find!("iscsid") @serviceStatus = true if Service.Status("iscsi") == 0 @socketStatus = true if iscsidSocketActive? -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-services-manager for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2014-04-26 11:44:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old) and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2014-03-21 12:14:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes 2014-04-26 11:44:52.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 10 14:31:57 UTC 2014 - vmoravec(a)suse.com + +- Add support for legacy runlevel autoyast profile and improve + profile specifications (bnc#865347) +- 3.1.12 + +------------------------------------------------------------------- Old: ---- yast2-services-manager-3.1.11.tar.bz2 New: ---- yast2-services-manager-3.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.2bLswL/_old 2014-04-26 11:44:52.000000000 +0200 +++ /var/tmp/diff_new_pack.2bLswL/_new 2014-04-26 11:44:52.000000000 +0200 @@ -24,8 +24,9 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.11 +Version: 3.1.12 Release: 0 + BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +39,7 @@ Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel +Conflicts: yast2-runlevel BuildRequires: ruby BuildRequires: update-desktop-files @@ -82,6 +84,7 @@ %dir %{yast_dir}/lib/ %{yast_dir}/lib/services-manager/ %{_prefix}/share/applications/YaST2/services-manager.desktop +%{_prefix}/share/applications/YaST2/runlevel.desktop %dir %_docdir/ %_docdir/%name/ ++++++ yast2-services-manager-3.1.11.tar.bz2 -> yast2-services-manager-3.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/README.md new/yast2-services-manager-3.1.12/README.md --- old/yast2-services-manager-3.1.11/README.md 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/README.md 2014-04-14 13:07:39.000000000 +0200 @@ -2,8 +2,59 @@ Systemd target and services configuration library for Yast -Running -======= +## Autoyast profile - sudo yast2 services-manager +### Current profile for services and default target + +```xml +<services-manager> + <default_target>multi-user</default_target> + <services> + <enable config:type="list"> + <service>postfix</service> + <service>rsyslog</service> + <service>sshd</service> + </enable> + <disable config:type="list"> + <service>libvirtd</service> + </disable> + </services> + </services-manager> +``` +### Legacy runlevel profile [DEPRECATED] + +```xml +<runlevel> + <default>3</default> + <services config:type="list"> + <service> + <service_name>sshd</service_name> + <service_status>enable</service_status> + <service_start>3</service_start> + </service> + </services> +</runlevel> +``` + +### Legacy list of services [DEPRECATED] + +```xml + <services-manager> + <default_target>multi-user</default_target> + <services config:type="list"> + <service>cron</service> + <service>postfix</service> + <service>rsyslog</service> + <service>sshd</service> + </services> + </services-manager> +``` + +## Running + +`sudo yast services-manager` + +or + +`sudo yast services` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/package/yast2-services-manager.changes new/yast2-services-manager-3.1.12/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.11/package/yast2-services-manager.changes 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/package/yast2-services-manager.changes 2014-04-14 13:07:39.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 10 14:31:57 UTC 2014 - vmoravec(a)suse.com + +- Add support for legacy runlevel autoyast profile and improve + profile specifications (bnc#865347) +- 3.1.12 + +------------------------------------------------------------------- Tue Mar 18 13:37:40 UTC 2014 - vmoravec(a)suse.com - Do not crash installation with empty services list (bnc#868614) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/package/yast2-services-manager.spec new/yast2-services-manager-3.1.12/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.11/package/yast2-services-manager.spec 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/package/yast2-services-manager.spec 2014-04-14 13:07:39.000000000 +0200 @@ -24,7 +24,8 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.11 +Version: 3.1.12 + Release: 0 BuildArch: noarch @@ -38,6 +39,7 @@ Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel +Conflicts: yast2-runlevel BuildRequires: ruby BuildRequires: update-desktop-files @@ -82,6 +84,7 @@ %dir %{yast_dir}/lib/ %{yast_dir}/lib/services-manager/ %{_prefix}/share/applications/YaST2/services-manager.desktop +%{_prefix}/share/applications/YaST2/runlevel.desktop %dir %_docdir/ %_docdir/%name/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/autoyast_rnc/services-manager.rnc new/yast2-services-manager-3.1.12/src/autoyast_rnc/services-manager.rnc --- old/yast2-services-manager-3.1.11/src/autoyast_rnc/services-manager.rnc 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/autoyast_rnc/services-manager.rnc 2014-04-14 13:07:39.000000000 +0200 @@ -2,15 +2,57 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" +# runlevel legacy schema + +runlevel_service_name = element service_name { text } +runlevel_service_status = element service_status { text } +runlevel_service_start = element service_start { text } +runlevel_service_stop = element service_stop { text } + +runlevel_service = + element service { + attribute config:type { text }? & + runlevel_service_name? & + runlevel_service_start? & + runlevel_service_stop? & + runlevel_service_status? + } + +runlevel_services = + element services { + attribute config:type { "list" }?, + runlevel_service* + } + +runlevel_default = element \default { text } + +runlevel_content = element runlevel { runlevel_default? & runlevel_services? } + +# current services-manager schema + service = element service { text } -services = element services { - attribute config:type { text }?, - service* -} +enabled = + element enabled { + attribute config:type { text }? & + service* + } + +disabled = + element disabled { + attribute config:type { text }? & + service* + } + +services = + element services { attribute config:type { text }? & enabled } | + element services { attribute config:type { text }? & disabled } | + element services { attribute config:type { text }? & service* } default_target = element default_target { text } -services-manager = element services-manager { - default_target? & services? -} +services_manager_content = default_target? & services? + +services-manager = + element services-manager { services_manager_content } | + element runlevel { runlevel_content } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/desktop/runlevel.desktop new/yast2-services-manager-3.1.12/src/desktop/runlevel.desktop --- old/yast2-services-manager-3.1.11/src/desktop/runlevel.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/desktop/runlevel.desktop 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,23 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-System; + +X-KDE-ModuleType=Library +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=services-manager +X-SuSE-YaST-AutoInstClient=services-manager_auto + +X-SuSE-YaST-Group=System +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= + +Icon=yast-runlevel +Exec=xdg-su -c "/sbin/yast2 services-manager" + +Name=Services Manager +GenericName=Configure running services and the default target +StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/lib/services-manager/services_manager_profile.rb new/yast2-services-manager-3.1.12/src/lib/services-manager/services_manager_profile.rb --- old/yast2-services-manager-3.1.11/src/lib/services-manager/services_manager_profile.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/lib/services-manager/services_manager_profile.rb 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,155 @@ +module Yast + import "Report" + + ### Supported profiles + # + # @example Extended profile with list of services to be enabled and disabled + # + # <services-manager> + # <default_target>multi-user</default_target> + # <services> + # <enable config:type="list"> + # <service>at</service> + # <service>cron</service> + # <service>nscd</service> + # <service>openct</service> + # <service>postfix</service> + # <service>rsyslog</service> + # <service>sshd</service> + # </enable> + # <disable config:type="list"> + # <service>libvirtd</service> + # </disable> + # </services> + # </services-manager> + # + # @deprecated Legacy profile with incomplete support for services + # @example Simple list of services + # Supported are only services to be enabled. This profile is missing + # services which are going to be disabled. + # + # <services-manager> + # <default_target>multi-user</default_target> + # <services config:type="list"> + # <service>cron</service> + # <service>postfix</service> + # <service>sshd</service> + # </services> + # </services-manager> + # + # @deprecated Legacy runlevel profile + # @example Runlevel profle + # + # <runlevel> + # <default>3</default> + # <services config:type="list"> + # <service> + # <service_name>sshd</service_name> + # <service_status>enable</service_status> + # <service_start>3</service_start> + # </service> + # </services> + # </runlevel> + # + ### + + class ServicesManagerProfile + include Yast::Logger + + ENABLE = 'enable' + DISABLE = 'disable' + + # Service object with two attributes: + # @attr [String] name of the service unit. Suffix '.service' is optional. + # @attr [String] required status on the target system. Can be 'enable' or 'disable'. + Service = Struct.new(:name, :status) + + # Profile data passed from autoyast, a Hash expected + # @return [Hash] + attr_reader :autoyast_profile + + # List of Service structs + # @return [Array<Service>] + attr_reader :services + + # Name of the systemd default target unit. Suffix '.target' is optional. + # @return [String] if the target has been specified in the profile. Can be nil. + attr_reader :target + + def initialize autoyast_profile + @autoyast_profile = autoyast_profile + @services = [] + extract_services + extract_target + end + + private + + def extract_services + services = autoyast_profile['services'] + return if services.nil? || services.empty? + + if services.all? {|item| item.is_a?(::String) } + load_from_simple_list(services) + elsif services.is_a?(Hash) && ( services.key?(ENABLE) || services.key?(DISABLE)) + load_from_extended_list(services) + elsif services.all? {|i| i.is_a?(Hash) && (i.key?('service_name') || i.key?('service_status')) } + load_from_runlevel_list(services) + else + Yast::Report.Error _("Unknown autoyast services profile schema for 'services-manager'") + return + end + log.info "Extracted services from autoyast profile: #{self.services}" + end + + def extract_target + if autoyast_profile.key?('default_target') + @target = autoyast_profile['default_target'] + elsif autoyast_profile.key?('default') + @target = case autoyast_profile['default'] + when "2", "3", "4" + "multi-user" + when "5" + "graphical" + when "0" + log.error "You can't set the default target to 'poweroff' in autoyast profile" + nil + when "1" + log.error "You can't set the default target to 'rescue' in autoyast profile" + nil + else + log.error "Target '#{autoyast_profile['default']}' is not valid" + nil + end + end + end + + def load_from_simple_list services + self.services.concat( + services.map {|service_name| Service.new(service_name, ENABLE)} + ) + end + + def load_from_runlevel_list services + self.services.concat( + services.map do |service| + Service.new(service['service_name'], service['service_status']) + end + ) + end + + def load_from_extended_list services + self.services.concat( + services.fetch(ENABLE, []).map do |service_name| + Service.new(service_name, ENABLE) + end + ) + + self.services.concat( + services.fetch(DISABLE, []).map do |service_name| + Service.new(service_name, DISABLE) + end + ) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager.rb new/yast2-services-manager-3.1.12/src/modules/services_manager.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager.rb 2014-04-14 13:07:39.000000000 +0200 @@ -1,4 +1,5 @@ require 'yast' +require 'services-manager/services_manager_profile' module Yast import "ServicesManagerTarget" @@ -23,8 +24,9 @@ end def import data - ServicesManagerTarget.import data[TARGET] - ServicesManagerService.import data[SERVICES] + profile = ServicesManagerProfile.new(data) + ServicesManagerTarget.import(profile) + ServicesManagerService.import(profile) end def reset diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager_service.rb new/yast2-services-manager-3.1.12/src/modules/services_manager_service.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager_service.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager_service.rb 2014-04-14 13:07:39.000000000 +0200 @@ -233,23 +233,23 @@ exported_services.keys end - def import imported_services=[] - if imported_services.nil? || imported_services.empty? - Builtins.y2error("No services for import provided.") - return false - end - Builtins.y2milestone("Imported services: #{imported_services}") + def import profile + Builtins.y2milestone("List of services from autoyast profile: #{profile.services.map(&:name)}") non_existent_services = [] - # All imported will be enabled - imported_services.each do |service| - if exists?(service) - enable(service) + profile.services.each do |service| + case service.status + when 'enable' + exists?(service.name) ? enable(service.name) : non_existent_services << service.name + when 'disable' + exists?(service.name) ? disable(service.name) : non_existent_services << service.name else - non_existent_services << service - Builtins.y2error("Service '#{service}' doesn't exist on this system") + Builtins.y2error("Unknown status '#{service.status}' for service '#{service.name}'") end end - non_existent_services.empty? + return true if non_existent_services.empty? + + Builtins.y2error("Services #{non_existent_services.inspect} don't exist on this system") + false end # Saves the current configuration in memory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/src/modules/services_manager_target.rb new/yast2-services-manager-3.1.12/src/modules/services_manager_target.rb --- old/yast2-services-manager-3.1.11/src/modules/services_manager_target.rb 2014-03-18 14:51:41.000000000 +0100 +++ new/yast2-services-manager-3.1.12/src/modules/services_manager_target.rb 2014-04-14 13:07:39.000000000 +0200 @@ -65,12 +65,9 @@ default_target end - def import new_target - if new_target.to_s.empty? - Builtins.y2error("New default target not provided") - return - end - self.default_target = new_target + def import profile + return false if profile.target.nil? || profile.target.empty? + self.default_target = profile.target end def inspect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.11/test/services_manager_profile_test.rb new/yast2-services-manager-3.1.12/test/services_manager_profile_test.rb --- old/yast2-services-manager-3.1.11/test/services_manager_profile_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.12/test/services_manager_profile_test.rb 2014-04-14 13:07:39.000000000 +0200 @@ -0,0 +1,142 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" + +require 'services-manager/services_manager_profile' + +module Yast + describe ServicesManagerProfile do + attr_reader :profile, :autoyast_profile + + context "legacy runlevel autoyast profile" do + before do + @autoyast_profile = { + 'default' => '3', + 'services' => [ + { + 'service_name' => 'sshd', + 'service_status' => 'enable', + 'service_start' => '3' + }, + { + 'service_name' => 'libvirt', + 'service_status' => 'disable', + 'service_start' => '5' + }, + ] + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object with services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(2) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides collection of services to be disabled" do + service = profile.services.find {|s| s.name == 'libvirt'} + expect(service).not_to be_nil + expect(service.status).to eq('disable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('multi-user') + end + end + + context "simplified services profile" do + before do + @autoyast_profile = { + 'default_target'=>'graphical', + 'services' => [ 'sshd', 'iscsi' ] + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object that provides services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(2) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('graphical') + end + end + + context "extended services autoyast profile" do + before do + @autoyast_profile = { + 'default_target' => 'multi-user', + 'services' => { + 'enable' => ['sshd', 'iscsi' ], + 'disable' => ['nginx', 'libvirt'] + } + } + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "returns profile object that provides services collection" do + expect(profile.services).not_to be_empty + expect(profile.services.size).to eq(4) + end + + it "provides the original data from autoyast" do + expect(profile.autoyast_profile).to equal(autoyast_profile) + end + + it "provides collection of services to be disabled" do + service = profile.services.find {|s| s.name == 'nginx'} + expect(service).not_to be_nil + expect(service.status).to eq('disable') + end + + it "provides collection of services to be enabled" do + service = profile.services.find {|s| s.name == 'sshd'} + expect(service).not_to be_nil + expect(service.status).to eq('enable') + end + + it "provides default target" do + expect(profile.target).not_to be_empty + expect(profile.target).to eq('multi-user') + end + end + + context "missing services and target entries in profile" do + before do + @autoyast_profile = {} + @profile = ServicesManagerProfile.new(autoyast_profile) + end + + it "provides not target information" do + expect(profile.target).to be_nil + end + + it "provides empty list of services" do + expect(profile.services).to be_empty + end + end + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-plugins-good for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package gstreamer-plugins-good for openSUSE:Factory checked in at 2014-04-26 11:04:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-good (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-good" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-good/gstreamer-plugins-good.changes 2014-02-21 14:25:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-good.new/gstreamer-plugins-good.changes 2014-04-26 11:04:40.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 25 11:40:04 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 1.2.4: + + Bugs fixed: bgo#725104, bgo#722185, bgo#724619, bgo#725124, + bgo#725712, bgo#725860, bgo#726777, bgo#728017, bgo#728041, + bgo#724638, bgo#727329. +- Drop gsp-docs-fix-mismatched-para-tags.patch and + gsp-docs-use-docbook-markup-for-xi:include.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- gsp-docs-fix-mismatched-para-tags.patch gsp-docs-use-docbook-markup-for-xi:include.patch gst-plugins-good-1.2.3.tar.xz New: ---- gst-plugins-good-1.2.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-good.spec ++++++ --- /var/tmp/diff_new_pack.AVF2Ds/_old 2014-04-26 11:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.AVF2Ds/_new 2014-04-26 11:04:40.000000000 +0200 @@ -22,24 +22,20 @@ Name: gstreamer-plugins-good %define _name gst-plugins-good -Version: 1.2.3 +Version: 1.2.4 Release: 0 %define gst_branch 1.0 Summary: GStreamer Streaming-Media Framework Plug-Ins License: LGPL-2.1+ Group: Productivity/Multimedia/Other Url: http://gstreamer.freedesktop.org/ -Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/%{_name}-%{version}.t… -# PATCH-FIX-UPSTREAM gsp-docs-fix-mismatched-para-tags.patch bgo#724085 zaitor(a)opensuse.org -- docs: fix mismatched para tags, newer gtkdoc is more sensitive to mismatched docbook tags. -Patch0: gsp-docs-fix-mismatched-para-tags.patch -# PATCH-FIX-UPSTREAM gsp-docs-use-docbook-markup-for-xi:include.patch zaitor(a)opensuse.org -- docs: use docbook markup for xi:include It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in CDATA break xi:inlcude examples. -Patch1: gsp-docs-use-docbook-markup-for-xi:include.patch +Source0: http://download.gnome.org/sources/gst-plugins-good/1.2/%{_name}-%{version}.… %if 0%{?ENABLE_AALIB} BuildRequires: aalib-devel %endif BuildRequires: gcc-c++ BuildRequires: glib2-devel >= 2.31.14 -BuildRequires: gstreamer-devel >= 1.2.0 +BuildRequires: gstreamer-devel >= 1.2.4 BuildRequires: gstreamer-plugins-base-devel >= 1.2.1 BuildRequires: gtk-doc >= 1.12 BuildRequires: libICE-devel @@ -119,8 +115,6 @@ chmod 0644 %{S:0} %setup -q -n %{_name}-%{version} translation-update-upstream po gst-plugins-good-%{gst_branch} -%patch0 -p1 -%patch1 -p1 %build # FIXME: ++++++ gst-plugins-good-1.2.3.tar.xz -> gst-plugins-good-1.2.4.tar.xz ++++++ ++++ 5145 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wt for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package wt for openSUSE:Factory checked in at 2014-04-26 10:12:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wt (Old) and /work/SRC/openSUSE:Factory/.wt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wt" Changes: -------- --- /work/SRC/openSUSE:Factory/wt/wt.changes 2012-02-20 16:19:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wt.new/wt.changes 2014-04-26 10:12:10.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Apr 14 07:17:02 UTC 2014 - dap.darkness(a)gmail.com + +- Added _constraints file to prevent out of memory issue. + +------------------------------------------------------------------- +Thu Apr 3 17:17:02 UTC 2014 - dap.darkness(a)gmail.com + +- Update to 3.3.2: + * WRasterImage: now also support skia as backend. + * Namespace Wt::Signals was created. + * Checkboxes are rendered when CheckStateRole is present. + * Client SSL certificates can be queried from WResources. + * Fixed regression in resource continations. + * Added binary WebGL VBO buffers. + * Layouts: various bug fixes and improvements. + * Render: added support for repeating table headers. + * Render: added support for explicit page breaks and % widths. + * Fix popup widgets confusing preferred size calculations. + * New API for payment with an implementation for PayPal. + * layouts: fix various issues. + * WTextEdit: fix behaviour inside a WPanel. + * Render: code reorganizations for java port. + * QueryModel: added stableResultRow() method. + * Dbo/Exception: add support for SQLSTATE code information. + * Mail/Client: log configuration that will be used on first use. + * WAnchor: use <a> tag even if no link has been provided. + * WDoubleSpinBox: fix formatting. + * WSlider: add more hooks for custom styles. +- Added SourceUrl. +- doxygen, firebird-devel, libharu-devel and pango-devel + became required to build because of cmake warnings. +- Rpm_opt_flags became set via cmake option. +- DWT_CMAKE_FINDER_INSTALL_DIR cmake option became broken + and was replaced by manual file moving. +- DBUILD_EXAMPLES cmake option was enabled + because of FIXME comment at spec-file. +- DENABLE_EXT cmake option was enabled + to satisfy leechcraft requirements. +- Don't package INSTALL file. +- RPM_BUILD_ROOT macro was replaced by buildroot. +- Let make be verbose: V=1. + +------------------------------------------------------------------- Old: ---- wt-3.2.0.tar.bz2 New: ---- _constraints wt-3.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wt.spec ++++++ --- /var/tmp/diff_new_pack.OuLLdm/_old 2014-04-26 10:12:11.000000000 +0200 +++ /var/tmp/diff_new_pack.OuLLdm/_new 2014-04-26 10:12:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,40 @@ # - Name: wt -Url: http://www.webtoolkit.eu/wt/ +Version: 3.3.2 +Release: 0 +Summary: Web Toolkit License: GPL-2.0 Group: Development/Libraries/C and C++ -Version: 3.2.0 -Release: 1 -Summary: Web Toolkit -Source0: %{name}-%{version}.tar.bz2 -Requires: FastCGI openssl -BuildRequires: gcc-c++ -BuildRequires: FastCGI-devel openssl-devel +Url: http://www.webtoolkit.eu/wt/ +Source0: https://downloads.sourceforge.net/project/witty/wt/%{version}/wt-%{version}… +BuildRequires: FastCGI-devel +%if 0%{?suse_version} < 1220 +BuildRequires: Mesa-devel +%endif # wt will build with boost-devel < 1.36.0 but it won't work BuildRequires: boost-devel >= 1.36.0 - -BuildRequires: graphviz postgresql-devel -BuildRequires: cmake libqt4-devel pkgconfig +BuildRequires: cmake +BuildRequires: doxygen BuildRequires: fdupes +%if 0%{?suse_version} >= 1220 +BuildRequires: firebird-devel +%endif +BuildRequires: gcc-c++ +BuildRequires: graphviz +%if 0%{?suse_version} >= 1230 +BuildRequires: libharu-devel +%endif +BuildRequires: libqt4-devel +BuildRequires: openssl-devel +BuildRequires: pango-devel +BuildRequires: pkgconfig +BuildRequires: postgresql-devel + +Requires: FastCGI +Requires: openssl BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,10 +64,12 @@ %package devel Summary: Web Toolkit - Development Files Group: Development/Libraries/C and C++ -Requires: FastCGI-devel openssl-devel Xerces-c-devel +Requires: %{name} = %{version} +Requires: FastCGI-devel +Requires: Xerces-c-devel Requires: boost-devel >= 1.34.1 Requires: mxml-devel >= 2.3 -Requires: %{name} = %{version} +Requires: openssl-devel %description devel Development files for the Wt library. @@ -93,47 +110,54 @@ %define WTRUNGROUP www mkdir wt-build cd wt-build -CFLAGS=$RPM_OPT_FLAGS CXXFLAGS="$RPM_OPT_FLAGS" \ cmake .. \ + -DCMAKE_C_FLAGS="%{optflags}" \ + -DCMAKE_CXX_FLAGS="%{optflags}" \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake/Modules" \ -DLIB_INSTALL_DIR=%{_lib} \ -DCONNECTOR_HTTP=ON \ -DCONNECTOR_FCGI=ON \ +%if 0%{?suse_version} < 1220 + -DWT_NO_BOOST_RANDOM=ON \ +%endif + -DENABLE_EXT=True \ -DWEBGROUP="%{WTRUNGROUP}" -DWEBUSER="%{WTRUNUSER}" \ -DRUNDIR="%{WTRUNDIR}" \ - -DBUILD_EXAMPLES=OFF -# FIXME: Examples are temporarily disabled to avoid a boost bug that produces -# some errors while compiling the tests. -make %{?_smp_mflags} + -DBUILD_EXAMPLES=ON +make V=1 %{?_smp_mflags} %install cd wt-build -make DESTDIR="$RPM_BUILD_ROOT" install +make V=1 DESTDIR="%{buildroot}" install # hack for broken cmake configs on archs with /lib64 %ifarch ppc64 s390x -mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT/usr/%{_lib} || true -rm -Rf $RPM_BUILD_ROOT/usr/lib +mv %{buildroot}/usr/lib/* %{buildroot}/usr/%{_lib} || true +rm -Rf %{buildroot}/usr/lib %endif # end hack -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name} -mkdir -p $RPM_BUILD_ROOT/%{WTSRVDIR} -mkdir -p $RPM_BUILD_ROOT/%{WTRUNDIR} -mkdir $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/ -cp -rv ../doc/* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/ -mv -v $RPM_BUILD_ROOT/%{_datadir}/Wt $RPM_BUILD_ROOT/%{_datadir}/wt +mkdir -p %{buildroot}/%{_docdir}/%{name} +mkdir -p %{buildroot}/%{WTSRVDIR} +mkdir -p %{buildroot}/%{WTRUNDIR} +mkdir %{buildroot}/%{_docdir}/%{name}-devel/ +cp -rv ../doc/* %{buildroot}/%{_docdir}/%{name}-devel/ +mv -v %{buildroot}/%{_datadir}/Wt %{buildroot}/%{_datadir}/wt # We mustn't package .orig files -find $RPM_BUILD_ROOT/%{_includedir}/Wt -name '*.orig' -delete +find %{buildroot}/%{_includedir}/Wt -name '*.orig' -delete # Remove the installdox script used for the installation of documentation. -rm $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel/reference/html/installdox +rm %{buildroot}/%{_docdir}/%{name}-devel/examples/html/installdox # Remove shell scripts used for generating some images. -rm $RPM_BUILD_ROOT/%{_datadir}/wt/resources/themes/*/*/generate.sh +rm %{buildroot}/%{_datadir}/wt/resources/themes/*/*/generate.sh + +# Move cmake module to the correct location. +install -v -m 0755 -d %{buildroot}/%{_datadir}/cmake/Modules +mv -v %{buildroot}/%{_prefix}/cmake/*.cmake \ + %{buildroot}/%{_datadir}/cmake/Modules -%fdupes $RPM_BUILD_ROOT/%{_docdir} -%fdupes $RPM_BUILD_ROOT/%{_datadir} +%fdupes %{buildroot}/%{_docdir} +%fdupes %{buildroot}/%{_datadir} %post -p /sbin/ldconfig @@ -142,11 +166,11 @@ %files %defattr(-,root,root) %{_libdir}/*.so.%{version} -%doc Changelog INSTALL LICENSE +%doc Changelog LICENSE %dir %{WTSRVDIR} -%dir /etc/wt +%dir %{_sysconfdir}/wt %{_datadir}/wt -%config(noreplace) /etc/wt/wt_config.xml +%config(noreplace) %{_sysconfdir}/wt/wt_config.xml %attr(-,%{WTRUNUSER},%{WTRUNGROUP}) %{WTRUNDIR} %files devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ulogd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2014-04-26 10:12:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ulogd" Changes: -------- --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2013-11-30 16:23:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2014-04-26 10:12:01.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 18 12:37:59 UTC 2014 - jengelh(a)inai.de + +- Update to new upstream release 2.0.4 +* ulogd 2.0.4 features a new JSON output plugin allowing easy + integration with log management systems. + +------------------------------------------------------------------- Old: ---- ulogd-2.0.3.tar.bz2 ulogd-2.0.3.tar.bz2.sig New: ---- ulogd-2.0.4.tar.bz2 ulogd-2.0.4.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd.spec ++++++ --- /var/tmp/diff_new_pack.gOnGYj/_old 2014-04-26 10:12:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gOnGYj/_new 2014-04-26 10:12:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ulogd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ulogd -Version: 2.0.3 +Version: 2.0.4 Release: 0 Summary: Userspace logging for Netfilter License: GPL-2.0 @@ -125,13 +125,13 @@ mkdir -p "$b/var/log/ulogd"; mkdir -p "$b/%_sysconfdir"; install -pm0644 ulogd.conf "$b/%_sysconfdir/"; -mkdir -p "$b/%_initrddir" "$b/%_sbindir"; -install -pm0755 "%{S:3}" "$b/%_initrddir/%name"; -ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; - %if 0%{?_unitdir:1} mkdir -p "$b/%_unitdir"; install -pm0644 "%{S:4}" "$b/%_unitdir"; +%else +mkdir -p "$b/%_initrddir" "$b/%_sbindir"; +install -pm0755 "%{S:3}" "$b/%_initrddir/%name"; +ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; %endif %pre @@ -141,16 +141,13 @@ %service_add_pre ulogd.service %endif -%post %if 0%{?_unitdir:1} +%post %service_add_post ulogd.service %endif -%preun -%if 0%{?suse_version} -%stop_on_removal ulogd -%endif %if 0%{?_unitdir:1} +%preun %service_del_preun ulogd.service %endif @@ -165,9 +162,7 @@ %files %defattr(-,root,root) %config(noreplace) %_sysconfdir/ulogd.conf -%_initddir/%name %_sbindir/ulogd -%_sbindir/rc%name %dir %_libdir/%name %_libdir/%name/ulogd_[fir]*.so* %_libdir/%name/ulogd_output_GRAPHITE.so* @@ -181,6 +176,9 @@ %attr(0750,ulogd,root) /var/log/ulogd %if 0%{?_unitdir:1} %_unitdir/ulogd.service +%else +%_initddir/%name +%_sbindir/rc%name %endif # These are the dependency-heavy things: ++++++ ulogd-2.0.3.tar.bz2 -> ulogd-2.0.4.tar.bz2 ++++++ ++++ 1862 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/build-aux/missing new/ulogd-2.0.4/build-aux/missing --- old/ulogd-2.0.3/build-aux/missing 2013-11-19 19:32:15.000000000 +0100 +++ new/ulogd-2.0.4/build-aux/missing 2014-03-23 16:39:32.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/config.h.in new/ulogd-2.0.4/config.h.in --- old/ulogd-2.0.3/config.h.in 2013-11-19 19:32:15.000000000 +0100 +++ new/ulogd-2.0.4/config.h.in 2014-03-23 16:39:31.000000000 +0100 @@ -34,9 +34,6 @@ /* Define to 1 if you have the `pq' library (-lpq). */ #undef HAVE_LIBPQ -/* Define to 1 if you have the `pthread' library (-lpthread). */ -#undef HAVE_LIBPTHREAD - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/configure.ac new/ulogd-2.0.4/configure.ac --- old/ulogd-2.0.3/configure.ac 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/configure.ac 2014-03-23 16:30:50.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([ulogd], [2.0.3]) +AC_INIT([ulogd], [2.0.4]) AC_PREREQ([2.50]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-bzip2 1.10b]) @@ -39,7 +39,8 @@ regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter" AC_SUBST([regular_CFLAGS]) -AC_CHECK_LIB(pthread, pthread_create) +AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""]) +AC_SUBST([libpthread_LIBS]) dnl Check for the right nfnetlink version PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) @@ -116,6 +117,17 @@ enable_pcap="no" fi +AC_ARG_WITH([jansson], AS_HELP_STRING([--without-jansson], [Build without JSON output plugin [default=test]])) +AS_IF([test "x$with_jansson" != "xno"], [ + PKG_CHECK_MODULES([libjansson], [jansson], [], [:]) +]) +AM_CONDITIONAL([HAVE_JANSSON], [test -n "$libjansson_LIBS"]) +if test "x$libjansson_LIBS" != "x"; then + enable_jansson="yes" +else + enable_jansson="no" +fi + dnl AC_SUBST(DATABASE_DIR) dnl AC_SUBST(DATABASE_LIB) dnl AC_SUBST(DATABASE_LIB_DIR) @@ -151,5 +163,6 @@ MySQL plugin: ${enable_mysql} SQLITE3 plugin: ${enable_sqlite3} DBI plugin: ${enable_dbi} + JSON plugin: ${enable_jansson} " echo "You can now run 'make' and 'make install'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c new/ulogd-2.0.4/filter/raw2packet/ulogd_raw2packet_BASE.c --- old/ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/filter/raw2packet/ulogd_raw2packet_BASE.c 2014-03-23 16:30:50.000000000 +0100 @@ -259,6 +259,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_tcpSourcePort, }, + .cim_name = "src_port", }, [KEY_TCP_DPORT] = { .type = ULOGD_RET_UINT16, @@ -268,6 +269,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_tcpDestinationPort, }, + .cim_name = "dest_port", }, [KEY_TCP_SEQ] = { .type = ULOGD_RET_UINT32, @@ -368,6 +370,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_udpSourcePort, }, + .cim_name = "src_port", }, [KEY_UDP_DPORT] = { .type = ULOGD_RET_UINT16, @@ -377,6 +380,7 @@ .vendor = IPFIX_VENDOR_IETF, .field_id = IPFIX_udpDestinationPort, }, + .cim_name = "dest_port", }, [KEY_UDP_LEN] = { .type = ULOGD_RET_UINT16, @@ -512,12 +516,14 @@ [KEY_SCTP_SPORT] = { .type = ULOGD_RET_UINT16, .flags = ULOGD_RETF_NONE, - .name = "sctp.sport", + .name = "sctp.sport", + .cim_name = "src_port", }, [KEY_SCTP_DPORT] = { .type = ULOGD_RET_UINT16, .flags = ULOGD_RETF_NONE, - .name = "sctp.dport", + .name = "sctp.dport", + .cim_name = "dest_port", }, [KEY_SCTP_CSUM] = { .type = ULOGD_RET_UINT32, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/filter/ulogd_filter_IP2STR.c new/ulogd-2.0.4/filter/ulogd_filter_IP2STR.c --- old/ulogd-2.0.3/filter/ulogd_filter_IP2STR.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/filter/ulogd_filter_IP2STR.c 2014-03-23 16:30:50.000000000 +0100 @@ -102,18 +102,22 @@ { .type = ULOGD_RET_STRING, .name = "ip.saddr.str", + .cim_name = "src_ip", }, { .type = ULOGD_RET_STRING, .name = "ip.daddr.str", + .cim_name = "dest_ip", }, { .type = ULOGD_RET_STRING, .name = "orig.ip.saddr.str", + .cim_name = "src_ip", }, { .type = ULOGD_RET_STRING, .name = "orig.ip.daddr.str", + .cim_name = "dest_ip", }, { .type = ULOGD_RET_STRING, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/include/ulogd/db.h new/ulogd-2.0.4/include/ulogd/db.h --- old/ulogd-2.0.3/include/ulogd/db.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/db.h 2014-03-23 16:30:50.000000000 +0100 @@ -65,7 +65,7 @@ #define TIME_ERR ((time_t)-1) /* Be paranoid */ #define RECONNECT_DEFAULT 2 #define MAX_ONESHOT_REQUEST 10 -#define RING_BUFFER_DEFAULT_SIZE 10 +#define RING_BUFFER_DEFAULT_SIZE 0 #define DB_CES \ { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/include/ulogd/printpkt.h new/ulogd-2.0.4/include/ulogd/printpkt.h --- old/ulogd-2.0.3/include/ulogd/printpkt.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/printpkt.h 2014-03-23 16:30:50.000000000 +0100 @@ -3,7 +3,6 @@ enum pkt_keys { KEY_OOB_FAMILY, - KEY_OOB_TIME_SEC, KEY_OOB_PREFIX, KEY_OOB_IN, KEY_OOB_OUT, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/include/ulogd/ulogd.h new/ulogd-2.0.4/include/ulogd/ulogd.h --- old/ulogd-2.0.3/include/ulogd/ulogd.h 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/include/ulogd/ulogd.h 2014-03-23 16:30:50.000000000 +0100 @@ -17,6 +17,7 @@ #include <stdio.h> #include <signal.h> /* need this because of extension-sighandler */ #include <sys/types.h> +#include <inttypes.h> #include <string.h> #include <config.h> @@ -97,6 +98,9 @@ u_int16_t field_id; } ipfix; + /* Store field name for Common Information Model */ + char *cim_name; + union { /* and finally the returned value */ union { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/input/flow/ulogd_inpflow_NFCT.c new/ulogd-2.0.4/input/flow/ulogd_inpflow_NFCT.c --- old/ulogd-2.0.3/input/flow/ulogd_inpflow_NFCT.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/input/flow/ulogd_inpflow_NFCT.c 2014-03-23 16:30:50.000000000 +0100 @@ -621,7 +621,7 @@ propagate_ct(upi, upi, ct, type, ts); } -static void set_timestamp_from_ct(struct ct_timestamp *ts, +static int set_timestamp_from_ct_try(struct ct_timestamp *ts, struct nf_conntrack *ct, int name) { int attr_name; @@ -636,7 +636,15 @@ nfct_get_attr_u64(ct, attr_name) / NSEC_PER_SEC; ts->time[name].tv_usec = (nfct_get_attr_u64(ct, attr_name) % NSEC_PER_SEC) / 1000; - } else + return 1; + } + return 0; +} + +static void set_timestamp_from_ct(struct ct_timestamp *ts, + struct nf_conntrack *ct, int name) +{ + if (!set_timestamp_from_ct_try(ts, ct, name)) gettimeofday(&ts->time[name], NULL); } @@ -732,8 +740,10 @@ break; case NFCT_T_DESTROY: set_timestamp_from_ct(&tmp, ct, STOP); - tmp.time[START].tv_sec = 0; - tmp.time[START].tv_usec = 0; + if (!set_timestamp_from_ct_try(&tmp, ct, START)) { + tmp.time[START].tv_sec = 0; + tmp.time[START].tv_usec = 0; + } break; default: ulogd_log(ULOGD_NOTICE, "unsupported message type\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/m4/libtool.m4 new/ulogd-2.0.4/m4/libtool.m4 --- old/ulogd-2.0.3/m4/libtool.m4 2013-11-19 19:32:12.000000000 +0100 +++ new/ulogd-2.0.4/m4/libtool.m4 2014-03-23 16:39:29.000000000 +0100 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/output/Makefile.am new/ulogd-2.0.4/output/Makefile.am --- old/ulogd-2.0.3/output/Makefile.am 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/output/Makefile.am 2014-03-23 16:30:50.000000000 +0100 @@ -9,6 +9,10 @@ ulogd_output_NACCT.la ulogd_output_XML.la \ ulogd_output_GRAPHITE.la +if HAVE_JANSSON +pkglib_LTLIBRARIES += ulogd_output_JSON.la +endif + ulogd_output_GPRINT_la_SOURCES = ulogd_output_GPRINT.c ulogd_output_GPRINT_la_LDFLAGS = -avoid-version -module @@ -32,3 +36,9 @@ ulogd_output_GRAPHITE_la_SOURCES = ulogd_output_GRAPHITE.c ulogd_output_GRAPHITE_la_LDFLAGS = -avoid-version -module + +if HAVE_JANSSON +ulogd_output_JSON_la_SOURCES = ulogd_output_JSON.c +ulogd_output_JSON_la_LIBADD = ${libjansson_LIBS} +ulogd_output_JSON_la_LDFLAGS = -avoid-version -module +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/output/ulogd_output_JSON.c new/ulogd-2.0.4/output/ulogd_output_JSON.c --- old/ulogd-2.0.3/output/ulogd_output_JSON.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ulogd-2.0.4/output/ulogd_output_JSON.c 2014-03-23 16:30:50.000000000 +0100 @@ -0,0 +1,292 @@ +/* ulogd_output_JSON.c + * + * ulogd output target for logging to a file in JSON format. + * + * (C) 2014 by Eric Leblond <eric(a)regit.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <errno.h> +#include <inttypes.h> +#include <ulogd/ulogd.h> +#include <ulogd/conffile.h> +#include <jansson.h> + +#ifndef ULOGD_JSON_DEFAULT +#define ULOGD_JSON_DEFAULT "/var/log/ulogd.json" +#endif + +#ifndef ULOGD_JSON_DEFAULT_DEVICE +#define ULOGD_JSON_DEFAULT_DEVICE "Netfilter" +#endif + +struct json_priv { + FILE *of; + int sec_idx; + int usec_idx; +}; + +enum json_conf { + JSON_CONF_FILENAME = 0, + JSON_CONF_SYNC, + JSON_CONF_TIMESTAMP, + JSON_CONF_DEVICE, + JSON_CONF_BOOLEAN_LABEL, + JSON_CONF_MAX +}; + +static struct config_keyset json_kset = { + .num_ces = JSON_CONF_MAX, + .ces = { + [JSON_CONF_FILENAME] = { + .key = "file", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_NONE, + .u = {.string = ULOGD_JSON_DEFAULT }, + }, + [JSON_CONF_SYNC] = { + .key = "sync", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 0 }, + }, + [JSON_CONF_TIMESTAMP] = { + .key = "timestamp", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 1 }, + }, + [JSON_CONF_DEVICE] = { + .key = "device", + .type = CONFIG_TYPE_STRING, + .options = CONFIG_OPT_NONE, + .u = { .string = ULOGD_JSON_DEFAULT_DEVICE }, + }, + [JSON_CONF_BOOLEAN_LABEL] = { + .key = "boolean_label", + .type = CONFIG_TYPE_INT, + .options = CONFIG_OPT_NONE, + .u = { .value = 0 }, + }, + }, +}; + +#define MAX_LOCAL_TIME_STRING 32 + +static int json_interp(struct ulogd_pluginstance *upi) +{ + struct json_priv *opi = (struct json_priv *) &upi->private; + unsigned int i; + json_t *msg; + + msg = json_object(); + if (!msg) { + ulogd_log(ULOGD_ERROR, "Unable to create JSON object\n"); + return ULOGD_IRET_ERR; + } + + if (upi->config_kset->ces[JSON_CONF_TIMESTAMP].u.value != 0) { + time_t now; + char timestr[MAX_LOCAL_TIME_STRING]; + struct tm *t; + struct tm result; + struct ulogd_key *inp = upi->input.keys; + + + if (pp_is_valid(inp, opi->sec_idx)) + now = (time_t) ikey_get_u64(&inp[opi->sec_idx]); + else + now = time(NULL); + t = localtime_r(&now, &result); + + if (pp_is_valid(inp, opi->usec_idx)) { + snprintf(timestr, MAX_LOCAL_TIME_STRING, + "%04d-%02d-%02dT%02d:%02d:%02d.%06u", + t->tm_year + 1900, t->tm_mon + 1, + t->tm_mday, t->tm_hour, + t->tm_min, t->tm_sec, + ikey_get_u32(&inp[opi->usec_idx])); + } else { + snprintf(timestr, MAX_LOCAL_TIME_STRING, + "%04d-%02d-%02dT%02d:%02d:%02d", + t->tm_year + 1900, t->tm_mon + 1, + t->tm_mday, t->tm_hour, + t->tm_min, t->tm_sec); + } + + json_object_set_new(msg, "timestamp", json_string(timestr)); + } + + if (upi->config_kset->ces[JSON_CONF_DEVICE].u.string) { + char *dvc = upi->config_kset->ces[JSON_CONF_DEVICE].u.string; + json_object_set_new(msg, "dvc", json_string(dvc)); + } + + + + for (i = 0; i < upi->input.num_keys; i++) { + struct ulogd_key *key = upi->input.keys[i].u.source; + char *field_name; + + if (!key) + continue; + + if (!IS_VALID(*key)) + continue; + + field_name = key->cim_name ? key->cim_name : key->name; + + switch (key->type) { + case ULOGD_RET_STRING: + json_object_set_new(msg, field_name, json_string(key->u.value.ptr)); + break; + case ULOGD_RET_BOOL: + case ULOGD_RET_INT8: + case ULOGD_RET_INT16: + case ULOGD_RET_INT32: + json_object_set_new(msg, field_name, json_integer(key->u.value.i32)); + break; + case ULOGD_RET_UINT8: + if ((upi->config_kset->ces[JSON_CONF_BOOLEAN_LABEL].u.value != 0) + && (!strcmp(key->name, "raw.label"))) { + if (key->u.value.ui8) + json_object_set_new(msg, "action", json_string("allowed")); + else + json_object_set_new(msg, "action", json_string("blocked")); + break; + } + case ULOGD_RET_UINT16: + case ULOGD_RET_UINT32: + case ULOGD_RET_UINT64: + json_object_set_new(msg, field_name, json_integer(key->u.value.ui64)); + default: + /* don't know how to interpret this key. */ + break; + } + } + + json_dumpf(msg, opi->of, 0); + fprintf(opi->of, "\n"); + + json_decref(msg); + + if (upi->config_kset->ces[JSON_CONF_SYNC].u.value != 0) + fflush(opi->of); + + return ULOGD_IRET_OK; +} + +static void sighup_handler_print(struct ulogd_pluginstance *upi, int signal) +{ + struct json_priv *oi = (struct json_priv *) &upi->private; + FILE *old = oi->of; + + switch (signal) { + case SIGHUP: + ulogd_log(ULOGD_NOTICE, "JSON: reopening logfile\n"); + oi->of = fopen(upi->config_kset->ces[0].u.string, "a"); + if (!oi->of) { + ulogd_log(ULOGD_ERROR, "can't open JSON " + "log file: %s\n", + strerror(errno)); + oi->of = old; + } else { + fclose(old); + } + break; + default: + break; + } +} + +static int json_configure(struct ulogd_pluginstance *upi, + struct ulogd_pluginstance_stack *stack) +{ + int ret; + + ret = ulogd_wildcard_inputkeys(upi); + if (ret < 0) + return ret; + + ret = config_parse_file(upi->id, upi->config_kset); + if (ret < 0) + return ret; + + return 0; +} + +static int json_init(struct ulogd_pluginstance *upi) +{ + struct json_priv *op = (struct json_priv *) &upi->private; + unsigned int i; + + op->of = fopen(upi->config_kset->ces[0].u.string, "a"); + if (!op->of) { + ulogd_log(ULOGD_FATAL, "can't open JSON log file: %s\n", + strerror(errno)); + return -1; + } + + /* search for time */ + op->sec_idx = -1; + op->usec_idx = -1; + for (i = 0; i < upi->input.num_keys; i++) { + struct ulogd_key *key = upi->input.keys[i].u.source; + if (!strcmp(key->name, "oob.time.sec")) + op->sec_idx = i; + else if (!strcmp(key->name, "oob.time.usec")) + op->usec_idx = i; + } + + return 0; +} + +static int json_fini(struct ulogd_pluginstance *pi) +{ + struct json_priv *op = (struct json_priv *) &pi->private; + + if (op->of != stdout) + fclose(op->of); + + return 0; +} + +static struct ulogd_plugin json_plugin = { + .name = "JSON", + .input = { + .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW | ULOGD_DTYPE_SUM, + }, + .output = { + .type = ULOGD_DTYPE_SINK, + }, + .configure = &json_configure, + .interp = &json_interp, + .start = &json_init, + .stop = &json_fini, + .signal = &sighup_handler_print, + .config_kset = &json_kset, + .version = VERSION, +}; + +void __attribute__ ((constructor)) init(void); + +void init(void) +{ + ulogd_register_plugin(&json_plugin); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/output/ulogd_output_NACCT.c new/ulogd-2.0.4/output/ulogd_output_NACCT.c --- old/ulogd-2.0.3/output/ulogd_output_NACCT.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/output/ulogd_output_NACCT.c 2014-03-23 16:30:50.000000000 +0100 @@ -127,7 +127,7 @@ 'timestamp' value use 'flow.end.sec' */ if (ikey_get_u8(&inp[KEY_IP_PROTO]) == IPPROTO_ICMP) { snprintf(buf, sizeof(buf), - "%u\t%u\t%s\t%u\t%s\t%u\t%llu\t%llu", + "%u\t%u\t%s\t%u\t%s\t%u\t%" PRIu64 "\t%" PRIu64, ikey_get_u32(&inp[KEY_FLOW_END]), ikey_get_u8(&inp[KEY_IP_PROTO]), (char *) ikey_get_ptr(&inp[KEY_IP_SADDR]), @@ -138,7 +138,7 @@ ikey_get_u64(&inp[KEY_RAW_PKTLEN])); } else { snprintf(buf, sizeof(buf), - "%u\t%u\t%s\t%u\t%s\t%u\t%llu\t%llu", + "%u\t%u\t%s\t%u\t%s\t%u\t%" PRIu64 "\t%" PRIu64, ikey_get_u32(&inp[KEY_FLOW_END]), ikey_get_u8(&inp[KEY_IP_PROTO]), (char *) ikey_get_ptr(&inp[KEY_IP_SADDR]), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/src/Makefile.am new/ulogd-2.0.4/src/Makefile.am --- old/ulogd-2.0.3/src/Makefile.am 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/src/Makefile.am 2014-03-23 16:30:50.000000000 +0100 @@ -7,5 +7,5 @@ sbin_PROGRAMS = ulogd ulogd_SOURCES = ulogd.c select.c timer.c rbtree.c conffile.c hash.c addr.c -ulogd_LDADD = ${libdl_LIBS} -ulogd_LDFLAGS = -export-dynamic -lpthread +ulogd_LDADD = ${libdl_LIBS} ${libpthread_LIBS} +ulogd_LDFLAGS = -export-dynamic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/src/conffile.c new/ulogd-2.0.4/src/conffile.c --- old/ulogd-2.0.3/src/conffile.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/src/conffile.c 2014-03-23 16:30:50.000000000 +0100 @@ -146,7 +146,7 @@ return -ERRTOOLONG; } - if (!(wordend = get_word(line, " \t\n[]", (char *) wordbuf))) + if (!(wordend = get_word(line, " \t\n\r[]", (char *) wordbuf))) continue; pr_debug("word: \"%s\"\n", wordbuf); if (!strcmp(wordbuf, section)) { @@ -178,7 +178,7 @@ return -ERRTOOLONG; } - if (!(wordend = get_word(line, " =\t\n", (char *) &wordbuf))) + if (!(wordend = get_word(line, " =\t\n\r", (char *) &wordbuf))) continue; if (wordbuf[0] == '[' ) { @@ -195,7 +195,7 @@ continue; } - wordend = get_word(wordend, " =\t\n", (char *) &wordbuf); + wordend = get_word(wordend, " =\t\n\r", (char *) &wordbuf); args = (char *)&wordbuf; if (ce->hit && !(ce->options & CONFIG_OPT_MULTI)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/src/ulogd.c new/ulogd-2.0.4/src/ulogd.c --- old/ulogd-2.0.3/src/ulogd.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/src/ulogd.c 2014-03-23 16:30:50.000000000 +0100 @@ -442,7 +442,7 @@ timestr = ctime(&tm); timestr[strlen(timestr)-1] = '\0'; fprintf(outfd, "%s <%1.1d> %s:%d ", timestr, level, file, line); - if (verbose) + if (verbose && outfd != stderr) fprintf(stderr, "%s <%1.1d> %s:%d ", timestr, level, file, line); @@ -452,7 +452,7 @@ /* flush glibc's buffer */ fflush(outfd); - if (verbose) { + if (verbose && outfd != stderr) { va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap); @@ -1383,9 +1383,10 @@ } /* command line has precedence on config file */ - if (loglevel) + if (loglevel) { loglevel_ce.u.value = loglevel; loglevel_ce.flag |= CONFIG_FLAG_VAL_PROTECTED; + } if (ulogd_pidfile) { if (create_pidfile() < 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/ulogd.conf.in new/ulogd-2.0.4/ulogd.conf.in --- old/ulogd-2.0.3/ulogd.conf.in 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/ulogd.conf.in 2014-03-23 16:30:50.000000000 +0100 @@ -49,6 +49,7 @@ plugin="@pkglibdir@/ulogd_raw2packet_BASE.so" plugin="@pkglibdir@/ulogd_inpflow_NFACCT.so" plugin="@pkglibdir@/ulogd_output_GRAPHITE.so" +#plugin="@pkglibdir@/ulogd_output_JSON.so" # this is a stack for logging packet send by system via LOGEMU #stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -92,6 +93,9 @@ # this is a stack for logging packet to PGsql after a collect via NFLOG #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,pgsql1:PGSQL +# this is a stack for logging packet to JSON formatted file after a collect via NFLOG +#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,json1:JSON + # this is a stack for logging packets to syslog after a collect via NFLOG #stack=log3:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG @@ -195,6 +199,17 @@ directory="/var/log/" sync=1 +[json1] +sync=1 +#file="/var/log/ulogd.json" +#timestamp=0 +# device name to be used in JSON message +#device="My awesome Netfilter firewall" +# If boolean_label is set to 1 then the numeric_label put on packet +# by the input plugin is coding the action on packet: if 0, then +# packet has been blocked and if non null it has been accepted. +#boolean_label=1 + [pcap1] #default file is /var/log/ulogd.pcap #file="/var/log/ulogd.pcap" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/util/db.c new/ulogd-2.0.4/util/db.c --- old/ulogd-2.0.3/util/db.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/util/db.c 2014-03-23 16:30:50.000000000 +0100 @@ -590,7 +590,8 @@ "permanently disabling plugin\n"); di->interp = &disabled_interp_db; return NULL; - } + } else /* try to re run query */ + continue; } *wr_place = RING_NO_QUERY; di->ring.rd_item++; @@ -619,6 +620,23 @@ ulogd_log(ULOGD_ERROR, "No SIGHUP handling if ring buffer is used\n"); break; + case SIGTERM: + case SIGINT: + if (di->ring.size) { + int s = pthread_cancel(di->db_thread_id); + if (s != 0) { + ulogd_log(ULOGD_ERROR, + "Can't cancel injection thread\n"); + break; + } + s = pthread_join(di->db_thread_id, NULL); + if (s != 0) { + ulogd_log(ULOGD_ERROR, + "Error waiting for injection thread" + "cancelation\n"); + } + } + break; default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/util/printflow.c new/ulogd-2.0.4/util/printflow.c --- old/ulogd-2.0.3/util/printflow.c 2013-11-18 23:34:03.000000000 +0100 +++ new/ulogd-2.0.4/util/printflow.c 2014-03-23 16:30:50.000000000 +0100 @@ -135,9 +135,10 @@ }; int printflow_keys_num = sizeof(printflow_keys)/sizeof(*printflow_keys); -#define pp_print(buf_cur, label, res, x, type) \ +#define pp_pri(type) PRI##type +#define pp_print_u(buf_cur, label, res, x, type) \ if (pp_is_valid(res, x)) \ - buf_cur += sprintf(buf_cur, label"=%u ", ikey_get_##type(&res[x])); + buf_cur += sprintf(buf_cur, label"=%" pp_pri(type) " ", ikey_get_##type(&res[x])); int printflow_print(struct ulogd_key *res, char *buf) { @@ -175,20 +176,20 @@ switch (ikey_get_u8(&res[PRINTFLOW_ORIG_IP_PROTOCOL])) { case IPPROTO_TCP: buf_cur += sprintf(buf_cur, "PROTO=TCP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); break; case IPPROTO_UDP: buf_cur += sprintf(buf_cur, "PROTO=UDP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_ORIG_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_ORIG_L4_DPORT, u16); break; case IPPROTO_ICMP: buf_cur += sprintf(buf_cur, "PROTO=ICMP "); - pp_print(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); - pp_print(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); + pp_print_u(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); + pp_print_u(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); break; case IPPROTO_ESP: @@ -200,13 +201,13 @@ break; default: - pp_print(buf_cur, "PROTO", res, PRINTFLOW_ORIG_IP_PROTOCOL, u8); + pp_print_u(buf_cur, "PROTO", res, PRINTFLOW_ORIG_IP_PROTOCOL, u8); break; } orig_out: - pp_print(buf_cur, "PKTS", res, PRINTFLOW_ORIG_RAW_PKTCOUNT, u64); - pp_print(buf_cur, "BYTES", res, PRINTFLOW_ORIG_RAW_PKTLEN, u64); + pp_print_u(buf_cur, "PKTS", res, PRINTFLOW_ORIG_RAW_PKTCOUNT, u64); + pp_print_u(buf_cur, "BYTES", res, PRINTFLOW_ORIG_RAW_PKTLEN, u64); buf_cur += sprintf(buf_cur, ", REPLY: "); @@ -226,20 +227,20 @@ switch (ikey_get_u8(&res[PRINTFLOW_REPLY_IP_PROTOCOL])) { case IPPROTO_TCP: buf_cur += sprintf(buf_cur, "PROTO=TCP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); break; case IPPROTO_UDP: buf_cur += sprintf(buf_cur, "PROTO=UDP "); - pp_print(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); - pp_print(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); + pp_print_u(buf_cur, "SPT", res, PRINTFLOW_REPLY_L4_SPORT, u16); + pp_print_u(buf_cur, "DPT", res, PRINTFLOW_REPLY_L4_DPORT, u16); break; case IPPROTO_ICMP: buf_cur += sprintf(buf_cur, "PROTO=ICMP "); - pp_print(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); - pp_print(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); + pp_print_u(buf_cur, "TYPE", res, PRINTFLOW_ICMP_CODE, u8); + pp_print_u(buf_cur, "CODE", res, PRINTFLOW_ICMP_TYPE, u8); break; case IPPROTO_ESP: @@ -251,13 +252,13 @@ break; default: - pp_print(buf_cur, "PROTO", res, PRINTFLOW_REPLY_IP_PROTOCOL, u8); + pp_print_u(buf_cur, "PROTO", res, PRINTFLOW_REPLY_IP_PROTOCOL, u8); break; } reply_out: - pp_print(buf_cur, "PKTS", res, PRINTFLOW_REPLY_RAW_PKTCOUNT, u64); - pp_print(buf_cur, "BYTES", res, PRINTFLOW_REPLY_RAW_PKTLEN, u64); + pp_print_u(buf_cur, "PKTS", res, PRINTFLOW_REPLY_RAW_PKTCOUNT, u64); + pp_print_u(buf_cur, "BYTES", res, PRINTFLOW_REPLY_RAW_PKTLEN, u64); strcat(buf_cur, "\n"); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ulogd-2.0.3/util/printpkt.c new/ulogd-2.0.4/util/printpkt.c --- old/ulogd-2.0.3/util/printpkt.c 2013-06-18 22:52:50.000000000 +0200 +++ new/ulogd-2.0.4/util/printpkt.c 2014-03-23 16:30:50.000000000 +0100 @@ -39,7 +39,6 @@ struct ulogd_key printpkt_keys[] = { [KEY_OOB_FAMILY] = { .name = "oob.family", }, [KEY_OOB_PROTOCOL] = { .name = "oob.protocol", }, - [KEY_OOB_TIME_SEC] = { .name = "oob.time.sec", }, [KEY_OOB_PREFIX] = { .name = "oob.prefix", }, [KEY_OOB_IN] = { .name = "oob.in", }, [KEY_OOB_OUT] = { .name = "oob.out", }, ++++++ ulogd-conf.diff ++++++ --- /var/tmp/diff_new_pack.gOnGYj/_old 2014-04-26 10:12:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gOnGYj/_new 2014-04-26 10:12:02.000000000 +0200 @@ -1,11 +1,11 @@ --- - ulogd.conf.in | 27 ++++++++++----------------- - 1 file changed, 10 insertions(+), 17 deletions(-) + ulogd.conf.in | 29 +++++++++++------------------ + 1 file changed, 11 insertions(+), 18 deletions(-) -Index: ulogd-2.0.3/ulogd.conf.in +Index: ulogd-2.0.4/ulogd.conf.in =================================================================== ---- ulogd-2.0.3.orig/ulogd.conf.in -+++ ulogd-2.0.3/ulogd.conf.in +--- ulogd-2.0.4.orig/ulogd.conf.in ++++ ulogd-2.0.4/ulogd.conf.in @@ -6,9 +6,10 @@ # GLOBAL OPTIONS ###################################################################### @@ -18,7 +18,7 @@ # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) (default 5) # loglevel=1 -@@ -56,9 +57,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT +@@ -57,9 +58,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT # this is a stack for packet-based logging via LOGEMU #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -28,7 +28,7 @@ # this is a stack for packet-based logging via LOGEMU with filtering on MARK #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU -@@ -170,34 +168,29 @@ numeric_label=1 # you can label the log +@@ -174,34 +172,29 @@ numeric_label=1 # you can label the log #netlink_socket_buffer_maxsize=1085440 #bind=1 @@ -61,6 +61,15 @@ +directory="/var/log/ulogd/" sync=1 + [json1] + sync=1 +-#file="/var/log/ulogd.json" ++#file="/var/log/ulogd/ulogd.json" + #timestamp=0 + # device name to be used in JSON message + #device="My awesome Netfilter firewall" +@@ -212,7 +205,7 @@ sync=1 + [pcap1] #default file is /var/log/ulogd.pcap -#file="/var/log/ulogd.pcap" @@ -68,7 +77,7 @@ sync=1 [mysql1] -@@ -282,12 +275,12 @@ procedure="INSERT_PACKET_FULL" +@@ -297,12 +290,12 @@ procedure="INSERT_PACKET_FULL" [sqlite3_ct] table="ulog_ct" @@ -83,7 +92,7 @@ buffer=200 [sys2] -@@ -295,7 +288,7 @@ facility=LOG_LOCAL2 +@@ -310,7 +303,7 @@ facility=LOG_LOCAL2 [nacct1] sync = 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smuxi for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package smuxi for openSUSE:Factory checked in at 2014-04-26 10:11:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smuxi (Old) and /work/SRC/openSUSE:Factory/.smuxi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "smuxi" Changes: -------- --- /work/SRC/openSUSE:Factory/smuxi/smuxi.changes 2013-12-24 16:04:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.smuxi.new/smuxi.changes 2014-04-26 10:11:53.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Apr 23 18:29:49 UTC 2014 - develop7(a)develop7.info + +- Updated to version 0.11: + + User Interface Enhancements: + - The chat list can be shrunken. + - The highlight counter is now a separate column. + + Multi Identity Support. + + Message Patterns. + + Hooks Enhancements. + + Twitter Enhancements. + + JabbR (Beta) Enhancements. + + Updated translations. + +------------------------------------------------------------------- Old: ---- smuxi-0.10.tar.gz New: ---- smuxi-0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smuxi.spec ++++++ --- /var/tmp/diff_new_pack.nU6Nuk/_old 2014-04-26 10:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nU6Nuk/_new 2014-04-26 10:11:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package smuxi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: smuxi -Version: 0.10 +Version: 0.11 Release: 0 # FIXME: when db4o is in Factory, uncomment BuildRequires for it Url: http://www.smuxi.org @@ -27,7 +27,7 @@ Group: Productivity/Networking/IRC #BuildRequires: indicate-sharp BuildRequires: intltool -BuildRequires: mono-devel >= 1.9 +BuildRequires: mono-devel >= 2.6 BuildRequires: update-desktop-files BuildRequires: mono(System.Web.Extensions) #BuildRequires: pkgconfig(db4o) >= 8.0 ++++++ smuxi-0.10.tar.gz -> smuxi-0.11.tar.gz ++++++ ++++ 8229 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scim-bridge for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package scim-bridge for openSUSE:Factory checked in at 2014-04-26 10:11:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-bridge (Old) and /work/SRC/openSUSE:Factory/.scim-bridge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-bridge" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-bridge/scim-bridge.changes 2012-09-14 12:37:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-bridge.new/scim-bridge.changes 2014-04-26 10:11:48.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 24 15:38:46 UTC 2014 - dmueller(a)suse.com + +- remove dependency on qt3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.XYs4z6/_old 2014-04-26 10:11:48.000000000 +0200 +++ /var/tmp/diff_new_pack.XYs4z6/_new 2014-04-26 10:11:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-bridge # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,6 @@ BuildRequires: gtk2-devel BuildRequires: libqt4-devel BuildRequires: libtool -BuildRequires: qt3-devel BuildRequires: scim-devel Summary: Scim Bridge License: LGPL-2.1+ @@ -113,22 +112,14 @@ libtoolize --force -c --automake export CFLAGS="$RPM_OPT_FLAGS" -%configure --disable-static --with-pic --enable-gtk2-immodule --enable-qt3-immodule --enable-qt4-immodule --enable-documents +%configure --disable-static --with-pic --enable-gtk2-immodule --disable-qt3-immodule \ + --enable-qt4-immodule --enable-documents %{__make} %{?jobs:-j%jobs} %install make DESTDIR=${RPM_BUILD_ROOT} install rm -f $RPM_BUILD_ROOT/%{gtk_prefix}/%{_lib}/gtk-2.0/immodules/im-scim-bridge.*a -pushd $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/ - if [ %_lib = lib64 ]; then - mv im-scim-bridge.so im-scim-bridge.lib64.so - mv im-scim-bridge.la im-scim-bridge.lib64.la - else - : - fi -popd -rm -f $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.*a mkdir -p $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods mv $RPM_BUILD_ROOT/usr/plugins/inputmethods/im-scim-bridge* $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods pushd $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods @@ -182,13 +173,8 @@ %defattr(-, root, root) %{gtk_prefix}/%{_lib}/gtk-2.0/immodules - %files -n scim-bridge-qt %defattr(-, root, root) -%dir /usr/lib/qt3/ -%dir /usr/lib/qt3/plugins/ -%dir /usr/lib/qt3/plugins/inputmethods/ -/usr/lib/qt3/plugins/inputmethods/im-scim-bridge*.so %dir %qt4_plugindir/ %dir %qt4_plugindir/inputmethods/ %qt4_plugindir/inputmethods/im-scim-bridge*.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rekonq for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package rekonq for openSUSE:Factory checked in at 2014-04-26 10:11:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rekonq (Old) and /work/SRC/openSUSE:Factory/.rekonq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rekonq" Changes: -------- --- /work/SRC/openSUSE:Factory/rekonq/rekonq.changes 2014-01-13 10:55:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rekonq.new/rekonq.changes 2014-04-26 10:11:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 7 18:29:32 UTC 2014 - tittiatcoke(a)gmail.com + +- Remove nepomuk-core from the buildrequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekonq.spec ++++++ --- /var/tmp/diff_new_pack.BxHFhd/_old 2014-04-26 10:11:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BxHFhd/_new 2014-04-26 10:11:29.000000000 +0200 @@ -29,8 +29,7 @@ BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= 4.8.3 BuildRequires: libqca2-devel -BuildRequires: libqt4-devel >= 4.8.0 -BuildRequires: nepomuk-core-devel +BuildRequires: libqt4-devel >= 4.8.0l # for opera sync service BuildRequires: qoauth-devel %if 0%{?suse_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0