May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit update-test-trival for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package update-test-trival for openSUSE:Factory checked in at Wed May 6 00:33:02 CEST 2009. -------- --- update-test-trival/update-test-trival.changes 2007-02-15 17:48:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/update-test-trival/update-test-trival.changes 2009-05-05 19:09:18.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 5 19:06:16 CEST 2009 - dmueller(a)suse.de + +- add relogin-suggested subpackage + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-test-trival.spec ++++++ --- /var/tmp/diff_new_pack.u10723/_old 2009-05-06 00:32:50.000000000 +0200 +++ /var/tmp/diff_new_pack.u10723/_new 2009-05-06 00:32:50.000000000 +0200 @@ -1,22 +1,30 @@ # # spec file for package update-test-trival (Version 0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 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: update-test-trival Version: 0 Release: 1.3 Summary: Package for testing the update stack during product development. -License: GNU General Public License (GPL) +License: GPL v2 or later BuildArch: noarch -Autoreqprov: on +AutoReqProv: on Source0: %{name}.tar.bz2 Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,6 +42,7 @@ Harald M�ller-Ney <hmuelle(a)suse.de> %package -n update-test-reboot-needed +License: GPL v2 or later Summary: Package for testing the update stack during product development. Group: System/YaST @@ -49,7 +58,25 @@ -------- Harald M�ller-Ney <hmuelle(a)suse.de> +%package -n update-test-relogin-suggested +License: GPL v2 or later +Summary: Package for testing the update stack during product development. +Group: System/YaST + +%description -n update-test-relogin-suggested +Package for testing the update stack during product development. + +We will provide a "always" working update for this package so that the +update stack could be easily tested. + + + +Authors: +-------- + Harald M�ller-Ney <hmuelle(a)suse.de> + %package -n update-test-interactive +License: GPL v2 or later Summary: Package for testing the update stack during product development. Group: System/YaST @@ -66,6 +93,7 @@ Harald M�ller-Ney <hmuelle(a)suse.de> %package -n update-test-affects-package-manager +License: GPL v2 or later Summary: Package for testing the update stack during product development. Group: System/YaST @@ -82,6 +110,7 @@ Harald M�ller-Ney <hmuelle(a)suse.de> %package -n update-test-security +License: GPL v2 or later Summary: Package for testing the update stack during product development. Group: System/YaST @@ -98,6 +127,7 @@ Harald M�ller-Ney <hmuelle(a)suse.de> %package -n update-test-optional +License: GPL v2 or later Summary: Package for testing the update stack during product development. Group: System/YaST @@ -123,26 +153,12 @@ %install # skip-check-libtool-deps -cat > README.update-test-reboot-needed <<-EOF +for i in update-test-reboot-needed update-test-interactive update-test-affects-package-manager update-test-security update-test-optional update-test-relogin-suggested; do +cat > README.$i <<-EOF Package for testing the update stack during product development. This package should require a reboot of the machine. EOF -cat > README.update-test-interactive <<-EOF -Package for testing the update stack during product development. -This package should ask the enduser a question. -EOF -cat > README.update-test-affects-package-manager <<-EOF -Package for testing the update stack during product development. -This package should update the package manager himself. -EOF -cat > README.update-test-security <<-EOF -Package for testing the update stack during product development. -This package tests security updates. -EOF -cat > README.update-test-optional <<-EOF -Package for testing the update stack during product development. -This package should test an optional update. -EOF +done for i in `ls -A README.update-test*`; do echo >> $i echo "Package Version : %{version}" >> $i @@ -182,23 +198,29 @@ %defattr(-,root,root) %doc README.update-test-optional -%changelog -n update-test-trival -* Thu Feb 15 2007 - lrupp(a)suse.de +%files -n update-test-relogin-suggested +%defattr(-,root,root) +%doc README.update-test-relogin-suggested + +%changelog +* Tue May 05 2009 dmueller(a)suse.de +- add relogin-suggested subpackage +* Thu Feb 15 2007 lrupp(a)suse.de - specfile rewrite: + create the documentation files inline: (add version, release and date) + use get_version_number.sh and get_release_number.sh for "easier" preparing mbuild numbers - version 1.3-0 -* Wed Jan 17 2007 - hmuelle(a)suse.de +* Wed Jan 17 2007 hmuelle(a)suse.de - Fixed specfile and downgrade version to 1.2 99.9 is reserved for "universal updates testing" during beta cycles -* Mon Dec 04 2006 - hmuelle(a)suse.de +* Mon Dec 04 2006 hmuelle(a)suse.de - Fixed specfile to avoid locale issues (Müller -> Mueller) -* Wed Nov 08 2006 - mvidner(a)suse.cz +* Wed Nov 08 2006 mvidner(a)suse.cz - Added subpackages to test other kinds of patches. - 1.1 -* Wed Oct 18 2006 - hmuelle(a)suse.de +* Wed Oct 18 2006 hmuelle(a)suse.de - created initial update-test-trival package for testing our update stack ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virtualbox-ose for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Tue May 5 18:13:04 CEST 2009. -------- --- virtualbox-ose/virtualbox-ose.changes 2009-04-29 17:14:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2009-05-05 03:09:25.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 5 03:09:09 CEST 2009 - dmueller(a)suse.de + +- fix build for older distros + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.pS7677/_old 2009-05-05 18:12:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pS7677/_new 2009-05-05 18:12:52.000000000 +0200 @@ -57,7 +57,7 @@ # ExclusiveArch: %ix86 x86_64 Version: 2.2.2 -Release: 1 +Release: 2 Summary: VirtualBox OSE is an Emulator License: GPL v2 or later Group: System/Emulators/PC @@ -203,7 +203,7 @@ %if %suse_version > 1020 --with-linux=/usr/src/linux-obj/%{_target_cpu}/default \ %endif - --with-qt-dir=%{_libdir}/qt4 $EXTRA_OPTS + $EXTRA_OPTS /usr/bin/kmk \ KBUILD_VERBOSE=2 \ %if %suse_version > 1020 @@ -527,6 +527,8 @@ %{_datadir}/virtualbox/x11restore.pl %changelog +* Tue May 05 2009 dmueller(a)suse.de +- fix build for older distros * Wed Apr 29 2009 mseben(a)suse.cz - updated to 2.2.2 * Host and guest clipboard: ﬁxed a number of issues affecting hosts and guests running the X window system. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rsync for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package rsync for openSUSE:Factory checked in at Tue May 5 18:12:35 CEST 2009. -------- --- rsync/rsync.changes 2009-04-16 12:21:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/rsync/rsync.changes 2009-05-05 15:31:54.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 5 15:29:12 CEST 2009 - puzel(a)suse.cz + +- add rsync-allow-slp-disable.patch (FATE#306331) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- rsync-allow-slp-disable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsync.spec ++++++ --- /var/tmp/diff_new_pack.rC4202/_old 2009-05-05 18:12:22.000000000 +0200 +++ /var/tmp/diff_new_pack.rC4202/_new 2009-05-05 18:12:22.000000000 +0200 @@ -32,7 +32,7 @@ PreReq: %fillup_prereq %insserv_prereq sed grep AutoReqProv: on Version: 3.0.5.91 -Release: 1 +Release: 2 %define tar_version 3.0.6pre1 Summary: Replacement for RCP/mirror that has Many More Features Source: %{name}-%{tar_version}.tar.bz2 @@ -46,6 +46,8 @@ Patch3: system-zlib.diff #PATCH-FIX-UPSTREAM rsync-3.0.5-doc-fix.patch bnc487591 petr.uzel(a)suse.cz -- based on upstream changes to rsync.yo Patch4: rsync-3.0.5-doc-fix.patch +#PATCH-FEATURE-UPSTREAM rsync-allow-slp-disable.patch fate#306331 -- taken from upstream git +Patch5: rsync-allow-slp-disable.patch Url: http://rsync.samba.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define with_system_zlib 0 @@ -78,6 +80,7 @@ patch -p1 < patches/xattrs.diff patch -p1 < patches/slp.diff %patch4 -p1 +%patch5 -p1 %build autoheader @@ -140,6 +143,8 @@ %doc COPYING NEWS README tech_report.ps tech_report.tex %changelog +* Tue May 05 2009 puzel(a)suse.cz +- add rsync-allow-slp-disable.patch (FATE#306331) * Thu Apr 16 2009 puzel(a)suse.cz - update to 3.0.6pre1 (bugfix release) - noteworthy changes: ++++++ rsync-allow-slp-disable.patch ++++++ diff -Naurp rsync-3.0.6pre1/clientserver.c rsync-3.0.6pre1-slp//clientserver.c --- rsync-3.0.6pre1/clientserver.c 2009-05-05 14:24:50.000000000 +0200 +++ rsync-3.0.6pre1-slp//clientserver.c 2009-05-05 14:29:01.000000000 +0200 @@ -1065,7 +1065,7 @@ int daemon_main(void) * local address??? */ #ifdef HAVE_LIBSLP - if (register_services()) { + if (lp_use_slp() && register_services() != 0) { rprintf(FINFO, "Couldn't register with service discovery protocol, continuing anyway\n"); } diff -Naurp rsync-3.0.6pre1/loadparm.c rsync-3.0.6pre1-slp//loadparm.c --- rsync-3.0.6pre1/loadparm.c 2009-05-05 14:24:50.000000000 +0200 +++ rsync-3.0.6pre1-slp//loadparm.c 2009-05-05 14:29:01.000000000 +0200 @@ -112,6 +112,10 @@ typedef struct #ifdef HAVE_LIBSLP int slp_refresh; #endif + +#ifdef HAVE_LIBSLP + BOOL use_slp; +#endif } global; static global Globals; @@ -307,6 +311,9 @@ static struct parm_struct parm_table[] = {"slp refresh", P_INTEGER,P_GLOBAL,&Globals.slp_refresh, NULL,0}, #endif {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0}, +#ifdef HAVE_LIBSLP + {"use slp", P_BOOL, P_GLOBAL,&Globals.use_slp, NULL,0}, +#endif {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0}, {"charset", P_STRING, P_LOCAL, &sDefault.charset, NULL,0}, @@ -360,6 +367,7 @@ static struct parm_struct parm_table[] = static void init_globals(void) { memset(&Globals, 0, sizeof Globals); + Globals.use_slp = True; } /*************************************************************************** @@ -404,6 +412,10 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh) #endif +#ifdef HAVE_LIBSLP +FN_GLOBAL_BOOL(lp_use_slp, &Globals.use_slp) +#endif + FN_LOCAL_STRING(lp_auth_users, auth_users) FN_LOCAL_STRING(lp_charset, charset) FN_LOCAL_STRING(lp_comment, comment) diff -Naurp rsync-3.0.6pre1/rsyncd.conf.yo rsync-3.0.6pre1-slp//rsyncd.conf.yo --- rsync-3.0.6pre1/rsyncd.conf.yo 2009-05-05 14:24:50.000000000 +0200 +++ rsync-3.0.6pre1-slp//rsyncd.conf.yo 2009-05-05 14:54:01.000000000 +0200 @@ -104,6 +104,10 @@ details on some of the options you may b special socket options are set. These settings can also be specified via the bf(--sockopts) command-line option. +dit(bf(use slp)) This parameter is used to determine if the module names are +advertised via slp. The default is for this to be enabled, which will +advertise your public modules. + dit(bf(slp refresh)) This parameter is used to determine how long service advertisements are valid (measured in seconds), and is only applicable if you have Service Location Protocol support compiled in. If this is diff -Naurp rsync-3.0.6pre1/rsyncd.conf.5 rsync-3.0.6pre1-slp//rsyncd.conf.5 --- rsync-3.0.6pre1/rsyncd.conf.5 2009-05-05 14:24:50.000000000 +0200 +++ rsync-3.0.6pre1-slp//rsyncd.conf.5 2009-05-05 14:55:31.000000000 +0200 @@ -121,7 +121,12 @@ details on some of the options you may b special socket options are set. These settings can also be specified via the \fB\-\-sockopts\fP command-line option. .IP -.IP "\fBslp refresh\fP" +.IP "\fBuse slp\fP" +This parameter is used to determine if the module names are +advertised via slp. The default is for this to be enabled, which will +advertise your public modules. +.IP +.IP "\fBslp refresh\fP" This parameter is used to determine how long service advertisements are valid (measured in seconds), and is only applicable if you have Service Location Protocol support compiled in. If this is diff -Naurp rsync-3.0.6pre1/socket.c rsync-3.0.6pre1-slp//socket.c --- rsync-3.0.6pre1/socket.c 2009-05-05 14:24:50.000000000 +0200 +++ rsync-3.0.6pre1-slp//socket.c 2009-05-05 14:29:01.000000000 +0200 @@ -532,7 +532,7 @@ void start_accept_loop(int port, int (*f int *sp, maxfd, i; #ifdef HAVE_LIBSLP time_t next_slp_refresh; - short slp_timeout = lp_slp_refresh(); + short slp_timeout = lp_use_slp() ? lp_slp_refresh() : 0; if (slp_timeout) { if (slp_timeout < SLP_MIN_TIMEOUT) slp_timeout = SLP_MIN_TIMEOUT; ++++++ rsyncd.conf ++++++ --- /var/tmp/diff_new_pack.rC4202/_old 2009-05-05 18:12:22.000000000 +0200 +++ /var/tmp/diff_new_pack.rC4202/_new 2009-05-05 18:12:22.000000000 +0200 @@ -7,6 +7,7 @@ pid file = /var/run/rsyncd.pid hosts allow = trusted.hosts slp refresh = 300 +use slp = false #[Example] # path = /home/Example ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Tue May 5 18:11:35 CEST 2009. -------- --- kiwi/kiwi.changes 2009-05-04 16:28:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2009-05-05 16:42:51.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 5 11:34:11 CEST 2009 - ms(a)suse.de + +- v3.49 +- added clic fixes from coolo (bnc #497172) +- fixed quotation of realname for user setup (bnc #500537) +- fixed activateBootPartition code (bnc #500454) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.lQ1181/_old 2009-05-05 18:11:20.000000000 +0200 +++ /var/tmp/diff_new_pack.lQ1181/_new 2009-05-05 18:11:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 3.48) +# spec file for package kiwi (Version 3.49) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,7 +53,7 @@ Summary: openSUSE - KIWI Image System Provides: kiwi2 <= 2.14 Obsoletes: kiwi2 <= 2.14 -Version: 3.48 +Version: 3.49 Release: 1 Group: System/Management License: GPL v2 or later @@ -612,6 +612,11 @@ %endif %changelog +* Tue May 05 2009 ms(a)suse.de +- v3.49 +- added clic fixes from coolo (bnc #497172) +- fixed quotation of realname for user setup (bnc #500537) +- fixed activateBootPartition code (bnc #500454) * Wed Apr 29 2009 ms(a)suse.de - v3.48 - allow setting up vga for iso images too (bnc #480336) ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi.tar.bz2 differ: byte 11, line 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 patterns-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at Tue May 5 18:11:22 CEST 2009. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2009-04-22 10:48:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2009-05-05 10:47:55.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 5 10:47:15 CEST 2009 - coolo(a)suse.de + +- follow package names + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.GUi702/_old 2009-05-05 18:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.GUi702/_new 2009-05-05 18:11:12.000000000 +0200 @@ -25,7 +25,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.2 -Release: 7 +Release: 8 Url: http://en.opensuse.org/Patterns BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 @@ -122,6 +122,8 @@ /CD1/suse/setup/descr/non_oss-*.pat %changelog +* Tue May 05 2009 coolo(a)suse.de +- follow package names * Wed Apr 22 2009 coolo(a)suse.de - remove manuals pattern * Tue Apr 21 2009 coolo(a)suse.de ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-GNOME new/patterns-openSUSE-data/data/DEVEL-GNOME --- old/patterns-openSUSE-data/data/DEVEL-GNOME 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/DEVEL-GNOME 2009-05-05 10:40:35.000000000 +0200 @@ -9,7 +9,6 @@ at-spi-devel atk-devel audiofile-devel -banshee-devel cairo-devel cairo-doc gnome-control-center-devel diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-KDE new/patterns-openSUSE-data/data/DEVEL-KDE --- old/patterns-openSUSE-data/data/DEVEL-KDE 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/DEVEL-KDE 2009-05-05 10:39:03.000000000 +0200 @@ -76,13 +76,12 @@ cups-devel bluez-devel libpoppler-qt4-devel -libkexiv2-7-devel +libkexiv2-devel giflib-devel -Prc: +Psg: -libkdcraw7-devel -libkexiv2-7-devel +libkdcraw-devel libkipi-devel freeglut-devel graphviz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS new/patterns-openSUSE-data/data/ENHANCED-BASIS --- old/patterns-openSUSE-data/data/ENHANCED-BASIS 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS 2009-05-05 10:05:24.000000000 +0200 @@ -104,7 +104,8 @@ pciutils pcsc-lite #if defined __i386__ || defined __x86_64 || defined __ia64__ -pmtools +dmidecode +acpica #endif #if defined(__i386__) || defined (__x86_64__) microcode_ctl diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT --- old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2009-05-05 10:42:31.000000000 +0200 @@ -8,7 +8,6 @@ cups-drivers dos2unix ed -filters finger // 304995 // fbset diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GAMES-OPT new/patterns-openSUSE-data/data/GAMES-OPT --- old/patterns-openSUSE-data/data/GAMES-OPT 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/GAMES-OPT 2009-05-05 10:42:49.000000000 +0200 @@ -3,16 +3,8 @@ frozen-bubble freeciv supertux -#pragma online -xmoto lbreakout #pragma online -BASS -#pragma online -FOTAQ -#pragma online -enigma -#pragma online glest #pragma online lincity diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-BASIS new/patterns-openSUSE-data/data/GNOME-BASIS --- old/patterns-openSUSE-data/data/GNOME-BASIS 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-BASIS 2009-05-05 10:41:05.000000000 +0200 @@ -74,7 +74,6 @@ gstreamer-0_10-plugins-good gtk2-engines gtkhtml2 -gtksourceview gtkspell gucharmap input-utils diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/IMAGE new/patterns-openSUSE-data/data/IMAGE --- old/patterns-openSUSE-data/data/IMAGE 2009-03-31 13:00:00.000000000 +0200 +++ new/patterns-openSUSE-data/data/IMAGE 2009-04-23 14:01:25.000000000 +0200 @@ -1,2 +1,4 @@ +Prc: +exiftool +gimp -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/IMAGE-OPT new/patterns-openSUSE-data/data/IMAGE-OPT --- old/patterns-openSUSE-data/data/IMAGE-OPT 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/IMAGE-OPT 2009-04-23 14:01:17.000000000 +0200 @@ -1,8 +1,6 @@ +Prc: AdobeICCProfiles gimp-help -exiftool -gimp -Prc: +Psg: ufraw diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-BASIS new/patterns-openSUSE-data/data/KDE4-BASIS --- old/patterns-openSUSE-data/data/KDE4-BASIS 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-BASIS 2009-05-05 10:39:14.000000000 +0200 @@ -25,7 +25,7 @@ kde4-korganizer kde4-knotes pinentry-qt -kde4-kcm_gtk +kcm_gtk qtcurve-gtk2 yast2-control-center-qt // we want useful bug reports diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-BASIS-OPT new/patterns-openSUSE-data/data/KDE4-BASIS-OPT --- old/patterns-openSUSE-data/data/KDE4-BASIS-OPT 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-BASIS-OPT 2009-05-05 10:39:31.000000000 +0200 @@ -6,7 +6,7 @@ kde4-kio_beagle kepas kde4-webkitpart -kde4-yakuake +yakuake kde4-kerry -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Games new/patterns-openSUSE-data/data/KDE4-Games --- old/patterns-openSUSE-data/data/KDE4-Games 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-Games 2009-05-05 10:41:32.000000000 +0200 @@ -17,7 +17,6 @@ kde4-kbounce kde4-kbreakout kde4-kdiamond -kde4-kfourline kde4-kgoldrunner kde4-kiriki kde4-kjumpingcube diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-IDE new/patterns-openSUSE-data/data/KDE4-IDE --- old/patterns-openSUSE-data/data/KDE4-IDE 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-IDE 2009-05-05 10:41:45.000000000 +0200 @@ -7,5 +7,4 @@ kde4-kapptemplate kde4-lokalize kde4-l10n-devel -kdevelop3 -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-IMAGE new/patterns-openSUSE-data/data/KDE4-IMAGE --- old/patterns-openSUSE-data/data/KDE4-IMAGE 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-IMAGE 2009-05-05 10:39:41.000000000 +0200 @@ -1,5 +1,5 @@ +Prq: -kde4-gwenview +gwenview digikam kipi-plugins // kipi-plugins needs /usr/bin/jpegtran diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Internet new/patterns-openSUSE-data/data/KDE4-Internet --- old/patterns-openSUSE-data/data/KDE4-Internet 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-Internet 2009-04-23 14:46:49.000000000 +0200 @@ -14,9 +14,9 @@ kde4-krfb kde4-krdc konversation +ktorrent -Prc: +Psg: NetworkManager-openvpn-kde4 NetworkManager-vpnc-kde4 -ktorrent -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-Multimedia new/patterns-openSUSE-data/data/KDE4-Multimedia --- old/patterns-openSUSE-data/data/KDE4-Multimedia 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-Multimedia 2009-04-30 14:45:04.000000000 +0200 @@ -1,6 +1,6 @@ +Prq: -kde4-amarok -kde4-k3b +amarok +k3b kde4-kmix kde4-kscd kde4-kio_audiocd @@ -9,7 +9,7 @@ -Prq: +Prc: -kde4-kaffeine +kaffeine //kio_ipodslave krecord //phonon_xine diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/MULTIMEDIA-OPT new/patterns-openSUSE-data/data/MULTIMEDIA-OPT --- old/patterns-openSUSE-data/data/MULTIMEDIA-OPT 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/MULTIMEDIA-OPT 2009-05-05 10:40:20.000000000 +0200 @@ -2,9 +2,6 @@ kino ImageMagick mjpegtools -#if defined(__i386__) || defined (__x86_64__) -RealPlayer -#endif -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/NON-OSS-OPT new/patterns-openSUSE-data/data/NON-OSS-OPT --- old/patterns-openSUSE-data/data/NON-OSS-OPT 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/NON-OSS-OPT 2009-05-05 10:43:02.000000000 +0200 @@ -39,8 +39,4 @@ FZMingTiB // needed for instsys FZSongTi -#if defined(__i386__) || defined (__x86_64__) -#pragma online -wink -#endif -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/PRINT_SERVER new/patterns-openSUSE-data/data/PRINT_SERVER --- old/patterns-openSUSE-data/data/PRINT_SERVER 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/PRINT_SERVER 2009-05-05 10:42:25.000000000 +0200 @@ -5,7 +5,6 @@ +Prc: cups-backends cups-drivers -filters foomatic-filters gutenprint hplip diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REMOTE-DESKTOP new/patterns-openSUSE-data/data/REMOTE-DESKTOP --- old/patterns-openSUSE-data/data/REMOTE-DESKTOP 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/REMOTE-DESKTOP 2009-05-05 10:41:21.000000000 +0200 @@ -3,7 +3,6 @@ -Prq: +Prc: tsclient -FreeNX tightvnc -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-CD new/patterns-openSUSE-data/data/REST-CD --- old/patterns-openSUSE-data/data/REST-CD 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-CD 2009-05-04 16:07:41.000000000 +0200 @@ -131,4 +131,17 @@ // #494547 - just testing cups-drivers manufacturer-PPDs + +// needed to detect if a system is the same +dmidecode + +// decompression to recover something +xz +zip +unzip +unrar + +// file system stuff +xfsdump + -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-DVD new/patterns-openSUSE-data/data/REST-DVD --- old/patterns-openSUSE-data/data/REST-DVD 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-DVD 2009-05-05 10:42:16.000000000 +0200 @@ -9,15 +9,13 @@ // needed for kiwi creation squashfs -aufs -aufs-kmp-default -aufs-kmp-xen yast2-live-installer -cromfs + gfxboot-devel nbd nbd-doc kiwi-config-openSUSE +clicfs //# 306071 virtualbox-ose @@ -67,8 +65,6 @@ // kernel modules acx-kmp-default acx-kmp-xen -at76_usb-kmp-default -at76_usb-kmp-xen dazuko-kmp-default dazuko-kmp-xen drbd-kmp-default @@ -83,13 +79,11 @@ wlan-ng-kmp-xen quickcam-kmp-default kvm-kmp-default -// bnc#420039 - EEPC modules for 11.1 -atl2-kmp-default #if defined(__i386__) kqemu-kmp-pae -aufs-kmp-pae virtualbox-ose-kmp-pae +kvm-kmp-pae acx-kmp-pae at76_usb-kmp-pae dazuko-kmp-pae diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_dvd/requires new/patterns-openSUSE-data/toinstall/rest_dvd/requires --- old/patterns-openSUSE-data/toinstall/rest_dvd/requires 2009-04-22 10:05:41.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/rest_dvd/requires 2009-05-04 17:18:39.000000000 +0200 @@ -109,3 +109,4 @@ xgl yast2_basis yast2_install_wf +update_test ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gammu for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package gammu for openSUSE:Factory checked in at Tue May 5 18:06:15 CEST 2009. -------- --- gammu/gammu.changes 2009-03-18 15:50:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/gammu/gammu.changes 2009-05-05 12:21:26.000000000 +0200 @@ -1,0 +2,42 @@ +Tue May 5 12:20:17 CEST 2009 - prusnak(a)suse.cz + +- updated to 1.24.0 + * Better detect Bluetooth ports on Samsung (bug #862). + * Ignore security errors on AT init (needed for Huawei). + * LUID reading requires IrMC profile. + * Locations for GlobeTrotter 3G+ start at 0 (bug #847). + * More verbose logging of delivery reports (bug #824). + * Increase default DeliveryReportDelay (bug #824). + * Fixed handling of SMS locations (bug #853). + * PostgreSQL backend now supports IDs for RunOnReceive. + * RunOnReceive is started through shell not directly. + * Fixed reading of empty phonebook entries from Samsung (bug #809). + * Reread messages if CMGL shows them corrupted (bug #691). + * Added support for vNote files. + * Properly detect Nokia 6220 Classic (bug #840). + * Fix writing of phonebook on Motorola V8 (bug #827). + * Detect daemon on FreeBSD. + * Ignore charset errors on AT init as some phones might need PIN. + * Optionally use MT for phone phonebook for AT phones. + * Added support for quick dial numbers on AT phones. + * Fixed decoding of Samsung memory entries. + * Properly handle corrupted messages from Nokia phones (bug #811). + * Fix parsing of calls from Alcatel C701 (bug #831). + * Fixed handling of error states with -len and -autolen parameters. + * Fixed possible crash in DBI engine. + * PostgreSQL engine properly uses sequences instead of reinventing. + * MySQL engine properly uses auto increments instead of reinventing. + * Fix escaping of field name in PostgreSQL engine. + * Better SMSD files logging. + * Added testing of SMSD files engine. + * Increase timeout for AT settings SIM card SMS storage. + * Fixed date formatting in PostgreSQL SMSD service. + * Add option to install without documentation. + * Add -textutf8 option for TEXT sms. + * Fix crash when some lines in config are too long. + * Make smsdrc example better looking by removing obsolete docs. + * Make dku2 connection types work on Linux (alias to fbususb). + * Better calculation of signal percent. + * Fixed getting of memory status for some Nokias (bug #836). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gammu-1.23.1.tar.bz2 New: ---- gammu-1.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gammu.spec ++++++ --- /var/tmp/diff_new_pack.F19229/_old 2009-05-05 18:05:41.000000000 +0200 +++ /var/tmp/diff_new_pack.F19229/_new 2009-05-05 18:05:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gammu (Version 1.23.1) +# spec file for package gammu (Version 1.24.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gammu -Version: 1.23.1 +Version: 1.24.0 Release: 1 # Set to 0 to disable bluetooth support %if 0%{?opensuse_bs} && 0%{?sles_version} == 9 @@ -45,7 +45,7 @@ %define gammu_docdir %_docdir/%{name} %endif Summary: Mobile phone management utility -License: GPL v2 or later +License: GPL v2 only %if 0%{?suse_version} Group: Hardware/Mobile %else @@ -54,6 +54,7 @@ # Detect build requires, I really hate this crap # SUSE %if 0%{?suse_version} +%define dist_usb_libs libusb-1_0-devel %define dist_dbi_libs libdbi-devel libdbi-drivers-dbd-sqlite3 sqlite # 11.1 changed name of devel package for Bluetooth %if 0%{?suse_version} >= 1110 @@ -61,27 +62,16 @@ %else %define dist_bluez_libs bluez-libs >= 2.0 %endif -# 10.3 changed name of several packages -%if 0%{?suse_version} >= 1030 -%define dist_mysql_libs libmysqlclient-devel -%else -%define dist_mysql_libs mysql-devel -%endif %define dist_postgres_libs postgresql-devel %else # Mandriva %if 0%{?mandriva_version} +%define dist_usb_libs libusb-1_0-devel %define dist_dbi_libs libdbi-devel libdbi-drivers-dbd-sqlite3 sqlite3-tools # 64-bit Mandriva has 64 in package name %ifarch x86_64 %define mandriva_hack 64 %endif -# MySQL devel packages got rename in 2007 -%if 0%{?mandriva_version} > 2007 -%define dist_mysql_libs lib%{?mandriva_hack}mysql-devel -%else -%define dist_mysql_libs lib%{?mandriva_hack}mysql15-devel -%endif # Bluetooth things got renamed several times %if 0%{?mandriva_version} > 2007 %define dist_bluez_libs lib%{?mandriva_hack}bluez2 lib%{?mandriva_hack}bluez-devel @@ -101,18 +91,14 @@ %else # Fedora / Redhat / Centos %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -%define dist_dbi_libs libdbi-devel libdbi-drivers-dbd-sqlite3 sqlite -# MySQL devela package has different name since Fedora 8 and in all RHEL/Centos -%if 0%{?fedora_version} >= 8 || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} >= 8 || 0%{?rhel} -%define dist_mysql_libs mysql-devel -%else -%define dist_mysql_libs mysqlclient14-devel -%endif +%define dist_usb_libs libusb1-devel +%define dist_dbi_libs libdbi-devel libdbi-dbd-sqlite sqlite %define dist_bluez_libs bluez-libs >= 2.0 bluez-libs-devel >= 2.0 %define dist_postgres_libs postgresql-devel %else #Defaults for not know distributions -%define dist_mysql_libs libmysqlclient-devel +%define dist_usb_libs libusb1-devel +%define dist_dbi_libs libdbi-devel libdbi-dbd-sqlite sqlite %define dist_bluez_libs bluez-libs >= 2.0 bluez-libs-devel >= 2.0 %define dist_postgres_libs postgresql-devel %endif @@ -125,7 +111,7 @@ BuildRequires: %{dist_postgres_libs} %endif %if %mysql -BuildRequires: %{dist_mysql_libs} +BuildRequires: mysql-devel %endif %if %dbi BuildRequires: %{dist_dbi_libs} @@ -133,7 +119,7 @@ BuildRequires: python-devel BuildRequires: libcurl-devel %if %usb -BuildRequires: libusb-1_0-devel +BuildRequires: %{dist_usb_libs} %endif BuildRequires: cmake gettext pkgconfig Source: http://dl.cihar.com/gammu/releases/gammu-%{version}.tar.%{extension} @@ -168,33 +154,36 @@ Michal Cihar <michal(a)cihar.com> %package devel -License: GPL v2 or later +License: GPL v2 only Summary: Development files for Gammu %if 0%{?suse_version} Group: Development/Libraries/C and C++ %else Group: Development/Libraries/C and C++ %endif -AutoReqProv: on Requires: %{name} = %{version}-%{release} pkgconfig %description devel -Gammu can do such things with cellular phones as making data calls, -updating the address book, changing calendar and ToDo entries, sending -and receiving SMS messages, loading and getting ring tones and pictures -(different types of logos), synchronizing time, enabling NetMonitor, -managing WAP settings and bookmarks and much more. Functions depend on -the phone model. +Gammu is command line utility and library to work with mobile phones +from many vendors. Support for different models differs, but basic +functions should work with majority of them. Program can work with +contacts, messages (SMS, EMS and MMS), calendar, todos, filesystem, +integrated radio, camera, etc. It also supports daemon mode to send and +receive SMSes. -Currently supported phones are: +Currently supported phones include: -* Many Nokia phones. +* Many Nokia models. -* Alcatel BE5 (501/701), BF5 (715). +* Alcatel BE5 (501/701), BF5 (715), BH4 (535/735). -* Any AT capable phone (Siemens, Nokia, Alcatel, IPAQ,...). +* AT capable phones (Siemens, Nokia, Alcatel, IPAQ). + +* OBEX and IrMC capable phones (Sony-Ericsson, Motorola). + +* Symbian phones through gnapplet. -Another simmilar tool you might want to check is gnokii. +This package contain files needed for development. @@ -204,7 +193,7 @@ Michal Cihar <michal(a)cihar.com> %package -n python-gammu -License: GPL v2 or later +License: GPL v2 only Summary: Python module to communicate with mobile phones %if 0%{?suse_version} Group: Development/Libraries/Python @@ -284,6 +273,45 @@ rm -rf %buildroot %changelog +* Tue May 05 2009 prusnak(a)suse.cz +- updated to 1.24.0 + * Better detect Bluetooth ports on Samsung (bug #862). + * Ignore security errors on AT init (needed for Huawei). + * LUID reading requires IrMC profile. + * Locations for GlobeTrotter 3G+ start at 0 (bug #847). + * More verbose logging of delivery reports (bug #824). + * Increase default DeliveryReportDelay (bug #824). + * Fixed handling of SMS locations (bug #853). + * PostgreSQL backend now supports IDs for RunOnReceive. + * RunOnReceive is started through shell not directly. + * Fixed reading of empty phonebook entries from Samsung (bug #809). + * Reread messages if CMGL shows them corrupted (bug #691). + * Added support for vNote files. + * Properly detect Nokia 6220 Classic (bug #840). + * Fix writing of phonebook on Motorola V8 (bug #827). + * Detect daemon on FreeBSD. + * Ignore charset errors on AT init as some phones might need PIN. + * Optionally use MT for phone phonebook for AT phones. + * Added support for quick dial numbers on AT phones. + * Fixed decoding of Samsung memory entries. + * Properly handle corrupted messages from Nokia phones (bug #811). + * Fix parsing of calls from Alcatel C701 (bug #831). + * Fixed handling of error states with -len and -autolen parameters. + * Fixed possible crash in DBI engine. + * PostgreSQL engine properly uses sequences instead of reinventing. + * MySQL engine properly uses auto increments instead of reinventing. + * Fix escaping of field name in PostgreSQL engine. + * Better SMSD files logging. + * Added testing of SMSD files engine. + * Increase timeout for AT settings SIM card SMS storage. + * Fixed date formatting in PostgreSQL SMSD service. + * Add option to install without documentation. + * Add -textutf8 option for TEXT sms. + * Fix crash when some lines in config are too long. + * Make smsdrc example better looking by removing obsolete docs. + * Make dku2 connection types work on Linux (alias to fbususb). + * Better calculation of signal percent. + * Fixed getting of memory status for some Nokias (bug #836). * Wed Mar 18 2009 prusnak(a)suse.cz - updated to 1.23.1 * Documentation clarification. ++++++ gammu-1.23.1.tar.bz2 -> gammu-1.24.0.tar.bz2 ++++++ ++++ 274752 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 dmidecode for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package dmidecode for openSUSE:Factory checked in at Tue May 5 18:05:11 CEST 2009. -------- --- dmidecode/dmidecode.changes 2009-03-25 10:36:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/dmidecode/dmidecode.changes 2009-05-05 10:02:52.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 5 10:02:31 CEST 2009 - coolo(a)suse.de + +- obsolete pmtools, but do not provide it as it's not a rename + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmidecode.spec ++++++ --- /var/tmp/diff_new_pack.A15714/_old 2009-05-05 18:05:02.000000000 +0200 +++ /var/tmp/diff_new_pack.A15714/_new 2009-05-05 18:05:02.000000000 +0200 @@ -21,7 +21,7 @@ Name: dmidecode Url: http://www.nongnu.org/dmidecode/ Version: 2.10 -Release: 2 +Release: 3 License: GPL v2 or later Group: System/Console Provides: pmtools:/usr/sbin/dmidecode @@ -30,6 +30,7 @@ Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 +Obsoletes: pmtools < 20071117 %description Dmidecode reports information about your system's hardware as described @@ -79,6 +80,8 @@ /%{_mandir}/man8/* %changelog +* Tue May 05 2009 coolo(a)suse.de +- obsolete pmtools, but do not provide it as it's not a rename * Wed Mar 25 2009 jdelvare(a)suse.de - Initial packaging. Historically, dmidecode had been part of the pmtools package, but it didn't make that much sense so it now has ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 clicfs for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package clicfs for openSUSE:Factory checked in at Tue May 5 18:04:50 CEST 2009. -------- --- clicfs/clicfs.changes 2009-04-20 21:36:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/clicfs/clicfs.changes 2009-05-05 14:13:52.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 5 14:13:39 CEST 2009 - coolo(a)suse.de + +- if the cow file is read only, then just read it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clicfs.spec ++++++ --- /var/tmp/diff_new_pack.Q15012/_old 2009-05-05 18:04:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q15012/_new 2009-05-05 18:04:41.000000000 +0200 @@ -23,7 +23,7 @@ Requires: fuse Summary: Compressed Loop Image Container Version: 1.0 -Release: 3 +Release: 4 License: GPL v2 only Group: System/Filesystems Source: clicfs.tar.bz2 @@ -62,6 +62,8 @@ %_mandir/man1/* %changelog +* Tue May 05 2009 coolo(a)suse.de +- if the cow file is read only, then just read it * Mon Apr 20 2009 coolo(a)suse.de - fixing license * Mon Apr 20 2009 coolo(a)suse.de ++++++ clicfs.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/doc/clicfs.1 new/doc/clicfs.1 --- old/doc/clicfs.1 2009-04-20 20:31:33.000000000 +0200 +++ new/doc/clicfs.1 2009-05-05 14:13:03.000000000 +0200 @@ -182,7 +182,7 @@ The compressed content is actually read only (as with most compressed file systems), but if a write happens, the data is either stored in memory (with \-m) or written into a cowfile (with \-c)\&. The container is seen in the mount point as actually larger than the original file, so it can be resizes to match the memory available\&. .SH "See Also" .PP -mkclicfs, undoenerfs +mkclicfs, unclicfs .SH "Author" .PP Stephan Kulow diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/doc/man-mkclicfs.1.docbook new/doc/man-mkclicfs.1.docbook --- old/doc/man-mkclicfs.1.docbook 2009-04-20 20:31:33.000000000 +0200 +++ new/doc/man-mkclicfs.1.docbook 2009-05-05 14:13:03.000000000 +0200 @@ -44,6 +44,9 @@ <arg choice="opt"> <option>-l</option> <arg choice="plain">logfile</arg> </arg> +<arg choice="opt"> + <option>-n</option> <arg choice="plain">cores</arg> +</arg> <arg choice="plain">infile</arg> <arg choice="plain">outfile</arg> </cmdsynopsis> @@ -56,6 +59,7 @@ <para>The blocksize defines how many pages are grouped together before compression. The default is 32, it is a good balance between overhead and compression ratio.</para> <para>The compression preset defines on how slow it is or how good it compresses. Compare with xz presets. -c 0 is fast and -c 9 is (very) slow - but the compression rate varies a lot - of course depending on the data. Preset 6 is the default.</para> <para>The logfile is the logfile that is generated from clicfs -l, clicfs will output the access pattern and mkclicfs will reorder the blocks so they are in order.</para> +<para>The number of cores is by default taken from the system. Sometimes it's wise to not all of them though.</para> </refsect1> <refsect1> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/doc/mkclicfs.1 new/doc/mkclicfs.1 --- old/doc/mkclicfs.1 2009-04-20 20:31:33.000000000 +0200 +++ new/doc/mkclicfs.1 2009-05-05 14:13:03.000000000 +0200 @@ -171,18 +171,24 @@ .SH "Synopsis" .fam C .HP \w'\fBmkclicfs\fR\ 'u -\fBmkclicfs\fR [\fB\-d\fR] [\fB\-p\fR\ pagesize] [\fB\-b\fR\ blocksize] [\fB\-c\fR\ compression] [\fB\-l\fR\ logfile] infile outfile +\fBmkclicfs\fR [\fB\-d\fR] [\fB\-p\fR\ pagesize] [\fB\-b\fR\ blocksize] [\fB\-c\fR\ compression] [\fB\-l\fR\ logfile] [\fB\-n\fR\ cores] infile outfile .fam .SH "Description" .PP -The infile is a loop image (so far only tested with ext3) that is assumed to use 4K pages\&. The outfile is the Compressed Loop Image Container (Clic), it will contain X parts with blocksize\&. mkclicfs automatically discards duplicated pages\&. A good value for blocksize is 131072, it is a good balance between overhead and compression ratio and it will be default in future releases\&. +The infile is a loop image (so far only tested with ext3) that is assumed to use pages of pagesize\&. The outfile is the Compressed Loop Image Container (Clic), it will contain X parts with blocksize\&. mkclicfs automatically discards duplicated pages, unless \-d is given\&. .PP -The preset defines on how slow it is or how good it compresses\&. Compare with xz presets\&. \-0 is fast and \-9 is (very) slow \- but the compression rate varies a lot \- of course depending on the data\&. Preset 6 is the default\&. +The default for the pagesize is 4096, the default for ext3 .PP -The profile is the logfile that is generated from clicfs \-l, clicfs will output the access pattern and mkclicfs will reorder the blocks so they are in order\&. +The blocksize defines how many pages are grouped together before compression\&. The default is 32, it is a good balance between overhead and compression ratio\&. +.PP +The compression preset defines on how slow it is or how good it compresses\&. Compare with xz presets\&. \-c 0 is fast and \-c 9 is (very) slow \- but the compression rate varies a lot \- of course depending on the data\&. Preset 6 is the default\&. +.PP +The logfile is the logfile that is generated from clicfs \-l, clicfs will output the access pattern and mkclicfs will reorder the blocks so they are in order\&. +.PP +The number of cores is by default taken from the system\&. Sometimes it\'s wise to not all of them though\&. .SH "See Also" .PP -clicfs, undoenerfs +clicfs, unclicfs .SH "Author" .PP Stephan Kulow diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/doc/unclicfs.1 new/doc/unclicfs.1 --- old/doc/unclicfs.1 2009-04-20 20:31:33.000000000 +0200 +++ new/doc/unclicfs.1 2009-05-05 14:13:03.000000000 +0200 @@ -178,7 +178,7 @@ Unclicfs will extract the original file into the current directory\&. It\'s name was given to mkclicfs as input file\&. .SH "See Also" .PP -mkclicfs, undoenerfs +mkclicfs, clicfs .SH "Author" .PP Stephan Kulow diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/clicfs.c new/src/clicfs.c --- old/src/clicfs.c 2009-04-20 20:31:33.000000000 +0200 +++ new/src/clicfs.c 2009-05-05 14:13:03.000000000 +0200 @@ -50,7 +50,7 @@ static int clic_write_cow() { - if (!cowfilename) + if (!cowfilename || cowfile_ro == 1) return 0; uint32_t indexlen = sizeof(uint32_t) * 2; @@ -530,8 +530,12 @@ free(packfilename); if (cowfilename) { - if (access(cowfilename, W_OK)) { + if (access(cowfilename, R_OK)) { FILE *cow = fopen(cowfilename, "w"); + if (!cow) { + perror("opening cow"); + return 1; + } uint32_t stringlen = (thefilesize / pagesize * pagesize) + 512 * 1024 * 1024; fwrite((char*)&stringlen, 1, sizeof(uint32_t), cow); stringlen = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/clicfs_common.c new/src/clicfs_common.c --- old/src/clicfs_common.c 2009-04-20 20:31:33.000000000 +0200 +++ new/src/clicfs_common.c 2009-05-05 14:13:03.000000000 +0200 @@ -44,6 +44,7 @@ uint32_t cow_pages = 0; uint32_t *cows = 0; unsigned int cows_index = 0; +int cowfile_ro = 0; static lzma_stream strm; @@ -68,10 +69,18 @@ int clicfs_read_cow(const char *cowfilename) { cowfilefd = open(cowfilename, O_RDWR); + if (cowfilefd == -1 ) { - fprintf(stderr, "cowfile %s can't be opened\n", cowfilename); - return 1; - } + + cowfilefd = open(cowfilename, O_RDONLY); + if (cowfilefd == -1) { + fprintf(stderr, "cowfile %s can't be opened\n", cowfilename); + return 1; + } else { + cowfile_ro = 1; + } + } else + cowfile_ro = 0; struct stat st; fstat(cowfilefd, &st); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/clicfs.h new/src/clicfs.h --- old/src/clicfs.h 2009-04-20 20:31:33.000000000 +0200 +++ new/src/clicfs.h 2009-05-05 14:13:03.000000000 +0200 @@ -39,6 +39,8 @@ extern uint32_t num_pages; // the number of pages in the cow index extern uint32_t cow_pages; +// support temporary changes on ro medium +extern int cowfile_ro; #define DOENER_COW_COUNT 100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/src/mkclicfs.cpp new/src/mkclicfs.cpp --- old/src/mkclicfs.cpp 2009-04-20 20:31:33.000000000 +0200 +++ new/src/mkclicfs.cpp 2009-05-05 14:13:03.000000000 +0200 @@ -30,6 +30,11 @@ #include <lzma.h> #include <limits.h> #include <fcntl.h> +#include <sys/sysinfo.h> +#include <signal.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <pthread.h> #include <openssl/md5.h> #include <map> @@ -85,17 +90,345 @@ return strm.total_out; } +int blocksize = 32; +int infd = -1; +uint32_t *ublocks = 0; +uint32_t *found = 0; +bool check_dups = true; +uint32_t *blockindex = 0; +uint32_t num_pages = 0; +size_t pagesize = 4096; +uint32_t pindex = 0; +int preset = 2; + +/* most of this logic is from mksquashfs - GPLv2+ */ + +/* struct describing queues used to pass data between threads */ +struct queue { + int size; + int readp; + int writep; + pthread_mutex_t mutex; + pthread_cond_t empty; + pthread_cond_t full; + void **data; +}; + +static struct queue *from_reader, *to_writer; +static pthread_t *thread; + +static int processors = -1; + +struct queue *queue_init(int size) +{ + struct queue *queue = (struct queue*)malloc(sizeof(struct queue)); + + if(queue == NULL) + return NULL; + + if((queue->data = (void**)malloc(sizeof(void *) * (size + 1))) == NULL) { + free(queue); + return NULL; + } + + queue->size = size + 1; + queue->readp = queue->writep = 0; + pthread_mutex_init(&queue->mutex, NULL); + pthread_cond_init(&queue->empty, NULL); + pthread_cond_init(&queue->full, NULL); + + return queue; +} + +int queue_length(struct queue *queue) +{ + pthread_mutex_lock(&queue->mutex); + int ret = (queue->writep - queue->readp + queue->size) % queue->size; + pthread_mutex_unlock(&queue->mutex); + return ret; +} + +void queue_put(struct queue *queue, void *data) +{ + int nextp; + + pthread_mutex_lock(&queue->mutex); + + while((nextp = (queue->writep + 1) % queue->size) == queue->readp) + pthread_cond_wait(&queue->full, &queue->mutex); + + queue->data[queue->writep] = data; + queue->writep = nextp; + pthread_cond_signal(&queue->empty); + pthread_mutex_unlock(&queue->mutex); +} + + +void *queue_get(struct queue *queue) +{ + void *data; + pthread_mutex_lock(&queue->mutex); + + while(queue->readp == queue->writep) + pthread_cond_wait(&queue->empty, &queue->mutex); + + data = queue->data[queue->readp]; + queue->readp = (queue->readp + 1) % queue->size; + pthread_cond_signal(&queue->full); + pthread_mutex_unlock(&queue->mutex); + + return data; +} + +// the number of really saved parts +uint32_t parts = 0; + +struct inbuf_struct { + size_t readin, totalin; + unsigned char *inbuf; + size_t part, bpp; + bool lastblock; +}; + + +void *reader(void *arg) +{ + int oldstate; + + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate); + pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldstate); + + uint32_t rindex = 0; // overall index + uint32_t uindex = 0; // index for "unused" blocks + + std::map<std::string,uint32_t> dups; + + uint32_t currentblocksperpart = 0; // for debug output + + uint32_t usedblock = 0; // overall "mapped" index + + while ( rindex < num_pages ) { + + int currentblocks = 0; + + inbuf_struct *in = new inbuf_struct(); + in->inbuf = new unsigned char[blocksize*pagesize]; + in->readin = 0; + in->totalin = 0; + in->lastblock = false; + + while ( currentblocks < blocksize ) { + off_t cindex = 0; + if (rindex < pindex) { + cindex = ublocks[rindex]; + } else { + while (found[uindex] && uindex < num_pages) uindex++; + assert( uindex < num_pages ); + if ( uindex < num_pages ) { + cindex = uindex; + uindex++; + } + } + if ( lseek( infd, cindex * pagesize, SEEK_SET) == -1 ) { + perror( "seek" ); exit( 1 ); + } + size_t diff= read( infd, in->inbuf + in->readin, pagesize); + in->totalin += diff; + std::string sm; + if (check_dups) + sm = calc_md5( in->inbuf + in->readin, diff ); + //fprintf( stderr, "block %ld %s\n", ( long )cindex, sm.c_str() ); + if ( check_dups && dups.find( sm ) != dups.end() ) { + //fprintf( stderr, "already have %s\n", sm.c_str() ); + blockindex[cindex] = dups[sm]; + } else { + blockindex[cindex] = usedblock++; + dups[sm] = blockindex[cindex]; + in->readin += diff; + currentblocks++; + } + //fprintf(stderr, "block %ld in part %ld\n", cindex, parts); + rindex++; + currentblocksperpart++; + if ( rindex == num_pages ) { + in->lastblock = true; + break; + } + } + in->part = parts++; + in->bpp = currentblocksperpart; + currentblocksperpart = 0; + //fprintf( stderr, "put part %d %d\n", in->part, queue_length(from_reader)); + queue_put( from_reader, in ); + + } + fprintf( stderr, "thread 0 is gone\n" ); + + thread[0] = 0; + + pthread_exit(NULL); +} + + +struct outbuf_struct +{ + unsigned char *outbuf; + size_t insize, outsize, totalin; + size_t part, bpp; + bool lastblock; + + ~outbuf_struct() { + delete [] outbuf; + } +}; + +void *deflator(void *arg) +{ + int oldstate; + + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate); + pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldstate); + + while(1) { + inbuf_struct *in = (inbuf_struct*)queue_get(from_reader); + + outbuf_struct *out = new outbuf_struct(); + out->outbuf = new unsigned char[blocksize*pagesize + 300]; +// fprintf( stderr, "compress start %ld %d %x %ld\n", pthread_self(), in->part, in->inbuf, in->readin ); + out->outsize = compress(preset, in->inbuf, in->readin, out->outbuf, blocksize*pagesize + 300); + out->part = in->part; + out->insize = in->readin; + out->bpp = in->bpp; + out->lastblock = in->lastblock; + out->totalin = in->totalin; + +// fprintf( stderr, "compress %ld %d %x %ld -> %ld\n", pthread_self(), in->part, in->inbuf, in->readin, out->outsize ); + delete [] in->inbuf; + delete in; + + queue_put(to_writer, out); + } + + return 0; +} + +void initialise_threads() +{ + int i; + sigset_t sigmask, old_mask; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGINT); + sigaddset(&sigmask, SIGQUIT); + if(sigprocmask(SIG_BLOCK, &sigmask, &old_mask) == -1) + exit( 1 ); + + if(processors == -1) { +#ifndef linux + int mib[2]; + size_t len = sizeof(processors); + + mib[0] = CTL_HW; +#ifdef HW_AVAILCPU + mib[1] = HW_AVAILCPU; +#else + mib[1] = HW_NCPU; +#endif + + if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) { + ERROR("Failed to get number of available processors. Defaulting to 1\n"); + processors = 1; + } +#else + processors = get_nprocs(); +#endif + } + + if((thread = (pthread_t*)malloc((2 + processors * 2) * sizeof(pthread_t))) == NULL) + exit( 1 ); + + from_reader = queue_init(20); + to_writer = queue_init(20); + pthread_create(&thread[0], NULL, reader, NULL); + + for(i = 0; i < processors; i++) { + if(pthread_create(&thread[2+i], NULL, deflator, NULL) != 0 ) + exit( 1 ); + } + + fprintf(stderr, "Parallel mkclicfs: Using %d processor%s\n", processors, + processors == 1 ? "" : "s"); + + if(sigprocmask(SIG_SETMASK, &old_mask, NULL) == -1) + exit( 1 ); +} + +int writer(size_t oparts, off_t index_off, FILE *out, uint64_t *sizes, uint64_t *offs, size_t full_size) +{ + int oldstate; + + uint64_t total_in = 0; + uint64_t total_out = 0; + + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate); + pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldstate); + + outbuf_struct **comps = new outbuf_struct*[oparts]; + memset( comps, 0, sizeof( void* )*oparts ); + size_t lastpart = -1; + + int lastpercentage = 0; + + struct timeval start; + gettimeofday(&start, 0); + + while(1) { + outbuf_struct *comp = (outbuf_struct*)queue_get(to_writer); + //fprintf(stderr, "got %ld %ld %d %d\n", comp->part, lastpart, queue_length(to_writer), queue_length(from_reader)); + comps[comp->part] = comp; + + while ( comps[lastpart + 1] ) { + comp = comps[++lastpart]; + + sizes[comp->part] = comp->outsize; + offs[comp->part] = total_out + index_off; + total_in += comp->totalin; + total_out += comp->outsize; + if (fwrite(comp->outbuf, comp->outsize, 1, out) != 1) { + perror("write"); return 1; + } + + if ((int)(100 * total_in / full_size) > lastpercentage || comp->lastblock ) { + struct timeval current; + gettimeofday(&current, 0); + fprintf(stderr, "part blocks:%d%% parts:%ld total:%d%% time:%d\n", + lastpercentage+1, (long)comp->part, + (int)(total_out * 100 / total_in), (current.tv_sec - start.tv_sec) * 1000 + ((current.tv_usec - start.tv_usec) / 1000 )); + start.tv_sec = current.tv_sec; + start.tv_usec = current.tv_usec; + lastpercentage++; + } + + if ( comp->lastblock ) { + delete comp; + goto out; + } + comps[comp->part] = 0; + delete comp; + } + } +out: + delete [] comps; + return 0; +} + int main(int argc, char **argv) { - bool check_dups = true; - int blocksize = 32; - int pagesize = 4096; const char *profile = 0; - int preset = 2; bool usage = false; int opt; - while ((opt = getopt(argc, argv, "dp:b:l:c:")) != -1) { + while ((opt = getopt(argc, argv, "dp:b:l:c:n:")) != -1) { switch (opt) { case 'd': check_dups = false; @@ -118,6 +451,11 @@ if (preset < 0 || preset > 9) usage = true; break; + case 'n': + processors = atoi(optarg); + if (processors < 1) + usage = true; + break; default: /* '?' */ usage = true; break; @@ -136,7 +474,7 @@ struct stat st; stat(infile, &st); - uint32_t num_pages = st.st_size / pagesize; + num_pages = st.st_size / pagesize; /* ext3 should be X blocks */ if (num_pages * pagesize != st.st_size) num_pages++; @@ -146,12 +484,11 @@ if (oparts * blocksize != num_pages) oparts++; - uint32_t *found = ( uint32_t* )malloc(sizeof(uint32_t)*num_pages); + found = ( uint32_t* )malloc(sizeof(uint32_t)*num_pages); memset(found, 0, sizeof(int)*num_pages); - uint32_t *ublocks = ( uint32_t* )malloc(sizeof(uint32_t)*num_pages); + ublocks = ( uint32_t* )malloc(sizeof(uint32_t)*num_pages); memset(ublocks, 0, sizeof(int)*num_pages); - uint32_t pindex = 0; // always take the first block to make the algorithm easier ublocks[pindex++] = 0; found[0] = pindex; @@ -178,24 +515,17 @@ fprintf(stderr, "pindex %ld %ld\n", (long)pindex, (long)num_pages); - int infd = open(infile, O_RDONLY); + infd = open(infile, O_RDONLY); FILE *out = fopen(outfile, "w"); if (!out) { perror("open output"); return 1; } - unsigned char inbuf[blocksize*pagesize]; - unsigned char outbuf[blocksize*pagesize + 300]; - - uint64_t total_in = 0; - uint64_t total_out = 0; - uint64_t *sizes = ( uint64_t* )malloc(sizeof(uint64_t)*oparts); uint64_t *offs = ( uint64_t* )malloc(sizeof(uint64_t)*oparts); off_t index_off = 6; - int lastpercentage = 0; assert( DOENER_MAGIC < 100 ); fprintf(out, "CLIC%02d", DOENER_MAGIC ); @@ -226,91 +556,22 @@ off_t index_blocks = index_off; index_off += num_pages * sizeof( uint32_t ); - uint32_t *blockmap = new uint32_t[num_pages]; + blockindex = new uint32_t[num_pages]; off_t index_part = index_off; index_off += 2 * oparts * sizeof(uint64_t) + sizeof(uint32_t); fseek(out, index_off, SEEK_SET); - uint32_t rindex = 0; // overall index - uint32_t uindex = 0; // index for "unused" blocks - - std::map<std::string,uint32_t> dups; - - // the number of really saved parts - uint32_t parts = 0; - uint32_t currentblocksperpart = 0; // for debug output - uint32_t lastparts = 0; // for debug output - - uint32_t usedblock = 0; // overall "mapped" index - - while ( rindex < num_pages ) - { - int currentblocks = 0; - size_t readin = 0; - - while ( currentblocks < blocksize ) - { - off_t cindex = 0; - if (rindex < pindex) { - cindex = ublocks[rindex]; - } else { - while (found[uindex] && uindex < num_pages) uindex++; - assert( uindex < num_pages ); - if ( uindex < num_pages ) { - cindex = uindex; - uindex++; - } - } - if ( lseek( infd, cindex * pagesize, SEEK_SET) == -1 ) { - perror( "seek" ); return 1; - } - size_t diff= read( infd, inbuf+readin, pagesize); - std::string sm; - if (check_dups) - sm = calc_md5( inbuf+readin, diff ); - if ( check_dups && dups.find( sm ) != dups.end() ) { - //fprintf( stderr, "already have %s\n", sm.c_str() ); - blockmap[cindex] = dups[sm]; - } else { - blockmap[cindex] = usedblock++; - dups[sm] = blockmap[cindex]; - readin += diff; - currentblocks++; - } - //fprintf(stderr, "block %ld in part %ld\n", cindex, parts); - rindex++; - currentblocksperpart++; - if ( rindex == num_pages ) - break; - } - size_t outsize = compress(preset, inbuf, readin, outbuf, blocksize*pagesize + 300); - sizes[parts] = outsize; - offs[parts] = total_out + index_off; - total_in += readin; - total_out += outsize; - if (fwrite(outbuf, outsize, 1, out) != 1) { - perror("write"); return 1; - } - - parts++; - if ((int)(rindex * 100. / num_pages) > lastpercentage || rindex >= num_pages - 1 && parts > lastparts && readin ) { - fprintf(stderr, "part blocks:%d%% parts:%ld bpp:%d current:%d%% total:%d%%\n", - (int)(rindex * 100. / num_pages), (long)parts, - (int)( currentblocksperpart / ( parts - lastparts ) ), - (int)(outsize * 100 / readin), (int)(total_out * 100 / total_in)); - lastpercentage++; - lastparts = parts; - currentblocksperpart = 0; - } - } + initialise_threads(); + if ( writer(oparts, index_off, out, sizes, offs, st.st_size) ) + return 1; if (fseek(out, index_blocks, SEEK_SET) < 0) { perror("seek"); return 1; } for (i = 0; i < num_pages; ++i) - if (!writeindex(out, blockmap[i])) + if (!writeindex(out, blockindex[i])) return 1; if (fseek(out, index_part, SEEK_SET) < 0) { @@ -330,7 +591,9 @@ fclose(out); close( infd ); - delete [] blockmap; + delete [] blockindex; + free(offs); + free(sizes); return 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 CASA for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package CASA for openSUSE:Factory checked in at Tue May 5 02:03:18 CEST 2009. -------- --- CASA/CASA.changes 2008-12-10 13:38:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/CASA/CASA.changes 2009-05-05 02:03:00.219789000 +0200 @@ -1,0 +2,5 @@ +Wed Feb 18 08:49:01 MST 2009 - jnorman(a)novell.com + +- bnc#458146. Add call to initialize Mono Crypto library during startup + +------------------------------------------------------------------- @@ -12,0 +18,5 @@ +Wed Oct 15 14:51:32 MDT 2008 - jnorman(a)novell.com + +- bnc#407409. Account for a filehandles equal to 0. + +------------------------------------------------------------------- @@ -18,0 +29,5 @@ +Tue Aug 26 14:32:58 MDT 2008 - cgardner(a)novell.com + +- Revert startup of micasa to "/usr/bin/micasad-init /usr/bin/micasad.exe" + +------------------------------------------------------------------- @@ -21 +36 @@ -- Disable debug build since a fix for bug #36127 checked in +- Disable debug build since a fix for bnc#362127 checked in @@ -31 +46 @@ -- Enable debug build to try to find a fix for bug #362127 +- Enable debug build to try to find a fix for bnc#362127 @@ -979,0 +995 @@ + calling whatdependson for head-i586 Old: ---- baselibs.conf CASA-1.7.1582.tar.bz2 New: ---- CASA-1.7.1592.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CASA.spec ++++++ --- /var/tmp/diff_new_pack.M12330/_old 2009-05-05 02:03:12.000000000 +0200 +++ /var/tmp/diff_new_pack.M12330/_new 2009-05-05 02:03:12.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package CASA (Version 1.7.1582 ) +# spec file for package CASA (Version 1.7.1592) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,8 +34,8 @@ %endif # %define bldno 1.1.1 -Version: 1.7.1582 -Release: 15 +Version: 1.7.1592 +Release: 3 Summary: Novell Common Authentication Service Adapter (CASA) Source: %{name}-%{version}.tar.bz2 #Patch: %{name}-%{version}.diff @@ -309,20 +309,26 @@ %{prefix}/CASA/help/en/* %changelog +* Wed Feb 18 2009 jnorman(a)novell.com +- bnc#458146. Add call to initialize Mono Crypto library during startup * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) * Thu Oct 30 2008 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) +* Wed Oct 15 2008 jnorman(a)novell.com +- bnc#407409. Account for a filehandles equal to 0. * Thu Aug 28 2008 ro(a)suse.de - drop novell-filesystem from buildreqs (not in factory/stable) - add /etc/opt/novell directory to filelist instead +* Tue Aug 26 2008 cgardner(a)novell.com +- Revert startup of micasa to "/usr/bin/micasad-init /usr/bin/micasad.exe" * Tue Aug 26 2008 schoi(a)novell.com -- Disable debug build since a fix for bug #36127 checked in +- Disable debug build since a fix for bnc#362127 checked in * Mon Aug 25 2008 jnorman(a)novell.com - Bug 362127. Increase retry/timeout before returning an error. -* Thu Aug 21 2008 cgardner(a)novell.com -- Enable debug build to try to find a fix for bug #362127 +* Wed Aug 20 2008 cgardner(a)novell.com +- Enable debug build to try to find a fix for bnc#362127 * Tue Jul 15 2008 jnorman(a)novell.com - Bug 409364. Fixed RemoveKey.cs to extract proper LUID Affects windows only. @@ -362,7 +368,7 @@ - Bug 265898. Added option to remove all secrets to cli * Thu May 17 2007 jnorman(a)novell.com - Bug 265898. Fix makefile to build cli -* Thu May 17 2007 jnorman(a)novell.com +* Wed May 16 2007 jnorman(a)novell.com - Bug 265898. Replace mono based cli with native based one. This was needed to support changing the UID * Fri May 11 2007 jnorman(a)novell.com @@ -379,7 +385,7 @@ when setting the value of a key. * Tue May 01 2007 jnorman(a)novell.com - Bug 265898. Rename CASAUtil to CASAcli per Baber's request -* Tue May 01 2007 jnorman(a)novell.com +* Mon Apr 30 2007 jnorman(a)novell.com - Bug 265898. Seperate CLI into it's own rpm for cypress. CASAUtil is no longer in the base CASA rpm. * Wed Apr 18 2007 jnorman(a)novell.com @@ -457,7 +463,7 @@ - Bug 231331. Change the includes on jmicasa.c * Tue Jan 02 2007 jnorman(a)novell.com - Bug 231331. Pass correct parameter from JNI to native code. -* Wed Dec 06 2006 cmashayekhi(a)novell.com +* Tue Dec 05 2006 cmashayekhi(a)novell.com - Bug 222012 scripts in micasad directory were modified to recognize the desktop to modify pam stack. On servers we skip this step. * Tue Nov 21 2006 schoi(a)novell.com @@ -516,10 +522,10 @@ - Fixed dependency cycle between CASA <-> gnome-keyring. - Bug 176736. Fixed micasad startup/shutdown process to clean up open files on shutdown and upgrade. -* Fri May 12 2006 jnorman(a)novell.com +* Thu May 11 2006 jnorman(a)novell.com - Bug 174093. Set our process name to CASAManager so gnome-keyring knows who we are. -* Mon May 08 2006 jnorman(a)novell.com +* Sun May 07 2006 jnorman(a)novell.com - Bug 169353. Prompt user for Desktop Password when Master Password is not present. * Thu May 04 2006 smanojna(a)novell.com @@ -685,7 +691,7 @@ yast2 install. * Mon Apr 24 2006 jnorman(a)novell.com - change lookup name from kwallet_rw to casakwallet -* Sun Apr 23 2006 cmashayekhi(a)novell.com +* Sat Apr 22 2006 cmashayekhi(a)novell.com - installcasa and uninstallcasa scripts were added to c_micasad/startup to accomodate for yast configuration. - casacfg and casaucfg were updated for yast configuration. @@ -751,27 +757,27 @@ - Added a check to verify Decrypt string is greater than 32. * Wed Mar 22 2006 schwab(a)suse.de - Fix broken makefiles. -* Wed Mar 15 2006 lsreevatsa(a)novell.com +* Tue Mar 14 2006 lsreevatsa(a)novell.com - Added Modify and Delete functionalities for Firefox Password Manager Secrets into CASAManager. * Tue Mar 14 2006 jnorman(a)novell.com - Bug 155529. Detect whether or not Firefox is installed -* Thu Mar 09 2006 smanojna(a)novell.com +* Wed Mar 08 2006 smanojna(a)novell.com - Added a delete-event-handler for the Firefox master password prompt dialog. - A minor fix to make CASAManager always write to the default wallet. - Removed console debug print messages from GK and FF code. -* Wed Mar 08 2006 lsreevatsa(a)novell.com +* Tue Mar 07 2006 lsreevatsa(a)novell.com -Fix for Bug [154548]: CASAManager does not display Firefox Secrets if started before Firefox has been used. -Fix for Bug [155529] : Support for IsFirefoxStoreAvailable. -* Wed Mar 08 2006 smanojna(a)novell.com +* Tue Mar 07 2006 smanojna(a)novell.com - Added Firefox MasterPassword prompt into CASAManager. CASAManager will now prompt for master password during aggregating the Firefox password manager if it is locked with a master password. -* Tue Mar 07 2006 lsreevatsa(a)novell.com +* Mon Mar 06 2006 lsreevatsa(a)novell.com - Changed the GetDefaultWallet() function to address all scenarios. -* Tue Mar 07 2006 smanojna(a)novell.com +* Mon Mar 06 2006 smanojna(a)novell.com - Added Application SSO feature to CASAManager (Linux). We will be able to add single sign-on information to Konquerer and NetworkManager appilcations from within CASAManager. @@ -782,7 +788,7 @@ - Fix for writing secrets into the default Wallet instead of writing into CASAWallet. - Changed the port attribute in Keyring from string to unit32. -* Mon Mar 06 2006 mmanohar(a)novell.com +* Sun Mar 05 2006 mmanohar(a)novell.com -Fix for BUG154514 - I am seeing sporadic GUI crashes on Linux -Fix for Bug 154547 -build 367 - SECURITY - Secrets in Firefox Password manager are being written to the console @@ -792,18 +798,18 @@ - CASA.spec was modified to put the CASAManager.sh in /usr/bin. - CASAManager.desktop was modified to point to CASAManager.sh in /usr/bin. - CASA.spec and CASA_dbg.spec were synced up. -* Wed Mar 01 2006 mmanohar(a)novell.com +* Tue Feb 28 2006 mmanohar(a)novell.com -CASA Spec files changed for installation of FireFox components via RPMs - Console messages removed from GUI-SDI and AD-Lib -* Tue Feb 28 2006 jnorman(a)novell.com +* Mon Feb 27 2006 jnorman(a)novell.com - Bug 147031. Change CASA.desktop to find CASAManager in /usr/sbin -* Tue Feb 28 2006 mmanohar(a)novell.com +* Mon Feb 27 2006 mmanohar(a)novell.com - FireFox View functionality integrated with CASA -* Mon Feb 27 2006 asuraj(a)novell.com +* Sun Feb 26 2006 asuraj(a)novell.com - Bug 141823. CASAManager will not display KDE Wallet Secrets unless kwalletmanager is open - fixed by starting kdeinit in code -* Thu Feb 23 2006 cmashayekhi(a)novell.com +* Wed Feb 22 2006 cmashayekhi(a)novell.com - CASA.spec was modified to put the scripts in /usr/sbin. - A link as rcmicasad was created fro /usr/sbin to /etc/init.d/micasad - force-reload and reload tags were added to the micasad script. @@ -813,7 +819,7 @@ - Bug 150642. Return additional error codes when store is locked * Wed Feb 22 2006 jnorman(a)novell.com - Remove build dependency on krb5-devel and libgssapi -* Wed Feb 22 2006 jnorman(a)novell.com +* Tue Feb 21 2006 jnorman(a)novell.com - Bug 141689. Windows: change mouse handler for notifyicon to mouse down event. - Bug: Windows, start service at post install. @@ -822,7 +828,7 @@ * Tue Feb 21 2006 jnorman(a)novell.com - Bug 148945. Handle the case were micasad is restarted, before a user sets their master password -* Mon Feb 20 2006 smanojna(a)novell.com +* Sun Feb 19 2006 smanojna(a)novell.com - Bug 147031: CASAManager main menu icon is placed only in... - System > Configuration > Novell CASA Manager * Sun Feb 19 2006 ro(a)suse.de @@ -834,9 +840,9 @@ - CASA.spec and CASA_dbg.spec were synched. * Fri Feb 17 2006 jnorman(a)novell.com - Bug 135386: Linking secrets with colon in the name - FIXED -* Fri Feb 17 2006 cmashayekhi(a)novell.com +* Thu Feb 16 2006 cmashayekhi(a)novell.com - Spec file was correct to eliminate the neededforbuild directive -* Fri Feb 17 2006 smanojna(a)novell.com +* Thu Feb 16 2006 smanojna(a)novell.com - Bug 147031: CASAManager should have a menu item - FIXED, A menu item for CASAManager gets created within the NLD/SuSE main menu under the following categories, @@ -845,13 +851,13 @@ - Internet > Administration > Novell CASA Manager * Thu Feb 16 2006 jnorman(a)novell.com - Add dependency to kdelibs3 back to CASA-gui rpm in spec file -* Thu Feb 16 2006 smanojna(a)novell.com +* Wed Feb 15 2006 smanojna(a)novell.com - Bug 146015: A CASAkeyring is created to add secrets to the Gnome Keyring through CASAManager - FIXED. * Wed Feb 15 2006 cmashayekhi(a)novell.com - Bug 143940. pam_sscs.c patch for the buffer overflow applied to version 1.5. -* Wed Feb 15 2006 jnorman(a)novell.com +* Tue Feb 14 2006 jnorman(a)novell.com - Bug 150975. Enable GNOME Keyring when gnome-keyring.so is loaded * Tue Feb 14 2006 jnorman(a)novell.com - Bug 150644. Prevent removal of secrets when store is locked. @@ -862,9 +868,9 @@ - CASA.spec was fixed to not try to create duplicate dirs * Tue Feb 14 2006 meissner(a)suse.de - Fixed the broken %%post and %%preun logic, added prerequires. -* Tue Feb 14 2006 ro(a)suse.de +* Mon Feb 13 2006 ro(a)suse.de - comment out filesystem dirs from filelist -* Tue Feb 14 2006 smanojna(a)novell.com +* Mon Feb 13 2006 smanojna(a)novell.com - Bug 133386: Remove install time dependency on keyring and kdewallet. - Bug 148102: CASA-gui requires kdelibs3. @@ -877,9 +883,9 @@ - disabled CASA by default again. #147934 - fixed file lists - actually builds on all Mono supporting platforms now. -* Thu Feb 09 2006 mls(a)suse.de +* Wed Feb 08 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Feb 09 2006 cmashayekhi(a)novell.com +* Wed Feb 08 2006 cmashayekhi(a)novell.com - startup and shutdown script was modified to not edit pam files. - script to modify pam files for install, upgradeand @@ -904,14 +910,14 @@ gtk libs and mono. * Mon Jan 30 2006 ro(a)suse.de - replaced java2 by java2-devel-packages in BuildRequires -* Sun Jan 29 2006 jnorman(a)novell.com +* Sat Jan 28 2006 jnorman(a)novell.com - Bug 143878. Handle more than 100 secrets in GUI. -* Sun Jan 29 2006 jnorman(a)novell.com +* Sat Jan 28 2006 jnorman(a)novell.com - Bug 146025. Prevent CASA manager from launch if MasterPassword login dialog is closed. * Sat Jan 28 2006 jnorman(a)novell.com - Bug 143859. Fix linking keys problem. -* Fri Jan 27 2006 mls(a)suse.de +* Thu Jan 26 2006 mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 25 2006 jnorman(a)novell.com - Bug 142183. Do not add GKPassword to gnome-keyring @@ -923,11 +929,11 @@ - converted neededforbuild to BuildRequires * Wed Jan 25 2006 cmashayekhi(a)novell.com - Rolled Ruediger Ortel changes into micasad. -* Tue Jan 24 2006 gekker(a)suse.de +* Mon Jan 23 2006 gekker(a)suse.de - fixup nfb for new gtk-sharp packaging * Mon Jan 23 2006 ro(a)suse.de - add (empty) rest of LSB script header -* Sun Jan 22 2006 jnorman(a)novell.com +* Sat Jan 21 2006 jnorman(a)novell.com - Bug 143837. Add description to micasad service for windows * Fri Jan 20 2006 jnorman(a)novell.com - Attempt unlocking all gnome-keyrings at login time. @@ -938,33 +944,33 @@ - Bug 143846. Suppress current key from being linked to itself. * Thu Jan 19 2006 jnorman(a)novell.com - Bug 142939. Keep 'New Key' menu item active. -* Thu Jan 19 2006 jnorman(a)novell.com +* Wed Jan 18 2006 jnorman(a)novell.com - Bug 143891. Sort SecretIDs on Link dialog. * Fri Jan 13 2006 jnorman(a)novell.com - Bug 142937. Activate 'New' menu option after unlock. * Fri Jan 13 2006 cmashayekhi(a)novell.com - Upon recieving a fix from ximian the change below was undone. -* Thu Jan 12 2006 jnorman(a)novell.com +* Wed Jan 11 2006 jnorman(a)novell.com - Revert Mono.Unix.PeerCred back to Mono.Posix.PeerCred to run on MONO 1.1.13 -* Wed Jan 11 2006 smanojna(a)novell.com +* Tue Jan 10 2006 smanojna(a)novell.com - Bug 142091: Inconsistency with naming in the GUI - FIXED. String "MiCasa" changed to "miCASA" in the Link Keys dialog. * Tue Jan 10 2006 jnorman(a)novell.com - Changed dependency to MONO 1.1.13 -* Tue Jan 10 2006 jnorman(a)novell.com +* Mon Jan 09 2006 jnorman(a)novell.com - Change Mono.Unix to Mono.Unix.Native. Move from Mono.Posix to Mono.Unix -* Tue Jan 10 2006 smanojna(a)novell.com +* Mon Jan 09 2006 smanojna(a)novell.com - Bug 142091: Inconsistency with naming in the GUI - FIXED - Added support for ADD-KEY and DELETE-KEY for GnomeKeyring store. - Bug 142183:Added code to prevent users from deleting "GKPassword" Key in Keyring store. * Mon Jan 09 2006 gekker(a)suse.de - Fix to build against the latest version of mono, version 1.1.13 -* Sat Jan 07 2006 jnorman(a)novell.com +* Fri Jan 06 2006 jnorman(a)novell.com - Bug 141689. Prevent multiple menus. -* Fri Jan 06 2006 smanojna(a)novell.com +* Thu Jan 05 2006 smanojna(a)novell.com - Added ADD/MODIFY/DELETE functionalites for Keyring and KWallet stores and was integrated with the GUI. - About dialog in the GUI was updated with the version info (1.6). @@ -974,7 +980,7 @@ 2. Creation of new secret in Keyring (ADD-SECRET) expects a key with the name "GKPassword" whose value will be the password for the respective secret. This key should not be deleted. -* Wed Jan 04 2006 cmashayekhi(a)novell.com +* Tue Jan 03 2006 cmashayekhi(a)novell.com - Fixed link.lux files to use $ARC parameter to eliminate the errors caused during the build with the rpath link parameter. * Thu Dec 22 2005 jnorman(a)novell.com @@ -1026,7 +1032,7 @@ * Mon Dec 05 2005 jnorman(a)novell.com - Bug 136523. Fix KWallet code to show KWallet secrets. fix made in kwallets_rw.cpp -* Sat Dec 03 2005 jnorman(a)novell.com +* Fri Dec 02 2005 jnorman(a)novell.com - Bug 136527. Add handlers on KDEStore and GNOME Store code * Fri Dec 02 2005 cmashayekhi(a)novell.com - Bug 136221, workaround in CASA.spec file were removed because @@ -1042,14 +1048,14 @@ - Added CASA_dbg.spec file to build debug RPMs on autobuild * Wed Nov 30 2005 jnorman(a)novell.com - Bug 134096, Fixed Wrapper code for proper structure marshaling. -* Wed Nov 30 2005 jnorman(a)novell.com +* Tue Nov 29 2005 jnorman(a)novell.com - Bug: 134096 Fix CASA gui for 64 bit * Thu Nov 24 2005 jnorman(a)novell.com - Bug fixes: 135387, 135393 -* Thu Nov 24 2005 cmashayekhi(a)novell.com +* Wed Nov 23 2005 cmashayekhi(a)novell.com - c_gui/CASAManager.sh was fixed to support lib64 directory. - c_micasad/startup/micasad.sh was fixed to support lib64. -* Thu Nov 24 2005 jnorman(a)novell.com +* Wed Nov 23 2005 jnorman(a)novell.com - changed PAM Capture to find libmicasa in path * Fri Nov 18 2005 jnorman(a)novell.com - Change GUI dependency from gtk2-devel to gtk2. @@ -1066,7 +1072,7 @@ * Thu Nov 10 2005 jnorman(a)novell.com - Replaced changes.log with CASA.changes in the src tree to be consistent with autobuild -* Tue Nov 08 2005 cameron(a)novell.com +* Mon Nov 07 2005 cameron(a)novell.com - CASA.spec and versioning number was modified to support build number as a part of the rpm version. - lib*.so versioning was changed to support linux format versioning ++++++ CASA-1.7.1582.tar.bz2 -> CASA-1.7.1592.tar.bz2 ++++++ CASA/CASA-1.7.1582.tar.bz2 /mounts/work_src_done/STABLE/CASA/CASA-1.7.1592.tar.bz2 differ: byte 11, line 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 java-binfmt-misc for openSUSE:Factory
by root＠Hilbert.suse.de 05 May '09

