March 2010 - openSUSE Commits - openSUSE Mailing Lists

commit syncevolution for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package syncevolution for openSUSE:Factory checked in at Fri Mar 19 10:44:13 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/syncevolution/syncevolution.changes 2010-03-17 17:48:43.000000000 +0100 @@ -0,0 +1,136 @@ +------------------------------------------------------------------- +Wed Mar 17 16:47:10 UTC 2010 - awafaa(a)opensuse.org + +- Replace rpmlinrc with syncevolution-rpmlintrc to pass + autobuild checks + +------------------------------------------------------------------- +Wed Mar 17 12:21:26 UTC 2010 - awafaa(a)opensuse.org + +- Update Summary and Description + +------------------------------------------------------------------- +Wed Nov 18 11:31:53 UTC 2009 - glin(a)novell.com + +- Respin desktop_file.patch to change the icon name +- Replace moblin with hicolor in the icon installation path in spec + file to pass package building. + +------------------------------------------------------------------- +Thu Oct 29 11:42:38 CET 2009 - jimmac(a)novell.com + +- don't hardcode the path to the icon in the .desktop file to allow theming. + +------------------------------------------------------------------- +Mon Oct 12 06:25:24 UTC 2009 - glin(a)novell.com + +- Add syncevolution-add-translation.patch to update po files + bnc#533220 + +------------------------------------------------------------------- +Tue Oct 6 10:11:28 UTC 2009 - glin(a)novell.com + +- Repsin desktop_file.patch to add "Internet" to categories. + bnc#542799 + +------------------------------------------------------------------- +Sat Sep 19 10:35:20 CET 2009 - awafaa(a)opensuse.org + +- Fix spec file to build on openSUSE Factory - use %patch0 + +------------------------------------------------------------------- +Wed Sep 02 12:54:00 BST 2009 - riggwelter(a)opensuse.org + +- Split lang package. +- Use {_libdir} macro to build correctly on x86_64. +- Tidy up spec file - lots of duplication. + +------------------------------------------------------------------- +Tue Aug 25 16:42:00 BST 2009 - riggwelter(a)opensuse.org + +- Updated to upstream 0.9. +- http://downloads.syncevolution.org/syncevolution/ChangeLog.txt + +------------------------------------------------------------------- +Thu May 14 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- fix for test system (#2219, #2220) +- dbus client: don't open urls twice (#2387) +- various other fixes in sync UI/dbus client + +------------------------------------------------------------------- +Wed May 13 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- better workaround for ScheduleWorld's EXDATE bug (#2226) +- GUI hack for unmaximized windows (#2057) +- GUI suppresses unsupported data sources (memos, #1977) +- GUI cancel improvements and cancel temporarily removed because not + completely done (#2271, 2067) +- --remove did not remove .other.ini (#1806) +- fix for not having all backends loaded when using shared libs (#2236) + +------------------------------------------------------------------- +Tue May 12 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- Bugzilla #2222: support checking of connection state via Conman +- GUI: tigher screen layout to fit into Netbook screen +- compile more code into shared libraries to reduce overall size + +------------------------------------------------------------------- +Mon May 11 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- Bugzilla #2042: GUI: no feedback for failed sync +- Bugzilla #2063: SyncUI cannot sync data while command line can +- Bugzilla #2029: client-test Source::testImport failed on Moblin +- Bugzilla #2146: D-Bus interface: detect crash of server +- some other minor fixes and improvements (for example, README) + +------------------------------------------------------------------- +Fri May 08 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- various fixes in the UI +- use GNOME system settings for HTTP proxy + +------------------------------------------------------------------- +Thu May 07 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- built from "ui" branch with Moblin UX GUI enabled + +------------------------------------------------------------------- +Tue May 05 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- uses the 3.2.0.27 Synthesis open source release from www.synthesis.ch/indefero: + fixes VTIMEZONE parsing and generation of invalid VTIMEZONE with no TZID +- Evolution memos: send summary if description is empty + +------------------------------------------------------------------- +Wed Apr 22 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- uses the 3.2.0.26 Synthesis open source release from www.synthesis.ch/indefero +- fixed Bugzilla #1412: no data source enabled => XML error => should be normal message + +------------------------------------------------------------------- +Thu Apr 09 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- various bug fixes in Synthesis SyncML implementation +- updated README + NEWS files in preparation for 0.9 beta 1 + +------------------------------------------------------------------- +Wed Mar 25 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- fixed bugzilla #1318: sync with ScheduleWorld fails: Cannot connect to datastore implementation module +- fixed bugzilla #1332: Moblin UX: should find address book, calendar, task list +- workaround bugzilla #1360: WBXML + ScheduleWorld: "UNKNOWN SERVER" +- compile SyncML Toolkit as separate library + +------------------------------------------------------------------- +Fri Mar 13 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- updated upstream sources +- build -test package with client-test + test files + +------------------------------------------------------------------- +Fri Feb 27 00:00:00 CET 2009 - patrick.ohly(a)intel.com + +- Initial release with Synthesis + calling whatdependson for head-i586 New: ---- desktop_file.patch syncevolution-0.9.tar.gz syncevolution-add-translation.patch syncevolution.changes syncevolution-rpmlintrc syncevolution.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syncevolution.spec ++++++ # # spec file for package syncevolution (Version 0.9) # # Copyright (c) 2010 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 Name: syncevolution Summary: SyncML Client Group: Applications/Productivity Version: 0.9 Release: 1 License: LGPLv2.1+ Url: http://www.estamos.de/projects/SyncML/ Source0: %{name}-%{version}.tar.gz Source1: syncevolution-rpmlintrc Patch0: desktop_file.patch Patch1: syncevolution-add-translation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: pkgconfig(evolution-data-server-1.2) BuildRequires: cppunit-devel dbus-1-glib-devel gconf2-devel libsoup-devel BuildRequires: evolution-data-server-devel gtk2-devel libglade2-devel sqlite3-devel BuildRequires: boost-devel libsoup-devel pcre-devel BuildRequires: gcc gcc-c++ update-desktop-files BuildRequires: libxslt #BuildRequires: pkgconfig(libpcre) #BuildRequires: pkgconfig(sqlite3) #BuildRequires: pkgconfig(gtk+-2.0) #BuildRequires: pkgconfig(libglade-2.0) #BuildRequires: pkgconfig(gconf-2.0) #BuildRequires: pkgconfig(gio-2.0) BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: dbus-1 BuildRequires: intltool BuildRequires: python BuildRequires: gdb Requires: %{name}-lang = %{version} %description A SyncML Client that interfaces with multiple web based services & e-d-s backend. %package devel License: LGPLv2.1+ Summary: SyncML Client Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Description: SyncML Client %package test License: LGPLv2.1+ Summary: SyncML Client Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description test Description: SyncML Client %lang_package %prep %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 %build %configure --enable-integration-tests --enable-dbus-service --enable-gui=moblin --enable-shared --disable-static export LD_AS_NEEDED=1 make %{?_smp_mflags} %install rm -rf %{buildroot} %makeinstall rm -rf %{buildroot}%{_libdir}/syncevolution/syncecal.la rm -rf %{buildroot}%{_libdir}/syncevolution/syncebook.la rm -rf %{buildroot}%{_libdir}/syncevolution/libsyncevolution.la rm -rf %{buildroot}%{_libdir}/libsmltk.la rm -rf %{buildroot}%{_libdir}/libsyncevo-dbus.la rm -rf %{buildroot}%{_libdir}/libsynthesis.la rm -rf %{buildroot}%{_libdir}/libsynthesissdk.la %find_lang %{name} || echo -n >> %{name}.lang mkdir -p %{buildroot}/%{_datadir}/doc/%{name}-%{version} for f in `ls %{buildroot}/%{_datadir}/doc/`; do if [ -f %{buildroot}/%{_datadir}/doc/$f ]; then mv %{buildroot}/%{_datadir}/doc/$f %{buildroot}/%{_datadir}/doc/%{name}-%{version} fi done mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps cp %{buildroot}/%{_datadir}/syncevolution/sync-generic.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/sync-generic.png cp %{buildroot}/%{_datadir}/syncevolution/sync-generic.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/sync-generic.png cp %{buildroot}/%{_datadir}/syncevolution/sync-generic.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/sync-generic.png cp %{buildroot}/%{_datadir}/syncevolution/sync-generic.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/sync-generic.png cp %{buildroot}/%{_datadir}/syncevolution/sync-generic.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/sync-generic.png %suse_update_desktop_file -r %{buildroot}/usr/share/applications/sync.desktop -N sync-generic -G sync-generic GNOME System Backup %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/synccompare %{_bindir}/syncevolution %{_bindir}/sync-ui %{_libdir}/libsynthesis.so.0 %{_libdir}/libsynthesis.so.0.1.0 %{_libdir}/libsmltk.so.0 %{_libdir}/libsmltk.so.0.1.0 %{_libdir}/libsyncevo-dbus.so.0 %{_libdir}/libsyncevo-dbus.so.0.0.0 %dir %{_libdir}/syncevolution %{_libdir}/syncevolution/* %{_libexecdir}/syncevo-dbus-server %dir %{_datadir}/syncevolution %{_datadir}/syncevolution/close_hover.png %{_datadir}/syncevolution/settings_hover.png %{_datadir}/syncevolution/sync-generic.png %{_datadir}/syncevolution/ui.xml %{_datadir}/syncevolution/settings.png %{_datadir}/syncevolution/close.png %{_datadir}/syncevolution/sync-ui.rc %{_datadir}/applications/sync.desktop %{_datadir}/icons/hicolor/16x16/apps/sync-generic.png %{_datadir}/icons/hicolor/24x24/apps/sync-generic.png %{_datadir}/icons/hicolor/32x32/apps/sync-generic.png %{_datadir}/icons/hicolor/48x48/apps/sync-generic.png %{_datadir}/icons/hicolor/64x64/apps/sync-generic.png %{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service %dir %{_datadir}/doc/syncevolution %dir %{_datadir}/doc/syncevolution/testcases %{_datadir}/doc/syncevolution/testcases/ical20.ics %{_datadir}/doc/syncevolution/testcases/imemo20.ics %{_datadir}/doc/syncevolution/testcases/itodo20.ics %{_datadir}/doc/syncevolution/testcases/ical20.ics.funambol.tem %{_datadir}/doc/syncevolution/testcases/itodo20.ics.funambol.tem %{_datadir}/doc/syncevolution/testcases/vcard30.vcf.google.tem %{_datadir}/doc/syncevolution/testcases/vcard21.vcf %{_datadir}/doc/syncevolution/testcases/vcard30.vcf %dir %{_sysconfdir}/default/syncevolution %dir %{_sysconfdir}/default/syncevolution/Funambol %dir %{_sysconfdir}/default/syncevolution/Funambol/sources %dir %{_sysconfdir}/default/syncevolution/Funambol/sources/addressbook %dir %{_sysconfdir}/default/syncevolution/Funambol/sources/calendar %dir %{_sysconfdir}/default/syncevolution/Funambol/sources/memo %dir %{_sysconfdir}/default/syncevolution/Funambol/sources/todo %dir %{_sysconfdir}/default/syncevolution/ScheduleWorld %dir %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources %dir %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/addressbook %dir %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/calendar %dir %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/memo %dir %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/todo %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/addressbook/config.ini %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/calendar/config.ini %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/memo/config.ini %{_sysconfdir}/default/syncevolution/ScheduleWorld/sources/todo/config.ini %{_sysconfdir}/default/syncevolution/ScheduleWorld/config.ini %{_sysconfdir}/default/syncevolution/Funambol/sources/addressbook/config.ini %{_sysconfdir}/default/syncevolution/Funambol/sources/calendar/config.ini %{_sysconfdir}/default/syncevolution/Funambol/sources/memo/config.ini %{_sysconfdir}/default/syncevolution/Funambol/sources/todo/config.ini %{_sysconfdir}/default/syncevolution/Funambol/config.ini %files devel %defattr(-,root,root,-) %doc %defattr(-,root,root,-) %dir %{_includedir}/synthesis %dir %{_includedir}/syncevo-dbus %{_includedir}/synthesis/*.h %{_includedir}/syncevo-dbus/*.h %{_libdir}/libsynthesis.so %{_libdir}/libsmltk.so %{_libdir}/libsyncevo-dbus.so %{_libdir}/pkgconfig/syncevo-dbus.pc %{_libdir}/pkgconfig/synthesis.pc %{_libdir}/libsynthesissdk.a %files test %defattr(-,root,root,-) %doc %defattr(-,root,root,-) %{_bindir}/client-test %files lang -f %{name}.lang %changelog ++++++ desktop_file.patch ++++++ Index: syncevolution-0.9/src/gtk-ui/sync.desktop.in =================================================================== --- syncevolution-0.9.orig/src/gtk-ui/sync.desktop.in +++ syncevolution-0.9/src/gtk-ui/sync.desktop.in @@ -1,10 +1,10 @@ [Desktop Entry] -_Name=Sync +_Name=SyncEvolution _Comment=Up to date Version=1.0 Type=Application Exec=sync-ui -Icon=sync -Categories=Network;GTK; +Icon=sync-generic +Categories=GNOME;System;X-SuSE-Backup;Internet; Terminal=false StartupNotify=true ++++++ syncevolution-add-translation.patch ++++++ ++++ 8915 lines (skipped) ++++++ syncevolution-rpmlintrc ++++++ addFilter("shlib-policy-name-error") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 uxlaunch for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package uxlaunch for openSUSE:Factory checked in at Fri Mar 19 10:42:37 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/uxlaunch/uxlaunch.changes 2010-03-18 12:25:29.000000000 +0100 @@ -0,0 +1,103 @@ +------------------------------------------------------------------- +Thu Mar 18 11:26:06 UTC 2010 - awafaa(a)opensuse.org + +- Fix man pages installation issue + +------------------------------------------------------------------- +Wed Mar 17 17:08:06 UTC 2010 - awafaa(a)opensuse.org + +- Change group to System/GUI/Other. Remove patch + uxlaunch-shutdown-gconfd.patch from >11.2 + +------------------------------------------------------------------- +Tue Feb 2 06:54:53 UTC 2010 - glin(a)novell.com + +- Set SDL_AUDIODRIVER=pulse to fix bnc#573381 + +------------------------------------------------------------------- +Mon Feb 1 10:24:35 UTC 2010 - glin(a)novell.com + +- Respin export-extra-env.patch to add two env variables: + WINDOWMANAGER and PATH. bnc#571380 + +------------------------------------------------------------------- +Fri Jan 29 15:49:02 GMT 2010 - michael.meeks(a)novell.com + +- Add uxlaunch-myzone-speed.patch: allow the myzone to get a + couple of seconds of uninterrupted CPU under it's belt. + +------------------------------------------------------------------- +Tue Nov 10 01:51:21 UTC 2009 - glin(a)novell.com + +- Update to 0.22.5 +- Added uxlaunch-rename-panel-internet-to-web.patch to rename the + moblin-panel-internet to moblin-panel-web in desktop.c + +------------------------------------------------------------------- +Tue Oct 27 12:52:24 UTC 2009 - tambet(a)novell.com + +- Improve the uxlaunch-shutdown-gconfd.patch to use gconftool-2 to + shut down gconfd. + +------------------------------------------------------------------- +Tue Oct 27 06:02:08 UTC 2009 - glin(a)novell.com + +- Add uxlaunch-shutdown-gconfd.patch to save gconf keys before shutdown + bnc#549522 + +------------------------------------------------------------------- +Tue Oct 13 09:55:10 UTC 2009 - glin(a)novell.com + +- Respin export-extra-env.patch to add ALSA_CONFIG_PATH. bnc#533225 + +------------------------------------------------------------------- +Fri Sep 18 07:56:39 UTC 2009 - awafaa(a)opensuse.org + +- Add uxlaunch-user.diff to remove the hard dependency on user "linux" + +------------------------------------------------------------------- +Sun Aug 30 15:47:04 UTC 2009 - abockover(a)novell.com + +- Export MOZ_PLUGIN_PATH and SSH_ASKPASS in user.c: bnc#534690 +- Fix two rpmlint warnings (suse_update_desktop_file, and make + /var/adm/fillup-templates/sysconfig.uxlaunch not executable) + +------------------------------------------------------------------- +Mon Aug 17 14:31:21 BST 2009 - michael.meeks(a)novell.com + +- add xmodmap calls to startmoblin, and remove --sync option for mutter. + +------------------------------------------------------------------- +Sat Aug 15 09:08:54 BST 2009 - michael.meeks(a)novell.com + +- Remove the system / init-script approach, and add a patch + to allow uxlaunch to replace moblin-session. + +------------------------------------------------------------------- +Wed Aug 12 21:03:49 BST 2009 - michael.meeks(a)novell.com + +- create an /etc/init.d/earlyux script - you need to set + DISPLAYMANAGER=console in /etc/sysconfig/displaymanager + to avoid xdm conflicting with this +- create /usr/sbin/moblin-uxlaunch to setup some shell + scripty things, and re-start uxlaunch as/when/if it + crashes. +- we really also require a fix in ConsoleKit's + /etc/dbus-1/.../ConsoleKit.conf + +------------------------------------------------------------------- +Wed Aug 12 16:38:34 BST 2009 - michael.meeks(a)novell.com + +- set the default configuration to match our system. + +------------------------------------------------------------------- +Tue Aug 11 12:16:05 BST 2009 - michael.meeks(a)novell.com + +- Fix PAM authentication callback issue +- Fix hard-coded libexec path problem + +------------------------------------------------------------------- +Mon Aug 10 20:23:44 BST 2009 - michael.meeks(a)novell.com + +- Package initial version from git. + calling whatdependson for head-i586 New: ---- 0001-Make-PAM-happy-on-chattier-SUSE.patch 0002-Allow-the-mutter-libexec-path-to-be-configured-at-co.patch export-extra-env.patch moblin.desktop startmoblin uxlaunch-0.22.5.tar.bz2 uxlaunch.changes uxlaunch-myzone-speed.patch uxlaunch-rename-panel-internet-to-web.patch uxlaunch-session-split.patch uxlaunch-set-sdl-audiodriver.patch uxlaunch-shutdown-gconfd.patch uxlaunch.spec uxlaunch-suse.patch uxlaunch-user.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uxlaunch.spec ++++++ # # spec file for package uxlaunch (Version 0.22.5) # # Copyright (c) 2010 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 Name: uxlaunch Version: 0.22.5 Release: 1 License: GPLv2 Summary: A hugely cut-down gdm and gnome-session replacement Group: System/GUI/Other Url: http://www.moblin.org/ Source0: %{name}-%{version}.tar.bz2 #Source1: init.earlyux #Source2: moblin-uxlaunch Source3: moblin.desktop Source4: startmoblin Patch0: 0001-Make-PAM-happy-on-chattier-SUSE.patch Patch1: 0002-Allow-the-mutter-libexec-path-to-be-configured-at-co.patch Patch2: uxlaunch-suse.patch Patch3: uxlaunch-session-split.patch Patch4: export-extra-env.patch Patch5: uxlaunch-user.diff Patch6: uxlaunch-shutdown-gconfd.patch Patch7: uxlaunch-rename-panel-internet-to-web.patch Patch8: uxlaunch-myzone-speed.patch Patch9: uxlaunch-set-sdl-audiodriver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel glib2-devel xorg-x11-libXau-devel BuildRequires: ConsoleKit-devel pam-devel BuildRequires: update-desktop-files PreReq: %fillup_prereq Conflicts: moblin-session %description An ultra-lightweight, but non-standard process to log you in, and get your session going in next to no cycles. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %if 0%{?suse_version} <= 1120 %patch6 -p1 %endif %patch7 -p1 %patch8 -p0 %patch9 -p1 %build export CFLAGS=$RPM_OPT_FLAGS %__make %{?jobs:-j%jobs} mutterlibexecdir=/usr/lib/mutter-moblin %install %makeinstall mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mv $RPM_BUILD_ROOT/etc/sysconfig/uxlaunch $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.uxlaunch chmod -x $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.uxlaunch # To use this as a user session launcher mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions install -m 644 %{S:3} $RPM_BUILD_ROOT%{_datadir}/xsessions/moblin.desktop %suse_update_desktop_file $RPM_BUILD_ROOT%{_datadir}/xsessions/moblin.desktop install -m 755 %{S:4} $RPM_BUILD_ROOT%{_bindir}/startmoblin # For using this as a gdm replacement: # install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/ # mkdir -p $RPM_BUILD_ROOT/etc/init.d # install -m 755 %{S:1} $RPM_BUILD_ROOT/etc/init.d/earlyux find %{buildroot}%{_mandir} -type f -print0 | xargs -r0 chmod a-x %clean rm -rf $RPM_BUILD_ROOT %post %{fillup_only -n uxlaunch} # If used as a gdm replacement: # {fillup_and_insserv -nY uxlaunch earlyux} # postun # {insserv_cleanup} %files %defattr(-,root,root,-) /usr/sbin/uxlaunch %{_bindir}/startmoblin %{_datadir}/xsessions/moblin.desktop /var/adm/fillup-templates/sysconfig.uxlaunch %{_mandir}/man1/uxlaunch.1.gz # /usr/sbin/moblin-uxlaunch # /etc/init.d/earlyux %changelog ++++++ 0001-Make-PAM-happy-on-chattier-SUSE.patch ++++++ >From 81f58edfb8e0145a34011b0270669b2d0a122e7c Mon Sep 17 00:00:00 2001 From: Michael Meeks <michael.meeks(a)novell.com> Date: Tue, 11 Aug 2009 11:53:10 +0100 Subject: [PATCH] Make PAM happy on (chattier) SUSE. --- options.c | 6 +++--- pam.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/options.c b/options.c index fbc38e6..49a7245 100644 --- a/options.c +++ b/options.c @@ -174,8 +174,8 @@ void get_options(int argc, char **argv) lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session); pass = getpwnam(username); - if (!pass) + if (!pass) { + lprintf("Error: can't find user \"%s\"", username); exit(EXIT_FAILURE); - - + } } diff --git a/pam.c b/pam.c index 65855bf..7b9881b 100644 --- a/pam.c +++ b/pam.c @@ -5,6 +5,7 @@ * Authors: * Auke Kok <auke(a)linux.intel.com> * Arjan van de Ven <arjan(a)linux.intel.com> + * Michael Meeks <michael.meeks(a)novell.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,6 +26,48 @@ pam_handle_t *ph; struct pam_conv pc; /* + * Sometimes PAM likes to chat with you, before it is assured + * enough to let you log-in: fun. + */ +static int +pam_conversation_fn (int msg_count, + const struct pam_message **messages, + struct pam_response **responses, + void *user_data) +{ + int i; + (void)user_data; + + lprintf ("pam conversation with %d messages", msg_count); + if (responses) + *responses = NULL; + + if (msg_count < 1) /* ping */ + return PAM_SUCCESS; + + /* otherwise find any helpful data we can to print, and bail */ + if (!responses || !messages) { + lprintf ("pam conversation with no message, or response"); + return PAM_CONV_ERR; + } + *responses = calloc (msg_count, sizeof (struct pam_response)); + for (i = 0; i < msg_count; i++) { + const struct pam_message *msg = messages[i]; + + if (msg->msg_style == PAM_TEXT_INFO) + lprintf ("pam chats to us: '%s'", msg->msg); + else if (msg->msg_style == PAM_ERROR_MSG) + lprintf ("Error: pam error msg '%s'", msg->msg); + else + lprintf ("pam message %d style %d: '%s'", + i, msg->msg_style, msg->msg); + (*responses)[i].resp = NULL; + (*responses)[i].resp_retcode = PAM_SUCCESS; + } + return PAM_SUCCESS; +} + +/* * Creating a PAM session. We need a pam "login" session so that the dbus * "at_console" logic will work correctly, as well as various /dev file * permissions. @@ -40,6 +83,9 @@ void setup_pam_session(void) snprintf(x, 256, "tty%d", tty); + pc.conv = pam_conversation_fn; + pc.appdata_ptr = NULL; + err = pam_start("login", pass->pw_name, &pc, &ph); err = pam_set_item(ph, PAM_TTY, &x); -- 1.6.0.2 ++++++ 0002-Allow-the-mutter-libexec-path-to-be-configured-at-co.patch ++++++ >From 1ce5af2971371f3bc7df488aa82e1c7e7b821407 Mon Sep 17 00:00:00 2001 From: Michael Meeks <michael.meeks(a)novell.com> Date: Tue, 11 Aug 2009 12:13:53 +0100 Subject: [PATCH] Allow the mutter libexec path to be configured at compile time --- Makefile | 5 ++++- desktop.c | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) Index: uxlaunch-0.22.5/Makefile =================================================================== --- uxlaunch-0.22.5.orig/Makefile +++ uxlaunch-0.22.5/Makefile @@ -13,11 +13,14 @@ install: uxlaunch install uxlaunch.sysconfig $(DESTDIR)/etc/sysconfig/uxlaunch install uxlaunch.1 $(DESTDIR)/usr/share/man/man1/uxlaunch.1 +mutterlibexecdir = "/usr/libexec" + OBJS := uxlaunch.o consolekit.o dbus.o desktop.o misc.o pam.o user.o xserver.o \ lib.o options.o oom_adj.o CFLAGS += -Wall -W -Os -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -fno-common \ -Wimplicit-function-declaration -Wimplicit-int \ + -DMUTTER_LIBEXECDIR=\""$(mutterlibexecdir)"\" \ `pkg-config --cflags dbus-1` \ `pkg-config --cflags ck-connector` \ `pkg-config --cflags glib-2.0` \ @@ -30,7 +33,7 @@ LDADD += `pkg-config --libs dbus-1` \ %.o: %.c uxlaunch.h Makefile @echo " CC $<" - @$(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< uxlaunch: $(OBJS) Makefile @echo " LD $@" Index: uxlaunch-0.22.5/desktop.c =================================================================== --- uxlaunch-0.22.5.orig/desktop.c +++ uxlaunch-0.22.5/desktop.c @@ -166,13 +166,13 @@ void autostart_panels(void) if (!strstr(session, "mutter")) return; - desktop_entry_add("/usr/libexec/moblin-panel-myzone", -1); - desktop_entry_add("/usr/libexec/moblin-panel-status", 0); - desktop_entry_add("/usr/libexec/moblin-panel-people", 0); - desktop_entry_add("/usr/libexec/moblin-panel-internet", 0); - desktop_entry_add("/usr/libexec/moblin-panel-media", 1); - desktop_entry_add("/usr/libexec/moblin-panel-pasteboard", 0); - desktop_entry_add("/usr/libexec/moblin-panel-applications", 1); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-myzone", -1); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-status", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-people", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-internet", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-media", 1); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-pasteboard", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-applications", 1); } ++++++ export-extra-env.patch ++++++ Index: uxlaunch-0.22.5/user.c =================================================================== --- uxlaunch-0.22.5.orig/user.c +++ uxlaunch-0.22.5/user.c @@ -173,4 +173,12 @@ void setup_user_environment (void) snprintf(buf, PATH_MAX, "%s/.config", pass->pw_dir); setenv("XDG_CONFIG_HOME", buf, 0); setenv("OOO_FORCE_DESKTOP","gnome", 0); + setenv("MOZ_PLUGIN_PATH", ":/usr/lib/browser-plugins", 0); + setenv("SSH_ASKPASS", "/usr/lib/ssh/x11-ssh-askpass", 0); + setenv("ALSA_CONFIG_PATH", "/etc/alsa-pulse.conf", 0); + setenv("WINDOWMANAGER", "startmoblin", 0); + snprintf(buf, PATH_MAX, "%s/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:" + "/usr/X11R6/bin:/usr/games:/usr/lib/jvm/jre/bin:/usr/lib/mit/bin:" + "/usr/lib/mit/sbin:.", pass->pw_dir); + setenv("PATH", buf, 1); } ++++++ moblin.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Type=XSession Exec=startmoblin TryExec=startmoblin Name=Moblin User Experience Comment=Moblin User Experience ++++++ startmoblin ++++++ #!/bin/sh export XDG_MENU_PREFIX=moblin- export XDG_DATA_DIRS=$HOME/.local/share/applications:/usr/share # load modmap settings test -r /etc/X11/Xmodmap && xmodmap /etc/X11/Xmodmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap exec /usr/sbin/uxlaunch -x ++++++ uxlaunch-myzone-speed.patch ++++++ --- desktop.c +++ desktop.c @@ -337,8 +337,11 @@ while (ptrs[count] && count < 255) ptrs[++count] = strtok(NULL, " \t"); - usleep(delay); + /* give myzone a couple of seconds of un-interrupted grace */ + if (entry->prio >= 0) + delay += 2000000; + usleep(delay); lprintf("Starting %s with prio %d at %d", entry->exec, entry->prio, delay); execvp(ptrs[0], ptrs); exit(ret); } ++++++ uxlaunch-rename-panel-internet-to-web.patch ++++++ Index: uxlaunch-0.22.5/desktop.c =================================================================== --- uxlaunch-0.22.5.orig/desktop.c +++ uxlaunch-0.22.5/desktop.c @@ -171,7 +171,7 @@ void autostart_panels(void) desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-myzone", -1); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-status", 0); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-people", 0); - desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-internet", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-web", 0); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-media", 1); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-pasteboard", 0); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-applications", 1); ++++++ uxlaunch-session-split.patch ++++++ Index: uxlaunch-0.22.5/desktop.c =================================================================== --- uxlaunch-0.22.5.orig/desktop.c +++ uxlaunch-0.22.5/desktop.c @@ -17,8 +17,10 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <sys/wait.h> #include <dirent.h> #include <time.h> +#include <errno.h> #include <glib.h> #include <limits.h> #include <pwd.h> @@ -372,9 +374,28 @@ void start_desktop_session(void) while (ptrs[count] && count < 255) ptrs[++count] = strtok(NULL, " \t"); + lprintf("Exec session '%s'", session); ret = execv(ptrs[0], ptrs); if (ret != EXIT_SUCCESS) lprintf("Failed to start %s", session); } +void wait_for_session_exit(void) +{ + lprintf("wait_for_session_exit"); + for (;;) { + errno = 0; + if (waitpid (session_pid, NULL, 0) < 0) { + if (errno == EINTR) { + continue; + } else if (errno == ECHILD) + break; /* child already reaped */ + else + lprintf("waidpid error '%s'", strerror (errno)); + } + break; + } + + lprintf("session exited"); +} Index: uxlaunch-0.22.5/lib.c =================================================================== --- uxlaunch-0.22.5.orig/lib.c +++ uxlaunch-0.22.5/lib.c @@ -24,8 +24,6 @@ #include "uxlaunch.h" -#define LOGFILE "/var/log/uxlaunch.log" - extern char **environ; static int first_time = 1; @@ -36,10 +34,13 @@ struct timeval start; static FILE *log; -void open_log(void) +void open_log(const char *logfile) { /* truncate log */ - log = fopen(LOGFILE, "w"); + if (!logfile) + log = stdout; + else + log = fopen(logfile, "w"); if (!log) logfile_enabled = 0; } Index: uxlaunch-0.22.5/options.c =================================================================== --- uxlaunch-0.22.5.orig/options.c +++ uxlaunch-0.22.5/options.c @@ -29,6 +29,7 @@ char session[256] = "/usr/bin/mutter --s char username[256] = "moblin"; int verbose = 0; +int x_session_only = 0; static struct option opts[] = { { "user", 1, NULL, 'u' }, @@ -46,6 +47,7 @@ void usage(const char *name) printf(" -u, --user Start session as specific username\n"); printf(" -t, --tty Start session on alternative tty number\n"); printf(" -s, --session Start a non-default session\n"); + printf(" -x, --xsession Start X apps inside an existing X session\n"); printf(" -v, --verbose Display lots of output to the console\n"); printf(" -h, --help Display this help message\n"); } @@ -132,7 +134,7 @@ void get_options(int argc, char **argv) /* parse cmdline - overrides */ while (1) { - c = getopt_long(argc, argv, "u:t:s:hv", opts, &i); + c = getopt_long(argc, argv, "u:t:s:hvx", opts, &i); if (c == -1) break; @@ -153,6 +155,9 @@ void get_options(int argc, char **argv) case 'v': verbose = 1; break; + case 'x': + x_session_only = 1; + break; default: break; } @@ -170,7 +175,9 @@ void get_options(int argc, char **argv) } } - lprintf("uxlaunch v%s started.", VERSION); + open_log(!x_session_only ? LOGFILE : NULL); + + lprintf("uxlaunch v%s started%s.", VERSION, x_session_only ? " for x session only" : "" ); lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session); pass = getpwnam(username); Index: uxlaunch-0.22.5/user.c =================================================================== --- uxlaunch-0.22.5.orig/user.c +++ uxlaunch-0.22.5/user.c @@ -78,12 +78,6 @@ void switch_to_user(void) setenv("PATH", buf, 1); snprintf(user_xauth_path, PATH_MAX, "%s/.Xauthority", pass->pw_dir); setenv("XAUTHORITY", user_xauth_path, 1); - snprintf(buf, PATH_MAX, "%s/.cache", pass->pw_dir); - mkdir(buf, 0700); - setenv("XDG_CACHE_HOME", buf, 0); - snprintf(buf, PATH_MAX, "%s/.config", pass->pw_dir); - setenv("XDG_CONFIG_HOME", buf, 0); - setenv("OOO_FORCE_DESKTOP","gnome", 0); set_i18n(); @@ -143,10 +137,6 @@ void set_i18n(void) * and other user stuff we don't care for now */ if (!strcmp(key, "LANG")) { setenv(key, val, 1); - if (strstr(val, "zh_")) { - setenv("GTK_IM_MODULE", "scim-bridge", 0); - setenv("CLUTTER_IM_MODULE","scim-bridge", 0); - } } if (!strcmp(key, "SYSFONT")) setenv(key, val, 1); @@ -156,3 +146,31 @@ void set_i18n(void) log_environment(); } + +void setup_user_environment (void) +{ + int i; + char buf[PATH_MAX]; + const char *lang; + static const char *scim_langs[] = { + "zh_", "ko_", "ja_", NULL + }; + + /* launch scim only where it makes sense */ + lang = getenv ("LANG"); + for (i = 0; lang && scim_langs[i]; i++) { + if (strstr (lang, scim_langs[i])) { + setenv("GTK_IM_MODULE", "scim-bridge", 0); + setenv("CLUTTER_IM_MODULE","scim-bridge", 0); + break; + } + } + + /* setup misc. user directories and variables */ + snprintf(buf, PATH_MAX, "%s/.cache", pass->pw_dir); + mkdir(buf, 0700); + setenv("XDG_CACHE_HOME", buf, 0); + snprintf(buf, PATH_MAX, "%s/.config", pass->pw_dir); + setenv("XDG_CONFIG_HOME", buf, 0); + setenv("OOO_FORCE_DESKTOP","gnome", 0); +} Index: uxlaunch-0.22.5/uxlaunch.c =================================================================== --- uxlaunch-0.22.5.orig/uxlaunch.c +++ uxlaunch-0.22.5/uxlaunch.c @@ -19,11 +19,37 @@ #include "uxlaunch.h" +/* + * Launch apps that form the user's X session + */ +static void +launch_user_session(void) +{ + setup_user_environment (); + + start_ssh_agent(); + + /* dbus needs the CK env var */ + if (!x_session_only) + setup_consolekit_session(); + + start_dbus_session_bus(); + + /* gconf needs dbus */ + start_gconf(); + + maybe_start_screensaver(); + + start_desktop_session(); + + get_session_type(); + autostart_panels(); + autostart_desktop_files(); + do_autostart(); +} int main(int argc, char **argv) { - open_log(); - /* * General objective: * Do the things that need root privs first, @@ -49,6 +75,13 @@ int main(int argc, char **argv) */ get_options(argc, argv); + + if (x_session_only) { + launch_user_session(); + wait_for_session_exit(); + return 0; + } + set_tty(); start_oom_task(); @@ -69,24 +102,7 @@ int main(int argc, char **argv) wait_for_X_signal(); - start_ssh_agent(); - - setup_consolekit_session(); - - /* dbus needs the CK env var */ - start_dbus_session_bus(); - - /* gconf needs dbus */ - start_gconf(); - - maybe_start_screensaver(); - - start_desktop_session(); - - get_session_type(); - autostart_panels(); - autostart_desktop_files(); - do_autostart(); + launch_user_session(); /* * we do this now to make sure dbus etc are not spawning Index: uxlaunch-0.22.5/uxlaunch.h =================================================================== --- uxlaunch-0.22.5.orig/uxlaunch.h +++ uxlaunch-0.22.5/uxlaunch.h @@ -3,6 +3,7 @@ #include <X11/Xauth.h> +#define LOGFILE "/var/log/uxlaunch.log" /* * Target user information @@ -23,12 +24,14 @@ extern int session_pid; extern int xpid; extern int verbose; +extern int x_session_only; extern void get_options(int argc, char **argv); extern void set_i18n(void); extern void setup_pam_session(void); extern void close_pam_session(void); extern void switch_to_user(void); +extern void setup_user_environment (void); extern void set_tty(void); extern void setup_xauth(void); extern void start_X_server(void); @@ -45,6 +48,7 @@ extern void autostart_panels(void); extern void autostart_desktop_files(void); extern void do_autostart(void); extern void start_desktop_session(void); +extern void wait_for_session_exit(void); extern void start_bash(void); extern void wait_for_X_exit(void); extern void set_text_mode(void); @@ -53,7 +57,7 @@ extern void oom_adj(int, int); extern void start_oom_task(void); extern void stop_oom_task(void); -extern void open_log(void); +extern void open_log(const char *); extern void lprintf(const char *, ...); extern void log_environment(void); ++++++ uxlaunch-set-sdl-audiodriver.patch ++++++ diff --git a/user.c b/user.c index 74cbeba..1723f0e 100644 --- a/user.c +++ b/user.c @@ -176,6 +176,7 @@ void setup_user_environment (void) setenv("MOZ_PLUGIN_PATH", ":/usr/lib/browser-plugins", 0); setenv("SSH_ASKPASS", "/usr/lib/ssh/x11-ssh-askpass", 0); setenv("ALSA_CONFIG_PATH", "/etc/alsa-pulse.conf", 0); + setenv("SDL_AUDIODRIVER", "pulse", 0); setenv("WINDOWMANAGER", "startmoblin", 0); snprintf(buf, PATH_MAX, "%s/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:" "/usr/X11R6/bin:/usr/games:/usr/lib/jvm/jre/bin:/usr/lib/mit/bin:" ++++++ uxlaunch-shutdown-gconfd.patch ++++++ Index: uxlaunch-0.22/misc.c =================================================================== --- uxlaunch-0.22.orig/misc.c +++ uxlaunch-0.22/misc.c @@ -17,6 +17,7 @@ #include <stdlib.h> #include <string.h> #include <signal.h> +#include <glib.h> #include "uxlaunch.h" @@ -102,6 +103,26 @@ void start_gconf(void) lprintf("failure to start gconftool-2: %d", ret); } +/* + * Stop gconfd to save gconf keys before shutdown + */ +void stop_gconf(void) +{ + const char *command = "gconftool-2 --shutdown"; + GError *error = NULL; + int status = 0; + + if (!g_spawn_command_line_sync (command, NULL, NULL, &status, &error)) { + g_warning ("Failed to execute '%s' on logout: %s\n", + command, error->message); + g_error_free (error); + } + + if (status) { + g_warning ("Running '%s' at logout returned an exit status of '%d'", + command, status); + } +} /* * Start the background screensaver daemon. Index: uxlaunch-0.22/uxlaunch.c =================================================================== --- uxlaunch-0.22.orig/uxlaunch.c +++ uxlaunch-0.22/uxlaunch.c @@ -79,6 +79,7 @@ int main(int argc, char **argv) if (x_session_only) { launch_user_session(); wait_for_session_exit(); + stop_gconf(); return 0; } @@ -104,6 +105,8 @@ int main(int argc, char **argv) wait_for_X_exit(); + stop_gconf(); + set_text_mode(); // close_consolekit_session(); Index: uxlaunch-0.22/uxlaunch.h =================================================================== --- uxlaunch-0.22.orig/uxlaunch.h +++ uxlaunch-0.22/uxlaunch.h @@ -41,6 +41,7 @@ extern void setup_consolekit_session(voi extern void start_ssh_agent(void); extern void stop_ssh_agent(void); extern void start_gconf(void); +extern void stop_gconf(void); extern void maybe_start_screensaver(void); extern void get_session_type(void); extern void autostart_panels(void); ++++++ uxlaunch-suse.patch ++++++ Index: uxlaunch-0.22.5/uxlaunch.sysconfig =================================================================== --- uxlaunch-0.22.5.orig/uxlaunch.sysconfig +++ uxlaunch-0.22.5/uxlaunch.sysconfig @@ -8,9 +8,9 @@ # except in values where they are needed. # # defaults: -# user=moblin -# tty=2 -# session=/usr/bin/mutter --sm-disable +user=linux +tty=3 +session=/usr/bin/mutter --sm-disable # # standard MOBLIN desktop: # session=/usr/bin/mutter --sm-disable ++++++ uxlaunch-user.diff ++++++ diff --git a/options.c b/options.c index a5760a0..336f50e 100644 --- a/options.c +++ b/options.c @@ -157,6 +157,8 @@ void get_options(int argc, char **argv) break; case 'x': x_session_only = 1; + if (getenv ("USER")) + strncpy (username, getenv ("USER"), 256); break; default: break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wine-gecko for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package wine-gecko for openSUSE:Factory checked in at Fri Mar 19 10:41:50 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/wine-gecko/wine-gecko.changes 2009-11-13 16:00:15.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Nov 13 15:55:55 CET 2009 - meissner(a)suse.de + +- Wine specific Win32 build of the Gecko rendering engine. + calling whatdependson for head-i586 New: ---- wine_gecko-1.0.0-x86.cab wine-gecko.changes wine-gecko.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine-gecko.spec ++++++ # # spec file for package wine-gecko (Version 1.0.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: wine-gecko BuildRequires: cabextract License: MPL 1.1 or later Group: Development/Tools/Other AutoReqProv: on Summary: A Friendly Greeting Program Version: 1.0.0 Release: 1 Source0: http://downloads.sourceforge.net/wine/wine_gecko-%{version}-x86.cab # Source of this CAB is at: # http://wine.git.sourceforge.net/git/gitweb.cgi?p=wine/wine-gecko;a=summary # build instructions are at http://wiki.winehq.org/BuildingWineGecko BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the prepackaged Win32 Gecko rendering engine for use by Wine. %prep # this is only for "LICENSE" cabextract %{SOURCE0} %install mkdir -p $RPM_BUILD_ROOT/usr/share/wine/gecko cp %{SOURCE0} $RPM_BUILD_ROOT/usr/share/wine/gecko %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc wine_gecko/LICENSE wine_gecko/VERSION %dir /usr/share/wine %dir /usr/share/wine/gecko /usr/share/wine/gecko/*cab %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 arptables for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package arptables for openSUSE:Factory checked in at Fri Mar 19 10:37:45 CET 2010. -------- --- arptables/arptables.changes 2009-12-19 18:40:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/arptables/arptables.changes 2010-03-15 14:01:11.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 15 12:44:28 UTC 2010 - jengelh(a)medozas.de + +- drop JF fork and use the mainline arptables again +- update to v0.0.3-4 + * Update the userspace arptables tool to kernels 2.6.16 and + above. A change in the kernel API broke compatibility with the + arptables tool around release 2.6.16, causing the filtering to + behave unexpectedly. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- arptables_jf-0.0.8-2.6-kernel.patch arptables_jf-0.0.8-fclose.patch arptables_jf-0.0.8-header.patch arptables_jf-0.0.8-man.patch arptables_jf-0.0.8-no-script.patch arptables_jf-0.0.8.tbz arptables_jf-0.0.8-warnings.patch New: ---- arptables-install.diff arptables-v0.0.3-4.tar.xz arptables-warnings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arptables.spec ++++++ --- /var/tmp/diff_new_pack.6qMS9l/_old 2010-03-19 10:36:46.000000000 +0100 +++ /var/tmp/diff_new_pack.6qMS9l/_new 2010-03-19 10:36:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package arptables (Version 0.0.8) +# spec file for package arptables (Version 1.0.3.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,22 +20,19 @@ Url: http://ebtables.sourceforge.net/ Name: arptables -Version: 0.0.8 -Release: 6 +Version: 1.0.3.4 +Release: 1 +%define oversion v0.0.3-4 License: GPLv2+ Group: Productivity/Networking/Security Summary: User Space Tool to Set Up and Maintain ARP Filtering Tables -PreReq: %insserv_prereq %fillup_prereq -AutoReqProv: on -Source0: %{name}_jf-%{version}.tbz -Patch1: %{name}_jf-%{version}-2.6-kernel.patch -Patch2: %{name}_jf-%{version}-man.patch -Patch3: %{name}_jf-%{version}-warnings.patch -Patch4: %{name}_jf-%{version}-header.patch -Patch5: %{name}_jf-%{version}-no-script.patch -Patch6: %{name}_jf-%{version}-fclose.patch + +#Source: http://downloads.sf.net/ebtables/arptables-v0.0.3-4.tar.gz +Source: %name-%oversion.tar.xz +Patch1: arptables-install.diff +Patch2: arptables-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: coreutils licenses perl +BuildRequires: coreutils licenses perl xz Requires: licenses %description @@ -48,25 +45,20 @@ Authors: -------- - Jay Fenlason <fenlason(a)redhat.com> - and others + Bart De Schuymer <bdschuym(a)pandora.be> + Netfilter Developers <netfilter-devel(a)vger.kernel.org> %prep -%setup -q -n %{name}_jf-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%setup -qn %name-%oversion +%patch -P 1 -P 2 -p1 %build export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -W -Wall" export CFLAGS="$RPM_OPT_FLAGS" -make %{?jobs:-j%jobs} all LIBDIR=/%{_lib} +make %{?_smp_mflags} all LIBDIR=/%{_lib} PREFIX=%_prefix %install -make install DESTDIR=%{buildroot} LIBDIR=/%{_lib} +make install DESTDIR=%{buildroot} LIBDIR=/%{_lib} PREFIX=%_prefix MANDIR=%_mandir ln -sf $(readlink -f /usr/share/doc/licenses/GPL-2.0.txt) COPYING %clean @@ -76,7 +68,7 @@ %files %defattr(-,root,root) -/sbin/arptables* +%_sbindir/arptables* %{_mandir}/*/arptables* %doc COPYING ++++++ arptables-install.diff ++++++ --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: arptables-v0.0.3-4/Makefile =================================================================== --- arptables-v0.0.3-4.orig/Makefile +++ arptables-v0.0.3-4/Makefile @@ -35,22 +35,22 @@ arptables: arptables-standalone.o arptab $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8 mkdir -p $(@D) - install -m 0644 -o root -g root $< $@ + install -m 0644 $< $@ $(DESTDIR)$(BINDIR)/arptables: arptables mkdir -p $(DESTDIR)$(BINDIR) - install -m 0755 -o root -g root $< $@ + install -m 0755 $< $@ tmp1:=$(shell printf $(BINDIR) | sed 's/\//\\\//g') tmp2:=$(shell printf $(SYSCONFIGDIR) | sed 's/\//\\\//g') .PHONY: scripts scripts: arptables-save arptables-restore arptables.sysv cat arptables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-save_ - install -m 0755 -o root -g root arptables-save_ $(DESTDIR)$(BINDIR)/arptables-save + install -m 0755 arptables-save_ $(DESTDIR)$(BINDIR)/arptables-save cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_ - install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore + install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ - if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi + if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi rm -f arptables-save_ arptables-restore_ arptables.sysv_ .PHONY: install ++++++ arptables-warnings.diff ++++++ --- arptables.c | 27 +++++++++++++++------------ libarptc/libarptc.c | 6 ++++-- libarptc/libarptc_incl.c | 6 ++++-- 3 files changed, 23 insertions(+), 16 deletions(-) Index: arptables-v0.0.3-4/arptables.c =================================================================== --- arptables-v0.0.3-4.orig/arptables.c +++ arptables-v0.0.3-4/arptables.c @@ -874,7 +874,7 @@ parse_target(const char *targetname) if (strlen(targetname)+1 > sizeof(arpt_chainlabel)) exit_error(PARAMETER_PROBLEM, - "Invalid target name `%s' (%i chars max)", + "Invalid target name `%s' (%zu chars max)", targetname, sizeof(arpt_chainlabel)-1); for (ptr = targetname; *ptr; ptr++) @@ -1062,7 +1062,7 @@ register_match(struct arptables_match *m } if (me->size != ARPT_ALIGN(me->size)) { - fprintf(stderr, "%s: match `%s' has invalid size %u.\n", + fprintf(stderr, "%s: match `%s' has invalid size %zu.\n", program_name, me->name, me->size); exit(1); } @@ -1092,7 +1092,7 @@ register_target(struct arptables_target } if (me->size != ARPT_ALIGN(me->size)) { - fprintf(stderr, "%s: target `%s' has invalid size %u.\n", + fprintf(stderr, "%s: target `%s' has invalid size %zu.\n", program_name, me->name, me->size); exit(1); } @@ -1116,17 +1116,17 @@ print_num(u_int64_t number, unsigned int number = (number + 500) / 1000; if (number > 9999) { number = (number + 500) / 1000; - printf(FMT("%4lluT ","%lluT "), number); + printf(FMT("%4lluT ","%lluT "), (unsigned long long)number); } - else printf(FMT("%4lluG ","%lluG "), number); + else printf(FMT("%4lluG ","%lluG "), (unsigned long long)number); } - else printf(FMT("%4lluM ","%lluM "), number); + else printf(FMT("%4lluM ","%lluM "), (unsigned long long)number); } else - printf(FMT("%4lluK ","%lluK "), number); + printf(FMT("%4lluK ","%lluK "), (unsigned long long)number); } else - printf(FMT("%5llu ","%llu "), number); + printf(FMT("%5llu ","%llu "), (unsigned long long)number); } else - printf(FMT("%8llu ","%llu "), number); + printf(FMT("%8llu ","%llu "), (unsigned long long)number); } @@ -1370,7 +1370,7 @@ after_devdst: /* Print the target information. */ target->print(&fw->arp, t, format & FMT_NUMERIC); } else if (t->u.target_size != sizeof(*t)) - printf("[%u bytes of unknown target data] ", + printf("[%zu bytes of unknown target data] ", t->u.target_size - sizeof(*t)); if (!(format & FMT_NOCOUNTS)) { @@ -1777,6 +1777,7 @@ int do_command(int argc, char *argv[], c const char *jumpto = ""; char *protocol = NULL; const char *modprobe = NULL; + unsigned long long bpcnt_num; /* first figure out if this is a 2.6 or a 2.4 kernel */ *handle = arptc_init(*table); @@ -2159,15 +2160,17 @@ int do_command(int argc, char *argv[], c "-%c requires packet and byte counter", opt2char(OPT_COUNTERS)); - if (sscanf(pcnt, "%llu", &fw.counters.pcnt) != 1) + if (sscanf(pcnt, "%llu", &bpcnt_num) != 1) exit_error(PARAMETER_PROBLEM, "-%c packet counter not numeric", opt2char(OPT_COUNTERS)); + fw.counters.pcnt = bpcnt_num; - if (sscanf(bcnt, "%llu", &fw.counters.bcnt) != 1) + if (sscanf(bcnt, "%llu", &bpcnt_num) != 1) exit_error(PARAMETER_PROBLEM, "-%c byte counter not numeric", opt2char(OPT_COUNTERS)); + fw.counters.bcnt = bpcnt_num; break; Index: arptables-v0.0.3-4/libarptc/libarptc.c =================================================================== --- arptables-v0.0.3-4.orig/libarptc/libarptc.c +++ arptables-v0.0.3-4/libarptc/libarptc.c @@ -133,7 +133,8 @@ dump_entry(STRUCT_ENTRY *e, const TC_HAN printf("Flags: %02X\n", e->arp.flags); printf("Invflags: %02X\n", e->arp.invflags); printf("Counters: %llu packets, %llu bytes\n", - e->counters.pcnt, e->counters.bcnt); + (unsigned long long)e->counters.pcnt, + (unsigned long long)e->counters.bcnt); /* printf("Cache: %08X ", e->nfcache); if (e->nfcache & NFC_ALTERED) printf("ALTERED "); @@ -159,7 +160,8 @@ dump_entry(STRUCT_ENTRY *e, const TC_HAN t = GET_TARGET(e); printf("Target name: `%s' [%u]\n", t->u.user.name, t->u.target_size); if (strcmp(t->u.user.name, STANDARD_TARGET) == 0) { - int pos = *(int *)t->data; + const unsigned char *data = t->data; + int pos = *(const int *)data; if (pos < 0) printf("verdict=%s\n", pos == -NF_ACCEPT-1 ? "NF_ACCEPT" Index: arptables-v0.0.3-4/libarptc/libarptc_incl.c =================================================================== --- arptables-v0.0.3-4.orig/libarptc/libarptc_incl.c +++ arptables-v0.0.3-4/libarptc/libarptc_incl.c @@ -121,7 +121,7 @@ entry2index(const TC_HANDLE_T h, const S if (ENTRY_ITERATE(h->entries.entrytable, h->entries.size, get_number, seek, &pos) == 0) { - fprintf(stderr, "ERROR: offset %i not an entry!\n", + fprintf(stderr, "ERROR: offset %zu not an entry!\n", (char *)seek - (char *)h->entries.entrytable); abort(); } @@ -583,6 +583,7 @@ target_name(TC_HANDLE_T handle, const ST int spos; unsigned int labelidx; STRUCT_ENTRY *jumpto; + const unsigned char *data; /* To avoid const warnings */ STRUCT_ENTRY *e = (STRUCT_ENTRY *)ce; @@ -591,7 +592,8 @@ target_name(TC_HANDLE_T handle, const ST return GET_TARGET(e)->u.user.name; /* Standard target: evaluate */ - spos = *(int *)GET_TARGET(e)->data; + data = GET_TARGET(e)->data; + spos = *(const int *)data; if (spos < 0) { if (spos == RETURN) return LABEL_RETURN; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 build for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at Fri Mar 19 10:37:18 CET 2010. -------- --- build/build.changes 2010-03-08 13:07:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/build/build.changes 2010-03-10 14:35:10.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 10 13:34:45 UTC 2010 - adrian(a)suse.de + +- update to current git + * Kiwi exclude arch handling + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- build-2010.03.08.tar.gz New: ---- build-2010.03.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.lmwssL/_old 2010-03-19 10:36:19.000000000 +0100 +++ /var/tmp/diff_new_pack.lmwssL/_new 2010-03-19 10:36:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.03.08) +# spec file for package build (Version 2010.03.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.03.08 +Version: 2010.03.10 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -64,10 +64,10 @@ %install make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if 0%sles_version +%if 0%{?sles_version} ln -s sles%{sles_version}.conf default.conf %else -%if 0%suse_version +%if 0%{?suse_version} V=%suse_version ln -s sl${V:0:2}.${V:2:1}.conf default.conf %endif ++++++ build-2010.03.08.tar.gz -> build-2010.03.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.03.08/Build/Kiwi.pm new/build-2010.03.10/Build/Kiwi.pm --- old/build-2010.03.08/Build/Kiwi.pm 2010-02-20 11:47:37.000000000 +0100 +++ new/build-2010.03.10/Build/Kiwi.pm 2010-03-10 14:33:27.000000000 +0100 @@ -145,16 +145,6 @@ die("bad instsource path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; push @repos, "$1/$2"; } - for my $repopackages (@{$instsource->{'repopackages'} || []}) { - for my $repopackage (@{$repopackages->{'repopackage'} || []}) { - push @packages, $repopackage->{'name'}; - } - } - if ($instsource->{'metadata'}) { - for my $repopackage (@{$instsource->{'metadata'}->[0]->{'repopackage'} || []}) { - push @packages, $repopackage->{'name'}; - } - } if ($instsource->{'productoptions'}) { my $productoptions = $instsource->{'productoptions'}->[0] || {}; for my $po (@{$productoptions->{'productvar'} || []}) { @@ -169,33 +159,53 @@ } } + my @repositories = sort {$a->{'priority'} <=> $b->{'priority'}} @{$kiwi->{'repository'} || []}; if ($preferences->{'packagemanager'}->[0]->{'_content'} eq 'smart') { - foreach my $repository(sort {$b->{priority} <=> $a->{priority}} @{$kiwi->{'repository'} || []}) { - my $kiwisource = ($repository->{'source'} || [])->[0]; - next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr - die("bad path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; - push @repos, "$1/$2"; - } - }else{ - foreach my $repository(sort {$a->{priority} <=> $b->{priority}} @{$kiwi->{'repository'} || []}) { - my $kiwisource = ($repository->{'source'} || [])->[0]; - next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr - die("bad path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; - push @repos, "$1/$2"; - } + @repositories = reverse @repositories; + } + for my $repository (@repositories) { + my $kiwisource = ($repository->{'source'} || [])->[0]; + next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr + die("bad path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; + push @repos, "$1/$2"; + } + + # Find packages and possible additional required architectures + my @additionalarchs; + my @pkgs; + push @pkgs, @{$kiwi->{'packages'}->[0]->{'package'}} if $kiwi->{'packages'}; + if ($instsource) { + push @pkgs, @{$instsource->{'metadata'}->[0]->{'repopackage'} || []} if $instsource->{'metadata'}; + push @pkgs, @{$instsource->{'repopackages'}->[0]->{'repopackage'} || []} if $instsource->{'repopackages'}; } - for my $packagegroup (@{$kiwi->{'packages'} || []}) { - for my $package (@{$packagegroup->{'package'} || []}) { - if ($package->{'arch'}) { - my $ma = $arch; - $ma =~ s/i[456]86/i386/; - my $pa = $package->{'arch'}; - $pa =~ s/i[456]86/i386/; - next if $ma ne $pa; + @pkgs = unify(@pkgs); + for my $package (@pkgs) { + # filter packages, which are not targeted for the wanted plattform + if ($package->{'arch'}) { + if (@requiredarch) { + # this is a product + next unless grep {$_ eq $package->{'arch'}} @requiredarch; + } else { + # live appliance + my $ma = $arch; + $ma =~ s/i[456]86/i386/; + my $pa = $package->{'arch'}; + $pa =~ s/i[456]86/i386/; + next if $ma ne $pa; } - push @packages, $package->{'name'}; } + + # not nice, but optimizes our build dependencies + next if $package->{'onlyarch'} && $package->{'onlyarch'} eq "skipit"; + + # we need this package + push @packages, $package->{'name'}; + + # find the maximal superset of possible required architectures + push @additionalarchs, split(',', $package->{'addarch'}) if $package->{'addarch'}; + push @additionalarchs, split(',', $package->{'onlyarch'}) if $package->{'onlyarch'}; } + @requiredarch = unify(@requiredarch, @additionalarchs); if (!$instsource) { my $packman = $preferences->{'packagemanager'}->[0]->{'_content'}; ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.lmwssL/_old 2010-03-19 10:36:19.000000000 +0100 +++ /var/tmp/diff_new_pack.lmwssL/_new 2010-03-19 10:36:19.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.03.08 +Version: 2010.03.10 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bzflag for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package bzflag for openSUSE:Factory checked in at Fri Mar 19 10:36:34 CET 2010. -------- --- bzflag/bzflag.changes 2008-09-08 13:55:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/bzflag/bzflag.changes 2010-03-18 13:13:43.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 18 12:13:15 UTC 2010 - prusnak(a)novell.com + +- cleanup spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bzflag-1.10.4-ncursespollution.diff bzflag-2.0.10_array-subscript2.patch bzflag-decl.diff bzflag-icon.png New: ---- bzflag-1.10.4-ncursespollution.patch bzflag-2.0.10-array-subscript.patch bzflag-decl.patch bzflag.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bzflag.spec ++++++ --- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100 +++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bzflag (Version 2.0.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,23 +20,22 @@ Name: bzflag BuildRequires: bc curl-devel freeglut-devel gcc-c++ libcares-devel libdrm-devel ncurses-devel update-desktop-files -License: GPL v2 or later +License: GPLv2+ Group: Amusements/Games/3D/Shoot -AutoReqProv: on Version: 2.0.12 -Release: 1 +Release: 5 Summary: 3D Networked Multiplayer Tank Battle Game Url: http://BZFlag.org/ -Source: %name-%version.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source2: rc.bzflagserver -Source3: bzflag-maps.tar.bz2 +Source3: %{name}-maps.tar.bz2 Source4: sysconfig.bzflagserver-bzflag -Source5: bzflag.desktop -Source6: bzflag-icon.png -Patch: bzflag-1.10.4-ncursespollution.diff -Patch1: bzflag-decl.diff -Patch3: bzflag-char-signedness.patch -Patch5: %{name}-2.0.10_array-subscript2.patch +Source5: %{name}.desktop +Source6: %{name}.png +Patch: %{name}-1.10.4-ncursespollution.patch +Patch1: %{name}-decl.patch +Patch3: %{name}-char-signedness.patch +Patch5: %{name}-2.0.10-array-subscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -46,7 +45,7 @@ use of 3D graphics (OpenGL), a fast CPU or a supported 3D video card is heavily recommended. -Find server maps in /usr/share/games/bzflag/maps. +Find server maps in /usr/share/bzflag/maps. @@ -68,7 +67,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ - --datadir=/usr/share/games \ --with-pic make %{?jobs:-j %jobs} all @@ -84,18 +82,15 @@ %install #Init script for the BZFlag server -mkdir -p $RPM_BUILD_ROOT/etc/init.d -install -m 755 rc.bzflagserver $RPM_BUILD_ROOT/etc/init.d/bzflagserver -mkdir -p $RPM_BUILD_ROOT/usr/sbin -ln -s ../../etc/init.d/bzflagserver $RPM_BUILD_ROOT/usr/sbin/rcbzflagserver +install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/bzflagserver +mkdir -p $RPM_BUILD_ROOT%{_sbindir} +ln -s %{_sysconfdir}/init.d/bzflagserver $RPM_BUILD_ROOT%{_sbindir}/rcbzflagserver make MKDIR_P="mkdir -p --" DESTDIR=$RPM_BUILD_ROOT install -install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 %{S:4} $RPM_BUILD_ROOT/var/adm/fillup-templates -mkdir -p $RPM_BUILD_ROOT/usr/share/games/bzflag/maps -install -m 644 maps/*bzmap $RPM_BUILD_ROOT/usr/share/games/bzflag/maps -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -install -m 644 %{S:6} $RPM_BUILD_ROOT/usr/share/pixmaps/bzflag.png -%suse_update_desktop_file -i %name Game ActionGame +install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag +mkdir -p $RPM_BUILD_ROOT%{_datadir}/bzflag/maps +install -m 644 maps/*bzmap $RPM_BUILD_ROOT%{_datadir}/bzflag/maps +install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bzflag.png +%suse_update_desktop_file -i %{name} %clean rm -rf $RPM_BUILD_ROOT @@ -104,14 +99,15 @@ %defattr(-, root, root) %doc AUTHORS BUGS COPYING PORTING README DEVINFO README.UNIX %doc RELNOTES TODO README.Linux misc/bzfs.conf -/etc/init.d/bzflagserver -/usr/sbin/rcbzflagserver -/usr/bin/* -/usr/share/games/bzflag -/usr/share/applications/bzflag.desktop -/usr/share/pixmaps/bzflag.png -%_mandir/man6/* -%_mandir/man5/* -/var/adm/fillup-templates/sysconfig.bzflagserver-bzflag +%{_sysconfdir}/init.d/bzflagserver +%{_sbindir}/rcbzflagserver +%{_bindir}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%{_mandir}/man5/* +%{_mandir}/man6/* +%{_localstatedir}/adm/fillup-templates/sysconfig.bzflagserver-bzflag %changelog ++++++ bzflag-1.10.4-ncursespollution.patch ++++++ --- bzflag-1.10.8.20041007/src/bzadmin/CursesUI.h +++ bzflag-1.10.8.20041007/src/bzadmin/CursesUI.h @@ -29,6 +29,8 @@ #include "global.h" #include "UIMap.h" +#undef bool + #define CMDLENGTH (MessageLen - 3) ++++++ bzflag-2.0.10-array-subscript.patch ++++++ --- src/bzflag/ServerStartMenu.cxx +++ src/bzflag/ServerStartMenu.cxx @@ -319,14 +319,6 @@ void ServerStartMenu::setSettings(const char* _settings) { - // FIXME -- temporary to automatically upgrade old configurations - if (strlen(_settings) == 14) { - strcpy(settings, _settings); - settings[12] = settings[13]; - settings[13] = settings[14]; - return; - } - if (strlen(_settings) != strlen(settings)) return; strcpy(settings, _settings); } ++++++ bzflag-decl.patch ++++++ --- src/ogl/OpenGLGState.cxx +++ src/ogl/OpenGLGState.cxx @@ -128,6 +128,8 @@ Unsorted unsorted; }; +class SortedGState; + // // OpenGLGStateRep // ++++++ bzflag.desktop ++++++ --- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100 +++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100 @@ -13,3 +13,4 @@ Name[hu]=3D-s hálózati többjátékos tankcsata játék GenericName[hu]=3D-s hálózati többjátékos tankcsata játék GenericName[cs]=3D síťová tanková bitva pro více hráčů +Categories=Game;ActionGame; ++++++ rc.bzflagserver ++++++ --- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100 +++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100 @@ -11,7 +11,7 @@ # /usr/sbin/rcbzflagserver # # LSB compliant service control script; see http://www.linuxbase.org/spec/ -# +# # System startup script for the BZFlag gameserver # ### BEGIN INIT INFO @@ -22,9 +22,9 @@ # Default-Stop: 0 1 2 6 # Short-Description: bzflag server daemon # Description: Start bzflagserver to provide a server for the popular -# tank game BZFlag, http://www.bzflag.org +# tank game BZFlag, http://www.bzflag.org ### END INIT INFO -# +# # Note on Required-Start: It does specify the init script ordering, # not real dependencies. Depencies have to be handled by admin # resp. the configuration tools (s)he uses. @@ -34,12 +34,12 @@ rc_reset if [ -f /etc/sysconfig/bzflagserver ]; then - . /etc/sysconfig/bzflagserver + . /etc/sysconfig/bzflagserver else - echo "Could not find /etc/sysconfig/bzflagserver" - echo "Please start the bzflagserver manually" - rc_failed 1 - rc_status -v + echo "Could not find /etc/sysconfig/bzflagserver" + echo "Please start the bzflagserver manually" + rc_failed 1 + rc_status -v fi # Check for missing binaries (stale symlinks should not happen) @@ -48,85 +48,85 @@ # See /etc/sysconfig/bzflagserver for options to the bzfs if [ "$BZFLAGSERVER_PUBLIC" = "yes" ] ; then - PUBLIC="-public" + PUBLIC="-public" fi if [ "$BZFLAGSERVER_NEWBIE" = "yes" ] ; then - HANDICAP="-handicap" + HANDICAP="-handicap" fi case "$1" in start) - echo -n "Starting bzflagserver" + echo -n "Starting bzflagserver" - if [ "$BZFLAGSERVER_SRVMSG" ] ; then - startproc -u nobody -g nobody $BZFLAGSERVER_BIN \ - $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \ - -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \ - -srvmsg "$BZFLAGSERVER_SRVMSG" $HANDICAP - else - startproc -u nobody -g nobody $BZFLAGSERVER_BIN \ - $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \ - -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \ - $HANDICAP - fi - # Remember status and be verbose - rc_status -v - ;; + if [ "$BZFLAGSERVER_SRVMSG" ] ; then + startproc -u nobody -g nobody $BZFLAGSERVER_BIN \ + $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \ + -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \ + -srvmsg "$BZFLAGSERVER_SRVMSG" $HANDICAP + else + startproc -u nobody -g nobody $BZFLAGSERVER_BIN \ + $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \ + -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \ + $HANDICAP + fi + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down bzflagserver" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - - killproc -TERM $BZFLAGSERVER_BIN - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Shutting down bzflagserver" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. + + killproc -TERM $BZFLAGSERVER_BIN + + # Remember status and be verbose + rc_status -v + ;; try-restart) - ## Stop the service and if this succeeds (i.e. the - ## service was running before), start it again. - ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; force-reload) - $0 stop && $0 start - rc_status - ;; + $0 stop && $0 start + rc_status + ;; reload) - rc_failed 3 - rc_status -v - ;; + rc_failed 3 + rc_status -v + ;; status) - echo -n "Checking for service bzflagserver: " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc $BZFLAGSERVER_BIN - rc_status -v - ;; + echo -n "Checking for service bzflagserver: " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Return value is slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $BZFLAGSERVER_BIN + rc_status -v + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit ++++++ sysconfig.bzflagserver-bzflag ++++++ --- /var/tmp/diff_new_pack.w8Lgnj/_old 2010-03-19 10:34:32.000000000 +0100 +++ /var/tmp/diff_new_pack.w8Lgnj/_new 2010-03-19 10:34:32.000000000 +0100 @@ -1,8 +1,8 @@ -## Path: Applications/Games/BZFlagserver -## Description: Configuration of the BZFlag server -## Type: string -## Default: "teleport.bzmap" -## ServiceRestart: bzflagserver +## Path: Applications/Games/BZFlagserver +## Description: Configuration of the BZFlag server +## Type: string +## Default: "teleport.bzmap" +## ServiceRestart: bzflagserver # # The map to use on the server. Have a look at the available maps in # /usr/share/games/bzflag/maps for available maps. @@ -17,28 +17,28 @@ # BZFLAGSERVER_OPTS="+f good -st 15 +s 5" -## Type: string +## Type: string ## Default: "" # # Define a server welcome message # BZFLAGSERVER_SRVMSG="" -## Type: yesno +## Type: yesno ## Default: off # # Define whether the server should be public for other players on the internet # BZFLAGSERVER_PUBLIC="no" -## Type: integer +## Type: integer ## Default: 5155 # # What port should the server listen to? The BZFlag game standard is 5155. # BZFLAGSERVER_PORT="5155" -## Type: yesno +## Type: yesno ## Default: off # # Define whether the server should punish people who are too good players ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 compcache for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package compcache for openSUSE:Factory checked in at Fri Mar 19 10:36:06 CET 2010. -------- --- compcache/compcache.changes 2009-12-29 21:46:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/compcache/compcache.changes 2010-03-09 00:12:31.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 8 23:09:41 UTC 2010 - death_knight(a)gamebox.net + +- additional ramzswap devices for SMP CPU machines. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compcache.spec ++++++ --- /var/tmp/diff_new_pack.j1zgZB/_old 2010-03-19 10:33:42.000000000 +0100 +++ /var/tmp/diff_new_pack.j1zgZB/_new 2010-03-19 10:33:42.000000000 +0100 @@ -24,7 +24,7 @@ License: GPLv2 Group: System/Kernel Version: 0.6 -Release: 2 +Release: 3 Summary: Compressed RAM based swap device Source0: compcache-%{version}.tar.bz2 Source1: sysconfig.compcache ++++++ boot.compcache ++++++ --- /var/tmp/diff_new_pack.j1zgZB/_old 2010-03-19 10:33:42.000000000 +0100 +++ /var/tmp/diff_new_pack.j1zgZB/_new 2010-03-19 10:33:42.000000000 +0100 @@ -2,7 +2,7 @@ # # System startup script loading compcache kernel module # Copyright (C) 2008 Takashi Iwai <tiwai(a)suse.de> -# +# Added SMP support by Erdem U. Altinyurt <spamjunkeater(a)gmail.com> # /etc/init.d/compcache # ### BEGIN INIT INFO @@ -24,70 +24,77 @@ UDEVADM_BIN=/sbin/udevadm MODPROBE_BIN=/sbin/modprobe RZSCTL_BIN=/usr/sbin/rzscontrol -SWAPDEV=/dev/ramzswap0 +SWAPDEVNM=/dev/ramzswap +COMPCACHE_NUM_DEVICES=$(cat /proc/cpuinfo | grep processor | wc -l) +COMPCACHE_SIZE_KB=$(expr $(grep MemTotal /proc/meminfo | sed 's/^.* //;s/ .*$//g') / 4) #%25 of ram is_comp_swap_on () { - grep -q ramzswap /proc/swaps + grep -q $1 /proc/swaps return $? } rc_reset case "$1" in - start|restart) + start) test -z "$COMPCACHE_NUM_DEVICES" && COMPCACHE_NUM_DEVICES="1" param="NUM_DEVICES=$COMPCACHE_NUM_DEVICES" - echo -n "Loading ramzswap driver" - $MODPROBE_BIN -q ramzswap &>/dev/null - rc_status -v - + echo -n "Loading ramzswap driver with $COMPCACHE_NUM_DEVICES devices and $(expr $COMPCACHE_SIZE_KB / 1024 )MB memory" + $MODPROBE_BIN -q ramzswap num_devices=$COMPCACHE_NUM_DEVICES &>/dev/null + rc_status -v # /dev/ramzswap0 is not available immediately after insmod returns # So, let udev complete its work before we do swapon - if [ ! -f $SWAPDEV ]; then - if [ -f "$UDEVADM_BIN" ]; then - $UDEVADM_BIN settle - else - sleep 2 - fi - fi - - test -z "$COMPCACHE_SIZE_KB" && COMPCACHE_SIZE_KB="0" - if [ "$COMPCACHE_SIZE_KB" -gt 0 ]; then - $RZSCTL_BIN $SWAPDEV -d $COMPCACHE_SIZE_KB -i - else - $RZSCTL_BIN $SWAPDEV -i - fi - - if ! is_comp_swap_on; then - echo -n "Setting up ramzswap swap device" - $SWAPON_BIN $SWAPDEV - rc_status -v - fi - ;; - stop) - if is_comp_swap_on; then - echo -n "Turning off ramzswap swap device" - $SWAPOFF_BIN $SWAPDEV - rc_status -v - fi + for i in $(seq 0 $(expr $COMPCACHE_NUM_DEVICES - 1) ); do + SWAPDEV=$SWAPDEVNM$i + if [ ! -f $SWAPDEV ]; then + if [ -f "$UDEVADM_BIN" ]; then + $UDEVADM_BIN settle + else + sleep 2 + fi + fi + test -z "$COMPCACHE_SIZE_KB" && COMPCACHE_SIZE_KB="0" + if [ "$COMPCACHE_SIZE_KB" -gt 0 ]; then + $RZSCTL_BIN $SWAPDEV -d $(expr $COMPCACHE_SIZE_KB / $COMPCACHE_NUM_DEVICES) -i + else + $RZSCTL_BIN $SWAPDEV -i + fi + + if ! is_comp_swap_on $SWAPDEV; then + echo -n "Setting up ramzswap swap device $i" + $SWAPON_BIN $SWAPDEV -p 10 + rc_status -v + fi + done + ;; + stop) + for i in $(seq 0 $(expr $COMPCACHE_NUM_DEVICES - 1) ); do + SWAPDEV=$SWAPDEVNM$i + if is_comp_swap_on $SWAPDEV; then + echo -n "Turning off ramzswap swap device $i" + $SWAPOFF_BIN $SWAPDEV + rc_status -v + fi + done echo -n "Unloading ramzswap module" $MODPROBE_BIN -qr ramzswap &>/dev/null rc_status -v + ;; - restart) + restart) $0 stop $0 start ;; - status) + status) echo -n "Checking for compcache " - if is_comp_swap_on; then - rc_failed 0 + if is_comp_swap_on $SWAPDEVNM; then + rc_failed 0 else - rc_failed 3 + rc_failed 3 fi rc_status -v ;; - *) + *) echo "Usage: $0 {start|stop|status|restart}" exit 1 ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cvs2svn for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package cvs2svn for openSUSE:Factory checked in at Fri Mar 19 10:34:20 CET 2010. -------- --- cvs2svn/cvs2svn.changes 2009-07-17 15:54:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/cvs2svn/cvs2svn.changes 2010-03-13 02:53:10.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Mar 13 01:45:47 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 2.3.0: + * add a "cvs2git" script for starting conversions to git (or Mercurial) + * add a "cvs2bzr" script for starting conversions to Bazaar + * generate manual pages automatically via new --man option + * allow --mime-types and --auto-props options to be specified more than once + * support author transforms when converting to Subversion + * allow unlabeled branches to be renamed using SymbolTransforms + * fix cvs2git with non-inline blobs: a revision after a delete could be empty + * do path comparisions platform-independently in symbol transform classes + * fix https://bugs.launchpad.net/pld-linux/+bug/385920 + * output error message if a revision's deltatext is missing + * improve contrib/verify-cvs2svn.py (used for testing conversion accuracy) + * add an IgnoreSymbolTransform class, for ignoring symbols matching a regexp + * remove some DeprecationWarnings when running under newer Python versions + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cvs2svn-2.2.0.tar.bz2 New: ---- cvs2svn-2.3.0.tar.bz2 cvs2svn-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cvs2svn.spec ++++++ --- /var/tmp/diff_new_pack.Oz3YXn/_old 2010-03-19 10:31:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Oz3YXn/_new 2010-03-19 10:31:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cvs2svn (Version 2.2.0) +# spec file for package cvs2svn (Version 2.3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,21 +17,24 @@ # norootforbuild +%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?py_ver: %global pyver %(%__python -c 'import sys; print sys.version[:3]')} Name: cvs2svn +%if 0%{?sles_version} >= 9 && 0%{?sles_version} < 10 +BuildRequires: python25-devel +Requires: python25 +%else BuildRequires: python-devel >= 2.4 -Version: 2.2.0 +Requires: python >= %{py_ver}, python < %{py_ver}.99 +%endif +Version: 2.3.0 Release: 1 -# -%define site_python %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") -# -%define cvs2svn_dir cvs2svn-%{version} -%define pyver %(python -c 'import sys; print sys.version[:3]') -Requires: python >= %pyver, python < %{pyver}.99 Requires: rcs Requires: subversion -Provides: subversion-cvs2svn -Obsoletes: subversion-cvs2svn +Provides: subversion-cvs2svn = %{version} +Obsoletes: subversion-cvs2svn < %{version} Group: Development/Tools/Version Control Url: http://cvs2svn.tigris.org/ # @@ -39,11 +42,15 @@ # Summary: Converts CVS repositories to Subversion repositories BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: ASLv.. +License: ASLv2 Group: Development/Tools/Version Control -# http://cvs2svn.tigris.org/files/documents/1462/44372/cvs2svn-%{version}.tar… +# http://cvs2svn.tigris.org/files/documents/1462/46528/cvs2svn-%{version}.tar… Source0: cvs2svn-%{version}.tar.bz2 +Source99: cvs2svn-rpmlintrc Patch0: cvs2svn.install-prefix.patch +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %py_requires # @@ -55,20 +62,24 @@ %prep -%setup -q -n %{cvs2svn_dir} +%setup -q # -%patch0 -p1 +%patch0 +# replace shebang for python with %__python +%__perl -ni -e 'if (1..1 && m/^#!(.+python)(\s+.+)?$/) {print "#!%__python".$2."\n";} else {print}' cvs2{svn,bzr,git} %build %install -make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR="$RPM_BUILD_ROOT" %files %defattr(-,root,root) %doc {BUGS,COMMITTERS,COPYING,README,www/{faq,cvs2svn}.html} -%attr(755,root,root) /usr/bin/cvs2svn -%dir %{site_python}/cvs2svn_rcsparse -%{site_python}/cvs2svn* +%attr(755,root,root) %{_bindir}/cvs2svn +%attr(755,root,root) %{_bindir}/cvs2bzr +%attr(755,root,root) %{_bindir}/cvs2git +%dir %{python_sitelib}/cvs2svn_rcsparse +%{python_sitelib}/cvs2svn* %changelog ++++++ cvs2svn-2.2.0.tar.bz2 -> cvs2svn-2.3.0.tar.bz2 ++++++ ++++ 20142 lines of diff (skipped) ++++++ cvs2svn.install-prefix.patch ++++++ --- /var/tmp/diff_new_pack.Oz3YXn/_old 2010-03-19 10:31:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Oz3YXn/_new 2010-03-19 10:31:10.000000000 +0100 @@ -1,14 +1,6 @@ -According to bug #149809, prefix must be /usr/local - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: cvs2svn-1.5.x/Makefile -=================================================================== ---- cvs2svn-1.5.x.orig/Makefile -+++ cvs2svn-1.5.x/Makefile -@@ -18,8 +18,8 @@ install: +--- Makefile.orig 2009-08-23 00:01:10.000000000 +0200 ++++ Makefile 2010-03-13 02:45:09.000000000 +0100 +@@ -35,8 +35,8 @@ ${PYTHON} ./setup.py install ; \ ;; \ *) \ ++++++ cvs2svn-rpmlintrc ++++++ addFilter("W: non-executable-script /usr/lib.*/python.*/site-packages/cvs2svn.*") addFilter("W: python-naming-policy-not-applied .*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 docutils for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package docutils for openSUSE:Factory checked in at Fri Mar 19 10:30:58 CET 2010. -------- --- docutils/docutils.changes 2009-08-11 15:14:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/docutils/docutils.changes 2010-03-18 16:52:56.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Mar 18 16:50:35 CET 2010 - matejcik(a)suse.cz + +- update to 0.6 + * scaling figures/images by percents + * many improvements in LaTeX2e writer +- fixed insecure usage of temp files in emacs mode + (bnc#564366) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- docutils-0.5.tar.bz2 New: ---- docutils-0.6-insecure-temp.patch docutils-0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docutils.spec ++++++ --- /var/tmp/diff_new_pack.xDautn/_old 2010-03-19 10:29:29.000000000 +0100 +++ /var/tmp/diff_new_pack.xDautn/_new 2010-03-19 10:29:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package docutils (Version 0.5) +# spec file for package docutils (Version 0.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,14 +20,15 @@ Name: docutils BuildRequires: python-devel -License: BSD 3-clause (or similar) ; GPL v2 or later ; Public Domain, Freeware ; Python License .. +License: BSD3c(or similar) ; GPLv2+ ; Public Domain, Freeware ; Python License .. Group: Productivity/Publishing/Other AutoReqProv: on -Version: 0.5 -Release: 2 +Version: 0.6 +Release: 1 Summary: Tools for Processing Plain Text Documentation into Useful Formats Url: http://docutils.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 +Patch1: %{name}-0.6-insecure-temp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} %if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} @@ -56,6 +57,7 @@ %prep %setup +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ docutils-0.6-insecure-temp.patch ++++++ Index: docutils-0.6/tools/editors/emacs/rst.el =================================================================== --- docutils-0.6.orig/tools/editors/emacs/rst.el +++ docutils-0.6/tools/editors/emacs/rst.el @@ -3301,13 +3301,31 @@ of the entire buffer, if the region is n (cadr (assq 'pseudoxml rst-compile-toolsets)) standard-output))) +(defvar rst-temp-dir nil) +(make-variable-buffer-local 'rst-temp-dir) + +(defun rst-get-temp-dir () + (or rst-temp-dir + (setq rst-temp-dir + (file-name-as-directory (make-temp-file "rst-" t)) + ) + ) +) + +(defun rst-remove-temp-dir () + (require 'dired) + (if rst-temp-dir (dired-delete-file rst-temp-dir 'always)) +) + +(add-hook 'kill-buffer-hook 'rst-remove-temp-dir) + (defvar rst-pdf-program "xpdf" "Program used to preview PDF files.") (defun rst-compile-pdf-preview () "Convert the document to a PDF file and launch a preview program." (interactive) - (let* ((tmp-filename "/tmp/out.pdf") + (let* ((tmp-filename (concat (rst-get-temp-dir) "out.pdf")) (command (format "%s %s %s && %s %s" (cadr (assq 'pdf rst-compile-toolsets)) buffer-file-name tmp-filename @@ -3323,7 +3341,7 @@ of the entire buffer, if the region is n (defun rst-compile-slides-preview () "Convert the document to an S5 slide presentation and launch a preview program." (interactive) - (let* ((tmp-filename "/tmp/slides.html") + (let* ((tmp-filename (concat (rst-get-temp-dir) "slides.html")) (command (format "%s %s %s && %s %s" (cadr (assq 's5 rst-compile-toolsets)) buffer-file-name tmp-filename ++++++ docutils-0.5.tar.bz2 -> docutils-0.6.tar.bz2 ++++++ ++++ 32847 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 dovecot12 for openSUSE:Factory
by root＠Hilbert.suse.de 19 Mar '10

19 Mar '10

Hello community, here is the log from the commit of package dovecot12 for openSUSE:Factory checked in at Fri Mar 19 10:30:15 CET 2010. -------- --- dovecot12/dovecot12.changes 2009-12-19 12:49:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/dovecot12/dovecot12.changes 2010-03-18 03:05:18.000000000 +0100 @@ -1,0 +2,108 @@ +Thu Mar 18 02:02:10 UTC 2010 - alexandre(a)exatati.com.br + +- ManageSieve patch refreshed for 1.2.11. + +------------------------------------------------------------------- +Tue Mar 9 14:02:38 UTC 2010 - mrueckert(a)suse.de + +- package solr schema + +------------------------------------------------------------------- +Mon Mar 8 19:39:19 UTC 2010 - mrueckert(a)suse.de + +- update to version 1.2.11 + - mbox: Message header reading was unnecessarily slow. Fetching a + huge header could have resulted in Dovecot eating a lot of CPU. + Also searching messages was much slower than necessary. + - mbox, dbox, cydir: Mail root directory was created with 0770 + permissions, instead of 0700. + - maildir: Reading uidlist could have ended up in an infinite + loop. + - IMAP IDLE: v1.2.7+ caused extra load by checking changes every + 0.5 seconds after a change had occurred in mailbox +- added dovecot-1.2-sieve-0.1.15_memset.patch: + fix order of memset arguments + +------------------------------------------------------------------- +Mon Mar 8 01:58:39 UTC 2010 - mrueckert(a)suse.de + +- enable solr backend for full text search + adds 2 new dependencies: curl and expat + +------------------------------------------------------------------- +Mon Jan 25 11:02:07 UTC 2010 - alexandre(a)exatati.com.br + +- update sieve version to 0.1.15: + * Enotify extension: + - Adjusted notify method API for addition of new notification + methods. + - Set default importance level to 'normal' (was 'high'). + * Include extension: updated implementation towards most recent + specification (all should be backwards compatible): + - Implemented global variables namespace. + - Global command may now appear anywhere in a script. + - Implemented script name checking using the requirements specified + in the ManageSieve draft. + - One issue remains: ManageSieve currently requires included scripts + to be uploaded first, which is not according to specification. + * Changed envelope path parser to allow to and from envelope addresses + that have no domain part. + + Added preliminary support for Sieve plugins and added support for + installing Sieve development headers. + + Started work on the implementation of the spamtest, spamtestplus and + virustest extensions (unfinished). + + Deprecated notify extension: implemented denotify command. + + Variables extension: added support for variable namespaces. + + Added configurable script size limit. Compiler will refuse to + compile files larger than sieve_max_script_size. + + Testsuite changes: + - Added support for changing and testing an extension's + configuration. + - Added a command line parameter for copying errors to stderr. + - Fixed a bug in the i;ascii-numeric comparator. If one of the + strings started with a non-digit character, the comparator would + always yield less-than. + - Imap4flags extension: fixed bug in removeflag: removing a single + flag failed due to off-by-one error (bug report by Julian Cowley). + - Improved EACCES error messages for stat() and lstat() syscalls and + slightly improved error messages that may uccur when saving a + binary. + - Vacation extension: fixed typo in runtime log message (patch by + Julian Cowley). + - Fixed use of minus '-' in man pages; it is now properly escaped. + - Fixed parser recovery. In particular cases it would trigger spurious + errors after an initial valid error and sometimes additional errors + were inappropriately ignored. +- update managesieve patches to match the release: + old: dovecot-1.2-managesieve-0.11.10.tar.bz2 + new: dovecot-1.2-managesieve-0.11.11.tar.bz2 + old: dovecot-1.2.9-managesieve-0.11.10.diff.bz2 + new: dovecot-1.2.10-managesieve-0.11.11.diff.bz2 + * This release contains adjustments to match changes in the Sieve API. + This means that this release will only compile against Pigeonhole + Sieve v0.1.15. + + Implemented ManageSieve QUOTA enforcement. + + Added MAXREDIRECTS capability after login. + + Implemented new script name rules specified in most recent + ManageSieve draft. + - Fixed assertion failure occuring with challenge-response SASL + mechanisms. + - Made configure complain about trying to compile against installed + Dovecot headers alone. + - Fixed compile warning for compilation against CMUSieve. +- update managesieve pie patch to match release: + old: dovecot-1.2-managesieve-0.11.10_pie.patch + new: dovecot-1.2-managesieve-0.11.11_pie.patch +- update sieve pie patch to match release: + old: dovecot-1.2-sieve-0.1.14_pie.patch + new: dovecot-1.2-sieve-0.1.15_pie.patch +- update to version 1.2.10 + + %variables now support %{host}, %{pid} and %{env:ENVIRONMENT_NAME} + everywhere. + + LIST-STATUS capability is now advertised + - maildir: Fixed several assert-crashes. + - imap: LIST "" inbox shouldn't crash when using namespace with + "INBOX." prefix. + - lazy_expunge now ignores non-private namespaces. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dovecot-1.2.9-managesieve-0.11.10.diff.bz2 dovecot-1.2.9.tar.bz2 dovecot-1.2-managesieve-0.11.10_pie.patch dovecot-1.2-managesieve-0.11.10.tar.bz2 dovecot-1.2-sieve-0.1.14_pie.patch dovecot-1.2-sieve-0.1.14.tar.bz2 New: ---- dovecot-1.2.11-managesieve-0.11.11.diff.bz2 dovecot-1.2.11.tar.bz2 dovecot-1.2-managesieve-0.11.11_pie.patch dovecot-1.2-managesieve-0.11.11.tar.bz2 dovecot-1.2-sieve-0.1.15_memset.patch dovecot-1.2-sieve-0.1.15_pie.patch dovecot-1.2-sieve-0.1.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dovecot12.spec ++++++ --- /var/tmp/diff_new_pack.tMzU5r/_old 2010-03-19 10:26:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tMzU5r/_new 2010-03-19 10:26:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dovecot12 (Version 1.2.9) +# spec file for package dovecot12 (Version 1.2.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: dovecot12 -Version: 1.2.9 +Version: 1.2.11 Release: 1 %define dovecot_major_version 1.2 -%define dovecot_sieve_version 0.1.14 -%define dovecot_managesieve_version 0.11.10 +%define dovecot_sieve_version 0.1.15 +%define dovecot_managesieve_version 0.11.11 %define dovecot_managesieve_docdir %{_docdir}/%{pkg_name}/dovecot-managesieve/ %define dovecot_sieve_docdir %{_docdir}/%{pkg_name}/dovecot-sieve # @@ -32,6 +32,9 @@ # %define makeinstall make install DESTDIR=%{buildroot} %define pkg_name dovecot +%if 0%{?suse_version} >= 1000 +%define with_solr 1 +%endif %if 0%{?suse_version} > 1020 %define with_clucene 1 %endif @@ -58,6 +61,9 @@ %if 0%{?suse_version} > 1020 BuildRequires: libbz2-devel %endif +%if 0%{?with_solr} +BuildRequires: curl-devel libexpat-devel +%endif PreReq: pwdutils %insserv_prereq %fillup_prereq Conflicts: dovecot10 dovecot11 dovecot-snapshot dovecot11-snapshot dovecot12-snapshot Provides: dovecot = %{version}-%{release} @@ -81,10 +87,11 @@ Source5: dovecot-rpmlintrc %define dovecot_managesieve_source_dir dovecot-%{dovecot_major_version}-managesieve-%{dovecot_managesieve_version} Source6: http://www.rename-it.nl/dovecot/1.1/%{dovecot_managesieve_source_dir}.tar.b… -Patch: http://www.rename-it.nl/dovecot/1.1/dovecot-1.2.9-managesieve-%{dovecot_man… +Patch: http://www.rename-it.nl/dovecot/1.1/dovecot-1.2.11-managesieve-%{dovecot_ma… Patch1: dovecot-1.2.4_pie.patch -Patch2: dovecot-1.2-managesieve-0.11.10_pie.patch -Patch3: dovecot-1.2-sieve-0.1.14_pie.patch +Patch2: dovecot-1.2-managesieve-0.11.11_pie.patch +Patch3: dovecot-1.2-sieve-0.1.15_pie.patch +Patch4: dovecot-1.2-sieve-0.1.15_memset.patch # Summary: IMAP and POP3 Server Written Primarily with Security in Mind @@ -183,6 +190,7 @@ -------- Timo Sirainen <tss(a)iki.fi> %endif + %if 0%{?with_clucene} %package fts-lucene @@ -212,6 +220,35 @@ Timo Sirainen <tss(a)iki.fi> %endif +%if 0%{?with_solr} + +%package fts-solr +License: BSD3c ; LGPLv2.1+ ; MIT +Group: Productivity/Networking/Email/Servers +Requires: %{name} = %{version} +Provides: dovecot_fts_backend = %{version}-%{release} +Provides: dovecot-fts-solr = %{version}-%{release} +Obsoletes: dovecot-fts-solr < %{version} +Conflicts: dovecot10-fts-solr dovecot11-fts-solr dovecot-snapshot-fts-solr dovecot11-snapshot-fts-solr dovecot12-snapshot-fts-solr +Summary: Fulltext search support via solr + +%description fts-solr +Dovecot is an IMAP and POP3 server for Linux and UNIX-like systems, +written primarily with security in mind. Although it is written in C, +it uses several coding techniques to avoid most of the common pitfalls. + +Dovecot can work with standard mbox and maildir formats and is fully +compatible with UW-IMAP and Courier IMAP servers as well as mail +clients accessing the mailboxes directly. + +This package holds the files needed for fulltext search support via solr. + + +Authors: +-------- + Timo Sirainen <tss(a)iki.fi> +%endif + %package devel License: BSD3c ; LGPLv2.1+ ; MIT Group: Development/Libraries/C and C++ @@ -246,6 +283,7 @@ %patch1 %patch2 %patch3 +%patch4 cp %{pkg_name}-example.conf{,.bak} %{__sed} -i -e 's|#ssl = yes|ssl = no|' \ -e 's|/usr/libexec|%{_prefix}/lib|g' %{pkg_name}-example.conf @@ -280,6 +318,9 @@ %if 0%{?with_clucene} --with-lucene \ %endif +%if 0%{?with_solr} + --with-solr \ +%endif --with-ldap=plugin \ --with-sql=plugin \ --with-gssapi=plugin \ @@ -361,8 +402,12 @@ # # additional docs for the main package %{__install} -m 0644 \ - AUTHORS ChangeLog COPYING* NEWS TODO README* \ + AUTHORS ChangeLog COPYING* NEWS TODO README* doc/*.txt \ + %{buildroot}%{_docdir}/%{pkg_name}/ +%if 0%{?with_solr} +%{__install} -m 0644 doc/*.xml \ %{buildroot}%{_docdir}/%{pkg_name}/ +%endif %{__gzip} -9v %{buildroot}%{_docdir}/%{pkg_name}/ChangeLog # for i in %{dovecot_sieve_source_dir}/{AUTHORS,ChangeLog,COPYING,NEWS,README} ; do @@ -502,6 +547,9 @@ # documentation # %doc %{_docdir}/%{pkg_name} +%if 0%{?with_solr} +%exclude %{_docdir}/%{pkg_name}/solr-schema.xml +%endif # # setting up permissions # @@ -520,6 +568,7 @@ %{_libdir}/%{pkg_name}/modules/auth/libdriver_pgsql.so %{_libdir}/%{pkg_name}/modules/dict/libdriver_pgsql.so %{_libdir}/%{pkg_name}/modules/sql/libdriver_pgsql.so + %if 0%{?with_sqlite} %files backend-sqlite @@ -528,6 +577,7 @@ %{_libdir}/%{pkg_name}/modules/dict/libdriver_sqlite.so %{_libdir}/%{pkg_name}/modules/sql/libdriver_sqlite.so %endif + %if 0%{?with_clucene} %files fts-lucene @@ -538,6 +588,17 @@ %{_libdir}/%{pkg_name}/modules/pop3/lib21_fts_lucene_plugin.so %endif +%if 0%{?with_solr} + +%files fts-solr +%defattr(-,root,root,-) +%{_libdir}/%{pkg_name}/modules/lib21_fts_solr_plugin.so +%{_libdir}/%{pkg_name}/modules/imap/lib21_fts_solr_plugin.so +%{_libdir}/%{pkg_name}/modules/lda/lib21_fts_solr_plugin.so +%{_libdir}/%{pkg_name}/modules/pop3/lib21_fts_solr_plugin.so +%{_docdir}/%{pkg_name}/solr-schema.xml +%endif + %files devel %defattr(-,root,root,-) %{_includedir}/%{pkg_name}/ ++++++ dovecot-1.2.9-managesieve-0.11.10.diff.bz2 -> dovecot-1.2.11-managesieve-0.11.11.diff.bz2 ++++++ Files dovecot12/dovecot-1.2.9-managesieve-0.11.10.diff.bz2 and /mounts/work_src_done/STABLE/dovecot12/dovecot-1.2.11-managesieve-0.11.11.diff.bz2 differ ++++++ dovecot-1.2.9.tar.bz2 -> dovecot-1.2.11.tar.bz2 ++++++ ++++ 21692 lines of diff (skipped) ++++++ dovecot-1.2-managesieve-0.11.10_pie.patch -> dovecot-1.2-managesieve-0.11.11_pie.patch ++++++ --- dovecot12/dovecot-1.2-managesieve-0.11.10_pie.patch 2009-12-19 12:49:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/dovecot12/dovecot-1.2-managesieve-0.11.11_pie.patch 2010-01-25 12:39:41.000000000 +0100 @@ -1,7 +1,7 @@ -Index: dovecot-1.2-managesieve-0.11.10/configure.in +Index: dovecot-1.2-managesieve-0.11.11/configure.in =================================================================== ---- dovecot-1.2-managesieve-0.11.10/configure.in.orig -+++ dovecot-1.2-managesieve-0.11.10/configure.in +--- dovecot-1.2-managesieve-0.11.11.orig/configure.in ++++ dovecot-1.2-managesieve-0.11.11/configure.in @@ -16,6 +16,37 @@ AC_PROG_CC AC_PROG_CPP AM_PROG_LIBTOOL ++++++ dovecot-1.2-managesieve-0.11.10.tar.bz2 -> dovecot-1.2-managesieve-0.11.11.tar.bz2 ++++++ ++++ 59906 lines of diff (skipped) ++++++ dovecot-1.2-sieve-0.1.15_memset.patch ++++++ Index: dovecot-1.2-sieve-0.1.15/src/lib-sieve/plugins/enotify/cmd-notify.c =================================================================== --- dovecot-1.2-sieve-0.1.15/src/lib-sieve/plugins/enotify/cmd-notify.c.orig +++ dovecot-1.2-sieve-0.1.15/src/lib-sieve/plugins/enotify/cmd-notify.c @@ -541,7 +541,7 @@ static int act_notify_check_duplicate if ( nmth_def->action_check_duplicates == NULL ) return 0; - memset(&nenv, sizeof(nenv), 0); + memset(&nenv, 0, sizeof(nenv)); nenv.method = nact->method; nenv.ehandler = sieve_prefix_ehandler_create (sieve_result_get_error_handler(renv->result), act->location, "notify"); @@ -594,7 +594,7 @@ static bool act_notify_commit if ( method->def != NULL && method->def->action_execute != NULL ) { /* Compose log structure */ - memset(&nenv, sizeof(nenv), 0); + memset(&nenv, 0, sizeof(nenv)); nenv.method = method; nenv.scriptenv = aenv->scriptenv; nenv.msgdata = aenv->msgdata; Index: dovecot-1.2-sieve-0.1.15/src/lib-sieve/plugins/enotify/ext-enotify-common.c =================================================================== --- dovecot-1.2-sieve-0.1.15/src/lib-sieve/plugins/enotify/ext-enotify-common.c.orig +++ dovecot-1.2-sieve-0.1.15/src/lib-sieve/plugins/enotify/ext-enotify-common.c @@ -321,7 +321,7 @@ static int _ext_enotify_option_check bool result = TRUE, check = TRUE; /* Compose log structure */ - memset(&nenv, sizeof(nenv), 0); + memset(&nenv, 0, sizeof(nenv)); nenv.method = method; nenv.ehandler = sieve_prefix_ehandler_create (sieve_validator_error_handler(valdtr), @@ -395,7 +395,7 @@ bool ext_enotify_compile_check_arguments if ( method->def == NULL ) return TRUE; /* Compose log structure */ - memset(&nenv, sizeof(nenv), 0); + memset(&nenv, 0, sizeof(nenv)); nenv.method = method; /* Check URI itself */ ++++++ dovecot-1.2-sieve-0.1.14_pie.patch -> dovecot-1.2-sieve-0.1.15_pie.patch ++++++ --- dovecot12/dovecot-1.2-sieve-0.1.14_pie.patch 2009-12-19 12:49:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/dovecot12/dovecot-1.2-sieve-0.1.15_pie.patch 2010-01-25 12:39:51.000000000 +0100 @@ -1,7 +1,7 @@ -Index: dovecot-1.2-sieve-0.1.14/configure.in +Index: dovecot-1.2-sieve-0.1.15/configure.in =================================================================== ---- dovecot-1.2-sieve-0.1.14/configure.in.orig -+++ dovecot-1.2-sieve-0.1.14/configure.in +--- dovecot-1.2-sieve-0.1.15/configure.in.orig ++++ dovecot-1.2-sieve-0.1.15/configure.in @@ -20,6 +20,37 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_LIBTOOL ++++++ dovecot-1.2-sieve-0.1.14.tar.bz2 -> dovecot-1.2-sieve-0.1.15.tar.bz2 ++++++ ++++ 83973 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