January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit splix for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package splix for openSUSE:Factory checked in at Tue Jan 25 13:26:55 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/splix/splix.changes 2011-01-25 11:09:57.000000000 +0100 @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Tue Jan 25 11:04:19 CET 2011 - jsmeix(a)suse.de + +- A rename of a RPM binary package by chaging the name value + in the spec file and the spec file name also to "splix.spec" + is currently not possible whith the openSUSE toolset + (see why submitrequest 56905 was declined). + Therefore a new package "splix" was created and + the old package "cups-drivers-splix" was removed. + +------------------------------------------------------------------- +Wed Dec 15 13:15:08 UTC 2010 - andrea(a)opensuse.org + +- rename package from cups-drivers-splix to splix according to + bnc#659579 + +------------------------------------------------------------------- +Fri Aug 6 13:06:47 UTC 2010 - andrea(a)opensuse.org + +- exclude from the package ppd files that requires JBIG when + JBIG is disabled bnc#628698 +- use upstream manufacturer subfolders + +------------------------------------------------------------------- +Tue Apr 6 10:01:40 UTC 2010 - andrea(a)opensuse.org + +- fixed gcc 4.5 build failure + +------------------------------------------------------------------- +Fri Oct 9 08:24:01 UTC 2009 - lnussel(a)suse.de + +- use bcond again + +------------------------------------------------------------------- +Sun Oct 4 20:45:50 UTC 2009 - andrea(a)opensuse.org + +- re-enabled JBIG since i need it, it's possible to disable it + with "%%define with_jbigkit 0" + +------------------------------------------------------------------- +Sun Oct 4 19:11:19 CEST 2009 - lnussel(a)suse.de + +- disable JBIG by default (patent problems) +- move ppd files to subdirs with captital first letter as used by + cups-drivers + +------------------------------------------------------------------- +Sat Jul 4 16:23:00 CEST 2009 - andrea(a)opensuse.org + +- New package + calling whatdependson for head-i586 New: ---- README.SuSE samsung_cms.tar.bz2 splix-2.0.0-gcc45.patch splix-2.0.0.tar.bz2 splix.changes splix.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splix.spec ++++++ # # spec file for package splix # # Copyright (c) 2011 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/ # # norootforbuild %bcond_with jbigkit %if %suse_version < 1120 %define _libexecdir %_prefix/lib %endif Name: splix Summary: Driver for Samsung Printer Language printers Version: 2.0.0 Release: 1 License: GPLv2 Group: Hardware/Printing Url: http://splix.ap2c.org/ Source0: http://downloads.sourceforge.net/project/splix/splix/%{version}/%{name}-%{v… Source1: http://splix.ap2c.org/samsung_cms.tar.bz2 Source2: README.SuSE Patch0: %name-2.0.0-gcc45.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cups-devel fdupes gcc-c++ %if %{with jbigkit} BuildRequires: jbigkit-devel %endif Requires: cups # Provide and obsolete its old RPM package name "cups-drivers-splix" # see https://bugzilla.novell.com/show_bug.cgi?id=659579 Provides: cups-drivers-splix >= %version Obsoletes: cups-drivers-splix < %version %description SpliX is a set of CUPS printer drivers for SPL (Samsung Printer Language) printers. Some Samsung, Xerox and Dell printers use that language. %prep %setup -q %patch0 -p1 %__cp %SOURCE2 . %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %__make %{!?_with_jbigkit:DISABLE_JBIG=1} %{?jobs:-j%{jobs}} V=1 %install %makeinstall %{!?_with_jbigkit:DISABLE_JBIG=1} pushd $RPM_BUILD_ROOT%_datadir/cups/model/samsung/ %__tar xjvf "%{SOURCE1}" popd gzip -9 %buildroot/%_datadir/cups/model/*/*.ppd %fdupes -s %{buildroot} %clean rm -fr %buildroot %files %defattr(-,root,root) %doc README.SuSE %dir %_datadir/cups %dir %_datadir/cups/model %dir %_datadir/cups/model/dell %dir %_datadir/cups/model/samsung %dir %_datadir/cups/model/xerox %dir %_libexecdir/cups/ %dir %_libexecdir/cups/filter/ %_libexecdir/cups/filter/pstoqpdl %_libexecdir/cups/filter/rastertoqpdl %_datadir/cups/model/dell/*.ppd.gz %_datadir/cups/model/samsung/*.ppd.gz %_datadir/cups/model/samsung/cms %_datadir/cups/model/xerox/*.ppd.gz %changelog ++++++ README.SuSE ++++++ Installation of the color profile for color printers: ----------------------------------------------------- Color printers needs color profile files to get better results. These files are provided by your printer manufacturer and you have to install them manually. To do that, download the linux official drivers and locate the "cms" directory. Install them copy everything in /usr/share/cups/model/MANUFACTURER/cms/ where MANUFACTURER is "samsung or xerox or dell" Samsung color profile files are available at: http://splix.ap2c.org/samsung_cms.tar.bz2 even if they are already provided by this package ++++++ splix-2.0.0-gcc45.patch ++++++ diff -rNu splix-2.0.0/src/ppdfile.cpp splix-2.0.0.new/src/ppdfile.cpp - --- splix-2.0.0/src/ppdfile.cpp 2009-02-06 12:49:10.000000000 +0100 +++ splix-2.0.0.new/src/ppdfile.cpp 2010-03-17 17:55:38.585903986 +0100 @@ -282,7 +282,7 @@ * Opérateur d'assignation * Assignment operator */ - -void PPDFile::Value::operator = (const PPDFile::Value::Value &val) +void PPDFile::Value::operator = (const PPDFile::Value &val) { if (_preformatted) delete[] _preformatted; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nfs-utils for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at Tue Jan 25 13:23:48 CET 2011. -------- --- nfs-utils/nfs-utils.changes 2011-01-12 13:36:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes 2011-01-25 10:02:26.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 25 09:01:37 UTC 2011 - lnussel(a)suse.de + +- give user a hint if portmap isn't running as statd can't be started in that + case. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.6r73Ld/_old 2011-01-25 13:22:39.000000000 +0100 +++ /var/tmp/diff_new_pack.6r73Ld/_new 2011-01-25 13:22:39.000000000 +0100 @@ -27,7 +27,7 @@ Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.3 -Release: 3 +Release: 4 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ start-statd ++++++ --- /var/tmp/diff_new_pack.6r73Ld/_old 2011-01-25 13:22:39.000000000 +0100 +++ /var/tmp/diff_new_pack.6r73Ld/_new 2011-01-25 13:22:39.000000000 +0100 @@ -5,9 +5,22 @@ # It should run run statd with whatever flags are apropriate for this # site. PATH=/sbin:/usr/sbin:/bin:/usr/bin +checkproc /usr/sbin/rpc.statd && exit 0 +. /etc/rc.status . /etc/sysconfig/nfs -rpc.statd --no-notify $STATD_OPTIONS -# in case firewall needs to punch a hole for the -# statd port... -/etc/init.d/SuSEfirewall2_setup try-restart > /dev/null 2>&1 +rc_reset +echo -n "Starting rpc.statd ..." +if ! rpcinfo -p localhost >/dev/null 2>/dev/null; then + echo -n " ${extd}portmapper not running${norm}" + rc_failed 1 + rc_status -v + rc_exit +fi +# TODO: write init script and call that one via /sbin/service instead +start_daemon /usr/sbin/rpc.statd --no-notify $STATD_OPTIONS +if rc_status -v; then + # in case firewall needs to punch a hole for the + # statd port... + /etc/init.d/SuSEfirewall2_setup try-restart +fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package libdbi-drivers for openSUSE:Factory checked in at Tue Jan 25 13:22:57 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdbi-drivers/libdbi-drivers.changes 2010-12-15 16:17:30.000000000 +0100 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Wed Dec 15 16:17:10 CET 2010 - meissner(a)suse.de + +- spec file cleanup +- disabled static driver libs +- pass in RPM_OPT_FLAGS + +------------------------------------------------------------------- +Wed Dec 15 16:05:55 CET 2010 - meissner(a)suse.de + +- split off from libdbi + calling whatdependson for head-i586 New: ---- libdbi-drivers-0.8.3-1.tar.bz2 libdbi-drivers.changes libdbi-drivers.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbi-drivers.spec ++++++ # # spec file for package libdbi-drivers # # Copyright (c) 2011 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 special -1 Summary: Database drivers for libdbi Name: libdbi-drivers Version: 0.8.3 Release: 1 Group: Development/Libraries License: LGPL Url: http://libdbi-drivers.sourceforge.net/ Source: %{name}-%{version}%{special}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext libdbi-devel mysql-devel openjade postgresql-devel sqlite-devel %description libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. Drivers are distributed separately from the library itself. _Original_Vendor: Neon Goat Productions _Original_Packager: David A. Parker <david(a)neongoat.com> %package dbd-mysql License: LGPL Summary: MySQL driver for libdbi Group: Development/Libraries Requires: libdbi0 = %{version}, mysqlclient9 >= 3.23.22 %description dbd-mysql This driver provides connectivity to MySQL database servers through the libdbi database independent abstraction layer. Switching a program's driver does not require recompilation or rewriting source code. %package dbd-pgsql License: LGPL Summary: PostgreSQL driver for libdbi Group: Development/Libraries Requires: libdbi0 = %{version}, postgresql >= 7.0.3 %description dbd-pgsql This driver provides connectivity to PostgreSQL database servers through the libdbi database independent abstraction layer. Switching a program's driver does not require recompilation or rewriting source code. %if 0%{?suse_version} == 910 # SLES 9 %package dbd-sqlite License: LGPL Summary: SQLite driver for libdbi Group: Development/Libraries Requires: libdbi0 = %{version}, sqlite %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. %else %package dbd-sqlite3 Summary: SQLite3 driver for libdbi Group: Development/Libraries Requires: libdbi0 = %{version}, sqlite %description dbd-sqlite3 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. %endif %prep %setup -q -n %{name}-%{version}%{special} %build CFLAGS="$RPM_OPT_FLAGS" %configure \ --with-mysql \ --with-mysql-incdir=/usr/include/mysql \ --with-mysql-libdir=%{_libdir}/mysql \ --with-pgsql \ --with-pgsql-incdir=/usr/include/pgsql \ --with-pgsql-libdir=%{_libdir} \ %if 0%{?suse_version} == 910 --with-sqlite \ --with-sqlite-incdir=/usr/include \ --with-sqlite-libdir=%{_libdir} \ %else --with-sqlite3 \ --with-sqlite3-incdir=/usr/include \ --with-sqlite3-libdir=%{_libdir} \ %endif --with-dbi-incdir=/usr/include/dbi \ --with-dbi-libdir=%{_libdir} \ --disable-static \ --disable-docs make AM_CFLAGS="$RPM_OPT_FLAGS" %install make DESTDIR=$RPM_BUILD_ROOT install %files dbd-mysql %defattr(-,root,root) %dir %{_libdir}/dbd %{_libdir}/dbd/libdbdmysql.so %{_libdir}/dbd/libdbdmysql.la %files dbd-pgsql %defattr(-,root,root) %dir %{_libdir}/dbd %{_libdir}/dbd/libdbdpgsql.so %{_libdir}/dbd/libdbdpgsql.la %if 0%{?suse_version} == 910 %defattr(-,root,root) # SLES 9 %files dbd-sqlite %defattr(-,root,root) %dir %{_libdir}/dbd %{_libdir}/dbd/libdbdsqlite.so %{_libdir}/dbd/libdbdsqlite.la %else %files dbd-sqlite3 %defattr(-,root,root) %dir %{_libdir}/dbd %{_libdir}/dbd/libdbdsqlite3.so %{_libdir}/dbd/libdbdsqlite3.la %endif %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-panel-plugins for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package xfce4-panel-plugins for openSUSE:Factory checked in at Tue Jan 25 13:20:51 CET 2011. -------- --- xfce4-panel-plugins/xfce4-panel-plugins.changes 2010-12-14 20:30:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce4-panel-plugins/xfce4-panel-plugins.changes 2011-01-07 15:16:30.000000000 +0100 @@ -1,0 +2,127 @@ +Fri Jan 7 14:12:59 UTC 2011 - gber(a)opensuse.org + +- added xfce4-sensors-plugin-1.0.0-fix-uninitialized-memory.patch + which fixes a crash due to an unitialized pointer when no sensors + are found + +------------------------------------------------------------------- +Tue Jan 4 19:57:05 UTC 2011 - gber(a)opensuse.org + +- fixed typo in + xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch + +------------------------------------------------------------------- +Sat Jan 1 14:30:10 UTC 2011 - gber(a)opensuse.org + +- only handle xfce4-notes-autostart.desktop on >= 11.4 + +------------------------------------------------------------------- +Sat Jan 1 12:44:32 UTC 2011 - gber(a)opensuse.org + +- changed build dependency in order to fix compatibility with 11.3 +- added xfce4-notes-plugin-1.7.7-fix-desktop-file.patch, + xfce4-quicklauncher-plugin-1.9.4-fix-desktop-file.patch, and + xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch in order + to fix their desktop files which prevented them from loading +- changed xfce4-panel-plugins-rpmlintrc to ignore + devel-file-in-non-devel-package due to panel plugins + +------------------------------------------------------------------- +Fri Dec 31 21:38:53 UTC 2010 - gber(a)opensuse.org + +- streamlined build dependencies, added libcdio, libcddb, + libunique, libmpd +- use more pkgconfig symbols for dependencies +- remove unsupported locales +- improved summaries/descriptions +- no need to own %%{_libexecdir}/xfce4 and + %%{_libexecdir}/xfce4/panel-plugins since they are now owned by + xfce4-panel-plugin +- made xfce4-panel-plugin-governor depend on hal +- made xfce4-panel-plugin-places depend on thunar-vfs +- made xfce4-panel-plugin-clipman and xfce4-panel-plugin-notes + depend on xfconf +- split off xfce4-panel-plugin-clipman-doc subpackage +- split off xfce4-panel-plugin-sensors-devel +- use %suse_update_desktop_file on .desktop files +- marked configuration files as such +- improved summaries/descriptions +- renamed rpmlintrc to xfce4-panel-plugins-rpmlintrc +- updated fsguard to version 1.0.0 + - translated to 11 new languages, for a total of 38 + - detect the file manager automatically + - replace limits in MB to percents +- updated netload plugin to 1.0.0 + - translated in 23 more languages, for a total of 36, 32 of which + are fully translations + - add a unique icon + - bugfixes +- dropped xfce4-netload-plugin-0.4.0-fix-build-with-4.7.patch and + xfce4-netload-plugin-0.4.0.patch +- updated time-out to 1.0.0 + - translated into a total of 31 languages, with 15 at 100% + - allow setting the time with a precision in seconds, rather than + minutes + - added an about dialog + - new optional resume button to be pushed at the end of the pause + - new progress bar in the lock screen +- updated systemload to 1.0.0 + - translated into 34 languages, including 13 with a complete + translation + - adjust the way free memory is calculated + - improve the accuracy of CPU activity measurements + - make the plugin more compact visually +- updated verve to 1.0.0 + - translated into 7 more languages, for a total of 37, 36 of + which are full translations +- dropped xfce4-verve-plugin-0.3.6-fix-build-with-4.7.patch +- backported xfce4-clipman-plugin-1.1.3-catch-null-value.patch from + git in order to fix a crash due to dereferencing a NULL pointer +- backported xfce4-clipman-plugin-1.1.3-fix-memory-leak.patch from + git in order to fix a memory leak +- dropped xfce4-clipman-plugin-1.1.3.patch as there is no need to + patch the desktop file category +- added xfce4-xkb-plugin-0.5.3.3-check-retval.patch in order to fix + a crash due to not checking the return value of + gtk_combo_box_get_active_iter +- added xfce4-xkb-plugin-0.5.3.3-do-not-free-stack-memory.patch in + order prevent freeing stack memory +- added xfce4-xkb-plugin-0.5.3.3-fix-array-size.patch in order to + fix a creash due to an unterminated array +- updated sensors to 1.0.0 + - made min/max values for Fahrenheit work + - maximum number of lines specifiable for text view + - labels in text view possible + - remember window size of configuration dialog + - respect "suppress messages" for error dialogs with acpi/sysfs +- dropped xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch +- dropped xfce4-sensors-plugin-0.10.99.6-initialize-pointers.patch +- dropped xfce4-sensors-plugin-0.10.99.6.patch +- backported xfce4-sensors-plugin-1.0.0-fix-memory-leaks.patch from + git in order to fix a memory leak +- backported xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch in + order to fix build with newer panel +- backported xfce4-battery-plugin-0.5.1-no-battery.patch from git + in order to correctly handle a missing battery +- backported xfce4-battery-plugin-0.5.1-use-sysfs.patch from git + in order to get correct infomration for some systems from sysfs +- backported + xfce4-battery-plugin-0.5.1-fix-fan-temperature-detection.patch + in order to fix fan and temperature detection +- added xfce4-genmon-plugin-3.2-prevent-zombies.patch from Debian + in order to prevent zombie processes +- added xfce4-genmon-plugin-3.2-close-unused-pipes.patch from + Debian in order to close unused pipes +- backported xfce4-quicklauncher-plugin-1.9.4-save-settings.patch + from git in order to make quicklaunches save its settings +- added + xfce4-quicklauncher-plugin-1.9.4-fix-parameters-launcher.patch + in order to fix the "Parameters" launcher +- added xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch from + Debian in order to lauch applications on the right screen i + multiscreen setups +- added + xfce4-quicklauncher-plugin-1.9.4-add-missing-en-translation.patch + from Debian in order to add the missing English translation + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rpmlintrc xfce4-clipman-plugin-1.1.3.patch xfce4-fsguard-plugin-0.4.2.tar.bz2 xfce4-netload-plugin-0.4.0-fix-build-with-4.7.patch xfce4-netload-plugin-0.4.0.patch xfce4-netload-plugin-0.4.0.tar.bz2 xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch xfce4-sensors-plugin-0.10.99.6-initialize-pointers.patch xfce4-sensors-plugin-0.10.99.6.patch xfce4-sensors-plugin-0.10.99.6.tar.bz2 xfce4-systemload-plugin-0.4.2.tar.bz2 xfce4-time-out-plugin-0.1.1.tar.bz2 xfce4-verve-plugin-0.3.6-fix-build-with-4.7.patch xfce4-verve-plugin-0.3.6.tar.bz2 New: ---- xfce4-battery-plugin-0.5.1-fix-fan-temperature-detection.patch xfce4-battery-plugin-0.5.1-no-battery.patch xfce4-battery-plugin-0.5.1-use-sysfs.patch xfce4-clipman-plugin-1.1.3-catch-null-value.patch xfce4-clipman-plugin-1.1.3-fix-memory-leak.patch xfce4-fsguard-plugin-1.0.0.tar.bz2 xfce4-genmon-plugin-3.2-close-unused-pipes.patch xfce4-genmon-plugin-3.2-prevent-zombies.patch xfce4-netload-plugin-1.0.0.tar.bz2 xfce4-notes-plugin-1.7.7-fix-desktop-file.patch xfce4-panel-plugins-rpmlintrc xfce4-quicklauncher-plugin-1.9.4-add-missing-en-translation.patch xfce4-quicklauncher-plugin-1.9.4-fix-desktop-file.patch xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch xfce4-quicklauncher-plugin-1.9.4-fix-parameters-launcher.patch xfce4-quicklauncher-plugin-1.9.4-save-settings.patch xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch xfce4-sensors-plugin-1.0.0-fix-memory-leaks.patch xfce4-sensors-plugin-1.0.0-fix-uninitialized-memory.patch xfce4-sensors-plugin-1.0.0.tar.bz2 xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch xfce4-systemload-plugin-1.0.0.tar.bz2 xfce4-time-out-plugin-1.0.0.tar.bz2 xfce4-verve-plugin-1.0.0.tar.bz2 xfce4-xkb-plugin-0.5.3.3-check-retval.patch xfce4-xkb-plugin-0.5.3.3-do-not-free-stack-memory.patch xfce4-xkb-plugin-0.5.3.3-fix-array-size.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugins.spec ++++++ ++++ 1407 lines (skipped) ++++ between xfce4-panel-plugins/xfce4-panel-plugins.spec ++++ and /mounts/work_src_done/STABLE/xfce4-panel-plugins/xfce4-panel-plugins.spec ++++++ xfce4-battery-plugin-0.5.1-fix-fan-temperature-detection.patch ++++++ diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c 2008-09-04 23:10:07.000000000 +0200 +++ xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c 2011-01-01 01:21:47.000000000 +0100 @@ -30,6 +30,7 @@ #include <stdlib.h> #include <sys/types.h> #include <dirent.h> +#include <glob.h> #if HAVE_SYSCTL @@ -181,6 +182,22 @@ #endif #endif +/* expand file name and fopen first match */ +static FILE * +fopen_glob(const char *name, const char *mode) +{ + glob_t globbuf; + FILE *fd; + + if (glob(name, 0, NULL, &globbuf) != 0) + return NULL; + + fd = fopen(globbuf.gl_pathv[0], mode); + globfree(&globbuf); + + return fd; +} + /* see if we have ACPI support */ int check_acpi(void) { @@ -695,7 +712,7 @@ else return 0; } proc_fan_status="/proc/acpi/fan/*/state"; - if ( (fp=fopen(proc_fan_status, "r")) == NULL ) return 0; + if ( (fp=fopen_glob(proc_fan_status, "r")) == NULL ) return 0; fgets(line,255,fp); fclose(fp); @@ -708,10 +725,10 @@ { #ifdef __linux__ FILE *fp; - char *proc_temperature="/proc/acpi/thermal_zone/*0/temperature"; + char *proc_temperature="/proc/acpi/thermal_zone/*/temperature"; static char *p,line[256]; - if ( (fp=fopen(proc_temperature, "r")) == NULL) return NULL; + if ( (fp=fopen_glob(proc_temperature, "r")) == NULL) return NULL; fgets(line,255,fp); fclose(fp); p=strtok(line," "); ++++++ xfce4-battery-plugin-0.5.1-no-battery.patch ++++++ diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/battery.c xfce4-battery-plugin-0.5.1/panel-plugin/battery.c --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/battery.c 2008-09-04 23:10:07.000000000 +0200 +++ xfce4-battery-plugin-0.5.1/panel-plugin/battery.c 2011-01-01 01:20:51.000000000 +0100 @@ -5,6 +5,7 @@ * Copyright (c) 2003 Edscott Wilson Garcia <edscott(a)users.sourceforge.net> * Copyright (c) 2005 Eduard Roccatello <eduard(a)xfce.org> * Copyright (c) 2006 Nick Schermer <nick(a)xfce.org> + * Copyright (c) 2010 Florian Rivoal <frivoal(a)xfce.org> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -491,7 +492,12 @@ if(acline) { - char *t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); + char *t; + if((battmon->method == BM_USE_ACPI) && (acpiinfo->present == 0)) { + t=_("(No battery, AC on-line)"); + } else { + t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); + } if(battmon->options.tooltip_display_percentage) { g_snprintf(buffer, sizeof(buffer), "%d%% %s", charge,t); } ++++++ xfce4-battery-plugin-0.5.1-use-sysfs.patch ++++++ diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.c 2011-01-01 11:09:48.000000000 +0100 +++ xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.c 2011-01-01 11:10:33.000000000 +0100 @@ -55,6 +55,10 @@ static char batteries[MAXBATT][128]; static char battinfo[MAXBATT][128]; +/* path to AC adapter because not all AC adapter are listed +in /sys/class/power_supply/AC/ this obviously only supports one AC adapter. */ +static char sysfsacdir[128]; + #ifndef __linux__ #if HAVE_SYSCTL static int @@ -198,9 +202,76 @@ return fd; } +int check_acpi_sysfs(void) +{ + DIR *sysfs; + struct dirent *batt; + char *name; + FILE *typefile; + char typepath[128]; + char tmptype[8]; + + sysfs = opendir("/sys/class/power_supply"); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:No acpi support for sysfs. Trying procfs...\n"); + #endif + return 2; + } + + while ((batt = readdir(sysfs))) + { + name = batt->d_name; + if (!strncmp(".", name, 1)) continue; + /* check whether /sys/class/power_supply/$name/type exists and + contains "Battery" or "Mains" */ + sprintf(typepath, "/sys/class/power_supply/%s/type",name); + if(!(typefile = fopen(typepath, "r"))) continue; + fgets(tmptype, 8, typefile); + fclose(typefile); + if(strncmp("Battery", tmptype, 7)==0) + { + sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name); + #ifdef DEBUG + printf("DBG:battery number %d at:\n",batt_count); + printf("DBG:sysfs dir->%s\n",batteries[batt_count]); + printf("DBG:------------------------\n"); + #endif + batt_count++; + } + /* I guess that the type of the AC adapter is always "Mains" (?) */ + else if(strncmp("Mains", tmptype, 5)==0){ + sprintf(sysfsacdir, "/sys/class/power_supply/%s", name); + #ifdef DEBUG + printf("DBG:sysfs AC dir->%s\n",sysfsacdir); + printf("DBG:------------------------\n"); + #endif + } + } + closedir(sysfs); + if ( batt_count == 0 ) + { +#ifdef DEBUG + printf("DBG:No acpi support for sysfs. Trying procfs...\n"); +#endif + acpi_sysfs = 0; + return 2; + } + else + { + acpi_sysfs = 1; + return 0; + } +} + /* see if we have ACPI support */ int check_acpi(void) { +#ifdef __linux__ + if ( check_acpi_sysfs() == 0 ) + return 0; +#endif DIR *battdir; struct dirent *batt; char *name; @@ -281,9 +352,82 @@ #endif } +int read_sysfs_int(char* filename) +{ + FILE* f; + f = fopen(filename,"r"); + if ( !f ) + { +#ifdef DEBUG + printf("DBG:Could not open %s\n",filename); +#endif + return 0; + } + int out; + fscanf(f,"%d",&out); + fclose(f); + return out; +} + +char* read_sysfs_string(char* filename) +{ + FILE* f; + f = fopen(filename,"r"); + if ( !f ) + { +#ifdef DEBUG + printf("DBG:Could not open %s\n",filename); +#endif + return NULL; + } + fscanf(f,"%s",buf2); + fclose(f); + return buf2; +} + +int read_acad_state_sysfs(void) +{ + DIR *sysfs; + struct dirent *propety; + char *name; + char onlinefilepath[128]; + + sysfs = opendir(sysfsacdir); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:Can't open %s",sysfsacdir); + #endif + return 0; + } + closedir(sysfs); + + if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate)); + /* this code doesn't make much sense.. why look at the whole directory?! + while ((propety = readdir(sysfs))) + { + name = propety->d_name; + if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; + + if (strcmp(name,"online") == 0) + { + acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ; + } + } + */ + sprintf(onlinefilepath, "%s/online", sysfsacdir); + /* if onlinefilepath doesn't exist read_sysfs_int() will return 0 + so acadstate->state will be 0, that should be ok */ + acadstate->state = ( read_sysfs_int(onlinefilepath) == 1 ); + + return acadstate->state; +} + int read_acad_state(void) { #ifdef __linux__ + if (acpi_sysfs) + return read_acad_state_sysfs(); FILE *acpi; char *ptr; char stat; @@ -373,20 +517,83 @@ #endif } +int read_acpi_info_sysfs(int battery) +{ + DIR *sysfs; + struct dirent *propety; + char *name; + + sysfs = opendir(batteries[battery]); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:Can't open %s!\n", batteries[battery]); + #endif + return 0; + } + /* malloc.. might explain the random battery level values on 2.6.24 + systems (energe_full is called charge_full so the value isn't initialised + and some random data from the heap is displayed..) + if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo)); + */ + if (!acpiinfo) acpiinfo=(ACPIinfo *)calloc(1, sizeof(ACPIinfo)); + + while ((propety = readdir(sysfs))) + { + name = propety->d_name; + if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; + /* at least on my system this is called charge_full */ + if ((strcmp(name,"energy_full") == 0) || (strcmp(name,"charge_full") == 0)) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpiinfo->last_full_capacity = read_sysfs_int(buf); + } + if ((strcmp(name,"energy_full_design") == 0) || (strcmp(name,"charge_full_design") == 0)) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpiinfo->design_capacity = read_sysfs_int(buf); + } + if (strcmp(name,"technology") == 0) + { + char *tmp; + sprintf(buf,"%s/%s",batteries[battery], name); + tmp = read_sysfs_string(buf); + if (tmp != NULL) + { + if (strcmp(tmp,"Li-ion") == 0) + acpiinfo->battery_technology = 1; + else + acpiinfo->battery_technology = 0; + } + } + if (strcmp(name,"present") == 0) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpiinfo->present = read_sysfs_int(buf); + } + } + closedir(sysfs); + return acpiinfo->present; +} + int read_acpi_info(int battery) { #ifdef __linux__ - FILE *acpi; - char *ptr; - char stat; - int temp; - if (battery > MAXBATT) { #ifdef DEBUG printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT); #endif return 0; } + + if (acpi_sysfs) + return read_acpi_info_sysfs(battery); + + FILE *acpi; + char *ptr; + char stat; + int temp; + if (!(acpi = fopen (battinfo[battery], "r"))) { #ifdef DEBUG printf("DBG:cannot open %s for read!\n",battinfo[battery]); @@ -533,9 +740,80 @@ } +int read_acpi_state_sysfs(int battery) +{ + DIR *sysfs; + struct dirent *propety; + char *name; + + sysfs = opendir(batteries[battery]); + if (sysfs == 0) + { + #ifdef DEBUG + printf("DBG:Can't open %s!\n", batteries[battery]); + #endif + return 0; + } + + /* again it might be better to use calloc + if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate)); + */ + if (!acpistate) acpistate=(ACPIstate *)calloc(1, sizeof(ACPIstate)); + + while ((propety = readdir(sysfs))) + { + name = propety->d_name; + if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; + + if (strcmp(name,"status") == 0) + { + char *tmp; + sprintf(buf,"%s/%s",batteries[battery], name); + tmp = read_sysfs_string(buf); + if ( tmp != NULL ) + { + if (strcmp(tmp,"Charging") == 0) + acpistate->state = CHARGING; + else if (strcmp(tmp,"Discharging") == 0) + acpistate->state = DISCHARGING; + else if (strcmp(tmp,"Full") == 0) + acpistate->state = POWER; + else + acpistate->state = UNKNOW; + } + } + /* on my system this is called charge_now */ + if ((strcmp(name,"energy_now") == 0) || (strcmp(name,"charge_now") == 0)) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpistate->rcapacity = read_sysfs_int(buf); + acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100; + } + if (strcmp(name,"current_now") == 0) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpistate->prate = read_sysfs_int(buf); + if ( acpistate->prate < 0 ) + acpistate->prate = 0; + if ( acpistate->prate > 0 ) + acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60; + } + if (strcmp(name,"voltage_now") == 0) + { + sprintf(buf,"%s/%s",batteries[battery], name); + acpistate->pvoltage = read_sysfs_int(buf); + } + } + closedir(sysfs); + return acpiinfo->present; +} + int read_acpi_state(int battery) { #ifdef __linux__ + if (acpi_sysfs) + return read_acpi_state_sysfs(battery); + FILE *acpi; char *ptr; char stat; diff -ur xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.h xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.h --- xfce4-battery-plugin-0.5.1.orig/panel-plugin/libacpi.h 2008-09-04 23:10:07.000000000 +0200 +++ xfce4-battery-plugin-0.5.1/panel-plugin/libacpi.h 2011-01-01 11:10:33.000000000 +0100 @@ -80,6 +80,8 @@ int batt_count; /* temp buffer */ char buf[512]; +char buf2[512]; +int acpi_sysfs; #else extern int batt_count; extern ACPIstate *acpistate; ++++++ xfce4-clipman-plugin-1.1.3-catch-null-value.patch ++++++ diff -ur xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c --- xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c 2009-11-15 21:24:52.000000000 +0100 +++ xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c 2010-12-31 21:58:06.000000000 +0100 @@ -121,7 +121,7 @@ GtkSelectionData *selection_data_cache = NULL; list = manager->priv->default_cache; - for (; list->next != NULL; list = list->next) { + for (; list != NULL && list->next != NULL; list = list->next) { selection_data_cache = list->data; if (selection_data->target == selection_data_cache->target) { break; @@ -154,8 +154,11 @@ GtkSelectionData *sdata; GSList *list; - target_list = gtk_target_list_new (NULL, 0); list = manager->priv->default_cache; + if (list == NULL) { + return; + } + target_list = gtk_target_list_new (NULL, 0); for (; list->next != NULL; list = list->next) { sdata = list->data; gtk_target_list_add (target_list, sdata->target, 0, 0); ++++++ xfce4-clipman-plugin-1.1.3-fix-memory-leak.patch ++++++ diff -ur xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c --- xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c 2010-12-31 21:58:06.000000000 +0100 +++ xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c 2010-12-31 22:04:17.000000000 +0100 @@ -164,6 +164,7 @@ gtk_target_list_add (target_list, sdata->target, 0, 0); } targets = gtk_target_table_new_from_list (target_list, &n_targets); + gtk_target_list_unref (target_list); gtk_clipboard_set_with_data (manager->priv->default_clipboard, targets, n_targets, ++++++ xfce4-fsguard-plugin-0.4.2.tar.bz2 -> xfce4-fsguard-plugin-1.0.0.tar.bz2 ++++++ ++++ 29529 lines of diff (skipped) ++++++ xfce4-genmon-plugin-3.2-close-unused-pipes.patch ++++++ diff -ur xfce4-genmon-plugin-3.2.orig/panel-plugin/cmdspawn.c xfce4-genmon-plugin-3.2/panel-plugin/cmdspawn.c --- xfce4-genmon-plugin-3.2.orig/panel-plugin/cmdspawn.c 2007-11-23 16:32:40.000000000 +0100 +++ xfce4-genmon-plugin-3.2/panel-plugin/cmdspawn.c 2011-01-01 11:27:04.000000000 +0100 @@ -184,6 +184,7 @@ return (-1); case 0: /* Redirect stdout/stderr to associated pipe's write-ends */ + close(0); /* stdin is not used in child */ for (i = 0; i < OUT_ERR; i++) { j = i + 1; // stdout/stderr file descriptor close (j); @@ -199,6 +200,9 @@ exit (-1); } + for (i = 0; i < OUT_ERR; i++) + close (aaiPipe[i][WR]); /* close write end of pipes in parent */ + /* Wait for child completion */ if (wait == 1) { @@ -231,10 +235,9 @@ } End: - /* Close created pipes */ + /* Close read end of pipes */ for (i = 0; i < OUT_ERR; i++) - for (j = 0; j < RD_WR; j++) - close (aaiPipe[i][j]); + close (aaiPipe[i][RD]); return (-fError); }// Spawn() ++++++ xfce4-genmon-plugin-3.2-prevent-zombies.patch ++++++ diff -ur xfce4-genmon-plugin-3.2.orig/panel-plugin/main.c xfce4-genmon-plugin-3.2/panel-plugin/main.c --- xfce4-genmon-plugin-3.2.orig/panel-plugin/main.c 2008-03-15 23:38:18.000000000 +0100 +++ xfce4-genmon-plugin-3.2/panel-plugin/main.c 2011-01-01 11:17:46.000000000 +0100 @@ -32,6 +32,7 @@ #include <libxfce4util/libxfce4util.h> #include <libxfcegui4/dialogs.h> +#include <libxfcegui4/xfce-exec.h> #include <libxfce4panel/xfce-panel-plugin.h> #include <libxfce4panel/xfce-panel-convenience.h> @@ -94,10 +95,18 @@ { struct genmon_t *poPlugin = (genmon_t *) p_pvPlugin; struct monitor_t *poMonitor = &(poPlugin->oMonitor); - char result[256]; + GError *error = NULL; + + xfce_exec(poMonitor->onClickCmd, 0, 0, &error); + if (error) { + char first[256]; + g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd); + xfce_message_dialog (NULL, _("Xfce Panel"), + GTK_STOCK_DIALOG_ERROR, first, error->message, + GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + g_error_free (error); + } - genmon_SpawnCmd (poMonitor->onClickCmd, result, - sizeof (poMonitor->onClickCmd), 0); } /**************************************************************/ ++++++ xfce4-netload-plugin-0.4.0.tar.bz2 -> xfce4-netload-plugin-1.0.0.tar.bz2 ++++++ ++++ 33080 lines of diff (skipped) ++++++ xfce4-notes-plugin-1.7.7-fix-desktop-file.patch ++++++ diff -ur xfce4-notes-plugin-1.7.7.orig/src/xfce4-notes-plugin-47.desktop.in xfce4-notes-plugin-1.7.7/src/xfce4-notes-plugin-47.desktop.in --- xfce4-notes-plugin-1.7.7.orig/src/xfce4-notes-plugin-47.desktop.in 2010-11-07 12:25:41.000000000 +0100 +++ xfce4-notes-plugin-1.7.7/src/xfce4-notes-plugin-47.desktop.in 2011-01-01 13:42:43.000000000 +0100 @@ -6,4 +6,5 @@ Icon=xfce4-notes-plugin X-XFCE-Unique=true X-XFCE-Module=notes +X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ X-XFCE-Internal=FALSE ++++++ xfce4-panel-plugins-rpmlintrc ++++++ addFilter("untranslated-desktop-file .*/usr/share/xfce4/panel-plugins/.*") addFilter("devel-file-in-non-devel-package .*/usr/lib[:digit:]*/xfce4/panel-plugins/.*") ++++++ xfce4-quicklauncher-plugin-1.9.4-add-missing-en-translation.patch ++++++ diff -urN xfce4-quicklauncher-plugin-1.9.4.orig/configure xfce4-quicklauncher-plugin-1.9.4/configure --- xfce4-quicklauncher-plugin-1.9.4.orig/configure 2007-06-27 21:07:14.000000000 +0200 +++ xfce4-quicklauncher-plugin-1.9.4/configure 2011-01-01 11:53:38.000000000 +0100 @@ -21181,7 +21181,7 @@ - ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi" + ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi" for ac_header in locale.h diff -urN xfce4-quicklauncher-plugin-1.9.4.orig/po/en.po xfce4-quicklauncher-plugin-1.9.4/po/en.po --- xfce4-quicklauncher-plugin-1.9.4.orig/po/en.po 1970-01-01 01:00:00.000000000 +0100 +++ xfce4-quicklauncher-plugin-1.9.4/po/en.po 2011-01-01 11:53:38.000000000 +0100 @@ -0,0 +1,87 @@ +# English translation of xfce4-quicklauncher-plugin. +# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-quicklauncher-plugin package. +# Jeff Bailes <thepizzaking(a)gmail.com>, 2007. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: xfce4-quicklauncher-plugin\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-05-17 21:37+0200\n" +"PO-Revision-Date: 2007-03-31 10:17+1000\n" +"Last-Translator: Jeff Bailes <thepizzaking(a)gmail.com>\n" +"Language-Team: English\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit" + +#: ../panel-plugin/callbacks.c:79 +msgid "Configure Quicklauncher" +msgstr "Configure Quicklauncher" + +#: ../panel-plugin/callbacks.c:93 +msgid "Lines: " +msgstr "Lines: " + +#: ../panel-plugin/callbacks.c:123 +msgid "Espace entre les lanceurs :" +msgstr "Space between launchers" + +#: ../panel-plugin/callbacks.c:131 +msgid "afficher les tooltips" +msgstr "Show tooltips" + +#: ../panel-plugin/callbacks.c:135 +msgid "afficher les labels" +msgstr "Show labels" + +#: ../panel-plugin/callbacks.c:216 +msgid "icone" +msgstr "icon" + +#: ../panel-plugin/callbacks.c:222 +msgid "commande" +msgstr "command" + +#: ../panel-plugin/callbacks.c:228 +msgid "nom" +msgstr "name" + +#: ../panel-plugin/callbacks.c:327 +msgid "Open icon" +msgstr "Open icon" + +#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2 +msgid "Quicklauncher" +msgstr "Quicklauncher" + +#: ../panel-plugin/main.c:166 +msgid "Allows you to add launchers easily and display them on many lines." +msgstr "Allows you to add launchers easily and display them on many lines." + +#: ../panel-plugin/main.c:168 +msgid "Other plugins available here" +msgstr "Other plugins available here" + +#: ../panel-plugin/main.c:320 +msgid "Lock" +msgstr "Lock" + +#: ../panel-plugin/main.c:323 +msgid "Parameters" +msgstr "Parameters" + +#: ../panel-plugin/main.c:326 +msgid "Applications" +msgstr "Applications" + +#: ../panel-plugin/main.c:329 +msgid "Help" +msgstr "Help" + +#: ../panel-plugin/quicklauncher.desktop.in.in.h:1 +msgid "Program with several launchers" +msgstr "Program with several launchers" + ++++++ xfce4-quicklauncher-plugin-1.9.4-fix-desktop-file.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in 2005-09-25 21:08:43.000000000 +0200 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in 2011-01-01 13:43:26.000000000 +0100 @@ -4,4 +4,5 @@ _Name=Quicklauncher _Comment=Program with several launchers Icon=gnome-fs-executable -X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so +X-XFCE-Module=libquicklauncher.so +X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ ++++++ xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c 2011-01-01 11:44:18.000000000 +0100 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c 2011-01-01 11:47:16.000000000 +0100 @@ -148,6 +148,7 @@ t_qck_launcher_opt_dlg* dlg; xfce_panel_plugin_block_menu(plugin); dlg = create_qck_launcher_dlg(); + gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin)); qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); gtk_dialog_run(GTK_DIALOG(dlg->dialog)); quicklauncher_save(plugin, quicklauncher); @@ -161,6 +162,7 @@ GtkWidget *about; const gchar* authors[2] = {"Bountykiller <masse_nicolas(a)yahoo.fr>", NULL}; about = gtk_about_dialog_new(); + gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin)); gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher")); gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors); @@ -462,7 +464,7 @@ if(launcher->quicklauncher->_last_zoomed_launcher == launcher) { g_return_val_if_fail(launcher->clicked_img, FALSE); - xfce_exec(launcher->command, FALSE, FALSE, NULL); + xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL); gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img); } else ++++++ xfce4-quicklauncher-plugin-1.9.4-fix-parameters-launcher.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c 2011-01-01 11:40:59.000000000 +0100 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c 2011-01-01 11:44:18.000000000 +0100 @@ -321,7 +321,7 @@ launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM, NULL, quicklauncher); quicklauncher_add_element(quicklauncher, launcher); - launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS, + launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS, NULL, quicklauncher); quicklauncher_add_element(quicklauncher, launcher); launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY, ++++++ xfce4-quicklauncher-plugin-1.9.4-save-settings.patch ++++++ diff -ur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/main.c 2007-05-14 22:42:09.000000000 +0200 +++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c 2011-01-01 11:40:59.000000000 +0100 @@ -150,6 +150,7 @@ dlg = create_qck_launcher_dlg(); qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); gtk_dialog_run(GTK_DIALOG(dlg->dialog)); + quicklauncher_save(plugin, quicklauncher); xfce_panel_plugin_unblock_menu(plugin); } ++++++ xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch -> xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch ++++++ --- xfce4-panel-plugins/xfce4-sensors-plugin-0.10.99.6-fix-build-with-4.7.patch 2010-12-05 20:11:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce4-panel-plugins/xfce4-sensors-plugin-1.0.0-fix-build-with-4.7.patch 2011-01-01 12:50:44.000000000 +0100 @@ -1,6 +1,18 @@ -diff -ur xfce4-sensors-plugin-0.10.99.6.orig/panel-plugin/Makefile.am xfce4-sensors-plugin-0.10.99.6/panel-plugin/Makefile.am ---- xfce4-sensors-plugin-0.10.99.6.orig/panel-plugin/Makefile.am 2008-11-03 22:09:06.000000000 +0100 -+++ xfce4-sensors-plugin-0.10.99.6/panel-plugin/Makefile.am 2010-12-05 14:05:44.000000000 +0100 +diff -ur xfce4-sensors-plugin-1.0.0.orig/include/sensors-interface-common.h xfce4-sensors-plugin-1.0.0/include/sensors-interface-common.h +--- xfce4-sensors-plugin-1.0.0.orig/include/sensors-interface-common.h 2010-03-28 20:11:33.000000000 +0200 ++++ xfce4-sensors-plugin-1.0.0/include/sensors-interface-common.h 2011-01-01 01:46:24.000000000 +0100 +@@ -31,7 +31,7 @@ + /* #include <glib/gprintf.h> */ + + /* Xfce includes */ +-#include <libxfce4panel/xfce-panel-plugin.h> ++#include <libxfce4panel/libxfce4panel.h> + + /* Package includes */ + #include <types.h> +diff -ur xfce4-sensors-plugin-1.0.0.orig/panel-plugin/Makefile.am xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am +--- xfce4-sensors-plugin-1.0.0.orig/panel-plugin/Makefile.am 2009-11-06 12:02:11.000000000 +0100 ++++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am 2011-01-01 01:48:53.000000000 +0100 @@ -20,6 +20,7 @@ xfce4_sensors_plugin_CFLAGS = \ @@ -9,22 +21,28 @@ @PLATFORM_CFLAGS@ \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @LIBSENSORS_CFLAGS@ -@@ -30,6 +31,7 @@ - xfce4_sensors_plugin_LDFLAGS = \ +@@ -27,9 +28,10 @@ + # @GTK_CFLAGS@ \ + # @GLIB_CFLAGS@ + +-xfce4_sensors_plugin_LDFLAGS = \ ++xfce4_sensors_plugin_LDADD = \ $(top_builddir)/lib/libxfce4sensors.la @LIBXFCE4PANEL_LIBS@ \ -+ @LIBXFCEGUI4_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ \ @SOLLIBS@ \ @LIBSENSORS_LDFLAGS@ -diff -ur xfce4-sensors-plugin-0.10.99.6.orig/src/Makefile.am xfce4-sensors-plugin-0.10.99.6/src/Makefile.am ---- xfce4-sensors-plugin-0.10.99.6.orig/src/Makefile.am 2008-11-03 22:09:06.000000000 +0100 -+++ xfce4-sensors-plugin-0.10.99.6/src/Makefile.am 2010-12-05 14:18:33.000000000 +0100 -@@ -28,6 +28,7 @@ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBSENSORS_CFLAGS@ \ +diff -ur xfce4-sensors-plugin-1.0.0.orig/src/Makefile.am xfce4-sensors-plugin-1.0.0/src/Makefile.am +--- xfce4-sensors-plugin-1.0.0.orig/src/Makefile.am 2009-11-06 12:02:11.000000000 +0100 ++++ xfce4-sensors-plugin-1.0.0/src/Makefile.am 2011-01-01 10:39:52.000000000 +0100 +@@ -27,7 +27,8 @@ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + @LIBSENSORS_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ -+ @LIBXFCE4PANEL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ +- @LIBXFCEGUI4_CFLAGS@ ++ @LIBXFCEGUI4_CFLAGS@ \ ++ @LIBXFCE4PANEL_CFLAGS@ - # @GTK_CFLAGS@ \ + # @GTK_CFLAGS@ \ + # @GLIB_CFLAGS@ \ ++++++ xfce4-sensors-plugin-1.0.0-fix-memory-leaks.patch ++++++ diff -ur xfce4-sensors-plugin-1.0.0.orig/lib/acpi.c xfce4-sensors-plugin-1.0.0/lib/acpi.c --- xfce4-sensors-plugin-1.0.0.orig/lib/acpi.c 2010-03-27 16:11:48.000000000 +0100 +++ xfce4-sensors-plugin-1.0.0/lib/acpi.c 2011-01-01 01:23:15.000000000 +0100 @@ -631,6 +631,7 @@ TRACE ("leaves get_acpi_info"); version = get_acpi_value (filename); + g_free (filename); if (version!=NULL) version = g_strchomp (version); @@ -654,6 +655,7 @@ filename = g_strdup_printf ("%s/%s/%s", ACPI_PATH, zone, file); value = get_acpi_value (filename); + g_free(filename); TRACE ("leaves get_acpi_zone_value with correctly converted value"); ++++++ xfce4-sensors-plugin-1.0.0-fix-uninitialized-memory.patch ++++++ diff -ur xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface-common.c xfce4-sensors-plugin-1.0.0/lib/sensors-interface-common.c --- xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface-common.c 2010-03-27 16:11:48.000000000 +0100 +++ xfce4-sensors-plugin-1.0.0/lib/sensors-interface-common.c 2011-01-07 12:27:27.000000000 +0100 @@ -43,7 +43,7 @@ TRACE ("enters sensors_new"); - sensors = g_new (t_sensors, 1); + sensors = g_new0 (t_sensors, 1); sensors->plugin_config_file = plugin_config_file; /* important as we check against NULL frequently */ /* init xfce sensors stuff width default values */ @@ -69,6 +69,7 @@ chipfeature->address = 0; chip->sensorId = g_strdup(_("No sensors found!")); + chip->description = g_strdup(_("No sensors found!")); chip->num_features = 1; chipfeature->color = g_strdup("#000000"); /* g_free (chipfeature->name); */ ++++++ xfce4-sensors-plugin-0.10.99.6.tar.bz2 -> xfce4-sensors-plugin-1.0.0.tar.bz2 ++++++ ++++ 98263 lines of diff (skipped) ++++++ xfce4-smartbookmark-plugin-0.4.2-fix-desktop-file.patch ++++++ diff -ur xfce4-smartbookmark-plugin-0.4.2.orig/src/smartbookmark.desktop.in.in xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.desktop.in.in --- xfce4-smartbookmark-plugin-0.4.2.orig/src/smartbookmark.desktop.in.in 2006-08-12 19:41:44.000000000 +0200 +++ xfce4-smartbookmark-plugin-0.4.2/src/smartbookmark.desktop.in.in 2011-01-01 13:43:54.000000000 +0100 @@ -4,5 +4,6 @@ _Name=SmartBookmark _Comment=Query websites from the Xfce panel Icon=gtk-preferences -X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so +X-XFCE-Module=libsmartbookmark.so +X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ X-XFCE-Unique=false ++++++ xfce4-systemload-plugin-0.4.2.tar.bz2 -> xfce4-systemload-plugin-1.0.0.tar.bz2 ++++++ ++++ 56061 lines of diff (skipped) ++++++ xfce4-time-out-plugin-0.1.1.tar.bz2 -> xfce4-time-out-plugin-1.0.0.tar.bz2 ++++++ ++++ 63293 lines of diff (skipped) ++++++ xfce4-verve-plugin-0.3.6.tar.bz2 -> xfce4-verve-plugin-1.0.0.tar.bz2 ++++++ ++++ 73395 lines of diff (skipped) ++++++ xfce4-xkb-plugin-0.5.3.3-check-retval.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c 2009-03-06 14:16:03.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:15:41.000000000 +0100 @@ -831,9 +831,11 @@ gint i = 0; model = GTK_TREE_MODEL (xkb->combo_store); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter); - gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); - kbd_config->model = kbdmodel; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter)) + { + gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); + kbd_config->model = kbdmodel; + } model = GTK_TREE_MODEL (xkb->toggle_options_store); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter)) ++++++ xfce4-xkb-plugin-0.5.3.3-do-not-free-stack-memory.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2011-01-01 01:14:16.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2011-01-01 01:18:16.000000000 +0100 @@ -290,7 +290,7 @@ if (settings->kbd_config->toggle_option && strlen (settings->kbd_config->toggle_option) > 0) options = g_strdup (settings->kbd_config->toggle_option); - else options = ""; + else options = g_strdup (""); if (settings->kbd_config->compose_key_position && strlen (settings->kbd_config->compose_key_position) > 0) @@ -312,11 +312,11 @@ { prefix = g_strsplit(*opt, ":", 2); if (settings->kbd_config->toggle_option == NULL - && prefix && strcmp(*prefix, "grp") == 0) + && prefix && *prefix && strcmp(*prefix, "grp") == 0) { settings->kbd_config->toggle_option = g_strdup (*opt); } - else if (prefix && strcmp(*prefix, "compose") == 0) + else if (prefix && *prefix && strcmp(*prefix, "compose") == 0) { settings->kbd_config->compose_key_position = g_strdup (*opt); } ++++++ xfce4-xkb-plugin-0.5.3.3-fix-array-size.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:15:41.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:19:07.000000000 +0100 @@ -678,7 +678,7 @@ xfce_xkb_about (XfcePanelPlugin *plugin) { GtkWidget *about; - const gchar* authors[2] = { + const gchar* authors[3] = { "Alexander Iliev <sasoiliev(a)mamul.org>", "Gauvain Pocentek <gauvainpocentek(a)gmail.com>", NULL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apparmor for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at Tue Jan 25 13:16:44 CET 2011. -------- --- apparmor/apparmor.changes 2011-01-18 11:55:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/apparmor/apparmor.changes 2011-01-24 20:16:37.000000000 +0100 @@ -1,0 +2,30 @@ +Mon Jan 24 20:16:03 CET 2011 - jeffm(a)suse.de + +- Inherit flags in sub-profiles when generating profiles (bnc#496204). + +------------------------------------------------------------------- +Mon Jan 24 01:02:53 CET 2011 - jeffm(a)suse.de + +- Stop treating profiles shipped with the package as config files. + - /etc/apparmor.d will still be treated specially. +- Add support for parsing network operation events (bnc#665483) + +------------------------------------------------------------------- +Mon Jan 24 00:23:35 CET 2011 - jeffm(a)suse.de + +- Fix for sbin.klogd profile using kernel versions >= 2.6.38-rc1. + +------------------------------------------------------------------- +Mon Jan 24 00:11:28 CET 2011 - jeffm(a)suse.de + +- Update to apparmor-2.5 r1445. + - Includes 3 of the fixes below. + - Several testsuite fixes. + - Update for Thunderbird profile. + +------------------------------------------------------------------- +Fri Jan 21 19:07:15 CET 2011 - jeffm(a)suse.de + +- Add support for libvirt in usr.sbin.dnsmasq (bnc#666090) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- apparmor-2.5.1-fix-parser-use-after-free apparmor-utils-support-newer-auditd-formatted-messages fix-two-x-transition-conflict-bugs testsuite-build-fix New: ---- apparmor-2.5-r1445 apparmor-2.5.1-dnsmasq-libvirt-profile-fix apparmor-2.5.1-network-fixes apparmor-utils-inherit-flags-during-profile-generation klog-needs-CAP_SYSLOG ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.MYf8zX/_old 2011-01-25 13:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.MYf8zX/_new 2011-01-25 13:16:30.000000000 +0100 @@ -32,6 +32,9 @@ %define JAR_FILE changeHatValve.jar %define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR) +%define srcversion 2.5.1 +%define bzr_commit r1445 + Name: apparmor %if ! %{?distro:1}0 %if %{?suse_version:1}0 @@ -45,14 +48,14 @@ %define distro suse %endif Summary: AppArmor userlevel parser utility -Version: 2.5.1 -Release: 2 +Version: %{srcversion}.%{bzr_commit} +Release: 1 Group: Productivity/Networking/Security -Source0: apparmor-%{version}.tar.bz2 +Source0: apparmor-%{srcversion}.tar.bz2 Source1: %{name}-profile-editor.png Source2: %{name}-profile-editor.desktop Source3: update-trans.sh -Patch: testsuite-build-fix +Patch: apparmor-2.5-%{bzr_commit} Patch1: pam-apparmor-include Patch2: mod_apparmor-includes Patch3: tomcat-build-fixes @@ -81,12 +84,15 @@ Patch26: apparmor-2.5.1-edirectory-profile Patch27: apparmor-2.5.1-firefox-proc-fix Patch28: apparmor-2.5.1-unconfined-fixes -Patch29: apparmor-2.5.1-fix-parser-use-after-free +Patch29: apparmor-utils-inherit-flags-during-profile-generation Patch30: apparmor-2.5.1-ldapclient-profile -Patch31: apparmor-utils-support-newer-auditd-formatted-messages -Patch32: fix-two-x-transition-conflict-bugs +#Patch31: +#Patch32: Patch33: apparmor-2.5.1-ntpd-sys_nice Patch34: apparmor-2.5.1-ssl-fix +Patch35: apparmor-2.5.1-dnsmasq-libvirt-profile-fix +Patch36: klog-needs-CAP_SYSLOG +Patch37: apparmor-2.5.1-network-fixes License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: https://launchpad.net/apparmor @@ -157,6 +163,7 @@ Provides: subdomain-parser-common = %{version} Provides: subdomain-leaf-cert = %{version} Provides: libimnxcert = %{version} +Provides: apparmor-parser(CAP_SYSLOG) %description parser The AppArmor Parser is a userlevel program that is used to load in @@ -311,6 +318,7 @@ Group: Productivity/Security Obsoletes: subdomain-profiles < %{version} Provides: subdomain-profiles = %{version} +Requires: apparmor-parser(CAP_SYSLOG) %description profiles Base profiles. AppArmor is a file and network mandatory access control @@ -453,7 +461,7 @@ %endif %prep -%setup -q +%setup -q -n %{name}-%{srcversion} %patch -p1 %patch1 -p1 %patch2 -p1 @@ -485,10 +493,11 @@ %patch28 -p1 %patch29 -p1 %patch30 -p1 -%patch31 -p1 -%patch32 -p1 %patch33 -p1 %patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 %build export SUSE_ASNEEDED=0 @@ -658,7 +667,7 @@ %files profiles %defattr(-,root,root) %attr(644, root, root) %config(noreplace) %{profiles_dir}/* -%attr(644, root, root) %config(noreplace) %{extras_dir}/* +%attr(644, root, root) %{extras_dir}/* %dir %{_sysconfdir}/apparmor.d/ %dir %{_sysconfdir}/apparmor/ %dir %{_sysconfdir}/apparmor/profiles ++++++ apparmor-2.5-r1445 ++++++ ++++ 705 lines (skipped) ++++++ apparmor-2.5.1-dnsmasq-libvirt-profile-fix ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: profiles: Add libvirt pid support to dnsmasq profile References: bnc#666090 libvirt starts up dnsmasq with its pid file in Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- profiles/apparmor.d/usr.sbin.dnsmasq | 6 ++++++ 1 file changed, 6 insertions(+) --- a/profiles/apparmor.d/usr.sbin.dnsmasq +++ b/profiles/apparmor.d/usr.sbin.dnsmasq @@ -8,6 +8,9 @@ capability setgid, capability setuid, capability dac_override, + capability net_admin, # for DHCP server + capability net_raw, # for DHCP server ping checks + network inet raw, /etc/dnsmasq.conf r, /etc/dnsmasq.d/ r, @@ -19,5 +22,8 @@ /var/run/dnsmasq/ r, /var/run/dnsmasq/* rw, + /var/run/libvirt/network/ r, # Required when called by libvirt + /var/run/libvirt/network/*.pid rw, # Required when called by libvirt + /var/lib/misc/dnsmasq.leases rw, # Required only for DHCP server usage } ++++++ apparmor-2.5.1-network-fixes ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: apparmor: Fix network event parsing References: bnc#665483 The upstream version of AppArmor had network mediation but it was removed. There's a compability patch floating around that both openSUSE and Ubuntu have applied to their kernels. Unfortunately, one part was overlooked. The socket operation event names where changed from the socket_ prefixed names they had when AppArmor was out-of-tree and utils/SubDomain.pm was never updated to understand them. This patch adds an operation-type table so that the code can just do a optype($operation) call to discover what type of operation a particular name refers to. It then uses this in place of the socket_ checks to decide whether an event is a network operation. This allows genprof and logprof to work with networking rules again. Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- utils/SubDomain.pm | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) --- a/utils/SubDomain.pm +++ b/utils/SubDomain.pm @@ -233,6 +233,50 @@ my %MODE_HASH = ( N => $AA_EXEC_NT, ); + +# Currently only used by netdomain but there's no reason it couldn't +# be extended to support other types. +my %operation_types = ( + + # Old socket names + "socket_create", => "net", + "socket_post_create" => "net", + "socket_bind" => "net", + "socket_connect" => "net", + "socket_listen" => "net", + "socket_accept" => "net", + "socket_sendmsg" => "net", + "socket_recvmsg" => "net", + "socket_getsockname" => "net", + "socket_getpeername" => "net", + "socket_getsockopt" => "net", + "socket_setsockopt" => "net", + "socket_shutdown" => "net", + + # New socket names + "create" => "net", + "post_create" => "net", + "bind" => "net", + "connect" => "net", + "listen" => "net", + "accept" => "net", + "sendmsg" => "net", + "recvmsg" => "net", + "getsockname" => "net", + "getpeername" => "net", + "getsockopt" => "net", + "setsockopt" => "net", + "sock_shutdown" => "net", +); + +sub optype($) { + my $op = shift; + my $type = $operation_types{$op}; + + return "unknown" if !defined($type); + return $type; +} + sub debug ($) { my $message = shift; chomp($message); @@ -2911,7 +2955,7 @@ sub add_event_to_tree ($) { } $pid{$child} = $arrayref; push @{$arrayref}, [ "fork", $child, $profile, $hat ]; - } elsif ($e->{operation} =~ m/socket_/) { + } elsif (optype($e->{operation}) eq "net") { add_to_tree( $e->{pid}, $e->{parent}, "netdomain", @@ -6620,7 +6664,7 @@ sub parse_event($) { LibAppArmor::aa_log_record::swig_magic_token_get($event); # NetDomain - if ( $ev{'operation'} && $ev{'operation'} =~ /socket/ ) { + if ( $ev{'operation'} && optype($ev{'operation'}) eq "net" ) { $ev{'family'} = LibAppArmor::aa_log_record::swig_net_family_get($event); $ev{'protocol'} = ++++++ apparmor-2.5.1-unconfined-fixes ++++++ --- /var/tmp/diff_new_pack.MYf8zX/_old 2011-01-25 13:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.MYf8zX/_new 2011-01-25 13:16:30.000000000 +0100 @@ -35,23 +35,3 @@ # just convert new null profile style names to old before we begin processing # profile and name can contain multiple layers of null- but all we care about # currently is single level. -@@ -6625,10 +6632,15 @@ sub parse_event($) { - LibAppArmor::free_record($event); - - #map new c and d to w as logprof doesn't support them yet -- $rmask =~ s/c/w/g; -- $rmask =~ s/d/w/g; -- $dmask =~ s/c/w/g; -- $dmask =~ s/d/w/g; -+ if ($rmask) { -+ $rmask =~ s/c/w/g; -+ $rmask =~ s/d/w/g; -+ } -+ -+ if ($dmask) { -+ $dmask =~ s/c/w/g; -+ $dmask =~ s/d/w/g; -+ } - - if ($rmask && !validate_log_mode(hide_log_mode($rmask))) { - fatal_error(sprintf(gettext('Log contains unknown mode %s.'), ++++++ apparmor-2.5.1-unified-build ++++++ --- /var/tmp/diff_new_pack.MYf8zX/_old 2011-01-25 13:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.MYf8zX/_new 2011-01-25 13:16:30.000000000 +0100 @@ -43,6 +43,94 @@ libraries/libapparmor/config.guess | 1502 - libraries/libapparmor/config.sub | 1714 - libraries/libapparmor/configure |13962 ---------- + AUTHORS | 1 + ChangeLog | 1 + INSTALL | 365 + Makefile.am | 2 + NEWS | 1 + README | 1 + changehat/Makefile.am | 1 + changehat/mod_apparmor/Makefile.am | 19 + changehat/mod_apparmor/apache2-mod_apparmor.spec.in | 216 + changehat/pam_apparmor/COPYING | 39 + changehat/pam_apparmor/Makefile.am | 9 + changehat/pam_apparmor/pam_apparmor.changes | 49 + changehat/pam_apparmor/pam_apparmor.spec.in | 83 + changehat/tomcat_apparmor/Makefile.am | 1 + changehat/tomcat_apparmor/tomcat_5_0/Makefile.am | 2 + changehat/tomcat_apparmor/tomcat_5_5/Makefile.am | 13 + changehat/tomcat_apparmor/tomcat_5_5/build.xml | 11 + changehat/tomcat_apparmor/tomcat_5_5/src/Makefile.am | 1 + changehat/tomcat_apparmor/tomcat_5_5/src/jni_src/Makefile.am | 17 + config.rpath | 666 + configure.in | 220 + deprecated/Makefile.am | 2 + deprecated/management/Makefile.am | 1 + deprecated/management/apparmor-dbus/Makefile.am | 2 + deprecated/management/apparmor-dbus/src/Makefile.am | 3 + deprecated/management/applets/Makefile.am | 1 + deprecated/management/applets/apparmorapplet-gnome/Makefile.am | 4 + deprecated/management/applets/apparmorapplet-gnome/po/Makefile | 30 + deprecated/management/applets/apparmorapplet-gnome/po/Makefile.in.in | 258 + deprecated/management/applets/apparmorapplet-gnome/src/Makefile.am | 8 + deprecated/management/profile-editor/Makefile.am | 2 + deprecated/management/profile-editor/src/Makefile.am | 6 + deprecated/management/profile-editor/src/wxStyledTextCtrl/Makefile.am | 4 + libraries/Makefile.am | 1 + libraries/libapparmor/AUTHORS | 2 + libraries/libapparmor/ChangeLog | 1 + libraries/libapparmor/INSTALL | 236 + libraries/libapparmor/NEWS | 1 + libraries/libapparmor/README | 1 + libraries/libapparmor/autogen.sh | 42 + libraries/libapparmor/compile | 143 + libraries/libapparmor/config.guess | 1502 - + libraries/libapparmor/config.sub | 1714 - + libraries/libapparmor/configure |13962 ---------- + AUTHORS | 1 + ChangeLog | 1 + INSTALL | 365 + Makefile.am | 2 + NEWS | 1 + README | 1 + changehat/Makefile.am | 1 + changehat/mod_apparmor/Makefile.am | 19 + changehat/mod_apparmor/apache2-mod_apparmor.spec.in | 216 + changehat/pam_apparmor/COPYING | 39 + changehat/pam_apparmor/Makefile.am | 9 + changehat/pam_apparmor/pam_apparmor.changes | 49 + changehat/pam_apparmor/pam_apparmor.spec.in | 83 + changehat/tomcat_apparmor/Makefile.am | 1 + changehat/tomcat_apparmor/tomcat_5_0/Makefile.am | 2 + changehat/tomcat_apparmor/tomcat_5_5/Makefile.am | 13 + changehat/tomcat_apparmor/tomcat_5_5/build.xml | 11 + changehat/tomcat_apparmor/tomcat_5_5/src/Makefile.am | 1 + changehat/tomcat_apparmor/tomcat_5_5/src/jni_src/Makefile.am | 17 + config.rpath | 666 + configure.in | 220 + deprecated/Makefile.am | 2 + deprecated/management/Makefile.am | 1 + deprecated/management/apparmor-dbus/Makefile.am | 2 + deprecated/management/apparmor-dbus/src/Makefile.am | 3 + deprecated/management/applets/Makefile.am | 1 + deprecated/management/applets/apparmorapplet-gnome/Makefile.am | 4 + deprecated/management/applets/apparmorapplet-gnome/po/Makefile | 30 + deprecated/management/applets/apparmorapplet-gnome/po/Makefile.in.in | 258 + deprecated/management/applets/apparmorapplet-gnome/src/Makefile.am | 8 + deprecated/management/profile-editor/Makefile.am | 2 + deprecated/management/profile-editor/src/Makefile.am | 6 + deprecated/management/profile-editor/src/wxStyledTextCtrl/Makefile.am | 4 + libraries/Makefile.am | 1 + libraries/libapparmor/AUTHORS | 2 + libraries/libapparmor/ChangeLog | 1 + libraries/libapparmor/INSTALL | 236 + libraries/libapparmor/NEWS | 1 + libraries/libapparmor/README | 1 + libraries/libapparmor/autogen.sh | 42 + libraries/libapparmor/compile | 143 + libraries/libapparmor/config.guess | 1502 - + libraries/libapparmor/config.sub | 1714 - + libraries/libapparmor/configure |13962 ---------- libraries/libapparmor/doc/Makefile.am | 14 libraries/libapparmor/install-sh | 520 libraries/libapparmor/libapparmor1.spec | 178 @@ -64,8 +152,8 @@ m4/wxwidgets.m4 | 37 parser/Makefile.am | 81 parser/libapparmor_re/Makefile.am | 4 - parser/libapparmor_re/regexp.y | 2800 -- - parser/libapparmor_re/regexp.yy | 2800 ++ + parser/libapparmor_re/regexp.y | 2802 -- + parser/libapparmor_re/regexp.yy | 2802 ++ parser/parser_alias.c | 1 parser/parser_main.c | 3 parser/parser_policy.c | 1 @@ -80,7 +168,7 @@ utils/Makefile.PL | 15 utils/Makefile.am | 39 utils/po/Makefile | 8 - 81 files changed, 4902 insertions(+), 22094 deletions(-) + 81 files changed, 4904 insertions(+), 22096 deletions(-) --- /dev/null +++ b/AUTHORS @@ -21585,7 +21673,7 @@ +libapparmor_re_la_SOURCES = regexp.yy --- a/parser/libapparmor_re/regexp.y +++ /dev/null -@@ -1,2800 +0,0 @@ +@@ -1,2802 +0,0 @@ -/* - * regexp.y -- Regular Expression Matcher Generator - * (C) 2006, 2007 Andreas Gruenbacher <agruen(a)suse.de> @@ -22308,17 +22396,19 @@ - Node *i = t->child[!dir]; - for (;dynamic_cast<AltNode *>(i); p = i, i = i->child[!dir]) { - if (t->child[dir]->eq(i->child[dir])) { +- Node *old = t; - t->child[!dir]->dup(); -- t->release(); - t = t->child[!dir]; +- old->release(); - continue; - } - } - // last altnode of chain check other dir as well - if (t->child[dir]->eq(p->child[!dir])) { +- Node *old = t; - t->child[!dir]->dup(); -- t->release(); - t = t->child[!dir]; +- old->release(); - continue; - } - @@ -24169,9 +24259,9 @@ -#define MATCH_FLAGS_SIZE (sizeof(uint32_t) * 8 - 1) -MatchFlag *match_flags[FLAGS_WIDTH][MATCH_FLAGS_SIZE]; -DenyMatchFlag *deny_flags[FLAGS_WIDTH][MATCH_FLAGS_SIZE]; --#define EXEC_MATCH_FLAGS_SIZE ((AA_EXEC_COUNT << 2) * 2) --MatchFlag *exec_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE]; /* mods + unsafe + ix *u::o*/ --ExactMatchFlag *exact_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE];/* mods + unsafe +ix *u::o*/ +-#define EXEC_MATCH_FLAGS_SIZE (AA_EXEC_COUNT *2 * 2 * 2) /* double for each of ix pux, unsafe x bits * u::o */ +-MatchFlag *exec_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE]; /* mods + unsafe + ix + pux * u::o*/ +-ExactMatchFlag *exact_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE];/* mods + unsafe + ix + pux *u::o*/ - -extern "C" void aare_reset_matchflags(void) -{ @@ -24232,8 +24322,8 @@ - flip_tree(tree); - - --/* 0x3f == 4 bits x mods + 1 bit unsafe mask + 1 bit ix, after shift */ --#define EXTRACT_X_INDEX(perm, shift) (((perm) >> (shift + 8)) & 0x3f) +-/* 0x7f == 4 bits x mods + 1 bit unsafe mask + 1 bit ix, + 1 pux after shift */ +-#define EXTRACT_X_INDEX(perm, shift) (((perm) >> (shift + 7)) & 0x7f) - -//if (perms & ALL_AA_EXEC_TYPE && (!perms & AA_EXEC_BITS)) -// fprintf(stderr, "adding X rule without MAY_EXEC: 0x%x %s\n", perms, rulev[0]); @@ -24388,7 +24478,7 @@ -} --- /dev/null +++ b/parser/libapparmor_re/regexp.yy -@@ -0,0 +1,2800 @@ +@@ -0,0 +1,2802 @@ +/* + * regexp.y -- Regular Expression Matcher Generator + * (C) 2006, 2007 Andreas Gruenbacher <agruen(a)suse.de> @@ -25111,17 +25201,19 @@ + Node *i = t->child[!dir]; + for (;dynamic_cast<AltNode *>(i); p = i, i = i->child[!dir]) { + if (t->child[dir]->eq(i->child[dir])) { ++ Node *old = t; + t->child[!dir]->dup(); -+ t->release(); + t = t->child[!dir]; ++ old->release(); + continue; + } + } + // last altnode of chain check other dir as well + if (t->child[dir]->eq(p->child[!dir])) { ++ Node *old = t; + t->child[!dir]->dup(); -+ t->release(); + t = t->child[!dir]; ++ old->release(); + continue; + } + @@ -26972,9 +27064,9 @@ +#define MATCH_FLAGS_SIZE (sizeof(uint32_t) * 8 - 1) +MatchFlag *match_flags[FLAGS_WIDTH][MATCH_FLAGS_SIZE]; +DenyMatchFlag *deny_flags[FLAGS_WIDTH][MATCH_FLAGS_SIZE]; -+#define EXEC_MATCH_FLAGS_SIZE ((AA_EXEC_COUNT << 2) * 2) -+MatchFlag *exec_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE]; /* mods + unsafe + ix *u::o*/ -+ExactMatchFlag *exact_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE];/* mods + unsafe +ix *u::o*/ ++#define EXEC_MATCH_FLAGS_SIZE (AA_EXEC_COUNT *2 * 2 * 2) /* double for each of ix pux, unsafe x bits * u::o */ ++MatchFlag *exec_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE]; /* mods + unsafe + ix + pux * u::o*/ ++ExactMatchFlag *exact_match_flags[FLAGS_WIDTH][EXEC_MATCH_FLAGS_SIZE];/* mods + unsafe + ix + pux *u::o*/ + +extern "C" void aare_reset_matchflags(void) +{ @@ -27035,8 +27127,8 @@ + flip_tree(tree); + + -+/* 0x3f == 4 bits x mods + 1 bit unsafe mask + 1 bit ix, after shift */ -+#define EXTRACT_X_INDEX(perm, shift) (((perm) >> (shift + 8)) & 0x3f) ++/* 0x7f == 4 bits x mods + 1 bit unsafe mask + 1 bit ix, + 1 pux after shift */ ++#define EXTRACT_X_INDEX(perm, shift) (((perm) >> (shift + 7)) & 0x7f) + +//if (perms & ALL_AA_EXEC_TYPE && (!perms & AA_EXEC_BITS)) +// fprintf(stderr, "adding X rule without MAY_EXEC: 0x%x %s\n", perms, rulev[0]); ++++++ apparmor-no-caching-test ++++++ --- /var/tmp/diff_new_pack.MYf8zX/_old 2011-01-25 13:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.MYf8zX/_new 2011-01-25 13:16:30.000000000 +0100 @@ -7,9 +7,9 @@ @@ -12,7 +12,7 @@ endif all: tests - .PHONY: tests error_output parser_sanity caching --tests: error_output parser_sanity caching -+tests: error_output parser_sanity + .PHONY: tests error_output gen_xtrans parser_sanity caching +-tests: error_output gen_xtrans parser_sanity caching ++tests: error_output gen_xtrans parser_sanity - error_output: $(PARSER) - $(PARSER) -S -I errors >/dev/null errors/okay.sd + gen_xtrans: + perl ./gen-xtrans.pl ++++++ apparmor-utils-inherit-flags-during-profile-generation ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: apparmor-utils: Inherit flags in sub-profiles when generating profiles References: bnc#496204 When creating profiles with cx subprofiles, genprof will set the sub-profile in enforce mode. When genprof cycles multiple times, it prohibits the sub-profile from working correctly. e.g. # Last Modified: Mon Jan 24 13:52:26 2011 #include <tunables/global> /home/jeffm/mycat flags=(complain) { #include <abstractions/base> #include <abstractions/bash> #include <abstractions/consoles> /bin/bash ix, /bin/cat cx, /home/jeffm/mycat r, profile /bin/cat { #include <abstractions/base> /bin/cat r, /home/jeffm/mycat r, } } This patch allows sub-profiles to inherit the flags from the parent profile, which allows it to be created in complain mode (if appropriate). The temporary complain flags are cleaned up at genprof completion as expected. This issue was reported at: https://bugzilla.novell.com/show_bug.cgi?id=496204 Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- utils/SubDomain.pm | 6 ++++++ 1 file changed, 6 insertions(+) --- a/utils/SubDomain.pm +++ b/utils/SubDomain.pm @@ -2337,6 +2337,12 @@ sub handlechildren { # we have seen more than a declaration so clear it $sd{$profile}{$hat}{'declared'} = 0; $sd{$profile}{$hat}{profile} = 1; + + # Otherwise sub-profiles end up getting + # put in enforce mode with genprof + $sd{$profile}{$hat}{flags} = $sd{$profile}{$profile}{flags} if $profile ne $hat; + + $sd{$profile}{$hat}{flags} = 'complain'; $sd{$profile}{$hat}{allow}{path} = { }; $sd{$profile}{$hat}{allow}{netdomain} = { }; my $file = $sd{$profile}{$profile}{filename}; ++++++ klog-needs-CAP_SYSLOG ++++++ --- parser/parser_misc.c | 4 ++++ profiles/apparmor.d/sbin.klogd | 1 + 2 files changed, 5 insertions(+) --- a/parser/parser_misc.c +++ b/parser/parser_misc.c @@ -122,6 +122,9 @@ static int get_table_token(const char *n static struct keyword_table capability_table[] = { /* capabilities */ #include "cap_names.h" +#ifndef CAP_SYSLOG + {"syslog", 34}, +#endif /* terminate */ {NULL, 0} }; @@ -820,6 +823,7 @@ static const char *capnames[] = { "audit_control", "setfcap", "mac_override" + "syslog", }; const char *capability_to_name(unsigned int cap) --- a/profiles/apparmor.d/sbin.klogd +++ b/profiles/apparmor.d/sbin.klogd @@ -15,6 +15,7 @@ #include <abstractions/base> capability sys_admin, + capability syslog, network inet stream, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Tue Jan 25 13:13:42 CET 2011. -------- --- kiwi/kiwi.changes 2011-01-23 21:34:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-01-25 11:14:58.000000000 +0100 @@ -1,0 +2,30 @@ +Tue Jan 25 10:02:40 CET 2011 - ms(a)suse.de + +- reverted the following commits: + + eeecf05d029e7e75abfc44a5c2c600263838c50e + 438e83976cbd12dde20511ea5d000620082fa066 + + They broke the yast autoyast and firstboot setup. The provided + config-yast-autoyast.xml or config-yast-firstboot.xml were not + handled anymore + +------------------------------------------------------------------- +Mon Jan 24 17:31:23 CET 2011 - ms(a)suse.de + +- removed fdisk support entirely except for changing the + partition table created by the isohybrid tool. parted can't + handle that table and therefore we use fdisk inside the + function createHybridPersistent() but nowhere else anymore + +------------------------------------------------------------------- +Mon Jan 24 17:25:38 CET 2011 - ms(a)suse.de + +- update schema and kiwi documentation + +------------------------------------------------------------------- +Mon Jan 24 12:49:57 CET 2011 - ms(a)suse.de + +- fixed mdadm --stop call for pxe raid(1) boot + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.jkx7XG/_old 2011-01-25 13:12:59.000000000 +0100 +++ /var/tmp/diff_new_pack.jkx7XG/_new 2011-01-25 13:12:59.000000000 +0100 @@ -66,7 +66,7 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.71 -Release: 1 +Release: 2 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-01-21 16:01:41.000000000 +0100 +++ new/kiwi/.revision 2011-01-25 11:11:07.000000000 +0100 @@ -1 +1 @@ -696f4fee72f6539219d2b6f6028de61641b665a9 +d3846132b7353b1c93229c87447a6085c7ead466 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-01-21 16:01:41.000000000 +0100 +++ new/kiwi/kiwi.pl 2011-01-25 11:11:07.000000000 +0100 @@ -1512,11 +1512,10 @@ } if (defined $Partitioner) { if ( - ($Partitioner ne "fdisk") && ($Partitioner ne "parted") && ($Partitioner ne "fdasd") ) { - $kiwi -> error ("Invalid partitioner, expected fdisk|parted"); + $kiwi -> error ("Invalid partitioner, expected parted|fdasd"); $kiwi -> failed (); my $code = kiwiExit (1); return $code; } @@ -1716,9 +1715,9 @@ print " Set the maximal time between two filesystem checks for ext[234].\n"; print " Set to 0 to disable time-dependent checks.\n"; print "\n"; - print " [ --partitioner <fdisk|parted> ]\n"; + print " [ --partitioner <parted|fdasd> ]\n"; print " Select the tool to create partition tables. Supported are\n"; - print " fdisk (sfdisk) and parted. By default fdisk is used\n"; + print " parted and fdasd (s390). By default parted is used\n"; print "\n"; print " [ --check-kernel ]\n"; print " Activates check for matching kernels between boot and\n"; @@ -1785,6 +1784,9 @@ my $validator = new KIWIXMLValidator ( $kiwi,$CheckConfig,$Revision,$Schema,$SchemaCVT ); + if (! $validator) { + exit 1; + } my $isValid = $validator -> validate(); if (! defined $isValid) { $kiwi -> error ('Validation failed'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2011-01-21 16:01:41.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2011-01-25 11:11:07.000000000 +0100 @@ -3984,7 +3984,7 @@ my $ignore; my $action; if (! defined $tool) { - $tool = "fdisk"; + $tool = "parted"; } SWITCH: for ($tool) { #========================================== @@ -4046,94 +4046,6 @@ last SWITCH; }; #========================================== - # fdisk - #------------------------------------------ - /^fdisk/ && do { - $status = qxx ("dd if=/dev/zero of=$device bs=512 count=1 2>&1"); - $result = $? >> 8; - if ($result != 0) { - $kiwi -> loginfo ($status); - return undef; - } - my $palign = $xml -> getOEMAlignPartition(); - if (($palign) && ("$palign" eq "true")) { - #========================================== - # create aligned table - #------------------------------------------ - my @commands_first = (); - my @commands_next = (); - for (my $count=0;$count<@commands;$count++) { - if ($commands[$count] eq "n") { - if (($commands[$count+2] eq "1") && - ($commands[$count+3] eq ".") - ) { - $commands[$count+3] = "64"; - last; - } - } - } - for (my $count=0;$count<=4;$count++) { - push @commands_first, $commands[$count]; - } - push @commands_first, "w"; - push @commands_first, "q"; - for (my $count=5;$count<@commands;$count++) { - push @commands_next, $commands[$count]; - } - $kiwi -> loginfo ( - "FDISK input aligned: $device [@commands]" - ); - if (! open (FD,"|/sbin/fdisk -u $device &>$tmpdir/fdisk.log")) { - return undef; - } - foreach my $cmd (@commands_first) { - if ($cmd eq ".") { - print FD "\n"; - } else { - print FD "$cmd\n"; - } - } - close FD; - if (! open (FD,"|/sbin/fdisk $device &>$tmpdir/fdisk.log")) { - return undef; - } - foreach my $cmd (@commands_next) { - if ($cmd eq ".") { - print FD "\n"; - } else { - print FD "$cmd\n"; - } - } - close FD; - } else { - #========================================== - # standard call without alignment - #------------------------------------------ - $kiwi -> loginfo ( - "FDISK input: $device [@commands]" - ); - if (! open (FD,"|/sbin/fdisk $device &>$tmpdir/fdisk.log")) { - return undef; - } - foreach my $cmd (@commands) { - if ($cmd eq ".") { - print FD "\n"; - } else { - print FD "$cmd\n"; - } - } - close FD; - } - $result = $? >> 8; - my $flog; - if (open (FD,"$tmpdir/fdisk.log")) { - my @flog = <FD>; close FD; - $flog = join ("\n",@flog); - $kiwi -> loginfo ("FDISK: $flog"); - } - last SWITCH; - }; - #========================================== # parted #------------------------------------------ /^parted/ && do { @@ -4196,31 +4108,10 @@ my $result; my $status; if (! defined $tool) { - $tool = "fdisk"; + $tool = "parted"; } SWITCH: for ($tool) { #========================================== - # fdisk - #------------------------------------------ - /^fdisk/ && do { - my $disk; - my $devnr= -1; - if ($pdev =~ /mapper/) { - if ($pdev =~ /mapper\/(.*)p(\d+)/) { - $disk = "/dev/".$1; - $devnr= $2; - } - } else { - if ($pdev =~ /(.*)(\d+)/) { - $disk = $1; - $devnr= $2; - } - } - $status = qxx ("/sbin/sfdisk -c $disk $devnr 2>&1"); - $result = $? >> 8; - last SWITCH; - }; - #========================================== # parted #------------------------------------------ /^parted/ && do { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2011-01-21 16:01:41.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2011-01-25 11:11:07.000000000 +0100 @@ -956,10 +956,10 @@ # remove unneeded tools #------------------------------------------ local tools=" - tune2fs swapon swapoff shutdown sfdisk resize_reiserfs + tune2fs swapon swapoff shutdown resize_reiserfs reiserfsck reboot halt pivot_root modprobe modinfo rmmod mkswap mkinitrd mkreiserfs mkfs.cramfs mkfs.btrfs btrfsctl - losetup ldconfig insmod init ifconfig fdisk e2fsck fsck.ext2 + losetup ldconfig insmod init ifconfig e2fsck fsck.ext2 fsck.ext3 fsck.ext4 dhcpcd mkfs.ext2 mkfs.ext3 mkfs.ext4 depmod atftpd klogconsole hwinfo xargs wc tail tac readlink mkfifo md5sum head expr file free find env du dirname cut @@ -979,7 +979,7 @@ dmsetup dialog awk gawk clicfs cryptsetup clear blkid fbiterm gettext diff bc utimer cmp busybox kexec pam_console_apply setterm kpartx vgcfgbackup vgcfgrestore lsdasd dasd_configure - qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes + qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk " tools="$tools $@" for path in /sbin /usr/sbin /usr/bin /bin;do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfigure.pm new/kiwi/modules/KIWIConfigure.pm --- old/kiwi/modules/KIWIConfigure.pm 2011-01-21 16:01:41.000000000 +0100 +++ new/kiwi/modules/KIWIConfigure.pm 2011-01-25 11:11:07.000000000 +0100 @@ -329,26 +329,21 @@ my $kiwi = $this->{kiwi}; my $root = $this->{root}; my $imageDesc = $this->{imageDesc}; - my $autodir = "var/lib/autoinstall/autoconf"; - my $autocnf = "autoconf.xml"; - my $autosetup = "$root/$autodir/$autocnf"; - if ((! -f "$imageDesc/config-yast-autoyast.xml") && (! -f $autosetup)) { + if (! -f "$imageDesc/config-yast-autoyast.xml") { return "skipped"; } $kiwi -> info ("Setting up AutoYaST..."); + my $autodir = "var/lib/autoinstall/autoconf"; + my $autocnf = "autoconf.xml"; if (! -d "$root/$autodir") { $kiwi -> failed (); $kiwi -> error ("AutoYaST seems not to be installed"); $kiwi -> failed (); return "failed"; } - if ( -f $autosetup ) { - $kiwi -> info ("$autocnf file already exists, won't overwrite"); - } else { - qxx ( - "cp $imageDesc/config-yast-autoyast.xml $autosetup 2>&1" - ); - } + qxx ( + "cp $imageDesc/config-yast-autoyast.xml $root/$autodir/$autocnf 2>&1" + ); if ( ! open (FD,">$root/etc/install.inf")) { $kiwi -> failed (); $kiwi -> error ("Failed to create install.inf: $!"); @@ -383,8 +378,7 @@ my $kiwi = $this->{kiwi}; my $root = $this->{root}; my $imageDesc = $this->{imageDesc}; - my $firstboot = "$root/etc/YaST2/firstboot.xml"; - if ((! -f "$imageDesc/config-yast-firstboot.xml") && (! -f $firstboot)) { + if (! -f "$imageDesc/config-yast-firstboot.xml") { return "skipped"; } $kiwi -> info ("Setting up YaST firstboot service..."); @@ -397,19 +391,14 @@ $kiwi -> failed (); return "failed"; } - if ( -f $firstboot ) { - $kiwi -> info ("firstboot.xml file already exists, won't overwrite"); - } else { - my $data = qxx ( - "cp $imageDesc/config-yast-firstboot.xml $firstboot 2>&1" - ); - my $code = $? >> 8; - if ($code != 0) { - $kiwi -> failed (); - $kiwi -> error ("Failed to copy config-yast-firstboot.xml: $data"); - $kiwi -> failed (); - return "failed"; - } + my $firstboot = "$root/etc/YaST2/firstboot.xml"; + my $data = qxx ("cp $imageDesc/config-yast-firstboot.xml $firstboot 2>&1"); + my $code = $? >> 8; + if ($code != 0) { + $kiwi -> failed (); + $kiwi -> error ("Failed to copy config-yast-firstboot.xml: $data"); + $kiwi -> failed (); + return "failed"; } # /.../ # keep an existing /etc/sysconfig/firstboot or copy the template @@ -466,10 +455,10 @@ if (! -e "$root/etc/init.d/$service") { next; } - my $data = qxx ( + $data = qxx ( "chroot $root /sbin/insserv /etc/init.d/$service 2>&1" ); - my $code = $? >> 8; + $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("Failed to activate service(s): $data"); @@ -482,8 +471,8 @@ # current firstboot service works like yast second stage and # is activated by touching /var/lib/YaST2/reconfig_system # ---- - my $data = qxx ("touch $root/var/lib/YaST2/reconfig_system 2>&1"); - my $code = $? >> 8; + $data = qxx ("touch $root/var/lib/YaST2/reconfig_system 2>&1"); + $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("Failed to activate firstboot: $data"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2010-03-18 11:42:51.000000000 +0100 +++ new/kiwi/modules/KIWIIsoLinux.pm 2011-01-25 11:11:07.000000000 +0100 @@ -678,7 +678,7 @@ my $ldir = $this -> {tmpdir}; my $prog = $this -> {tool}; my $cmdln= "$prog $para -o $dest $ldir $src 2>&1"; - $kiwi -> info ( "Calling: $cmdln\n" ); + $kiwi -> loginfo ( "Calling: $cmdln\n" ); my $data = qxx ( $cmdln ); my $code = $? >> 8; if ($code != 0) { @@ -758,38 +758,6 @@ $kiwi -> failed (); return undef; } - #========================================== - # Make it DOS compatible - #------------------------------------------ - # /.../ - # Doing this will break the hybrid, the partition - # can't be mounted after that call. I'm pretty sure - # this is a bug in isohybrid not creating a compatible - # partition table - # ---- - #my @commands = ("d","n","p","1",".",".","a","1","w","q"); - #$loop = qxx ("/sbin/losetup -s -f $iso 2>&1"); chomp $loop; - #$code = $? >> 8; - #if ($code != 0) { - # $kiwi -> error ("Failed to loop bind iso file: $loop"); - # $kiwi -> failed (); - # return undef; - #} - #if (! open ($FD,"|/sbin/fdisk $loop &> /dev/null")) { - # $kiwi -> error ("Failed to call fdisk"); - # $kiwi -> failed (); - # qxx ("losetup -d $loop"); - # return undef; - #} - #foreach my $cmd (@commands) { - # if ($cmd eq ".") { - # print $FD "\n"; - # } else { - # print $FD "$cmd\n"; - # } - #} - #close $FD; - #qxx ("losetup -d $loop"); return $this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-01-21 16:01:41.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-01-25 11:11:07.000000000 +0100 @@ -23,6 +23,7 @@ export UFONT=/usr/share/fbiterm/fonts/b16.pcf.gz export HYBRID_PERSISTENT_FS=ext3 export HYBRID_PERSISTENT_ID=83 +export HYBRID_PERSISTENT_PART=4 export HYBRID_PERSISTENT_DIR=/read-write export UTIMER_INFO=/dev/utimer export bootLoaderOK=0 @@ -58,7 +59,7 @@ export PARTED_HAVE_MACHINE=1 fi if [ $PARTED_HAVE_MACHINE -eq 0 ];then - export PARTITIONER=sfdisk + export PARTITIONER=unsupported fi if dhcpcd -p 2>&1 | grep -q 'Usage';then export DHCPCD_HAVE_PERSIST=0 @@ -2970,13 +2971,7 @@ #====================================== # search for hybrid device #-------------------------------------- - # /.../ - # we have to use fdisk here for partition manipulation - # because parted doesn't accept the partition table written - # by the isohybrid tool :( - # ---- - PARTITIONER=sfdisk - if [ "x$kiwi_hybridpersistent" = "xyes" ];then + if [ "$kiwi_hybridpersistent" = "yes" ];then protectedDevice=$(echo $biosBootDevice | sed -e s@/dev/@@) protectedDisk=$(cat /sys/block/$protectedDevice/ro) if [ $protectedDisk = "0" ];then @@ -3000,20 +2995,12 @@ #====================================== # search hybrid for a write partition #-------------------------------------- - for disknr in 2 3 4;do - id=`partitionID $biosBootDevice $disknr` - if [ "$id" = "83" ];then - export HYBRID_RW=$biosBootDevice$disknr - break - fi - done + export HYBRID_RW=$(ddn $biosBootDevice $HYBRID_PERSISTENT_PART) #====================================== - # device found go with it + # LIVECD_CONFIG found go with it #-------------------------------------- - PARTITIONER=parted return fi - PARTITIONER=parted umount $cddev &>/dev/null fi echo @@ -3534,15 +3521,6 @@ dd if=/dev/zero of=$diskDevice bs=32M >/dev/null } #====================================== -# sfdiskGetPartitionID -#-------------------------------------- -function sfdiskGetPartitionID { - # /.../ - # prints the partition ID for the given device and number - # ---- - sfdisk -c $1 $2 -} -#====================================== # fdasdGetPartitionID #-------------------------------------- function fdasdGetPartitionID { @@ -3578,9 +3556,7 @@ function partitionID { local diskDevice=$1 local diskNumber=$2 - if [ $PARTITIONER = "sfdisk" ];then - sfdiskGetPartitionID $diskDevice $diskNumber - elif [ $PARTITIONER = "fdasd" ];then + if [ $PARTITIONER = "fdasd" ];then fdasdGetPartitionID $diskDevice $diskNumber else partedGetPartitionID $diskDevice $diskNumber @@ -4022,6 +3998,7 @@ local roDevice=`echo $UNIONFS_CONFIG | cut -d , -f 2` local clic_cmd=clicfs local resetReadWrite=0 + local ramOnly=0 local haveBytes local haveKByte local haveMByte @@ -4050,8 +4027,12 @@ #====================================== # check read/write device location #-------------------------------------- - getDiskDevice $rwDevice | grep -q ram - if [ $? = 0 ];then + if [ ! -e $rwDevice ];then + ramOnly=1 + elif getDiskDevice $rwDevice | grep -q ram;then + ramOnly=1 + fi + if [ $ramOnly = 1 ];then haveKByte=`cat /proc/meminfo | grep MemFree | cut -f2 -d:| cut -f1 -dk` haveMByte=`expr $haveKByte / 1024` haveMByte=`expr $haveMByte \* 7 / 10` @@ -4061,8 +4042,8 @@ haveMByte=`expr $haveBytes / 1024 / 1024` wantCowFS=0 if \ - [ "x$kiwi_hybrid" = "xyes" ] && - [ "x$kiwi_hybridpersistent" = "xyes" ] + [ "$kiwi_hybrid" = "yes" ] && + [ "$kiwi_hybridpersistent" = "yes" ] then # write into a cow file on a filesystem, for hybrid iso's wantCowFS=1 @@ -5626,7 +5607,7 @@ echo $part_new } #====================================== -# ndd +# nd #-------------------------------------- function nd { # /.../ @@ -5670,82 +5651,71 @@ # createHybridPersistent #-------------------------------------- function createHybridPersistent { - local dev=$1; - local relativeDevName=`basename $dev` + # /.../ + # create a new partition to handle the copy-on-write actions + # by the clicfs live mount. A new partition with a filesystem + # inside labeled as 'hybrid' is created for this purpose + # ---- + local device=$1 local input=/part.input - local id=0 - for disknr in 2 3 4; do - id=`partitionID $dev $disknr` - if [ $id = $HYBRID_PERSISTENT_ID ]; then - Echo "Existing persistent hybrid partition found $dev$disknr" - return - else - Echo "Creating hybrid persistent partition for COW data: " - Echo "$dev$disknr id=$HYBRID_PERSISTENT_ID fs=$HYBRID_PERSISTENT_FS" - if [ $disknr -lt 4 ];then - createPartitionerInput \ - n p $disknr . . t $disknr $HYBRID_PERSISTENT_ID w - else - createPartitionerInput \ - n p . . t 4 $HYBRID_PERSISTENT_ID w - fi - imageDiskDevice=$dev - callPartitioner $input - if ! waitForStorageDevice $dev$disknr;then - Echo "Partition $dev$disknr doesn't appear... fatal !" - Echo "Persistent writing deactivated" - unset kiwi_hybridpersistent - elif ! mkfs.$HYBRID_PERSISTENT_FS $dev$disknr;then - Echo "Failed to create hybrid persistent filesystem" - Echo "Persistent writing deactivated" - unset kiwi_hybridpersistent - fi - return + local disknr=$HYBRID_PERSISTENT_PART + mkdir -p /cow + rm -f $input + #====================================== + # check persistent write partition + #-------------------------------------- + if mount -L hybrid /cow;then + Echo "Existing persistent hybrid partition found" + umount /cow + rmdir /cow + return + fi + #====================================== + # create persistent write partition + #-------------------------------------- + # /.../ + # we have to use fdisk here because parted can't work + # with the partition table created by isohybrid + # ---- + Echo "Creating hybrid persistent partition for COW data" + for cmd in n p $disknr . . t $disknr $HYBRID_PERSISTENT_ID w q;do + if [ $cmd = "." ];then + echo >> $input + continue fi + echo $cmd >> $input done + fdisk $device < $input 1>&2 + if test $? != 0; then + Echo "Failed to create persistent write partition" + Echo "Persistent writing deactivated" + unset kiwi_hybridpersistent + return + fi + #====================================== + # check partition device node + #-------------------------------------- + if ! waitForStorageDevice $(ddn $device $disknr);then + Echo "Partition $disknr on $device doesn't appear... fatal !" + Echo "Persistent writing deactivated" + unset kiwi_hybridpersistent + return + fi + #====================================== + # create filesystem on write partition + #-------------------------------------- + if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $(ddn $device $disknr);then + Echo "Failed to create hybrid persistent filesystem" + Echo "Persistent writing deactivated" + unset kiwi_hybridpersistent + fi } #====================================== # callPartitioner #-------------------------------------- function callPartitioner { local input=$1 - if [ $PARTITIONER = "sfdisk" ];then - Echo "Repartition the disk according to real geometry [ fdisk ]" - local pstart=$(checkFDiskFirstSector $imageDiskDevice) - echo "w" >> $input - echo "q" >> $input - fdisk $imageDiskDevice < $input 1>&2 - if test $? != 0; then - systemException "Failed to create partition table" "reboot" - fi - local pstopp_new=$(checkFDiskEndSector $imageDiskDevice) - local pstart_new=$(checkFDiskFirstSector $imageDiskDevice) - if [ $pstart_new -ne $pstart ];then - local fixpart=/part.input-fixupStartSector - local numpdevs=$(fdisk -ul $imageDiskDevice | grep '^/dev/' | wc -l) - echo "d" > $fixpart - if [ $numpdevs -gt 1 ];then - echo "1" >> $fixpart - fi - echo "n" >> $fixpart - echo "p" >> $fixpart - echo "1" >> $fixpart - echo $pstart >> $fixpart - echo $pstopp_new >> $fixpart - echo "w" >> $fixpart - echo "q" >> $fixpart - fdisk -u $imageDiskDevice < $fixpart 1>&2 - if test $? != 0; then - systemException "Failed to fix partition table" "reboot" - fi - fi - if [ ! -z "$OEM_ALIGN" ];then - if [ ! -z "$haveLVM" ];then - vgchange -an - fi - fixupFDiskSectors $input $pstart - fi - elif [ $PARTITIONER = "fdasd" ];then + if [ $PARTITIONER = "fdasd" ];then Echo "Repartition the disk according to real geometry [ fdasd ]" echo "w" >> $input echo "q" >> $input @@ -5757,7 +5727,7 @@ # /.../ # nothing to do for parted here as we write # imediately with parted and don't create a - # command input file as for fdisk but we re-read + # command input file as for fdasd but we re-read # the disk so that the new table will be used # ---- udevPending @@ -5771,9 +5741,7 @@ if echo $imageDiskDevice | grep -q 'dev\/dasd';then PARTITIONER=fdasd fi - if [ $PARTITIONER = "sfdisk" ];then - createFDiskInput $@ - elif [ $PARTITIONER = "fdasd" ];then + if [ $PARTITIONER = "fdasd" ];then createFDasdInput $@ else Echo "Repartition the disk according to real geometry [ parted ]" @@ -5822,98 +5790,6 @@ done } #====================================== -# checkFDiskFirstSector -#-------------------------------------- -function checkFDiskFirstSector { - # /.../ - # check number of start sector for first partition - # ---- - local dev=$1 - local p1=$(ddn $dev 1) - fdisk -ul ${dev} | grep '^'$p1 | \ - sed -e's@'$p1'[ \*]*$[0-9]\+$ .*$@\1@' -} - -#====================================== -# checkFDiskEndSector -#-------------------------------------- -function checkFDiskEndSector { - # /.../ - # check number of end sector for first partition - # ---- - local dev=$1 - local p1=$(ddn $dev 1) - fdisk -ul ${dev} | grep '^'$p1 | \ - sed -e's@'$p1'[ \*]*$[0-9]\+$[ \*]*$[0-9]\+$ .*$@\2@' -} -#====================================== -# fixupFDiskSectors -#-------------------------------------- -function fixupFDiskSectors { - # /.../ - # align the first partition start sector using fdisk - # ---- - local input=$1 - local palign=$2 - local pstart pend act psize ptype rest - case "$palign" in - 64) palign=8;; - 2048) palign=2048;; - *) return;; - esac - local numpdevs=$(fdisk -ul $imageDiskDevice | grep '^/dev/' | wc -l) - rm -f $input - fdisk -ul $imageDiskDevice | grep '^/dev/' | \ - while read pdev act pstart pend psize ptype rest; do - pdev=${pdev#$imageDiskDevice} - if [ "$act" != '*' ]; then - ptype="$psize" - pend="$pstart" - pstart="$act" - fi - local aligned=$(( ( $pstart + $palign - 1 ) / $palign * $palign )) - if [ "$aligned" -ne "$pstart" ]; then - echo "d" >> $input - test $numpdevs -gt 1 && echo "$pdev" >> $input - echo "n" >> $input - echo "p" >> $input - test $numpdevs -lt 4 && echo "$pdev" >> $input - echo "$aligned" >> $input - echo "$pend" >> $input - echo "t" >> $input - test $numpdevs -gt 1 && echo "$pdev" >> $input - echo "$ptype" >> $input - if [ "$act" = '*' ]; then - echo "a" >> $input - echo "$pdev" >> $input - fi - fi - # handle only the first partition - break - done - if [ -s $input ]; then - echo "w" >> $input - echo "q" >> $input - fdisk -u $imageDiskDevice < $input 1>&2 - if test $? != 0; then - systemException "Failed to fix up partition table" "reboot" - fi - fi -} -#====================================== -# createFDiskInput -#-------------------------------------- -function createFDiskInput { - local input=/part.input - for cmd in $*;do - if [ $cmd = "." ];then - echo >> $input - continue - fi - echo $cmd >> $input - done -} -#====================================== # partedInit #-------------------------------------- function partedInit { @@ -6890,6 +6766,14 @@ #-------------------------------------- function initialize { #====================================== + # Check partitioner capabilities + #-------------------------------------- + if [ $PARTITIONER = "unsupported" ];then + systemException \ + "Installed parted version is too old" \ + "reboot" + fi + #====================================== # Check for hotfix kernel #-------------------------------------- reloadKernel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2010-12-03 16:08:51.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rnc 2011-01-25 11:11:07.000000000 +0100 @@ -684,7 +684,7 @@ # div { k.partition.type.attribute = - ## Partition Type identifier, see fdisk for details + ## Partition Type identifier, see parted for details attribute type { text } k.partition.number.attribute = ## Partition ID @@ -877,14 +877,12 @@ k.oem-align-partition.content = xsd:boolean k.oem-align-partition.attlist = empty k.oem-align-partition = - ## For oemboot driven images: align start sectors. This is only - ## done when fdisk is used. For parted the option -a is passed in - ## in any case + ## For oemboot driven images: align start sectors. + ## For parted the option -a is passed [ db:para [ - "For oemboot driven images: align start sectors. This is only\x{a}"~ - "done when fdisk is used. For parted the option -a is passed\x{a}"~ - "in any case" + "For oemboot driven images: align start sectors.\x{a}"~ + "For parted the option -a is passed." ] ] element oem-align-partition { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2010-12-03 16:08:51.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rng 2011-01-25 11:11:07.000000000 +0100 @@ -1023,7 +1023,7 @@ <div> <define name="k.partition.type.attribute"> <attribute name="type"> - <a:documentation>Partition Type identifier, see fdisk for details</a:documentation> + <a:documentation>Partition Type identifier, see parted for details</a:documentation> </attribute> </define> <define name="k.partition.number.attribute"> @@ -1301,12 +1301,10 @@ </define> <define name="k.oem-align-partition"> <element name="oem-align-partition"> - <a:documentation>For oemboot driven images: align start sectors. This is only -done when fdisk is used. For parted the option -a is passed in -in any case</a:documentation> - <db:para>For oemboot driven images: align start sectors. This is only -done when fdisk is used. For parted the option -a is passed -in any case</db:para> + <a:documentation>For oemboot driven images: align start sectors. +For parted the option -a is passed</a:documentation> + <db:para>For oemboot driven images: align start sectors. +For parted the option -a is passed.</db:para> <ref name="k.oem-align-partition.attlist"/> <ref name="k.oem-align-partition.content"/> </element> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-01-20 09:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-01-25 11:11:07.000000000 +0100 @@ -325,10 +325,11 @@ umountSystem RELOAD_IMAGE="yes" systemIntegrity="clean" - mdadm --stop $imageDevice fi else systemIntegrity="clean" + fi + if [ $systemIntegrity = "fine" ] && [ ! -z "$RAID" ];then mdadm --stop $imageDevice fi done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kipi-plugins for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package kipi-plugins for openSUSE:Factory checked in at Tue Jan 25 13:12:36 CET 2011. -------- --- KDE/kipi-plugins/kipi-plugins.changes 2010-12-24 10:40:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/kipi-plugins/kipi-plugins.changes 2011-01-25 12:27:39.000000000 +0100 @@ -1,0 +2,21 @@ +Mon Jan 24 21:25:45 UTC 2011 - Nico.Laus.2001(a)gmx.de + +- Update to version 1.8.0 + * Bugfixes: + - General: kipi-plugins 1.6.0 fails to build (final) + (bko261275) + - SmugExport: Program uploads only part of file or smaller + version of file and match error occurs (bko253257) + - PrintImages: Scaling of Pictures for print (bko257514) + - GPSSync: Remember last postition, remember last view mode, + cache the last view (bko196855) + - DngConverter: DNG Conversion can't be inverted. Embedded + file is corrupted (bko262125) + - PicasaWeb: Upload video from Digikam to Picasa (bko245956) + - AdvancedSlideshow: Better looking of "captions" during + slideshow (bko262642) + - PicasaWeb: Crashed, when trying to import photo from + picasaweb (bko263545) +- packaged debianscreenshots plugin + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:download_url:kipi-plugins-1.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.hWGVma/_old 2011-01-25 13:12:28.000000000 +0100 +++ /var/tmp/diff_new_pack.hWGVma/_new 2011-01-25 13:12:28.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kipi-plugins (Version 1.7.0) +# spec file for package kipi-plugins # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -30,7 +30,7 @@ Name: kipi-plugins BuildRequires: libkdcraw-devel libkdepimlibs4-devel libkexiv2-devel libkipi-devel BuildRequires: cmake libexpat-devel libgcrypt-devel libgphoto2-devel libksane-devel -BuildRequires: libqca2-devel +BuildRequires: libqca2-devel libqjson-devel %if %{with_opencv} BuildRequires: opencv-devel %endif @@ -40,9 +40,9 @@ Url: http://www.kipi-plugins.org/ Group: Productivity/Graphics/Other Summary: KDE Plug-Ins for Image Manipulation -Version: 1.7.0 +Version: 1.8.0 Release: 1 -%define rversion 1.7.0 +%define rversion 1.8.0 Recommends: dcraw Requires: /usr/bin/jpegtran Recommends: %{name}-lang = %{version} @@ -188,12 +188,14 @@ %_kde4_libdir/libkipiplugins.so.1 %_kde4_libdir/libkipiplugins.so.1.0.0 %_kde4_bindir/dngconverter +%_kde4_bindir/dnginfo %_kde4_bindir/expoblending %_kde4_applicationsdir/expoblending.desktop %_kde4_applicationsdir/kipiplugins.desktop %_kde4_modules/kipiplugin_advancedslideshow.so %_kde4_modules/kipiplugin_batchprocessimages.so %_kde4_modules/kipiplugin_calendar.so +%_kde4_modules/kipiplugin_debianscreenshots.so %_kde4_modules/kipiplugin_dngconverter.so %_kde4_modules/kipiplugin_expoblending.so %_kde4_modules/kipiplugin_facebook.so @@ -219,6 +221,7 @@ %_kde_share_dir/services/kipiplugin_advancedslideshow.desktop %_kde_share_dir/services/kipiplugin_batchprocessimages.desktop %_kde_share_dir/services/kipiplugin_calendar.desktop +%_kde_share_dir/services/kipiplugin_debianscreenshots.desktop %_kde_share_dir/services/kipiplugin_dngconverter.desktop %_kde_share_dir/services/kipiplugin_expoblending.desktop %_kde_share_dir/services/kipiplugin_facebook.desktop @@ -254,6 +257,7 @@ %_kde4_iconsdir/hicolor/*/actions/borderimages.* %_kde4_iconsdir/hicolor/*/actions/colorimages.* %_kde4_iconsdir/hicolor/*/actions/convertimages.* +%_kde4_iconsdir/hicolor/*/actions/debianscreenshots.* %_kde4_iconsdir/hicolor/*/actions/effectimages.* %_kde4_iconsdir/hicolor/*/actions/expoblending.* %_kde4_iconsdir/hicolor/*/actions/facebook.* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hWGVma/_old 2011-01-25 13:12:29.000000000 +0100 +++ /var/tmp/diff_new_pack.hWGVma/_new 2011-01-25 13:12:29.000000000 +0100 @@ -3,11 +3,11 @@ <service name="download_url"> <param name="protocol">http</param> <param name="host">downloads.sourceforge.net</param> - <param name="path">/project/kipi/kipi-plugins/1.7.0/kipi-plugins-1.7.0.tar.bz2</param> + <param name="path">/project/kipi/kipi-plugins/1.8.0/kipi-plugins-1.8.0.tar.bz2</param> </service> <service name="verify_file"> - <param name="file">_service:download_url:kipi-plugins-1.7.0.tar.bz2</param> + <param name="file">_service:download_url:kipi-plugins-1.8.0.tar.bz2</param> <param name="verifier">sha256</param> - <param name="checksum">1125295f1999a25332aed22c12f84fc94e8f8df5d8710f38b21374040cb1268a</param> + <param name="checksum">10e8be835c00a3b2e880d5653e0b294cbe004dee9d98809e45501a5638c7d142</param> </service> </services> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevplatform for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at Tue Jan 25 13:12:16 CET 2011. -------- --- KDE/kdevplatform/kdevplatform.changes 2011-01-15 16:25:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdevplatform/kdevplatform.changes 2011-01-24 15:32:26.000000000 +0100 @@ -1,0 +2,23 @@ +Mon Jan 24 13:41:22 UTC 2011 - wstephenson(a)novell.com + +- update to 1.2.0 + * remove warning that is triggered whenever the cleanup asserts + for a proper removal + * Save the status of the 'Use lower case filenames' checkbox for + next time. Defaults to ticked as before. + * Rehash every time, we can change the repository between calls, + so it has to be calculated every time. + * Don't display all commits in the OutputView. + * don't an add infinite number of rows of output, instead limit + to 50k lines and only keep the most recent ones + * Fix Patch review closes all open documents from other worksets + (bko#263021) + * Only try creating one parse-job at a time. If more parse-jobs + need to be created, queue an event to re-try. This way, the UI + stays responsive when many many files we cannot handle are iterated. + * Delete the view _after_ emitting "viewRemoved(..)". + This fixes a possible crash, because the working-set will call "view->document()" in the connected slot. + * Also use the cache if the cached list is "empty", it means that + no mimetype could be determined. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevplatform-1.1.90.tar.bz2 New: ---- kdevplatform-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.z5pLSx/_old 2011-01-25 13:09:43.000000000 +0100 +++ /var/tmp/diff_new_pack.z5pLSx/_new 2011-01-25 13:09:43.000000000 +0100 @@ -29,9 +29,9 @@ Group: Development/Tools/IDE Summary: Base Package for Integrated Development Environments Url: http://www.kdevelop.org -Version: 1.1.90 +Version: 1.2.0 Release: 1 -Source0: kdevplatform-1.1.90.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires: libkdevplatform0 = %{version} ++++++ kdevplatform-1.1.90.tar.bz2 -> kdevplatform-1.2.0.tar.bz2 ++++++ ++++ 24576 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevelop4-plugins for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package kdevelop4-plugins for openSUSE:Factory checked in at Tue Jan 25 13:09:21 CET 2011. -------- --- KDE/kdevelop4-plugins/kdevelop4-plugins.changes 2011-01-15 17:23:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdevelop4-plugins/kdevelop4-plugins.changes 2011-01-24 16:49:22.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 24 15:24:22 UTC 2011 - wstephenson(a)novell.com + +- Update to 1.2.0 release + * Use rainbow colors for all PHP variables + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevelop-php-1.1.90.tar.bz2 kdevelop-php-docs-1.1.90.tar.bz2 New: ---- kdevelop-php-1.2.0.tar.bz2 kdevelop-php-docs-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4-plugins.spec ++++++ --- /var/tmp/diff_new_pack.WdefTk/_old 2011-01-25 13:09:06.000000000 +0100 +++ /var/tmp/diff_new_pack.WdefTk/_new 2011-01-25 13:09:06.000000000 +0100 @@ -24,7 +24,7 @@ Group: Development/Tools/IDE Summary: Additional plugins for Kdevelop4 Integrated Development Environment Url: http://www.kdevelop.org -Version: 1.1.90 +Version: 1.2.0 Release: 1 Source0: kdevelop-php-%version.tar.bz2 Source1: kdevelop-php-docs-%version.tar.bz2 ++++++ add-php-docs.diff ++++++ --- /var/tmp/diff_new_pack.WdefTk/_old 2011-01-25 13:09:06.000000000 +0100 +++ /var/tmp/diff_new_pack.WdefTk/_new 2011-01-25 13:09:06.000000000 +0100 @@ -4,7 +4,7 @@ add_subdirectory(parser) add_subdirectory(duchain) add_subdirectory(completion) -+add_subdirectory(kdevelop-php-docs-1.1.90) ++add_subdirectory(kdevelop-php-docs-1.2.0) set(kdevphplanguagesupport_PART_SRCS phplanguagesupport.cpp ++++++ kdevelop-php-1.1.90.tar.bz2 -> kdevelop-php-1.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/CHANGELOG.1.1.90 new/kdevelop-php-1.2.0/CHANGELOG.1.1.90 --- old/kdevelop-php-1.1.90/CHANGELOG.1.1.90 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/CHANGELOG.1.1.90 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -ChangeLog for php v1.1.90 -========================= - -* Milian Wolff: push version to 1.1.90 in preparation of 4.2 rc1 release -* Milian Wolff: Allow null as type for class constants. -* Milian Wolff: set version to 1.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/CHANGELOG.1.2.0 new/kdevelop-php-1.2.0/CHANGELOG.1.2.0 --- old/kdevelop-php-1.1.90/CHANGELOG.1.2.0 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-1.2.0/CHANGELOG.1.2.0 2011-01-23 20:42:54.000000000 +0100 @@ -0,0 +1,11 @@ +ChangeLog for php v1.2.0 +======================== + +* Milian Wolff: set version to 1.2.0 and look for same versioned kdevplatform in preparation of release +* Milian Wolff: fix test logic +* Milian Wolff: only take encountered declarations into account when checking for redeclarations +* Milian Wolff: don't report use for same range as declaration of parent-namespace, happens with nested namespaces, fixes test +* Milian Wolff: properly pass topducontext to update along +* Milian Wolff: force updated range when encountering variable declaration +* Milian Wolff: prevent explicitlyGlobal import identifiers for namespace alias declaration, fixes assert +* Milian Wolff: prevent crash in ExpressionVisitor::visitEncapsVar when class is currentClass and hence internalContext is not yet set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/CMakeLists.txt new/kdevelop-php-1.2.0/CMakeLists.txt --- old/kdevelop-php-1.1.90/CMakeLists.txt 2011-01-09 22:58:58.000000000 +0100 +++ new/kdevelop-php-1.2.0/CMakeLists.txt 2011-01-23 20:49:32.000000000 +0100 @@ -9,7 +9,7 @@ #complain about the FindKDevelop-PG.cmake file not findable. find_package(KDE4 REQUIRED) -find_package(KDevPlatform 1.1.90 REQUIRED) +find_package(KDevPlatform 1.2.0 REQUIRED) include_directories(${KDEVPLATFORM_INCLUDE_DIR}) include_directories( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/builders/declarationbuilder.cpp new/kdevelop-php-1.2.0/duchain/builders/declarationbuilder.cpp --- old/kdevelop-php-1.1.90/duchain/builders/declarationbuilder.cpp 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/duchain/builders/declarationbuilder.cpp 2011-01-23 20:42:54.000000000 +0100 @@ -225,7 +225,7 @@ { if (dec->isFunctionDeclaration()) { ClassMethodDeclaration* func = dynamic_cast<ClassMethodDeclaration*>(dec); - if (!func) { + if (!func || !wasEncountered(func)) { continue; } // we cannot redeclare final classes ever @@ -264,7 +264,7 @@ DUChainWriteLocker lock(DUChain::lock()); foreach(Declaration * dec, currentContext()->findLocalDeclarations(ids.second.first(), startPos(node->methodName))) { - if (dec->isFunctionDeclaration()) { + if (wasEncountered(dec) && dec->isFunctionDeclaration()) { reportRedeclarationError(dec, node->methodName); localError = true; break; @@ -383,7 +383,7 @@ Q_ASSERT(currentContext()->type() == DUContext::Class); foreach(Declaration * dec, currentContext()->findLocalDeclarations(name.first(), startPos(node))) { - if (!dec->isFunctionDeclaration() && ! dec->abstractType()->modifiers() & AbstractType::ConstModifier) { + if (wasEncountered(dec) && !dec->isFunctionDeclaration() && ! dec->abstractType()->modifiers() & AbstractType::ConstModifier) { reportRedeclarationError(dec, node); break; } @@ -484,7 +484,7 @@ DUChainWriteLocker lock(DUChain::lock()); foreach(Declaration * dec, currentContext()->findLocalDeclarations(identifierForNode(node->identifier).first(), startPos(node->identifier))) { - if (!dec->isFunctionDeclaration() && dec->abstractType()->modifiers() & AbstractType::ConstModifier) { + if (wasEncountered(dec) && !dec->isFunctionDeclaration() && dec->abstractType()->modifiers() & AbstractType::ConstModifier) { reportRedeclarationError(dec, node->identifier); break; } @@ -624,7 +624,7 @@ DUChainWriteLocker lock(DUChain::lock()); QList<Declaration*> declarations = currentContext()->topContext()->findDeclarations( identifier, startPos(node) ); foreach(Declaration* dec, declarations) { - if (isMatch(dec, type)) { + if (wasEncountered(dec) && isMatch(dec, type)) { reportRedeclarationError(dec, node); return true; } @@ -710,6 +710,9 @@ } DUChainWriteLocker lock(DUChain::lock()); + + const RangeInRevision newRange = editorFindRange(node, node); + // check if this variable is already declared { QList< Declaration* > decs = parentCtx->findDeclarations(identifier.first(), startPos(node), 0, DUContext::DontSearchInParent); @@ -718,7 +721,12 @@ while ( true ) { // we expect that the list of declarations has the newest declaration at back if ( dynamic_cast<VariableDeclaration*>( *it ) ) { - encounter(*it); + if (!wasEncountered(*it)) { + encounter(*it); + // force new range https://bugs.kde.org/show_bug.cgi?id=262189, + // might be wrong when we had syntax errors in there before + (*it)->setRange(newRange); + } if ( (*it)->abstractType() && !(*it)->abstractType()->equals(type.unsafeData()) ) { // if it's currently mixed and we now get something more definite, use that instead if ( ReferenceType::Ptr rType = ReferenceType::Ptr::dynamicCast((*it)->abstractType()) ) { @@ -772,8 +780,6 @@ } } - RangeInRevision newRange = editorFindRange(node, node); - VariableDeclaration *dec = openDefinition<VariableDeclaration>(identifier, newRange); dec->setKind(Declaration::Instance); if (!m_lastTopStatementComment.isEmpty()) { @@ -783,7 +789,7 @@ } } //own closeDeclaration() that doesn't use lastType() - currentDeclaration()->setType(type); + dec->setType(type); eventuallyAssignInternalContext(); DeclarationBuilderBase::closeDeclaration(); } @@ -1158,7 +1164,10 @@ m_editor->findRange(idNode)); { ///TODO: case insensitive! - decl->setImportIdentifier( identifierForNamespace(node->identifier, m_editor) ); + QualifiedIdentifier qid = identifierForNamespace(node->identifier, m_editor); + ///TODO: find out why this must be done (see mail to kdevelop-devel on jan 18th 2011) + qid.setExplicitlyGlobal( false ); + decl->setImportIdentifier( qid ); decl->setPrettyName( id.first ); decl->setKind(Declaration::NamespaceAlias); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/builders/usebuilder.cpp new/kdevelop-php-1.2.0/duchain/builders/usebuilder.cpp --- old/kdevelop-php-1.1.90/duchain/builders/usebuilder.cpp 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/duchain/builders/usebuilder.cpp 2011-01-23 20:42:54.000000000 +0100 @@ -176,7 +176,9 @@ curId.push(identifier.at(i)); AstNode* n = node->namespaceNameSequence->at(i)->element; DeclarationPointer dec = findDeclarationImport(NamespaceDeclarationType, curId, n); - newCheckedUse(n, dec); + if (!dec || dec->range() != editorFindRange(n, n)) { + newCheckedUse(n, dec); + } } newCheckedUse(node->namespaceNameSequence->back()->element, findDeclarationImport(lastType, identifier, node )); @@ -186,7 +188,10 @@ const IdentifierPair& identifier, const RangeInRevision& range) { if (node != parent->namespaceNameSequence->back()->element) { - newCheckedUse(node, findDeclarationImport(NamespaceDeclarationType, identifier.second, node)); + DeclarationPointer dec = findDeclarationImport(NamespaceDeclarationType, identifier.second, node); + if (!dec || dec->range() != editorFindRange(node, node)) { + newCheckedUse(node, dec); + } } UseBuilderBase::openNamespace(parent, node, identifier, range); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/expressionvisitor.cpp new/kdevelop-php-1.2.0/duchain/expressionvisitor.cpp --- old/kdevelop-php-1.1.90/duchain/expressionvisitor.cpp 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/duchain/expressionvisitor.cpp 2011-01-23 20:42:54.000000000 +0100 @@ -483,10 +483,20 @@ DUChainReadLocker lock(DUChain::lock()); if ( StructureType::Ptr structType = dec->type<StructureType>() ) { if ( ClassDeclaration* cdec = dynamic_cast<ClassDeclaration*>(structType->declaration(m_currentContext->topContext())) ) { - foreach( Declaration* pdec, cdec->internalContext()->findDeclarations(identifierForNode(node->propertyIdentifier)) ) { - if ( !pdec->isFunctionDeclaration() ) { - foundDec = pdec; - break; + ///TODO: share code with visitVariableProperty + DUContext* ctx = cdec->internalContext(); + if (!ctx && m_currentContext->parentContext()) { + if (m_currentContext->parentContext()->localScopeIdentifier() == cdec->qualifiedIdentifier()) { + //class is currentClass (internalContext is not yet set) + ctx = m_currentContext->parentContext(); + } + } + if (ctx) { + foreach( Declaration* pdec, ctx->findDeclarations(identifierForNode(node->propertyIdentifier)) ) { + if ( !pdec->isFunctionDeclaration() ) { + foundDec = pdec; + break; + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/tests/duchain.cpp new/kdevelop-php-1.2.0/duchain/tests/duchain.cpp --- old/kdevelop-php-1.1.90/duchain/tests/duchain.cpp 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/duchain/tests/duchain.cpp 2011-01-23 20:42:54.000000000 +0100 @@ -2405,13 +2405,14 @@ "}\n" "namespace {\n" "use ns1\\ns2, ns3\\ns4 as ns5;\n" + "use \\ns3\\ns4 as ns6;\n" "}\n" , DumpNone); QVERIFY(top); DUChainReleaser releaseTop(top); DUChainWriteLocker lock; - QCOMPARE(top->localDeclarations().count(), 4); + QCOMPARE(top->localDeclarations().count(), 5); Declaration* dec = top->localDeclarations().at(2); QCOMPARE(dec->qualifiedIdentifier().toString(), QString("ns2")); @@ -2420,6 +2421,12 @@ dec = top->localDeclarations().at(3); QCOMPARE(dec->qualifiedIdentifier().toString(), QString("ns5")); QVERIFY(dynamic_cast<NamespaceAliasDeclaration*>(dec)); + + dec = top->localDeclarations().at(4); + QCOMPARE(dec->qualifiedIdentifier().toString(), QString("ns6")); + QVERIFY(dynamic_cast<NamespaceAliasDeclaration*>(dec)); + ///TODO: find out why this is explictly required + QVERIFY(!dynamic_cast<NamespaceAliasDeclaration*>(dec)->importIdentifier().explicitlyGlobal()); } struct TestUse { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/duchain/tests/uses.cpp new/kdevelop-php-1.2.0/duchain/tests/uses.cpp --- old/kdevelop-php-1.1.90/duchain/tests/uses.cpp 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/duchain/tests/uses.cpp 2011-01-23 20:42:54.000000000 +0100 @@ -879,7 +879,6 @@ dec = top->findDeclarations(QualifiedIdentifier("foo")).last(); QCOMPARE(dec->kind(), Declaration::Namespace); compareUses(dec, QList<RangeInRevision>() - << RangeInRevision(1, 10, 1, 13) << RangeInRevision(8, 1, 8, 4) << RangeInRevision(9, 1, 9, 4) << RangeInRevision(10, 1, 10, 4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/kdevphpsupport.desktop new/kdevelop-php-1.2.0/kdevphpsupport.desktop --- old/kdevelop-php-1.1.90/kdevphpsupport.desktop 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/kdevphpsupport.desktop 2011-01-23 20:42:54.000000000 +0100 @@ -30,9 +30,13 @@ Name[en_GB]=PHP Language Support Name[es]=Implementación de lenguaje PHP Name[et]=PHP keele toetus +Name[fr]=Prise en charge du langage PHP +Name[it]=Supporto al linguaggio PHP +Name[nb]=PHP språkstøtte Name[nl]=Ondersteuning voor PHP-taal Name[pt]=Suporte à Linguagem PHP Name[pt_BR]=Suporte à linguagem PHP +Name[ru]=Поддержка языка PHP Name[sv]=Stöd för språket PHP Name[uk]=Підтримка мови PHP Name[x-test]=xxPHP Language Supportxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/phplanguagesupport.cpp new/kdevelop-php-1.2.0/phplanguagesupport.cpp --- old/kdevelop-php-1.1.90/phplanguagesupport.cpp 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/phplanguagesupport.cpp 2011-01-23 20:42:54.000000000 +0100 @@ -57,7 +57,7 @@ using namespace KDevelop; K_PLUGIN_FACTORY(KDevPhpSupportFactory, registerPlugin<Php::LanguageSupport>();) -K_EXPORT_PLUGIN(KDevPhpSupportFactory(KAboutData("kdevphpsupport","kdevphp", ki18n("Php Support"), "1.1.90", ki18n("Support for Php Language"), KAboutData::License_GPL) +K_EXPORT_PLUGIN(KDevPhpSupportFactory(KAboutData("kdevphpsupport","kdevphp", ki18n("Php Support"), "1.2.0", ki18n("Support for Php Language"), KAboutData::License_GPL) .addAuthor(ki18n("Milian Wolff"), ki18n("Author"), "mail(a)milianw.de", "http://milianw.de") .addAuthor(ki18n("Niko Sams"), ki18n("Author"), "niko.sams(a)gmail.com", "http://nikosams.blogspot.com") )) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/phpparsejob.cpp new/kdevelop-php-1.2.0/phpparsejob.cpp --- old/kdevelop-php-1.1.90/phpparsejob.cpp 2011-01-09 22:52:33.000000000 +0100 +++ new/kdevelop-php-1.2.0/phpparsejob.cpp 2011-01-23 20:42:54.000000000 +0100 @@ -148,7 +148,7 @@ QReadLocker parseLock(php()->language()->parseLock()); DeclarationBuilder builder(&editor); - KDevelop::ReferencedTopDUContext chain = builder.build(document(), ast); + KDevelop::ReferencedTopDUContext chain = builder.build(document(), ast, toUpdate); if (abortRequested()) { return abortJob(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/po/CMakeLists.txt new/kdevelop-php-1.2.0/po/CMakeLists.txt --- old/kdevelop-php-1.1.90/po/CMakeLists.txt 2011-01-09 22:58:58.000000000 +0100 +++ new/kdevelop-php-1.2.0/po/CMakeLists.txt 2011-01-23 20:49:32.000000000 +0100 @@ -11,6 +11,7 @@ add_subdirectory(th) add_subdirectory(ca) add_subdirectory(uk) +add_subdirectory(nb) add_subdirectory(da) add_subdirectory(nds) add_subdirectory(sv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/po/nb/CMakeLists.txt new/kdevelop-php-1.2.0/po/nb/CMakeLists.txt --- old/kdevelop-php-1.1.90/po/nb/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-1.2.0/po/nb/CMakeLists.txt 2011-01-23 20:46:58.000000000 +0100 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES(nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-1.1.90/po/nb/kdevphp.po new/kdevelop-php-1.2.0/po/nb/kdevphp.po --- old/kdevelop-php-1.1.90/po/nb/kdevphp.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-1.2.0/po/nb/kdevphp.po 2011-01-23 20:46:58.000000000 +0100 @@ -0,0 +1,219 @@ +# Translation of kdevphp to Norwegian Bokmål +# +# Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>, 2010. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2011-01-06 02:37+0100\n" +"PO-Revision-Date: 2010-12-31 14:54+0100\n" +"Last-Translator: Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>\n" +"Language-Team: Norwegian Bokmål <i18n-nb(a)lister.ping.uio.no>\n" +"Language: nb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: completion/implementationitem.cpp:69 +msgid "Override" +msgstr "Overstyr" + +#: completion/implementationitem.cpp:72 +msgid "Implement" +msgstr "Implementer" + +#: completion/implementationitem.cpp:84 +#, kde-format +msgid "From %1" +msgstr "Fra %1" + +#: duchain/builders/contextbuilder.cpp:388 +#, kde-format +msgid "Circular inheritance of %1 and %2" +msgstr "Sirkulær arv av %1 og %2" + +#: duchain/builders/usebuilder.cpp:143 +#, kde-format +msgid "Usage of %1 is deprecated." +msgstr "Bruk av %1 er frarådet." + +#: duchain/builders/declarationbuilder.cpp:300 +#, kde-format +msgid "Access type for interface method %1 must be omitted." +msgstr "Tilgangstype for grensesnittmetode %1 må utelates." + +#: duchain/builders/declarationbuilder.cpp:304 +#, kde-format +msgid "Interface function %1 cannot contain body." +msgstr "Grensesnittfunksjon %1 kan ikke inneholde en kropp." + +#: duchain/builders/declarationbuilder.cpp:316 +#, kde-format +msgid "" +"Class %1 contains abstract method %2 and must therefore be declared abstract " +"or implement the method." +msgstr "" +"Klasse %1 inneholder en abstrakt metode %2 og må derfor deklareres abstrakt, " +"eller implementere metoden." + +#: duchain/builders/declarationbuilder.cpp:322 +#, kde-format +msgid "Abstract function %1 cannot contain body." +msgstr "Abstrakt funksjon %1 kan ikke inneholde en kropp." + +#: duchain/builders/declarationbuilder.cpp:325 +msgid "Cannot use the final modifier on an abstract class member." +msgstr "Kan ikke bruke «final» på et abstrakt klassemedlem." + +#: duchain/builders/declarationbuilder.cpp:335 +#, kde-format +msgid "Non-abstract method %1 must contain body." +msgstr "Ikke-abstrakt metode %1 må inneholde en kropp." + +#: duchain/builders/declarationbuilder.cpp:349 +msgid "Properties cannot be declared final." +msgstr "Egenskaper kan ikke deklareres final." + +#: duchain/builders/declarationbuilder.cpp:352 +msgid "Properties cannot be declared abstract." +msgstr "Egenskaper kan ikke deklareres abstrakt." + +#: duchain/builders/declarationbuilder.cpp:451 +#, kde-format +msgid "Cannot redeclare private property %1 from this context." +msgstr "Kan ikke redeklarere private egenskap %1 fra denne konteksten." + +#: duchain/builders/declarationbuilder.cpp:457 +#, kde-format +msgid "Cannot redeclare protected property %1 from this context." +msgstr "Kan ikke redeklarere protected egenskap %1 fra denne konteksten." + +#: duchain/builders/declarationbuilder.cpp:520 +msgid "" +"Only booleans, ints, floats and strings are allowed for class constants." +msgstr "Bare boolean, int, float og string er tillatt for klassekonstanter." + +#: duchain/builders/declarationbuilder.cpp:533 +msgid "Default value for parameters with a class type hint can only be NULL." +msgstr "Standardverdi for parametre med et klassetype-hint kan bare være NULL." + +#: duchain/builders/declarationbuilder.cpp:536 +msgid "Following parameters must have a default value assigned." +msgstr "Følgende parametre må ha tilordnet en standardverdi." + +#: duchain/builders/declarationbuilder.cpp:642 +#, kde-format +msgid "Cannot redeclare PHP internal %1." +msgstr "Kan ikke re-deklarere PHP intern %1." + +#: duchain/builders/declarationbuilder.cpp:646 +#, kde-format +msgid "Cannot redeclare %1, already declared in %2 on line %3." +msgstr "Kan ikke re-deklarere %1, allerede deklarert i %2 på linje %3." + +#: duchain/builders/declarationbuilder.cpp:708 +msgid "Cannot re-assign $this." +msgstr "Kan ikke gi $this ny tilordning." + +#: duchain/builders/declarationbuilder.cpp:1149 +#, kde-format +msgid "The use statement with non-compound name '%1' has no effect." +msgstr "use-setningen med ikke-sammensatt navn «%1» har ingen effekt." + +#: duchain/navigation/declarationnavigationcontext.cpp:123 +msgid "PHP internal" +msgstr "PHP intern" + +#: duchain/navigation/declarationnavigationcontext.cpp:133 +msgctxt "kind of a php-constant, as shown in the declaration tooltip" +msgid "Constant" +msgstr "Konstant" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:61 +msgid "magic constant" +msgstr "magisk konstant" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:76 +msgid "empty (not inside a class)" +msgstr "tom (ikke inne i en klasse)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:95 +msgid "empty (not inside a method)" +msgstr "tom (ikke inne i en metode)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:105 +msgid "empty (not inside a function)" +msgstr "tom (ikke inne i en funksjon)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:114 +msgid "empty (not inside a namespace)" +msgstr "tom (ikke inne i et navnerom)" + +#: duchain/navigation/magicconstantnavigationcontext.cpp:118 +#, kde-format +msgid "current value: %1" +msgstr "nåværende verdi: %1" + +#: parser/main.cpp:41 +msgid "php-parser" +msgstr "pgp-tolker" + +#: parser/main.cpp:42 +msgid "KDevelop PHP parser debugging utility" +msgstr "KDevelop-verktøy for å feilsøke PHP-tolker" + +#: parser/main.cpp:43 +msgid "(c) 2008 Niko Sams, 2009 Milian Wolff" +msgstr "© 2008 Niko Sams, 2009 Milian Wolff" + +#: parser/parsesession.cpp:71 +#, kde-format +msgid "Could not open file '%1'" +msgstr "Klarte ikke å åpne fila «%1»" + +#: parser/parsesession.cpp:74 +msgid "File could not be read from." +msgstr "Klarte ikke å lese fila." + +#: parser/parsesession.cpp:77 +msgid "File could not be opened." +msgstr "Fila kunne ikke åpnes." + +#: parser/parsesession.cpp:80 +msgid "File permissions prevent opening for read." +msgstr "Filtillatelser tillater ikke åpning for lesing." + +#: phplanguagesupport.cpp:60 +msgid "Php Support" +msgstr "PHP-støtte" + +#: phplanguagesupport.cpp:60 +msgid "Support for Php Language" +msgstr "Støtte for PHP-språket" + +#: phplanguagesupport.cpp:61 +msgid "Milian Wolff" +msgstr "Milian Wolff" + +#: phplanguagesupport.cpp:61 phplanguagesupport.cpp:62 +msgid "Author" +msgstr "Forfatter" + +#: phplanguagesupport.cpp:62 +msgid "Niko Sams" +msgstr "Niko Sams" + +#: rc.cpp:1 +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Bjørn Steensrud" + +#: rc.cpp:2 +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "bjornst(a)skogkatt.homelinux.org" \ No newline at end of file ++++++ kdevelop-php-docs-1.1.90.tar.bz2 -> kdevelop-php-docs-1.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/CHANGELOG.1.1.90 new/kdevelop-php-docs-1.2.0/CHANGELOG.1.1.90 --- old/kdevelop-php-docs-1.1.90/CHANGELOG.1.1.90 2011-01-09 22:59:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/CHANGELOG.1.1.90 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -ChangeLog for php-docs v1.1.90 -============================== - -* Milian Wolff: set version to 1.1.90 in preparation of kdev 4.2 rc1 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/CHANGELOG.1.2.0 new/kdevelop-php-docs-1.2.0/CHANGELOG.1.2.0 --- old/kdevelop-php-docs-1.1.90/CHANGELOG.1.2.0 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/CHANGELOG.1.2.0 2011-01-23 20:49:34.000000000 +0100 @@ -0,0 +1,4 @@ +ChangeLog for php-docs v1.2.0 +============================= + +* Milian Wolff: set version to 1.2.0 and look for same versioned kdevplatform in preparation of release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/CMakeLists.txt new/kdevelop-php-docs-1.2.0/CMakeLists.txt --- old/kdevelop-php-docs-1.1.90/CMakeLists.txt 2011-01-09 23:05:22.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/CMakeLists.txt 2011-01-23 20:56:00.000000000 +0100 @@ -4,7 +4,7 @@ enable_testing() find_package(KDE4 REQUIRED) -find_package(KDevPlatform 1.1.90 REQUIRED) +find_package(KDevPlatform 1.2.0 REQUIRED) include_directories(${KDEVPLATFORM_INCLUDE_DIR}) include_directories( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/kdevphpdocs.desktop new/kdevelop-php-docs-1.2.0/kdevphpdocs.desktop --- old/kdevelop-php-docs-1.1.90/kdevphpdocs.desktop 2011-01-09 22:59:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/kdevphpdocs.desktop 2011-01-23 20:49:34.000000000 +0100 @@ -15,6 +15,7 @@ Comment[nl]=Deze plugin integreert PHP.net online-documentatie. Comment[pt]=Este 'plugin' integra a documentação 'online' do PHP.net. Comment[pt_BR]=Este plug-in integra a documentação on-line do PHP.net. +Comment[ru]=Расширение для работы с документацией с сайта PHP.net Comment[sv]=Insticksprogrammet integrerar PHP.net nätdokumentation. Comment[tr]=Bu eklenti, PHP çevrimiçi belgelendirmesini entegre eder. Comment[uk]=За допомогою цього додатка можна інтегрувати документацію PHP.net. @@ -37,6 +38,7 @@ Name[nl]=PHP-documentatie Name[pt]=Documentação de PHP Name[pt_BR]=Documentação de PHP +Name[ru]=Документация по PHP Name[sv]=PHP-dokumentation Name[tr]=PHP Belgelendirmesi Name[uk]=Документація з PHP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/kdevphpdocs_config.desktop new/kdevelop-php-docs-1.2.0/kdevphpdocs_config.desktop --- old/kdevelop-php-docs-1.1.90/kdevphpdocs_config.desktop 2011-01-09 22:59:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/kdevphpdocs_config.desktop 2011-01-23 20:49:34.000000000 +0100 @@ -26,6 +26,7 @@ Name[nl]=PHP-documentatie Name[pt]=Documentação de PHP Name[pt_BR]=Documentação de PHP +Name[ru]=Документация по PHP Name[sv]=PHP-dokumentation Name[tr]=PHP Belgelendirmesi Name[uk]=Документація з PHP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/phpdocsplugin.cpp new/kdevelop-php-docs-1.2.0/phpdocsplugin.cpp --- old/kdevelop-php-docs-1.1.90/phpdocsplugin.cpp 2011-01-09 22:59:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/phpdocsplugin.cpp 2011-01-23 20:49:34.000000000 +0100 @@ -52,7 +52,7 @@ K_PLUGIN_FACTORY(PhpDocsFactory, registerPlugin<PhpDocsPlugin>(); ) K_EXPORT_PLUGIN(PhpDocsFactory(KAboutData("kdevphpdocs","kdevphpdocs", ki18n("PhpDocs"), - "1.1.90", ki18n("Check PHP.net documentation"), + "1.2.0", ki18n("Check PHP.net documentation"), KAboutData::License_GPL).addAuthor(ki18n("Milian Wolff"), ki18n("Maintainer"), "mail(a)milianw.de", "http://milianw.de"))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/CMakeLists.txt new/kdevelop-php-docs-1.2.0/po/CMakeLists.txt --- old/kdevelop-php-docs-1.1.90/po/CMakeLists.txt 2011-01-09 23:05:22.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/po/CMakeLists.txt 2011-01-23 20:56:00.000000000 +0100 @@ -10,7 +10,9 @@ add_subdirectory(ca@valencia) add_subdirectory(pt) add_subdirectory(ca) +add_subdirectory(ru) add_subdirectory(uk) +add_subdirectory(nb) add_subdirectory(da) add_subdirectory(nds) add_subdirectory(sv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/nb/CMakeLists.txt new/kdevelop-php-docs-1.2.0/po/nb/CMakeLists.txt --- old/kdevelop-php-docs-1.1.90/po/nb/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/po/nb/CMakeLists.txt 2011-01-23 20:53:20.000000000 +0100 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES(nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/nb/kdevphpdocs.po new/kdevelop-php-docs-1.2.0/po/nb/kdevphpdocs.po --- old/kdevelop-php-docs-1.1.90/po/nb/kdevphpdocs.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/po/nb/kdevphpdocs.po 2011-01-23 20:53:20.000000000 +0100 @@ -0,0 +1,135 @@ +# Translation of kdevphpdocs to Norwegian Bokmål +# +# Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2010-12-16 02:25+0100\n" +"PO-Revision-Date: 2011-01-09 22:25+0100\n" +"Last-Translator: Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>\n" +"Language-Team: Norwegian Bokmål <i18n-nb(a)lister.ping.uio.no>\n" +"Language: nb\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: phpdocsmodel.cpp:113 +msgid "<lost declaration>" +msgstr "<mistet deklarasjon>" + +#: phpdocumentationwidget.cpp:67 +msgid "...loading documentation..." +msgstr "… laster dokumentasjon …" + +#: phpdocsplugin.cpp:54 +msgid "PhpDocs" +msgstr "PhpDocs" + +#: phpdocsplugin.cpp:55 +msgid "Check PHP.net documentation" +msgstr "Sjekk PHP.net-dokumentasjon" + +#: phpdocsplugin.cpp:56 +msgid "Milian Wolff" +msgstr "Milian Wolff" + +#: phpdocsplugin.cpp:57 +msgid "Maintainer" +msgstr "Vedlikeholder" + +#: phpdocsplugin.cpp:222 +msgid "PHP Documentation" +msgstr "PHP-dokumentasjon" + +#: rc.cpp:1 +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Bjørn Steensrud" + +#: rc.cpp:2 +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "bjornst(a)skogkatt.homelinux.org" + +#. i18n: file: phpdocsconfig.ui:20 +#. i18n: ectx: property (title), widget (QGroupBox, PhpDoc) +#: rc.cpp:5 +msgid "PHP Manual Integration" +msgstr "PHP håndbok-integrering" + +#. i18n: file: phpdocsconfig.ui:36 +#. i18n: ectx: property (text), widget (QLabel, PhpDocNote) +#: rc.cpp:8 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/" +"REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/" +"css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-" +"weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" +"right:0px; -qt-block-indent:0; text-indent:0px;\">By default the online <a " +"href=\"http://php.net\"><span style=\" text-decoration: underline; " +"color:#0000ff;\">PHP documentation</span></a> is used remotely. " +"Alternatively you can set the location to a local copy of the documentation " +"in the language of your choice. Make sure you downloaded the <span style=\" " +"font-style:italic;\">\"HTML format, many files\"</span> package.</p></body></" +"html>" +msgstr "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/" +"REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/" +"css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-" +"weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" +"right:0px; -qt-block-indent:0; text-indent:0px;\">Som standard blir " +"nettutgaven av <a href=\"http://php.net\"><span style=\" text-decoration: " +"underline; color:#0000ff;\">PHP-dokumentasjonen</span></a> brukt. Ellers kan " +"du oppgi adressen til en lokal utgave av dokumentasjonen på det språket du " +"vil. Pass på at du lastet ned pakka <span style=\" font-style:italic;" +"\">\"HTML format, mange filer\"</span> package.</p></body></html>" + +#. i18n: file: phpdocsconfig.ui:54 +#. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel) +#: rc.cpp:15 +msgid "Location:" +msgstr "Plassering:" + +#. i18n: file: phpdocssettings.kcfg:10 +#. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation) +#: rc.cpp:18 +msgid "Specifies the location of the PHP documentation to use." +msgstr "Oppgir plasseringen til den PHP-dokumentasjonen som skal brukes." + +#. i18n: file: phpdocssettings.kcfg:13 +#. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation) +#: rc.cpp:21 +msgid "" +"The location of the PHP documentation to use. You can either use a remote\n" +" location like http://php.net or a local directory which " +"contains the\n" +" PHP documentation in HTML format with many files." +msgstr "" +"Plasseringen til PHP-dokumentasjonen som skal brukes. Du kan enten bruke\n" +" en nettadresse som http://php.net eller en lokal mappe som " +"inneholder\n" +" PHP-dokumentasjonen i HTML-format med mange filer." + +#. i18n: file: phpdocssettings.kcfg:15 +#. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation) +#: rc.cpp:26 +msgid "" +"Make sure local copies are downloaded in HTML format with many files.\n" +" " +msgstr "" +"Se til at lokale kopier er lastet ned i HTML-format med mange filer.\n" +" " \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/ru/CMakeLists.txt new/kdevelop-php-docs-1.2.0/po/ru/CMakeLists.txt --- old/kdevelop-php-docs-1.1.90/po/ru/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/po/ru/CMakeLists.txt 2011-01-23 20:54:23.000000000 +0100 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES(ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.1.90/po/ru/kdevphpdocs.po new/kdevelop-php-docs-1.2.0/po/ru/kdevphpdocs.po --- old/kdevelop-php-docs-1.1.90/po/ru/kdevphpdocs.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-docs-1.2.0/po/ru/kdevphpdocs.po 2011-01-23 20:54:23.000000000 +0100 @@ -0,0 +1,138 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Alexander Potashev <aspotashev(a)gmail.com>, 2010, 2011. +# Alexander Wolf <alex.v.wolf(a)gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2010-12-16 02:25+0100\n" +"PO-Revision-Date: 2011-01-22 09:59+0300\n" +"Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" +"Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n%" +"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: phpdocsmodel.cpp:113 +msgid "<lost declaration>" +msgstr "" + +#: phpdocumentationwidget.cpp:67 +msgid "...loading documentation..." +msgstr "Загрузка документации..." + +#: phpdocsplugin.cpp:54 +msgid "PhpDocs" +msgstr "PhpDocs" + +#: phpdocsplugin.cpp:55 +msgid "Check PHP.net documentation" +msgstr "Просмотр документации на PHP.net" + +#: phpdocsplugin.cpp:56 +msgid "Milian Wolff" +msgstr "Milian Wolff" + +#: phpdocsplugin.cpp:57 +msgid "Maintainer" +msgstr "Сопровождающий" + +#: phpdocsplugin.cpp:222 +msgid "PHP Documentation" +msgstr "Документация PHP" + +#: rc.cpp:1 +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Александр Вольф" + +#: rc.cpp:2 +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "alex.v.wolf(a)gmail.com" + +#. i18n: file: phpdocsconfig.ui:20 +#. i18n: ectx: property (title), widget (QGroupBox, PhpDoc) +#: rc.cpp:5 +msgid "PHP Manual Integration" +msgstr "Интеграция руководства PHP" + +#. i18n: file: phpdocsconfig.ui:36 +#. i18n: ectx: property (text), widget (QLabel, PhpDocNote) +#: rc.cpp:8 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/" +"REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css" +"\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-" +"weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" +"right:0px; -qt-block-indent:0; text-indent:0px;\">By default the online <a " +"href=\"http://php.net\"><span style=\" text-decoration: underline; color:" +"#0000ff;\">PHP documentation</span></a> is used remotely. Alternatively you " +"can set the location to a local copy of the documentation in the language of " +"your choice. Make sure you downloaded the <span style=\" font-style:italic;" +"\">\"HTML format, many files\"</span> package.</p></body></html>" +msgstr "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/" +"REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css" +"\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-" +"weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-" +"right:0px; -qt-block-indent:0; text-indent:0px;\">По-умолчанию онлайновая <a " +"href=\"http://php.net\"><span style=\" text-decoration: underline; color:" +"#0000ff;\">документация на PHP</span></a> используется удалённо. В качестве " +"альтернативы можно сделать локальную копию документации и указать её " +"расположение. Убедитесь в том, что вы загрузили с сайта именно пакет <span " +"style=\" font-style:italic;\">«Формат HTML, много файлов»</span>.</p></body></" +"html>" + +#. i18n: file: phpdocsconfig.ui:54 +#. i18n: ectx: property (text), widget (QLabel, PhpDocLocationLabel) +#: rc.cpp:15 +msgid "Location:" +msgstr "Расположение:" + +#. i18n: file: phpdocssettings.kcfg:10 +#. i18n: ectx: label, entry (phpDocLocation), group (PHP Documentation) +#: rc.cpp:18 +msgid "Specifies the location of the PHP documentation to use." +msgstr "Укажите расположение используемой документации PHP." + +#. i18n: file: phpdocssettings.kcfg:13 +#. i18n: ectx: tooltip, entry (phpDocLocation), group (PHP Documentation) +#: rc.cpp:21 +msgid "" +"The location of the PHP documentation to use. You can either use a remote\n" +" location like http://php.net or a local directory which " +"contains the\n" +" PHP documentation in HTML format with many files." +msgstr "" +"Расположение используемой документации PHP. Можно указать адрес \n" +"вида http://php.net или локальную папку, в которой находится документация \n" +"PHP в виде набора HTML файлов." + +#. i18n: file: phpdocssettings.kcfg:15 +#. i18n: ectx: whatsthis, entry (phpDocLocation), group (PHP Documentation) +#: rc.cpp:26 +msgid "" +"Make sure local copies are downloaded in HTML format with many files.\n" +" " +msgstr "" +"Убедитесь в том, что документация загружена в виде архива с набором файлов " +"HTML.\n" +" " \ No newline at end of file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevelop4 for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package kdevelop4 for openSUSE:Factory checked in at Tue Jan 25 13:08:48 CET 2011. -------- --- KDE/kdevelop4/kdevelop4.changes 2011-01-15 17:02:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdevelop4/kdevelop4.changes 2011-01-25 12:21:56.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Jan 24 14:54:00 UTC 2011 - wstephenson(a)novell.com + +* update to 4.2.0 final: + * Ported to Kate MovingCursors and MovingRanges apis + * Improved Search and Replace in multiple files + * Better embedded developer documentation including .qch support + * Better handling of locked sessions + * Improved look-and-feel for code assistants + * Filter added to the Projects toolview + * A much improved Problems toolview, which now tracks TODO and + FIXME comments as well + * Improved standards compliancy for the C++ macro support + * Improvements to file and folder handling, in particular for + CMake support + * Improvements to file and folder handling, in particular for + CMake support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevelop-4.1.90.tar.bz2 New: ---- kdevelop-4.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4.spec ++++++ --- /var/tmp/diff_new_pack.vTqMvW/_old 2011-01-25 13:08:41.000000000 +0100 +++ /var/tmp/diff_new_pack.vTqMvW/_new 2011-01-25 13:08:41.000000000 +0100 @@ -25,9 +25,9 @@ Group: Development/Tools/IDE Summary: Integrated Development Environment for the X Window System, Qt, KDE, and GNOME Url: http://www.kdevelop.org -Version: 4.1.90 +Version: 4.2.0 Release: 1 -Source0: kdevelop-4.1.90.tar.bz2 +Source0: kdevelop-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %version %kde4_runtime_requires ++++++ kdevelop-4.1.90.tar.bz2 -> kdevelop-4.2.0.tar.bz2 ++++++ ++++ 17315 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0