05 May '09

Hello community, here is the log from the commit of package java-binfmt-misc for openSUSE:Factory checked in at Tue May 5 02:02:43 CEST 2009. -------- --- java-binfmt-misc/java-binfmt-misc.changes 2009-02-10 11:20:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/java-binfmt-misc/java-binfmt-misc.changes 2009-05-05 01:11:32.014787000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 25 13:46:34 CET 2009 - mvyskocil(a)suse.cz + +- fixed minor indentation in initscript [bnc#435514] using vim's = + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-binfmt-misc.spec ++++++ --- /var/tmp/diff_new_pack.g10259/_old 2009-05-05 02:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.g10259/_new 2009-05-05 02:02:39.000000000 +0200 @@ -21,7 +21,7 @@ Name: java-binfmt-misc Version: 1.03 -Release: 4 +Release: 5 Summary: The binfmt_misc support for Java Group: Development/Languages/Java License: GPL v2 only @@ -118,6 +118,8 @@ %{_mandir}/man1/* %changelog +* Wed Mar 25 2009 mvyskocil(a)suse.cz +- fixed minor indentation in initscript [bnc#435514] using vim's = * Tue Feb 10 2009 mvyskocil(a)suse.cz - Remove Java 64bit Webstart warning, as it's obsoleted by openjdk and Sun u12 * Thu Feb 05 2009 mvyskocil(a)suse.cz ++++++ java-binfmt-misc-1.03.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/java-binfmt-misc-1.03/java-binfmt-misc.init new/java-binfmt-misc-1.03/java-binfmt-misc.init --- old/java-binfmt-misc-1.03/java-binfmt-misc.init 2009-02-05 14:26:13.000000000 +0100 +++ new/java-binfmt-misc-1.03/java-binfmt-misc.init 2009-03-25 13:45:36.000000000 +0100 @@ -42,23 +42,23 @@ # see #271198 java_binfmt_misc_status () { - [ ! -e /proc/sys/fs/binfmt_misc/status ] && return 4 - [ `cat /proc/sys/fs/binfmt_misc/status` != "enabled" ] && return 3 - - for state in Java ExecutableJAR JavaWebStart - do - if [ ! -e /proc/sys/fs/binfmt_misc/$state ]; then - echo Warning /proc/sys/fs/binfmt_misc/$state is not present - return 3 - fi + [ ! -e /proc/sys/fs/binfmt_misc/status ] && return 4 + [ `cat /proc/sys/fs/binfmt_misc/status` != "enabled" ] && return 3 - if [ `head -n 1 /proc/sys/fs/binfmt_misc/$state` != "enabled" ] - then - echo Warning /proc/sys/fs/binfmt_misc/$state is not enabled - fi - done - - return 0 + for state in Java ExecutableJAR JavaWebStart + do + if [ ! -e /proc/sys/fs/binfmt_misc/$state ]; then + echo Warning /proc/sys/fs/binfmt_misc/$state is not present + return 3 + fi + + if [ `head -n 1 /proc/sys/fs/binfmt_misc/$state` != "enabled" ] + then + echo Warning /proc/sys/fs/binfmt_misc/$state is not enabled + fi + done + + return 0 } @@ -66,7 +66,7 @@ # Note: Special treatment of stop for LSB conformance for file in /usr/bin/javawrapper /usr/bin/jarwrapper /usr/bin/javaclassname do - test -x $file || { echo "$file not installed"; + test -x $file || { echo "$file not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } done @@ -123,178 +123,178 @@ case "$1" in start) - echo -n "Starting java.binfmt_misc " + echo -n "Starting java.binfmt_misc " + + # Insert BINFMT_MISC module into the kernel + if [ ! -e /proc/sys/fs/binfmt_misc/register ]; then + if [ -x /sbin/modprobe ]; then + /sbin/modprobe binfmt_misc + # Some distributions, like Fedora Core, perform + # the following command automatically when the + # binfmt_misc module is loaded into the kernel. + # Thus, it is possible that the following line + # is not needed at all. Look at /etc/modprobe.conf + # to check whether this is applicable or not. + if ! mount | grep -q binfmt + then + mount -t binfmt_misc none /proc/sys/fs/binfmt_misc + fi + fi + fi - # Insert BINFMT_MISC module into the kernel - if [ ! -e /proc/sys/fs/binfmt_misc/register ]; then - if [ -x /sbin/modprobe ]; then - /sbin/modprobe binfmt_misc - # Some distributions, like Fedora Core, perform - # the following command automatically when the - # binfmt_misc module is loaded into the kernel. - # Thus, it is possible that the following line - # is not needed at all. Look at /etc/modprobe.conf - # to check whether this is applicable or not. - if ! mount | grep -q binfmt + # Register support for class and jar files + if [ -e /proc/sys/fs/binfmt_misc/register ]; then + # support for Java applications: + if [ -e /proc/sys/fs/binfmt_misc/Java ] + then + echo 1 > /proc/sys/fs/binfmt_misc/Java + else + echo ':Java:M::\xca\xfe\xba\xbe::/usr/bin/javawrapper:' > /proc/sys/fs/binfmt_misc/register + fi + # support for executable Jar files: + if [ -e /proc/sys/fs/binfmt_misc/ExecutableJAR ] then - mount -t binfmt_misc none /proc/sys/fs/binfmt_misc + echo 1 > /proc/sys/fs/binfmt_misc/ExecutableJAR + else + echo ':ExecutableJAR:E::jar::/usr/bin/jarwrapper:' > /proc/sys/fs/binfmt_misc/register fi - fi - fi + # support for executable javaws + if [ -e /proc/sys/fs/binfmt_misc/JavaWebStart ] + then + echo 1 > /proc/sys/fs/binfmt_misc/JavaWebStart + else + echo ':JavaWebStart:E::jnlp::/usr/bin/javawswrapper:' > /proc/sys/fs/binfmt_misc/register + fi + echo 1 > /proc/sys/fs/binfmt_misc/status + ## support for Java Applets: + # ':Applet:E::html::/usr/bin/appletviewer:' + ##or the following, if you want to be more selective: + # ':Applet:M::<!--applet::/usr/bin/appletviewer:' + fi - # Register support for class and jar files - if [ -e /proc/sys/fs/binfmt_misc/register ]; then - # support for Java applications: - if [ -e /proc/sys/fs/binfmt_misc/Java ] - then - echo 1 > /proc/sys/fs/binfmt_misc/Java - else - echo ':Java:M::\xca\xfe\xba\xbe::/usr/bin/javawrapper:' > /proc/sys/fs/binfmt_misc/register - fi - # support for executable Jar files: - if [ -e /proc/sys/fs/binfmt_misc/ExecutableJAR ] - then - echo 1 > /proc/sys/fs/binfmt_misc/ExecutableJAR - else - echo ':ExecutableJAR:E::jar::/usr/bin/jarwrapper:' > /proc/sys/fs/binfmt_misc/register - fi - # support for executable javaws - if [ -e /proc/sys/fs/binfmt_misc/JavaWebStart ] - then - echo 1 > /proc/sys/fs/binfmt_misc/JavaWebStart - else - echo ':JavaWebStart:E::jnlp::/usr/bin/javawswrapper:' > /proc/sys/fs/binfmt_misc/register - fi - echo 1 > /proc/sys/fs/binfmt_misc/status - ## support for Java Applets: - # ':Applet:E::html::/usr/bin/appletviewer:' - ##or the following, if you want to be more selective: - # ':Applet:M::<!--applet::/usr/bin/appletviewer:' - fi - - - # Remember status and be verbose - rc_status -v - ;; + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down java.binfmt_misc " - # Register support for class and jar files - if [ -e /proc/sys/fs/binfmt_misc/register ]; then - # support for Java applications: - if [ -e /proc/sys/fs/binfmt_misc/Java ]; then - echo -1 > /proc/sys/fs/binfmt_misc/Java - fi - # support for executable Jar files: - if [ -e /proc/sys/fs/binfmt_misc/ExecutableJAR ]; then - echo -1 > /proc/sys/fs/binfmt_misc/ExecutableJAR - fi - # support for javaws - if [ -e /proc/sys/fs/binfmt_misc/JavaWebStart ]; then - echo -1 > /proc/sys/fs/binfmt_misc/JavaWebStart - fi - ## support for Java Applets: - # ':Applet:E::html::/usr/bin/appletviewer:' - ##or the following, if you want to be more selective: - # ':Applet:M::<!--applet::/usr/bin/appletviewer:' - fi - - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Shutting down java.binfmt_misc " + # Register support for class and jar files + if [ -e /proc/sys/fs/binfmt_misc/register ]; then + # support for Java applications: + if [ -e /proc/sys/fs/binfmt_misc/Java ]; then + echo -1 > /proc/sys/fs/binfmt_misc/Java + fi + # support for executable Jar files: + if [ -e /proc/sys/fs/binfmt_misc/ExecutableJAR ]; then + echo -1 > /proc/sys/fs/binfmt_misc/ExecutableJAR + fi + # support for javaws + if [ -e /proc/sys/fs/binfmt_misc/JavaWebStart ]; then + echo -1 > /proc/sys/fs/binfmt_misc/JavaWebStart + fi + ## support for Java Applets: + # ':Applet:E::html::/usr/bin/appletviewer:' + ##or the following, if you want to be more selective: + # ':Applet:M::<!--applet::/usr/bin/appletviewer:' + fi + + + # Remember status and be verbose + rc_status -v + ;; try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; + ## Do a restart only if the service was active before. + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + # 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 + ;; reload) - rc_failed 3 - ;; + rc_failed 3 + ;; -## removed see #271198 + ## removed see #271198 -# force-reload) -# ## Signal the daemon to reload its config. Most daemons -# ## do this on signal 1 (SIGHUP). -# ## If it does not support it, restart the service if it -# ## is running. -# -# echo -n "Reload service java.binfmt_misc " -# ## if it supports it: -# echo /sbin/killproc -HUP $java.binfmt_misc_BIN -# /sbin/killproc -HUP $java.binfmt_misc_BIN -# #touch /var/run/java.binfmt_misc.pid -# rc_status -v -# -# ## Otherwise: -# #$0 try-restart -# #rc_status -# ;; -# reload) -# ## Like force-reload, but if daemon does not support -# ## signaling, do nothing (!) -# -# # If it supports signaling: -# echo -n "Reload service java.binfmt_misc " -# /sbin/killproc -HUP $java.binfmt_misc_BIN -# #touch /var/run/java.binfmt_misc.pid -# rc_status -v -# -# ## Otherwise if it does not support reload: -# #rc_failed 3 -# #rc_status -v -# ;; + # force-reload) + # ## Signal the daemon to reload its config. Most daemons + # ## do this on signal 1 (SIGHUP). + # ## If it does not support it, restart the service if it + # ## is running. + # + # echo -n "Reload service java.binfmt_misc " + # ## if it supports it: + # echo /sbin/killproc -HUP $java.binfmt_misc_BIN + # /sbin/killproc -HUP $java.binfmt_misc_BIN + # #touch /var/run/java.binfmt_misc.pid + # rc_status -v + # + # ## Otherwise: + # #$0 try-restart + # #rc_status + # ;; + # reload) + # ## Like force-reload, but if daemon does not support + # ## signaling, do nothing (!) + # + # # If it supports signaling: + # echo -n "Reload service java.binfmt_misc " + # /sbin/killproc -HUP $java.binfmt_misc_BIN + # #touch /var/run/java.binfmt_misc.pid + # rc_status -v + # + # ## Otherwise if it does not support reload: + # #rc_failed 3 + # #rc_status -v + # ;; status) - echo -n "Checking for service java.binfmt_misc " - ## 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 up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # this function returns the LSB compliants status code - # see #271198 - java_binfmt_misc_status - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; -# probe) -# ## Optional: Probe for the necessity of a reload, print out the -# ## argument to this init script which is required for a reload. -# ## Note: probe is not (yet) part of LSB (as of 1.9) -# -# test /etc/java.binfmt_misc/java.binfmt_misc.conf -nt /var/run/java.binfmt_misc.pid && echo reload -# ;; + echo -n "Checking for service java.binfmt_misc " + ## 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 up and running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running (unused) + # 4 - service status unknown :-( + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + + # this function returns the LSB compliants status code + # see #271198 + java_binfmt_misc_status + # NOTE: rc_status knows that we called this init script with + # "status" option and adapts its messages accordingly. + rc_status -v + ;; + # probe) + # ## Optional: Probe for the necessity of a reload, print out the + # ## argument to this init script which is required for a reload. + # ## Note: probe is not (yet) part of LSB (as of 1.9) + # + # test /etc/java.binfmt_misc/java.binfmt_misc.conf -nt /var/run/java.binfmt_misc.pid && echo reload + # ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart}" + exit 1 + ;; esac rc_exit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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