Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2011-10-27 11:12:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2011-10-26
15:53:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2011-10-27
11:14:46.000000000 +0200
@@ -1,0 +2,36 @@
+Wed Oct 26 21:58:07 CEST 2011 - m...@suse.de
+
+- v4.98.7 released
+
+-------------------------------------------------------------------
+Wed Oct 26 21:55:05 CEST 2011 - m...@suse.de
+
+- fixed appliance name escaping. One can use any string for
+ the displayname attribute which is now properly escaped
+ via perl's quotemeta(). Along with this change the image
+ name attribute must match the pattern [a-zA-Z0-9_\-\.]
+ and is not allowed to have the architecture string
+ as part of the name (bnc #716992)
+
+-------------------------------------------------------------------
+Wed Oct 26 15:57:19 CEST 2011 - m...@suse.de
+
+- v4.98.6 released
+
+-------------------------------------------------------------------
+Wed Oct 26 15:55:32 CEST 2011 - m...@suse.de
+
+- libcrc32 module depends on crc32c, but it does not state this dependency
+ explicitely (modules.dep does not contain this information). Since KIWI
+ relies od modules.dep to clean up unused modules in the initrd, this can
+ break module loading. This patch ensures that the module is kept in the
+ initrd and not purged.
+
+-------------------------------------------------------------------
+Wed Oct 26 15:38:59 CEST 2011 - m...@suse.de
+
+- revert back to parted hex id's, this reverts commits:
+ 47f8bf758861a3d8cdbc2c188024f423e6ee45db
+ 47f8bf758861a3d8cdbc2c188024f423e6ee45db
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.O7omk8/_old 2011-10-27 11:14:48.000000000 +0200
+++ /var/tmp/diff_new_pack.O7omk8/_new 2011-10-27 11:14:48.000000000 +0200
@@ -69,7 +69,7 @@
%endif
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.98.5
+Version: 4.98.7
Release: 1
Group: System/Management
License: GPLv2
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2011-10-26 14:47:33.000000000 +0200
+++ new/kiwi/.revision 2011-10-26 14:47:33.000000000 +0200
@@ -1 +1 @@
-c0cd267086f0183b6d6504885808cff14a9d3615
+4e00fb56f08a5d6f4d1f719418149a02ce9c3705
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-10-25 15:40:01.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2011-10-26 15:57:49.000000000 +0200
@@ -4425,11 +4425,7 @@
if ($cmd eq "t") {
my $index= $commands[$count+1];
my $type = $commands[$count+2];
- if ($type eq "8e") {
- push (@p_cmd,"set $index lvm
on");
- } elsif ($type eq "82") {
- push (@p_cmd,"set $index swap
on");
- }
+ push (@p_cmd,"set $index type 0x$type");
}
if ($cmd eq "a") {
my $index= $commands[$count+1];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm
new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm 2011-10-26 14:47:33.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2011-10-26 21:59:23.000000000 +0200
@@ -40,7 +40,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "4.98.5";
+ $data{Version} = "4.98.7";
$data{Publisher} = "SUSE LINUX Products GmbH";
$data{Preparer} = "KIWI - http://kiwi.berlios.de";;
$data{ConfigName} = "config.xml";
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-10-26 14:47:33.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2011-10-26 21:59:23.000000000 +0200
@@ -229,27 +229,18 @@
# will export each entry of the file as variable into
# the current shell environment
# ----
- IFS="
- "
- local prefix=$1 #change name of key with a prefix
+ local prefix=$1
+ cat - | grep -v ^# > /tmp/srcme
+ source /tmp/srcme
while read line;do
- echo $line | grep -qi "^#" && continue
- key=`echo "$line" | cut -d '=' -f1`
- item=`echo "$line" | cut -d '=' -f2-`
- if [ -z "$key" ] || [ -z "$item" ];then
- continue
- fi
- if ! echo $item | grep -E -q "^(\"|')";then
- item="'"$item"'"
- fi
- Debug "$prefix$key=$item"
- eval export "$prefix$key\=$item"
- done
+ key=$(echo "$line" | cut -d '=' -f1)
+ eval "export $key"
+ eval "export $prefix$key=\$$key"
+ done < /tmp/srcme
if [ ! -z "$ERROR_INTERRUPT" ];then
Echo -e "$ERROR_INTERRUPT"
systemException "*** interrupted ****" "shell"
fi
- IFS=$IFS_ORIG
}
#======================================
# unsetFile
@@ -6918,11 +6909,7 @@
"t")
ptypex=${pcmds[$index + 2]}
partid=${pcmds[$index + 1]}
- if [ $ptypex -eq "8e" ];then
- cmdq="$cmdq set $partid lvm on"
- elif [ $ptypex -eq "82" ];then
- cmdq="$cmdq set $partid swap on"
- fi
+ cmdq="$cmdq set $partid type 0x$ptypex"
partedWrite "$disk" "$cmdq"
cmdq=""
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc
new/kiwi/modules/KIWISchema.rnc
--- old/kiwi/modules/KIWISchema.rnc 2011-10-25 15:40:01.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rnc 2011-10-26 21:59:23.000000000 +0200
@@ -31,7 +31,7 @@
db:pubdate [ "2008-01-08" ]
]
-image-name = xsd:token {pattern = "[^\s/]+"}
+image-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]+"}
locale-name = xsd:token {pattern = "[a-z]{2}_[A-Z]{2}(,[a-z]{2}_[A-Z]{2})*"}
mac-address-type = xsd:token {pattern = "([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}"}
size-type = xsd:token {pattern = "\d*|image"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng
new/kiwi/modules/KIWISchema.rng
--- old/kiwi/modules/KIWISchema.rng 2011-10-25 15:40:01.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rng 2011-10-26 21:59:23.000000000 +0200
@@ -29,7 +29,7 @@
</db:info>
<define name="image-name">
<data type="token">
- <param name="pattern">[^\s/]+</param>
+ <param name="pattern">[a-zA-Z0-9_\-\.]+</param>
</data>
</define>
<define name="locale-name">
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-10-26 14:47:33.000000000 +0200
+++ new/kiwi/modules/KIWIXML.pm 2011-10-26 21:59:23.000000000 +0200
@@ -2374,7 +2374,7 @@
$result{kiwi_iname} = $name;
}
if ($dname) {
- $result{kiwi_displayname} = $dname;
+ $result{kiwi_displayname} = quotemeta $dname;
}
if ($iver) {
$result{kiwi_iversion} = $iver;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm
new/kiwi/modules/KIWIXMLValidator.pm
--- old/kiwi/modules/KIWIXMLValidator.pm 2011-10-25 15:40:01.000000000
+0200
+++ new/kiwi/modules/KIWIXMLValidator.pm 2011-10-26 21:59:23.000000000
+0200
@@ -265,6 +265,28 @@
}
#==========================================
+# __checkNameValid
+#------------------------------------------
+sub __checkNameValid {
+ # ...
+ # Check if arch string is part of the name which is not allowed
+ # ---
+ my $this = shift;
+ my @imgNodes = $this->{systemTree} -> getElementsByTagName('image');
+ # There is only one image node, it is the root node
+ my $name = $imgNodes[0] -> getAttribute('name');
+ if (($name) && ($name =~ /i.*86|x86_64|ppc|ppc64|s390|s390x/)) {
+ my $kiwi = $this->{kiwi};
+ my $msg = 'Found arch string provided in name. '
+ . 'No arch string permitted';
+ $kiwi -> error ( $msg );
+ $kiwi -> failed ();
+ return undef;
+ }
+ return 1;
+}
+
+#==========================================
# __checkEC2IsFsysType
#------------------------------------------
sub __checkEC2IsFsysType {
@@ -885,6 +907,9 @@
if (! $this -> __checkDisplaynameValid()) {
return undef;
}
+ if (! $this -> __checkNameValid()) {
+ return undef;
+ }
if (! $this -> __checkEC2IsFsysType()) {
return undef;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml
new/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -24,6 +24,7 @@
<file name="usb/input/usbhid.ko"/>
</drivers>
<drivers type="drivers">
+ <file name="crypto/*"/>
<file name="drivers/md/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/block/loop.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml
new/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -24,6 +24,7 @@
<file name="usb/input/usbhid.ko"/>
</drivers>
<drivers type="drivers">
+ <file name="crypto/*"/>
<file name="drivers/md/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/block/loop.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml
new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -76,6 +76,7 @@
<file name="lib/crc16.ko"/>
</drivers>
<drivers type="drivers" profiles="diskless">
+ <file name="crypto/*"/>
<file name="drivers/md/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/block/loop.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml
new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -79,6 +79,7 @@
<file name="drivers/gpu/drm/radeon/radeon.ko"/>
</drivers>
<drivers type="drivers" profiles="diskless">
+ <file name="crypto/*"/>
<file name="drivers/md/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/block/loop.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml
new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -79,6 +79,7 @@
<file name="drivers/gpu/drm/radeon/radeon.ko"/>
</drivers>
<drivers type="drivers" profiles="diskless">
+ <file name="crypto/*"/>
<file name="drivers/md/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/block/loop.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml
new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -24,6 +24,7 @@
<file name="usb/input/usbhid.ko"/>
</drivers>
<drivers type="drivers">
+ <file name="crypto/*"/>
<file name="drivers/md/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/cdrom/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml
new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -70,6 +70,7 @@
<file name="drivers/acpi/dock.ko"/>
</drivers>
<drivers type="drivers" profiles="diskless">
+ <file name="crypto/*"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
<file name="drivers/char/agp/intel-agp.ko"/>
<file name="drivers/md/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml
new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -24,6 +24,7 @@
<file name="usb/input/usbhid.ko"/>
</drivers>
<drivers type="drivers">
+ <file name="crypto/*"/>
<file name="drivers/md/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/cdrom/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml
new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -70,6 +70,7 @@
<file name="drivers/acpi/dock.ko"/>
</drivers>
<drivers type="drivers" profiles="diskless">
+ <file name="crypto/*"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
<file name="drivers/char/agp/intel-agp.ko"/>
<file name="drivers/md/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml
new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -23,6 +23,7 @@
<profile name="ppc64" description="KERNEL: ppc64 kernel"/>
</profiles>
<drivers type="drivers">
+ <file name="crypto/*"/>
<file name="drivers/usb/*"/>
<file name="drivers/block/loop.ko"/>
<file name="drivers/block/brd.ko"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml
new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2011-10-25
15:40:01.000000000 +0200
+++ new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2011-10-26
15:57:49.000000000 +0200
@@ -17,6 +17,7 @@
<profile name="ppc64" description="KERNEL: ppc64 kernel"/>
</profiles>
<drivers type="drivers">
+ <file name="crypto/*"/>
<file name="drivers/usb/*"/>
<file name="drivers/block/loop.ko"/>
<file name="net/packet/*"/>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
