May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon May 9 09:59:01 CEST 2011. -------- --- kiwi/kiwi.changes 2011-04-21 14:01:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-05-06 15:26:32.000000000 +0200 @@ -1,0 +2,104 @@ +Fri May 6 15:11:27 CEST 2011 - ms(a)suse.de + +- v4.88 released + +------------------------------------------------------------------- +Fri May 6 15:09:30 CEST 2011 - ms(a)suse.de + +- fixed build for ia64 architecture + +------------------------------------------------------------------- +Fri May 6 09:01:54 CEST 2011 - ms(a)suse.de + +- added hook preNetworkRelease (bnc #691249) + +------------------------------------------------------------------- +Wed May 4 15:30:38 CEST 2011 - ms(a)suse.de + +- fixed the problem where the <size> element is being dropped + during XML file upgrade if the <size> element is specified as + a child of <preferences>. The <size> element is moved to + every <type> + +------------------------------------------------------------------- +Wed May 4 15:09:13 CEST 2011 - ms(a)suse.de + +- fixed xsl style sheets, apply changes only if the + schema version of the input data is smaller than the + style sheet version + +------------------------------------------------------------------- +Wed May 4 09:31:21 CEST 2011 - ms(a)suse.de + +- fixed typo in kiwi_bootloader evaluation (bnc #691424) +- fixed hvc/xvc console setup, add entry only if missing (bnc #691424) + +------------------------------------------------------------------- +Tue May 3 17:28:34 CEST 2011 - root(a)suse.de + +- fixed disk offset calculation for zipl.conf creation, also + fixed the lookup of the boot partition and the cleanup of the + loop devices if the zipl bootloader is used (bnc #687927) + +------------------------------------------------------------------- +Tue May 3 14:55:24 CEST 2011 - ms(a)suse.de + +- switch back to by-id device name schema (bnc #691199) + This reverts commit: f1e31c85689d6925b9c3069a845f5e252c838936 + +------------------------------------------------------------------- +Tue May 3 14:08:11 CEST 2011 - ms(a)suse.de + +- fixed first type selection for a subset of types selected + by profiles. This is a follow up fix for (bnc #690554) + +------------------------------------------------------------------- +Tue May 3 09:36:14 CEST 2011 - ms(a)suse.de + +- DB: update documentation, FORCE_KEXEC feature (bnc #691247) + +------------------------------------------------------------------- +Tue May 3 09:35:06 CEST 2011 - ms(a)suse.de + +- added support for FORCE_KEXEC in kernelCheck function which + allows to force the kexec call even if the kernel versions + are the same (bnc #691247) + +------------------------------------------------------------------- +Mon May 2 17:20:39 CEST 2011 - ms(a)suse.de + +- removed pxeNotifyNewImage function. This is done inside the + slepos specific code hooked in (bnc #691249) + +------------------------------------------------------------------- +Mon May 2 17:17:49 CEST 2011 - ms(a)suse.de + +- make sure bootincluded_archives.filelist contains only files + +------------------------------------------------------------------- +Mon May 2 15:38:37 CEST 2011 - ms(a)suse.de + +- move the createTmpDirectory code from the XML object to the Locator. + Creating a directory really has nothing to do with XML processing, + the Locator now handles local file system interaction, thus this + is a better place. + +------------------------------------------------------------------- +Mon May 2 14:56:23 CEST 2011 - ms(a)suse.de + +- fixed reboot call in kernelCheck function (bnc #689294) + +------------------------------------------------------------------- +Mon May 2 10:28:01 CEST 2011 - ms(a)suse.de + +- fixed type selection if not type was specified and no primary + attribute is set to any type. In that case the first type written + in the XML description should be used (bnc #690554) + +------------------------------------------------------------------- +Thu Apr 28 18:19:54 CEST 2011 - ms(a)suse.de + +- also allow NFSROOT and AOEROOT to be set on the + commandline (bnc #536309) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.NvlfLP/_old 2011-05-09 09:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.NvlfLP/_new 2011-05-09 09:58:03.000000000 +0200 @@ -65,7 +65,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.87 +Version: 4.88 Release: 1 Group: System/Management License: GPLv2 @@ -483,6 +483,8 @@ %{_datadir}/kiwi/image/oemboot/suse* %endif +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x + %files -n kiwi-templates %defattr(-, root, root) %ifarch %ix86 x86_64 @@ -501,5 +503,7 @@ %{_datadir}/kiwi/image/suse-SLE11-JeOS %endif +%endif + %changelog ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-04-21 13:57:55.000000000 +0200 +++ new/kiwi/.revision 2011-05-06 15:22:52.000000000 +0200 @@ -1 +1 @@ -dec521fd69f73299badd58ccf92098e59cfb1f71 +20f6c66b4f42e859abac467956b0262fc47768e7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-04-21 13:57:55.000000000 +0200 +++ new/kiwi/kiwi.pl 2011-05-06 15:22:52.000000000 +0200 @@ -50,7 +50,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.87"; +our $Version = "4.88"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de"; our $ConfigFile = "$ENV{'HOME'}/.kiwirc"; @@ -2734,7 +2734,7 @@ #========================================== # Initialize installation source tree #------------------------------------------ - my $root = $xml -> createTmpDirectory ( undef, $RootTree ); + my $root = $locator -> createTmpDirectory ( undef, $RootTree ); if (! defined $root) { $kiwi -> error ("Couldn't create instsource root"); $kiwi -> failed (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2011-04-21 12:02:24.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-05-06 15:22:52.000000000 +0200 @@ -3506,11 +3506,11 @@ } elsif (($type=~ /^KIWI USB/)||($imgtype=~ /vmx|oem|split/)) { print FD "\t"."image = boot/linux.vmx"."\n"; print FD "\t"."target = boot/zipl"."\n"; - print FD "\t"."ramdisk = boot/initrd.vmx,0x2000000"."\n"; + print FD "\t"."ramdisk = boot/initrd.vmx,0x4000000"."\n"; } else { print FD "\t"."image = boot/linux"."\n"; print FD "\t"."target = boot/zipl"."\n"; - print FD "\t"."ramdisk = boot/initrd,0x2000000"."\n"; + print FD "\t"."ramdisk = boot/initrd,0x4000000"."\n"; } print FD "\t"."parameters = \"loader=$bloader"; print FD " $cmdline\""."\n"; @@ -3526,11 +3526,11 @@ } elsif (($type=~ /^KIWI USB/)||($imgtype=~ /vmx|oem|split/)) { print FD "\t"."image = boot/linux.vmx"."\n"; print FD "\t"."target = boot/zipl"."\n"; - print FD "\t"."ramdisk = boot/initrd.vmx,0x2000000"."\n"; + print FD "\t"."ramdisk = boot/initrd.vmx,0x4000000"."\n"; } else { print FD "\t"."image = boot/linux"."\n"; print FD "\t"."target = boot/zipl"."\n"; - print FD "\t"."ramdisk = boot/initrd,0x2000000"."\n"; + print FD "\t"."ramdisk = boot/initrd,0x4000000"."\n"; } print FD "\t"."parameters = \"x11failsafe loader=$bloader"; print FD " $cmdline\""."\n"; @@ -3848,16 +3848,20 @@ if ($loader eq "zipl") { $kiwi -> info ("Installing zipl on device: $diskname"); my $bootdev; - my @geometry; + my $offset; my $haveRealDevice = 0; if ($diskname !~ /\/dev\//) { #========================================== - # detect disk geometry of disk image file + # clean loop maps #------------------------------------------ - @geometry = $this -> diskGeometry ($diskname); - if (! @geometry) { + $this -> cleanLoop (); + #========================================== + # detect disk offset of disk image file + #------------------------------------------ + $offset = $this -> diskOffset ($diskname); + if (! $offset) { $kiwi -> failed (); - $kiwi -> error ("Failed to detect disk geometry"); + $kiwi -> error ("Failed to detect disk offset"); $kiwi -> failed (); return undef; } @@ -3872,7 +3876,18 @@ $this -> cleanLoop (); return undef; } - $bootdev = $this->{bindloop}.$geometry[2]; + #========================================== + # find boot partition + #------------------------------------------ + $bootdev = $this->{bindloop}."2"; + if (! -e $bootdev) { + $bootdev = $this->{bindloop}."1"; + } else { + my $type = qxx ("blkid $bootdev -s TYPE -o value"); + if ($type =~ /LVM/) { + $bootdev = $this->{bindloop}."1"; + } + } if (! -e $bootdev) { $kiwi -> failed (); $kiwi -> error ("Can't find loop map: $bootdev"); @@ -3881,6 +3896,9 @@ return undef; } } else { + #========================================== + # find boot partition + #------------------------------------------ $bootdev = $diskname."2"; if (! -e $bootdev) { $bootdev = $diskname."1"; @@ -3927,13 +3945,18 @@ $this -> cleanLoop (); return undef; } + $kiwi -> loginfo ("zipl.conf target values:\n"); foreach my $line (@data) { print FD $line; if ($line =~ /^:menu/) { + $kiwi -> loginfo ("targetbase = $this->{loop}\n"); + $kiwi -> loginfo ("targetbase = SCSI\n"); + $kiwi -> loginfo ("targetblocksize = 512\n"); + $kiwi -> loginfo ("targetoffset = $offset\n"); print FD "\t"."targetbase = $this->{loop}"."\n"; print FD "\t"."targettype = SCSI"."\n"; print FD "\t"."targetblocksize = 512"."\n"; - print FD "\t"."targetoffset = $geometry[1]"."\n"; + print FD "\t"."targetoffset = $offset"."\n"; } } close FD; @@ -4952,39 +4975,29 @@ } #========================================== -# diskGeometry +# diskOffset #------------------------------------------ -sub diskGeometry { +sub diskOffset { # ... - # find disk geometry: CYLINDERS,HEADS,SECTORS and - # also the start sector of the boot partition which - # is in kiwi always the last partition in the table + # find the offset to the start of the first partition # --- my $this = shift; my $disk = shift; - my $bootid = 0; - my $geometry; - my $bootsector; - my $bios = qx (parted $disk unit cyl print | grep BIOS 2>&1); + my $offset; my @table = qx (parted -m $disk unit s print 2>&1); - if ($bios =~ /geometry: (.*?)\./) { - $geometry = $1; - } else { - return undef; - } chomp @table; foreach my $entry (@table) { if ($entry =~ /^[1-4]:/) { my @items = split (/:/,$entry); - $bootsector = $items[1]; - chop $bootsector; - $bootid++; + $offset = $items[1]; + chop $offset; + last; } } - if (! $bootsector) { + if (! $offset) { return undef; } - return ($geometry,$bootsector,$bootid); + return $offset; } #========================================== 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-04-21 12:02:25.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-05-06 15:22:52.000000000 +0200 @@ -958,7 +958,7 @@ para="$para \"$1\"" shift done - if [ ! -z "kiwi_bootloader" ];then + if [ ! -z "$kiwi_bootloader" ];then loader=$kiwi_bootloader fi if [ -z "$loader" ];then @@ -2538,18 +2538,26 @@ break fi done - if [ $kreboot = 0 ];then - return + #====================================== + # check for forced reboot + #-------------------------------------- + if [ ! -z "$FORCE_KEXEC" ];then + kreboot=2 fi - Echo "Kernel versions do not match..." + #====================================== + # evaluate kreboot condition + #-------------------------------------- + case $kreboot in + 1) Echo "Kernel versions do not match..." ;; + 2) Echo "kexec based reboot forced..." ;; + 0) return ;; + esac #====================================== # trigger reboot if kexec doesn't exist #-------------------------------------- if [ ! -f /sbin/kexec ];then Echo "Reboot triggered in 5 sec..." - export REBOOT_IMAGE="yes" - sleep 5 - return + sleep 5 ; /sbin/reboot -f -i fi #====================================== # trigger reboot using kexec @@ -2569,9 +2577,7 @@ if [ ! -f $prefix/boot/$kernel ] || [ ! -f $prefix/boot/$initrd ];then Echo "Can't find $kernel / $initrd in system image" Echo "Reboot triggered in 5 sec..." - export REBOOT_IMAGE="yes" - sleep 5 - return + sleep 5 ; /sbin/reboot -f -i fi #====================================== # extract bootloader cmdline params @@ -2585,9 +2591,7 @@ if [ ! $? = 0 ];then Echo "Failed to load kernel" Echo "Reboot triggered in 5 sec..." - export REBOOT_IMAGE="yes" - sleep 5 - return + sleep 5 ; /sbin/reboot -f -i fi #====================================== # go for gold @@ -5049,7 +5053,7 @@ echo $device return fi - for i in /dev/disk/by-path/*;do + for i in /dev/disk/by-id/*;do if [ -z "$i" ];then continue fi @@ -6491,33 +6495,6 @@ done } #====================================== -# pxeNotifyNewImage -#-------------------------------------- -function pxeNotifyNewImage { - # /.../ - # upload image name and version information to - # the pxe boot server - # ---- - local count=0 - local field=0 - IFS="," ; for i in $IMAGE;do - count=$(($count + 1)) - field=0 - IFS=";" ; for n in $i;do - case $field in - 0) field=1 ;; - 1) imageName=$n ; field=2 ;; - 2) imageVersion=$n; field=3 - esac - done - Echo "Notify of new image: image/$imageName" - echo "image/$imageName" > bootversion.$DHCPCHADDR - echo "$imageVersion" >> bootversion.$DHCPCHADDR - putFile bootversion.$DHCPCHADDR upload/bootversion.$DHCPCHADDR - rm -f bootversion.$DHCPCHADDR - done -} -#====================================== # pxeCheckServer #-------------------------------------- function pxeCheckServer { @@ -7060,12 +7037,16 @@ local itab=/etc/inittab local stty=/etc/securetty if [ -e /sys/class/tty/xvc0 ];then - echo "X0:12345:respawn:/sbin/mingetty --noclear xvc0 linux" >> $itab - echo xvc0 >> $stty + if ! grep -q xvc0 $itab;then + echo "X0:12345:respawn:/sbin/mingetty --noclear xvc0 linux" >> $itab + echo xvc0 >> $stty + fi fi if [ -e /sys/class/tty/hvc0 ];then - echo "H0:12345:respawn:/sbin/mingetty --noclear hvc0 linux" >> $itab - echo hvc0 >> $stty + if ! grep -q hvc0 $itab;then + echo "H0:12345:respawn:/sbin/mingetty --noclear hvc0 linux" >> $itab + echo hvc0 >> $stty + fi fi } #====================================== 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-03-15 12:07:25.000000000 +0100 +++ new/kiwi/modules/KIWILocator.pm 2011-05-06 15:22:52.000000000 +0200 @@ -8,8 +8,8 @@ # : # BELONGS TO : Operating System images # : -# DESCRIPTION : This module is used to perform operation to locate -# : objects needed by Kiwi in the filesystem +# DESCRIPTION : This module is used to perform operations +# : on the local filesystem # : # STATUS : Development #---------------- @@ -27,7 +27,7 @@ # Exports #------------------------------------------ our @ISA = qw (Exporter); -our @EXPORT = qw (getExecPath getControlFile ); +our @EXPORT = qw (createTmpDirectory getExecPath getControlFile ); #========================================== # Constructor @@ -61,6 +61,61 @@ } #========================================== +# createTmpDirectory +#------------------------------------------ +sub createTmpDirectory { + my $this = shift; + my $useRoot = shift; + my $selfRoot = shift; + my $rootError = 1; + my $root; + my $code; + my $kiwi = $this->{kiwi}; + if (! defined $useRoot) { + if (! defined $selfRoot) { + $root = qxx (" mktemp -q -d /tmp/kiwi.XXXXXX "); + $code = $? >> 8; + if ($code == 0) { + $rootError = 0; + } + chomp $root; + } else { + $root = $selfRoot; + rmdir $root; + if ( -e $root && -d $root && $main::ForceNewRoot ) { + $kiwi -> info ("Removing old root directory '$root'"); + if (-e $root."/base-system") { + $kiwi -> failed(); + $kiwi -> info ("Mount point /base-system exists"); + $kiwi -> failed(); + return undef; + } + qxx ("rm -R $root"); + $kiwi -> done(); + } + if (mkdir $root) { + $rootError = 0; + } + } + } else { + if (-d $useRoot) { + $root = $useRoot; + $rootError = 0; + } + } + if ( $rootError ) { + if ($kiwi -> trace()) { + $main::BT.=eval { Carp::longmess ($main::TT.$main::TL++) }; + } + return undef; + } + if ( $rootError ) { + return undef; + } + return $root; +} + +#========================================== # getControlFile #------------------------------------------ sub getControlFile { 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-04-08 14:27:57.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2011-05-06 15:22:52.000000000 +0200 @@ -1750,7 +1750,8 @@ print $fd "echo 1 > $screenCall.exit; exit 1; }\n"; print $fd "trap clean INT TERM\n"; print $fd "for i in @tars;do\n"; - print $fd " tar -tf $idesc/\$i >> $root/bootincluded_archives.filelist\n"; + print $fd " tar -tvf $idesc/\$i | grep -v ^d | cut -c49- | cut -f1 -d-"; + print $fd ">> $root/bootincluded_archives.filelist\n"; print $fd " if ! tar -C $root -xvf $idesc/\$i;then\n"; print $fd " ECODE=\$?\n"; print $fd " echo \$ECODE > $screenCall.exit\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2011-05-06 15:22:52.000000000 +0200 @@ -23,11 +23,12 @@ use File::Glob ':glob'; use File::Find; use FileHandle; -use KIWIURL; +use KIWIConfigure; +use KIWILocator; use KIWILog; use KIWIManager; -use KIWIConfigure; use KIWIQX; +use KIWIURL; #========================================== # Constructor @@ -190,7 +191,8 @@ #========================================== # Create root directory #------------------------------------------ - my $root = $xml -> createTmpDirectory ( + my $locator = new KIWILocator ($this -> {kiwi}); + my $root = $locator -> createTmpDirectory ( $useRoot,$selfRoot ); if ( ! defined $root ) { 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-04-08 14:27:57.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2011-05-06 15:22:52.000000000 +0200 @@ -3420,61 +3420,6 @@ } #========================================== -# createTmpDirectory -#------------------------------------------ -sub createTmpDirectory { - my $this = shift; - my $useRoot = shift; - my $selfRoot = shift; - my $rootError = 1; - my $root; - my $code; - my $kiwi = $this->{kiwi}; - if (! defined $useRoot) { - if (! defined $selfRoot) { - $root = qxx (" mktemp -q -d /tmp/kiwi.XXXXXX "); - $code = $? >> 8; - if ($code == 0) { - $rootError = 0; - } - chomp $root; - } else { - $root = $selfRoot; - rmdir $root; - if ( -e $root && -d $root && $main::ForceNewRoot ) { - $kiwi -> info ("Removing old root directory '$root'"); - if (-e $root."/base-system") { - $kiwi -> failed(); - $kiwi -> info ("Mount point /base-system exists"); - $kiwi -> failed(); - return undef; - } - qxx ("rm -R $root"); - $kiwi -> done(); - } - if (mkdir $root) { - $rootError = 0; - } - } - } else { - if (-d $useRoot) { - $root = $useRoot; - $rootError = 0; - } - } - if ( $rootError ) { - if ($kiwi -> trace()) { - $main::BT.=eval { Carp::longmess ($main::TT.$main::TL++) }; - } - return undef; - } - if ( $rootError ) { - return undef; - } - return $root; -} - -#========================================== # getInstSourceFile #------------------------------------------ sub getInstSourceFile { @@ -4765,6 +4710,7 @@ my $urlhd = new KIWIURL ($kiwi); my @node = $this->{optionsNodeList} -> get_nodelist(); my @result = (); + my $first = 1; #========================================== # select types #------------------------------------------ @@ -4787,8 +4733,10 @@ #========================================== # meta data #------------------------------------------ + $record{first} = $first; $record{node} = $node; $record{assigned} = \@assigned; + $first = 0; #========================================== # type attributes #------------------------------------------ @@ -4897,13 +4845,16 @@ #------------------------------------------ foreach my $record (@{$typeList}) { my $found = 0; + my $first = 1; foreach my $p (@{$record->{assigned}}) { if ($select{$p}) { $found = 1; last; } } next if ! $found; + $record->{first} = $first; $result{$record->{type}} = $record; + $first = 0; } #========================================== # store types in typeInfo hash @@ -4936,7 +4887,7 @@ #------------------------------------------ if (! $typeinfo) { # /.../ - # if not typeinfo hash was populated we use the first type + # if no typeinfo hash was populated we use the first type # node listed in the description as the used type. # ---- $this->{typeNode} = $this->{optionsNodeList} @@ -4953,13 +4904,17 @@ # in the list # ---- my @types = keys %{$typeinfo}; + my $first; foreach my $type (@types) { if ($typeinfo->{$type}{primary} eq "true") { $select = $type; last; } + if ($typeinfo->{$type}{first} == 1) { + $first = $type; + } } if (! $select) { - $select = $types[0]; + $select = $first; } } else { # /.../ 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-04-21 12:02:25.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-05-06 15:22:52.000000000 +0200 @@ -143,7 +143,13 @@ #-------------------------------------- unset ALLOW_CMDLINE_OVERWRITE if [ ! -z "$NBDROOT" ];then - KLIST[0]="NBDROOT=$NBDROOT"; + KLIST[0]="NBDROOT=$NBDROOT" + fi + if [ ! -z "$NFSROOT" ];then + KLIST[1]="NFSROOT=$NFSROOT" + fi + if [ ! -z "$AOEROOT" ];then + KLIST[2]="AOEROOT=$AOEROOT" fi Echo "Checking for config file..." #====================================== @@ -903,41 +909,33 @@ fi #====================================== -# 21) If image is new, notify -#-------------------------------------- -runHook prenotify -if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then - pxeNotifyNewImage -fi -runHook postnotify - -#====================================== -# 22) send DHCP_RELEASE, reset cache +# 21) send DHCP_RELEASE, reset cache #-------------------------------------- +runHook preNetworkRelease if [ $LOCAL_BOOT = "no" ];then releaseNetwork fi #====================================== -# 23) copy system dependant files +# 22) copy system dependant files #-------------------------------------- if [ $LOCAL_BOOT = "no" ];then setupConfigFiles fi #====================================== -# 24) update system dependant files +# 23) update system dependant files #-------------------------------------- setupInittab /mnt echo 256 > /proc/sys/kernel/real-root-dev #====================================== -# 25) umount system filesystems +# 24) umount system filesystems #-------------------------------------- umountSystemFilesystems #====================================== -# 26) copy initrd files to image +# 25) copy initrd files to image #-------------------------------------- if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then if canWrite /mnt;then @@ -948,18 +946,18 @@ fi #====================================== -# 27) kill boot shell +# 26) kill boot shell #-------------------------------------- killShell killBlogD #====================================== -# 28) Activate new root +# 27) Activate new root #-------------------------------------- runHook preactivate activateImage #====================================== -# 29) Unmount initrd / system init +# 28) Unmount initrd / system init #-------------------------------------- bootImage $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert14to20.xsl new/kiwi/xsl/convert14to20.xsl --- old/kiwi/xsl/convert14to20.xsl 2010-02-05 16:11:32.000000000 +0100 +++ new/kiwi/xsl/convert14to20.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -19,10 +19,19 @@ from <literal>1.4</literal> to <literal>2.0</literal>. </para> <xsl:template match="image" mode="conv14to20"> - <image schemeversion="2.0"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv14to20"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemeversion > 1.4 or @schemaversion > 1.4"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemeversion="2.0"> + <xsl:copy-of select="@*[local-name() != 'schemeversion']"/> + <xsl:apply-templates mode="conv14to20"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert20to24.xsl new/kiwi/xsl/convert20to24.xsl --- old/kiwi/xsl/convert20to24.xsl 2010-02-05 16:11:32.000000000 +0100 +++ new/kiwi/xsl/convert20to24.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,16 +13,25 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemeversion</tag> from <literal>2.0</literal> to <literal>2.4</literal>. </para> <xsl:template match="image" mode="conv20to24"> - <image schemeversion="2.4"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv20to24"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemeversion > 2.0 or @schemaversion > 2.0"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemeversion="2.4"> + <xsl:copy-of select="@*[local-name() != 'schemeversion']"/> + <xsl:apply-templates mode="conv20to24"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert24to35.xsl new/kiwi/xsl/convert24to35.xsl --- old/kiwi/xsl/convert24to35.xsl 2010-02-05 16:11:32.000000000 +0100 +++ new/kiwi/xsl/convert24to35.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,17 +13,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemeversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>2.4</literal> to <literal>3.5</literal>. </para> <xsl:template match="image" mode="conv24to35"> - <image schemaversion="3.5"> - <xsl:copy-of select="@*[local-name() != 'schemeversion']"/> - <xsl:apply-templates mode="conv24to35"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 2.4 or @schemeversion > 2.4"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="3.5"> + <xsl:copy-of select="@*[local-name() != 'schemeversion']"/> + <xsl:apply-templates mode="conv24to35"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert35to37.xsl new/kiwi/xsl/convert35to37.xsl --- old/kiwi/xsl/convert35to37.xsl 2010-02-05 16:11:32.000000000 +0100 +++ new/kiwi/xsl/convert35to37.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -17,17 +17,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>3.5</literal> to <literal>3.7</literal>. </para> <xsl:template match="image" mode="conv35to37"> - <image schemaversion="3.7"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv35to37"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 3.5"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="3.7"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv35to37"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert37to38.xsl new/kiwi/xsl/convert37to38.xsl --- old/kiwi/xsl/convert37to38.xsl 2010-02-05 16:11:32.000000000 +0100 +++ new/kiwi/xsl/convert37to38.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,17 +13,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>3.7</literal> to <literal>3.8</literal>. </para> <xsl:template match="image" mode="conv37to38"> - <image schemaversion="3.8"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv37to38"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 3.7"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="3.8"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv37to38"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert38to39.xsl new/kiwi/xsl/convert38to39.xsl --- old/kiwi/xsl/convert38to39.xsl 2010-07-09 14:29:02.000000000 +0200 +++ new/kiwi/xsl/convert38to39.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,17 +13,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>3.8</literal> to <literal>3.9</literal>. </para> <xsl:template match="image" mode="conv38to39"> - <image schemaversion="3.9"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv38to39"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 3.8"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="3.9"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv38to39"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert39to41.xsl new/kiwi/xsl/convert39to41.xsl --- old/kiwi/xsl/convert39to41.xsl 2010-08-27 15:35:45.000000000 +0200 +++ new/kiwi/xsl/convert39to41.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -11,7 +11,7 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from @@ -22,10 +22,19 @@ children of the <tag class="element">type</tag> element. </para> <xsl:template match="image" mode="conv39to41"> - <image schemaversion="4.1"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv39to41"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 3.9"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.1"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv39to41"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="preferences" mode="conv39to41"> @@ -95,19 +104,10 @@ </type> </xsl:when> <xsl:otherwise> - <xsl:choose> - <xsl:when test="@image"> - <xsl:copy-of select="current()"/> - </xsl:when> - <xsl:otherwise> - <xsl:element name="type"> - <xsl:attribute name="image"> - <xsl:value-of select="current()"/> - </xsl:attribute> - <xsl:copy-of select="@*"/> - </xsl:element> - </xsl:otherwise> - </xsl:choose> + <type> + <xsl:call-template name="insertcomprops" mode="conv39to41"/> + <xsl:apply-templates select="*"/> + </type> </xsl:otherwise> </xsl:choose> </xsl:template> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert41to42.xsl new/kiwi/xsl/convert41to42.xsl --- old/kiwi/xsl/convert41to42.xsl 2010-02-09 16:59:43.000000000 +0100 +++ new/kiwi/xsl/convert41to42.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -17,7 +17,7 @@ <xsl:variable name="ec2cert" select="/image/preferences/type/@ec2certfile"/> <xsl:variable name="ec2acct" select="/image/preferences/type/@ec2accountnr"/> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from @@ -27,13 +27,20 @@ <tag class="element">ec2config</tag> element is a child of the <tag class="element">type</tag> element. </para> - <xsl:template match="image" mode="conv41to42"> - <image schemaversion="4.2"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv41to42"/> - - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.1"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.2"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv41to42"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="preferences" mode="conv41to42"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert42to43.xsl new/kiwi/xsl/convert42to43.xsl --- old/kiwi/xsl/convert42to43.xsl 2010-02-18 13:15:24.000000000 +0100 +++ new/kiwi/xsl/convert42to43.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -12,7 +12,7 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from @@ -21,12 +21,20 @@ <tag class="element">type</tag> to the <tag class="element">lvmvolumes</tag> element. </para> - <xsl:template match="image" mode="conv42to43"> - <image schemaversion="4.3"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv42to43"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.2"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.3"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv42to43"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="preferences" mode="conv42to43"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert43to44.xsl new/kiwi/xsl/convert43to44.xsl --- old/kiwi/xsl/convert43to44.xsl 2010-02-19 15:21:51.000000000 +0100 +++ new/kiwi/xsl/convert43to44.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,17 +13,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>4.3</literal> to <literal>4.4</literal>. </para> <xsl:template match="image" mode="conv43to44"> - <image schemaversion="4.4"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv43to44"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.3"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.4"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv43to44"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert44to45.xsl new/kiwi/xsl/convert44to45.xsl --- old/kiwi/xsl/convert44to45.xsl 2010-04-26 15:28:55.000000000 +0200 +++ new/kiwi/xsl/convert44to45.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,17 +13,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>4.4</literal> to <literal>4.5</literal>. </para> <xsl:template match="image" mode="conv44to45"> - <image schemaversion="4.5"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv44to45"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.4"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.5"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv44to45"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert45to46.xsl new/kiwi/xsl/convert45to46.xsl --- old/kiwi/xsl/convert45to46.xsl 2010-07-02 15:03:37.000000000 +0200 +++ new/kiwi/xsl/convert45to46.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,17 +13,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>4.5</literal> to <literal>4.6</literal>. </para> <xsl:template match="image" mode="conv45to46"> - <image schemaversion="4.6"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv45to46"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.5"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.6"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv45to46"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert46to47.xsl new/kiwi/xsl/convert46to47.xsl --- old/kiwi/xsl/convert46to47.xsl 2010-07-13 13:29:41.000000000 +0200 +++ new/kiwi/xsl/convert46to47.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -13,17 +13,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>4.6</literal> to <literal>4.7</literal>. </para> <xsl:template match="image" mode="conv46to47"> - <image schemaversion="4.7"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv46to47"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.6"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.7"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv46to47"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert47to48.xsl new/kiwi/xsl/convert47to48.xsl --- old/kiwi/xsl/convert47to48.xsl 2011-03-11 15:36:07.000000000 +0100 +++ new/kiwi/xsl/convert47to48.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -37,17 +37,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>4.7</literal> to <literal>4.8</literal>. </para> <xsl:template match="image" mode="conv47to48"> - <image schemaversion="4.8"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv47to48"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.7"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.8"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv47to48"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>4.8</literal> to <literal>4.9</literal>. </para> <xsl:template match="image" mode="conv48to49"> - <image schemaversion="4.9"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv48to49"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.8"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="4.9"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv48to49"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert49to50.xsl new/kiwi/xsl/convert49to50.xsl --- old/kiwi/xsl/convert49to50.xsl 2010-11-19 15:29:39.000000000 +0100 +++ new/kiwi/xsl/convert49to50.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -11,17 +11,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>4.9</literal> to <literal>5.0</literal>. </para> <xsl:template match="image" mode="conv49to50"> - <image schemaversion="5.0"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv49to50"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 4.9"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="5.0"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv49to50"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert50to51.xsl new/kiwi/xsl/convert50to51.xsl --- old/kiwi/xsl/convert50to51.xsl 2010-12-03 16:08:52.000000000 +0100 +++ new/kiwi/xsl/convert50to51.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -11,17 +11,26 @@ </xsl:copy> </xsl:template> - + <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> to <tag class="attribute">schemaversion</tag> from <literal>5.0</literal> to <literal>5.1</literal>. </para> <xsl:template match="image" mode="conv50to51"> - <image schemaversion="5.1"> - <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> - <xsl:apply-templates mode="conv50to51"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 5.0"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="5.1"> + <xsl:copy-of select="@*[local-name() != 'schemaversion']"/> + <xsl:apply-templates mode="conv50to51"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert51to52.xsl new/kiwi/xsl/convert51to52.xsl --- old/kiwi/xsl/convert51to52.xsl 2011-04-21 12:02:25.000000000 +0200 +++ new/kiwi/xsl/convert51to52.xsl 2011-05-06 15:22:52.000000000 +0200 @@ -11,7 +11,7 @@ </xsl:copy> </xsl:template> - +  <para xmlns="http://docbook.org/ns/docbook"> Changed attribute <tag class="attribute">schemaversion</tag> @@ -19,10 +19,19 @@ <literal>5.1</literal> to <literal>5.2</literal>. </para> <xsl:template match="image" mode="conv51to52"> - <image schemaversion="5.2"> - <xsl:copy-of select="@*[local-name() != 'schemaversion' and local-name() != 'inherit']"/> - <xsl:apply-templates mode="conv51to52"/> - </image> + <xsl:choose> +  + <xsl:when test="@schemaversion > 5.1"> + <xsl:copy-of select="/"/> + </xsl:when> +  + <xsl:otherwise> + <image schemaversion="5.2"> + <xsl:copy-of select="@*[local-name() != 'schemaversion' and local-name() != 'inherit']"/> + <xsl:apply-templates mode="conv51to52"/> + </image> + </xsl:otherwise> + </xsl:choose> </xsl:template>  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-driver-input for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Mon May 9 09:55:56 CEST 2011. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2011-03-23 19:12:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2011-05-06 12:24:52.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 6 10:09:45 UTC 2011 - sndirsch(a)novell.com + +- xf86-input-wacom-no-n-trig.diff + * stylus doesn't work on N-Trig; better rely on evdev driver + (bnc #686498) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-input-wacom-no-n-trig.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.HZGG2P/_old 2011-05-09 09:51:56.000000000 +0200 +++ /var/tmp/diff_new_pack.HZGG2P/_new 2011-05-09 09:51:56.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 32 +Release: 33 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -69,6 +69,7 @@ Patch55: xf86-input-synaptics-clickpad-threshold.diff Patch56: xf86-input-synaptics-move-threshold.diff Patch57: xf86-input-synaptics-filter-bogus-coord.diff +Patch58: xf86-input-wacom-no-n-trig.diff %description This package contains X.Org input drivers. @@ -118,7 +119,11 @@ %else pushd xf86-input-vmmouse-* %patch47 -p1 +popd %endif +pushd xf86-input-wacom-* +%patch58 -p1 +popd %build for dir in $(ls); do ++++++ xf86-input-wacom-no-n-trig.diff ++++++ Index: xf86-input-wacom-0.10.8/conf/50-wacom.conf =================================================================== --- xf86-input-wacom-0.10.8.orig/conf/50-wacom.conf +++ xf86-input-wacom-0.10.8/conf/50-wacom.conf @@ -21,12 +21,13 @@ Section "InputClass" EndSection +### stylus doesn't work; better rely on evdev driver (bnc #686498) # N-Trig Duosense Electromagnetic Digitizer -Section "InputClass" - Identifier "Wacom N-Trig class" - MatchProduct "HID 1b96:0001|N-Trig Pen" - MatchDevicePath "/dev/input/event*" - Driver "wacom" - Option "Button2" "3" -EndSection +#Section "InputClass" +# Identifier "Wacom N-Trig class" +# MatchProduct "HID 1b96:0001|N-Trig Pen" +# MatchDevicePath "/dev/input/event*" +# Driver "wacom" +# Option "Button2" "3" +#EndSection ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-games for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package gnome-games for openSUSE:Factory checked in at Mon May 9 09:51:37 CEST 2011. -------- --- GNOME/gnome-games/gnome-games.changes 2011-04-25 12:57:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-games/gnome-games.changes 2011-05-06 10:33:42.000000000 +0200 @@ -1,0 +2,21 @@ +Thu May 5 19:47:34 CEST 2011 - vuntz(a)opensuse.org + +- Fix permissions handling for glines, gnibbles, gnobots2, + gnomine, gnotravex, gnotski, gtali, mahjongg and quadrapassel: + + Add permissions PreReq. + + Use %set_permissions on the binary instead of the deprecated + %run_permissions. + + Move %desktop_database_post and %icon_theme_cache_post to be in + %post and not %verifyscript. +- Fix PreReq that are used because of score files: + + Only /bin/chown /bin/chmod /usr/bin/touch are needed. + + Remove unneeded PreReq for /bin/rm from glines, gnibbles, + gnobots2, gnomine, gnotravex, gnotski, gtali, mahjongg. + + Add previously missing PreReq for /bin/chown /bin/chmod + /usr/bin/touch to quadrapassel. + + Remove all PreReq from swell-foop as there is no score file + there. +- Remove unneeded /bin/chown /bin/chmod /usr/bin/touch PreReq in + support subpackage as only rm is used in %post. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-games.spec ++++++ --- /var/tmp/diff_new_pack.r0zszz/_old 2011-05-09 09:49:24.000000000 +0200 +++ /var/tmp/diff_new_pack.r0zszz/_new 2011-05-09 09:49:24.000000000 +0200 @@ -21,7 +21,7 @@ Name: gnome-games Version: 3.0.0 -Release: 1 +Release: 3 # FIXME: validate list of games for the recommended subpackage License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Games for GNOME @@ -129,7 +129,7 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Games for GNOME - Shared files Group: Development/Libraries/GNOME -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/rm Recommends: %{name}-support-lang Suggests: gnome-games-extra-data %glib2_gsettings_schema_requires @@ -180,7 +180,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: "Five or More" Game for GNOME Group: Amusements/Games/Board/Puzzle -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: glines-lang %gconf_schemas_prereq @@ -213,7 +214,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Worm Game for GNOME Group: Amusements/Games/Action/Arcade -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: gnibbles-lang %gconf_schemas_prereq @@ -229,7 +231,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Robots Game for GNOME Group: Amusements/Games/Action/Arcade -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: gnobots2-lang %gconf_schemas_prereq @@ -265,7 +268,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Minesweeper Game for GNOME Group: Amusements/Games/Board/Other -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: gnomine-lang %gconf_schemas_prereq @@ -280,7 +284,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Tetravex Game for GNOME Group: Amusements/Games/Board/Puzzle -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: gnotravex-lang %gconf_schemas_prereq @@ -297,7 +302,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Klotski Game for GNOME Group: Amusements/Games/Board/Puzzle -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: gnotski-lang %gconf_schemas_prereq @@ -313,7 +319,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Yahtzee Game for GNOME Group: Amusements/Games/Board/Other -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: gtali-lang %gconf_schemas_prereq @@ -365,7 +372,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Mahjong Solitaire Game for GNOME Group: Amusements/Games/Board/Puzzle -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: mahjongg-lang %gconf_schemas_prereq @@ -381,6 +389,8 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Tetris Game for GNOME Group: Amusements/Games/Action/Other +PreReq: /bin/chown /bin/chmod /usr/bin/touch +PreReq: permissions Requires: %{name}-support = %{version} Recommends: quadrapassel-lang %gconf_schemas_prereq @@ -398,7 +408,6 @@ License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Same Game for GNOME Group: Amusements/Games/Board/Puzzle -PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch Requires: %{name}-support = %{version} Requires: seed Recommends: swell-foop-lang @@ -541,12 +550,13 @@ %pre -n glines -f glines.schemas_pre %post -n glines -f glines.scores_post -%run_permissions -%verifyscript -n glines -%verify_permissions -e %{_bindir}/glines +%set_permissions %{_bindir}/glines %desktop_database_post %icon_theme_cache_post +%verifyscript -n glines +%verify_permissions -e %{_bindir}/glines + %posttrans -n glines -f glines.schemas_posttrans %preun -n glines -f glines.schemas_preun @@ -574,12 +584,13 @@ %pre -n gnibbles -f gnibbles.schemas_pre %post -n gnibbles -f gnibbles.scores_post -%run_permissions -%verifyscript -n gnibbles -%verify_permissions -e %{_bindir}/gnibbles +%set_permissions %{_bindir}/gnibbles %desktop_database_post %icon_theme_cache_post +%verifyscript -n gnibbles +%verify_permissions -e %{_bindir}/gnibbles + %posttrans -n gnibbles -f gnibbles.schemas_posttrans %preun -n gnibbles -f gnibbles.schemas_preun @@ -592,12 +603,13 @@ %pre -n gnobots2 -f gnobots2.schemas_pre %post -n gnobots2 -f gnobots2.scores_post -%run_permissions -%verifyscript -n gnobots2 -%verify_permissions -e %{_bindir}/gnobots2 +%set_permissions %{_bindir}/gnobots2 %desktop_database_post %icon_theme_cache_post +%verifyscript -n gnobots2 +%verify_permissions -e %{_bindir}/gnobots2 + %posttrans -n gnobots2 -f gnobots2.schemas_posttrans %preun -n gnobots2 -f gnobots2.schemas_preun @@ -628,12 +640,13 @@ %pre -n gnomine -f gnomine.schemas_pre %post -n gnomine -f gnomine.scores_post -%run_permissions -%verifyscript -n gnomine -%verify_permissions -e %{_bindir}/gnomine +%set_permissions %{_bindir}/gnomine %desktop_database_post %icon_theme_cache_post +%verifyscript -n gnomine +%verify_permissions -e %{_bindir}/gnomine + %posttrans -n gnomine -f gnomine.schemas_posttrans %preun -n gnomine -f gnomine.schemas_preun @@ -646,12 +659,13 @@ %pre -n gnotravex -f gnotravex.schemas_pre %post -n gnotravex -f gnotravex.scores_post -%run_permissions -%verifyscript -n gnotravex -%verify_permissions -e %{_bindir}/gnotravex +%set_permissions %{_bindir}/gnotravex %desktop_database_post %icon_theme_cache_post +%verifyscript -n gnotravex +%verify_permissions -e %{_bindir}/gnotravex + %posttrans -n gnotravex -f gnotravex.schemas_posttrans %preun -n gnotravex -f gnotravex.schemas_preun @@ -664,12 +678,13 @@ %pre -n gnotski -f gnotski.schemas_pre %post -n gnotski -f gnotski.scores_post -%run_permissions -%verifyscript -n gnotski -%verify_permissions -e %{_bindir}/gnotski +%set_permissions %{_bindir}/gnotski %desktop_database_post %icon_theme_cache_post +%verifyscript -n gnotski +%verify_permissions -e %{_bindir}/gnotski + %posttrans -n gnotski -f gnotski.schemas_posttrans %preun -n gnotski -f gnotski.schemas_preun @@ -682,12 +697,13 @@ %pre -n gtali -f gtali.schemas_pre %post -n gtali -f gtali.scores_post -%run_permissions -%verifyscript -n gtali -%verify_permissions -e %{_bindir}/gtali +%set_permissions %{_bindir}/gtali %desktop_database_post %icon_theme_cache_post +%verifyscript -n gtali +%verify_permissions -e %{_bindir}/gtali + %posttrans -n gtali -f gtali.schemas_posttrans %preun -n gtali -f gtali.schemas_preun @@ -730,12 +746,13 @@ %pre -n mahjongg -f mahjongg.schemas_pre %post -n mahjongg -f mahjongg.scores_post -%run_permissions -%verifyscript -n mahjongg -%verify_permissions -e %{_bindir}/mahjongg +%set_permissions %{_bindir}/mahjongg %desktop_database_post %icon_theme_cache_post +%verifyscript -n mahjongg +%verify_permissions -e %{_bindir}/mahjongg + %posttrans -n mahjongg -f mahjongg.schemas_posttrans %preun -n mahjongg -f mahjongg.schemas_preun @@ -748,12 +765,13 @@ %pre -n quadrapassel -f quadrapassel.schemas_pre %post -n quadrapassel -f quadrapassel.scores_post -%run_permissions -%verifyscript -n quadrapassel -%verify_permissions -e %{_bindir}/quadrapassel +%set_permissions %{_bindir}/quadrapassel %desktop_database_post %icon_theme_cache_post +%verifyscript -n quadrapassel +%verify_permissions -e %{_bindir}/quadrapassel + %posttrans -n quadrapassel -f quadrapassel.schemas_posttrans %preun -n quadrapassel -f quadrapassel.schemas_preun @@ -854,11 +872,11 @@ %{_mandir}/man?/glines.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/glines %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/glines.Large.scores %ghost %{_localstatedir}/games/glines.Medium.scores %ghost %{_localstatedir}/games/glines.Small.scores @@ -895,11 +913,11 @@ %{_mandir}/man?/gnibbles.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/gnibbles %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/gnibbles.1.0.scores %ghost %{_localstatedir}/games/gnibbles.1.1.scores %ghost %{_localstatedir}/games/gnibbles.2.0.scores @@ -925,11 +943,11 @@ %{_mandir}/man?/gnobots2.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/gnobots2 %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/gnobots2.classic_robots-safe.scores %ghost %{_localstatedir}/games/gnobots2.classic_robots-super-safe.scores %ghost %{_localstatedir}/games/gnobots2.classic_robots.scores @@ -982,11 +1000,11 @@ %{_mandir}/man?/gnomine.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/gnomine %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/gnomine.Custom.scores %ghost %{_localstatedir}/games/gnomine.Large.scores %ghost %{_localstatedir}/games/gnomine.Medium.scores @@ -1004,11 +1022,11 @@ %{_mandir}/man?/gnotravex.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/gnotravex %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/gnotravex.2x2.scores %ghost %{_localstatedir}/games/gnotravex.3x3.scores %ghost %{_localstatedir}/games/gnotravex.4x4.scores @@ -1031,11 +1049,11 @@ %{_mandir}/man?/gnotski.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/gnotski %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/gnotski.1.scores %ghost %{_localstatedir}/games/gnotski.10.scores %ghost %{_localstatedir}/games/gnotski.11.scores @@ -1090,11 +1108,11 @@ %{_mandir}/man?/gtali.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/gtali %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/gtali.Colors.scores %ghost %{_localstatedir}/games/gtali.Regular.scores # If adding/removing a package, see the NOTE before aisleriot @@ -1145,11 +1163,11 @@ %{_mandir}/man?/mahjongg.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/mahjongg %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/mahjongg.difficult.scores %ghost %{_localstatedir}/games/mahjongg.easy.scores %ghost %{_localstatedir}/games/mahjongg.bridges.scores @@ -1176,11 +1194,11 @@ %{_mandir}/man?/quadrapassel.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the -# %post script for verify_permissions. +# %%post/%%verifyscript scripts for set_permissions/verify_permissions. %verify(not mode) %{_bindir}/quadrapassel %defattr (0664, games, games) # WARNING: If you are modifying this list, -# don't forget to remove obsolete scores in %post. +# don't forget to remove obsolete scores in %%post. %ghost %{_localstatedir}/games/quadrapassel.scores # If adding/removing a package, see the NOTE before aisleriot ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 zeitgeist for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package zeitgeist for openSUSE:Factory checked in at Mon May 9 09:49:07 CEST 2011. -------- --- GNOME/zeitgeist/zeitgeist.changes 2010-11-17 16:42:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/zeitgeist/zeitgeist.changes 2011-04-29 23:52:41.000000000 +0200 @@ -1,0 +2,71 @@ +Fri Apr 29 23:12:54 UTC 2011 - dimstar(a)opensuse.org + +- Update to 0.7.1: + + Overall: + - Added new event interpretation types: AcceptEvent, DenyEvent + and ExpireEvent. + - Include NCO in the generated ontologies. + - Better ./configure check for python-rdflib. + - Update the manpage to document exit codes. + + Engine: + - Expose property information in the D-Bus introspection output + - Mention column names explicitly when inserting events, for + compatibility with the upcoming 0.8 release. + + Python API: + - Expose DataSourceRegistry's enabled status in a callback. + - Automatically reconnect to Zeitgeist if the connection is + lost when using methods asynchronously. + - lp#673008, lp#727226: Reinstall all active monitors upon + reconnection. + - lp#732015: Fix a (harmless) race condition requesting the bus + name. +- Drop zeitgeist-no-rdfpipe.patch: fixed upstream. +- Escape % in comments in the .spec file to fix some rpmlint + warnings. +- Use source services: download_url, recompress and set_version. + +------------------------------------------------------------------- +Thu Mar 3 14:14:22 CET 2011 - vuntz(a)opensuse.org + +- Remove checks for openSUSE 11.1 or earlier: those versions are + not maintained anymore. + +------------------------------------------------------------------- +Tue Jan 18 12:30:54 CST 2011 - federico(a)novell.com + +- Update to version 0.7: + + Overall: + - Using logging output for debugging purposes (lp#660440) + - Stop building man page for zeitgeist-datahub (lp#680360) + - Allow easy building for KDE (lp#683280) + - Logging output now displays how many events were actually + inserted from the batch of requested inserts (lp#660440) + - Changed License to LGPL 2.1+ + + Engine: + - Added some new mimetype mappings + - Speed up the GetEvents method by caching events (lp#686732) + - Allow extension without public method (lp#691660) + - Added a read-only DBus property "extensions" to + org.gnome.zeitgeist.Log (lp#693861) + - Added helper function to get an extension's name + - Fixed bug in RemoteInterface.Quit(): make sure to close + connection to the used bus if this method gets called, this + is needed if RemoteInterface does not know anything about the + loop it is running in. + - Fix sending payload from engine to client (lp#692645) + - Improve performance of DataSourceRegistry (lp#695311) + - Improve performance of find_event queries with timerange + other than TimeRange.always() (lp#672965) + - Add an auto-filter for broken database entries (lp#598666 + workaround) + - Introduce new DB schema (version 3) that bundles a few + performance related fixes (lp#673452, lp#673394) + + Python API: + - Fix find_event_for_template to stop ignoring the template + (lp#690377) + - Add get_extensions method to ZeitgeistClient +- Add zeitgeist-no-rdfpipe.patch: this removes a check in + configure, that is not needed anymore. +- Update license tag to LGPLv2.1+. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zeitgeist-0.6.tar.bz2 New: ---- _service _service:recompress:download_url:zeitgeist-0.7.1.tar.bz2 _service:set_version:zeitgeist.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:set_version:zeitgeist.spec ++++++ # # spec file for package zeitgeist # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Dominique Leuenberger, Amsterdam, The Netherlands. # # 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: zeitgeist Version: 0.7.1 Release: 0 License: LGPLv2.1+ Summary: Zeitgeist Engine Url: https://launchpad.net/zeitgeist Group: Productivity/Other Source: %{name}-%{version}.tar.bz2 # dbus required for file ownership only. BuildRequires: dbus-1 BuildRequires: fdupes BuildRequires: intltool BuildRequires: python BuildRequires: python-rdflib BuildRequires: python-xml BuildRequires: raptor Requires: dbus-1-python # For gconf Requires: python-gnome Requires: python-gobject2 Requires: python-rdflib Requires: python-xdg Requires: python-xml # For recent files data source Recommends: python-gtk BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %py_requires %description Zeitgeist is a service that logs the users activity. The log can be queried and managed in various ways over a DBus API. This is the Zeitgeist backend engine. %lang_package %prep %setup -q %build %configure make %{?_smp_mflags} %install %make_install # Let's move the .pc file from %%{_libdir} to %%{_datadir}. As of up to version 0.5.0 of zeitgeist, # the .pc file does not contain any Requires and no arch-dependent information. Moving the file # to %%{_datadir} allows us to remain a noarch package install -d -m 755 %{buildroot}%{_datadir}/pkgconfig mv %{buildroot}%{_libdir}/pkgconfig/zeitgeist-daemon.pc %{buildroot}%{_datadir}/pkgconfig/zeitgeist-daemon.pc %fdupes %{buildroot}%{_datadir}/zeitgeist %fdupes %{buildroot}%{python_sitelib} %find_lang %{name} %clean rm -rf %{buildroot} %files %defattr(-,root,root) %{_bindir}/zeitgeist* %{python_sitelib}/zeitgeist/ %{_datadir}/dbus-1/services/org.gnome.zeitgeist.service %{_mandir}/man?/*.* %{_datadir}/zeitgeist/ # As long as the .pc file does not drag in any -devel files, let's keep it in the main package. %{_datadir}/pkgconfig/zeitgeist-daemon.pc %files lang -f %{name}.lang %changelog ++++++ zeitgeist.spec ++++++ --- /var/tmp/diff_new_pack.eSCLKL/_old 2011-05-09 09:44:14.000000000 +0200 +++ /var/tmp/diff_new_pack.eSCLKL/_new 2011-05-09 09:44:14.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package zeitgeist (Version 0.6) +# spec file for package zeitgeist # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -19,9 +19,9 @@ Name: zeitgeist -Version: 0.6 +Version: 0.7 Release: 1 -License: GPLv2+ +License: LGPLv2.1+ Summary: Zeitgeist Engine Url: https://launchpad.net/zeitgeist Group: Productivity/Other @@ -44,14 +44,8 @@ # For recent files data source Recommends: python-gtk BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{suse_version} > 1110 BuildArch: noarch -%endif %py_requires -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%define python_sitearch %{py_sitedir} -%endif %description Zeitgeist is a service that logs the users activity. The log can be @@ -65,13 +59,13 @@ %build %configure -%__make %{?_smp_mflags} +make %{?_smp_mflags} %install -%makeinstall -# Let's move the .pc file from %{_libdir} to %{_datadir}. As of up to version 0.5.0 of zeitgeist, +%make_install +# Let's move the .pc file from %%{_libdir} to %%{_datadir}. As of up to version 0.5.0 of zeitgeist, # the .pc file does not contain any Requires and no arch-dependent information. Moving the file -# to %{_datadir} allows us to remain a noarch package +# to %%{_datadir} allows us to remain a noarch package install -d -m 755 %{buildroot}%{_datadir}/pkgconfig mv %{buildroot}%{_libdir}/pkgconfig/zeitgeist-daemon.pc %{buildroot}%{_datadir}/pkgconfig/zeitgeist-daemon.pc %fdupes %{buildroot}%{_datadir}/zeitgeist ++++++ _service ++++++ <services> <service name="download_url"> <param name="protocol">http</param> <param name="host">launchpad.net</param> <param name="path">/zeitgeist/0.7/0.7.1/+download/zeitgeist-0.7.1.tar.gz</param> </service> <service name="recompress"> <param name="file">_service:download_url:*.tar.gz</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 gnome-keyring for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at Mon May 9 09:44:07 CEST 2011. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2011-01-14 14:02:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes 2011-05-06 14:32:18.000000000 +0200 @@ -1,0 +2,127 @@ +Thu May 5 19:57:53 CEST 2011 - vuntz(a)opensuse.org + +- Handle specific permissions for %{_bindir}/gnome-keyring-daemon: + + Add permissions PreReq. + + Add %set_permissions %{_bindir}/gnome-keyring-daemon to %post. + + Add a %verifyscript scriptlet calling %verify_permissions. +- Do not package %{_bindir}/gnome-keyring-daemon with filesystem + capabilities: the security team will add what is needed via + %set_permissions after a review of the code. +- Drop rpmlintrc file as we don't need it anymore, since we have no + setuid binary nor capabilities. +- Add gnome-keyring-keep-only-ipc_lock.patch: when filesystem + capabilities are used, make sure that we do have ipc_lock and + keep only this one. +- Add gnome-keyring-accept-no-ipc_lock.patch: accept to run without + ipc_lock capability, just print a warning instead of aborting. +- This is part of bnc#682244. + +------------------------------------------------------------------- +Mon May 2 14:01:10 UTC 2011 - fcrozat(a)novell.com + +- Add gnome-keyring-file-capabilities.patch: Use libcap-ng for file + capabilities (from git, see rh#668831). +- Use libcap-ng-devel BuildRequires instead of libcap-devel +- Add gtk-doc BuildRequires, only needed because of the new patch. +- gnome-keyring-daemon is now using cap_ipc_lock=ep instead of + setuid. + +------------------------------------------------------------------- +Wed Apr 27 09:42:44 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.1: + + Fix clicking buttons in 'unsafe storage' dialog on GTK+3. + + Build with GTK+3 by default. + + More tests and test fine tuning: --enable-tests=yes/no/full. + + Expand path in gnome-keyring-prompt.desktop properly. + + Implement debug tracing in parts of gcr library. + + Complete documentation in gcr and gck libraries. + + Fix assertions in gcr library during parsing of a stream. + + Build fixes. +- Add gnome-keyring-fix-parallel-build.patch to fix parallel build + (from git). +- Remove libmock-test-module.so in %install, as this is only useful + for tests. + +------------------------------------------------------------------- +Mon Apr 25 13:06:18 CEST 2011 - vuntz(a)opensuse.org + +- Add the rpmlintrc that was added as workaround until bnc#682244 + is fixed (security review) as a source. + +------------------------------------------------------------------- +Mon Apr 4 13:23:15 UTC 2011 - fcrozat(a)novell.com + +- Update to version 3.0.0: + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 22 10:12:34 UTC 2011 - fcrozat(a)novell.com + +- Update to version 2.91.93: + + Use full interface.Property form for CreateCollection and + CreateItem in the DBus API. + + Add deprecated functions for libgcr symbols lost since 2.32.x + + Don't crash when the GPG agent is asked for a passhprase + without a key id. +- Changes from version 2.91.92: + + Don't leak login name from PAM when logging error. + + Also start daemon in XFCE + + Fix inability to save password for other keyrings. + + Build and test fixes. + + Support removal of aliases via the secret service API + + Fix race condition when multiple applications create the + default keyring at the same time. + + Add a desktop file for gnome-keyring-prompt, so the icon shows + up properly in gnome-shell. + + Implement HKDF for transport encryption security. +- Changes from version 2.91.91: + + Fix the certificate details expander when used with GTK+3 + + Calculate the minimum/natural size of the certificate widget + better. + + Fix gnome-keyring-prompt for GTK+3 release. + + Fix problems with the URIs used for trust lookup and storage. + + Pass around a content-type for secrets in the DBus Secret + Service API. + + If DBus couldn't be initialized when starting up the daemon, + try again at a later point. + + Build and testing fixes. + + Remove support for the pkcs11-options file, and wait for a + proper configuration file setup being worked on in p11-kit. + + Add support for --version argument to gnome-keyring-daemon and + gnome-keyring. + + Create necessary directory when storing trust assertion + objects. +- Changes from version 2.91.4: + + gck library loads PKCS#11 modules from /usr/lib/pkcs11 + + PKCS#11 config file in /etc/xdg/pkcs11.conf[.defaults] + + Many ASN.1 encoding fixes. + + Refactor how tests work. + + Install standalone PKCS#11 modules to a consistent location. + + Memory leaks and other bug fixes. + + Allow enumeration of objects in specific PKCS#11 slots as well + as modules. + + Add GcrCertificateChain for building certificate chains. + + Implementation of the initial PKCS#11 Trust Assertions spec. + + Add GcrPkcs11Certificate for looking up certificates in PKCS#11 + modules by issuer. + + Expose gcr functionality for setting which PKCS#11 modules to + use. + + Find the root certificates by default. + + Move to a single header model for libgcr. + + Don't load *.la files when looking for PKCS#11 modules. + + Fixes for GTK+3.0 + + New xdg-store PKCS#11 module with support for storing trust + assertions. + + Rename old user-store to gnome2-store since it stores its data + in old formats in the old .gnome2 location. +- Replace gnome-keyring-autostart-in-xfce.patch with + desktop-file-install calls. Add desktop-file-utils BuildRequires + for this. +- Add support for source service checkout, with %BUILD_FROM_VCS: + + Add gnome-common and gtk-doc BuildRequires. + + Add call to ./autogen.sh. + + Enforce gtk-doc html generation by passing --enable-gtk-doc to + configure. + +------------------------------------------------------------------- @@ -7,0 +135,44 @@ + +------------------------------------------------------------------- +Fri Dec 17 12:06:16 CET 2010 - vuntz(a)opensuse.org + +- Update to version 2.91.3: + + Shutdown module timer when holding proper mutex. + + Linux capabilities to overcome limits on locked memory. + + Update HACKING with coding style + + Build fixes. +- Changes from version 2.91.2: + + Add timeout if PAM startup doesn't complete shortly. + + Fix login keyring password when it doesn't match unix login. + + Replace gp11-0 with gck in pkgconfig file + + Fix broken dispose of GcrCertificateWidget + + Remove gp11 library. +- Changes from version 2.91.1: + + Fix build problem in gpg-agent. + + Properly distribute pkgconfig file for gck library. + + Better certificate widget in gcr library. + + Add extra debug guard around printing of prompt io. + + Rework how the gcr parser and importer work together. + + More GTK+ 3.0 fixes. +- Changes from version 2.91.0: + + String and punctuation fixes. + + Add libgck library to soon replace libgp11 + + Migrate everything in gnome-keyring to libgp11 + + Fix invalid memory access in PKCS#11 rpc-layer + + Fix race condition in tests +- Move to pkgconfig()-style BuildRequires: + + Old ones: dbus-1-devel, gtk2-devel, libtasn1-devel. + + New ones: dbus-1, glib-2.0, gtk+-3.0, libtasn1. +- Add libcap-devel BuildRequires. +- Rename libgcr0 to libgcr-3_0 after library name change. +- Remove explicit glib2-devel, gtk2-devel, libgp11-devel, + libtasn1-devel Requires in libgcr-devel package: they will be + automatically added the pkgconfig() way. +- Add libgck0, libgck-devel and libgck-modules subpackages, and + remove libgp11-0, libgp11-devel, libgp11-modules. Packaging-wise, + it's mostly like a renaming. Note that we have libgck-modules + with a Obsoletes tag for libgp11-modules since they share the + same files. +- Pass --with-gtk=3.0 instead of --with-gtk=2.0 to configure. +- Stop passing --libexecdir=%{_libexecdir}/gnome-keyring-1 to + configure: this is really not needed. calling whatdependson for head-i586 Old: ---- gnome-keyring-2.32.1.tar.bz2 gnome-keyring-autostart-in-xfce.patch New: ---- gnome-keyring-3.0.1.tar.bz2 gnome-keyring-accept-no-ipc_lock.patch gnome-keyring-file-capabilities.patch gnome-keyring-fix-parallel-build.patch gnome-keyring-keep-only-ipc_lock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.VZpV7g/_old 2011-05-09 09:39:35.000000000 +0200 +++ /var/tmp/diff_new_pack.VZpV7g/_new 2011-05-09 09:39:35.000000000 +0200 @@ -19,17 +19,27 @@ Name: gnome-keyring -BuildRequires: dbus-1-devel +BuildRequires: desktop-file-utils BuildRequires: fdupes -BuildRequires: gtk2-devel BuildRequires: intltool +BuildRequires: libcap-ng-devel BuildRequires: libgcrypt-devel -BuildRequires: libtasn1-devel BuildRequires: pam-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -Version: 2.32.1 -Release: 4 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libtasn1) +BuildRequires: ca-certificates +# needed by patch7 +BuildRequires: gtk-doc +%if 0%{?BUILD_FROM_VCS} +BuildRequires: gnome-common +BuildRequires: gtk-doc +%endif +Version: 3.0.1 +Release: 1 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPLv2+ ; LGPLv2.1+ @@ -40,9 +50,16 @@ Patch4: gnome-keyring-check-session.patch # PATCH-FIX-OPENSUSE gnome-keyring-pam-auth-prompt-password.patch bnc466732 bgo560488 vuntz(a)novell.com -- Make the pam module prompt the password in auth, so we can use pam-config. This is a workaround until bnc#477488 is implemented. Patch5: gnome-keyring-pam-auth-prompt-password.patch -# PATCH-FEATURE-OPENSUSE gnome-keyring-autostart-in-xfce.patch gber(a)opensuse.org -- Fix desktop files so that gnome keyring is autostarted in XFCE sessions as well. -Patch6: gnome-keyring-autostart-in-xfce.patch -Requires: libgp11-modules = %{version} +# PATCH-FIX-UPSTREAM gnome-keyring-fix-parallel-build.patch fcrozat(a)novell.com -- Fix parallel build (from git) +Patch6: gnome-keyring-fix-parallel-build.patch +# PATCH-FIX-UPSTREAM gnome-keyring-file-capabilities.patch rh668831 fcrozat(a)novell.com -- Use libcap-ng for file capabilities (from git) +Patch7: gnome-keyring-file-capabilities.patch +# PATCH-FIX-UPSTREAM gnome-keyring-keep-only-ipc_lock.patch bnc#682244 bgo#649560 vuntz(a)opensuse.org -- Drop fs-based caps other than ipc_lock +Patch8: gnome-keyring-keep-only-ipc_lock.patch +# PATCH-FIX-UPSTREAM gnome-keyring-accept-no-ipc_lock.patch bnc#682244 bgo#649560 vuntz(a)opensuse.org -- Accept to run if we don't have the ipc_lock cap. Note that this might result in unencrypted sensitive data (like passwords) being written to the disk (in the swap) if we use too much memory. +Patch9: gnome-keyring-accept-no-ipc_lock.patch +PreReq: permissions +Requires: libgck-modules = %{version} Recommends: %{name}-lang Recommends: %{name}-pam # bug437293 @@ -62,24 +79,20 @@ password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends. -%package -n libgcr0 +%package -n libgcr-3-0 License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME Summary: Library for Crypto UI related task Recommends: %{name} = %{version} -%description -n libgcr0 +%description -n libgcr-3-0 GCR is a library for crypto UI and related tasks. %package -n libgcr-devel License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/GNOME Summary: Library for Crypto UI related task - Development Files -Requires: libgcr0 = %{version} -Requires: glib2-devel -Requires: gtk2-devel -Requires: libgp11-devel -Requires: libtasn1-devel +Requires: libgcr-3-0 = %{version} %description -n libgcr-devel The GNOME Keyring is a daemon in the session, similar to ssh-agent, @@ -90,24 +103,23 @@ password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends. -%package -n libgp11-0 +%package -n libgck0 License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME -Summary: Glib wrapper library for PKCS#11 -Recommends: libgp11-modules = %{version} +Summary: GObject bindings for PKCS#11 +Recommends: libgck-modules = %{version} -%description -n libgp11-0 -GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) +%description -n libgck0 +GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) interface. -%package -n libgp11-devel +%package -n libgck-devel License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/GNOME -Summary: Glib wrapper library for PKCS#11 - Development Files -Requires: libgp11-0 = %{version} -Requires: glib2-devel +Summary: GObject bindings for PKCS#11 - Development Files +Requires: libgck0 = %{version} -%description -n libgp11-devel +%description -n libgck-devel The GNOME Keyring is a daemon in the session, similar to ssh-agent, and other applications can use it to store passwords and other sensitive information. @@ -116,14 +128,17 @@ password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends. -%package -n libgp11-modules +%package -n libgck-modules License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME Summary: Glib wrapper library for PKCS#11 - Modules -Requires: libgp11-0 = %{version} +Requires: libgck0 = %{version} +# libgp11 used to be the library providing all this. It turns out the +# modules are, as of 2.91.3, installed in the same place +Obsoletes: libgp11-modules < %{version} -%description -n libgp11-modules -GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) +%description -n libgck-modules +GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) interface. This package contains various PKCS#11 modules, to expose keys and @@ -158,26 +173,41 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 + +%if 0%{?BUILD_FROM_VCS} +[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh +%endif %build +# needed by patch7 +libtoolize --force +autoreconf %configure\ - --libexecdir=%{_libexecdir}/gnome-keyring-1\ --enable-pam \ --with-pam-dir=/%{_lib}/security \ --with-root-certs=%{_sysconfdir}/ssl/certs \ - --disable-acl-prompts \ - --with-gtk=2.0 -make %{?jobs:-j%jobs} +%if 0%{?BUILD_FROM_VCS} + --enable-gtk-doc \ +%endif + --with-gtk=3.0 +make %{?jobs:-j%jobs} V=1 %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif +# we don't want to ship a test module +rm %{buildroot}/%{_libdir}/libmock-test-module.so find %{buildroot} -type f -name "*.la" -delete -print +# XFCE team wants gnome-keyring to work by default. +for i in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop ; do + desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart --add-only-show-in=XFCE $i +done %find_lang %{name} %suse_update_desktop_file gnome-keyring-gpg %suse_update_desktop_file gnome-keyring-pkcs11 +%suse_update_desktop_file gnome-keyring-prompt %suse_update_desktop_file gnome-keyring-secrets %suse_update_desktop_file gnome-keyring-ssh %fdupes %{buildroot} @@ -186,18 +216,22 @@ rm -rf %{buildroot} %post +%set_permissions %{_bindir}/gnome-keyring-daemon %glib2_gsettings_schema_post +%verifyscript +%verify_permissions -e %{_bindir}/gnome-keyring-daemon + %postun %glib2_gsettings_schema_postun -%post -n libgcr0 -p /sbin/ldconfig +%post -n libgcr-3-0 -p /sbin/ldconfig -%postun -n libgcr0 -p /sbin/ldconfig +%postun -n libgcr-3-0 -p /sbin/ldconfig -%post -n libgp11-0 -p /sbin/ldconfig +%post -n libgck0 -p /sbin/ldconfig -%postun -n libgp11-0 -p /sbin/ldconfig +%postun -n libgck0 -p /sbin/ldconfig %post pam %{_sbindir}/pam-config -a --gnome_keyring --gnome_keyring-auto_start --gnome_keyring-only_if=gdm,lxdm || true @@ -219,59 +253,68 @@ %files %defattr (-, root, root) %doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/* -%{_libexecdir}/gnome-keyring-1/ -%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.so +%{_bindir}/gnome-keyring +%{_bindir}/gnome-keyring-3 +%{_bindir}/gnome-keyring-daemon +%{_libexecdir}/gnome-keyring-prompt +%{_libexecdir}/gnome-keyring-prompt-3 +%dir %{_libdir}/pkcs11 +%{_libdir}/pkcs11/gnome-keyring-pkcs11.so %{_datadir}/dbus-1/services/org.freedesktop.secrets.service %{_datadir}/dbus-1/services/org.gnome.keyring.service +%dir %{_datadir}/gnome-keyring-3 +%dir %{_datadir}/gnome-keyring-3/ui +%{_datadir}/gnome-keyring-3/ui/gku-prompt.ui # Own the directory since we can't depend on gconf providing them %dir %{_datadir}/GConf %dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/org.gnome.crypto.cache.convert %{_datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert +%{_datadir}/applications/gnome-keyring-prompt.desktop %{_datadir}/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml -%{_datadir}/gnome-keyring/ %{_sysconfdir}/xdg/autostart/*.desktop %files lang -f %{name}.lang -%files -n libgcr0 +%files -n libgcr-3-0 %defattr (-, root, root) -%{_libdir}/libgcr.so.* -%{_datadir}/gcr/ +%{_libdir}/libgcr-3.so.* +%{_datadir}/gcr-3/ %files -n libgcr-devel %defattr (-, root, root) -%{_libdir}/libgcr.so -%{_libdir}/pkgconfig/gcr-0.pc -%{_includedir}/gcr +%{_libdir}/libgcr-3.so +%{_libdir}/pkgconfig/gcr-3.pc +%{_includedir}/gcr-3/ %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/gcr-0/ +%{_datadir}/gtk-doc/html/gcr-3/ -%files -n libgp11-0 +%files -n libgck0 %defattr (-, root, root) -%{_libdir}/libgp11.so.* +%{_libdir}/libgck.so.* %dir %{_libdir}/gnome-keyring %dir %{_libdir}/gnome-keyring/devel -%dir %{_libdir}/gnome-keyring/standalone -%files -n libgp11-devel +%files -n libgck-devel %defattr (-, root, root) -%{_libdir}/libgp11.so -%{_libdir}/pkgconfig/gp11-0.pc -%{_includedir}/gp11 +%{_libdir}/libgck.so +%{_libdir}/pkgconfig/gck-0.pc +%{_includedir}/gck/ %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/gp11/ +%{_datadir}/gtk-doc/html/gck/ -%files -n libgp11-modules +%files -n libgck-modules %defattr (-, root, root) +# Note: if modules move to %%{_libdir}/pkcs11, then we should remove +# the libgp11-modules Obsoletes tag. +%{_libdir}/gnome-keyring/devel/gkm-gnome2-store-standalone.so +%{_libdir}/gnome-keyring/devel/gkm-roots-store-standalone.so +%{_libdir}/gnome-keyring/devel/gkm-secret-store-standalone.so %{_libdir}/gnome-keyring/devel/gkm-ssh-store-standalone.so -%{_libdir}/gnome-keyring/devel/gkm-user-store-standalone.so -%{_libdir}/gnome-keyring/standalone/gkm-roots-store-standalone.so -%{_libdir}/gnome-keyring/standalone/gkm-secret-store-standalone.so +%{_libdir}/gnome-keyring/devel/gkm-xdg-store-standalone.so %files pam %defattr (-, root, root) ++++++ gnome-keyring-2.32.1.tar.bz2 -> gnome-keyring-3.0.1.tar.bz2 ++++++ ++++ 246639 lines of diff (skipped) ++++++ gnome-keyring-accept-no-ipc_lock.patch ++++++ >From b0bfc64a35faec9f2127c4fc857ce5be7df75baa Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Fri, 6 May 2011 14:18:00 +0200 Subject: [PATCH 2/2] Accept to run if ipc_lock capability is not available We print a warning about potential use of unsecure memory, but still run (and drop unneeded capabilities if we have some). This is better than nothing. --- daemon/gkd-capability.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/daemon/gkd-capability.c b/daemon/gkd-capability.c index e15200a..92c000c 100644 --- a/daemon/gkd-capability.c +++ b/daemon/gkd-capability.c @@ -42,6 +42,12 @@ early_error (const char *err_string) exit (1); } +static void +early_warning (const char *warn_string) +{ + fprintf (stderr, "gnome-keyring-daemon: %s\n", warn_string); +} + #endif /* HAVE_LIPCAPNG */ /* @@ -74,11 +80,14 @@ gkd_capability_obtain_capability_and_drop_privileges (void) early_error ("error getting process capabilities"); break; case CAPNG_NONE: - early_error ("insufficient process capabilities"); + early_warning ("insufficient process capabilities, unsecure memory might get used"); break; case CAPNG_PARTIAL: /* File system based capabilities */ if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) { - early_error ("insufficient process capabilities"); + early_warning ("insufficient process capabilities, unsecure memory might get used"); + /* Drop all capabilities */ + capng_clear (CAPNG_SELECT_BOTH); + capng_apply (CAPNG_SELECT_BOTH); break; } -- 1.7.4.2 ++++++ gnome-keyring-file-capabilities.patch ++++++ >From 66bd5dd32836a770647b8acf3476fb7922be71eb Mon Sep 17 00:00:00 2001 From: Steve Grubb <sgrubb(a)redhat.com> Date: Thu, 10 Mar 2011 17:01:35 +0100 Subject: [PATCH] Use file system based capabilities as a way of getting ipc-lock https://bugzilla.redhat.com/show_bug.cgi?id=668831 --- configure.in | 16 +++--- daemon/gkd-capability.c | 112 +++++++++++++++------------------------------- 2 files changed, 45 insertions(+), 83 deletions(-) diff --git a/configure.in b/configure.in index 8e03c7d..a5a434d 100644 --- a/configure.in +++ b/configure.in @@ -440,19 +440,19 @@ if test "$ASN1PARSER" = "no" ; then fi # ------------------------------------------------------------------- -# libcap2 +# libcap-ng # -AC_CHECK_LIB([cap], [cap_get_proc], have_libcap="yes", have_libcap="no") +AC_CHECK_LIB([cap-ng], [capng_clear], have_libcapng="yes", have_libcapng="no") -if test $have_libcap = yes; then - AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library]) - DAEMON_LIBS="$DAEMON_LIBS -lcap" +if test $have_libcapng = yes; then + AC_DEFINE(HAVE_LIBCAPNG, 1, [Have libcap-ng package, libcap-ng library]) + DAEMON_LIBS="$DAEMON_LIBS -lcap-ng" else - AC_MSG_WARN([libcap2 (or development headers) is not installed]) + AC_MSG_WARN([libcap-ng (or development headers) is not installed]) fi -libcap_status=$have_libcap +libcapng_status=$have_libcapng # -------------------------------------------------------------------- # Debug mode @@ -741,7 +741,7 @@ ui/tests/Makefile echo echo "OPTIONAL DEPENDENCIES" echo " PAM: $pam_status" -echo " Linux capabilities: $libcap_status" +echo " Linux capabilities: $libcapng_status" echo echo "CONFIGURATION" echo " SSH Agent: $ssh_status" diff --git a/daemon/gkd-capability.c b/daemon/gkd-capability.c index 4ca0db1..5b47f4e 100644 --- a/daemon/gkd-capability.c +++ b/daemon/gkd-capability.c @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* gkd-capability.c - the security-critical initial phase of the daemon * - * Copyright (C) 2010 Yaron Sheffer + * Copyright (C) 2011 Steve Grubb * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -18,102 +18,64 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. * - * Author: Yaron Sheffer <yaronf(a)gmx.com> - * Author: Stef Walter <stef(a)thewalter.net> + * Author: Steve Grubb <sgrubb(a)redhat.com> */ #include "config.h" #include "gkd-capability.h" -#ifdef HAVE_LIBCAP -#include <sys/capability.h> +#ifdef HAVE_LIBCAPNG +#include <cap-ng.h> #endif #include <stdio.h> -#include <unistd.h> -#include <sys/types.h> #include <stdlib.h> -/* Security note: this portion of the code is extremely sensitive. - * DO NOT add any other include files. - */ +#ifdef HAVE_LIBCAPNG -/* - * No logging, no gettext - */ +/* No logging, no gettext */ static void early_error (const char *err_string) { - fprintf (stderr, "gnome-keyring-daemon: %s\n", err_string); + fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string); + exit (1); } -static void -drop_privileges (void) -{ - uid_t orig_uid; - gid_t orig_gid; - - orig_uid = getuid (); - orig_gid = getgid (); - - /* This is permanent, you cannot go back to root */ - setgid (orig_gid); - setuid (orig_uid); - - /* - * Check that the switch was ok - * We do not allow programs to run without the drop being - * successful as this would possibly run the program - * using root-privs, when that is not what we want - */ - if ((getegid () != orig_gid) || (geteuid () != orig_uid)) { - early_error ("failed to drop privileges, aborting"); - exit (1); - } -} +#endif /* HAVE_LIPCAPNG */ /* - * Try to obtain the CAP_IPC_LOCK Linux capability. - * Then, whether or not this is successful, drop root - * privileges to run as the invoking user. The application is aborted - * if for any reason we are unable to drop privileges. Note: even gettext - * is unavailable! + * This program needs the CAP_IPC_LOCK posix capability. + * We want to allow either setuid root or file system based capabilies + * to work. If file system based capabilities, this is a no-op unless + * the root user is running the program. In that case we just drop + * capabilities down to IPC_LOCK. If we are setuid root, then change to the + * invoking user retaining just the IPC_LOCK capability. The application + * is aborted if for any reason we are unable to drop privileges. + * Note: even gettext is unavailable! */ void gkd_capability_obtain_capability_and_drop_privileges (void) { -#ifdef HAVE_LIBCAP - cap_t caps; - cap_value_t cap_list[1]; - - caps = cap_get_proc (); - if (caps == NULL) { - early_error ("capability state cannot be allocated"); - goto drop; - } - - cap_list[0] = CAP_IPC_LOCK; - if (cap_set_flag (caps, CAP_EFFECTIVE, 1, cap_list, CAP_SET) == -1) { - early_error ("error when manipulating capability sets"); - goto drop; - } - - if (cap_set_proc (caps) == -1) { - /* Only warn when it's root that's running */ - if (getuid () == 0) - early_error ("cannot apply capabilities to process"); - goto drop; +#ifdef HAVE_LIBCAPNG + capng_get_caps_process (); + switch (capng_have_capabilities (CAPNG_SELECT_CAPS)) + { + case CAPNG_FULL: + /* We are either setuid root or the root user */ + capng_clear (CAPNG_SELECT_CAPS); + capng_update (CAPNG_ADD, + CAPNG_EFFECTIVE|CAPNG_PERMITTED, + CAP_IPC_LOCK); + if (capng_change_id (getuid (), getgid (), 0)) + early_error ("failed dropping capabilities"); + break; + case CAPNG_FAIL: + case CAPNG_NONE: + early_error ("error getting process capabilities"); + break; + case CAPNG_PARTIAL: /* File system based capabilities */ + break; } - - if (cap_free (caps) == -1) { - early_error ("failed to free capability structure"); - goto drop; - } -drop: - -#endif - /* Now finally drop the suid by becoming the invoking user */ - if (geteuid () != getuid() || getegid () != getgid ()) - drop_privileges (); +#endif /* HAVE_LIBCAPNG */ } -- 1.7.3.4 >From b9d69a5751c421cca2bee9bab78c1067e1d1acac Mon Sep 17 00:00:00 2001 From: Stef Walter <stefw(a)collabora.co.uk> Date: Wed, 16 Mar 2011 15:26:44 +0100 Subject: [PATCH] If we're using linux capabilities then use setcap instead of setuid. Only use setuid when not using linux capabilities. Run this on install when we are using caps: setcap cap_ipc_lock=ep $(DESTDIR)$(bindir)/gnome-keyring-daemon --- configure.in | 4 +++- daemon/Makefile.am | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index a5a434d..c000ed9 100644 --- a/configure.in +++ b/configure.in @@ -445,13 +445,15 @@ fi AC_CHECK_LIB([cap-ng], [capng_clear], have_libcapng="yes", have_libcapng="no") -if test $have_libcapng = yes; then +if test "$have_libcapng" = "yes"; then AC_DEFINE(HAVE_LIBCAPNG, 1, [Have libcap-ng package, libcap-ng library]) DAEMON_LIBS="$DAEMON_LIBS -lcap-ng" else + have_lipcapng="no" AC_MSG_WARN([libcap-ng (or development headers) is not installed]) fi +AM_CONDITIONAL(WITH_CAPS, test "$have_libcapng" = "yes") libcapng_status=$have_libcapng # -------------------------------------------------------------------- diff --git a/daemon/Makefile.am b/daemon/Makefile.am index a6db20f..7ecfe24 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -79,13 +79,21 @@ CLEANFILES = \ $(service_DATA) \ $(desktop_DATA) +if WITH_CAPS + +# Set the relevant capabilities on the daemon +install-exec-hook: + setcap cap_ipc_lock=ep $(DESTDIR)$(bindir)/gnome-keyring-daemon || true + +else # without caps + # The daemon is installed as setuid so as to obtain specialized # capabilities, then immediately drops permissions. In other words, # it does *not* run as setuid. -# If installing as non-root, chown+chmod will not succeed but -# the build will continue. install-exec-hook: chown root $(DESTDIR)$(bindir)/gnome-keyring-daemon || true chmod u+s $(DESTDIR)$(bindir)/gnome-keyring-daemon || true +endif # without caps + @INTLTOOL_DESKTOP_RULE@ -- 1.7.3.4 ++++++ gnome-keyring-fix-parallel-build.patch ++++++ >From d914606f8dc4cefd5d128af6f9a566a42f102e87 Mon Sep 17 00:00:00 2001 From: Stef Walter <stefw(a)collabora.co.uk> Date: Wed, 27 Apr 2011 09:47:51 +0200 Subject: [PATCH] Fix Makefiles so testable libraries are rebuilt when source changes. --- gck/Makefile.am | 4 ++-- gcr/Makefile.am | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) Index: gnome-keyring-3.0.1/gck/Makefile.am =================================================================== --- gnome-keyring-3.0.1.orig/gck/Makefile.am +++ gnome-keyring-3.0.1/gck/Makefile.am @@ -61,8 +61,8 @@ libgck_testable_la_SOURCES = \ gck-mock.h \ gck-test.c \ gck-test.h -libgck_testable_la_LIBADD = \ - $(libgck_la_OBJECTS) +libgck_testable_la_LIBADD = $(libgck_la_OBJECTS) +libgck_testable_la_DEPENDENCIES = $(libgck_la_OBJECTS) gck-marshal.h: gck-marshal.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) $< --header --prefix=_gck_marshal > $@ Index: gnome-keyring-3.0.1/gcr/Makefile.am =================================================================== --- gnome-keyring-3.0.1.orig/gcr/Makefile.am +++ gnome-keyring-3.0.1/gcr/Makefile.am @@ -112,6 +112,7 @@ libgcr@GCR_VERSION_SUFFIX@_la_LIBADD = \ noinst_LTLIBRARIES = $(TESTABLE_LIB) libgcr_testable_la_SOURCES = libgcr_testable_la_LIBADD = $(libgcr@GCR_VERSION_SUFFIX@_la_OBJECTS) +libgcr_testable_la_DEPENDENCIES = $(libgcr@GCR_VERSION_SUFFIX@_la_OBJECTS) gcr-marshal.h: gcr-marshal.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) $< --header --prefix=_gcr_marshal > $@ Index: gnome-keyring-3.0.1/gck/Makefile.in =================================================================== --- gnome-keyring-3.0.1.orig/gck/Makefile.in +++ gnome-keyring-3.0.1/gck/Makefile.in @@ -71,7 +71,6 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(incdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) -libgck_testable_la_DEPENDENCIES = am_libgck_testable_la_OBJECTS = gck-mock.lo gck-test.lo libgck_testable_la_OBJECTS = $(am_libgck_testable_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) @@ -412,9 +411,8 @@ libgck_testable_la_SOURCES = \ gck-test.c \ gck-test.h -libgck_testable_la_LIBADD = \ - $(libgck_la_OBJECTS) - +libgck_testable_la_LIBADD = $(libgck_la_OBJECTS) +libgck_testable_la_DEPENDENCIES = $(libgck_la_OBJECTS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gck-$(GCK_MAJOR).pc EXTRA_DIST = \ Index: gnome-keyring-3.0.1/gcr/Makefile.in =================================================================== --- gnome-keyring-3.0.1.orig/gcr/Makefile.in +++ gnome-keyring-3.0.1/gcr/Makefile.in @@ -71,7 +71,6 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(uidir)" "$(DESTDIR)$(incdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) -libgcr_testable_la_DEPENDENCIES = am_libgcr_testable_la_OBJECTS = libgcr_testable_la_OBJECTS = $(am_libgcr_testable_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) @@ -485,6 +484,7 @@ libgcr@GCR_VERSION_SUFFIX@_la_LIBADD = \ noinst_LTLIBRARIES = $(TESTABLE_LIB) libgcr_testable_la_SOURCES = libgcr_testable_la_LIBADD = $(libgcr@GCR_VERSION_SUFFIX@_la_OBJECTS) +libgcr_testable_la_DEPENDENCIES = $(libgcr@GCR_VERSION_SUFFIX@_la_OBJECTS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gcr-$(GCR_MAJOR).pc ++++++ gnome-keyring-keep-only-ipc_lock.patch ++++++ >From fc4f6167447f1fd9f3e0240e68a3480143e4715e Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Fri, 6 May 2011 14:14:21 +0200 Subject: [PATCH 1/2] Improved checks for fs capabilities, and drop unneeded ones If we have fs capabilities, we first need to check that we really do have ipc_lock, and if that's the case we just keep ipc_lock and drop everything else. --- daemon/gkd-capability.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/daemon/gkd-capability.c b/daemon/gkd-capability.c index 5b47f4e..e15200a 100644 --- a/daemon/gkd-capability.c +++ b/daemon/gkd-capability.c @@ -71,11 +71,26 @@ gkd_capability_obtain_capability_and_drop_privileges (void) early_error ("failed dropping capabilities"); break; case CAPNG_FAIL: - case CAPNG_NONE: early_error ("error getting process capabilities"); break; + case CAPNG_NONE: + early_error ("insufficient process capabilities"); + break; case CAPNG_PARTIAL: /* File system based capabilities */ - break; + if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) { + early_error ("insufficient process capabilities"); + break; + } + + /* Drop all capabilities except ipc_lock */ + capng_clear (CAPNG_SELECT_BOTH); + if (capng_update (CAPNG_ADD, + CAPNG_EFFECTIVE|CAPNG_PERMITTED, + CAP_IPC_LOCK) != 0) + early_error ("error dropping process capabilities"); + if (capng_apply (CAPNG_SELECT_BOTH) != 0) + early_error ("error dropping process capabilities"); + break; } #endif /* HAVE_LIBCAPNG */ } -- 1.7.4.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libopenvas for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package libopenvas for openSUSE:Factory checked in at Mon May 9 09:39:25 CEST 2011. -------- --- libopenvas/libopenvas.changes 2011-03-18 16:16:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/libopenvas/libopenvas.changes 2011-05-07 12:49:46.000000000 +0200 @@ -1,0 +2,10 @@ +Sat May 7 10:29:26 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 4.0.4 + * The handling of internal dependencies while linking has been improved, + parallel builds of openvas-libraries should now work. + * Two potential resource leaks reported by Pavel Sejnoha and Henri Doreau have + been fixed. + * The setting "unscanned_closed" is now properly applied to UDP ports. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openvas-libraries-4.0.3.tar.gz New: ---- openvas-libraries-4.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopenvas.spec ++++++ --- /var/tmp/diff_new_pack.lie2AP/_old 2011-05-09 09:38:55.000000000 +0200 +++ /var/tmp/diff_new_pack.lie2AP/_new 2011-05-09 09:38:55.000000000 +0200 @@ -20,7 +20,7 @@ %define soname 4 Name: libopenvas -Version: 4.0.3 +Version: 4.0.4 Release: 1 License: GPLv2 Group: Productivity/Networking/Security @@ -156,8 +156,7 @@ %build cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_VERBOSE_MAKEFILE=ON -DSYSCONFDIR=%{_sysconfdir} -DLOCALSTATEDIR=%{_localstatedir} -DLIBDIR=%{_libdir} -DBUILD_WITH_LDAP=ON -DCMAKE_BUILD_TYPE=release -#__make %{?_smp_mflags} VERBOSE=1 -make VERBOSE=1 +%__make %{?_smp_mflags} VERBOSE=1 %install %__make install DESTDIR=%{buildroot} ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.lie2AP/_old 2011-05-09 09:38:55.000000000 +0200 +++ /var/tmp/diff_new_pack.lie2AP/_new 2011-05-09 09:38:55.000000000 +0200 @@ -1,3 +1,14 @@ +libopenvas (4.0.4-1) unstable; urgency=low + + * New upstream release. + - The handling of internal dependencies while linking has been improved, + parallel builds of openvas-libraries should now work. + - Two potential resource leaks reported by Pavel Sejnoha and Henri Doreau have + been fixed. + - The setting "unscanned_closed" is now properly applied to UDP ports. + + -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 07 May 2011 12:30:32 +0200 + libopenvas (4.0.3-1) unstable; urgency=low * New upstream release. ++++++ libopenvas.dsc ++++++ --- /var/tmp/diff_new_pack.lie2AP/_old 2011-05-09 09:38:55.000000000 +0200 +++ /var/tmp/diff_new_pack.lie2AP/_new 2011-05-09 09:38:55.000000000 +0200 @@ -2,13 +2,13 @@ Source: libopenvas Binary: libopenvas4-dev, libopenvas4 Architecture: any -Version: 4.0.3-1 +Version: 4.0.4-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: bison, cmake (>= 2.6), debhelper (>= 5), doxygen, dpatch, hardening-wrapper, libgcrypt11-dev, libglib2.0-dev, libgnutls-dev, libgpgme11-dev (>= 1.1.2), libldap2-dev, libpcap-dev, uuid-dev Files: - b55a7a72ba7b9c8da7b1372a91fbdf88 464106 libopenvas-4.0.3.tar.gz - f657b454af293e32275da3400cc7c67b 4369 libopenvas-4.0.3.diff.gz + b55a7a72ba7b9c8da7b1372a91fbdf88 464106 libopenvas-4.0.4.tar.gz + f657b454af293e32275da3400cc7c67b 4369 libopenvas-4.0.4.diff.gz ++++++ openvas-libraries-4.0.3.tar.gz -> openvas-libraries-4.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/CHANGES new/openvas-libraries-4.0.4/CHANGES --- old/openvas-libraries-4.0.3/CHANGES 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/CHANGES 2011-05-04 08:22:37.000000000 +0200 @@ -1,3 +1,23 @@ +openvas-libraries 4.0.4 (2011-05-04) + +This is the fourth maintenance release of the openvas-libraries 4.0 module for +the Open Vulnerability Assessment System (OpenVAS). + +This release features improvements to the build environment, closes two +potential resource leaks and ensures the unscanned_closed setting in honored for +UDP ports as well. + +Many thanks to everyone who has contributed this release: +Henri Doreau, Matthew Mundell, Pavel Sejnoha and Michael Wiegand. + +Main changes compared to 4.0.3: +* The handling of internal dependencies while linking has been improved, + parallel builds of openvas-libraries should now work. +* Two potential resource leaks reported by Pavel Sejnoha and Henri Doreau have + been fixed. +* The setting "unscanned_closed" is now properly applied to UDP ports. + + openvas-libraries 4.0.3 (2011-03-03) This is the third maintenance release of the openvas-libraries 4.0 module for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/CMakeLists.txt new/openvas-libraries-4.0.4/CMakeLists.txt --- old/openvas-libraries-4.0.3/CMakeLists.txt 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/CMakeLists.txt 2011-05-04 08:22:37.000000000 +0200 @@ -81,7 +81,7 @@ set (CPACK_TOPLEVEL_TAG "") set (CPACK_PACKAGE_VERSION_MAJOR "4") set (CPACK_PACKAGE_VERSION_MINOR "0") -set (CPACK_PACKAGE_VERSION_PATCH "3${SVN_REVISION}") +set (CPACK_PACKAGE_VERSION_PATCH "4${SVN_REVISION}") set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/ChangeLog new/openvas-libraries-4.0.4/ChangeLog --- old/openvas-libraries-4.0.3/ChangeLog 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/ChangeLog 2011-05-04 08:22:37.000000000 +0200 @@ -1,3 +1,61 @@ +2011-05-04 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Preparing the openvas-libraries 4.0.4 release. + + * CHANGES: Updated. + +2011-04-15 Henri Doreau <henri.doreau(a)greenbone.net> + + * nasl/nasl_grammar.y (init_nasl_ctx), nasl/nasl.c (main): fixed memory + leaks reported by valgrind. + +2011-04-15 Henri Doreau <henri.doreau(a)greenbone.net> + + * misc/popen.c (openvas_popen4): replaced raw fd numbers for + stdin/stdout/stderr by the corresponding STD*_FILENO macros from + unistd.h + +2011-04-11 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * omp/xml.c (try_read_entity_and_string): New function. Body from + read_entity_and_string, with timeout arg. + (read_entity_and_string): Call through to try_read_entity_and_string. + (try_read_entity): New function. + (read_entity): Call through to try_read_entity. + + * omp/omp.c (omp_ping): New function. + + * omp/xml.h, omp/omp.h: Add headers accordingly. + +2011-03-19 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * omp/xml.c (parse_entity): New function. + + * omp/xml.h: Add header accordingly. + +2011-03-09 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * misc/plugutils.c (kb_get_port_state_proto): Honor unscanned_closed + setting for UDP ports as well. + +2011-03-07 Matthew Mundell <matthew.mundell(a)greenbone.net> + + * omp/xml.c (handle_end_element, read_entity_and_string): Free context + data list elements. From valgrind by Pavel Sejnoha. + +2011-03-07 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * hg/CMakeLists.txt, misc/CMakeLists.txt, nasl/CMakeLists.txt, + omp/CMakeLists.txt: Refer to libraries by their target name to allow + cmake to handle dependencies correctly. Add missing link between misc + and base when doing static linking. + +2011-03-03 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Post release version bump. + + * CMakeLists.txt: Set version to 4.0.4. + 2011-03-03 Michael Wiegand <michael.wiegand(a)greenbone.net> Preparing the openvas-libraries 4.0.3 release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/hg/CMakeLists.txt new/openvas-libraries-4.0.4/hg/CMakeLists.txt --- old/openvas-libraries-4.0.3/hg/CMakeLists.txt 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/hg/CMakeLists.txt 2011-05-04 08:22:37.000000000 +0200 @@ -51,7 +51,7 @@ set_target_properties (openvas_hg_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}") set_target_properties (openvas_hg_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}") set_target_properties (openvas_hg_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") -target_link_libraries (openvas_hg_shared resolv openvas_misc) +target_link_libraries (openvas_hg_shared resolv openvas_misc_shared openvas_base_shared) if (OPENVAS_PID_DIR) add_definitions (-DOPENVAS_PID_DIR=\\\"${OPENVAS_PID_DIR}\\\") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/misc/CMakeLists.txt new/openvas-libraries-4.0.4/misc/CMakeLists.txt --- old/openvas-libraries-4.0.3/misc/CMakeLists.txt 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/misc/CMakeLists.txt 2011-05-04 08:22:37.000000000 +0200 @@ -110,6 +110,7 @@ set_target_properties (openvas_misc_static PROPERTIES OUTPUT_NAME "openvas_misc") set_target_properties (openvas_misc_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) set_target_properties (openvas_misc_static PROPERTIES PUBLIC_HEADER "${HEADERS}") +target_link_libraries (openvas_misc_static openvas_base_static) add_library (openvas_misc_shared SHARED ${FILES}) @@ -120,7 +121,7 @@ set_target_properties (openvas_misc_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}") set_target_properties (openvas_misc_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") if (NOT MINGW) - target_link_libraries (openvas_misc_shared glib-2.0 pcap gnutls gcrypt openvas_base) + target_link_libraries (openvas_misc_shared glib-2.0 pcap gnutls gcrypt openvas_base_shared) endif (NOT MINGW) if (OPENVASLIB_VERSION) @@ -160,10 +161,10 @@ endif (OPENVAS_SYSCONF_DIR) if (MINGW) - target_link_libraries (openvas_misc_static uuid openvas_base ${GLIB_LDFLAGS} -lglib-2.0 + target_link_libraries (openvas_misc_static uuid openvas_base_static ${GLIB_LDFLAGS} -lglib-2.0 -lgcrypt -lgnutls -lintl -liconv -lgpg-error -lws2_32 -lole32 -lz) - target_link_libraries (openvas_misc_shared uuid openvas_base ${GLIB_LDFLAGS} -lglib-2.0 + target_link_libraries (openvas_misc_shared uuid openvas_base_shared ${GLIB_LDFLAGS} -lglib-2.0 -lgcrypt -lgnutls -lintl -liconv -lgpg-error -lws2_32 -lole32 -lz) else (MINGW) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/misc/plugutils.c new/openvas-libraries-4.0.4/misc/plugutils.c --- old/openvas-libraries-4.0.3/misc/plugutils.c 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/misc/plugutils.c 2011-05-04 08:22:37.000000000 +0200 @@ -738,7 +738,7 @@ return unscanned_ports_as_closed (prefs); else if (!strcmp (proto, "udp") && kb_item_get_int (kb, "Host/udp_scanned") <= 0) - return 1; + return unscanned_ports_as_closed (prefs); range = (u_short *) getpts (prange, &num); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/misc/popen.c new/openvas-libraries-4.0.4/misc/popen.c --- old/openvas-libraries-4.0.3/misc/popen.c 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/misc/popen.c 2011-05-04 08:22:37.000000000 +0200 @@ -98,19 +98,19 @@ perror ("/dev/null"); exit (1); } - close (0); - if (dup2 (fd, 0) < 0) + close (STDIN_FILENO); + if (dup2 (fd, STDIN_FILENO) < 0) { perror ("dup2"); exit (1); } close (fd); - close (1); - close (2); - if (dup2 (pipes[1], 1) < 0 || dup2 (pipes[1], 2) < 0) + close (STDOUT_FILENO); + close (STDERR_FILENO); + if (dup2 (pipes[1], STDOUT_FILENO) < 0 || dup2 (pipes[1], STDERR_FILENO) < 0) { - /* Cannot print error as 2 is closed! */ + /* Cannot print error as STDERR is closed! */ exit (1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/nasl/CMakeLists.txt new/openvas-libraries-4.0.4/nasl/CMakeLists.txt --- old/openvas-libraries-4.0.3/nasl/CMakeLists.txt 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/nasl/CMakeLists.txt 2011-05-04 08:22:37.000000000 +0200 @@ -98,8 +98,8 @@ set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl") set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}") -target_link_libraries (openvas_nasl_static openvas_base openvas_misc - openvas_hg glib-2.0 gcrypt gpgme +target_link_libraries (openvas_nasl_static openvas_base_static openvas_misc_static + openvas_hg_static glib-2.0 gcrypt gpgme gpg-error gnutls pcap ${WMI}) add_library (openvas_nasl_shared SHARED ${FILES}) @@ -110,14 +110,14 @@ set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}") set_target_properties (openvas_nasl_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") # line bellow is needed so it also works with no-undefined which is e.g. used by Mandriva -target_link_libraries (openvas_nasl_shared openvas_base openvas_misc - openvas_hg glib-2.0 gcrypt gpgme +target_link_libraries (openvas_nasl_shared openvas_base_shared openvas_misc_shared + openvas_hg_shared glib-2.0 gcrypt gpgme gpg-error gnutls pcap m ${WMI}) # Link the openvas-nasl executable add_executable (openvas-nasl nasl.c) -target_link_libraries (openvas-nasl openvas_nasl_static openvas_base - openvas_misc openvas_hg ${GLIB_LDFLAGS} -lgcrypt +target_link_libraries (openvas-nasl openvas_nasl_static openvas_base_static + openvas_misc_static openvas_hg_static ${GLIB_LDFLAGS} -lgcrypt -lgpgme -lgpg-error -lgnutls -lpcap -lresolv -lm ${WMI_LIBS}) set_target_properties (openvas-nasl PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${GPGME_CFLAGS}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/nasl/nasl.c new/openvas-libraries-4.0.4/nasl/nasl.c --- old/openvas-libraries-4.0.3/nasl/nasl.c 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/nasl/nasl.c 2011-05-04 08:22:37.000000000 +0200 @@ -161,6 +161,7 @@ g_print ("%s\n\n", error->message); exit (0); } + g_option_context_free (option_context); /*-------------------------------------------- Command-line options ---------------------------------------------*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/nasl/nasl_grammar.y new/openvas-libraries-4.0.4/nasl/nasl_grammar.y --- old/openvas-libraries-4.0.3/nasl/nasl_grammar.y 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/nasl/nasl_grammar.y 2011-05-04 08:22:37.000000000 +0200 @@ -557,6 +557,8 @@ pc->fp = NULL; while (inc_dir != NULL) { + if (full_name) + g_free (full_name); full_name = g_build_filename(inc_dir->data, name, NULL); if ((pc->fp = fopen(full_name, "r")) != NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/omp/CMakeLists.txt new/openvas-libraries-4.0.4/omp/CMakeLists.txt --- old/openvas-libraries-4.0.3/omp/CMakeLists.txt 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/omp/CMakeLists.txt 2011-05-04 08:22:37.000000000 +0200 @@ -51,11 +51,11 @@ set_target_properties (openvas_omp_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") if (MINGW) - target_link_libraries (openvas_omp_shared openvas_misc -lglib-2.0 -lgnutls + target_link_libraries (openvas_omp_shared openvas_misc_shared -lglib-2.0 -lgnutls -lgcrypt -lgpg-error -lintl -lws2_32 -liconv -lole32 -lz -lkernel32) else (MINGW) - target_link_libraries (openvas_omp_shared openvas_misc glib-2.0 gnutls) + target_link_libraries (openvas_omp_shared openvas_misc_shared glib-2.0 gnutls) endif (MINGW) ## Install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/omp/omp.c new/openvas-libraries-4.0.4/omp/omp.c --- old/openvas-libraries-4.0.3/omp/omp.c 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/omp/omp.c 2011-05-04 08:22:37.000000000 +0200 @@ -120,6 +120,62 @@ } /** + * @brief "Ping" the manager. + * + * @param[in] session Pointer to GNUTLS session. + * @param[in] timeout Server idle time before giving up, in milliseconds. 0 + * to wait forever. + * + * @return 0 on success, 1 if manager closed connection, 2 on timeout, + * -1 on error. + */ +int +omp_ping (gnutls_session_t *session, int timeout) +{ + entity_t entity; + const char* status; + char first; + int ret; + + /* Send a GET_VERSION request. */ + + ret = openvas_server_send (session, "<get_version/>"); + if (ret) + return ret; + + /* Read the response, with a timeout. */ + + entity = NULL; + switch (try_read_entity (session, timeout, &entity)) + { + case 0: + break; + case -4: + return 2; + default: + return -1; + } + + /* Check the response. */ + + status = entity_attribute (entity, "status"); + if (status == NULL) + { + free_entity (entity); + return -1; + } + if (strlen (status) == 0) + { + free_entity (entity); + return -1; + } + first = status[0]; + free_entity (entity); + if (first == '2') return 0; + return -1; +} + +/** * @brief Authenticate with the manager. * * @param[in] session Pointer to GNUTLS session. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/omp/omp.h new/openvas-libraries-4.0.4/omp/omp.h --- old/openvas-libraries-4.0.3/omp/omp.h 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/omp/omp.h 2011-05-04 08:22:37.000000000 +0200 @@ -42,6 +42,8 @@ const char *omp_task_status (entity_t status_response); +int omp_ping (gnutls_session_t *, int); + int omp_get_nvt_all (gnutls_session_t * session, entity_t * response); int omp_get_nvt_feed_checksum (gnutls_session_t * session, entity_t * response); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/omp/xml.c new/openvas-libraries-4.0.4/omp/xml.c --- old/openvas-libraries-4.0.3/omp/xml.c 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/omp/xml.c 2011-05-04 08:22:37.000000000 +0200 @@ -37,9 +37,12 @@ */ #include <assert.h> +#include <errno.h> +#include <fcntl.h> #include <glib.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include "xml.h" @@ -358,10 +361,17 @@ /* The name of the very first entity. */ ((entity_t) (data->first->data))->name) == 0); data->done = TRUE; + /* "Pop" the element. */ + data->current = g_slist_next (data->current); + } + else if (data->current) + { + GSList *front; + /* "Pop" and free the element. */ + front = data->current; + data->current = g_slist_next (data->current); + g_slist_free_1 (front); } - /* "Pop" the element. */ - if (data->current) - data->current = g_slist_next (data->current); } /** @@ -397,9 +407,11 @@ } /** - * @brief Read an XML entity tree from the manager. + * @brief Try read an XML entity tree from the manager. * * @param[in] session Pointer to GNUTLS session. + * @param[in] timeout Server idle time before giving up, in seconds. 0 to + * wait forever. * @param[out] entity Pointer to an entity tree. * @param[out] string An optional return location for the text read * from the session. If NULL then it simply @@ -408,16 +420,41 @@ * Otherwise it points to an existing GString onto * which the text is appended. * - * @return 0 success, -1 read error, -2 parse error, -3 end of file. + * @return 0 success, -1 read error, -2 parse error, -3 end of file, -4 timeout. */ int -read_entity_and_string (gnutls_session_t * session, entity_t * entity, - GString ** string_return) +try_read_entity_and_string (gnutls_session_t * session, int timeout, + entity_t * entity, GString ** string_return) { GMarkupParser xml_parser; GError *error = NULL; GMarkupParseContext *xml_context; GString *string; + int socket; + time_t last_time; + + /* Record the start time. */ + + if (time (&last_time) == -1) + { + g_message (" failed to get current time: %s\n", + strerror (errno)); + return -1; + } + + if (timeout > 0) + { + /* Turn off blocking. */ + + socket = GPOINTER_TO_INT (gnutls_transport_get_ptr (*session)); + if (fcntl (socket, F_SETFL, O_NONBLOCK) == -1) + return -1; + } + else + /* Quiet compiler. */ + socket = 0; + + /* Setup return arg. */ if (string_return == NULL) string = NULL; @@ -460,13 +497,30 @@ if (count == GNUTLS_E_INTERRUPTED) /* Interrupted, try read again. */ continue; + if ((timeout > 0) && (count == GNUTLS_E_AGAIN)) + { + /* Server still busy, either timeout and try read again. */ + if ((timeout - (time (NULL) - last_time)) + <= 0) + { + g_message (" timeout\n"); + fcntl (socket, F_SETFL, 0L); + return -4; + } + continue; + } if (count == GNUTLS_E_REHANDSHAKE) /* Try again. TODO Rehandshake. */ continue; if (context_data.first && context_data.first->data) - free_entity (context_data.first->data); + { + free_entity (context_data.first->data); + g_slist_free_1 (context_data.first); + } if (string && *string_return == NULL) g_string_free (string, TRUE); + if (timeout > 0) + fcntl (socket, F_SETFL, 0L); return -1; } if (count == 0) @@ -479,9 +533,14 @@ g_error_free (error); } if (context_data.first && context_data.first->data) - free_entity (context_data.first->data); + { + free_entity (context_data.first->data); + g_slist_free_1 (context_data.first); + } if (string && *string_return == NULL) g_string_free (string, TRUE); + if (timeout > 0) + fcntl (socket, F_SETFL, 0L); return -3; } break; @@ -497,9 +556,14 @@ { g_error_free (error); if (context_data.first && context_data.first->data) - free_entity (context_data.first->data); + { + free_entity (context_data.first->data); + g_slist_free_1 (context_data.first); + } if (string && *string_return == NULL) g_string_free (string, TRUE); + if (timeout > 0) + fcntl (socket, F_SETFL, 0L); return -2; } if (context_data.done) @@ -510,18 +574,56 @@ g_message (" End error: %s\n", error->message); g_error_free (error); if (context_data.first && context_data.first->data) - free_entity (context_data.first->data); + { + free_entity (context_data.first->data); + g_slist_free_1 (context_data.first); + } + if (timeout > 0) + fcntl (socket, F_SETFL, 0L); return -2; } *entity = (entity_t) context_data.first->data; if (string) *string_return = string; + if (timeout > 0) + fcntl (socket, F_SETFL, 0L); return 0; } + + if ((timeout > 0) && (time (&last_time) == -1)) + { + g_message (" failed to get current time (1): %s\n", + strerror (errno)); + fcntl (socket, F_SETFL, 0L); + return -1; + } } } /** + * @brief Try read an XML entity tree from the manager. + * + * @param[in] session Pointer to GNUTLS session. + * @param[in] timeout Seconds or server idle time before giving up. 0 to + * wait forever. + * @param[out] entity Pointer to an entity tree. + * @param[out] string An optional return location for the text read + * from the session. If NULL then it simply + * remains NULL. If a pointer to NULL then it points + * to a freshly allocated GString on successful return. + * Otherwise it points to an existing GString onto + * which the text is appended. + * + * @return 0 success, -1 read error, -2 parse error, -3 end of file, -4 timeout. + */ +int +read_entity_and_string (gnutls_session_t * session, entity_t * entity, + GString ** string_return) +{ + return try_read_entity_and_string (session, 0, entity, string_return); +} + +/** * @brief Read an XML entity tree from the manager. * * @param[in] session Pointer to GNUTLS session. @@ -571,6 +673,22 @@ } /** + * @brief Try read an XML entity tree from the manager. + * + * @param[in] session Pointer to GNUTLS session. + * @param[in] timeout Server idle time before giving up, in seconds. 0 to + * wait forever. + * @param[out] entity Pointer to an entity tree. + * + * @return 0 success, -1 read error, -2 parse error, -3 end of file. + */ +int +try_read_entity (gnutls_session_t * session, int timeout, entity_t * entity) +{ + return try_read_entity_and_string (session, timeout, entity, NULL); +} + +/** * @brief Read an XML entity tree from the manager. * * @param[in] session Pointer to GNUTLS session. @@ -581,7 +699,79 @@ int read_entity (gnutls_session_t * session, entity_t * entity) { - return read_entity_and_string (session, entity, NULL); + return try_read_entity (session, 0, entity); +} + +/** + * @brief Read an XML entity tree from a string. + * + * @param[in] string Input string. + * @param[out] entity Pointer to an entity tree. + * + * @return 0 success, -1 read error, -2 parse error, -3 XML ended prematurely. + */ +int +parse_entity (const char *string, entity_t * entity) +{ + GMarkupParser xml_parser; + GError *error = NULL; + GMarkupParseContext *xml_context; + context_data_t context_data; + + /* Create the XML parser. */ + + xml_parser.start_element = handle_start_element; + xml_parser.end_element = handle_end_element; + xml_parser.text = handle_text; + xml_parser.passthrough = NULL; + xml_parser.error = handle_error; + + context_data.done = FALSE; + context_data.first = NULL; + context_data.current = NULL; + + /* Setup the XML context. */ + + xml_context = + g_markup_parse_context_new (&xml_parser, 0, &context_data, NULL); + + /* Parse the string. */ + + g_markup_parse_context_parse (xml_context, string, strlen (string), &error); + if (error) + { + g_error_free (error); + if (context_data.first && context_data.first->data) + { + free_entity (context_data.first->data); + g_slist_free_1 (context_data.first); + } + return -2; + } + if (context_data.done) + { + g_markup_parse_context_end_parse (xml_context, &error); + if (error) + { + g_message (" End error: %s\n", error->message); + g_error_free (error); + if (context_data.first && context_data.first->data) + { + free_entity (context_data.first->data); + g_slist_free_1 (context_data.first); + } + return -2; + } + *entity = (entity_t) context_data.first->data; + g_slist_free_1 (context_data.first); + return 0; + } + if (context_data.first && context_data.first->data) + { + free_entity (context_data.first->data); + g_slist_free_1 (context_data.first); + } + return -3; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-libraries-4.0.3/omp/xml.h new/openvas-libraries-4.0.4/omp/xml.h --- old/openvas-libraries-4.0.3/omp/xml.h 2011-03-03 09:44:22.000000000 +0100 +++ new/openvas-libraries-4.0.4/omp/xml.h 2011-05-04 08:22:37.000000000 +0200 @@ -80,14 +80,21 @@ void print_entities_format (entities_t, int indentation); +int try_read_entity_and_string (gnutls_session_t *, int, entity_t *, + GString **); + int read_entity_and_string (gnutls_session_t *, entity_t *, GString **); int read_entity_and_text (gnutls_session_t *, entity_t *, char **); +int try_read_entity (gnutls_session_t *, int, entity_t *); + int read_entity (gnutls_session_t *, entity_t *); int read_string (gnutls_session_t *, GString **); +int parse_entity (const char *, entity_t *); + void print_entity_to_string (entity_t entity, GString * string); void print_entities_to_string (GString * string, entities_t entities); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 augeas for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package augeas for openSUSE:Factory checked in at Mon May 9 09:34:55 CEST 2011. -------- --- augeas/augeas.changes 2011-04-04 21:32:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/augeas/augeas.changes 2011-05-06 12:45:48.000000000 +0200 @@ -1,0 +2,67 @@ +Fri May 6 10:32:57 UTC 2011 - dmacvicar(a)suse.de + +- update to 0.8.1 + * augtool: respect autosave flag in oneshot mode, bug #193; + fix segfault caused by unmatched bracket in path expression, + bug #186 + * eliminate a global variable in the lexer, fixes BZ 690286 + * replace an erroneous assert(0) with a proper error message when + none of the alternatives in a union match during saving, + bug #183 + * improve AIX support + * Lens changes/additions + * Access: support the format @netgroup@@nisdomain, bug #190 + * Fstab: fix parsing of SELinux labels in the fscontext option + * Grub: support 'device' directive for UEFI boot, bug #189; support + 'configfile' and 'background' + * Httpd: handle continuation lines; autoload httpd.conf on + Fedora/RHEL, BZ 688149; fix support for single-quoted + strings + * Iptables: support --tcp-flags, bug #157; allow blank and comment + lines anywhere + * Mysql: include /etc/my.cnf used on Fedora/RHEL, BZ 688053 + * NagiosCfg: parse setting multiple values on one line + * NagiosObjects: process /etc/nagios3/objects/*.cfg + * Nsswitch: support 'sudoers' as a database, bug #187 + * Shellvars: autoload /etc/rc.conf used in FreeBSD + * Sudoers: support '#include' and '#includedir', bug #188 + * Yum: exclude /etc/yum/pluginconf.d/versionlock.list +- changes for 0.8.0 + * add new 'square' lens combinator + * add new aug_span API function + * augtool: short options for --nostdinc, --noload, and --noautoload + * augtool: read commands from tty after executing file with --interactive + * augtool: add --autosave option + * augtool: add --span option to load nodes' span + * augtool: add span command to get the node's span according to the input + file + * augtool: really be quiet when we shouldn't be echoing + * fix segfault in get.c with L_MAYBE lens; bug #180 + * fix segfault when a path expression called regexp() with an invalid + regexp; bug #168 + * improved vim syntax file + * replace augtest by test-augtool.sh to obviate the need for Ruby to run + tests + * use sys_wait module from gnulib; bug #164 + * Lens changes/additions + * Access: new lens for /etc/security/access.conf + * Crypttab: new lens for /etc/crypttab + * Dhcpd: new lens + * Exports: accept hostnames with dashes; bug #169 + * Grub: add various Solaris extensions; support "map" entries, + bug #148 + * Httpd: new lens for Apache config + * Inifile: new lens indented_title_label + * Interfaces: allow indentation for "iface" entries; bug #182 + * Mysql: change default comment delimiter from ';' to '#'; bug #181 + * Nsswitch: accept various add'l databases; bug #171 + * PuppetFileserver: new lens for Puppet's fileserver.conf + * REsolv: allow comments starting with ';'; bug #173 + * Shellvars: autoload various snmpd config files; bug #170 + * Solaris_system: new lens for /etc/system on Solaris + * Util (comment_c_style, empty_generic, empty_c_style): new lenses + * Xml: generic lens to process XML files + * Xorg: make "position" in "screen" optional; allow "Extensions" + section; bug #175 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- augeas-0.7.4.tar.bz2 New: ---- augeas-0.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ augeas.spec ++++++ --- /var/tmp/diff_new_pack.pXEj2u/_old 2011-05-09 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.pXEj2u/_new 2011-05-09 09:34:07.000000000 +0200 @@ -19,8 +19,8 @@ Name: augeas -Version: 0.7.4 -Release: 6 +Version: 0.8.1 +Release: 1 Summary: A library for changing configuration files Group: System/Libraries License: GPLv3+ ; LGPLv2.1+ ++++++ augeas-0.7.4.tar.bz2 -> augeas-0.8.1.tar.bz2 ++++++ ++++ 87414 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lzo for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package lzo for openSUSE:Factory checked in at Mon May 9 09:33:58 CEST 2011. -------- --- lzo/lzo.changes 2010-12-22 04:32:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/lzo/lzo.changes 2011-05-06 15:53:14.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 6 13:51:51 UTC 2011 - crrodriguez(a)opensuse.org + +- Update to version 2.05 + * Converted the configure system to non-recursive Automake. + * Applied some overdue speed optimizations for modern x86/x64 architectures + and current compilers like gcc 4.6 and MSVC 2010. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lzo-2.04.tar.bz2 New: ---- lzo-2.05.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lzo.spec ++++++ --- /var/tmp/diff_new_pack.fmJoU7/_old 2011-05-09 09:31:07.000000000 +0200 +++ /var/tmp/diff_new_pack.fmJoU7/_new 2011-05-09 09:31:07.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package lzo (Version 2.04) +# spec file for package lzo # -# 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,7 +20,7 @@ Name: lzo Url: http://www.oberhumer.com/opensource/lzo/ -Version: 2.04 +Version: 2.05 Release: 1 Group: Development/Libraries/C and C++ Source: lzo-%{version}.tar.bz2 @@ -104,7 +104,11 @@ %build export CFLAGS="%optflags -fvisibility=hidden" -%configure --enable-shared --disable-static --libdir=/%{_lib} +%configure --enable-shared \ + --disable-static \ + --libdir=/%{_lib} \ + --disable-silent-rules \ + --docdir=%{_docdir}/%{name}-devel #On windows, the build system defines __LZO_EXPORT1 to # __attribute__((dllexport))) which we can abuse to make ++++++ lzo-2.04.tar.bz2 -> lzo-2.05.tar.bz2 ++++++ ++++ 13877 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-gstreamer-0_10 for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package python-gstreamer-0_10 for openSUSE:Factory checked in at Mon May 9 09:30:59 CEST 2011. -------- --- python-gstreamer-0_10/python-gstreamer-0_10.changes 2010-12-07 12:17:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-gstreamer-0_10/python-gstreamer-0_10.changes 2011-05-06 20:45:00.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 6 20:40:01 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 0.10.21: + + gstreamer core/base 0.10.32 API additions + + Fix GstDiscover methods. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gst-python-0.10.20.tar.bz2 New: ---- gst-python-0.10.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gstreamer-0_10.spec ++++++ --- /var/tmp/diff_new_pack.65mL4D/_old 2011-05-09 09:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.65mL4D/_new 2011-05-09 09:29:54.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-gstreamer-0_10 (Version 0.10.20) +# spec file for package python-gstreamer-0_10 # -# 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 @@ -27,7 +27,7 @@ %endif Url: http://www.gstreamer.net/ Summary: Python Bindings for GStreamer -Version: 0.10.20 +Version: 0.10.21 Release: 1 License: LGPLv2.1+ Group: Development/Languages/Python ++++++ gst-python-0.10.20.tar.bz2 -> gst-python-0.10.21.tar.bz2 ++++++ ++++ 2366 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit portaudio for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package portaudio for openSUSE:Factory checked in at Mon May 9 09:29:47 CEST 2011. -------- --- portaudio/portaudio.changes 2010-02-16 20:52:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/portaudio/portaudio.changes 2011-04-24 19:49:16.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 24 12:59:34 UTC 2011 - toddrme2178(a)gmail.com + +- Add 32bit compatibility libraries + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ portaudio.spec ++++++ --- /var/tmp/diff_new_pack.dhp8dv/_old 2011-05-09 09:28:42.000000000 +0200 +++ /var/tmp/diff_new_pack.dhp8dv/_new 2011-05-09 09:28:42.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package portaudio (Version 19) +# spec file for package portaudio # -# 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 @@ %define package_date 20071207 Summary: Portable Real-Time Audio Library Version: 19 -Release: 263 +Release: 271 License: BSD3c Group: System/Libraries Source: pa_stable_v19_%{package_date}.tar.bz2 +Source1: baselibs.conf Patch: portaudio.diff Url: http://www.portaudio.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ baselibs.conf ++++++ portaudio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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