February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit nss_ldap for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package nss_ldap for openSUSE:Factory checked in at Fri Feb 5 15:13:30 CET 2010. -------- --- nss_ldap/nss_ldap.changes 2009-12-15 17:06:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/nss_ldap/nss_ldap.changes 2010-02-01 13:10:20.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 12:10:16 UTC 2010 - jengelh(a)medozas.de + +- Package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss_ldap.spec ++++++ --- /var/tmp/diff_new_pack.gfKwFq/_old 2010-02-05 15:12:01.000000000 +0100 +++ /var/tmp/diff_new_pack.gfKwFq/_new 2010-02-05 15:12:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nss_ldap (Version 265) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,11 +30,12 @@ %endif # Version: 265 -Release: 1 +Release: 2 Summary: NSS LDAP Module Url: http://www.padl.com/OSS/nss_ldap.html Source: nss_ldap-%{version}.tar.bz2 Source1: README.SuSE +Source2: baselibs.conf Patch: nss_ldap.dif Patch1: group-utf8.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nss-ldapd for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package nss-ldapd for openSUSE:Factory checked in at Fri Feb 5 15:11:51 CET 2010. -------- --- nss-ldapd/nss-ldapd.changes 2009-08-26 13:59:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/nss-ldapd/nss-ldapd.changes 2010-02-01 13:08:57.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 12:08:53 UTC 2010 - jengelh(a)medozas.de + +- package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss-ldapd.spec ++++++ --- /var/tmp/diff_new_pack.yZ1stQ/_old 2010-02-05 15:11:37.000000000 +0100 +++ /var/tmp/diff_new_pack.yZ1stQ/_new 2010-02-05 15:11:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nss-ldapd (Version 0.6.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,18 @@ Name: nss-ldapd BuildRequires: db-devel krb5-devel openldap2-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Productivity/Networking/LDAP/Clients AutoReqProv: on PreReq: /bin/chmod Conflicts: nss_ldap Version: 0.6.10 -Release: 2 +Release: 3 Summary: NSS module and daemon for using LDAP as a naming service Url: http://arthurdejong.org/nss-ldapd/ Source: nss-ldapd-%{version}.tar.bz2 Source1: rc.nslcd +Source2: baselibs.conf Source100: nss-ldapd-0.6.8-rpmlintrc Patch0: nslcd-passwd-offbyone.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 open-ovf for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package open-ovf for openSUSE:Factory checked in at Fri Feb 5 15:11:01 CET 2010. -------- --- open-ovf/open-ovf.changes 2009-10-22 17:31:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-ovf/open-ovf.changes 2009-11-20 00:34:45.000000000 +0100 @@ -1,0 +2,29 @@ +Tue Nov 10 18:02:43 MST 2009 - jfehlig(a)novell.com + +- Changed lsovf, chovf, and rmovf to use common cli class + instead of OptionsParser +- Fixed help of lsovf, chovf, rmovf, and ova commands + +------------------------------------------------------------------- +Fri Nov 6 20:44:11 MDT 2009 - jfehlig(a)novell.com + +- Improved help by adding '<cmd> --help <subcmd>' +- Fixed disk device creation for xenpv appliances +- Improved README.SuSE + +------------------------------------------------------------------- +Thu Nov 5 12:19:47 MDT 2009 - jfehlig(a)novell.com + +- spec file: conditionally specify noarch + +------------------------------------------------------------------- +Tue Nov 3 21:51:09 MDT 2009 - jfehlig(a)novell.com + +- Fix mkovf help + mkovf-help.patch +- Refactor OvfSet init code + OvfSet-init.patch +- Fix ova command + ova.patch + +------------------------------------------------------------------- @@ -9 +38 @@ -- Initial packaging of open-ovf +- Initial packaging of open-ovf, FATE #303038 calling whatdependson for head-i586 Old: ---- fix-libvirtxml.patch New: ---- chovf.patch help.patch libvirt-clock.patch lsovf.patch ova.patch OvfSet-init.patch rmovf.patch xenpv-libvirtxml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-ovf.spec ++++++ --- /var/tmp/diff_new_pack.7ePcC9/_old 2010-02-05 15:10:10.000000000 +0100 +++ /var/tmp/diff_new_pack.7ePcC9/_new 2010-02-05 15:10:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-ovf (Version 0.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: open-ovf Version: 0.1 -Release: 1 +Release: 2 Summary: Tool for importing and exporting OVF Url: http://open-ovf.wiki.sourceforge.net/ License: EPL @@ -29,11 +29,21 @@ Patch0: output-libvirtxml-file.patch Patch1: xenfv-libvirtxml.patch Patch2: use-before-define.patch -Patch3: fix-libvirtxml.patch +Patch3: libvirt-clock.patch Patch4: python2.6.patch +Patch5: help.patch +Patch6: OvfSet-init.patch +Patch7: ova.patch +Patch8: xenpv-libvirtxml.patch +Patch9: lsovf.patch +Patch10: rmovf.patch +Patch11: chovf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python python-devel +%if 0%{?suse_version} > 1110 BuildArch: noarch +%endif +%py_requires %description Open-OVF project is an open source library and tools designed to promote @@ -47,13 +57,19 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %build -python setup.py build +%{__python} setup.py build %install -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES -#rm -f $RPM_BUILD_ROOT/%{py_sitedir}/*.egg-info +%{__python} setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/ install -m 644 %SOURCE1 $RPM_BUILD_ROOT%{_docdir}/%{name}/ @@ -61,5 +77,4 @@ %defattr(-,root,root) %doc %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README.SuSE - %changelog ++++++ chovf.patch ++++++ ++++ 897 lines (skipped) ++++++ help.patch ++++++ Index: open-ovf-0.1/py/scripts/mkovf =================================================================== --- open-ovf-0.1.orig/py/scripts/mkovf +++ open-ovf-0.1/py/scripts/mkovf @@ -22,6 +22,8 @@ from ovf import validation from ovf.commands import cli from ovf.commands import VERSION_STR +USAGE = "usage: mkovf command -f <Ovf file path> [options]" + def initOVF(ovfFile, options=None): """ This function creates an empy OVF. @@ -580,7 +582,7 @@ def validateOVF(ovfFile, options): def main(): #The version=VERSION_STR is the version of the OVF. - cliParser = cli.CLI(commands, common, version=VERSION_STR) + cliParser = cli.CLI(commands, common, usage=USAGE, version=VERSION_STR) command, options, args = cliParser.parseArgs() ovfFile = None @@ -630,20 +632,21 @@ commands = { "required": True }, { "flags" : [ "-s", "--size" ], - "parms" : { "dest" : "size","help":"The size of the file. If none"+ - " is given the size will be acquired for that file." }}, + "parms" : { "dest" : "size","help":"The size of the file in bytes."+ + " If none is given the size will be acquired for that"+ + " file." }}, { "flags" : [ "-c", "--compression" ], "parms" : { "dest" : "compression","help": "Defines the"+ - " compression of the file if any. If none is given the"+ - " compression shall be determined. Specifying 'identity',"+ + " compression of the file, if any. If none is given the"+ + " compression shall be determined. Specifying 'identity'"+ " states that no compression is used. If the href is an"+ - " HTTP or HTTPS ,URI, then the compression may be"+ + " HTTP or HTTPS URI, then the compression may be"+ " specified by the HTTP server." }}, { "flags" : [ "-C", "--chunksize" ], "parms" : { "dest" : "chunksize","help":"Defines the chunksize for"+ - " the file if any." }} + " the file, if any." }} ) }, "disk" : { @@ -664,23 +667,32 @@ commands = { "required": True }, { "flags" : [ "-r", "--fileRef" ], - "parms" : { "dest" : "fileRef","help" : "File reference." }}, + "parms" : { "dest" : "fileRef","help" : "File reference. The"+ + " ovfID of corresponding File element in references"+ + " section."} + }, { "flags" : [ "-s", "--size" ], - "parms" : { "dest" : "populatedSize","help": "Populated Size." }}, + "parms" : { "dest" : "populatedSize","help": "Populated size"+ + " in bytes."} + }, { "flags" : [ "-u", "--capacityAlloc" ], "parms" : { "dest" : "capacityAllocUnits","help" : "Capacity"+ - " allocation Units." }}, + " allocation Units." } + }, { "flags" : [ "-p", "--parentRef" ], - "parms" : { "dest" : "parentRef","help" :"Parent ref. In order to"+ - " specify this the parent must have already been "+ - "specified." }}, - { "flags" : [ "-m", "--info" ], + "parms" : { "dest" : "parentRef","help" :"Reference to parent"+ + " diskID. In order to specify this the parent must"+ + " have already been specified." } + }, + { "flags" : [ "-m", "--info" ], "parms" : { "dest" : "info","help" : "The information to describe"+ - " the section." }}, - { "flags" : [ "-y"], + " the section." } + }, + { "flags" : [ "-y"], "parms" : { "dest" : "infoID","help" : "The id of the section's"+ - " information." }}, - { "flags" : [ "-q", "--notrequired"], + " information." } + }, + { "flags" : [ "-q", "--notrequired"], "parms" : { "dest" : "required", "action": "store_false", "default": True, "help" : "Defines if the section is not required."}, Index: open-ovf-0.1/py/ovf/commands/cli.py =================================================================== --- open-ovf-0.1.orig/py/ovf/commands/cli.py +++ open-ovf-0.1/py/ovf/commands/cli.py @@ -98,15 +98,19 @@ class CLI: @rtype: str """ - parser = OptionParser(self.usage, version = self.version) + parser = OptionParser(self.usage, version=self.version, + add_help_option=False) for opt in self.commands: parser.add_option("--" + opt, help = self.commands[opt]['help'], action="store_const", const=opt, dest="cmd") + parser.add_option("-h", "--help", action="store_const", + const="help", dest="cmd") + try: cmdStr = args[0] except IndexError: - parser.print_help() + self.printHelp(args) sys.exit(2) options, args = parser.parse_args([ cmdStr ]) @@ -158,13 +162,46 @@ class CLI: """ # if args is not specified use sys.argv - args = args or sys.argv[1:] + args = args or sys.argv + + cmd = self._parseCommand(args[1:]) + if cmd == 'help': + self.printHelp(args) + sys.exit(0) - cmd = self._parseCommand(args) - options, pArgs = self._parseSubcommand(cmd, args[1:]) + options, pArgs = self._parseSubcommand(cmd, args[2:]) return cmd, options, pArgs + def printHelp(self, args): + + if len(args) <= 2 or \ + (len(args) > 2 and not self.commands.has_key(args[2])): + print self.usage + print "\nCommands:" + print " --help, -h\n Show this help message and exit" + for cmd in self.commands: + print " --%s" % cmd + print " %s" % self.commands[cmd]['help'] + else: + print "usage: %s --%s [options]" % (args[0], args[2]) + print self.commands[args[2]]['help'] + print "\nOptions:" + for carg in self.common: + flags = " " + for f in carg['flags']: + flags += f + "," + print flags.rsplit(',', 1)[0] + print " %s" % carg['parms']['help'] + cargs = self.commands[args[2]]['args'] + for carg in cargs: + flags = " " + for f in carg['flags']: + flags += f + ", " + print flags.rsplit(',', 1)[0] + print " %s" % carg['parms']['help'] + + class MultipleNodeError(Exception): """ This error class will be used to print information about multiple ++++++ libvirt-clock.patch ++++++ Index: open-ovf-0.1/py/ovf/OvfLibvirt.py =================================================================== --- open-ovf-0.1.orig/py/ovf/OvfLibvirt.py +++ open-ovf-0.1/py/ovf/OvfLibvirt.py @@ -448,7 +448,7 @@ def clockElement(sync): """ document = Document() elem = document.createElement('clock') - elem.setAttribute('sync', sync) + elem.setAttribute('offset', sync) return elem def devicesElement(*devices): ++++++ lsovf.patch ++++++ Index: open-ovf-0.1/py/scripts/lsovf =================================================================== --- open-ovf-0.1.orig/py/scripts/lsovf +++ open-ovf-0.1/py/scripts/lsovf @@ -12,8 +12,10 @@ ############################################################################## import sys -from optparse import OptionParser +from ovf.commands import cli +from ovf.commands import VERSION_STR +from ovf.OvfFile import OvfFile from ovf.OvfFile import OvfFile def getEfile(ovfFile, options): @@ -397,29 +399,10 @@ def getOS(ovfFile, options): print child.firstChild.data def main(): - usage = "usage: %prog command [options]" - command = None - parser = OptionParser(usage) - for long in commands.keys(): - parser.add_option("--" + long, help=commands[long]['help'], - action="store_true") - - #do the help stuff up here.... - if len(sys.argv) > 1: - for long in commands: - if sys.argv[1] == "--" + long or sys.argv[1] == long: - command = long - break - - if command == None or sys.argv[1] == "--help" or sys.argv[1] == "-h": - parser.parse_args(['--help']) - exit(command != None) - - parser = OptionParser(usage) - for opt in commands[long]['args']+common: - parser.add_option(*opt['flags'], **opt['parms']) + usage = "usage: lsovf command --file <Ovf file path> [options]" + cliParser = cli.CLI(commands, common, usage=usage, version=VERSION_STR) + command, options, args = cliParser.parseArgs() - (options, args) = parser.parse_args(sys.argv[2:]) ovfFile = None if options.ovfFile: try: @@ -443,92 +426,92 @@ commands = { 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "disk" : { 'func': getDisk, - 'help' : 'List the disks from the Disk Section.', + 'help' : "List the disks from the Disk Section.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "net" : { 'func': getNetwork, - 'help' : 'List the networks from the network Section.', + 'help' : "List the networks from the network Section.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "deploy" : { 'func': getDeploy, - 'help' : 'List the Deploymen Options Section.', + 'help' : "List the Deploymen Options Section.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "vsc" : { 'func': getVSC, - 'help' : 'List a Virtual System Collection', + 'help' : "List a Virtual System Collection", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "vs" : { 'func': getVS, - 'help' : 'Lists a Virtual System.', + 'help' : "Lists a Virtual System.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "virthw" : { 'func': getHW, - 'help' : 'List a Virtual Hardware Section.', + 'help' : "List a Virtual Hardware Section.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "resource" : { 'func': _getRes, - 'help' : 'Define resources.', + 'help' : "List resources.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "resAlloc" : { 'func' : _findResAlloc, - 'help' : "List the Resource Allocation Sections. ", + 'help' : "List the Resource Allocation Sections.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "annotate" : { @@ -537,8 +520,8 @@ commands = { 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "product" : { @@ -547,60 +530,60 @@ commands = { 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "license" : { 'func': getLicense, - 'help' : "List the legal temrs for using a particular entity. ", + 'help' : "List the legal temrs for using a particular entity.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "startup" : { 'func': getStartup, - 'help' : "List the startup section for either a Virtual System or a\ - Virtual System Collection. ", + 'help' : "List the startup section for either a Virtual System or a " + "Virtual System Collection.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "compat" : { 'func': getCompat, - 'help' : 'List CPU Compatibility Section which specifies requirements on\ - the virtualized CPU. It is only valid in a Virtual System Section.', + 'help' : "List CPU Compatibility Section which specifies requirements on " + "the virtualized CPU. It is only valid in a Virtual System Section.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, "os" : { 'func': getOS, - 'help' : 'List the operating systems section for a Virtual System.', + 'help' : "List the operating systems section for a Virtual System.", 'args' : ( { 'flags' : [ '--vv' ], - 'parms' : { 'dest' : 'vv','help' : 'Very verbose. Only show some\ - parts of the section.','action': 'store_true','default':False } }, + 'parms' : { 'dest' : 'vv','help' : "Very verbose. Only show some " + "parts of the section.",'action': 'store_true','default':False } }, ) }, "install" : { 'func': getInstall, - 'help' : 'List the install section used to describe a virtual system in\ - a virtual system collection.', + 'help' : "List the install section used to describe a virtual system in " + "a virtual system collection.", 'args' : ( { 'flags' : [ '--vv' ], 'parms' : { 'dest' : 'vv', - 'help' : 'Very verbose. Only show some parts of the\ - section.','action': 'store_true','default':False } }, + 'help' : "Very verbose. Only show some parts of the " + "section.",'action': 'store_true','default':False } }, ) }, @@ -618,15 +601,15 @@ common = ( { 'flags' : [ '-f', '--file' ], - 'parms' : { 'dest' : 'ovfFile', 'help': 'Target OVF.' } + 'parms' : { 'dest' : 'ovfFile', 'help' : "Target OVF." } }, { 'flags' : [ '--id' ], 'parms' : { 'dest' : 'id', - 'help':'ID of the section to attach to, if any.'} + 'help' : "ID of the section to attach to, if any."} }, { 'flags' : [ '--verbose' ], 'parms' : {'action':'store_true', 'dest' : 'verbose', - 'help':'Display with verbose.' } + 'help' : "Display with verbose." } }, ) ++++++ output-libvirtxml-file.patch ++++++ --- /var/tmp/diff_new_pack.7ePcC9/_old 2010-02-05 15:10:10.000000000 +0100 +++ /var/tmp/diff_new_pack.7ePcC9/_new 2010-02-05 15:10:10.000000000 +0100 @@ -18,7 +18,7 @@ - # queue domains with action: domains[id].create() - schedule = OvfLibvirt.getSchedule(startup, domains) + if ofile: -+ fd = os.open(ofile, os.O_RDWR | os.O_CREAT | os.O_TRUNC) ++ fd = os.open(ofile, os.O_RDWR | os.O_CREAT | os.O_TRUNC, 0644) + for domain in domains.values(): + os.write(fd, domain) + os.write(fd, "\n\n") ++++++ ova.patch ++++++ Index: open-ovf-0.1/py/scripts/ova =================================================================== --- open-ovf-0.1.orig/py/scripts/ova +++ open-ovf-0.1/py/scripts/ova @@ -36,7 +36,7 @@ from ovf.OvfFile import OvfFile from ovf import OvfPlatform from ovf import OvfProperty from ovf.OvfReferencedFile import OvfReferencedFile -from ovf.OvfSet import OvfSet +from ovf.OvfSet import * from ovf.OvfManifest import writeManifestFromReferencedFilesList from ovf import OvfTransport from ovf.env import PlatformSection @@ -105,7 +105,7 @@ def packOva(options, args): # Base the output file name on the ovf file name outFile = os.path.splitext(options.ovfFile)[0] + '.ova' - ovfSet = OvfSet(options.ovfFile) + ovfSet = OvfSet(outFile, "w", FORMAT_TAR) if options.noManifest == False: manifestFile = options.manifestFile @@ -141,7 +141,7 @@ def unpackOva(options, args): @param args : target directory path to extract the appliance archive file """ if options.ovfFile != None and os.path.isfile(options.ovfFile): - ovaSet = OvfSet(options.ovfFile, "r") + ovaSet = OvfSet(options.ovfFile, "r", FORMAT_TAR) if not os.path.isdir(options.targetDir): os.mkdir(options.targetDir) ovaSet.writeAsDir(options.targetDir) @@ -610,7 +610,7 @@ COMMANDS = { "manifest" : { 'function' : makeManifest, - 'help' : "Create a manifest file with SHA-1 sum for each " + + 'help' : "Create a manifest file with SHA-1 sum for each " "referenced file", 'args' : ( { @@ -640,7 +640,7 @@ COMMANDS = { "pack" : { 'function' : packOva, - 'help' : "Packs a set of files comprising a virtual appliance into " + + 'help' : "Packs a set of files comprising a virtual appliance into " "a single file in the tar format", 'args' : ( { @@ -690,7 +690,7 @@ COMMANDS = { "runtime" : { "function" : run, - "help" : "Deploy the virtual systems of an OVF file as " + + "help" : "Deploy the virtual systems of an OVF file as " "libvirt domains", "args" : ( { @@ -732,8 +732,8 @@ COMMANDS = { 'flags' : ['-z', '--no-value'], 'parms' : {'dest' : 'noValue', 'action' : "store_true", 'default' : False, - 'help' : "With no-prompt, values without defaults " +\ - "are listed but left unset"} + 'help' : "With no-prompt, values without defaults " + "are listed but left unset"} }, { 'flags' : ['-i', '--id'], @@ -770,14 +770,14 @@ COMMANDS = { { 'flags' : ['-t', '--format'], 'parms' : {'dest' : 'format', 'default' : 'iso', - 'help' : "Transport format. Valid values: 'iso'." +\ + 'help' : "Transport format. Valid values: 'iso'. " "Default is 'iso'."} }, { 'flags' : ['-o', '--outfile'], 'parms': {'dest' : 'outFile', 'default' : None, - 'help' : "Output file. All environment files will be" +\ - " put on a single iso with this name."} + 'help' : "Output file. All environment files will be " + "put on a single iso with this name."} } ), ++++++ OvfSet-init.patch ++++++ Index: open-ovf-0.1/py/ovf/OvfSet.py =================================================================== --- open-ovf-0.1.orig/py/ovf/OvfSet.py +++ open-ovf-0.1/py/ovf/OvfSet.py @@ -29,7 +29,7 @@ class OvfSet(object): archive or as a directory layout """ - def __init__(self, path=None, mode="r"): + def __init__(self, path=None, mode="r", format=FORMAT_DIR): """ Initialize object from path in read/write mode @@ -48,8 +48,8 @@ class OvfSet(object): #: the package name of this object (the name of .ovf without extension) self.name = None - self.ovfFile = None #: The OvfFile object - self.archiveFormat = FORMAT_DIR #: The archive type of this (default save type) + self.ovfFile = None #: The OvfFile object + self.archiveFormat = format #: The archive type of this (default save type) self.archivePath = None #: The write path of the archive self.archiveSavePath = None #: The Save Path for the archive (differs from archivePath for tar) self.__tmpdir__ = None #: the temporary dir if tar (cleaned up in __del__) @@ -60,7 +60,7 @@ class OvfSet(object): self.certificate = None if path != None: - self.initializeFromPath(path, mode) + self.initializeFromPath(path) def __del__(self): """ @@ -89,70 +89,21 @@ class OvfSet(object): mode = property(_getMode, _setMode) - def initializeFromPath(self, path, mode="r"): + def initializeFromPath(self, path): """ initialize object from the file or path given in path @raise IOError: The cases are as follow - - I{B{Case 1:}} The path provided in the parameters is not - valid. - - I{B{Case 2:}} The mode parameter has a value of r and the path - already exist. - - I{B{Case 3:}} Unsafe Tar file - - I{B{Case 4:}} The tar file cannot be found. + - I{B{Case 1:}} Invalid archive format + - I{B{Case 2:}} Unsafe Tar file + - I{B{Case 3:}} The tar file cannot be found. @type path: String @param path: a path to a file to open - @type mode: string - @param mode: mode for open, either 'r' or 'w' """ - - exists = True - if os.path.isdir(path): - self.archiveFormat = FORMAT_DIR - elif os.path.isfile(path): - if tarfile.is_tarfile(path): - self.archiveFormat = FORMAT_TAR - else: - # this file is not a tar file, assume that this is a .ovf - self.archiveFormat = FORMAT_DIR - elif os.path.exists(path): - raise IOError("unsupported file type for " + path) - else: - exists = False - if mode == "r": - raise IOError("cannot open for read " + path) - if path.endswith("/") or path.endswith("\\"): - self.archiveFormat = FORMAT_DIR - elif path.endswith(".ovf") or path.endswith(".OVF"): - self.archiveFormat = FORMAT_DIR - else: - self.archiveFormat = FORMAT_TAR - - if exists == True and self.archiveFormat == FORMAT_TAR: - # Here, for now, we make a temporary copy - tmpdir = os.path.dirname(os.path.abspath(path)) - if os.environ.has_key("TMPDIR"): tmpdir = None - tmpd = tempfile.mkdtemp(dir=tmpdir) - self.__tmpdir__ = tmpd - tf = tarfile.open(path, "r") - ti = tf.next() - while ti is not None: - #TODO: need to do safe extraction here this - # on windows need to protect c:// - # also, check that .ovf is first file - # suggestion[ejcasler]: change ".." to "../" - # make absolute refs begin with tempdir path - if ti.name.find("..") != -1 or ti.name.startswith("/"): - raise IOError("Unsafe Tar file" + path) - tf.extract(ti, tmpd) - ti = tf.next() - self.archivePath = tmpd - self.archiveSavePath = path - elif exists == True and self.archiveFormat == FORMAT_DIR: - # for existing, if it is a file path=dirname(path) + if self.archiveFormat == FORMAT_DIR: if os.path.isfile(path): self.archivePath = os.path.dirname(path) # dirname returns "" rather than "." for "filename" @@ -162,46 +113,53 @@ class OvfSet(object): else: self.archivePath = path self.archiveSavePath = self.archivePath - elif exists == False and self.archiveFormat == FORMAT_TAR: - # for non-existant file, this is the file (.ova) - self.archivePath = path - self.archiveSavePath = self.archivePath - self.setName(os.path.basename(path)[0:(len(os.path.basename(path))-4)]) - elif exists == False and self.archiveFormat == FORMAT_DIR: - # for non-existant dir, this is a dir (not .ovf) - self.archivePath = path - self.archiveSavePath = self.archivePath + elif self.archiveFormat == FORMAT_TAR: + if os.path.isfile(path): + # Here, for now, we make a temporary copy + tmpdir = os.path.dirname(os.path.abspath(path)) + if os.environ.has_key("TMPDIR"): tmpdir = None + tmpd = tempfile.mkdtemp(dir=tmpdir) + self.__tmpdir__ = tmpd + tf = tarfile.open(path, "r") + for ti in tf.getmembers(): + #TODO: need to do safe extraction here this + # on windows need to protect c:// + # also, check that .ovf is first file + # suggestion[ejcasler]: change ".." to "../" + # make absolute refs begin with tempdir path + if ti.name.find("..") != -1 or ti.name.startswith("/"): + raise IOError("Unsafe Tar file" + path) + tf.extract(ti, tmpd) + tf.close() + self.archivePath = tmpd + self.archiveSavePath = path + else: + # for non-existant file, this is the file (.ova) + (p, f) = os.path.split(os.path.abspath(path)) + self.archivePath = p + self.archiveSavePath = self.archivePath + self.setName((f.rsplit(".ova", 1))[0]) + else: - raise IOError("shouldn't be here") + raise IOError("Invalid archive format") - if ( not os.path.isfile(path) and self.archiveFormat == FORMAT_DIR and - exists == True ) or self.__tmpdir__ != None: - name = False + if self.name == None: for curFile in os.listdir(self.archivePath): if curFile.endswith(".ovf"): - if name != False: - return False - # set name to filename without .ovf - name = curFile[0:(len(curFile)-4)] - if name == False and mode == "r": - raise IOError("no ovf file in " + path + "(" + self.archivePath + ")") - elif name: - self.setName(name) - - # now self.archivePath, self.archiveSavePath and self.archiveFormat should - # be set. self.name should be set if possible. - # now, self.archivePath/self.name + ".ovf" should have the ovf file - - if self.name != None: - basepath = os.path.join(self.archivePath, self.name) - self.ovfFile = OvfFile.OvfFile(basepath + ".ovf") - if os.path.isfile(basepath + ".mf"): - # we have a manifest - self.manifest = basepath + ".mf" - - if os.path.isfile(basepath + ".cert"): - # we have a certificate - self.certificate = basepath + ".cert" + self.name = curFile[0:(len(curFile)-4)] + + # ovf file name = self.archivePath + / + self.name + .ovf + basepath = os.path.join(self.archivePath, self.name) + self.ovfFile = OvfFile.OvfFile(basepath + ".ovf") + + # Similarly, aux file name = self.archive + / + self.name + .ext + if os.path.isfile(basepath + ".mf"): + # we have a manifest + self.manifest = basepath + ".mf" + + if os.path.isfile(basepath + ".cert"): + # we have a certificate + self.certificate = basepath + ".cert" def toString(self): """Overrides toString for OvfSet""" @@ -285,7 +243,7 @@ class OvfSet(object): os.unlink(ovfName) ovfname = None except: - if ovfname != None: + if ovfName != None: os.unlink(ovfName) raise ++++++ README.SuSE ++++++ --- /var/tmp/diff_new_pack.7ePcC9/_old 2010-02-05 15:10:10.000000000 +0100 +++ /var/tmp/diff_new_pack.7ePcC9/_new 2010-02-05 15:10:10.000000000 +0100 @@ -28,7 +28,7 @@ ----------- The Distributed Management Task Force (DMTF) has defined a vendor-neutral standard for packaging virtual appliances enabling automated installation, -configuration and activation of any virtualization platform. Open Virtual +configuration and activation on any virtualization platform. Open Virtual Machine Format (OVF) specification describes an open, secure, portable, efficient and extensible format for packaging and distribution of virtual machines. Some of the main features of OVF are @@ -96,64 +96,81 @@ are individually used to build different sections of the OVF. These commands closely parallel the standard, so ambiguity regarding the significance or value of arguments may be determined by looking at the OVF specification. +Nonetheless, brief comments about each subcommand are available through the +'help' subcommand: +mkovf --help +mkovf --help <subcommand> The following is an example of how to create an OVF for a SLES-based virtual appliance that targets the Xen hypervisor, using the mkovf command. # Create the Envelope, or root node, for the OVF file. All other sub-sections # are attached to the Envelope -mkovf --init -f sles11.ovf +mkovf --init --file sles11.ovf # Add an external file (e.g. the appliance disk image) to the Reference section -mkovf --efile -f sles11.ovf --ovfID disk0 -n sles11.img -s 4294967296 +# of the OVF envelope. +mkovf --efile --file sles11.ovf --ovfID disk0 --href sles11.img \ + --size 4294967296 + +# Add a DiskSection to OVF meta-data. The DiskSection describes meta- +# data about all virtual disks in the OVF. The fileRef option identifies +# the corresponding File element in Reference section. It should be set +# to the same value as ovfID option used when creating the File element. +mkovf --disk --file sles11.ovf --diskID disk0 --capacity 4294967296 \ + --format "Raw Image" --info "Virtual Disks" --size 4294967296 \ + --fileRef disk0 + +# Add a NetworkSection to OVF meta-data. The NetworkSection describes logical +# networks used in the OVF. +mkovf --net --file sles11.ovf --networkName br0 --netID 1 \ + --description "Bridged network" --info "Networks used by appliance" + +# Add a VirtualSystem to the OVF envelope. An OVF must contain at least one +# VirtualSystem or VirtualSystemCollection. +mkovf --vs --file sles11.ovf --vsID SLES11-vm \ + --info "Single-VM, SLES11-based virtual appliance" + +# Add an OperatingSystemSection to OVF meta-data. The OperatingSystemSection +# specifies the installed guest operating system of a VirtualSystem. It is +# only valid for VirtualSystems and does not apply to VirtualSystemCollections. +mkovf --os --file sles11.ovf --name SLES11 --description "Linux 2.6.31" \ + --info "SuSE Linux Enterprise Server" + +# Add a VirtualHardwareSection to a VirtualSystem. At least one +# VirtualHardwareSection must be specified for each VirtualSystem. Multiple +# VirtualHardwarSections can be specified for a VirtualSystem. This section +# can not be specified for a VirtualHardwareCollection +mkovf --virthw --file sles11.ovf --sysID 275b6cdf-c22d-52c6-5bce-fc17f71644b8 \ + --type xenpv --instanceID 1 --elementName "sles11-xen" \ + --info "Virtual Hardware Requirements: 512Mb, 4 CPUs, 1 disk, 1 nic" \ -# Append the specified disk information to the Disk section -mkovf --disk -f sles11.ovf -i disk0 -c 4294967296 -F "Raw Image" --info \ - "Virtual Disks" -s 4294967296 --fileRef disk0 - -# Append the specified network information to the Network section -mkovf --net -f sles11.ovf --networkName br0 -i 1 -d "Bridged network" \ - --info "Networks used by appliance" - -# Add a virtual system. The --id parameter can specify eitehr the id of -# virtual system collection to which this new collection should be attached -# or the parent section for the virtual system -mkovf --vs -f sles11.ovf -i SLES11-vm -m "Single-VM, SLES11-based virtual appliance" - -# Create an OperatingSystem Section. It is only valid for Virtual Servers. -# secID specifies the os type. This is an enumeration defined by -# CIM_OperatingSystem.osType -mkovf --os -f sles11.ovf --id SLES11-vm --info "SuSE Linux Enterprise Server" \ - --description "Linux 2.6.x" --secID 103 - -# Add a virtual hardware section to a virtual system. At least one virtual -# hardware section must be specified for each virtual system. Multiple virtual -# hardware sections can be specified for a virtual system. This section can not -# be specified for a virtual hardware collection -mkovf --virthw -f sles11.ovf --id SLES11-vm --type xenpv --secID vh0 --info \ - "Virtual Hardware Requirements: 512Mb, 4 CPUs, 1 disk, 1 nic" --instanceID 1 \ - --elementName "sles11-xen" - -# Add virtual resource elements to the VirtualHardware Section +# Add virtual resource elements to the VirtualHardwareSection # CPUs -mkovf --resource -f sles11.ovf --id vh0 --caption "4 VCPUs" \ - --description "Number of VCPUs" --resourceID 1 --resourceType 3 \ - --virtualQuantity 4 --elementName "virtual CPUs" +mkovf --resource --file sles11.ovf --caption "4 VCPUs" \ + --description "Number of VCPUs" --resourceID numVCPU --resourceType 3 \ + --virtualQuantity 4 --elementName "vcpus" # Memory -mkovf --resource -f sles11.ovf --id vh0 --allocUnits MegaBytes \ - --caption "512MB of memory" --description "Memory size" --resourceID 2 \ - --resourceType 4 --virtualQuantity 512 --elementName "Memory" +mkovf --resource --file sles11.ovf --allocUnits "byte * 2^20" \ + --caption "512MB of memory" --description "512MB Memory" \ + --resourceID mem0 --resourceType 4 --virtualQuantity 512 \ + --elementName "Mem0" # NIC -mkovf --resource -f sles11.ovf --id vh0 --automaticAllocation True \ +# The connection option specifies the bridge used by the virtual NIC +mkovf --resource --file sles11.ovf --automaticAllocation True \ --caption "Ethernet adapter on bridge network" --description "Ethernet" \ - --resourceID 3 --resourceType 10 --elementName "eth0" + --connection br0 --resourceID 3 --resourceType 10 --elementName "eth0" # Disk -mkovf --resource -f sles11.ovf --id vh0 --caption "Disk1" \ - --description "Harddisk" --hostResource ovf://disk/sles11.img \ - --resourceID 4 --resourceType 17 --elementName "xvda" +# The hostResource option specifies the backing disk. Use ovf://disk/<diskId> +# where <diskID> is the disk ID specified in the DiskSection. +# The address option is used to specify the virtual block device name +# presented to the guest, e.g. xvda. +mkovf --resource --file sles11.ovf --caption "Disk1" --description "Harddisk" \ + --hostResource ovf://disk/sles11.img --resourceID 4 --resourceType 17 \ + --elementName xvda --address xvda Creating an OVA @@ -166,7 +183,7 @@ packing of an appliance into this OVA file. # Create an ova with no manifest or certificate file -ova --pack -f sles11.ovf -o sles10sp2-hvm.ova --no-manifest --no-certificate +ova --pack --file sles11.ovf --output sles11.ova --no-manifest --no-certificate Activating an OVA @@ -178,10 +195,10 @@ 'virsh create <libvirt-xml-output>' # First, the ova must be unpacked -ova --unpack -f sles11.ova +ova --unpack --directory /tmp/foo --file /tmp/sles11.ova # Next, extract libvirt XML to a file -ova --runtime -f sles11.ovf --virt xenpv --ofile sles11-libvirt.xml +ova --runtime --file sles11.ovf --virt xenpv --ofile sles11-libvirt.xml # Finally, activate the guest using libvirt's virsh command virsh create sles11-libvirt.xml @@ -189,4 +206,4 @@ Alternatively, once unpacked, the appliance can be activated directly using the ova runtime subcommand by not specifying the --ofile option: -ova --runtime -f sles11.ovf --virt xenpv +ova --runtime --file sles11.ovf --virt xenpv ++++++ rmovf.patch ++++++ ++++ 786 lines (skipped) ++++++ xenpv-libvirtxml.patch ++++++ Index: open-ovf-0.1/py/ovf/OvfLibvirt.py =================================================================== --- open-ovf-0.1.orig/py/ovf/OvfLibvirt.py +++ open-ovf-0.1/py/ovf/OvfLibvirt.py @@ -1135,20 +1135,22 @@ def getOvfDisks(virtualHardware, dir, re raise ValueError(hostResource) #target bus - parentId = int(ovfDisk['rasd:Parent']) - for presource in rasd: - if presource['name'] == 'Item': - instId = int(presource['rasd:InstanceID']) - if instId == parentId: - parentType = presource['rasd:ResourceType'] - break - - if(parentType == '5'): - bus = 'ide' - elif(parentType == '6'): - bus = 'scsi' - else: - raise ValueError + bus = None + if ovfDisk.has_key('rasd:Parent'): + parentId = int(ovfDisk['rasd:Parent']) + for presource in rasd: + if presource['name'] == 'Item': + instId = int(presource['rasd:InstanceID']) + if instId == parentId: + parentType = presource['rasd:ResourceType'] + break + + if(parentType == '5'): + bus = 'ide' + elif(parentType == '6'): + bus = 'scsi' + else: + raise ValueError #default not read-only ro = False @@ -1157,15 +1159,18 @@ def getOvfDisks(virtualHardware, dir, re if(device == 'cdrom'): ro = True dev = 'hdc' + if ovfDisk.has_key('rasd:Address'): + dev = ovfDisk['rasd:Address'] else: dev = logicalNames.pop(0) libvirtDisk = dict(diskType='file', diskDevice=device, sourceFile=source, - targetBus=bus, targetDev=dev, readonly=ro) + if bus: + libvirtDisk['targetBus'] = bus disks += (libvirtDisk,) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pam_ldap for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package pam_ldap for openSUSE:Factory checked in at Fri Feb 5 15:02:47 CET 2010. -------- --- pam_ldap/pam_ldap.changes 2009-12-15 17:29:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/pam_ldap/pam_ldap.changes 2010-02-01 13:17:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 12:17:37 UTC 2010 - jengelh(a)medozas.de + +- Package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_ldap.spec ++++++ --- /var/tmp/diff_new_pack.yUbm3l/_old 2010-02-05 15:02:24.000000000 +0100 +++ /var/tmp/diff_new_pack.yUbm3l/_new 2010-02-05 15:02:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pam_ldap (Version 185) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,11 +29,12 @@ %endif # Version: 185 -Release: 1 +Release: 2 Summary: A PAM Module for LDAP Authentication Url: http://www.padl.com/OSS/pam_ldap.html Source: pam_ldap-%{version}.tar.bz2 Source1: README.SuSE +Source2: baselibs.conf Patch: pam_ldap.patch Patch2: pam_ldap-expirewarning.dif Patch3: pam_ldap-chauthtok-errcode.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sash for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package sash for openSUSE:Factory checked in at Fri Feb 5 15:02:14 CET 2010. -------- --- sash/sash.changes 2009-05-06 16:00:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/sash/sash.changes 2010-02-04 13:35:28.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 4 11:33:56 CET 2010 - pgajdos(a)suse.cz + +- fixed marking lines in -ed [bnc#576598] +- added sash-plus-patches + http://freshmeat.net/projects/sash-plus-patches/ + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sash-3.7-ed-line-marking.diff sash-plus-patches-3.7.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sash.spec ++++++ --- /var/tmp/diff_new_pack.8eUK6h/_old 2010-02-05 15:01:45.000000000 +0100 +++ /var/tmp/diff_new_pack.8eUK6h/_new 2010-02-05 15:01:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sash (Version 3.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,11 @@ Name: sash BuildRequires: ncurses-devel zlib-devel-static -License: Any permissive +License: PERMISSIVE-OSI-COMPLIANT Group: System/Shells AutoReqProv: on Version: 3.7 -Release: 170 +Release: 171 Summary: A stand-alone shell with built-in commands Source: sash-%{version}.tar.bz2 Url: http://www.tip.net.au/~dbell @@ -34,6 +34,8 @@ Patch3: sash-%{version}-strip.diff Patch4: sash-%{version}-fs.diff Patch5: sash-3.7-shared_libc.patch +Patch6: sash-%{version}-ed-line-marking.diff +Patch7: sash-plus-patches-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +59,8 @@ %patch3 %patch4 %patch5 +%patch6 -p1 +%patch7 -p1 %build export RPM_OPT_FLAGS ++++++ sash-3.7-ed-line-marking.diff ++++++ Index: sash-3.7/cmd_ed.c =================================================================== --- sash-3.7.orig/cmd_ed.c +++ sash-3.7/cmd_ed.c @@ -247,7 +247,7 @@ doCommands(void) while (isBlank(*cp)) cp++; - if ((*cp < 'a') || (*cp > 'a') || cp[1]) + if ((*cp < 'a') || (*cp > 'z') || cp[1]) { fprintf(stderr, "Bad mark name\n"); break; ++++++ sash-plus-patches-3.7.diff ++++++ Index: sash-3.7/Makefile =================================================================== --- sash-3.7.orig/Makefile +++ sash-3.7/Makefile @@ -3,12 +3,18 @@ # # The HAVE_GZIP definition adds the -gzip and -gunzip commands. # The HAVE_LINUX_ATTR definition adds the -chattr and -lsattr commands. +# The HAVE_LINUX_CHROOT definition adds the -chroot command. +# The HAVE_LINUX_PIVOT definition adds the -pivot_root command. +# The HAVE_LINUX_LOSETUP definition adds the -losetup command. # The HAVE_LINUX_MOUNT definition makes -mount and -umount work on Linux. # The HAVE_BSD_MOUNT definition makes -mount and -umount work on BSD. # The MOUNT_TYPE definition sets the default file system type for -mount. # HAVE_GZIP = 1 HAVE_LINUX_ATTR = 1 +HAVE_LINUX_CHROOT = 1 +HAVE_LINUX_LOSETUP = 1 +HAVE_LINUX_PIVOT = 1 HAVE_LINUX_MOUNT = 1 HAVE_BSD_MOUNT = 0 MOUNT_TYPE = '"ext3"' @@ -17,6 +23,9 @@ MOUNT_TYPE = '"ext3"' CFLAGS = -Wall -Wmissing-prototypes $(RPM_OPT_FLAGS) \ -DHAVE_GZIP=$(HAVE_GZIP) \ -DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \ + -DHAVE_LINUX_CHROOT=$(HAVE_LINUX_CHROOT) \ + -DHAVE_LINUX_LOSETUP=$(HAVE_LINUX_LOSETUP) \ + -DHAVE_LINUX_PIVOT=$(HAVE_LINUX_PIVOT) \ -DHAVE_LINUX_MOUNT=$(HAVE_LINUX_MOUNT) \ -DHAVE_BSD_MOUNT=$(HAVE_BSD_MOUNT) \ -DMOUNT_TYPE=$(MOUNT_TYPE) Index: sash-3.7/cmds.c =================================================================== --- sash-3.7.orig/cmds.c +++ sash-3.7/cmds.c @@ -24,6 +24,16 @@ #include <linux/fs.h> #endif +/* Need to tell loop.h what the actual dev_t type is. */ +#undef dev_t +#if defined(__alpha) || (defined(__sparc__) && defined(__arch64__)) +#define dev_t unsigned int +#else +#define dev_t unsigned short +#endif +#include <linux/loop.h> +#undef dev_t +#define dev_t dev_t void do_echo(int argc, const char ** argv) @@ -150,6 +160,28 @@ do_mknod(int argc, const char ** argv) } +#if HAVE_LINUX_PIVOT + +void +do_pivot_root(int argc, const char ** argv) +{ + if (pivot_root(argv[1], argv[2]) < 0) + perror(""); +} + +#endif + +#if HAVE_LINUX_CHROOT + +void +do_chroot(int argc, const char ** argv) +{ + if (chroot(argv[1]) < 0) + perror(""); +} + +#endif + void do_rmdir(int argc, const char ** argv) { @@ -1256,4 +1288,62 @@ do_where(int argc, const char ** argv) printf("Program \"%s\" not found in PATH\n", program); } +#if HAVE_LINUX_LOSETUP + +void +do_losetup(int argc, const char ** argv) +{ + int loopfd; + int targfd; + struct loop_info loopInfo; + + if (!strcmp(argv[1], "-d")) { + loopfd = open(argv[2], O_RDWR); + if (loopfd < 0) { + fprintf(stderr, "Error opening %s: %s\n", argv[2], + strerror(errno)); + return; + } + + if (ioctl(loopfd, LOOP_CLR_FD, 0)) { + fprintf(stderr, "Error unassociating device: %s\n", + strerror(errno)); + return; + } + } + + loopfd = open(argv[1], O_RDWR); + if (loopfd < 0) { + fprintf(stderr, "Error opening %s: %s\n", argv[1], + strerror(errno)); + return; + } + + targfd = open(argv[2], O_RDWR); + if (targfd < 0) { + fprintf(stderr, "Error opening %s: %s\n", argv[2], + strerror(errno)); + return; + } + + if (ioctl(loopfd, LOOP_SET_FD, targfd)) { + fprintf(stderr, "Error setting up loopback device: %s\n", + strerror(errno)); + return; + } + + memset(&loopInfo, 0, sizeof(loopInfo)); + strcpy(loopInfo.lo_name, argv[2]); + + if (ioctl(loopfd, LOOP_SET_STATUS, &loopInfo)) { + fprintf(stderr, "Error setting up loopback device: %s\n", + strerror(errno)); + return; + } + + return; +} + +#endif + /* END CODE */ Index: sash-3.7/sash.1 =================================================================== --- sash-3.7.orig/sash.1 +++ sash-3.7/sash.1 @@ -22,11 +22,11 @@ is that many of the standard system comm These built-in commands are: .PP .nf - -ar, -chattr, -chgrp, -chmod, -chown, -cmp, -cp, - -dd, -echo, -ed, -grep, -file, -find, -gunzip, - -gzip, -kill, -ln, -ls, -lsattr, -mkdir, -mknod, - -more, -mount, -mv, -printenv, -pwd, -rm, -rmdir, - -sum, -sync, -tar, -touch, -umount, -where + -ar, -chattr, -chgrp, -chmod, -chown, -chroot, -cmp, + -cp, -dd, -echo, -ed, -grep, -file, -find, -gunzip, + -gzip, -kill, -losetup, -ln, -ls, -lsattr, -mkdir, + -mknod, -more, -mount, -mv, -pivot_root, -printenv, -pwd, + -rm, -rmdir, -sum, -sync, -tar, -touch, -umount, -where .fi .PP These commands are generally similar to the standard programs with similar @@ -138,6 +138,13 @@ Change the owner id for the specified li can either be a user name, or a decimal value. .TP +.B -chroot path +Changes the root directory to that specified in +.I path. +This directory +will be used for path names beginning with /. The root directory is +inherited by all children of the current process. +.TP .B -cmp fileName1 fileName2 Determines whether or not the specified file names have identical data. This says that the files are links to each other, are different sizes, @@ -312,6 +319,20 @@ is a numeric value, or one of the specia QUIT, KILL, TERM, STOP, CONT, USR1 or USR2. If no signal is specified then SIGTERM is used. .TP +.B -losetup [-d] loopDev [file] +Associates loopback devices with files on the system. If +.I -d +is not given, +the loopback device +.I loopDev +is associated with +.I file. +If +.I -d +is given, +.I loopDev +is unassociated with the file it's currently configured for. +.TP .B -ln [-s] srcName ... destName Links one or more files from the .I srcName @@ -388,6 +409,13 @@ same names as the srcNames. Renames are this fails because of the files being on different filesystems, then copies and deletes are done instead. .TP +.B -pivot_root newRoot putOld +Moves the root file system of the current process to the directory +.I putOld +and makes +.I newRoot +the new root file system of the current process. +.TP .B -printenv [name] If .I name Index: sash-3.7/sash.c =================================================================== --- sash-3.7.orig/sash.c +++ sash-3.7/sash.c @@ -18,7 +18,7 @@ #include <linux/major.h> #include <linux/raid/md_u.h> -static const char * const version = "3.7"; +static const char * const version = "3.7-fb"; /* @@ -110,6 +110,14 @@ static const CommandEntry commandEntryTa "srcName ... destName" }, +#ifdef HAVE_LINUX_CHROOT + { + "-chroot", do_chroot, 2, 2, + "change root file system", + "new_root_dir" + }, +#endif + { "-dd", do_dd, 3, INFINITE_ARGS, "Copy data between two files", @@ -184,6 +192,14 @@ static const CommandEntry commandEntryTa "[-sig] pid ..." }, +#ifdef HAVE_LINUX_LOSETUP + { + "-losetup", do_losetup, 3, 3, + "Associate a loopback device with a file", + "[-d] device\n -losetup device filename" + }, +#endif + { "-ln", do_ln, 3, INFINITE_ARGS, "Link one fileName to another", @@ -240,6 +256,14 @@ static const CommandEntry commandEntryTa "srcName ... destName" }, +#ifdef HAVE_LINUX_PIVOT + { + "-pivot_root", do_pivot_root, 3, 3, + "pivot the root file system", + "new_dir old_dir" + }, +#endif + { "-printenv", do_printenv, 1, 2, "Print environment variables", @@ -392,6 +416,7 @@ static void childProcess(const char * cm static void showPrompt(void); static void usage(void); static Alias * findAlias(const char * name); +static void expandVariable(char * name); /* @@ -711,6 +736,11 @@ command(const char * cmd) } /* + * Expand simple environment variables + */ + while (strstr(cmd, "$(")) expandVariable((char *)cmd); + + /* * Now look for the command in the builtin table, and execute * the command if found. */ @@ -1296,4 +1326,29 @@ usage(void) exit(1); } +/* + * Expand one environment variable: Syntax $(VAR) + */ +static void +expandVariable(char * cmd) +{ + char tmp[CMD_LEN]; + char *cp; + char *ep; + + strcpy(tmp, cmd); + cp = strstr(tmp, "$("); + if (cp) { + *cp++ = '\0'; + strcpy(cmd, tmp); + ep = ++cp; + while (*ep && (*ep != ')')) ep++; + if (*ep == ')') *ep++ = '\0'; + cp = getenv(cp); + if (cp) strcat(cmd, cp); + strcat(cmd, ep); + } + return; +} + /* END CODE */ Index: sash-3.7/sash.h =================================================================== --- sash-3.7.orig/sash.h +++ sash-3.7/sash.h @@ -111,6 +111,18 @@ extern void do_lsattr(int argc, const ch extern void do_chattr(int argc, const char ** argv); #endif +#if HAVE_LINUX_CHROOT +extern void do_chroot(int argc, const char ** argv); +#endif + +#if HAVE_LINUX_LOSETUP +extern void do_losetup(int argc, const char ** argv); +#endif + +#if HAVE_LINUX_PIVOT +extern void do_pivot_root(int argc, const char ** argv); +extern int pivot_root(const char *new_root, const char *put_old); +#endif /* * Global utility routines. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tclplug for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package tclplug for openSUSE:Factory checked in at Fri Feb 5 15:01:35 CET 2010. -------- --- tclplug/tclplug.changes 2008-04-04 15:31:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/tclplug/tclplug.changes 2010-02-01 13:34:08.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 12:34:03 UTC 2010 - jengelh(a)medozas.de + +- Package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tclplug.spec ++++++ --- /var/tmp/diff_new_pack.6UBtYd/_old 2010-02-05 15:01:27.000000000 +0100 +++ /var/tmp/diff_new_pack.6UBtYd/_new 2010-02-05 15:01:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tclplug (Version 3.1.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,14 +20,15 @@ Name: tclplug BuildRequires: tk-devel xorg-x11-devel -License: BSD 3-Clause +License: BSD3c Group: Development/Libraries/Tcl Requires: web_browser tcl tk AutoReqProv: on Summary: Tcl/Tk Plug-In for Netscape Navigator Version: 3.1.0 -Release: 51 +Release: 52 Source: tclplugin-3.1.0-20060613-tar.bz2 +Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 installation-images for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Fri Feb 5 15:01:18 CET 2010. -------- --- installation-images/installation-images.changes 2010-01-12 15:33:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2010-01-28 18:47:01.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Jan 28 12:57:43 CET 2010 - meissner(a)suse.de + +- xorg-x11-driver-radeonhd is only on x86 and x86_64, require it there +- wlan is everywhere (ppc,ppc64,ia64 are candidates, we could filter + it on s390), added wpa_supplicant and wireless-tools +- various indirectly required things are not pulled in correctly in ppc. +- libcryptsetup0 was renamed to libcryptsetup1 +- added libXi6 and xorg-x11-libs for xdpyinfo dependencies. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.CiBgPg/_old 2010-02-05 15:00:46.000000000 +0100 +++ /var/tmp/diff_new_pack.CiBgPg/_new 2010-02-05 15:00:46.000000000 +0100 @@ -26,14 +26,14 @@ BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-nfs-client yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users BuildRequires: aaa_base audit-libs busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool fvwm2 gpm hfsutils icewm-lite libelf0 libzypp open-iscsi openct pciutils pciutils-ids pcsc-lite perl-HTML-Parser sqlite3 util-linux BuildRequires: build-key gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare perl-XML-NamespaceSupport perl-XML-Parser perl-XML-Simple yast2-iscsi-client yast2-ncurses -BuildRequires: Mesa xkeyboard-config xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-Xvnc xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm +BuildRequires: Mesa libXi6 xkeyboard-config xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-Xvnc xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm #BuildRequires: tightvnc BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel librpcsecgss module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace vim xntp xz yast2-devtools BuildRequires: alsa alsa-utils bind-libs bind-utils chkrootkit espeak lsscsi openldap2-client portaudio portmap python rpcbind sdparm smp_utils uuid-runtime xorg-x11-xauth yast2-multipath -BuildRequires: btrfsprogs cairo graphviz graphviz-gnome kernel-default kernel-firmware pango sax2 sax2-ident sax2-tools unscd valgrind yast2-qt-graph +BuildRequires: btrfsprogs cairo graphviz graphviz-gnome kernel-default kernel-firmware libiw30 pango sax2 sax2-ident sax2-tools unscd valgrind wireless-tools wpa_supplicant yast2-qt-graph # kmps %ifarch %ix86 x86_64 -BuildRequires: atmel-firmware dos2unix ftp ipw-firmware ncpfs opensc tftp wireless-tools wpa_supplicant +BuildRequires: atmel-firmware dos2unix ftp ipw-firmware ncpfs opensc tftp %if %{build_xen} BuildRequires: kernel-xen %else @@ -42,7 +42,11 @@ %endif BuildRequires: ltrace %ifnarch s390 s390x -BuildRequires: fbset iprutils kbd libxslt tightvnc xorg-x11-driver-input xorg-x11-driver-video xorg-x11-driver-video-radeonhd xorg-x11-driver-video-unichrome yast2-x11 +BuildRequires: fbset iprutils kbd libxslt tightvnc xorg-x11-driver-input xorg-x11-driver-video xorg-x11-driver-video-unichrome yast2-x11 +%endif +%ifarch %ix86 x86_64 +# mirror ExclusiveArch of xorg-x11-driver-video-radeonhd. +BuildRequires: xorg-x11-driver-video-radeonhd %endif %ifarch ppc BuildRequires: petitboot @@ -51,6 +55,7 @@ BuildRequires: lilo BuildRequires: pdisk BuildRequires: powerpc-utils +BuildRequires: kernel-ppc64 %endif %ifarch %ix86 x86_64 BuildRequires: acpica dhcp-client dmidecode elilo firmwarekit grub libsmbios2 libunwind lilo memtest86+ syslinux virtualbox-ose-kmp-default xorg-x11-driver-virtualbox-ose yast2-vm @@ -99,7 +104,7 @@ AutoReqProv: off Summary: Installation Image Files Version: 12.36 -Release: 1 +Release: 2 Source: installation-images-12.36.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -117,7 +122,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 575 +Release: 576 PreReq: /bin/ln %description -n install-initrd ++++++ installation-images-12.36.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.36/data/initrd/initrd.file_list new/installation-images-12.36/data/initrd/initrd.file_list --- old/installation-images-12.36/data/initrd/initrd.file_list 2010-01-11 18:33:49.000000000 +0100 +++ new/installation-images-12.36/data/initrd/initrd.file_list 2010-01-28 16:03:16.000000000 +0100 @@ -375,7 +375,9 @@ if arch eq 'i386' || arch eq 'x86_64' bootsplash: /sbin/splash +endif +if arch eq 'i386' || arch eq 'x86_64' || arch eq 'ppc' || arch eq 'ppc64' wpa_supplicant: /usr/sbin @@ -390,7 +392,7 @@ r /usr/sbin/install_intersil_firmware endif -# i386/x86_64 +# i386/x86_64/ppc libopenssl0_9_8: /usr/lib*/libcrypto.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.36/data/rescue/rescue.file_list new/installation-images-12.36/data/rescue/rescue.file_list --- old/installation-images-12.36/data/rescue/rescue.file_list 2010-01-11 18:33:49.000000000 +0100 +++ new/installation-images-12.36/data/rescue/rescue.file_list 2010-01-28 16:16:42.000000000 +0100 @@ -641,12 +641,14 @@ /usr/lib*/libsmbios.so.* endif +if arch eq 'i386' || arch eq 'x86_64' || arch eq 'ppc' || arch eq 'ppc64' libiw30: /usr/lib* wireless-tools: /etc /usr/sbin +endif dmraid: postin /lib* @@ -756,7 +758,7 @@ /sbin /lib* -libcryptsetup0: +libcryptsetup1: /lib*/libcryptsetup.so.* libgcrypt11: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.36/data/root/machbunt.file_list new/installation-images-12.36/data/root/machbunt.file_list --- old/installation-images-12.36/data/root/machbunt.file_list 2010-01-11 18:33:49.000000000 +0100 +++ new/installation-images-12.36/data/root/machbunt.file_list 2010-01-28 17:16:32.000000000 +0100 @@ -139,8 +139,12 @@ xorg-x11-libfontenc: /usr/lib*/libfontenc.so.* + libXi6: + /usr/lib*/libXi.so.* + xorg-x11-libs: /usr/lib*/libXaw8.so.* + /usr/lib*/libXcomposite.so.* /usr/lib*/libXcursor.so.* /usr/lib*/libXfontcache.so.* /usr/lib*/libXft.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.36/data/root/root.file_list new/installation-images-12.36/data/root/root.file_list --- old/installation-images-12.36/data/root/root.file_list 2010-01-11 18:33:49.000000000 +0100 +++ new/installation-images-12.36/data/root/root.file_list 2010-01-28 16:28:38.000000000 +0100 @@ -986,7 +986,7 @@ cryptsetup: /sbin -libcryptsetup0: +libcryptsetup1: /lib*/libcryptsetup.so.* ntp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.36/data/root/sax2.file_list new/installation-images-12.36/data/root/sax2.file_list --- old/installation-images-12.36/data/root/sax2.file_list 2009-09-28 12:08:32.000000000 +0200 +++ new/installation-images-12.36/data/root/sax2.file_list 2010-01-28 17:36:27.000000000 +0100 @@ -25,8 +25,10 @@ xorg-x11-driver-video: /usr/share/sax -xorg-x11-driver-video-radeonhd: - /usr/share/sax +if arch eq 'i386' || arch eq 'x86_64' + xorg-x11-driver-video-radeonhd: + /usr/share/sax +endif xorg-x11-driver-video-unichrome: /usr/share/sax diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.36/etc/module.config new/installation-images-12.36/etc/module.config --- old/installation-images-12.36/etc/module.config 2010-01-12 15:25:20.000000000 +0100 +++ new/installation-images-12.36/etc/module.config 2010-01-28 18:23:05.000000000 +0100 @@ -1167,6 +1167,7 @@ mtd,"mtd" mtd_blkdevs,"mtd_blkdevs" mtdblock,"mtdblock" +ps3-lpm,-,- ; ide generic,"Generic PCI IDE",,,,1 pdc202xx_new,"Promise PDC20268+ IDE",,,,1 @@ -1248,6 +1249,9 @@ rfkill,,- ssb,-,- ; +sja1000_of_platform,-,- +xilinx_emaclite,-,- +da903x_bl,-,- [s390] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Feb 5 15:00:33 CET 2010. -------- --- kiwi/kiwi.changes 2010-02-02 17:11:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2010-02-04 16:18:25.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 3 11:04:09 CET 2010 - ms(a)suse.de + +- v4.13 +- fixed templates, Xen based OEM image should be a dom0 +- Xen dom0 images doesn't require a xenconfig file +- prevent XML pretty printer from swallowing comments +- fixed migration mount setup and clean code allow + zypper types dvd:// and iso:// to be used + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.xgCzIu/_old 2010-02-05 14:59:51.000000000 +0100 +++ /var/tmp/diff_new_pack.xgCzIu/_new 2010-02-05 14:59:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 4.12) +# spec file for package kiwi (Version 4.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -60,7 +60,7 @@ Requires: clicfs %endif Summary: OpenSuSE - KIWI Image System -Version: 4.12 +Version: 4.13 Release: 1 Group: System/Management License: GPLv2+ @@ -415,11 +415,11 @@ %fdupes $RPM_BUILD_ROOT/usr/share/doc/packages/kiwi/schema %endif cat kiwi.loader +%ifarch %ix86 x86_64 %post -n kiwi-pxeboot #============================================================ # create /srv/tftpboot/pxelinux.cfg/default only if not exist -%ifarch %ix86 x86_64 if ( [ ! -e srv/tftpboot/pxelinux.cfg/default ] ) ; then cp /srv/tftpboot/pxelinux.cfg/default.default /srv/tftpboot/pxelinux.cfg/default fi ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Fri Feb 5 14:59:26 CET 2010. -------- --- aaa_base/aaa_base.changes 2010-01-14 12:01:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-02-05 01:18:41.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 5 01:17:38 CET 2010 - ro(a)suse.de + +- /etc/init.d/boot: use devtmpfs for /dev if available (bnc#561990) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.l1O8zn/_old 2010-02-05 14:37:14.000000000 +0100 +++ /var/tmp/diff_new_pack.l1O8zn/_new 2010-02-05 14:37:14.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv AutoReqProv: on Version: 11.2 -Release: 53 +Release: 54 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2009-12-02 14:56:01.000000000 +0100 +++ new/aaa_base/etc/init.d/boot 2010-02-05 01:13:01.000000000 +0100 @@ -64,59 +64,68 @@ echo "Running $0" # -# Start of e.g. blogd, requires /proc and /dev/pts. +# mount usual filesystems if not already done by initramfs or the kernel # -DTYPE=`stat -f -c "%T" /proc 2>/dev/null` +DTYPE=$(stat -f -c "%T" /proc 2>/dev/null) if test "$DTYPE" != "proc" ; then echo -n "Mounting procfs at /proc" mount -n -t proc proc /proc rc_status -v -r fi -DTYPE=`stat -f -c "%T" /sys 2>/dev/null` +DTYPE=$(stat -f -c "%T" /sys 2>/dev/null) if test "$DTYPE" != "sysfs" ; then echo -n "Mounting sysfs at /sys" mount -n -t sysfs sysfs /sys rc_status -v -r fi +HAVE_DEBUGFS=0 +DEVTMPFS=tmpfs +while read dev type ; do + test "$type" = "debugfs" && HAVE_DEBUGFS=1 + test "$type" = "devtmpfs" && DEVTMPFS=devtmpfs +done < /proc/filesystems + if test -d /sys/kernel/debug ; then - DTYPE=`stat -f -c "%T" /sys/kernel/debug 2>/dev/null` - if test "$DTYPE" = "sysfs" ; then - while read dev type ; do - if test "$type" = "debugfs" ; then + DTYPE=$(stat -f -c "%T" /sys/kernel/debug 2>/dev/null) + if test "$DTYPE" = "sysfs" -a "$HAVE_DEBUGFS" = "1" ; then echo -n "Mounting debugfs at /sys/kernel/debug" mount -n -t debugfs debugfs /sys/kernel/debug rc_status -v -r - fi - done < /proc/filesystems fi fi -# -# mount tmpfs on /dev if not already done by initramfs -# -DTYPE=`stat -f -c "%T" /dev 2>/dev/null` + +DTYPE=$(stat -f -c "%T" /dev 2>/dev/null) if test "$DTYPE" != "tmpfs" ; then - echo -n "Mounting tmpfs at /dev" - mount -n -t tmpfs -o mode=0755 none /dev + echo -n "Mounting devtmpfs at /dev" + mount -n -t $DEVTMPFS -o mode=0755 $DEVTMPFS /dev rc_status -v -r else - echo -n "Remounting tmpfs at /dev" - mount -oremount /dev + echo -n "Remounting /dev" + mount -o remount /dev rc_status -v -r fi -# -# populate /dev with initial content -# -echo -n "Initializing /dev" -cp --preserve=all --recursive --remove-destination /lib/udev/devices/* /dev -chmod 1777 /dev/shm +echo -n "Copying static /dev content" +cp -axT --remove-destination /lib/udev/devices /dev rc_status -v -r -DTYPE=`stat -f -c "%T" /dev/pts 2>/dev/null` +if test "$(stat -Lc %d /dev/shm 2>/dev/null)" = "$(stat -Lc %d /dev/shm/.. 2>/dev/null)" ; then + echo -n "Mounting tmpfs at /dev/shm" + mkdir -p -m 1777 /dev/shm + mount -t tmpfs -o mode=1777 tmpfs /dev/shm + rc_status -v -r +else + echo -n "Remounting /dev/shm" + mount -o remount /dev/shm + rc_status -v -r +fi + +DTYPE=$(stat -f -c "%T" /dev/pts 2>/dev/null) if test "$DTYPE" != "devpts" ; then echo -n "Mounting devpts at /dev/pts" + mkdir -p -m 755 /dev/pts mount -n -t devpts -o mode=0620,gid=5 devpts /dev/pts rc_status -v -r fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 grub for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package grub for openSUSE:Factory checked in at Fri Feb 5 14:36:59 CET 2010. -------- --- grub/grub.changes 2009-11-15 11:25:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/grub/grub.changes 2010-01-25 14:48:42.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Jan 25 12:46:48 CET 2010 - tiwai(a)suse.de + +- fix the truncation of boot options in 256 chars with gfx menu + (bnc#573453) + +------------------------------------------------------------------- +Sun Jan 24 11:00:21 CET 2010 - jdelvare(a)suse.de + +- Stop copying /usr/lib/grub/*/*stage1* during post-install, there + are no files there, and this can cause confusion when debugging + (see bnc#513821#c128). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- stage2-gfx-cmdline-len-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.garz53/_old 2010-02-05 14:36:28.000000000 +0100 +++ /var/tmp/diff_new_pack.garz53/_new 2010-02-05 14:36:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package grub (Version 0.97) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,10 @@ %else BuildRequires: gcc glibc-devel libncurses5 ncurses-devel %endif -License: GPL v2 or later +License: GPLv2+ Group: System/Boot Version: 0.97 -Release: 162 +Release: 163 Source0: %{name}-%{version}.tar.gz Source1: installgrub Source2: grubonce @@ -67,6 +67,7 @@ Patch31: string-ops-fix Patch39: document-grub-install.unsupported Patch40: grub-iso-fixes +Patch41: stage2-gfx-cmdline-len-fix.diff Url: http://www.gnu.org/software/grub/grub.en.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Grand Unified Boot Loader @@ -139,6 +140,7 @@ %patch31 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 %build perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi @@ -219,7 +221,6 @@ [ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old} # copy especially stage2 over, because it will be modified in-place ! cp -p /usr/lib/grub/*stage1* /boot/grub 2>/dev/null || true -cp -p /usr/lib/grub/*/*stage1* /boot/grub 2>/dev/null || true %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/multiboot.info.gz #special hack for #46843 ++++++ stage2-gfx-cmdline-len-fix.diff ++++++ --- stage2/stage2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/stage2/stage2.c +++ b/stage2/stage2.c @@ -1001,7 +1001,7 @@ /* setup command line edit buffer */ - gfx_data->cmdline_len = 256; + gfx_data->cmdline_len = 2048; /* FIXME! should be configuratble? */ gfx_data->cmdline = heap; heap += gfx_data->cmdline_len; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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