February 2011 - openSUSE Commits - openSUSE Mailing Lists

commit libsatsolver for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package libsatsolver for openSUSE:11.4 checked in at Sun Feb 27 12:52:22 CET 2011. -------- --- old-versions/11.4/all/libsatsolver/libsatsolver.changes 2010-10-22 16:35:11.000000000 +0200 +++ 11.4/libsatsolver/libsatsolver.changes 2011-02-24 17:45:23.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 24 17:44:05 CET 2011 - mls(a)suse.de + +- ignore to be dropped orhaned packages when calculating + candidates for recommends/supplements installation + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- ignoreorphaned.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.fnAjJe/_old 2011-02-27 12:51:57.000000000 +0100 +++ /var/tmp/diff_new_pack.fnAjJe/_new 2011-02-27 12:51:57.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libsatsolver (Version 0.16.1) +# spec file for package libsatsolver # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,10 +23,11 @@ Name: libsatsolver Version: 0.16.1 -Release: 1 +Release: 4.<RELEASE2> License: BSD3c Url: git://git.opensuse.org/projects/zypp/sat-solver.git Source: satsolver-%{version}.tar.bz2 +Patch: ignoreorphaned.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ Prefix: /usr @@ -159,6 +160,7 @@ %prep %setup -n satsolver-%{version} +%patch %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ ignoreorphaned.diff ++++++ --- ./src/solver.c.orig 2010-10-22 13:57:56.000000000 +0000 +++ ./src/solver.c 2011-02-24 16:41:45.000000000 +0000 @@ -1722,6 +1722,8 @@ solver_run_sat(Solver *solv, int disable } else if (solv->decisionmap[p] == 0) { + if (solv->dupmap_all && solv->installed && pool->solvables[p].repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, p - solv->installed->start)))) + continue; queue_pushunique(&dq, p); } } @@ -1737,6 +1739,8 @@ solver_run_sat(Solver *solv, int disable continue; if (!solver_is_supplementing(solv, s)) continue; + if (solv->dupmap_all && solv->installed && s->repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, i - solv->installed->start)))) + continue; queue_push(&dqs, i); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package kiwi for openSUSE:11.4 checked in at Sun Feb 27 12:51:40 CET 2011. -------- --- old-versions/11.4/all/kiwi/kiwi.changes 2011-02-22 18:05:20.000000000 +0100 +++ 11.4/kiwi/kiwi.changes 2011-02-25 13:35:30.000000000 +0100 @@ -1,0 +2,60 @@ +Fri Feb 25 13:29:39 CET 2011 - ms(a)suse.de + +- v4.79 released + +------------------------------------------------------------------- +Fri Feb 25 11:22:19 CET 2011 - ms(a)suse.de + +- The default tftp block size chosen by kiwi is too small and + not aligned to page size (4096), so it causes unnecessary + overhead. This patch improves loading performance a lot + +------------------------------------------------------------------- +Thu Feb 24 14:31:23 CET 2011 - adrian(a)suse.de + +- just compare the major version of squashfs kernel module and squashfs tools (bnc #674653) + +------------------------------------------------------------------- +Thu Feb 24 12:15:56 CET 2011 - adrian(a)suse.de + +- parse all available product file not just the first one + +------------------------------------------------------------------- +Thu Feb 24 10:18:04 CET 2011 - ms(a)suse.de + +- fixed -z test for RELOAD_CONFIG variable in netboot + +------------------------------------------------------------------- +Thu Feb 24 09:52:45 CET 2011 - ms(a)suse.de + +- added unit testing for the KIWILocator object + +------------------------------------------------------------------- +Thu Feb 24 09:46:06 CET 2011 - ms(a)suse.de + +- added ensconce parameter -i imagename which contains + the contents of the name attribute. ensconce requires this + to distinguish between system image and initrd image + +------------------------------------------------------------------- +Wed Feb 23 14:22:00 CET 2011 - ms(a)suse.de + +- Using here documents with tabs in front of the limit + string works but is not recommended. Tabs are ignored + when searching for the limit string but spaces are not, + in which case the here document ends at the next occurence + of the limit string or at the end of the file with some + shells not even issuing a warning + +------------------------------------------------------------------- +Wed Feb 23 09:52:15 CET 2011 - ms(a)suse.de + +- fixed use of uninitialized value if an improper + configuration directory is specified + +------------------------------------------------------------------- +Tue Feb 22 18:36:05 CET 2011 - ms(a)suse.de + +- move warning messages about shm and semaphores into logfile + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.8XdV32/_old 2011-02-27 12:50:39.000000000 +0100 +++ /var/tmp/diff_new_pack.8XdV32/_new 2011-02-27 12:50:39.000000000 +0100 @@ -65,7 +65,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.78 +Version: 4.79 Release: 1.<RELEASE2> Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ old-versions/11.4/all/kiwi/kiwi-docu.tar.bz2 11.4/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-02-22 18:02:35.000000000 +0100 +++ new/kiwi/.revision 2011-02-25 13:31:24.000000000 +0100 @@ -1 +1 @@ -d32fb17debadd5fa678e69503183bf70ad1eeb51 +ea7a834247aebbb4f41a028503fa9a62f03c2293 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-02-22 18:02:35.000000000 +0100 +++ new/kiwi/kiwi.pl 2011-02-25 13:31:24.000000000 +0100 @@ -47,7 +47,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.78"; +our $Version = "4.79"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de"; our $openSUSE = "http://download.opensuse.org"; @@ -2382,16 +2382,16 @@ my $mktool_vs = qxx ("mksquashfs -version 2>&1 | head -n 1"); my $module_vs = qxx ("modinfo -d $km 2>&1"); my $error = 0; - if ($mktool_vs =~ /^mksquashfs version (\d\.\d) \(/) { + if ($mktool_vs =~ /^mksquashfs version (\d)\.\d \(/) { $mktool_vs = $1; $error++; } - if ($module_vs =~ /^squashfs (\d\.\d),/) { + if ($module_vs =~ /^squashfs (\d)\.\d,/) { $module_vs = $1; $error++; } - $kiwi -> loginfo ("squashfs mktool version: $mktool_vs\n"); - $kiwi -> loginfo ("squashfs module version: $module_vs\n"); + $kiwi -> loginfo ("squashfs mktool major version: $mktool_vs\n"); + $kiwi -> loginfo ("squashfs module major version: $module_vs\n"); if (($error == 2) && ($mktool_vs ne $module_vs)) { $kiwi -> error ( "--> squashfs tool/driver mismatch: $mktool_vs vs $module_vs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2011-02-21 16:58:21.000000000 +0100 +++ new/kiwi/modules/KIWICollect.pm 2011-02-25 13:03:46.000000000 +0100 @@ -1598,7 +1598,10 @@ # get all .prod files local *D; - opendir(D, $tmp."/etc/products.d/") || return (); + if (!opendir(D, $tmp."/etc/products.d/")) { + $this->logMsg("I", "No products found, skipping"); + next RELEASEPACK; + } my @r = grep {$_ =~ '\.prod$'} readdir(D); closedir D; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-02-25 13:03:46.000000000 +0100 @@ -83,7 +83,7 @@ --exit-label "$TEXT_EXIT" \ $@ echo \$? > /tmp/fbcode - EOF +EOF fbiterm -m $UFONT -- bash /tmp/fbcode code=$(cat /tmp/fbcode) else @@ -3767,6 +3767,8 @@ # to the size of the image. The block size itself is also # limited to 65464 bytes # ---- + local blkTest + local nBlk if [ -z "$zblocks" ] && [ -z "$blocks" ];then # md5 file not yet read in... skip return @@ -3776,15 +3778,16 @@ else isize=`expr $blocks \* $blocksize` fi - isize=`expr $isize / 65535` - if [ $isize -gt $imageBlkSize ];then - imageBlkSize=`expr $isize + 1024` - fi - if [ $imageBlkSize -gt 65464 ];then - systemException \ - "Maximum blocksize for atftp protocol exceeded" \ - "reboot" - fi + for blkTest in 32768 61440 65464 ; do + nBlk=`expr $isize / $blkTest` + if [ $nBlk -lt 65535 ] ; then + imageBlkSize=$blkTest + return + fi + done + systemException \ + "Maximum blocksize for atftp protocol exceeded" \ + "reboot" } #====================================== # loadOK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILocator.pm new/kiwi/modules/KIWILocator.pm --- old/kiwi/modules/KIWILocator.pm 2011-01-20 09:19:55.000000000 +0100 +++ new/kiwi/modules/KIWILocator.pm 2011-02-25 13:03:46.000000000 +0100 @@ -20,6 +20,7 @@ use strict; use warnings; require Exporter; +use KIWILog; use KIWIQX; #========================================== @@ -70,7 +71,6 @@ my $this = shift; my $dir = shift; my $kiwi = $this->{kiwi}; - my $config = "$dir/" . $this->{configName}; if (! -d $dir) { my $msg = "Expected a directory at $dir.\nSpecify a directory"; $msg .= ' as the configuration base.'; @@ -78,6 +78,7 @@ $kiwi -> failed(); return undef; } + my $config = "$dir/" . $this->{configName}; if (-f $config) { return $config; } @@ -92,7 +93,7 @@ for my $item (@globsearch) { $msg .= "\t$item\n"; } - $kiwi -> errot ($msg); + $kiwi -> error ($msg); $kiwi -> failed(); return undef; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2011-02-11 14:21:47.000000000 +0100 +++ new/kiwi/modules/KIWIManager.pm 2011-02-25 13:03:46.000000000 +0100 @@ -1076,7 +1076,6 @@ my @smart = @{$this->{smart}}; my @zypper = @{$this->{zypper}}; my @yum = @{$this->{yum}}; - my @ensconce = @{$this->{ensconce}}; my $screenCall = $this->{screenCall}; #========================================== # check addon packages @@ -1152,20 +1151,12 @@ # ensconce #------------------------------------------ if ($manager eq "ensconce") { - $kiwi -> info ("Installing addon packages..."); - print $fd "function clean { kill \$SPID; "; - print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;"; - print $fd "if [ \"\$c\" = 5 ];then kill \$SPID;break;fi;"; - print $fd "c=\$((\$c+1));done;\n"; - print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;done\n"; - print $fd "echo 1 > $screenCall.exit; exit 1; }\n"; - print $fd "trap clean INT TERM\n"; - print $fd "@ensconce &\n"; - print $fd "SPID=\$!;wait \$SPID\n"; - print $fd "ECODE=\$?\n"; - print $fd "echo \$ECODE > $screenCall.exit\n"; - print $fd "exit \$ECODE\n"; + # FIXME + $kiwi -> failed (); + $kiwi -> error ("*** not implemeted ***"); + $kiwi -> failed (); $fd -> close(); + return undef; } #========================================== # yum @@ -1216,7 +1207,6 @@ my @smart = @{$this->{smart}}; my @zypper = @{$this->{zypper}}; my @yum = @{$this->{yum}}; - my @ensconce = @{$this->{ensconce}}; my $screenCall = $this->{screenCall}; #========================================== # check to be removed packages @@ -1295,20 +1285,12 @@ # ensconce #------------------------------------------ if ($manager eq "ensconce") { - $kiwi -> info ("Installing addon packages..."); - print $fd "function clean { kill \$SPID; "; - print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;"; - print $fd "if [ \"\$c\" = 5 ];then kill \$SPID;break;fi;"; - print $fd "c=\$((\$c+1));done;\n"; - print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;done\n"; - print $fd "echo 1 > $screenCall.exit; exit 1; }\n"; - print $fd "trap clean INT TERM\n"; - print $fd "@ensconce &\n"; - print $fd "SPID=\$!;wait \$SPID\n"; - print $fd "ECODE=\$?\n"; - print $fd "echo \$ECODE > $screenCall.exit\n"; - print $fd "exit \$ECODE\n"; + # FIXME + $kiwi -> failed (); + $kiwi -> error ("*** not implemeted ***"); + $kiwi -> failed (); $fd -> close(); + return undef; } #========================================== # yum @@ -1354,7 +1336,6 @@ my @smart = @{$this->{smart}}; my @zypper = @{$this->{zypper}}; my @yum = @{$this->{yum}}; - my @ensconce = @{$this->{ensconce}}; my $screenCall = $this->{screenCall}; #========================================== # setup screen call @@ -1991,7 +1972,8 @@ # ensconce #------------------------------------------ if ($manager eq "ensconce") { - my $ensconce_args = ""; + my $imagename = $xml -> getImageName(); + my $ensconce_args = "-i $imagename"; if (! $chroot) { #========================================== # Setup baselibs @@ -2005,7 +1987,7 @@ #========================================== # Ensconce options #------------------------------------------ - $ensconce_args = "-b"; + $ensconce_args .= " -b"; } if (! $chroot) { $kiwi -> info ("Initializing image system on: $root..."); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISharedMem.pm new/kiwi/modules/KIWISharedMem.pm --- old/kiwi/modules/KIWISharedMem.pm 2011-02-22 17:48:14.000000000 +0100 +++ new/kiwi/modules/KIWISharedMem.pm 2011-02-25 13:03:46.000000000 +0100 @@ -175,12 +175,10 @@ } return unless $this->{OWNER} == $$; # avoid dup dealloc if (! shmctl($this->{SHMKEY}, IPC_RMID, 0)) { - $kiwi -> warning ("shmctl RMID: $!"); - $kiwi -> skipped (); + $kiwi -> loginfo ("shmctl RMID: $!\n"); } if (! $this->{SEMA}->remove()) { - $kiwi -> warning ("sema->remove: $!"); - $kiwi -> skipped (); + $kiwi -> loginfo ("sema->remove: $!\n"); } return $this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2011-02-18 12:20:07.000000000 +0100 +++ new/kiwi/modules/KIWIXML.pm 2011-02-25 13:03:46.000000000 +0100 @@ -113,6 +113,9 @@ #------------------------------------------ my $locator = new KIWILocator($kiwi); my $controlFile = $locator -> getControlFile ( $imageDesc ); + if (! $controlFile) { + return undef; + } #========================================== # Store object data #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-02-25 13:03:46.000000000 +0100 @@ -765,7 +765,7 @@ #-------------------------------------- runHook preconfig if [ $LOCAL_BOOT = "no" ] || [ ! -z "$RELOAD_CONFIG" ];then - if test ! -z $RELOAD_CONFIG;then + if [ ! -z "$RELOAD_CONFIG" ];then Echo "Configuration files reload forced via RELOAD_CONFIG..." fi #======================================= @@ -806,7 +806,7 @@ # ---- cfg_copy=1 cfgmsg_why='(forced)' - if test -z $RELOAD_CONFIG;then + if [ -z "$RELOAD_CONFIG" ];then cfgmsg_why='(missing)' IFS=","; for j in $ALL_CBK_CONF;do BKconfigDest=`echo "$j" | cut -d ';' -f 2` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWILocator.t new/kiwi/tests/unit/KIWILocator.t --- old/kiwi/tests/unit/KIWILocator.t 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/KIWILocator.t 2011-02-25 13:03:46.000000000 +0100 @@ -0,0 +1,27 @@ +#================ +# FILE : KIWILocator.t +#---------------- +# PROJECT : OpenSUSE Build-Service +# COPYRIGHT : (c) 2011 Novell Inc. +# : +# AUTHOR : Robert Schweikert <rschweikert(a)novell.com> +# : +# BELONGS TO : Operating System images +# : +# DESCRIPTION : Unit test driver for the KIWILocator module. +# : +# STATUS : Development +#---------------- +use strict; +use warnings; +use FindBin; +use Test::Unit::HarnessUnit; + +# Location of test cases according to program path +use lib "$FindBin::Bin/lib"; + +# Location of Kiwi modules relative to test +use lib "$FindBin::Bin/../../modules"; + +my $runner = Test::Unit::HarnessUnit->new(); +$runner->start( 'Test::kiwiLocator' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiLocator/config.xml new/kiwi/tests/unit/data/kiwiLocator/config.xml --- old/kiwi/tests/unit/data/kiwiLocator/config.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiLocator/config.xml 2011-02-25 13:03:46.000000000 +0100 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="5.2" name="suse-11.3-vm-guest"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rschweikert(a)novell.com</contact> + <specification>Generic valid configuration file</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="512"> + <vmdisk controller="ide" id="0"/> + <vmnic interface="0" driver="e1000" mode="bridged"/> + <vmnic interface="1" driver="e1000" mode="bridged"/> + </machine> + </type> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="ifplugd"/> + <package name="vim"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiLocator/multiConf/config_one.kiwi new/kiwi/tests/unit/data/kiwiLocator/multiConf/config_one.kiwi --- old/kiwi/tests/unit/data/kiwiLocator/multiConf/config_one.kiwi 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiLocator/multiConf/config_one.kiwi 2011-02-25 13:03:46.000000000 +0100 @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.7" name="suse-11.3-vm-guest"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rschweikert(a)novell.com</contact> + <specification>Generic valid configuration file</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="512"> + <vmdisk controller="ide" id="0"/> + <vmnic interface="0" driver="e1000" mode="bridged"/> + <vmnic interface="1" driver="e1000" mode="bridged"/> + </machine> + </type> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="ifplugd"/> + <package name="vim"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiLocator/multiConf/config_two.kiwi new/kiwi/tests/unit/data/kiwiLocator/multiConf/config_two.kiwi --- old/kiwi/tests/unit/data/kiwiLocator/multiConf/config_two.kiwi 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiLocator/multiConf/config_two.kiwi 2011-02-25 13:03:46.000000000 +0100 @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.7" name="suse-11.3-vm-guest"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rschweikert(a)novell.com</contact> + <specification>Generic valid configuration file</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="512"> + <vmdisk controller="ide" id="0"/> + <vmnic interface="0" driver="e1000" mode="bridged"/> + <vmnic interface="1" driver="e1000" mode="bridged"/> + </machine> + </type> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="ifplugd"/> + <package name="vim"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiLocator/noConf/readme.txt new/kiwi/tests/unit/data/kiwiLocator/noConf/readme.txt --- old/kiwi/tests/unit/data/kiwiLocator/noConf/readme.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiLocator/noConf/readme.txt 2011-02-25 13:03:46.000000000 +0100 @@ -0,0 +1,4 @@ +Place holder file to keep this directory in version control + +This directory is used to check the "no config file" condition of the +locator object diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiLocator/sglConf/config_one.kiwi new/kiwi/tests/unit/data/kiwiLocator/sglConf/config_one.kiwi --- old/kiwi/tests/unit/data/kiwiLocator/sglConf/config_one.kiwi 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiLocator/sglConf/config_one.kiwi 2011-02-25 13:03:46.000000000 +0100 @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.7" name="suse-11.3-vm-guest"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rschweikert(a)novell.com</contact> + <specification>Generic valid configuration file</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="512"> + <vmdisk controller="ide" id="0"/> + <vmnic interface="0" driver="e1000" mode="bridged"/> + <vmnic interface="1" driver="e1000" mode="bridged"/> + </machine> + </type> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="ifplugd"/> + <package name="vim"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Common/ktLog.pm new/kiwi/tests/unit/lib/Common/ktLog.pm --- old/kiwi/tests/unit/lib/Common/ktLog.pm 2011-02-15 11:04:08.000000000 +0100 +++ new/kiwi/tests/unit/lib/Common/ktLog.pm 2011-02-25 13:03:46.000000000 +0100 @@ -50,9 +50,10 @@ #========================================== # Stored Messages #------------------------------------------ - $this -> {errMsg} = ''; - $this -> {infoMsg} = ''; - $this -> {warnMsg} = ''; + $this -> {errMsg} = ''; + $this -> {infoMsg} = ''; + $this -> {logInfoMsg} = ''; + $this -> {warnMsg} = ''; #========================================== # Stored State #------------------------------------------ @@ -118,6 +119,10 @@ $msg = $this -> {infoMsg}; $msgCnt += 1; } + if ( $this -> {logInfoMsg} ) { + $msg = $this -> {logInfoMsg}; + $msgCnt += 1; + } if ( $this -> {warnMsg} ) { $msg = $this -> {warnMsg}; $msgCnt += 1; @@ -188,6 +193,18 @@ return $this; } +#========================================== +# loginfo +#------------------------------------------ +sub loginfo { + # ... + # Set the information message + # --- + my $this = shift; + $this -> {logInfoMsg} = shift; + $this -> {msgType} = 'info'; + return $this; +} #========================================== # skipped @@ -238,9 +255,10 @@ # Reset object data # --- my $this = shift; - $this->{errMsg} = ''; - $this->{infoMsg} = ''; - $this->{warnMsg} = ''; + $this->{errMsg} = ''; + $this->{infoMsg} = ''; + $this->{logInfoMsg} = ''; + $this->{warnMsg} = ''; return $this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiLocator.pm new/kiwi/tests/unit/lib/Test/kiwiLocator.pm --- old/kiwi/tests/unit/lib/Test/kiwiLocator.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/lib/Test/kiwiLocator.pm 2011-02-25 13:03:46.000000000 +0100 @@ -0,0 +1,244 @@ +#================ +# FILE : kiwiLocator.pm +#---------------- +# PROJECT : OpenSUSE Build-Service +# COPYRIGHT : (c) 2011 Novell Inc. +# : +# AUTHOR : Robert Schweikert <rschweikert(a)novell.com> +# : +# BELONGS TO : Operating System images +# : +# DESCRIPTION : Unit test implementation for the KIWILocato module. +# : +# STATUS : Development +#---------------- +package Test::kiwiLocator; + +use strict; +use warnings; + +use Common::ktLog; +use Common::ktTestCase; +use base qw /Common::ktTestCase/; + +use KIWILocator; + +#========================================== +# Constructor +#------------------------------------------ +sub new { + # ... + # Construct new test case + # --- + my $this = shift -> SUPER::new(@_); + $this -> {dataDir} = $this -> getDataDir() . '/kiwiLocator/'; + $this -> {kiwi} = new Common::ktLog(); + + return $this; +} + +#========================================== +# test_ctor +#------------------------------------------ +sub test_ctor { + # ... + # Test the locator contructor, it has no error conditions, thus check + # the object construction. + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = new KIWILocator ( $kiwi ); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + # Test this condition last to get potential error messages + $this -> assert_not_null($locator); +} + +#========================================== +# test_getControlFileMultiConfig +#------------------------------------------ +sub test_getControlFileMultiConfig { + # ... + # Test the getControlFile method using a directory with multiple + # configuration files. + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $multiConfDir = $this -> {dataDir} . 'multiConf'; + my $res = $locator -> getControlFile( $multiConfDir ); + my $msg = $kiwi -> getMessage(); + my $expected = 'Found multiple control files in ' + . "$multiConfDir\n" + . "\t$multiConfDir/config_one.kiwi\n" + . "\t$multiConfDir/config_two.kiwi\n"; + $this -> assert_str_equals($expected, $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('error', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('failed', $state); + # Test this condition last to get potential error messages + $this -> assert_null($res); +} + +#========================================== +# test_getControlFileNoConfigFile +#------------------------------------------ +sub test_getControlFileNoConfigFile { + # ... + # Test the getControlFile method using a directory without a config file + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $noConfDir = $this -> {dataDir} . 'noConf'; + my $res = $locator -> getControlFile( $noConfDir ); + my $msg = $kiwi -> getMessage(); + my $expected = 'Could not locate a configuration file in ' + . "$noConfDir"; + $this -> assert_str_equals($expected, $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('error', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('failed', $state); + # Test this condition last to get potential error messages + $this -> assert_null($res); +} + +#========================================== +# test_getControlFileNoDir +#------------------------------------------ +sub test_getControlFileNoDir { + # ... + # Test the getControlFile method using a file path as argument + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $aFilePath = $this -> {dataDir} . 'config.xml'; + my $res = $locator -> getControlFile( $aFilePath ); + my $msg = $kiwi -> getMessage(); + my $expected = 'Expected a directory at ' + . "$aFilePath.\nSpecify a directory as the configuration base."; + $this -> assert_str_equals($expected, $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('error', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('failed', $state); + # Test this condition last to get potential error messages + $this -> assert_null($res); +} + +#========================================== +# test_getControlFileNoErrorConfigXML +#------------------------------------------ +sub test_getControlFileNoErrorConfigXML { + # ... + # Test the getControlFile method using a directory with one config.xml + # file. + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $res = $locator -> getControlFile( $this -> {dataDir} ); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + $this -> assert_not_null($res); + my $configFilePath = $this -> {dataDir} . '/config.xml'; + $this -> assert_str_equals($configFilePath, $res); +} + +#========================================== +# test_getControlFileNoErrorKiwiExt +#------------------------------------------ +sub test_getControlFileNoErrorKiwiExt { + # ... + # Test the getControlFile method using a directory with one *.kiwi + # file. + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $confDir = $this -> {dataDir} . 'sglConf'; + my $res = $locator -> getControlFile( $confDir ); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + # Test this condition last to get potential error messages + $this -> assert_not_null($res); + my $configFilePath = $this -> {dataDir} . 'sglConf/config_one.kiwi'; + $this -> assert_str_equals($configFilePath, $res); +} + +#========================================== +# test_getExecPathNoExec +#------------------------------------------ +sub test_getExecPathNoExec { + # ... + # Test behavior when an executable cannot be found + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $res = $locator -> getExecPath( 'execDoesNotExist' ); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals("warning: execDoesNotExist not found\n", $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('info', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + # Test this condition last to get potential error messages + $this -> assert_null($res); +} + +#========================================== +# test_getExecPerl +#------------------------------------------ +sub test_getExecPerl { + # ... + # Test behavior when an executable can be found + # Using the perl interpreter as an example + # Perl's location is specified by LSB, thus we only make the + # assumption that we are on an LSB compliant system, this should be + # reasonable. + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $res = $locator -> getExecPath( 'perl' ); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + # Test this condition last to get potential error messages + $this -> assert_not_null($res); + my $perlPath = '/usr/bin/perl'; + $this -> assert_str_equals($perlPath, $res); +} + +#========================================== +# Private helper methods +#------------------------------------------ +sub __getLocator { + # ... + # Helper function to create a KIWILocator object + # --- + my $this = shift; + my $locator = new KIWILocator ( $this -> {kiwi} ); + return $locator; +} + +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 kernel-firmware for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:11.4 checked in at Sun Feb 27 12:50:13 CET 2011. -------- --- old-versions/11.4/all/kernel-firmware/kernel-firmware.changes 2010-12-15 23:44:47.000000000 +0100 +++ 11.4/kernel-firmware/kernel-firmware.changes 2011-02-24 22:41:54.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Feb 24 21:40:58 UTC 2011 - gregkh(a)suse.de + +- create symlinks for Broadcom driver (bnc#673054) + +------------------------------------------------------------------- +Sat Feb 5 13:56:23 UTC 2011 - johannesobermayr(a)gmx.de + +- Add scm service for automatical updates + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- linux-firmware-20101214.tar.bz2 New: ---- _service _service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 _service:set_version:kernel-firmware.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:set_version:kernel-firmware.spec ++++++ # # spec file for package kernel-firmware # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kernel-firmware BuildRequires: fdupes kernel-default Version: 2.6.38 Release: 1.<RELEASE2> Summary: Linux kernel firmware files License: NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar) Group: System/Kernel Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ Source0: %name-%{version}.tar.bz2 Source1: firmware.sh %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Provides: qlogic-firmware Obsoletes: qlogic-firmware Provides: cxgb3-firmware Obsoletes: cxgb3-firmware Provides: ralink-firmware Obsoletes: ralink-firmware Provides: iwl1000-ucode Obsoletes: iwl1000-ucode Provides: iwl3945-ucode Obsoletes: iwl3945-ucode Provides: iwl4965-ucode Obsoletes: iwl4965-ucode Provides: iwl5000-ucode Obsoletes: iwl5000-ucode Provides: iwl5150-ucode Obsoletes: iwl5150-ucode AutoReq: off %description This package contains the firmware for in-kernel drivers that was previously included in the kernel. It is shared by all kernels >= 2.6.27-rc1. %prep %setup -q %build # nothing to do %install mkdir -p %{buildroot}/lib/firmware cp -avf * %{buildroot}/lib/firmware rm -f %{buildroot}/lib/firmware/WHENCE bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ %fdupes %{buildroot} # create symlinks for Broadcom driver (bnc#673054) cd %{buildroot}/lib/firmware/brcm/ ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw ln -s bcm43xx_hdr-0-610-809-0.fw bcm43xx_hdr-0.fw %clean rm -rf %{buildroot} %files %defattr(0644,root,root,0755) %doc WHENCE /lib/firmware/* %changelog ++++++ kernel-firmware.spec ++++++ --- /var/tmp/diff_new_pack.XZvU7R/_old 2011-02-27 12:49:51.000000000 +0100 +++ /var/tmp/diff_new_pack.XZvU7R/_new 2011-02-27 12:49:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-firmware (Version 20101214) +# spec file for package kernel-firmware # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ Name: kernel-firmware BuildRequires: fdupes kernel-default Version: 20101214 -Release: 1 +Release: 4.<RELEASE2> Summary: Linux kernel firmware files License: NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar) Group: System/Kernel Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ -Source0: linux-firmware-%{version}.tar.bz2 +Source0: %name-%{version}.tar.bz2 Source1: firmware.sh %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,7 @@ %prep -%setup -q -n linux-firmware-%{version} +%setup -q %build # nothing to do @@ -68,6 +68,11 @@ bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ %fdupes %{buildroot} +# create symlinks for Broadcom driver (bnc#673054) +cd %{buildroot}/lib/firmware/brcm/ +ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw +ln -s bcm43xx_hdr-0-610-809-0.fw bcm43xx_hdr-0.fw + %clean rm -rf %{buildroot} ++++++ _service ++++++ <services> <service name="tar_scm"> <param name="scm">git</param> <param name="url">git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git</param> <param name="version">2.6.38</param> <param name="filename">kernel-firmware</param> </service> <service name="recompress"> <param name="file">*.tar</param> <param name="compression">bz2</param> </service> <service name="set_version"/> </services> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:11.4 checked in at Sun Feb 27 12:49:39 CET 2011. -------- --- old-versions/11.4/all/kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-02-18 23:22:29.000000000 +0100 +++ 11.4/kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-02-25 12:06:03.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Feb 25 11:05:42 UTC 2011 - javier(a)opensuse.org + +- adding kio_sysinfo branding + +------------------------------------------------------------------- +Fri Feb 25 10:51:23 UTC 2011 - coolo(a)novell.com + +- restore kdeglobalsrc for firefox default (bnc#665497) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.5Mvmt7/_old 2011-02-27 12:48:37.000000000 +0100 +++ /var/tmp/diff_new_pack.5Mvmt7/_new 2011-02-27 12:48:37.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.4 -Release: 33.<RELEASE2> +Release: 33.<RELEASE3> # git clone git://git.opensuse.org/projects/desktop/kdebase4-openSUSE.git Source0: kdebase4-openSUSE-%{version}.tar.bz2 Source2: devel-splash.tar.bz2 @@ -183,8 +183,6 @@ /usr/share/kde4/config/SuSE/default/beagled-autostart.desktop.live /usr/share/kde4/config/SuSE/default/lowspacesuse.live /usr/share/kde4/config/SuSE/default/kupdateapplet-autostart.desktop.live -/usr/share/kde4/config/SuSE/default/kdeglobals -/usr/share/kde4/config/SuSE/default/kcminputrc %files -n kdebase4-runtime-branding-openSUSE %defattr(-,root,root) @@ -202,6 +200,7 @@ %dir /etc/kde4/share %dir /etc/kde4/share/config %config /etc/kde4/share/config/*rc +%config /etc/kde4/share/config/kdeglobals /usr/share/icons/hicolor/*/apps/SUSEgreeter.* /usr/share/icons/hicolor/*/apps/mycomp.* %dir /usr/share/kde4/config ++++++ kdebase4-openSUSE-11.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/etc/kde4/share/config/kdeglobals new/kdebase4-openSUSE/branding/root/etc/kde4/share/config/kdeglobals --- old/kdebase4-openSUSE/branding/root/etc/kde4/share/config/kdeglobals 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase4-openSUSE/branding/root/etc/kde4/share/config/kdeglobals 2011-02-25 12:05:25.000000000 +0100 @@ -0,0 +1,27 @@ +[KDE URL Restrictions] +rule_1=redirect,,help.opensuse.org,,irc,irc.opensuse.org,,true +rule_count=1 + +[WM] +activeBackground=106,154,213 + +[Paths] +Trash=$HOME/Desktop/Trash/ + +[PreviewSettings] +MaximumSize=3145728 +camera=true +file=true +fonts=true + +[Directories] +dir_pixmap=/usr/share/pixmaps + +[KDE] +ChangeCursor=true + +[KFileDialog Settings] +Breadcrumb Navigation=true + +[General] +BrowserApplication=firefox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kcminputrc new/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kcminputrc --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kcminputrc 2011-02-18 23:21:10.000000000 +0100 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kcminputrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[Mouse] -cursorTheme=Oxygen_White diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals new/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals --- old/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals 2011-02-18 23:21:10.000000000 +0100 +++ new/kdebase4-openSUSE/branding/root/usr/share/kde4/config/SuSE/default/kdeglobals 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -[KDE URL Restrictions] -rule_1=redirect,,help.opensuse.org,,irc,irc.opensuse.org,,true -rule_count=1 - -[WM] -activeBackground=106,154,213 - -[Paths] -Trash=$HOME/Desktop/Trash/ - -[PreviewSettings] -MaximumSize=3145728 -camera=true -file=true -fonts=true - -[Directories] -dir_pixmap=/usr/share/pixmaps - -[KDE] -ChangeCursor=true - -[KFileDialog Settings] -Breadcrumb Navigation=true - -[General] -BrowserApplication=firefox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh new/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh --- old/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh 2011-02-18 23:21:10.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh 2011-02-25 12:05:25.000000000 +0100 @@ -85,16 +85,6 @@ fi chmod u+x "$desktop/myComputer.desktop" 2>/dev/null - if [ ! -e $HOME/.kde4/share/config/kcminputrc -a -e /usr/share/kde4/config/SuSE/default/kcminputrc ]; then - mkdir -p $HOME/.kde4/share/config - cp /usr/share/kde4/config/SuSE/default/kcminputrc $HOME/.kde4/share/config/kcminputrc - fi - - if [ ! -e $HOME/.kde4/share/config/nepomukserverrc -a -e /usr/share/kde4/config/SuSE/default/nepomukserverrc ]; then - mkdir -p $HOME/.kde4/share/config - cp /usr/share/kde4/config/SuSE/default/nepomukserverrc $HOME/.kde4/share/config/nepomukserverrc - fi - if [ ! -e "$HOME/.kde4/share/apps/konqueror/bookmarks.xml" -a -e "/usr/share/kde4/config/SuSE/default/bookmarks.xml" ]; then mkdir -p $HOME/.kde4/share/apps/konqueror cp /usr/share/kde4/config/SuSE/default/bookmarks.xml $HOME/.kde4/share/apps/konqueror/bookmarks.xml Files old/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/images/background.png and new/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/images/background.png differ Files old/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/images/battery.png and new/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/images/battery.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/style.css new/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/style.css --- old/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/style.css 2009-09-23 20:01:40.000000000 +0200 +++ new/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/about/suse/style.css 2011-02-25 12:04:10.000000000 +0100 @@ -28,7 +28,7 @@ } div#background-container>h3 { - color: #ffffff; + color: #000000; opacity: 0.4; padding: 0px 0px 5px 44px; font-size: 8pt; @@ -143,6 +143,13 @@ background-repeat: no-repeat; } +h2#sysinfo+table { + margin-left: 4px; + padding-left: 50px; + background-image: url('images/sysinfo.png'); + background-repeat: no-repeat; +} + h2#display+table { margin-left: 4px; padding-left: 50px; @@ -150,12 +157,11 @@ background-repeat: no-repeat; } - -h2#sysinfo+table { - margin-left: 4px; - padding-left: 50px; - background-image: url('images/sysinfo.png'); - background-repeat: no-repeat; +h2#battery+table { + margin-left: 4px; + padding-left: 50px; + background-image: url('images/battery.png'); + background-repeat: no-repeat; } h2#launch+ul { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-1_6_0-openjdk for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:11.4 checked in at Sun Feb 27 12:47:55 CET 2011. -------- --- old-versions/11.4/all/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-01 15:14:14.000000000 +0100 +++ 11.4/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-24 14:02:09.000000000 +0100 @@ -1,0 +2,31 @@ +Thu Feb 24 13:01:52 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#671714 - VUL-0: java-1_6_0-openjdk: permissions assigned to applets + with multiple JARs (icedtea6-1.9.7) +- Security updates + * S6878713, CVE-2010-4469: Hotspot backward jsr heap corruption + * S6907662, CVE-2010-4465: Swing timer-based security manager bypass + * S6994263, CVE-2010-4472: Untrusted code allowed to replace DSIG/C14N implementation + * S6981922, CVE-2010-4448: DNS cache poisoning by untrusted applets + * S6983554, CVE-2010-4450: Launcher incorrect processing of empty library path entries + * S6985453, CVE-2010-4471: Java2D font-related system property leak + * S6927050, CVE-2010-4470: JAXP untrusted component state manipulation + * RH677332, CVE-2011-0706: Multiple signers privilege escalation +- Bug fixes + * RH676659: Pass -export-dynamic flag to linker using -Wl, as option in gcc 4.6+ is broken + * G344659: Fix issue when building on SPARC + * Fix latent JAXP bug caused by missing import +- fix bnc#670304 - VUL-1: java-1_6_0-openjdk: denial of service using floats + (icedtea6-1.9.6) +- Security updates + * S4421494, CVE-2010-4476: infinite loop while parsing double literal +- patches changes: + * obsoletes stack-protector patches (already upstreamed) + * modified openjdk-6-src-b20-initialized-after.patch + * modified openjdk-6-src-b20-no-werror.patch + * openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch + * add openjdk-6-src-b20-stringcompare.patch + * add openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch + * add openjdk-6-src-b20-gcj-workaround.patch (11.2/x86_64 workaround) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- 0803c0f69b51.tar.gz icedtea6-1.9.5.tar.bz2 openjdk-6-src-b17-stack-protector-fclose.patch openjdk-6-src-b17-stack-protector.patch New: ---- 13edc857b967.tar.gz icedtea6-1.9.7.tar.gz openjdk-6-src-b20-gcj-workaround.patch openjdk-6-src-b20-stringcompare.patch openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.k6HWHX/_old 2011-02-27 12:45:37.000000000 +0100 +++ /var/tmp/diff_new_pack.k6HWHX/_new 2011-02-27 12:45:37.000000000 +0100 @@ -16,6 +16,8 @@ # +%define gcjbootstrap 1 + %define jit_arches %{ix86} x86_64 # Turn on/off some features depending on openSUSE version %define with_systemtap 0 @@ -26,12 +28,15 @@ %endif %endif -%define gcjbootstrap 0 +# XXX: systemtap does not work with gcj +%if %{gcjbootstrap} +%define with_systemtap 0 +%endif # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.9.5 +%define icedteaver 1.9.7 %define icedteasnapshot %{nil} %define openjdkver b20 %define openjdkdate 21_jun_2010 @@ -134,14 +139,12 @@ Name: java-1_6_0-openjdk Version: 1.6.0.0_%{openjdkver}.%{icedteaver} -Release: 1 +Release: 1.<RELEASE2> Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://openjdk.java.net/ -# hg clone http://icedtea.classpath.org/hg/icedtea6-%{icedteaver} icedtea6-%{icedteaver} -# tar --exclude-vcs -cjf icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 icedtea6-%{icedteaver} -Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 +Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz # # download the openjdk from http://download.java.net/openjdk/jdk6/promoted/latest/ # sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz Source1: %{fedorazip} @@ -152,7 +155,7 @@ Source5: mauve-%{mauvedate}.tar.bz2 # from Fedora rpm Source6: mauve_tests -Source7: %{hotspoturl}0803c0f69b51.tar.gz +Source7: %{hotspoturl}13edc857b967.tar.gz Source8: %{jaxpurl}jdk6-jaxp-%{openjdkver}.zip Source9: %{jafurl}jdk6-jaf-%{openjdkver}.zip Source10: %{jaxwsurl}jdk6-jaxws-%{openjdkver}.zip @@ -198,12 +201,6 @@ Patch123: openjdk-6-src-b20-no-werror.patch # PATCH-FIX-OPENSUSE: the no-return-in-non-void againd - sent to upstream Patch124: icedtea6-1.7-no-return-in-non-void.patch -# PATCH-FIX-UPSTREAM: bnc#589021 -# http://cr.openjdk.java.net/~aph/6929067-jdk7-webrev-4/ -Patch125: openjdk-6-src-b17-stack-protector.patch -# PATCH-FIX-OPENSUSE: bnc#603316 -# The stack protector patch did not close the /proc/self/maps correctly -Patch126: openjdk-6-src-b17-stack-protector-fclose.patch # PATCH-FIX-OPENSUSE: gcc 4.5 warnings Patch127: openjdk-6-src-b20-defined-but-not-used.patch # PATCH-FIX-OPENSUSE: gcc 4.5 warnings @@ -216,6 +213,12 @@ # https://bugzilla.mozilla.org/show_bug.cgi?id=582130 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 Patch131: icedtea6-1.9.4-moonlight-symbol-clash.patch +# PATCH-FIX-OPENSUSE: the no-return-in-non-void again - now in openjdk-ecj +Patch132: openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch +# PATCH-FIX-OPENSUSE: the string and literal compare fix +Patch133: openjdk-6-src-b20-stringcompare.patch +# PATCH-FIX-OPENSUSE: gcj on 11.2/x86_64 returns the NPE on this file - assume because of comments +Patch134: openjdk-6-src-b20-gcj-workaround.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -494,7 +497,7 @@ %patch0 -b .optflags %patch124 -p1 -b .no-return-in-non-void %patch130 -p1 -b .realpath -%patch131 -p1 -b .realpath +%patch131 -p1 -b .moonlight %patch1000 -p1 cp %{SOURCE6} . @@ -517,11 +520,17 @@ --enable-nss \ --enable-plugin \ %endif + --with-hotspot-build=hs19 \ --with-hotspot-src-zip=%{SOURCE7} \ --with-jaf-drop-zip=%{SOURCE9} \ --with-jaxp-drop-zip=%{SOURCE8} \ --with-jaxws-drop-zip=%{SOURCE10} \ +%if %{gcjbootstrap} + --with-gcj-home=%{_jvmdir}/java-gcj \ + --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \ +%else --with-openjdk=%{_jvmdir}/%{sdkdir} \ +%endif --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} @@ -559,11 +568,12 @@ %{PATCH121} \ %{PATCH122} \ %{PATCH123} \ - %{PATCH125} \ - %{PATCH126} \ %{PATCH127} \ %{PATCH128} \ - %{PATCH129} + %{PATCH129} \ + %{PATCH132} \ + %{PATCH133} \ + %{PATCH134} do qpatch -p1 ${PATCH} done @@ -834,6 +844,11 @@ %post #bnc#648260 - workaround sed -i '/pack200/d' /var/lib/rpm/alternatives/java +#fix of the previous workaround ;-) bnc#669716 +#this will collect all empty lines in Sun Java alternatives +if [ -f %{_libexecdir}/%{name}/javafix ]; then + /bin/sh %{_libexecdir}/%{name}/javafix +fi ext=.gz update-alternatives \ --install %{_bindir}/java java %{jrebindir}/java %{priority} \ ++++++ 0803c0f69b51.tar.gz -> 13edc857b967.tar.gz ++++++ old-versions/11.4/all/java-1_6_0-openjdk/0803c0f69b51.tar.gz 11.4/java-1_6_0-openjdk/13edc857b967.tar.gz differ: char 5, line 1 ++++++ openjdk-6-src-b20-gcj-workaround.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java +++ icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java @@ -1,28 +1,3 @@ -/* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - package com.sun.source.tree; /** ++++++ openjdk-6-src-b20-initialized-after.patch ++++++ --- /var/tmp/diff_new_pack.k6HWHX/_old 2011-02-27 12:45:39.000000000 +0100 +++ /var/tmp/diff_new_pack.k6HWHX/_new 2011-02-27 12:45:39.000000000 +0100 @@ -1,7 +1,7 @@ -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp @@ -234,18 +234,18 @@ class ReferenceProcessor : public CHeapO // constructor ReferenceProcessor(): @@ -26,10 +26,10 @@ {} ReferenceProcessor(MemRegion span, bool atomic_discovery, -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/dependencies.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/dependencies.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp @@ -411,15 +411,15 @@ class Dependencies: public ResourceObj { public: @@ -50,10 +50,10 @@ _bytes(code->dependencies_begin()) { initial_asserts(code->dependencies_size()); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp @@ -151,7 +151,7 @@ class FilterIntoCSClosure: public OopClo public: FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl, @@ -72,11 +72,11 @@ template <class T> void do_oop_nv(T* p); virtual void do_oop(oop* p) { do_oop_nv(p); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -@@ -514,7 +514,7 @@ class SymbolHashMapEntry : public CHeapO +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp +@@ -589,7 +589,7 @@ class SymbolHashMapEntry : public CHeapO void set_value(u2 value) { _value = value; } SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value) @@ -85,11 +85,11 @@ }; // End SymbolHashMapEntry class -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/generation.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/generation.hpp -@@ -671,7 +671,8 @@ class OneContigSpaceCardGeneration: publ +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp +@@ -673,7 +673,8 @@ class OneContigSpaceCardGeneration: publ int level, GenRemSet* remset, ContiguousSpace* space) : CardGeneration(rs, initial_byte_size, level, remset), @@ -99,10 +99,10 @@ {} inline bool is_in(const void* p) const; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/watermark.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/watermark.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp @@ -40,8 +40,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC { void set_point(HeapWord* p) { _point = p; } @@ -114,29 +114,28 @@ }; inline bool operator==(const WaterMark& x, const WaterMark& y) { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp -@@ -70,11 +70,11 @@ class CollectorPolicy : public CHeapObj - size_t _max_alignment; +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp +@@ -83,11 +83,11 @@ class CollectorPolicy : public CHeapObj + bool _all_soft_refs_clear; CollectorPolicy() : - _min_alignment(1), - _max_alignment(1), _initial_heap_byte_size(0), _max_heap_byte_size(0), -- _min_heap_byte_size(0) -+ _min_heap_byte_size(0), + _min_heap_byte_size(0), + _min_alignment(1), -+ _max_alignment(1) - {} - - public: -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp ++ _max_alignment(1), + _size_policy(NULL), + _should_clear_all_soft_refs(false), + _all_soft_refs_clear(false) +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp @@ -44,7 +44,7 @@ class GenerationCounters: public CHeapOb // This constructor is only meant for use with the PSGenerationCounters // constructor. The need for such an constructor should be eliminated @@ -146,10 +145,10 @@ public: GenerationCounters(const char* name, int ordinal, int spaces, -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/space.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/space.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/space.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/space.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp @@ -328,7 +328,7 @@ public: DirtyCardToOopClosure(Space* sp, OopClosure* cl, CardTableModRefBS::PrecisionStyle precision, @@ -159,10 +158,10 @@ _min_done(NULL) { NOT_PRODUCT(_last_bottom = NULL); NOT_PRODUCT(_last_explicit_min_done = NULL); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp @@ -314,8 +314,8 @@ class VM_FindDeadlocks: public VM_Operat outputStream* _out; @@ -174,10 +173,10 @@ ~VM_FindDeadlocks(); DeadlockCycle* result() { return _deadlocks; }; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp @@ -309,8 +309,8 @@ public: // A plain safepoint advertises no memory effects (NULL): const TypePtr* adr_type = NULL) @@ -199,10 +198,10 @@ { #ifndef PRODUCT _counter = NULL; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/type.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/type.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/type.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/type.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp @@ -575,7 +575,7 @@ class TypePtr : public Type { public: enum PTR { TopPTR, AnyNull, Constant, Null, NotNull, BotPTR, lastPTR }; @@ -212,10 +211,10 @@ virtual bool eq( const Type *t ) const; virtual int hash() const; // Type specific hashing static const PTR ptr_meet[lastPTR][lastPTR]; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/machnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/machnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp @@ -780,7 +780,7 @@ public: uint _block_num; @@ -225,10 +224,10 @@ labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {} -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/runtime.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/runtime.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp @@ -64,8 +64,8 @@ private: NamedCounter(const char *n, CounterTag tag = NoTag): _name(n), @@ -240,10 +239,10 @@ const char * name() const { return _name; } int count() const { return _count; } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/block.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/block.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/block.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/block.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp @@ -47,7 +47,7 @@ protected: public: Arena *_arena; // Arena to allocate in @@ -277,10 +276,10 @@ set_next(b, NULL); set_prev(b, NULL); }; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp @@ -299,9 +299,9 @@ public: : _parent(0), _next(0), _child(0), _head(head), _tail(tail), @@ -293,10 +292,10 @@ { } // Is 'l' a member of 'this'? -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/subnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/subnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp @@ -278,7 +278,7 @@ class BoolNode : public Node { virtual uint size_of() const; public: @@ -306,10 +305,10 @@ init_class_id(Class_Bool); } // Convert an arbitrary int value to a Bool or other suitable predicate. -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp @@ -139,7 +139,7 @@ class ImplicitExceptionTable VALUE_OBJ_C implicit_null_entry *adr( uint idx ) const { return &_data[2*idx]; } ReallocMark _nesting; // assertion check for reallocations @@ -319,11 +318,11 @@ // (run-time) construction from nmethod ImplicitExceptionTable( const nmethod *nm ); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp -@@ -165,13 +165,13 @@ void MatchList::output(FILE *fp) { +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +@@ -166,13 +166,13 @@ void MatchList::output(FILE *fp) { ArchDesc::ArchDesc() : _globalNames(cmpstr,hashstr, Form::arena), @@ -341,10 +340,10 @@ // Initialize the opcode to MatchList table with NULLs for( int i=0; i<_last_opcode; ++i ) { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/forms.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/forms.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp @@ -142,7 +142,7 @@ public: // Public Methods @@ -354,10 +353,10 @@ ~Form() {}; virtual bool ideal_only() const { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp @@ -29,8 +29,8 @@ //----------------------------ADLParser---------------------------------------- // Create a new ADL parser @@ -369,10 +368,10 @@ _AD._syntax_errs = _AD._semantic_errs = 0; // No errors so far this file _AD._warnings = 0; // No warnings either _curline = _ptr = NULL; // No pointers into buffer yet -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/arena.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/arena.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp @@ -71,7 +71,7 @@ Arena::Arena() { } @@ -382,10 +381,10 @@ set_size_in_bytes(a->size_in_bytes()); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp @@ -52,11 +52,11 @@ public: // doubled in size; the total amount of EXTRA times all hash functions are // computed for the doubling is no more than the current size - thus the @@ -400,10 +399,10 @@ init(); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp @@ -29,7 +29,7 @@ using namespace std; //------------------------------FileBuff--------------------------------------- @@ -422,10 +421,10 @@ _next = NULL; // No chained regions } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp @@ -182,8 +182,8 @@ void RegisterForm::output(FILE *fp) { RegDef::RegDef(char *regname, char *callconv, char *c_conv, char * idealtype, char * encode, char * concrete) : _regname(regname), _callconv(callconv), _c_conv(c_conv), ++++++ openjdk-6-src-b20-no-werror.patch ++++++ --- /var/tmp/diff_new_pack.k6HWHX/_old 2011-02-27 12:45:39.000000000 +0100 +++ /var/tmp/diff_new_pack.k6HWHX/_new 2011-02-27 12:45:39.000000000 +0100 @@ -1,8 +1,17 @@ -Index: icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/gcc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/linux/makefiles/gcc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/gcc.make -@@ -111,7 +111,8 @@ else +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -118,7 +118,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +@@ -130,7 +130,8 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif @@ -12,10 +21,10 @@ # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) -Index: icedtea6-1.9.1/openjdk/jdk/make/common/Defs-linux.gmk +Index: icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk =================================================================== ---- icedtea6-1.9.1.orig/openjdk/jdk/make/common/Defs-linux.gmk -+++ icedtea6-1.9.1/openjdk/jdk/make/common/Defs-linux.gmk +--- icedtea6-1.9.7.orig/openjdk/jdk/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk @@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed @@ -24,29 +33,29 @@ - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) -+# GCC_WARNINGS += -Werror ++# GCC_WARNINGS += -Wall +#endif # # Misc compiler options -Index: icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/adlc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/linux/makefiles/adlc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/adlc.make +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/adlc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make @@ -62,7 +62,8 @@ CPPFLAGS += -DASSERT # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors -CFLAGS_WARN = -Werror +# XXX: Who could fix all those stupid errors on gcc 4.5? -+#CFLAGS_WARN = -Werror ++#CFLAGS_WARN = -Wall CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ -Index: icedtea6-1.9.1/openjdk/corba/make/common/Defs-linux.gmk +Index: icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk =================================================================== ---- icedtea6-1.9.1.orig/openjdk/corba/make/common/Defs-linux.gmk -+++ icedtea6-1.9.1/openjdk/corba/make/common/Defs-linux.gmk +--- icedtea6-1.9.7.orig/openjdk/corba/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk @@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed @@ -55,17 +64,21 @@ - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) -+# GCC_WARNINGS += -Werror ++# GCC_WARNINGS += -Wall +#endif # # Misc compiler options -Index: icedtea6-1.9.1/openjdk/hotspot/make/solaris/makefiles/gcc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/solaris/makefiles/gcc.make -@@ -114,7 +114,7 @@ endif - WARNINGS_ARE_ERRORS = -Werror +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make +@@ -111,10 +111,10 @@ endif + + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall # Enable these warnings. See 'info gcc' about details on these options ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) @@ -73,3 +86,68 @@ # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) +Index: icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk +@@ -144,7 +144,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G + # Treat compiler warnings as errors, if warnings not allowed + # + ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror ++ GCC_WARNINGS += -Wall + endif + + # +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +@@ -62,7 +62,7 @@ CPPFLAGS += -DASSERT + + # CFLAGS_WARN holds compiler options to suppress/enable warnings. + # Compiler warnings are treated as errors +-CFLAGS_WARN = -Werror ++CFLAGS_WARN = -Wall + CFLAGS += $(CFLAGS_WARN) + + OBJECTNAMES = \ +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +@@ -118,7 +118,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +@@ -111,7 +111,7 @@ endif + + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + # Enable these warnings. See 'info gcc' about details on these options + ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare + CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) +Index: icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk +@@ -154,7 +154,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G + # Treat compiler warnings as errors, if warnings not allowed + # + ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror ++ GCC_WARNINGS += -Wall + endif + + # ++++++ openjdk-6-src-b20-stringcompare.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c @@ -574,7 +574,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10, nativename, size * 10); - if (nativename != NULL && nativename != "") + if (nativename != NULL && strcmp(nativename, "")) JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); /* ++++++ openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/bin/jexec.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c @@ -221,6 +221,9 @@ int main(int argc, const char * argv[]) * implies an error in the exec. */ free(nargv); errorExit(errno, BAD_EXEC_MSG); + + /* Just supress compiler warning */ + return 0; } Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c @@ -138,10 +138,12 @@ jboolean XShared_initIDs(JNIEnv *env, jb } } - return JNI_TRUE; #endif /* MITSHM */ #endif /* !HEADLESS */ + + /* Supress compiler warning */ + return JNI_TRUE; } @@ -463,8 +465,10 @@ jboolean XShared_initSurface(JNIEnv *env return JNI_FALSE; } - return JNI_TRUE; #endif /* !HEADLESS */ + + /* Suppress compiler warning */ + return JNI_TRUE; } Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -494,6 +494,9 @@ JVM_handle_linux_signal(int sig, err.report_and_die(); ShouldNotReachHere(); + + /*Supress compiler warnings*/ + return -1; } void os::Linux::init_thread_fpu_state(void) { Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad @@ -1133,6 +1133,7 @@ uint MachSpillCopyNode::implementation( Unimplemented(); + return -1; //avoid compiler warning } #ifndef PRODUCT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 insserv for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package insserv for openSUSE:11.4 checked in at Sun Feb 27 12:45:21 CET 2011. -------- --- old-versions/11.4/all/insserv/insserv.changes 2011-02-10 12:50:34.000000000 +0100 +++ 11.4/insserv/insserv.changes 2011-02-25 17:40:41.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 25 17:39:37 CET 2011 - werner(a)suse.de + +- Skip `FATAL' key word from messages currently nonfatal + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.flHXcS/_old 2011-02-27 12:44:56.000000000 +0100 +++ /var/tmp/diff_new_pack.flHXcS/_new 2011-02-27 12:44:56.000000000 +0100 @@ -24,7 +24,7 @@ Provides: aaa_base:/sbin/insserv AutoReqProv: on Version: 1.14.0 -Release: 15 +Release: 20.<RELEASE2> Summary: A Program to Arrange Initialization Scripts Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.b… ++++++ insserv-1.14.0.dif ++++++ --- /var/tmp/diff_new_pack.flHXcS/_old 2011-02-27 12:44:56.000000000 +0100 +++ /var/tmp/diff_new_pack.flHXcS/_new 2011-02-27 12:44:56.000000000 +0100 @@ -1,5 +1,5 @@ --- insserv.c -+++ insserv.c 2010-12-01 11:09:35.795926353 +0000 ++++ insserv.c 2011-02-25 16:37:28.887927611 +0000 @@ -26,6 +26,7 @@ #define MINIMAL_MAKE 1 /* Remove disabled scripts from .depend.boot, * .depend.start, .depend.halt, and .depend.stop */ @@ -326,7 +326,7 @@ } if (script_inf.default_start && script_inf.default_start != empty) { -@@ -3357,6 +3452,111 @@ int main (int argc, char *argv[]) +@@ -3357,6 +3452,123 @@ int main (int argc, char *argv[]) active_script(); /* @@ -373,22 +373,28 @@ + } + clvl &= ~mlvl; + if ((must->attr.flags & SERV_WARNED) == 0) ++#ifndef OSCBUILD ++ warn("Service %s is missed in the runlevels %s to use service %s\n", ++ must->name, lvl2str(clvl), cur->name); ++#else + warn("FATAL: service %s is missed in the runlevels %s to use service %s\n", + must->name, lvl2str(clvl), cur->name); -+ must->attr.flags |= SERV_WARNED; -+#ifndef OSCBUILD + waserr = true; +#endif ++ must->attr.flags |= SERV_WARNED; + continue; + } + if ((must->attr.flags & (SERV_ENFORCE|SERV_KNOWN)) == SERV_ENFORCE) { + if ((must->attr.flags & SERV_WARNED) == 0) ++#ifndef OSCBUILD ++ warn("Service %s has to exists for service %s\n", ++ must->name, cur->name); ++#else + warn("FATAL: service %s has to exists for service %s\n", + must->name, cur->name); -+ must->attr.flags |= SERV_WARNED; -+#ifndef OSCBUILD + waserr = true; +#endif ++ must->attr.flags |= SERV_WARNED; + continue; + } + if (recursive) { @@ -402,9 +408,12 @@ + continue; + if ((must->attr.flags & (SERV_CMDLINE|SERV_KNOWN)) == 0) { + if ((must->attr.flags & SERV_WARNED) == 0) ++#ifndef OSCBUILD ++ warn("Service %s has to exists for service %s\n", ++ must->name, cur->name); ++#else + warn("FATAL: service %s has to exists for service %s\n", + must->name, cur->name); -+#ifndef OSCBUILD + waserr = true; +#endif + must->attr.flags |= SERV_WARNED; @@ -420,12 +429,15 @@ + continue; + clvl &= ~mlvl; + if ((must->attr.flags & SERV_WARNED) == 0) ++#ifndef OSCBUILD ++ warn("Service %s is missed in the runlevels %s to use service %s\n", ++ must->name, lvl2str(clvl), cur->name); ++#else + warn("FATAL: service %s is missed in the runlevels %s to use service %s\n", + must->name, lvl2str(clvl), cur->name); -+ must->attr.flags |= SERV_WARNED; -+#ifndef OSCBUILD + waserr = true; +#endif ++ must->attr.flags |= SERV_WARNED; + } + } + } @@ -438,7 +450,7 @@ * Sorry but we support only [KS][0-9][0-9]<name> */ if (maxstart > MAX_DEEP || maxstop > MAX_DEEP) -@@ -3435,13 +3635,16 @@ int main (int argc, char *argv[]) +@@ -3435,13 +3647,16 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', lvl))) { @@ -456,7 +468,7 @@ slink = false; if ((serv->start->lvl & lvl) == 0) goto stop; -@@ -3616,7 +3819,7 @@ int main (int argc, char *argv[]) +@@ -3616,7 +3831,7 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', seek))) { @@ -465,7 +477,7 @@ boolean found; char * clink; char mode; -@@ -3624,6 +3827,9 @@ int main (int argc, char *argv[]) +@@ -3624,6 +3839,9 @@ int main (int argc, char *argv[]) if (*script == '$') /* Do not link in virtual dependencies */ continue; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gfxboot for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package gfxboot for openSUSE:11.4 checked in at Sun Feb 27 12:44:25 CET 2011. -------- --- old-versions/11.4/all/gfxboot/gfxboot.changes 2011-02-21 17:30:41.000000000 +0100 +++ 11.4/gfxboot/gfxboot.changes 2011-02-24 14:02:53.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 24 14:02:03 CET 2011 - snwint(a)suse.de + +- default to hd install with isohybrid boot from hd + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- gfxboot-4.3.7.tar.bz2 New: ---- gfxboot-4.3.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.FseS2J/_old 2011-02-27 12:44:04.000000000 +0100 +++ /var/tmp/diff_new_pack.FseS2J/_new 2011-02-27 12:44:04.000000000 +0100 @@ -27,10 +27,10 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.3.7 +Version: 4.3.8 Release: 1.<RELEASE2> BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.3.7.tar.bz2 +Source: gfxboot-4.3.8.tar.bz2 Source1: openSUSE.tar.bz2 Source2: SLED.tar.bz2 Source3: SLES.tar.bz2 ++++++ SLED.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ gfxboot-4.3.7.tar.bz2 -> gfxboot-4.3.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.3.7/VERSION new/gfxboot-4.3.8/VERSION --- old/gfxboot-4.3.7/VERSION 2011-02-21 17:29:46.000000000 +0100 +++ new/gfxboot-4.3.8/VERSION 2011-02-24 14:01:46.000000000 +0100 @@ -1 +1 @@ -4.3.7 +4.3.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.3.7/changelog new/gfxboot-4.3.8/changelog --- old/gfxboot-4.3.7/changelog 2011-02-21 17:29:47.000000000 +0100 +++ new/gfxboot-4.3.8/changelog 2011-02-24 14:01:48.000000000 +0100 @@ -1,4 +1,7 @@ -2011-02-21: HEAD +2011-02-24: HEAD + - default to hd install with isohybrid boot from hd + +2011-02-21: 4.3.7 - new oS 11.4 branding 2011-01-13: 4.3.6 ++++++ openSUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_install.inc new/themes/openSUSE/src/dia_install.inc --- old/themes/openSUSE/src/dia_install.inc 2010-10-04 14:50:42.000000000 +0200 +++ new/themes/openSUSE/src/dia_install.inc 2011-02-24 13:53:06.000000000 +0100 @@ -24,6 +24,11 @@ /install.default .inst_cdrom def +% isohybrid image booted as disk +sectorsize 0x800 eq bootdrive 0x80 eq and { + /install.default .inst_hd def +} if + % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Build install mode list. % ++++++ upstream.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gconf2-branding-openSUSE for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:11.4 checked in at Sun Feb 27 12:43:45 CET 2011. -------- --- old-versions/11.4/all/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-02-21 23:14:51.000000000 +0100 +++ 11.4/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-02-27 12:43:02.597188000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 25 11:03:12 CET 2011 - vuntz(a)opensuse.org + +- Update gnome-panel-layout.patch: make sure there is no empty + space between the main-menu, tomboy and the window list. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.FsOtCG/_old 2011-02-27 12:43:19.000000000 +0100 +++ /var/tmp/diff_new_pack.FsOtCG/_new 2011-02-27 12:43:19.000000000 +0100 @@ -50,7 +50,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: %{desktop_data_ver} -Release: 8.<RELEASE3> +Release: 8.<RELEASE4> Source: gconf2-branding_spec-prepare.sh # panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries gconf2-branding-SLES.spec: same change ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.FsOtCG/_old 2011-02-27 12:43:19.000000000 +0100 +++ /var/tmp/diff_new_pack.FsOtCG/_new 2011-02-27 12:43:19.000000000 +0100 @@ -50,7 +50,7 @@ Group: System/GUI/GNOME Summary: openSUSE defaults for the GNOME configuration system Version: %{desktop_data_ver} -Release: 14.<RELEASE2> +Release: 14.<RELEASE3> Source: gconf2-branding_spec-prepare.sh # panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.FsOtCG/_old 2011-02-27 12:43:19.000000000 +0100 +++ /var/tmp/diff_new_pack.FsOtCG/_new 2011-02-27 12:43:19.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 25 11:03:12 CET 2011 - vuntz(a)opensuse.org + +- Update gnome-panel-layout.patch: make sure there is no empty + space between the main-menu, tomboy and the window list. + +------------------------------------------------------------------- Mon Feb 21 14:12:02 CET 2011 - vuntz(a)opensuse.org - Remove support for building on openSUSE < 11.4: the changes we're ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.FsOtCG/_old 2011-02-27 12:43:19.000000000 +0100 +++ /var/tmp/diff_new_pack.FsOtCG/_new 2011-02-27 12:43:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gconf2-branding-%{branding_name} (Version 11.4) +# spec file for package gconf2-branding-%{branding_name} # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ gnome-panel-layout.patch ++++++ --- /var/tmp/diff_new_pack.FsOtCG/_old 2011-02-27 12:43:19.000000000 +0100 +++ /var/tmp/diff_new_pack.FsOtCG/_new 2011-02-27 12:43:19.000000000 +0100 @@ -193,7 +193,7 @@ + <key>applets/tomboy/position</key> + <schema_key>/schemas/apps/panel/objects/position</schema_key> + <value> -+ <int>103</int> ++ <int>1</int> + </value> + </entry> + <entry> @@ -303,7 +303,7 @@ <schema_key>/schemas/apps/panel/objects/position</schema_key> <value> - <int>1</int> -+ <int>125</int> ++ <int>2</int> </value> </entry> <entry> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 desktop-translations for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package desktop-translations for openSUSE:11.4 checked in at Sun Feb 27 12:42:48 CET 2011. -------- --- old-versions/11.4/all/desktop-translations/desktop-translations.changes 2011-02-17 14:47:25.000000000 +0100 +++ 11.4/desktop-translations/desktop-translations.changes 2011-02-25 10:25:12.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 25 10:24:55 CET 2011 - ke(a)suse.de + +- update translations. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-translations.spec ++++++ --- /var/tmp/diff_new_pack.KIyQRl/_old 2011-02-27 12:41:54.000000000 +0100 +++ /var/tmp/diff_new_pack.KIyQRl/_new 2011-02-27 12:41:54.000000000 +0100 @@ -20,7 +20,7 @@ Name: desktop-translations Version: 11.4 -Release: 8.<RELEASE3> +Release: 8.<RELEASE4> Summary: Desktop Files Translation updates License: BSD3c(or similar) Group: System/GUI/Other ++++++ desktop-translations.tar.bz2 ++++++ old-versions/11.4/all/desktop-translations/desktop-translations.tar.bz2 11.4/desktop-translations/desktop-translations.tar.bz2 differ: char 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 cronie for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package cronie for openSUSE:11.4 checked in at Sun Feb 27 12:41:38 CET 2011. -------- --- old-versions/11.4/all/cronie/cronie.changes 2011-01-06 16:40:21.000000000 +0100 +++ 11.4/cronie/cronie.changes 2011-02-24 13:57:42.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 24 12:33:31 UTC 2011 - vcizek(a)novell.com + +- bnc#662433 again: + added quiet option to pam config, in order to avoid logging, + when /etc/cron.allow is missing + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ --- /var/tmp/diff_new_pack.F64wBk/_old 2011-02-27 12:40:55.000000000 +0100 +++ /var/tmp/diff_new_pack.F64wBk/_new 2011-02-27 12:40:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cronie (Version 1.4.6) +# spec file for package cronie # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) Version: 1.4.6 -Release: 6 +Release: 7.<RELEASE2> %{expand: %%define cronie_version %version} Summary: Cron Daemon Source0: %name-%version.tar.xz @@ -68,7 +68,7 @@ %package -n cron License: MIT and BSD and GPLv2 Version: 4.2 -Release: 8 +Release: 9.<RELEASE2> Summary: Auxiliary package Group: System/Daemons Requires: %{name} = %{cronie_version}-%{release} ++++++ cronie-pam_config.diff ++++++ --- /var/tmp/diff_new_pack.F64wBk/_old 2011-02-27 12:40:55.000000000 +0100 +++ /var/tmp/diff_new_pack.F64wBk/_new 2011-02-27 12:40:55.000000000 +0100 @@ -12,7 +12,7 @@ -session include password-auth -auth include password-auth +auth sufficient pam_rootok.so -+account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed ++account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed quiet +auth include common-auth +account include common-account +password include common-password ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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