April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit gedit for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package gedit for openSUSE:Factory checked in at Sat Apr 3 00:16:20 CEST 2010. -------- --- GNOME/gedit/gedit.changes 2010-03-29 23:08:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/gedit/gedit.changes 2010-04-02 15:08:48.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 2 15:08:21 CEST 2010 - vuntz(a)opensuse.org + +- Remove libglade2-devel, libgnomeprintui-devel, libgnomeui-devel + Requires from devel package. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gedit.spec ++++++ --- /var/tmp/diff_new_pack.SIDBVA/_old 2010-04-03 00:15:48.000000000 +0200 +++ /var/tmp/diff_new_pack.SIDBVA/_new 2010-04-03 00:15:48.000000000 +0200 @@ -19,7 +19,7 @@ Name: gedit Version: 2.30.0 -Release: 1 +Release: 2 License: GPLv2+ Summary: The Editor for the GNOME 2.x Desktop Url: http://www.gnome.org @@ -62,9 +62,6 @@ Group: Productivity/Text/Editors Requires: %{name} = %{version} Requires: gtksourceview-devel -Requires: libglade2-devel -Requires: libgnomeprintui-devel -Requires: libgnomeui-devel Provides: gedit2-devel = %{version} Obsoletes: gedit2-devel < %{version} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xen for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Sat Apr 3 00:15:34 CEST 2010. -------- --- xen/xen.changes 2010-03-19 18:16:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2010-04-02 17:57:55.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Mar 31 08:09:49 MDT 2010 - carnold(a)novell.com + +- Update to changeset 21087 Xen 4.0.0 RC9. + +------------------------------------------------------------------- +Fri Mar 26 07:57:33 MDT 2010 - carnold(a)novell.com + +- Update to changeset 21075 Xen 4.0.0 RC8. + +------------------------------------------------------------------- +Thu Mar 25 15:59:28 CST 2010 - jsong(a)novell.com + +- bnc#584210 - xm usb-hc-destroy does not remove entry from xend + del_usb_xend_entry.patch + +------------------------------------------------------------------- +Tue Mar 23 09:55:52 MDT 2010 - carnold(a)novell.com + +- Update to changeset 21057 Xen 4.0.0 RC7. + +------------------------------------------------------------------- @@ -5,0 +27 @@ + calling whatdependson for head-i586 New: ---- del_usb_xend_entry.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 4.0.0_21046_01) +# spec file for package xen (Version 4.0.0_21087_01) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ ExclusiveArch: %ix86 x86_64 %define xvers 4.0 %define xvermaj 4 -%define changeset 21046 +%define changeset 21087 %define xen_build_dir xen-4.0.0-testing %define with_kmp 0 BuildRequires: LibVNCServer-devel SDL-devel acpica automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel texinfo transfig @@ -33,11 +33,16 @@ %endif %ifarch x86_64 BuildRequires: glibc-32bit glibc-devel-32bit +%define max_cpus 256 +%define pae_enabled n +%else +%define max_cpus 32 +%define pae_enabled y %endif %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 4.0.0_21046_01 +Version: 4.0.0_21087_01 Release: 1 License: GPLv2 Group: System/Kernel @@ -156,6 +161,7 @@ Patch426: xen-ioemu-hvm-pv-support.diff Patch427: qemu-dm-segfault.patch Patch428: hibernate.patch +Patch429: del_usb_xend_entry.patch # Jim's domain lock patch Patch450: xend-domain-lock.patch # Hypervisor and PV driver Patches @@ -592,6 +598,7 @@ %patch426 -p1 %patch427 -p1 %patch428 -p1 +%patch429 -p1 %patch450 -p1 %patch500 -p1 %patch501 -p1 @@ -668,21 +675,12 @@ ln -s xen${ext}-%{version}-%{release}.gz $RPM_BUILD_ROOT/boot/xen${ext}.gz ln -sf xen-syms${ext}-%{version}-%{release} $RPM_BUILD_ROOT/boot/xen-syms${ext} } -%ifarch %ix86 -make -C xen install pae=y debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT +make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT install_xen dbg make -C xen clean -make -C xen install pae=y debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT +make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT install_xen make -C xen clean -%else -make -C xen install max_phys_cpus=256 pae=n debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT -install_xen dbg -make -C xen clean -make -C xen install max_phys_cpus=256 pae=n debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT -install_xen -make -C xen clean -%endif export CFLAGS="$RPM_OPT_FLAGS" export RPM_OPT_FLAGS make -C tools/include/xen-foreign ++++++ 32on64-extra-mem.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2902,7 +2902,7 @@ class XendDomainInfo: +@@ -2909,7 +2909,7 @@ class XendDomainInfo: self.guest_bitsize = self.image.getBitSize() # Make sure there's enough RAM available for the domain ++++++ cdrom-removable.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -1,5 +1,7 @@ +Index: xen-4.0.0-testing/tools/python/xen/xend/server/HalDaemon.py +=================================================================== --- /dev/null -+++ b/tools/python/xen/xend/server/HalDaemon.py ++++ xen-4.0.0-testing/tools/python/xen/xend/server/HalDaemon.py @@ -0,0 +1,243 @@ +#!/usr/bin/env python +# -*- mode: python; -*- @@ -244,8 +246,10 @@ + print 'Falling off end' + + +Index: xen-4.0.0-testing/tools/python/xen/xend/server/Hald.py +=================================================================== --- /dev/null -+++ b/tools/python/xen/xend/server/Hald.py ++++ xen-4.0.0-testing/tools/python/xen/xend/server/Hald.py @@ -0,0 +1,125 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -372,8 +376,10 @@ + watcher.run() + time.sleep(10) + watcher.shutdown() ---- a/tools/python/xen/xend/server/SrvServer.py -+++ b/tools/python/xen/xend/server/SrvServer.py +Index: xen-4.0.0-testing/tools/python/xen/xend/server/SrvServer.py +=================================================================== +--- xen-4.0.0-testing.orig/tools/python/xen/xend/server/SrvServer.py ++++ xen-4.0.0-testing/tools/python/xen/xend/server/SrvServer.py @@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir from SrvRoot import SrvRoot @@ -391,8 +397,10 @@ def create(): root = SrvDir() ---- a/tools/ioemu-remote/xenstore.c -+++ b/tools/ioemu-remote/xenstore.c +Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +=================================================================== +--- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c ++++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c @@ -18,6 +18,7 @@ #include "exec-all.h" #include "sysemu.h" @@ -479,10 +487,10 @@ xenstore_watch_callbacks[i].opaque); + if (!strcmp(vec[XS_WATCH_TOKEN], "media-present")) { -+ xenstore_process_media_change_event(vec); -+ goto out; ++ xenstore_process_media_change_event(vec); ++ goto out; + } + - if (strncmp(vec[XS_WATCH_TOKEN], "hd", 2) || - strlen(vec[XS_WATCH_TOKEN]) != 3) - goto out; + hd_index = drive_name_to_index(vec[XS_WATCH_TOKEN]); + if (hd_index == -1) { + fprintf(stderr,"medium change watch on `%s' -" ++++++ cpu-pools-python.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -36,7 +36,7 @@ return pyxc_error_to_exception(); if ( target ) -@@ -332,7 +334,7 @@ static PyObject *pyxc_domain_getinfo(XcO +@@ -329,7 +331,7 @@ static PyObject *pyxc_domain_getinfo(XcO { info_dict = Py_BuildValue( "{s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i" @@ -45,7 +45,7 @@ "domid", (int)info[i].domid, "online_vcpus", info[i].nr_online_vcpus, "max_vcpu_id", info[i].max_vcpu_id, -@@ -347,7 +349,8 @@ static PyObject *pyxc_domain_getinfo(XcO +@@ -344,7 +346,8 @@ static PyObject *pyxc_domain_getinfo(XcO "cpu_time", (long long)info[i].cpu_time, "maxmem_kb", (long long)info[i].max_memkb, "ssidref", (int)info[i].ssidref, @@ -55,7 +55,7 @@ pyhandle = PyList_New(sizeof(xen_domain_handle_t)); if ( (pyhandle == NULL) || (info_dict == NULL) ) { -@@ -1755,6 +1758,179 @@ static PyObject *pyxc_dom_set_memshr(XcO +@@ -1751,6 +1754,179 @@ static PyObject *pyxc_dom_set_memshr(XcO return zero; } @@ -235,7 +235,7 @@ static PyMethodDef pyxc_methods[] = { { "handle", -@@ -1870,7 +2046,8 @@ static PyMethodDef pyxc_methods[] = { +@@ -1866,7 +2042,8 @@ static PyMethodDef pyxc_methods[] = { " maxmem_kb [int]: Maximum memory limit, in kilobytes\n" " cpu_time [long]: CPU time consumed, in nanoseconds\n" " shutdown_reason [int]: Numeric code from guest OS, explaining " @@ -245,7 +245,7 @@ { "vcpu_getinfo", (PyCFunction)pyxc_vcpu_getinfo, -@@ -2268,6 +2445,66 @@ static PyMethodDef pyxc_methods[] = { +@@ -2264,6 +2441,66 @@ static PyMethodDef pyxc_methods[] = { " enable [int,0|1]: Disable or enable?\n" "Returns: [int] 0 on success; -1 on error.\n" }, ++++++ cpupools-core.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -4,7 +4,7 @@ =================================================================== --- xen-4.0.0-testing.orig/xen/arch/x86/acpi/power.c +++ xen-4.0.0-testing/xen/arch/x86/acpi/power.c -@@ -231,7 +231,7 @@ static int enter_state(u32 state) +@@ -234,7 +234,7 @@ static int enter_state(u32 state) return error; } @@ -13,7 +13,7 @@ { struct acpi_sleep_info *sinfo = (struct acpi_sleep_info *)data; return enter_state(sinfo->sleep_state); -@@ -262,7 +262,7 @@ int acpi_enter_sleep(struct xenpf_enter_ +@@ -265,7 +265,7 @@ int acpi_enter_sleep(struct xenpf_enter_ acpi_sinfo.pm1b_cnt_val = sleep->pm1b_cnt_val; acpi_sinfo.sleep_state = sleep->sleep_state; @@ -271,7 +271,7 @@ { int cpu = (unsigned long)data; return cpu_down(cpu); -@@ -310,7 +311,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe +@@ -314,7 +315,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe if ( op->u.change_freq.flags || !cpu_online(op->u.change_freq.cpu) ) break; per_cpu(freq, op->u.change_freq.cpu) = op->u.change_freq.freq; @@ -280,16 +280,16 @@ cpu_frequency_change_helper, NULL); break; -@@ -398,7 +399,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe - +@@ -403,7 +404,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe g_info = &op->u.pcpu_info; -- spin_lock(&cpu_add_remove_lock); -+ spin_lock(&cpupool_lock); - - if ( (g_info->xen_cpuid >= NR_CPUS) || - (g_info->xen_cpuid < 0) || -@@ -417,7 +418,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe + /* spin_trylock() avoids deadlock with stop_machine_run(). */ +- if ( !spin_trylock(&cpu_add_remove_lock) ) ++ if ( !spin_trylock(&cpupool_lock) ) + { + ret = -EBUSY; + break; +@@ -426,7 +427,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe g_info->max_present = last_cpu(cpu_present_map); @@ -298,7 +298,7 @@ ret = copy_to_guest(u_xenpf_op, op, 1) ? -EFAULT : 0; } -@@ -458,7 +459,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe +@@ -467,7 +468,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe break; } ret = continue_hypercall_on_cpu( @@ -372,47 +372,35 @@ */ int alloc_cpu_id(void) { -@@ -985,10 +985,10 @@ static int __devinit do_boot_cpu(int api - cpucount--; - - /* Mark the CPU as non-present */ -- spin_lock(&cpu_add_remove_lock); -+ spin_lock(&cpupool_lock); - x86_cpu_to_apicid[cpu] = BAD_APICID; - cpu_clear(cpu, cpu_present_map); -- spin_unlock(&cpu_add_remove_lock); -+ spin_unlock(&cpupool_lock); - } else { - } - -@@ -1304,12 +1304,14 @@ int __cpu_disable(void) - +@@ -1303,10 +1303,11 @@ int __cpu_disable(void) remove_siblinginfo(cpu); -+ cpu_clear(cpu, cpupool0->cpu_valid); - cpu_clear(cpu, cpu_online_map); - fixup_irqs(); /* It's now safe to remove this processor from the online map */ + cpu_clear(cpu, cpupool0->cpu_valid); cpu_clear(cpu, cpu_online_map); + fixup_irqs(); - cpu_disable_scheduler(); + cpu_disable_scheduler(cpu, 0); return 0; } -@@ -1342,8 +1344,8 @@ int cpu_down(unsigned int cpu) - { +@@ -1340,12 +1341,12 @@ int cpu_down(unsigned int cpu) int err = 0; -- spin_lock(&cpu_add_remove_lock); + /* spin_trylock() avoids deadlock with stop_machine_run(). */ +- if (!spin_trylock(&cpu_add_remove_lock)) { ++ if (!spin_trylock(&cpupool_lock)) { + err = -EBUSY; + goto out; + } + - if (num_online_cpus() == 1) { -+ spin_lock(&cpupool_lock); + if ((!cpu_isset(cpu, cpupool0->cpu_valid)) || (cpus_weight(cpupool0->cpu_valid) == 1)) { err = -EBUSY; goto out; } -@@ -1376,7 +1378,7 @@ int cpu_down(unsigned int cpu) +@@ -1378,7 +1379,7 @@ int cpu_down(unsigned int cpu) out: if (!err) send_guest_global_virq(dom0, VIRQ_PCPU_STATE); @@ -421,16 +409,16 @@ return err; } -@@ -1384,7 +1386,7 @@ int cpu_up(unsigned int cpu) - { +@@ -1387,7 +1388,7 @@ int cpu_up(unsigned int cpu) int err = 0; -- spin_lock(&cpu_add_remove_lock); -+ spin_lock(&cpupool_lock); + /* spin_trylock() avoids deadlock with stop_machine_run(). */ +- if (!spin_trylock(&cpu_add_remove_lock)) ++ if (!spin_trylock(&cpupool_lock)) + return -EBUSY; + if (cpu_online(cpu)) { - printk("Bring up a online cpu. Bogus!\n"); - err = -EBUSY; -@@ -1400,7 +1402,7 @@ int cpu_up(unsigned int cpu) +@@ -1405,7 +1406,7 @@ int cpu_up(unsigned int cpu) out: if (!err) send_guest_global_virq(dom0, VIRQ_PCPU_STATE); @@ -439,12 +427,13 @@ return err; } -@@ -1481,13 +1483,13 @@ int cpu_add(uint32_t apic_id, uint32_t a - if ( physid_isset(apic_id, phys_cpu_present_map) ) +@@ -1491,14 +1492,14 @@ int cpu_add(uint32_t apic_id, uint32_t a return -EEXIST; -- spin_lock(&cpu_add_remove_lock); -+ spin_lock(&cpupool_lock); + /* spin_trylock() avoids deadlock with stop_machine_run(). */ +- if (!spin_trylock(&cpu_add_remove_lock)) ++ if (!spin_trylock(&cpupool_lock)) + return -EBUSY; cpu = mp_register_lapic(apic_id, 1); @@ -455,7 +444,7 @@ return cpu; } -@@ -1504,7 +1506,7 @@ int cpu_add(uint32_t apic_id, uint32_t a +@@ -1515,7 +1516,7 @@ int cpu_add(uint32_t apic_id, uint32_t a "Setup node failed for pxm %x\n", pxm); x86_acpiid_to_apicid[acpi_id] = 0xff; mp_unregister_lapic(apic_id, cpu); @@ -464,7 +453,7 @@ return node; } apicid_to_node[apic_id] = node; -@@ -1512,7 +1514,7 @@ int cpu_add(uint32_t apic_id, uint32_t a +@@ -1523,7 +1524,7 @@ int cpu_add(uint32_t apic_id, uint32_t a srat_detect_node(cpu); numa_add_cpu(cpu); @@ -473,7 +462,7 @@ dprintk(XENLOG_INFO, "Add CPU %x with index %x\n", apic_id, cpu); return cpu; } -@@ -1556,6 +1558,7 @@ int __devinit __cpu_up(unsigned int cpu) +@@ -1567,6 +1568,7 @@ int __devinit __cpu_up(unsigned int cpu) process_pending_softirqs(); } ++++++ del_usb_xend_entry.patch ++++++ Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py @@ -1306,8 +1306,15 @@ class XendDomainInfo: frontpath = self.getDeviceController(deviceClass).frontendPath(dev) backpath = xstransact.Read(frontpath, "backend") thread.start_new_thread(self.getDeviceController(deviceClass).finishDeviceCleanup, (backpath, path)) - - rc = self.getDeviceController(deviceClass).destroyDevice(devid, force) + if deviceClass =='vusb': + dev = self.getDeviceController(deviceClass).convertToDeviceNumber(devid) + state = self.getDeviceController(deviceClass).readBackend(dev, 'state') + if state == '1': + rc = self.getDeviceController(deviceClass).destroyDevice(devid, True) + else: + rc = self.getDeviceController(deviceClass).destroyDevice(devid, force) + else: + rc = self.getDeviceController(deviceClass).destroyDevice(devid, force) if not force and rm_cfg: # The backend path, other than the device itself, # has to be passed because its accompanied frontend ++++++ dump-exec-state.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -15,7 +15,7 @@ =================================================================== --- xen-4.0.0-testing.orig/xen/arch/x86/smp.c +++ xen-4.0.0-testing/xen/arch/x86/smp.c -@@ -394,7 +394,7 @@ static void __smp_call_function_interrup +@@ -395,7 +395,7 @@ static void __smp_call_function_interrup if ( call_data.wait ) { @@ -24,7 +24,7 @@ mb(); atomic_inc(&call_data.finished); } -@@ -402,7 +402,7 @@ static void __smp_call_function_interrup +@@ -403,7 +403,7 @@ static void __smp_call_function_interrup { mb(); atomic_inc(&call_data.started); @@ -37,11 +37,13 @@ =================================================================== --- xen-4.0.0-testing.orig/xen/common/keyhandler.c +++ xen-4.0.0-testing/xen/common/keyhandler.c -@@ -71,14 +71,25 @@ static struct keyhandler show_handlers_k +@@ -71,20 +71,45 @@ static struct keyhandler show_handlers_k .desc = "show this message" }; -static void __dump_execstate(void *unused) ++static cpumask_t dump_execstate_mask; ++ +static void __dump_execstate(void *_regs) { - dump_execution_state(); @@ -64,25 +66,54 @@ + current->vcpu_id); show_execution_state(guest_cpu_user_regs()); + } ++ ++ cpu = cycle_cpu(cpu, dump_execstate_mask); ++ if ( cpu < NR_CPUS ) ++ { ++ cpu_clear(cpu, dump_execstate_mask); ++ on_selected_cpus(cpumask_of(cpu), __dump_execstate, NULL, 0); ++ } ++ else ++ { ++ printk("\n"); ++ ++ console_end_sync(); ++ watchdog_enable(); ++ } } static void dump_registers(unsigned char key, struct cpu_user_regs *regs) -@@ -92,14 +103,12 @@ static void dump_registers(unsigned char + { +- unsigned int cpu; +- + /* We want to get everything out that we possibly can. */ + watchdog_disable(); + console_start_sync(); +@@ -92,21 +117,9 @@ static void dump_registers(unsigned char printk("'%c' pressed -> dumping registers\n", key); /* Get local execution state out immediately, in case we get stuck. */ - printk("\n*** Dumping CPU%d host state: ***\n", smp_processor_id()); - __dump_execstate(NULL); -+ __dump_execstate(regs); - - for_each_online_cpu ( cpu ) - { - if ( cpu == smp_processor_id() ) - continue; +- +- for_each_online_cpu ( cpu ) +- { +- if ( cpu == smp_processor_id() ) +- continue; - printk("\n*** Dumping CPU%d host state: ***\n", cpu); - on_selected_cpus(cpumask_of(cpu), __dump_execstate, NULL, 1); - } +- on_selected_cpus(cpumask_of(cpu), __dump_execstate, NULL, 1); +- } +- +- printk("\n"); +- +- console_end_sync(); +- watchdog_enable(); ++ cpus_andnot(dump_execstate_mask, cpu_online_map, ++ cpumask_of_cpu(smp_processor_id())); ++ __dump_execstate(regs); + } + static struct keyhandler dump_registers_keyhandler = { Index: xen-4.0.0-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h =================================================================== --- xen-4.0.0-testing.orig/xen/include/asm-ia64/linux-xen/asm/ptrace.h ++++++ hv_tools.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/python/xen/lowlevel/xc/xc.c +++ xen-4.0.0-testing/tools/python/xen/lowlevel/xc/xc.c -@@ -950,16 +950,16 @@ static PyObject *pyxc_hvm_build(XcObject +@@ -946,16 +946,16 @@ static PyObject *pyxc_hvm_build(XcObject #endif int i; char *image; @@ -24,7 +24,7 @@ return NULL; memset(vcpu_avail, 0, sizeof(vcpu_avail)); -@@ -1011,6 +1011,7 @@ static PyObject *pyxc_hvm_build(XcObject +@@ -1007,6 +1007,7 @@ static PyObject *pyxc_hvm_build(XcObject va_hvm->checksum -= sum; munmap(va_map, XC_PAGE_SIZE); #endif ++++++ snapshot-ioemu-save.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -101,7 +101,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/ioemu-remote/i386-dm/helper2.c +++ xen-4.0.0-testing/tools/ioemu-remote/i386-dm/helper2.c -@@ -109,6 +109,9 @@ int send_vcpu = 0; +@@ -112,6 +112,9 @@ int send_vcpu = 0; //the evtchn port for polling the notification, evtchn_port_t *ioreq_local_port; @@ -111,7 +111,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) { CPUX86State *env; -@@ -553,6 +556,7 @@ int main_loop(void) +@@ -556,6 +559,7 @@ int main_loop(void) int evtchn_fd = xce_handle == -1 ? -1 : xc_evtchn_fd(xce_handle); char *qemu_file; fd_set fds; @@ -119,7 +119,7 @@ main_loop_prepare(); -@@ -580,11 +584,43 @@ int main_loop(void) +@@ -583,11 +587,43 @@ int main_loop(void) main_loop_wait(1); /* For the select() on events */ /* Save the device state */ ++++++ x86-cpufreq-report.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -19,7 +19,7 @@ struct xen_platform_op curop, *op = &curop; if ( !IS_PRIV(current->domain) ) -@@ -475,6 +476,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe +@@ -484,6 +485,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe op->u.mem_add.epfn, op->u.mem_add.pxm); break; ++++++ xen-4.0.0-testing-src.tar.bz2 ++++++ xen/xen-4.0.0-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-4.0.0-testing-src.tar.bz2 differ: char 11, line 1 ++++++ xen-config.diff ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -9,8 +9,8 @@ -CONFIG_QEMU ?= $(QEMU_REMOTE) +CONFIG_QEMU ?= ioemu-remote - QEMU_TAG := xen-4.0.0-rc6 - #QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78 + QEMU_TAG := xen-4.0.0-rc9 + #QEMU_TAG ?= f1d909f0f854194f5a40d850886d1413fb8b63c2 @@ -167,9 +167,9 @@ CONFIG_OCAML_XENSTORED ?= n # Optional components XENSTAT_XENTOP ?= y ++++++ xend-domain-lock.patch ++++++ --- /var/tmp/diff_new_pack.l0CDs2/_old 2010-04-03 00:14:58.000000000 +0200 +++ /var/tmp/diff_new_pack.l0CDs2/_new 2010-04-03 00:14:58.000000000 +0200 @@ -91,7 +91,7 @@ XendTask.log_progress(0, 30, self._constructDomain) XendTask.log_progress(31, 60, self._initDomain) -@@ -2972,6 +2974,11 @@ class XendDomainInfo: +@@ -2979,6 +2981,11 @@ class XendDomainInfo: self._stateSet(DOM_STATE_HALTED) self.domid = None # Do not push into _stateSet()! @@ -103,7 +103,7 @@ finally: self.refresh_shutdown_lock.release() -@@ -4478,6 +4485,74 @@ class XendDomainInfo: +@@ -4485,6 +4492,74 @@ class XendDomainInfo: def has_device(self, dev_class, dev_uuid): return (dev_uuid in self.info['%s_refs' % dev_class.lower()]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 telepathy-glib for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package telepathy-glib for openSUSE:Factory checked in at Sat Apr 3 00:14:47 CEST 2010. -------- --- telepathy-glib/telepathy-glib.changes 2010-03-25 11:11:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/telepathy-glib/telepathy-glib.changes 2010-04-02 19:34:34.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 2 19:31:29 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.10.2: + + Fixes: + - TpAccount: correctly add interfaces such as Avatars + - Make GetContactAttributes() in GLib CMs tolerate unsupported + interfaces, as per telepathy-spec 0.19.2 + - Improve documentation of + TpContactsMixinFillContactAttributesFunc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-glib-0.10.1.tar.bz2 New: ---- telepathy-glib-0.10.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-glib.spec ++++++ --- /var/tmp/diff_new_pack.hEfubb/_old 2010-04-03 00:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.hEfubb/_new 2010-04-03 00:13:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package telepathy-glib (Version 0.10.1) +# spec file for package telepathy-glib (Version 0.10.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: telepathy-glib -Version: 0.10.1 +Version: 0.10.2 Release: 1 License: LGPLv2.1+ %define debug_package_requires libtelepathy-glib0 = %{version}-%{release} ++++++ telepathy-glib-0.10.1.tar.bz2 -> telepathy-glib-0.10.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/ChangeLog new/telepathy-glib-0.10.2/ChangeLog --- old/telepathy-glib-0.10.1/ChangeLog 2010-03-24 19:39:32.000000000 +0100 +++ new/telepathy-glib-0.10.2/ChangeLog 2010-03-31 15:20:08.000000000 +0200 @@ -1,3 +1,37 @@ +commit 15009de37a7f83bc183d6736d60e9acf46a0472a +Author: Simon McVittie <simon.mcvittie(a)collabora.co.uk> +Date: 2010-03-31 13:33:28 +0100 + + Prepare version 0.10.2 + +commit 28ba4fde160635b37ca2bf381bb6b8dde6543ead +Author: Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> +Date: 2010-02-24 18:15:24 +0200 + + Improved documentation to TpContactsMixinFillContactAttributesFunc + +commit d89ffcc59c13447c4fc1cfc6567de5864c86e54c +Author: Will Thompson <will.thompson(a)collabora.co.uk> +Date: 2010-03-26 11:39:22 +0000 + + Make GetContactAttributes() tolerate unsupported interfaces + + See http://bugs.freedesktop.org/show_bug.cgi?id=27325 + + Reviewed-by: Simon McVittie <simon.mcvittie(a)collabora.co.uk> + +commit 5c1a25405b0e9c857d8b83337f1fd961a2cdd910 +Author: Danielle Madeley <danielle.madeley(a)collabora.co.uk> +Date: 2010-03-31 23:06:12 +1100 + + tp-account: check Interfaces property and append interface to TpProxy + +commit 11b018caa3e3df9e5968ad07bf80f2843cc5bb2c +Author: Simon McVittie <simon.mcvittie(a)collabora.co.uk> +Date: 2010-03-24 19:32:10 +0000 + + Nano version + commit 27a49b251dd81d7eacc3c88eb96ec9619547d383 Author: Simon McVittie <simon.mcvittie(a)collabora.co.uk> Date: 2010-03-24 18:35:29 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/NEWS new/telepathy-glib-0.10.2/NEWS --- old/telepathy-glib-0.10.1/NEWS 2010-03-24 19:34:45.000000000 +0100 +++ new/telepathy-glib-0.10.2/NEWS 2010-03-31 14:33:09.000000000 +0200 @@ -1,3 +1,17 @@ +telepathy-glib 0.10.2 (2010-03-31) +================================== + +The "is that a koala in your roster or are you just nearby?" release. + +Fixes: + +* TpAccount: correctly add interfaces such as Avatars (danni) + +* Make GetContactAttributes() in GLib CMs tolerate unsupported interfaces, + as per telepathy-spec 0.19.2 (wjt) + +* Improve documentation of TpContactsMixinFillContactAttributesFunc (mikhailz) + telepathy-glib 0.10.1 (2010-03-24) ================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/configure new/telepathy-glib-0.10.2/configure --- old/telepathy-glib-0.10.1/configure 2010-03-24 19:30:49.000000000 +0100 +++ new/telepathy-glib-0.10.2/configure 2010-03-31 14:33:35.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for Telepathy-GLib 0.10.1. +# Generated by GNU Autoconf 2.65 for Telepathy-GLib 0.10.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-g…>. # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='Telepathy-GLib' PACKAGE_TARNAME='telepathy-glib' -PACKAGE_VERSION='0.10.1' -PACKAGE_STRING='Telepathy-GLib 0.10.1' +PACKAGE_VERSION='0.10.2' +PACKAGE_STRING='Telepathy-GLib 0.10.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-g…' PACKAGE_URL='' @@ -1483,7 +1483,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Telepathy-GLib 0.10.1 to adapt to many kinds of systems. +\`configure' configures Telepathy-GLib 0.10.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1553,7 +1553,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Telepathy-GLib 0.10.1:";; + short | recursive ) echo "Configuration of Telepathy-GLib 0.10.2:";; esac cat <<\_ACEOF @@ -1683,7 +1683,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Telepathy-GLib configure 0.10.1 +Telepathy-GLib configure 0.10.2 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2054,7 +2054,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Telepathy-GLib $as_me 0.10.1, which was +It was created by Telepathy-GLib $as_me 0.10.2, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ # Define the identity of the package. PACKAGE='telepathy-glib' - VERSION='0.10.1' + VERSION='0.10.2' cat >>confdefs.h <<_ACEOF @@ -11177,7 +11177,7 @@ LT_CURRENT=32 -LT_REVISION=2 +LT_REVISION=3 LT_AGE=32 @@ -12759,7 +12759,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Telepathy-GLib $as_me 0.10.1, which was +This file was extended by Telepathy-GLib $as_me 0.10.2, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12825,7 +12825,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Telepathy-GLib config.status 0.10.1 +Telepathy-GLib config.status 0.10.2 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/configure.ac new/telepathy-glib-0.10.2/configure.ac --- old/telepathy-glib-0.10.1/configure.ac 2010-03-24 19:30:07.000000000 +0100 +++ new/telepathy-glib-0.10.2/configure.ac 2010-03-31 14:32:15.000000000 +0200 @@ -11,14 +11,14 @@ m4_define([tp_glib_major_version], [0]) m4_define([tp_glib_minor_version], [10]) -m4_define([tp_glib_micro_version], [1]) +m4_define([tp_glib_micro_version], [2]) m4_define([tp_glib_nano_version], [0]) # If library source has changed since last release, increment revision. # Do not add new API or ABI, or make incompatible changes, on this branch # (which means that current and age should remain 32). m4_define([tp_glib_lt_current], [32]) -m4_define([tp_glib_lt_revision], [2]) +m4_define([tp_glib_lt_revision], [3]) m4_define([tp_glib_lt_age], [32]) # Some magic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/docs/reference/html/telepathy-glib-TpContactsMixin.html new/telepathy-glib-0.10.2/docs/reference/html/telepathy-glib-TpContactsMixin.html --- old/telepathy-glib-0.10.1/docs/reference/html/telepathy-glib-TpContactsMixin.html 2010-03-24 19:39:32.000000000 +0100 +++ new/telepathy-glib-0.10.2/docs/reference/html/telepathy-glib-TpContactsMixin.html 2010-03-31 15:20:08.000000000 +0200 @@ -332,18 +332,21 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="returnvalue">GArray</span></a> *contacts, <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTab…"><span class="returnvalue">GHashTable</span></a> *attributes_hash);</pre> <p> -This function is called to add attributes of contacts</p> +This function is called to supply contact attributes pertaining to +a particular interface, for a list of contacts. +All the handles in <em class="parameter"><code>contacts</code></em> are guaranteed to be valid and +referenced.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td> -<td> An object implementing the presence interface with this mixin +<td> An object implementing the Contacts interface with this mixin </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>contacts</code></em> :</span></p></td> -<td> The contacts for which attributes are requested +<td> The contact handles for which attributes are requested </td> </tr> <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/docs/reference/html/telepathy-glib-asv.html new/telepathy-glib-0.10.2/docs/reference/html/telepathy-glib-asv.html --- old/telepathy-glib-0.10.1/docs/reference/html/telepathy-glib-asv.html 2010-03-24 19:39:32.000000000 +0100 +++ new/telepathy-glib-0.10.2/docs/reference/html/telepathy-glib-asv.html 2010-03-31 15:20:08.000000000 +0200 @@ -240,7 +240,7 @@ <p> </p> <div class="example"> -<a name="id2801298"></a><p class="title"><b>Example 1. Using <a class="link" href="telepathy-glib-asv.html#tp-asv-new" title="tp_asv_new ()"><code class="function">tp_asv_new()</code></a></b></p> +<a name="id2676780"></a><p class="title"><b>Example 1. Using <a class="link" href="telepathy-glib-asv.html#tp-asv-new" title="tp_asv_new ()"><code class="function">tp_asv_new()</code></a></b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/docs/reference/html/telepathy-glib-util.html new/telepathy-glib-0.10.2/docs/reference/html/telepathy-glib-util.html --- old/telepathy-glib-0.10.1/docs/reference/html/telepathy-glib-util.html 2010-03-24 19:39:32.000000000 +0100 +++ new/telepathy-glib-0.10.2/docs/reference/html/telepathy-glib-util.html 2010-03-31 15:20:08.000000000 +0200 @@ -1034,7 +1034,7 @@ <p> </p> <div class="example"> -<a name="id3221652"></a><p class="title"><b>Example 2. using tp_value_array_build</b></p> +<a name="id3097130"></a><p class="title"><b>Example 2. using tp_value_array_build</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/telepathy-glib/account.c new/telepathy-glib-0.10.2/telepathy-glib/account.c --- old/telepathy-glib-0.10.1/telepathy-glib/account.c 2010-03-24 19:23:54.000000000 +0100 +++ new/telepathy-glib-0.10.2/telepathy-glib/account.c 2010-03-31 14:24:32.000000000 +0200 @@ -444,6 +444,27 @@ TpConnectionStatus old_s = priv->connection_status; gboolean presence_changed = FALSE; + if (g_hash_table_lookup (properties, "Interfaces") != NULL) + { + gchar **interfaces, **iter; + + interfaces = tp_asv_get_boxed (properties, "Interfaces", G_TYPE_STRV); + + for (iter = interfaces; *iter != NULL; iter++) + { + if (tp_dbus_check_valid_interface_name (*iter, NULL)) + { + GQuark q = g_quark_from_string (*iter); + + tp_proxy_add_interface_by_id ((TpProxy *) account, q); + } + else + { + DEBUG ("\t\tInterface %s not valid", *iter); + } + } + } + if (g_hash_table_lookup (properties, "ConnectionStatus") != NULL) priv->connection_status = tp_asv_get_uint32 (properties, "ConnectionStatus", NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/telepathy-glib/contacts-mixin.c new/telepathy-glib-0.10.2/telepathy-glib/contacts-mixin.c --- old/telepathy-glib-0.10.1/telepathy-glib/contacts-mixin.c 2010-03-01 15:44:55.000000000 +0100 +++ new/telepathy-glib-0.10.2/telepathy-glib/contacts-mixin.c 2010-03-31 14:24:32.000000000 +0200 @@ -282,19 +282,6 @@ TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (conn, context); - /* first validate the given interfaces */ - for (i = 0; interfaces[i] != NULL; i++) { - if (g_hash_table_lookup (self->priv->interfaces, interfaces[i]) == NULL) - { - GError einval = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, - "Non-inspectable Interface given" }; - - dbus_g_method_return_error (context, &einval); - return; - } - } - - /* Setup handle array and hash with valid handles, optionally holding them */ valid_handles = g_array_sized_new (TRUE, TRUE, sizeof (TpHandle), handles->len); @@ -336,9 +323,10 @@ func = g_hash_table_lookup (self->priv->interfaces, interfaces[i]); - g_assert (func != NULL); - - func (G_OBJECT(iface), valid_handles, result); + if (func == NULL) + DEBUG ("non-inspectable interface %s given; ignoring", interfaces[i]); + else + func (G_OBJECT(iface), valid_handles, result); } tp_svc_connection_interface_contacts_return_from_get_contact_attributes ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.10.1/telepathy-glib/contacts-mixin.h new/telepathy-glib-0.10.2/telepathy-glib/contacts-mixin.h --- old/telepathy-glib-0.10.1/telepathy-glib/contacts-mixin.h 2010-03-24 18:53:25.000000000 +0100 +++ new/telepathy-glib-0.10.2/telepathy-glib/contacts-mixin.h 2010-03-31 14:24:32.000000000 +0200 @@ -35,13 +35,15 @@ /** * TpContactsMixinFillContactAttributesFunc: - * @obj: An object implementing the presence interface with this mixin - * @contacts: The contacts for which attributes are requested + * @obj: An object implementing the Contacts interface with this mixin + * @contacts: The contact handles for which attributes are requested * @attributes_hash: hash of handle => hash of attributes, containing all the * contacts in the contacts array * - * This function is called to add attributes of contacts - * + * This function is called to supply contact attributes pertaining to + * a particular interface, for a list of contacts. + * All the handles in @contacts are guaranteed to be valid and + * referenced. */ typedef void (*TpContactsMixinFillContactAttributesFunc) (GObject *obj, const GArray *contacts, GHashTable *attributes_hash); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 parted for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package parted for openSUSE:Factory checked in at Sat Apr 3 00:14:41 CEST 2010. -------- --- parted/parted.changes 2010-02-01 13:22:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/parted/parted.changes 2010-04-02 11:43:10.000000000 +0200 @@ -1,0 +2,130 @@ +Fri Apr 2 08:41:02 UTC 2010 - puzel(a)novell.com + +- add parted-remove-experimental-warning.patch +- refresh always_print_geom.diff to apply at correct function + +------------------------------------------------------------------- +Fri Feb 26 17:56:05 UTC 2010 - puzel(a)novell.com + +- update to parted-2.2 + - Changes in behavior + - The default alignment (--align option) for newly created + partitions has been changed to optimal. + - New features + - The ped_device_get_*_alignment() functions now return a sane + default value instead of NULL when the so called topology + information is incomplete. The default minimum alignment aligns + to physical sector size, the default optimal alignment is 1MiB, + which is what vista and windows 7 do. + - Bug fixes + - Parted no longer uses a physical sector size of 0 or of any + other value smaller than the logical sector size. + - dos: creating an HFS or HFS+ partition in an msdos partition + table used to set the partition type to 0x83. That is wrong. + The required number is 0xaf, and that is what is used now. + - gpt: read-only operation could clobber MBR part of hybrid + GPT+MBR table [bug introduced in parted-2.1] + - gpt: a read-only operation like "parted $dev print" would + overwrite $dev's protective MBR when exactly one of the primary + and backup GPT tables was found to be corrupt. [bug introduced + prior to parted-1.8.0] + - sun: the version, sanity and nparts VTOC fields were ignored by + libparted. Those fields are properly initialized now. The + nparts (number of partitions) field is initialized to 8 (max. + number of sun partitions) rather that to a real number of + partitions. This solution is compatible with Linux kernel and + Linux fdisk. + - libparted: try harder to inform kernel of partition changes. + Previously when editing partitions, occasionally the kernel + would fail to be informed of partition changes. When this + happened future problems would occur because the kernel had + incorrect information. For example, if this problem arose when + resizing or creating a new partition, then an incorrect + partition size might be displayed or a user might encounter a + failure to format or delete a newly created partition, + respectively. + - libparted: committing a disk that was returned by + ped_disk_duplicate would always result in ped_disk_clobber being + called (and thus the first and last 9KiB of the disk being + zeroed), even if the duplicated disk, was not returned by + ped_disk_fresh(). +- drop do-not-install-test-programs.patch (fixed in upstream) + +------------------------------------------------------------------- +Wed Feb 17 16:33:01 UTC 2010 - puzel(a)novell.com + +- add do-not-install-test-programs.patch + - avoid deleting this in specfile + +------------------------------------------------------------------- +Mon Feb 1 13:34:10 UTC 2010 - puzel(a)novell.com + +- update to parted-2.1 (noteworthy changes) + * New features + - new --align=<align> commandline option which can have the + following values: + - none: Use the minimum alignment allowed by the disk type + - cylinder: Align partitions to cylinders (the default) + - minimal: Use minimum alignment as given by the disk + topology information + - optimal: Use optimum alignment as given by the disk + topology information + The minimal and optimal values will use layout information + provided by the disk to align the logical partition table + addresses to actual physical blocks on the disks. The minimal + value uses the minimum alignment needed to align the partition + properly to physical blocks, which avoids performance + degradation. Where as the optimal value uses a multiple of the + physical block size in a way that guarantees optimal + performance. The min and opt values will only work when + compiled with libblkid >= 2.17 and running on a kernel >= + 2.6.31, otherwise they will behave as the none --align value. + - Parted now supports disks with sector size larger than 512 bytes. + Before this release, parted could operate only on disks with a + sector size of 512 bytes. However, disk manufacturers are + already making disks with an exposed hardware sector size of + 4096 bytes. Prior versions of parted cannot even read a + partition table on such a device, not to mention create or + manipulate existing partition tables. Due to internal design + and time constraints, the following less-common partition + table types are currently disabled: + - amiga, bsd, aix, pc98 + - new command "align-check TYPE N" to determine whether the + starting sector of partition N is + TYPE(minimal|optimal)-aligned for the disk. The same + libblkid and kernel version requirements apply as for --align + * Bug fixes + - parted can once again create partition tables on loop devices. + - improved >512-byte sector support + - gpt tables are more rigorously checked + - improved dasd disk support + - handle device nodes created by lvm built with udev + synchronisation enabled properly. + - when printing tables, parted no longer truncates flag names + - Partitions in a GPT table are no longer assigned the + "microsoft reserved partition" type. Before this change, + each partition would be listed with a type of "msftres" by + default. + * Notice + - Parted stopped using BLKPG_* ioctls to inform the kernel + about changes of the partition table. The consequence of this + change is that parted alone can no longer inform the kernel + about changes to partition table on a disk where some of the + partitions are mounted. +- build requires check-devel and pkg-config +- drop parted-1.8.3.dif - fixed by adding pkg-config and check-devel + to BuildRequires +- drop parted.tty.patch, parted.no-O_DIRECT.patch, + do-not-discard-bootcode-in-extended-partition.patch, + avoid-unnecessary-open-close.patch, + do-not-unnecessarily-open-part-dev.patch + - fixed upstream +- drop fix-tests.sh - make check disabled in specfile +- drop fix-error-informing-the-kernel.patch, + fix-race-call-udevadm-settle.patch, + retry-blkpg-ioctl.patch, use-ext-range.patch + - affected code removed as part of the BLKPG to BLKRRPART + switch +- clean up specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- avoid-unnecessary-open-close.patch do-not-discard-bootcode-in-extended-partition.patch do-not-unnecessarily-open-part-dev.patch fix-error-informing-the-kernel.patch fix-race-call-udevadm-settle.patch fix-tests.sh parted-1.8.3.dif parted-1.9.0.tar.bz2 parted.no-O_DIRECT.patch parted.tty.patch retry-blkpg-ioctl.patch use-ext-range.patch New: ---- parted-2.2.tar.bz2 parted-remove-experimental-warning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parted.spec ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:15.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package parted (Version 1.9.0) +# spec file for package parted (Version 2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,23 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: parted -BuildRequires: device-mapper-devel -BuildRequires: e2fsprogs-devel -BuildRequires: libreiserfs-devel -BuildRequires: readline-devel -BuildRequires: libsepol-devel -BuildRequires: libselinux-devel -%define aclocaldir /usr/share/aclocal +Version: 2.2 +Release: 1 License: GPLv3+ -Group: System/Filesystems -Requires: /sbin/udevadm Summary: GNU partitioner -Version: 1.9.0 -Release: 5 +Url: http://www.gnu.org/software/parted/ +Group: System/Filesystems Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch0: always-resize-part.dif @@ -39,35 +31,29 @@ Patch2: parted-mac.patch Patch3: parted-wipeaix.patch Patch4: etherd_support.diff -Patch5: parted-1.8.3.dif -Patch6: hfs_fix.dif -Patch7: always_print_geom.diff -Patch8: fix-function-def.patch -Patch9: parted.tty.patch -Patch10: parted.no-O_DIRECT.patch -Patch11: parted-gpt-mbr-sync.patch -Patch12: parted-no-inttypes-include -Patch13: fix-error-informing-the-kernel.patch -Patch14: do-not-discard-bootcode-in-extended-partition.patch +Patch5: hfs_fix.dif +Patch6: always_print_geom.diff +Patch7: fix-function-def.patch +Patch8: parted-gpt-mbr-sync.patch +Patch9: parted-no-inttypes-include #PATCH-FEATURE-OPENSUSE fix-dm-partition-name.patch bnc471440,447591 petr.uzel(a)suse.cz -Patch15: fix-dm-partition-name.patch -#PATCH-FEATURE-OPENSUSE fix-tests.sh petr.uzel(a)suse.cz -Patch16: fix-tests.sh +Patch10: fix-dm-partition-name.patch #PATCH-FEATURE-OPENSUSE do-not-create-dm-nodes.patch bnc#501773 petr.uzel(a)suse.cz -Patch17: do-not-create-dm-nodes.patch -#PATCH-FIX-UPSTREAM avoid-unnecessary-open-close.patch bnc#539521 petr.uzel(a)suse.cz -Patch18: avoid-unnecessary-open-close.patch -#PATCH-FIX-UPSTREAM do-not-unnecessarily-open-part-dev.patch bnc#539521 petr.uzel(a)suse.cz -Patch19: do-not-unnecessarily-open-part-dev.patch -#PATCH-FIX-UPSTREAM fix-race-call-udevadm-settle.patch bnc#539521 petr.uzel(a)suse.cz -Patch20: fix-race-call-udevadm-settle.patch -#PATCH-FIX-UPSTREAM retry-blkpg-ioctl.patch bnc#539521 petr.uzel(a)suse.cz -Patch21: retry-blkpg-ioctl.patch -#PATCH-FIX-UPSTREAM use-ext-range.patch bnc#567652 petr.uzel(a)suse.cz -Patch22: use-ext-range.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://www.gnu.org/software/parted/ +Patch11: do-not-create-dm-nodes.patch +#PATCH-FIX-UPSTREAM parted-remove-experimental-warning.patch +Patch12: parted-remove-experimental-warning.patch + +Requires: /sbin/udevadm +BuildRequires: check-devel +BuildRequires: device-mapper-devel >= 1.02.33 +BuildRequires: e2fsprogs-devel +BuildRequires: libreiserfs-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel +BuildRequires: pkg-config +BuildRequires: readline-devel PreReq: %install_info_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 Obsoletes: parted-64bit @@ -77,15 +63,14 @@ GNU Parted is a program for creating, destroying, resizing, checking, and copying partitions, and the file systems on them. -Authors: --------- - Andrew Clausen <clausen(a)gnu.org> - %package devel -License: GPLv2+ +License: GPLv3+ Summary: Parted Include Files and Libraries necessary for Development Group: Development/Libraries/C and C++ -Requires: e2fsprogs-devel parted = %version device-mapper-devel libreiserfs-devel +Requires: device-mapper-devel >= 1.02.33 +Requires: e2fsprogs-devel +Requires: libreiserfs-devel +Requires: parted = %version # bug437293 %ifarch ppc64 Obsoletes: parted-devel-64bit @@ -95,15 +80,6 @@ This package contains all necessary include files and libraries needed to develop applications that require these. -Authors: --------- - Andrew Clausen <clausen(a)gnu.org> - Lennert Buytenhek <buytenh(a)gnu.org> - Matthew Wilson <msw(a)redhat.com> - Masahiro Sakai <ZVM01052(a)nifty.ne.jp> - Ben Collins <vincent.stelhe(a)free.fr> - Matt Domsch <Matt_Domsch(a)dell.com> - %lang_package %prep %setup -q @@ -112,24 +88,14 @@ %patch2 -p1 %patch3 -p1 %patch4 -p0 -%patch5 -%patch6 -p1 +%patch5 -p1 +%patch6 %patch7 %patch8 %patch9 -p1 %patch10 -p1 -%patch11 +%patch11 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 %build AUTOPOINT=true autoreconf --force --install @@ -142,12 +108,12 @@ make %{?jobs:-j%jobs} %install -make DESTDIR="$RPM_BUILD_ROOT" install -rm $RPM_BUILD_ROOT%{_libdir}/*.la +%makeinstall +rm %{buildroot}%{_libdir}/*.la %find_lang %{name} %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf %{buildroot} %post /sbin/ldconfig @@ -168,7 +134,7 @@ %files devel %defattr(-,root,root) %doc doc/API doc/FAT -%{_prefix}/include/* +%{_includedir}/* %{_libdir}/pkgconfig/libparted.pc %{_libdir}/*.so ++++++ always-resize-part.dif ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:16.000000000 +0200 @@ -1,9 +1,13 @@ +--- + parted/parted.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + Index: parted/parted.c =================================================================== ---- parted/parted.c.orig 2009-07-30 16:28:06.000000000 +0200 -+++ parted/parted.c 2009-07-30 16:28:07.000000000 +0200 -@@ -1779,7 +1779,7 @@ do_resize (PedDevice** dev) - { +--- parted/parted.c.orig 2010-02-02 11:28:07.000000000 +0100 ++++ parted/parted.c 2010-02-02 11:31:00.000000000 +0100 +@@ -1853,7 +1853,7 @@ do_resize (PedDevice** dev) + issue_fs_op_warning ("resize"); PedDisk *disk; PedPartition *part = NULL; - PedFileSystem *fs; @@ -11,39 +15,39 @@ PedConstraint *constraint; PedSector start, end; PedGeometry *range_start = NULL, *range_end = NULL; -@@ -1816,22 +1816,39 @@ do_resize (PedDevice** dev) +@@ -1890,22 +1890,39 @@ do_resize (PedDevice** dev) goto error_destroy_constraint; ped_partition_set_system (part, NULL); } else { -+ int always_resize = getenv( "YAST_IS_RUNNING" ) != NULL; -+ const char* fsname = ""; -+ if( always_resize ) -+ { -+ PedFileSystemType* fst = ped_file_system_probe( &part->geom ); -+ if( fst ) -+ fsname = fst->name; -+ } ++ int always_resize = getenv( "YAST_IS_RUNNING" ) != NULL; ++ const char* fsname = ""; ++ if( always_resize ) ++ { ++ PedFileSystemType* fst = ped_file_system_probe( &part->geom ); ++ if( fst ) ++ fsname = fst->name; ++ } fs = ped_file_system_open (&part->geom); - if (!fs) -+ if (!fs && (!always_resize || strncmp(fsname,"fat",3)==0) ) ++ if (!fs && (!always_resize || strncmp(fsname,"fat",3)==0) ) goto error_destroy_disk; -+ if (fs) ++ if (fs) constraint = constraint_intersect_and_destroy ( ped_file_system_get_resize_constraint (fs), constraint_from_start_end ( *dev, range_start, range_end)); -+ else -+ { -+ new_geom.start = part->geom.start; -+ constraint = ped_constraint_exact(&new_geom); -+ } ++ else ++ { ++ new_geom.start = part->geom.start; ++ constraint = ped_constraint_exact(&new_geom); ++ } if (!ped_disk_set_partition_geom (disk, part, constraint, new_geom.start, new_geom.end)) goto error_close_fs; - if (!ped_file_system_resize (fs, &part->geom, g_timer)) -+ if(fs) -+ { -+ if (!ped_file_system_resize (fs, &part->geom, g_timer) && !always_resize ) ++ if(fs) ++ { ++ if (!ped_file_system_resize (fs, &part->geom, g_timer) && !always_resize ) goto error_close_fs; /* may have changed... eg fat16 -> fat32 */ ped_partition_set_system (part, fs->type); @@ -53,7 +57,7 @@ ped_disk_commit (disk); ped_constraint_destroy (constraint); -@@ -1847,6 +1864,7 @@ do_resize (PedDevice** dev) +@@ -1921,6 +1938,7 @@ do_resize (PedDevice** dev) return 1; error_close_fs: ++++++ always_print_geom.diff ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:16.000000000 +0200 @@ -1,26 +1,26 @@ Index: parted/parted.c =================================================================== ---- parted/parted.c.orig 2009-07-29 14:41:35.000000000 +0200 -+++ parted/parted.c 2009-07-29 14:41:59.000000000 +0200 -@@ -1312,7 +1312,21 @@ do_print (PedDevice** dev) +--- parted/parted.c.orig 2010-04-02 10:22:16.000000000 +0200 ++++ parted/parted.c 2010-04-02 10:40:03.000000000 +0200 +@@ -1435,8 +1435,20 @@ do_print (PedDevice** dev) + wchar_t* table_rendered; disk = ped_disk_new (*dev); - if (!disk) -+ { -+ if (ped_unit_get_default () == PED_UNIT_CHS || -+ ped_unit_get_default () == PED_UNIT_CYLINDER) -+ { -+ PedCHSGeometry* chs = &(*dev)->bios_geom; -+ char* cyl_size = ped_unit_format_custom (*dev, -+ chs->heads * chs->sectors, -+ PED_UNIT_KILOBYTE); -+ printf (_("BIOS cylinder,head,sector geometry: %d,%d,%d. " -+ "Each cylinder is %s.\n"), -+ chs->cylinders, chs->heads, chs->sectors, cyl_size); -+ free (cyl_size); -+ } +- if (!disk) ++ if (!disk) { ++ if (ped_unit_get_default () == PED_UNIT_CHS || ++ ped_unit_get_default () == PED_UNIT_CYLINDER) { ++ PedCHSGeometry* chs = &(*dev)->bios_geom; ++ char* cyl_size = ped_unit_format_custom (*dev, ++ chs->heads * chs->sectors, ++ PED_UNIT_KILOBYTE); ++ printf (_("BIOS cylinder,head,sector geometry: %d,%d,%d. " ++ "Each cylinder is %s.\n"), ++ chs->cylinders, chs->heads, chs->sectors, cyl_size); ++ free (cyl_size); ++ } goto error; -+ } ++ } - peek_word = command_line_peek_word (); - if (peek_word) { + if (ped_disk_is_flag_available(disk, PED_DISK_CYLINDER_ALIGNMENT)) + if (!ped_disk_set_flag(disk, PED_DISK_CYLINDER_ALIGNMENT, ++++++ do-not-create-dm-nodes.patch ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:16.000000000 +0200 @@ -58,7 +58,7 @@ + fclose(f); + + /* Wait for udev to finish */ -+ if (system ("/sbin/udevadm settle") != 0) { ++ if (system ("/sbin/udevadm settle --timeout=20") != 0) { + /* udevadm settle failed - let's sleep for a while */ + sleep (2); } ++++++ etherd_support.diff ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:16.000000000 +0200 @@ -1,7 +1,12 @@ +--- + include/parted/device.h | 3 ++- + libparted/arch/linux.c | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + Index: include/parted/device.h =================================================================== ---- include/parted/device.h.orig 2009-07-23 19:52:08.000000000 +0200 -+++ include/parted/device.h 2009-07-30 16:24:58.000000000 +0200 +--- include/parted/device.h.orig 2009-11-06 19:31:18.000000000 +0100 ++++ include/parted/device.h 2010-02-02 13:10:06.000000000 +0100 @@ -46,7 +46,8 @@ typedef enum { PED_DEVICE_DM = 12, PED_DEVICE_XVD = 13, @@ -14,9 +19,9 @@ typedef struct _PedDevice PedDevice; Index: libparted/arch/linux.c =================================================================== ---- libparted/arch/linux.c.orig 2009-07-23 19:52:08.000000000 +0200 -+++ libparted/arch/linux.c 2009-07-30 16:24:58.000000000 +0200 -@@ -251,6 +251,7 @@ struct blkdev_ioctl_param { +--- libparted/arch/linux.c.orig 2009-12-20 12:38:23.000000000 +0100 ++++ libparted/arch/linux.c 2010-02-02 13:13:27.000000000 +0100 +@@ -248,6 +248,7 @@ struct blkdev_ioctl_param { #define I2O_MAJOR7 86 #define I2O_MAJOR8 87 #define UBD_MAJOR 98 @@ -24,24 +29,24 @@ #define DASD_MAJOR 94 #define VIODASD_MAJOR 112 #define SX8_MAJOR1 160 -@@ -530,6 +531,8 @@ _device_probe_type (PedDevice* dev) +@@ -541,6 +542,8 @@ _device_probe_type (PedDevice* dev) dev->type = PED_DEVICE_DAC960; } else if (dev_major == ATARAID_MAJOR && (dev_minor % 0x10 == 0)) { dev->type = PED_DEVICE_ATARAID; -+ } else if (dev_major == AOE_MAJOR && (dev_minor % 0x10 == 0)) { -+ dev->type = PED_DEVICE_AOE; ++ } else if (dev_major == AOE_MAJOR && (dev_minor % 0x10 == 0)) { ++ dev->type = PED_DEVICE_AOE; } else if (dev_major == DASD_MAJOR && (dev_minor % 0x4 == 0)) { dev->type = PED_DEVICE_DASD; } else if (dev_major == VIODASD_MAJOR && (dev_minor % 0x8 == 0)) { -@@ -1250,6 +1253,11 @@ linux_new (const char* path) +@@ -1310,6 +1313,11 @@ linux_new (const char* path) goto error_free_arch_specific; break; -+ case PED_DEVICE_AOE: -+ if (!init_generic (dev, _("AoE Driver"))) -+ goto error_free_arch_specific; -+ break; ++ case PED_DEVICE_AOE: ++ if (!init_generic (dev, _("AoE Driver"))) ++ goto error_free_arch_specific; ++ break; + + #if defined __s390__ || defined __s390x__ case PED_DEVICE_DASD: if (!init_dasd (dev, _("IBM S390 DASD drive"))) - goto error_free_arch_specific; ++++++ parted-1.9.0.tar.bz2 -> parted-2.2.tar.bz2 ++++++ ++++ 216230 lines of diff (skipped) ++++++ parted-gpt-mbr-sync.patch ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:17.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:17.000000000 +0200 @@ -1,10 +1,14 @@ +--- + libparted/labels/gpt.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 107 insertions(+), 2 deletions(-) + Index: libparted/labels/gpt.c =================================================================== ---- libparted/labels/gpt.c.orig 2009-07-23 19:52:08.000000000 +0200 -+++ libparted/labels/gpt.c 2009-07-29 14:36:56.000000000 +0200 -@@ -47,6 +47,11 @@ +--- libparted/labels/gpt.c.orig 2009-12-16 18:01:34.000000000 +0100 ++++ libparted/labels/gpt.c 2010-02-02 14:12:46.000000000 +0100 +@@ -50,6 +50,11 @@ # define _(String) (String) - #endif /* ENABLE_NLS */ + #endif /* ENABLE_NLS */ +/* IA64 always has a properly working EFI implementation */ +#ifndef __ia64__ @@ -14,146 +18,143 @@ #define EFI_PMBR_OSTYPE_EFI 0xEE #define MSDOS_MBR_SIGNATURE 0xaa55 -@@ -968,13 +973,62 @@ error: - return 0; +@@ -1062,11 +1067,60 @@ error: + return 0; } ++ +#ifdef GPT_SYNC_MBR +static inline unsigned char +_part_to_ostype (PedPartition* part) +{ -+ GPTPartitionData* gpt_part_data = part->disk_specific; -+ if (part->fs_type) { -+ if (strncmp (part->fs_type->name, "fat", 3) == 0) return 0xc; -+ if (strncmp (part->fs_type->name, "ntfs", 4) == 0) return 0x7; -+ if (strncmp (part->fs_type->name, "hfs", 3) == 0) return 0xaf; -+ if (strstr (part->fs_type->name, "swap")) return 0x82; -+ } -+ return 0x83; // Everything else is Linux ++ if (part->fs_type) { ++ if (strncmp (part->fs_type->name, "fat", 3) == 0) return 0xc; ++ if (strncmp (part->fs_type->name, "ntfs", 4) == 0) return 0x7; ++ if (strncmp (part->fs_type->name, "hfs", 3) == 0) return 0xaf; ++ if (strstr (part->fs_type->name, "swap")) return 0x82; ++ } ++ return 0x83; // Everything else is Linux +} + +static inline PedPartition* +_find_first_part (const PedDisk* disk) +{ -+ PedPartition *retval = NULL, *part = NULL; -+ uint64_t lowest_end = 0xffffffffffffffff; -+ while (part = ped_disk_next_partition (disk, part)) { -+ if (part->geom.start == 0 || part->type == PED_PARTITION_METADATA -+ || part->type == PED_PARTITION_FREESPACE) -+ continue; -+ if (part->geom.end < lowest_end) { -+ retval = part; -+ lowest_end = part->geom.end; -+ } -+ } -+ return retval; ++ PedPartition *retval = NULL, *part = NULL; ++ uint64_t lowest_end = 0xffffffffffffffff; ++ while (part = ped_disk_next_partition (disk, part)) { ++ if (part->geom.start == 0 || part->type == PED_PARTITION_METADATA ++ || part->type == PED_PARTITION_FREESPACE) ++ continue; ++ if (part->geom.end < lowest_end) { ++ retval = part; ++ lowest_end = part->geom.end; ++ } ++ } ++ return retval; +} + +static inline uint32_t +_part_32bitmax (uint64_t in) +{ -+ if (in > 0xFFFFFFFFULL) -+ return 0xFFFFFFFF; -+ else -+ return (uint32_t)in; ++ if (in > 0xFFFFFFFFULL) ++ return 0xFFFFFFFF; ++ else ++ return (uint32_t)in; +} +#endif + + -+ #ifndef DISCOVER_ONLY /* Write the protective MBR (to keep DOS happy) */ static int --_write_pmbr (PedDevice * dev) -+_write_pmbr (const PedDisk * disk) +-_write_pmbr (PedDevice *dev) ++_write_pmbr (const PedDisk *disk) { -+ PedDevice * dev = disk->dev; - LegacyMBR_t pmbr; - ++ PedDevice * dev = disk->dev; ++ +#ifdef GPT_SYNC_MBR -+ int i, pmbr_id, first_entry = 0, last_entry = 3; -+ PedPartition *part = NULL, *esp; ++ int i, pmbr_id, first_entry = 0, last_entry = 3; ++ PedPartition *part = NULL, *esp; +#endif + - /* The UEFI spec is not clear about what to do with the following - elements of the Protective MBR (pmbr): BootCode (0-440B), - UniqueMBRSignature (440B-444B) and Unknown (444B-446B). -@@ -982,11 +1036,14 @@ _write_pmbr (PedDevice * dev) - if (ped_device_read (dev, &pmbr, 0, GPT_PMBR_SECTORS) < GPT_PMBR_SECTORS) - memset (&pmbr, 0, sizeof(pmbr)); + /* The UEFI spec is not clear about what to do with the following + elements of the Protective MBR (pmbr): BootCode (0-440B), + UniqueMBRSignature (440B-444B) and Unknown (444B-446B). +@@ -1076,10 +1130,13 @@ _write_pmbr (PedDevice *dev) + return 0; + LegacyMBR_t *pmbr = s0; +#ifndef GPT_SYNC_MBR - /* Zero out all the legacy partitions. - There are 4 PartitionRecords. */ - memset (pmbr.PartitionRecord, 0, sizeof pmbr.PartitionRecord); + /* Zero out the legacy partitions. */ + memset (pmbr->PartitionRecord, 0, sizeof pmbr->PartitionRecord); +#endif - pmbr.Signature = PED_CPU_TO_LE16(MSDOS_MBR_SIGNATURE); + pmbr->Signature = PED_CPU_TO_LE16 (MSDOS_MBR_SIGNATURE); +#ifndef GPT_SYNC_MBR - pmbr.PartitionRecord[0].OSType = EFI_PMBR_OSTYPE_EFI; - pmbr.PartitionRecord[0].StartSector = 1; - pmbr.PartitionRecord[0].EndHead = 0xFE; -@@ -997,6 +1054,54 @@ _write_pmbr (PedDevice * dev) - pmbr.PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32(0xFFFFFFFF); - else - pmbr.PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32(dev->length - 1UL); + pmbr->PartitionRecord[0].OSType = EFI_PMBR_OSTYPE_EFI; + pmbr->PartitionRecord[0].StartSector = 1; + pmbr->PartitionRecord[0].EndHead = 0xFE; +@@ -1090,6 +1147,54 @@ _write_pmbr (PedDevice *dev) + pmbr->PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32 (0xFFFFFFFF); + else + pmbr->PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32 (dev->length - 1UL); +#else -+ /* Search for an EFI System Partition */ -+ esp = _find_first_part(disk); -+ if (!esp || !esp->fs_type || strncmp (esp->fs_type->name, "fat", 3) != 0) -+ esp = NULL; -+ -+ pmbr_id = 3; -+ if (esp) { -+ pmbr_id = 0; -+ first_entry = 1; -+ last_entry = 4; -+ } -+ -+ /* Write a pseudo-PMBR so Linux is happy */ -+ pmbr.PartitionRecord[pmbr_id].OSType = EFI_PMBR_OSTYPE_EFI; -+ pmbr.PartitionRecord[pmbr_id].StartSector = 1; -+ pmbr.PartitionRecord[pmbr_id].EndHead = 0xFE; -+ pmbr.PartitionRecord[pmbr_id].EndSector = 0xFF; -+ pmbr.PartitionRecord[pmbr_id].EndTrack = 0xFF; -+ pmbr.PartitionRecord[pmbr_id].StartingLBA = PED_CPU_TO_LE32(1); -+ pmbr.PartitionRecord[pmbr_id].SizeInLBA = 1; -+ if (esp) -+ pmbr.PartitionRecord[pmbr_id].SizeInLBA = esp->geom.end - 1; -+ -+ /* sync the first 3 GPT entries to MBR primary partitions */ -+ for (i=first_entry; i < last_entry; i++) { -+ part = ped_disk_next_partition (disk, part); -+ if (part == NULL) -+ break; -+ /* we might get a starting garbage partition */ -+ if (part->geom.start == 0 || part->type == PED_PARTITION_METADATA || part->type == PED_PARTITION_FREESPACE || part == esp) { -+ i--; -+ continue; -+ } -+ pmbr.PartitionRecord[i].OSType = _part_to_ostype(part); -+ pmbr.PartitionRecord[i].StartSector = 1; -+ pmbr.PartitionRecord[i].StartHead = 0xFE; -+ pmbr.PartitionRecord[i].StartSector = 0xFF; -+ pmbr.PartitionRecord[i].StartTrack = 0xFF; -+ pmbr.PartitionRecord[i].EndHead = 0xFE; -+ pmbr.PartitionRecord[i].EndSector = 0xFF; -+ pmbr.PartitionRecord[i].EndTrack = 0xFF; -+ pmbr.PartitionRecord[i].StartingLBA = _part_32bitmax(part->geom.start); -+ if(((GPTPartitionData*)part->disk_specific)->boot) -+ pmbr.PartitionRecord[i].BootIndicator = 0x80; -+ pmbr.PartitionRecord[i].SizeInLBA = _part_32bitmax(part->geom.end - part->geom.start); -+ } ++ /* Search for an EFI System Partition */ ++ esp = _find_first_part(disk); ++ if (!esp || !esp->fs_type || strncmp (esp->fs_type->name, "fat", 3) != 0) ++ esp = NULL; ++ ++ pmbr_id = 3; ++ if (esp) { ++ pmbr_id = 0; ++ first_entry = 1; ++ last_entry = 4; ++ } ++ ++ /* Write a pseudo-PMBR so Linux is happy */ ++ pmbr->PartitionRecord[pmbr_id].OSType = EFI_PMBR_OSTYPE_EFI; ++ pmbr->PartitionRecord[pmbr_id].StartSector = 1; ++ pmbr->PartitionRecord[pmbr_id].EndHead = 0xFE; ++ pmbr->PartitionRecord[pmbr_id].EndSector = 0xFF; ++ pmbr->PartitionRecord[pmbr_id].EndTrack = 0xFF; ++ pmbr->PartitionRecord[pmbr_id].StartingLBA = PED_CPU_TO_LE32(1); ++ pmbr->PartitionRecord[pmbr_id].SizeInLBA = 1; ++ if (esp) ++ pmbr->PartitionRecord[pmbr_id].SizeInLBA = esp->geom.end - 1; ++ ++ /* sync the first 3 GPT entries to MBR primary partitions */ ++ for (i=first_entry; i < last_entry; i++) { ++ part = ped_disk_next_partition (disk, part); ++ if (part == NULL) ++ break; ++ /* we might get a starting garbage partition */ ++ if (part->geom.start == 0 || part->type == PED_PARTITION_METADATA || part->type == PED_PARTITION_FREESPACE || part == esp) { ++ i--; ++ continue; ++ } ++ pmbr->PartitionRecord[i].OSType = _part_to_ostype(part); ++ pmbr->PartitionRecord[i].StartSector = 1; ++ pmbr->PartitionRecord[i].StartHead = 0xFE; ++ pmbr->PartitionRecord[i].StartSector = 0xFF; ++ pmbr->PartitionRecord[i].StartTrack = 0xFF; ++ pmbr->PartitionRecord[i].EndHead = 0xFE; ++ pmbr->PartitionRecord[i].EndSector = 0xFF; ++ pmbr->PartitionRecord[i].EndTrack = 0xFF; ++ pmbr->PartitionRecord[i].StartingLBA = _part_32bitmax(part->geom.start); ++ if(((GPTPartitionData*)part->disk_specific)->boot) ++ pmbr->PartitionRecord[i].BootIndicator = 0x80; ++ pmbr->PartitionRecord[i].SizeInLBA = _part_32bitmax(part->geom.end - part->geom.start); ++ } +#endif - return ped_device_write (dev, &pmbr, GPT_PMBR_LBA, GPT_PMBR_SECTORS); - } -@@ -1100,7 +1205,7 @@ gpt_write(const PedDisk * disk) - ptes_crc = efi_crc32 (ptes, ptes_size); - - /* Write protective MBR */ -- if (!_write_pmbr (disk->dev)) -+ if (!_write_pmbr (disk)) - goto error_free_ptes; + int write_ok = ped_device_write (dev, pmbr, GPT_PMBR_LBA, + GPT_PMBR_SECTORS); +@@ -1204,7 +1309,7 @@ gpt_write (const PedDisk *disk) + ptes_crc = efi_crc32 (ptes, ptes_size); + + /* Write protective MBR */ +- if (!_write_pmbr (disk->dev)) ++ if (!_write_pmbr (disk)) + goto error_free_ptes; - /* Write PTH and PTEs */ + /* Write PTH and PTEs */ ++++++ parted-mac.patch ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:17.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:17.000000000 +0200 @@ -1,8 +1,8 @@ -Index: parted-1.9.0/libparted/disk.c +Index: parted-2.1/libparted/disk.c =================================================================== ---- parted-1.9.0.orig/libparted/disk.c 2009-07-30 15:22:28.000000000 +0200 -+++ parted-1.9.0/libparted/disk.c 2009-07-30 15:22:50.000000000 +0200 -@@ -969,6 +969,41 @@ _disk_pop_update_mode (PedDisk* disk) +--- parted-2.1.orig/libparted/disk.c 2010-02-02 11:38:31.000000000 +0100 ++++ parted-2.1/libparted/disk.c 2010-02-02 11:39:16.000000000 +0100 +@@ -1178,6 +1178,41 @@ _disk_pop_update_mode (PedDisk* disk) * @{ */ @@ -44,12 +44,12 @@ PedPartition* _ped_partition_alloc (const PedDisk* disk, PedPartitionType type, const PedFileSystemType* fs_type, -Index: parted-1.9.0/libparted/labels/mac.c +Index: parted-2.1/libparted/labels/mac.c =================================================================== ---- parted-1.9.0.orig/libparted/labels/mac.c 2009-07-23 19:52:08.000000000 +0200 -+++ parted-1.9.0/libparted/labels/mac.c 2009-07-30 15:22:50.000000000 +0200 -@@ -1375,6 +1375,36 @@ mac_partition_get_name (const PedPartiti - return mac_data->volume_name; +--- parted-2.1.orig/libparted/labels/mac.c 2009-12-16 18:18:13.000000000 +0100 ++++ parted-2.1/libparted/labels/mac.c 2010-02-02 11:43:23.000000000 +0100 +@@ -1437,6 +1437,36 @@ mac_get_partition_alignment(const PedDis + return ped_alignment_new(0, sector_size); } +/* we do not really want to call this ... yet */ @@ -85,16 +85,16 @@ static PedConstraint* _primary_constraint (PedDisk* disk) { -@@ -1599,6 +1629,8 @@ static PedDiskOps mac_disk_ops = { - partition_is_flag_available: mac_partition_is_flag_available, +@@ -1640,6 +1670,8 @@ static PedDiskOps mac_disk_ops = { + partition_set_name: mac_partition_set_name, partition_get_name: mac_partition_get_name, -+ partition_set_system_name: mac_partition_set_system_name, -+ partition_get_system_name: mac_partition_get_system_name, - partition_align: mac_partition_align, - partition_enumerate: mac_partition_enumerate, ++ partition_set_system_name: mac_partition_set_system_name, ++ partition_get_system_name: mac_partition_get_system_name, + + get_partition_alignment: mac_get_partition_alignment, -@@ -1613,7 +1645,7 @@ static PedDiskType mac_disk_type = { +@@ -1650,7 +1682,7 @@ static PedDiskType mac_disk_type = { next: NULL, name: "mac", ops: &mac_disk_ops, @@ -103,11 +103,11 @@ }; void -Index: parted-1.9.0/include/parted/disk.h +Index: parted-2.1/include/parted/disk.h =================================================================== ---- parted-1.9.0.orig/include/parted/disk.h 2009-07-30 15:22:28.000000000 +0200 -+++ parted-1.9.0/include/parted/disk.h 2009-07-30 15:22:50.000000000 +0200 -@@ -61,10 +61,11 @@ enum _PedPartitionFlag { +--- parted-2.1.orig/include/parted/disk.h 2010-02-02 11:38:31.000000000 +0100 ++++ parted-2.1/include/parted/disk.h 2010-02-02 11:39:16.000000000 +0100 +@@ -76,10 +76,11 @@ enum _PedPartitionFlag { enum _PedDiskTypeFeature { PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ @@ -121,7 +121,7 @@ struct _PedDisk; struct _PedPartition; -@@ -212,6 +213,8 @@ struct _PedDiskOps { +@@ -239,6 +240,8 @@ struct _PedDiskOps { /* other */ int (*alloc_metadata) (PedDisk* disk); int (*get_max_primary_partition_count) (const PedDisk* disk); @@ -129,8 +129,8 @@ + const char* (*partition_get_system_name) (const PedPartition* part); bool (*get_max_supported_partition_count) (const PedDisk* disk, int* supported); - }; -@@ -288,7 +291,9 @@ extern int ped_partition_is_flag_availab + PedAlignment *(*get_partition_alignment)(const PedDisk *disk); +@@ -325,7 +328,9 @@ extern int ped_partition_is_flag_availab extern int ped_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type); extern int ped_partition_set_name (PedPartition* part, const char* name); @@ -140,11 +140,11 @@ extern int ped_partition_is_busy (const PedPartition* part); extern char* ped_partition_get_path (const PedPartition* part); -Index: parted-1.9.0/parted/parted.c +Index: parted-2.1/parted/parted.c =================================================================== ---- parted-1.9.0.orig/parted/parted.c 2009-07-30 15:22:28.000000000 +0200 -+++ parted-1.9.0/parted/parted.c 2009-07-30 15:23:47.000000000 +0200 -@@ -1165,6 +1165,7 @@ partition_print_flags (PedPartition* par +--- parted-2.1.orig/parted/parted.c 2010-02-02 11:38:31.000000000 +0100 ++++ parted-2.1/parted/parted.c 2010-02-02 11:39:16.000000000 +0100 +@@ -1235,6 +1235,7 @@ partition_print_flags (PedPartition* par char* res = ped_malloc(1); void* _res = res; int xtype; @@ -152,7 +152,7 @@ *res = '\0'; -@@ -1201,6 +1202,23 @@ partition_print_flags (PedPartition* par +@@ -1269,6 +1270,23 @@ partition_print_flags (PedPartition* par } } ++++++ parted-remove-experimental-warning.patch ++++++ >From 2d81422f3caea30d9d65ec343a34bc1f447a4f01 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 11 Mar 2010 19:01:41 +0100 Subject: [PATCH] libparted: remove "HIGHLY EXPERIMENTAL" warning for >512B-sector devices * libparted/arch/linux.c (_device_set_sector_size): Remove the "HIGHLY EXPERIMENTAL" warning, now that support for >512-byte sectors seems to be usable. Suggested by Colin Watson. --- Index: parted-2.2/libparted/arch/linux.c =================================================================== --- parted-2.2.orig/libparted/arch/linux.c 2010-04-02 09:53:02.000000000 +0200 +++ parted-2.2/libparted/arch/linux.c 2010-04-02 09:53:43.000000000 +0200 @@ -688,16 +688,6 @@ _device_set_sector_size (PedDevice* dev) dev->sector_size = PED_SECTOR_SIZE_DEFAULT; } #endif - - if (dev->sector_size != PED_SECTOR_SIZE_DEFAULT) { - ped_exception_throw ( - PED_EXCEPTION_WARNING, - PED_EXCEPTION_OK, - _("Device %s has a logical sector size of %lld. Not " - "all parts of GNU Parted support this at the moment, " - "and the working code is HIGHLY EXPERIMENTAL.\n"), - dev->path, dev->sector_size); - } } static int ++++++ parted-type.patch ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:17.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:17.000000000 +0200 @@ -1,8 +1,16 @@ -Index: parted-1.9.0/libparted/disk.c +--- + include/parted/disk.h | 9 +++++---- + libparted/disk.c | 2 ++ + libparted/labels/dos.c | 8 ++++++++ + parted/parted.c | 24 +++++++++++++++++++++--- + parted/ui.c | 3 +++ + 5 files changed, 39 insertions(+), 7 deletions(-) + +Index: parted-2.1/libparted/disk.c =================================================================== ---- parted-1.9.0.orig/libparted/disk.c 2009-07-30 14:59:14.000000000 +0200 -+++ parted-1.9.0/libparted/disk.c 2009-07-30 14:59:21.000000000 +0200 -@@ -2240,6 +2240,8 @@ ped_partition_flag_get_name (PedPartitio +--- parted-2.1.orig/libparted/disk.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/libparted/disk.c 2010-02-02 11:57:14.000000000 +0100 +@@ -2429,6 +2429,8 @@ ped_partition_flag_get_name (PedPartitio return N_("lba"); case PED_PARTITION_HPSERVICE: return N_("hp-service"); @@ -11,11 +19,11 @@ case PED_PARTITION_PALO: return N_("palo"); case PED_PARTITION_PREP: -Index: parted-1.9.0/libparted/labels/dos.c +Index: parted-2.1/libparted/labels/dos.c =================================================================== ---- parted-1.9.0.orig/libparted/labels/dos.c 2009-07-30 14:59:14.000000000 +0200 -+++ parted-1.9.0/libparted/labels/dos.c 2009-07-30 14:59:21.000000000 +0200 -@@ -1346,6 +1346,10 @@ msdos_partition_set_flag (PedPartition* +--- parted-2.1.orig/libparted/labels/dos.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/libparted/labels/dos.c 2010-02-02 11:57:14.000000000 +0100 +@@ -1397,6 +1397,10 @@ msdos_partition_set_flag (PedPartition* disk = part->disk; switch (flag) { @@ -26,7 +34,7 @@ case PED_PARTITION_HIDDEN: if (part->type == PED_PARTITION_EXTENDED) { ped_exception_throw ( -@@ -1443,6 +1447,9 @@ msdos_partition_get_flag (const PedParti +@@ -1494,6 +1498,9 @@ msdos_partition_get_flag (const PedParti case PED_PARTITION_LBA: return dos_data->lba; @@ -36,7 +44,7 @@ case PED_PARTITION_PALO: return dos_data->palo; -@@ -1464,6 +1471,7 @@ msdos_partition_is_flag_available (const +@@ -1515,6 +1522,7 @@ msdos_partition_is_flag_available (const case PED_PARTITION_RAID: case PED_PARTITION_LVM: case PED_PARTITION_LBA: @@ -44,43 +52,45 @@ case PED_PARTITION_PALO: case PED_PARTITION_PREP: return 1; -Index: parted-1.9.0/parted/ui.c +Index: parted-2.1/parted/ui.c =================================================================== ---- parted-1.9.0.orig/parted/ui.c 2009-07-30 14:59:14.000000000 +0200 -+++ parted-1.9.0/parted/ui.c 2009-07-30 14:59:21.000000000 +0200 -@@ -908,6 +908,9 @@ command_line_get_integer (const char* pr +--- parted-2.1.orig/parted/ui.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/parted/ui.c 2010-02-02 12:00:01.000000000 +0100 +@@ -918,6 +918,9 @@ command_line_get_integer (const char* pr NULL, 1); if (!input) return 0; + if (strstr(input, "0x") == input) -+ valid = sscanf (input, "%x", value); -+ else ++ valid = sscanf (input, "%x", value); ++ else valid = sscanf (input, "%d", value); free (input); return valid; -Index: parted-1.9.0/include/parted/disk.h +Index: parted-2.1/include/parted/disk.h =================================================================== ---- parted-1.9.0.orig/include/parted/disk.h 2009-07-30 14:59:14.000000000 +0200 -+++ parted-1.9.0/include/parted/disk.h 2009-07-30 14:59:21.000000000 +0200 -@@ -51,9 +51,10 @@ enum _PedPartitionFlag { +--- parted-2.1.orig/include/parted/disk.h 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/include/parted/disk.h 2010-02-02 11:58:02.000000000 +0100 +@@ -65,10 +65,11 @@ enum _PedPartitionFlag { PED_PARTITION_LBA=7, PED_PARTITION_HPSERVICE=8, PED_PARTITION_PALO=9, - PED_PARTITION_PREP=10, - PED_PARTITION_MSFT_RESERVED=11, -- PED_PARTITION_BIOS_GRUB=12 -+ PED_PARTITION_TYPE=10, +- PED_PARTITION_BIOS_GRUB=12, +- PED_PARTITION_APPLE_TV_RECOVERY=13 ++ PED_PARTITION_TYPE=10, + PED_PARTITION_PREP=11, + PED_PARTITION_MSFT_RESERVED=12, -+ PED_PARTITION_BIOS_GRUB=13 ++ PED_PARTITION_BIOS_GRUB=13, ++ PED_PARTITION_APPLE_TV_RECOVERY=14 }; #define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT - #define PED_PARTITION_LAST_FLAG PED_PARTITION_BIOS_GRUB -Index: parted-1.9.0/parted/parted.c + #define PED_PARTITION_LAST_FLAG PED_PARTITION_APPLE_TV_RECOVERY +Index: parted-2.1/parted/parted.c =================================================================== ---- parted-1.9.0.orig/parted/parted.c 2009-07-30 14:59:20.000000000 +0200 -+++ parted-1.9.0/parted/parted.c 2009-07-30 15:13:40.000000000 +0200 -@@ -1164,13 +1164,14 @@ partition_print_flags (PedPartition* par +--- parted-2.1.orig/parted/parted.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/parted/parted.c 2010-02-02 11:57:14.000000000 +0100 +@@ -1234,13 +1234,14 @@ partition_print_flags (PedPartition* par const char* name; char* res = ped_malloc(1); void* _res = res; @@ -96,7 +106,7 @@ if (first_flag) first_flag = 0; else { -@@ -1180,7 +1181,16 @@ partition_print_flags (PedPartition* par +@@ -1249,7 +1250,16 @@ partition_print_flags (PedPartition* par res = _res; strncat (res, ", ", 2); } @@ -113,16 +123,16 @@ + else { name = _(ped_partition_flag_get_name (flag)); _res = res; - ped_realloc (&_res, strlen (res) + 1 -@@ -1189,6 +1199,7 @@ partition_print_flags (PedPartition* par - strncat (res, name, 21); + ped_realloc (&_res, strlen (res) + 1 + strlen (name)); +@@ -1257,6 +1267,7 @@ partition_print_flags (PedPartition* par + strcat(res, name); } } + } return res; } -@@ -1940,12 +1951,19 @@ do_set (PedDevice** dev) +@@ -2057,12 +2068,19 @@ do_set (PedDevice** dev) goto error_destroy_disk; if (!command_line_get_part_flag (_("Flag to Invert?"), part, &flag)) goto error_destroy_disk; ++++++ parted-wipeaix.patch ++++++ --- /var/tmp/diff_new_pack.a67qeI/_old 2010-04-03 00:13:17.000000000 +0200 +++ /var/tmp/diff_new_pack.a67qeI/_new 2010-04-03 00:13:17.000000000 +0200 @@ -1,36 +1,19 @@ -Index: parted-1.9.0/libparted/labels/dos.c +Index: parted-2.1/libparted/labels/dos.c =================================================================== ---- parted-1.9.0.orig/libparted/labels/dos.c 2009-07-29 11:31:18.000000000 +0200 -+++ parted-1.9.0/libparted/labels/dos.c 2009-07-29 11:36:43.000000000 +0200 -@@ -54,6 +54,8 @@ static const char MBR_BOOT_CODE[] = { - #define MSDOS_MAGIC 0xAA55 - #define PARTITION_MAGIC_MAGIC 0xf6f6 +--- parted-2.1.orig/libparted/labels/dos.c 2010-02-02 13:26:28.000000000 +0100 ++++ parted-2.1/libparted/labels/dos.c 2010-02-02 13:28:15.000000000 +0100 +@@ -1187,7 +1187,13 @@ msdos_write (const PedDisk* disk) + return 0; + DosRawTable *table = (DosRawTable *) s0; -+#define AIXIPLRECID 0xc9c2d4c1 /* Value is EBCIDIC 'IBMA' */ -+ - #define PARTITION_EMPTY 0x00 - #define PARTITION_FAT12 0x01 - #define PARTITION_FAT16_SM 0x04 -@@ -193,6 +195,10 @@ msdos_probe (const PedDevice *dev) - if (PED_LE16_TO_CPU (part_table->magic) != MSDOS_MAGIC) - goto probe_fail; - -+ /* Is this an AIX IPL label? Then just go away. */ -+ if (PED_BE32_TO_CPU (*(unsigned int*)(part_table->boot_code)) == AIXIPLRECID) -+ goto probe_fail; -+ - /* If this is a FAT fs, fail here. Checking for the FAT signature - * has some false positives; instead, do what the Linux kernel does - * and ensure that each partition has a boot indicator that is -@@ -1142,7 +1148,10 @@ msdos_write (const PedDisk* disk) - - ped_device_read (disk->dev, &table, 0, 1); - -- if (!table.boot_code[0]) { +- if (!table->boot_code[0]) { + /* either no bootrecord at all, or AIX IPL signature ... */ -+ if ((!table.boot_code[0]) || -+ (PED_BE32_TO_CPU (*(unsigned int*)(table.boot_code)) == AIXIPLRECID) -+ ) { - memset (table.boot_code, 0, 512); - memcpy (table.boot_code, MBR_BOOT_CODE, sizeof (MBR_BOOT_CODE)); ++ if ( (!table->boot_code[0]) || ++ ( table->boot_code[0] == (char) 0xc9 && ++ table->boot_code[1] == (char) 0xc2 && ++ table->boot_code[2] == (char) 0xd4 && ++ table->boot_code[3] == (char) 0xc1) ++ ) { + memset (table->boot_code, 0, 512); + memcpy (table->boot_code, MBR_BOOT_CODE, sizeof (MBR_BOOT_CODE)); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libssh for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package libssh for openSUSE:Factory checked in at Sat Apr 3 00:13:02 CEST 2010. -------- --- libssh/libssh.changes 2009-11-25 16:51:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/libssh/libssh.changes 2010-03-15 19:44:33.000000000 +0100 @@ -2 +2 @@ -Wed Nov 25 15:47:54 UTC 2009 - tittiatcoke(a)gmail.com +Mon Mar 15 19:40:44 CET 2010 - anschneider(a)exsuse.de @@ -4,2 +4,41 @@ -- Update to version 0.3.92 (0.4 RC2) - * Added pcap dumping support. +- Update to version 0.4.2 + * Added owner and group information in sftp attributes. + * Added missing SSH_OPTIONS_FD option. + * Added printout of owner and group in the sftp example. + * Added a prepend function for ssh_list. + * Added send back replies to openssh's keepalives. + * Fixed documentation in scp code + * Fixed longname parsing, this only workings with readdir. + * Fixed and added support for several identity files. + * Fixed sftp_parse_longname() on Windows. + * Fixed a race condition bug in ssh_scp_close() + * Remove config support for SSHv1 Cipher variable. + * Rename ssh_list_add to ssh_list_append. + * Rename ssh_list_get_head to ssh_list_pop_head + +------------------------------------------------------------------- +Mon Feb 15 12:41:47 CET 2010 - anschneider(a)exsuse.de + +- Fixed Requires. + +------------------------------------------------------------------- +Sat Feb 13 15:29:14 CET 2010 - anschneider(a)exsuse.de + +- Update to version 0.4.1 + * Added support for aes128-ctr, aes192-ctr and aes256-ctr encryption. + * Added an example for exec. + * Added private key type detection feature in privatekey_from_file(). + * Fixed zlib compression fallback. + * Fixed kex bug that client preference should be prioritary + * Fixed known_hosts file set by the user. + * Fixed a memleak in channel_accept(). + * Fixed underflow when leave_function() are unbalanced + * Fixed memory corruption in handle_channel_request_open(). + * Fixed closing of a file handle case of errors in privatekey_from_file(). + * Fixed ssh_get_user_home_dir() to be thread safe. + * Fixed the doxygen documentation. + +------------------------------------------------------------------- +Thu Dec 10 23:43:19 CET 2009 - anschneider(a)exsuse.de + +- Update to version 0.4.0 @@ -20 +58,0 @@ - * Added more examples. @@ -27 +64,0 @@ - calling whatdependson for head-i586 Old: ---- libssh-0.3.92.tar.bz2 New: ---- libssh-0.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libssh.spec ++++++ --- /var/tmp/diff_new_pack.CcBuuH/_old 2010-04-03 00:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.CcBuuH/_new 2010-04-03 00:12:10.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libssh (Version 0.3.92) +# spec file for package libssh (Version 0.4.2) # -# 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 @@ -21,14 +21,14 @@ Name: libssh BuildRequires: cmake doxygen openssl-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/Libraries -Version: 0.3.92 +Version: 0.4.2 Release: 1 Summary: SSH library Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define debug_package_requires libssh3 = %{version}-%{release} +%define debug_package_requires libssh4 = %{version}-%{release} %description The ssh library was designed to be used by programmers needing a @@ -52,7 +52,7 @@ Nick Zitzmann <seiryu(a)comcast.net> %package -n libssh4 -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/Libraries Summary: SSH library @@ -78,7 +78,7 @@ Nick Zitzmann <seiryu(a)comcast.net> %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: SSH library development headers Requires: libssh4 = %{version} @@ -95,7 +95,7 @@ Nick Zitzmann <seiryu(a)comcast.net> %package devel-doc -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: Development/Languages/C and C++ Summary: SSH library api documentation @@ -127,6 +127,7 @@ -DLIB_SUFFIX=64 \ %endif %{_builddir}/%{name}-%{version} + %__make %{?jobs:-j%jobs} VERBOSE=1 %__make doc popd build ++++++ libssh-0.3.92.tar.bz2 -> libssh-0.4.2.tar.bz2 ++++++ ++++ 2893 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 perl-URI for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package perl-URI for openSUSE:Factory checked in at Sat Apr 3 00:12:45 CEST 2010. -------- --- perl-URI/perl-URI.changes 2010-03-26 13:40:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-URI/perl-URI.changes 2010-04-02 13:24:06.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 1 18:09:05 CEST 2010 - anicka(a)suse.cz + +- update to 1.54 + * Fix heuristic test fails on hosts in .su (or .uk) domains + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- URI-1.53.tar.bz2 New: ---- URI-1.54.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-URI.spec ++++++ --- /var/tmp/diff_new_pack.Xqodho/_old 2010-04-03 00:12:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Xqodho/_new 2010-04-03 00:12:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-URI (Version 1.53) +# spec file for package perl-URI (Version 1.54) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: perl-URI %define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) Summary: URI - Uniform Resource Identifiers (absolute and relative) -Version: 1.53 +Version: 1.54 Release: 1 License: Artistic License .. Group: Development/Libraries/Perl ++++++ URI-1.53.tar.bz2 -> URI-1.54.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.53/Changes new/URI-1.54/Changes --- old/URI-1.53/Changes 2010-03-14 14:43:29.000000000 +0100 +++ new/URI-1.54/Changes 2010-03-31 09:09:53.000000000 +0200 @@ -1,3 +1,12 @@ +2010-03-31 Gisle Aas <gisle(a)ActiveState.com> + + Release 1.54 + + Alex Kapranoff (1): + Fix heuristic test fails on hosts in .su (or .uk) domains [RT#56135] + + + 2010-03-14 Gisle Aas <gisle(a)ActiveState.com> Release 1.53 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.53/META.yml new/URI-1.54/META.yml --- old/URI-1.53/META.yml 2010-03-14 14:43:52.000000000 +0100 +++ new/URI-1.54/META.yml 2010-03-31 09:10:41.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: URI -version: 1.53 +version: 1.54 abstract: Uniform Resource Identifiers (absolute and relative) author: - Gisle Aas <gisle(a)activestate.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.53/URI.pm new/URI-1.54/URI.pm --- old/URI-1.53/URI.pm 2010-03-14 14:43:29.000000000 +0100 +++ new/URI-1.54/URI.pm 2010-03-31 09:08:02.000000000 +0200 @@ -2,7 +2,7 @@ use strict; use vars qw($VERSION); -$VERSION = "1.53"; +$VERSION = "1.54"; use vars qw($ABS_REMOTE_LEADING_DOTS $ABS_ALLOW_RELATIVE_SCHEME $DEFAULT_QUERY_FORM_DELIMITER); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.53/t/heuristic.t new/URI-1.54/t/heuristic.t --- old/URI-1.53/t/heuristic.t 2010-03-14 14:43:17.000000000 +0100 +++ new/URI-1.54/t/heuristic.t 2010-03-31 09:02:38.000000000 +0200 @@ -5,7 +5,7 @@ exit; } -print "1..19\n"; +print "1..20\n"; use URI::Heuristic qw(uf_urlstr uf_url); if (shift) { @@ -54,63 +54,71 @@ print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; print "ok 6\n"; + use Net::Domain; $ENV{LC_ALL} = "C"; + { no warnings; *Net::Domain::hostfqdn = sub { return 'vasya.su' } } undef $URI::Heuristic::MY_COUNTRY; - print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,; + print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.su/camel\.gif$,; print "ok 7\n"; + $ENV{LC_ALL} = "C"; + { no warnings; *Net::Domain::hostfqdn = sub { return '' } } + undef $URI::Heuristic::MY_COUNTRY; + print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,; + print "ok 8\n"; + $ENV{HTTP_ACCEPT_LANGUAGE} = "en-ca"; undef $URI::Heuristic::MY_COUNTRY; print "not " unless uf_urlstr("perl/camel.gif") eq "http://www.perl.ca/camel.gif"; - print "ok 8\n"; + print "ok 9\n"; } $URI::Heuristic::MY_COUNTRY = "bv"; print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,; - print "ok 9\n"; + print "ok 10\n"; # Backwards compatibility; uk != United Kingdom in ISO 3166 $URI::Heuristic::MY_COUNTRY = "uk"; print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; - print "ok 10\n"; + print "ok 11\n"; $URI::Heuristic::MY_COUNTRY = "gb"; print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; - print "ok 11\n"; + print "ok 12\n"; $ENV{URL_GUESS_PATTERN} = "www.ACME.org www.ACME.com"; print "not " unless uf_urlstr("perl") eq "http://www.perl.org"; - print "ok 12\n"; + print "ok 13\n"; } else { # don't make the innocent worry print "Skipping test 6-12 because DNS does not work\n"; - for (6..12) { print "ok $_\n"; } + for (6..13) { print "ok $_\n"; } } { local $ENV{URL_GUESS_PATTERN} = ""; print "not " unless uf_urlstr("perl") eq "http://perl"; -print "ok 13\n"; +print "ok 14\n"; print "not " unless uf_urlstr("http:80") eq "http:80"; -print "ok 14\n"; +print "ok 15\n"; print "not " unless uf_urlstr("mailto:gisle\@aas.no") eq "mailto:gisle\@aas.no"; -print "ok 15\n"; +print "ok 16\n"; print "not " unless uf_urlstr("gisle\(a)aas.no") eq "mailto:gisle\@aas.no"; -print "ok 16\n"; +print "ok 17\n"; print "not " unless uf_urlstr("Gisle.Aas\(a)aas.perl.org") eq "mailto:Gisle.Aas\@aas.perl.org"; -print "ok 17\n"; +print "ok 18\n"; print "not " unless uf_url("gopher.sn.no")->scheme eq "gopher"; -print "ok 18\n"; +print "ok 19\n"; print "not " unless uf_urlstr("123.3.3.3:8080/foo") eq "http://123.3.3.3:8080/foo"; -print "ok 19\n"; +print "ok 20\n"; } # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-server for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Sat Apr 3 00:12:04 CEST 2010. -------- --- xorg-x11-server/xorg-x11-server.changes 2010-03-26 16:21:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2010-04-02 12:08:06.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 2 11:33:28 CEST 2010 - sndirsch(a)suse.de + +- update to 1.8 +- obsoletes xorg-server-walk_drivers.diff +- adjusted xorg-server-xf4vnc.patch +- xorg-server-1.8.0.diff + * install evdev config file to the right directory + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xorg-server-1.7.99.902.tar.bz2 xorg-server-walk_drivers.diff New: ---- xorg-server-1.8.0.diff xorg-server-1.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.EoiKDH/_old 2010-04-03 00:10:38.000000000 +0200 +++ /var/tmp/diff_new_pack.EoiKDH/_new 2010-04-03 00:10:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-server (Version 7.5_1.7.99.902) +# spec file for package xorg-x11-server (Version 7.5_1.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.7.99.902 +%define dirsuffix 1.8.0 %define fglrx_driver_hack 0 ### FIXME %define vnc 1 @@ -35,7 +35,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.5_%{dirsuffix} -Release: 2 +Release: 1 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -106,7 +106,6 @@ Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff Patch143: autoconfig_fallback_fbdev_first.diff Patch145: driver-autoconfig.diff -Patch146: xorg-server-walk_drivers.diff Patch147: xserver-1.6.1-nouveau.patch # Moblin Patch162: cache-xkbcomp-output-for-fast-start-up.patch @@ -126,6 +125,7 @@ Patch202: 0001-Check-harder-for-primary-PCI-device.patch Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch Patch204: missing_font_paths.diff +Patch205: xorg-server-1.8.0.diff %description This package contains the X.Org Server. @@ -229,7 +229,6 @@ %patch132 -p1 %patch143 -p0 %patch145 -p0 -%patch146 -p1 %patch147 -p1 %patch162 -p1 %if %moblin @@ -249,6 +248,7 @@ %patch202 -p1 %patch203 -p1 %patch204 -p0 +%patch205 -p0 %build pushd xorg-docs-* @@ -553,6 +553,10 @@ %ifnarch s390 s390x /var/adm/fillup-templates/sysconfig.displaymanager-%name %endif +%if %suse_version > 1120 +%dir /etc/X11/xorg.conf.d +/etc/X11/xorg.conf.d/10-evdev.conf +%endif %files extra %defattr(-,root,root) ++++++ xorg-server-walk_drivers.diff -> xorg-server-1.8.0.diff ++++++ --- xorg-x11-server/xorg-server-walk_drivers.diff 2010-03-25 19:40:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-server-1.8.0.diff 2010-04-02 12:08:03.000000000 +0200 @@ -1,123 +1,11 @@ -commit 4da6cffa8b6169595ea447cc53dfab857c04db04 -Author: h_root <root(a)hilbert.suse.de> -Date: Thu Mar 25 18:32:04 2010 +0100 - - when doing driver autoconfiguration with some parts of the config - file present but no driver set (e.g. only input configuration) - fix the case that we may have multiple drivers to try. - - create a screen section for each driver and let them be tried - in a row - -diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c -index 7f4ada8..56f7deb 100644 ---- a/hw/xfree86/common/xf86AutoConfig.c -+++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -546,10 +546,41 @@ chooseVideoDriver(void) - return chosen_driver; - } +--- config/Makefile.am.orig 2010-04-02 11:56:16.000000000 +0200 ++++ config/Makefile.am 2010-04-02 11:56:49.000000000 +0200 +@@ -9,7 +9,7 @@ + libconfig_la_SOURCES += udev.c + libconfig_la_LIBADD = $(UDEV_LIBS) -+ -+/* copy a screen section and enter the desired driver -+ * and insert it at i in the list of screens */ -+static Bool -+copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver) -+{ -+ GDevPtr cptr = NULL; -+ -+ xf86ConfigLayout.screens[i].screen = xnfcalloc(1, sizeof(confScreenRec)); -+ if(!xf86ConfigLayout.screens[i].screen) -+ return FALSE; -+ memcpy(xf86ConfigLayout.screens[i].screen, oscreen, sizeof(confScreenRec)); -+ -+ cptr = xcalloc(1, sizeof(GDevRec)); -+ if (!cptr) -+ return FALSE; -+ memcpy(cptr, odev, sizeof(GDevRec)); -+ -+ cptr->identifier = Xprintf("Autoconfigured Video Device %s", driver); -+ cptr->driver = driver; -+ -+ /* now associate the new driver entry with the new screen entry */ -+ xf86ConfigLayout.screens[i].screen->device = cptr; -+ cptr->myScreenSection = xf86ConfigLayout.screens[i].screen; -+ -+ return TRUE; -+} -+ - GDevPtr - autoConfigDevice(GDevPtr preconf_device) - { - GDevPtr ptr = NULL; -+ char *matches[20]; /* If we have more than 20 drivers we're in trouble */ -+ int num_matches = 0, num_screens = 0, i; -+ screenLayoutPtr slp; +-xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR) ++xorgconfddir = $(sysconfdir)/X11/$(XF86CONFIGDIR) + xorgconfd_DATA = 10-evdev.conf - if (!xf86configptr) { - return NULL; -@@ -573,14 +604,59 @@ autoConfigDevice(GDevPtr preconf_device) - ptr->driver = NULL; - } - if (!ptr->driver) { -- ptr->driver = chooseVideoDriver(); -- } -+ /* get all possible video drivers and count them */ -+ listPossibleVideoDrivers(matches, 20); -+ for (; matches[num_matches]; num_matches++) { -+ xf86Msg(X_DEFAULT, "Matched %s as autoconfigured driver %d\n", -+ matches[num_matches], num_matches); -+ } -+ -+ slp = xf86ConfigLayout.screens; -+ if (slp) { -+ /* count the number of screens and make space for -+ * a new screen for each additional possible driver -+ * minus one for the already existing first one -+ * plus one for the terminating NULL */ -+ for (; slp[num_screens].screen; num_screens++); -+ xf86ConfigLayout.screens = xnfcalloc(num_screens + num_matches, -+ sizeof(screenLayoutRec)); -+ xf86ConfigLayout.screens[0] = slp[0]; -+ -+ /* do the first match and set that for the original first screen */ -+ ptr->driver = matches[0]; -+ if (!xf86ConfigLayout.screens[0].screen->device) { -+ xf86ConfigLayout.screens[0].screen->device = ptr; -+ ptr->myScreenSection = xf86ConfigLayout.screens[0].screen; -+ } -+ -+ /* for each other driver found, copy the first screen, insert it -+ * into the list of screens and set the driver */ -+ i = 0; -+ while (i++ < num_matches) { -+ if (!copyScreen(slp[0].screen, ptr, i, matches[i])) -+ return NULL; -+ } - -- /* TODO Handle multiple screen sections */ -- if (xf86ConfigLayout.screens && !xf86ConfigLayout.screens->screen->device) { -- xf86ConfigLayout.screens->screen->device = ptr; -- ptr->myScreenSection = xf86ConfigLayout.screens->screen; -+ /* shift the rest of the original screen list -+ * to the end of the current screen list -+ * -+ * TODO Handle rest of multiple screen sections */ -+ for (i = 1; i < num_screens; i++) { -+ xf86ConfigLayout.screens[i+num_matches] = slp[i]; -+ } -+ xf86ConfigLayout.screens[num_screens+num_matches-1].screen = NULL; -+ xfree(slp); -+ } else { -+ /* layout does not have any screens, not much to do */ -+ ptr->driver = matches[0]; -+ for (i = 1; matches[i] ; i++) { -+ if (matches[i] != matches[0]) { -+ xfree(matches[i]); -+ } -+ } -+ } - } -+ - xf86Msg(X_DEFAULT, "Assigned the driver to the xf86ConfigLayout\n"); - - return ptr; + else ++++++ xorg-server-1.7.99.902.tar.bz2 -> xorg-server-1.8.0.tar.bz2 ++++++ ++++ 5848 lines of diff (skipped) ++++++ xorg-server-xf4vnc.patch ++++++ --- /var/tmp/diff_new_pack.EoiKDH/_old 2010-04-03 00:10:42.000000000 +0200 +++ /var/tmp/diff_new_pack.EoiKDH/_new 2010-04-03 00:10:42.000000000 +0200 @@ -134,8 +134,7 @@ if XQUARTZ XQUARTZ_SUBDIRS = xquartz endif -@@ -32,10 +36,11 @@ - $(XVFB_SUBDIRS) \ +@@ -33,8 +37,9 @@ $(XNEST_SUBDIRS) \ $(DMX_SUBDIRS) \ + $(VNC_SUBDIRS) \ @@ -146,7 +145,6 @@ +DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive vnc relink: - for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done --- xorg-server-1.7.99/hw/dmx/Makefile.am +++ xorg-server-1.7.99/hw/dmx/Makefile.am @@ -1,6 +1,6 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-country for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at Sat Apr 3 00:11:16 CEST 2010. -------- --- yast2-country/yast2-country.changes 2010-04-01 13:31:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2010-04-02 08:45:43.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 2 08:38:51 CEST 2010 - jsuchome(a)suse.cz + +- CONSOLE_SCREENMAP="8859-13" for Lithuanian (bnc#566283) +- 2.19.11 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.19.10.tar.bz2 New: ---- yast2-country-2.19.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.PGTOMJ/_old 2010-04-03 00:10:27.000000000 +0200 +++ /var/tmp/diff_new_pack.PGTOMJ/_new 2010-04-03 00:10:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.19.10) +# spec file for package yast2-country (Version 2.19.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-country -Version: 2.19.10 +Version: 2.19.11 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.19.10.tar.bz2 +Source0: yast2-country-2.19.11.tar.bz2 Prefix: /usr @@ -79,7 +79,7 @@ timezone) for yast2. %prep -%setup -n yast2-country-2.19.10 +%setup -n yast2-country-2.19.11 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-country-2.19.10.tar.bz2 -> yast2-country-2.19.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.10/VERSION new/yast2-country-2.19.11/VERSION --- old/yast2-country-2.19.10/VERSION 2010-04-01 13:23:39.000000000 +0200 +++ new/yast2-country-2.19.11/VERSION 2010-04-02 08:45:04.000000000 +0200 @@ -1 +1 @@ -2.19.10 +2.19.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.10/console/data/consolefonts.ycp new/yast2-country-2.19.11/console/data/consolefonts.ycp --- old/yast2-country-2.19.10/console/data/consolefonts.ycp 2009-09-04 14:04:16.000000000 +0200 +++ new/yast2-country-2.19.11/console/data/consolefonts.ycp 2010-04-02 08:45:14.000000000 +0200 @@ -1,7 +1,7 @@ /* * Maintainer: Thomas Fehr <fehr(a)suse.de> * - * $Id: consolefonts.ycp 58522 2009-09-04 12:03:59Z jsuchome $ + * $Id: consolefonts.ycp 61578 2010-04-02 06:45:13Z jsuchome $ */ $[ @@ -84,9 +84,9 @@ "hu" : [ "lat2-16.psfu", "", "8859-2", "(K" ], "hu_HU.UTF-8" : [ "lat2-16.psfu", "", "8859-2", "(K" ], - "lt_LT" : [ "lat4a-16.psfu", "", "8859-4", "(K" ], - "lt" : [ "lat4a-16.psfu", "", "8859-4", "(K" ], - "lt_LT.UTF-8" : [ "lat4a-16.psfu", "", "8859-4", "(K" ], + "lt_LT" : [ "lat4a-16.psfu", "", "8859-13", "(K" ], + "lt" : [ "lat4a-16.psfu", "", "8859-13", "(K" ], + "lt_LT.UTF-8" : [ "lat4a-16.psfu", "", "8859-13", "(K" ], "ru_RU.KOI8-R" : [ "Cyr_a8x16.psfu", "", "koi2alt", "(K" ], "ru" : [ "Cyr_a8x16.psfu", "", "koi2alt", "(K" ], ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner191 for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package mozilla-xulrunner191 for openSUSE:Factory checked in at Sat Apr 3 00:10:23 CEST 2010. -------- --- mozilla-xulrunner191/mozilla-xulrunner191.changes 2010-02-17 22:18:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner191/mozilla-xulrunner191.changes 2010-04-02 13:09:44.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Mar 17 20:59:03 CET 2010 - wr(a)rosenauer.org + +- security update to version 1.9.1.9 (bnc#586567) + * MFSA 2010-16/CVE-2010-0173/CVE-2010-0174 + Crashes with evidence of memory corruption + * MFSA 2010-17/CVE-2010-0175 (bmo#540100,375928) + Remote code execution with use-after-free in nsTreeSelection + * MFSA 2010-18/CVE-2010-0176 (bmo#538308) + Dangling pointer vulnerability in nsTreeContentView + * MFSA 2010-19/CVE-2010-0177 (bmo#538310) + Dangling pointer vulnerability in nsPluginArray + * MFSA 2010-20/CVE-2010-0178 (bmo#546909) + Chrome privilege escalation via forced URL drag and drop + * MFSA 2010-22/CVE-2009-3555 (bmo#545755) + Update NSS to support TLS renegotiation indication + * MFSA 2010-23/CVE-2010-0181 (bmo#452093) + Image src redirect to mailto: URL opens email editor + * MFSA 2010-24/CVE-2010-0182 (bmo#490790) + XMLDocument::load() doesn't check nsIContentPolicy +- clean up correctly on update (bnc#589094) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-1.9.1.8.tar.bz2 mozilla-clipboard.patch xulrunner-source-1.9.1.8.tar.bz2 New: ---- l10n-1.9.1.9.tar.bz2 xulrunner-source-1.9.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner191.spec ++++++ --- /var/tmp/diff_new_pack.huNaZ3/_old 2010-04-03 00:10:10.000000000 +0200 +++ /var/tmp/diff_new_pack.huNaZ3/_new 2010-04-03 00:10:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner191 (Version 1.9.1.8) +# spec file for package mozilla-xulrunner191 (Version 1.9.1.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006-2010 Wolfgang Rosenauer @@ -36,7 +36,7 @@ #BuildRequires: libproxy-devel #%endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.1.8 +Version: 1.9.1.9 Release: 1 Summary: Mozilla Runtime Environment 1.9.1 Url: http://www.mozilla.org @@ -66,7 +66,6 @@ Patch3: mozilla-pkgconfig.patch Patch4: idldir.patch Patch5: mozilla-path_len.patch -Patch6: mozilla-clipboard.patch Patch7: mozilla-nongnome-proxies.patch Patch8: mozilla-helper-app.patch Patch9: mozilla-system-hunspell.patch.bz2 @@ -94,10 +93,10 @@ %if %suse_version > 1110 %define has_system_cairo 1 %endif -%define releasedate 2010020400 +%define releasedate 2010031700 %define version_internal %{version} %define apiversion 1.9.1 -%define uaweight 191080 +%define uaweight 191090 ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -108,7 +107,7 @@ Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) %endif %if %has_system_nss -BuildRequires: mozilla-nss-devel >= 3.12.3 +BuildRequires: mozilla-nss-devel >= 3.12.6 Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %endif Recommends: %{name}-gnomevfs @@ -202,7 +201,6 @@ %patch3 -p1 %patch4 %patch5 -p1 -%patch6 -p1 %patch7 %patch8 -p1 pushd extensions @@ -515,6 +513,8 @@ %{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so %{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so %{_libdir}/xulrunner-%{version_internal}/components/libsystem-pref-gconf.so +%dir %{_libdir}/xulrunner-%{version_internal}/ +%dir %{_libdir}/xulrunner-%{version_internal}/chrome/ %files -n python-xpcom191 %defattr(-,root,root) @@ -524,13 +524,18 @@ %{_libdir}/xulrunner-%{version_internal}/components/pyabout.py %{py_sitedir}/nsdom/ %{py_sitedir}/xpcom/ + %if %localize %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) +%dir %{_libdir}/xulrunner-%{version_internal}/ +%dir %{_libdir}/xulrunner-%{version_internal}/chrome/ %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) +%dir %{_libdir}/xulrunner-%{version_internal}/ +%dir %{_libdir}/xulrunner-%{version_internal}/chrome/ %endif %changelog ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.huNaZ3/_old 2010-04-03 00:10:10.000000000 +0200 +++ /var/tmp/diff_new_pack.huNaZ3/_new 2010-04-03 00:10:10.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_5_8_RELEASE" -VERSION="1.9.1.8" +RELEASE_TAG="FIREFOX_3_5_9_RELEASE" +VERSION="1.9.1.9" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.1 mozilla ++++++ l10n-1.9.1.8.tar.bz2 -> l10n-1.9.1.9.tar.bz2 ++++++ mozilla-xulrunner191/l10n-1.9.1.8.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner191/l10n-1.9.1.9.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.1.8.tar.bz2 -> xulrunner-source-1.9.1.9.tar.bz2 ++++++ mozilla-xulrunner191/xulrunner-source-1.9.1.8.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner191/xulrunner-source-1.9.1.9.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit enchant for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package enchant for openSUSE:Factory checked in at Sat Apr 3 00:10:13 CEST 2010. -------- --- GNOME/enchant/enchant.changes 2009-05-24 14:30:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/enchant/enchant.changes 2010-04-02 19:30:24.000000000 +0200 @@ -1,0 +2,32 @@ +Fri Apr 2 19:11:59 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 1.6.0: + + Add a function to get enchant's version (enchant_get_version) + + Disable zemberek plugin by default, as it's known to cause + issues/crashes with WebKit + + Fix Win32 DLL dependency not found popup occurs when module has + unmet dependencies + + Possibly fix lp#474062 + + Fix Registry handle not closed in enchant_get_registry_value_ex + + Fix Leak in _enchant_get_user_home_dirs() on Windows + + Update FSF address + + Fix Zemberek module listing a Turkish dictionary even without + Zemberek installed + + Don't assert if passed a null string list + + Fix enchant_pwl_init_with_file truncating pwl file + + Fix a double-free memory corruption bug + + Fix some small memory leaks + + Fix mis-acceptence of dictionaries which start with a partial + match of the lang id + + Fix enchant always looking in "lib" dir for plugins + + Fix the build with the MSVC compiler + + Add a --with-system-myspell option + + Package missing compile-resource file + + Compare paths ignoring case sensitivity on windows +- Drop libmalaga-devel BuildRequires. +- Pass --enable-zemberek to configure: it's in a subpackage for us, + so we can keep it even if it's experimental. +- Explicitly list the backends in the file list to make sure we + don't lose some of them by accident. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- enchant-1.5.0.tar.bz2 New: ---- enchant-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enchant.spec ++++++ --- /var/tmp/diff_new_pack.KTNMjp/_old 2010-04-03 00:09:36.000000000 +0200 +++ /var/tmp/diff_new_pack.KTNMjp/_new 2010-04-03 00:09:36.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package enchant (Version 1.5.0) +# spec file for package enchant (Version 1.6.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 @@ -19,30 +19,27 @@ Name: enchant -BuildRequires: aspell-devel dbus-1-glib-devel gcc-c++ glib2-devel hunspell-devel libvoikko-devel -# FIXME: Delete before submit. Will be fixed after malaga checkin. -BuildRequires: libmalaga-devel -License: LGPL v2.1 or later -Group: Productivity/Text/Spell -Version: 1.5.0 +Version: 1.6.0 Release: 1 +License: LGPLv2.1+ Summary: Generic Spell Checking Library -Source: %{name}-%{version}.tar.bz2 +Group: Productivity/Text/Spell Url: http://www.abisource.com/ +Source: %{name}-%{version}.tar.bz2 +BuildRequires: aspell-devel +BuildRequires: dbus-1-glib-devel +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: hunspell-devel +BuildRequires: libvoikko-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A library providing an efficient extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod(a)hotmail.com> - %package voikko -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Generic Spell Checking Library - Voikko Plugin Group: Productivity/Text/Spell Provides: locale(%{name}:fi) @@ -52,14 +49,8 @@ extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod(a)hotmail.com> - %package zemberek -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Generic Spell Checking Library - Zemberek Plugin Group: Productivity/Text/Spell Provides: locale(%{name}:az) @@ -74,14 +65,8 @@ providing an efficient extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod(a)hotmail.com> - %package -n libenchant1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Generic Spell Checking Library Group: System/Libraries Requires: %{name} = %{version} @@ -90,14 +75,8 @@ A library providing an efficient extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod(a)hotmail.com> - %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: %{name} = %{version} glib2-devel libstdc++-devel @@ -106,28 +85,23 @@ This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - Dom Lachowicz <cinamod(a)hotmail.com> - %prep %setup -q %build %configure --with-pic \ - --disable-static + --disable-static \ + --enable-zemberek make %{?jobs:-j%jobs} %install %makeinstall %if %suse_version > 1110 -find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + +find %{buildroot} -type f -name "*.la" -delete -print %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n libenchant1 -p /sbin/ldconfig @@ -140,9 +114,10 @@ %defattr (-, root, root) %{_bindir}/* %{_datadir}/enchant -%{_libdir}/enchant -%exclude %{_libdir}/enchant/libenchant_voikko.so -%exclude %{_libdir}/enchant/libenchant_zemberek.so +%dir %{_libdir}/enchant +%{_libdir}/enchant/libenchant_aspell.so +%{_libdir}/enchant/libenchant_ispell.so +%{_libdir}/enchant/libenchant_myspell.so %doc %{_mandir}/man?/*.* %files voikko ++++++ enchant-1.5.0.tar.bz2 -> enchant-1.6.0.tar.bz2 ++++++ ++++ 7621 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/COPYING.LIB new/enchant-1.6.0/COPYING.LIB --- old/enchant-1.5.0/COPYING.LIB 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/COPYING.LIB 2010-04-01 22:53:37.000000000 +0200 @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/Makefile.am new/enchant-1.6.0/Makefile.am --- old/enchant-1.5.0/Makefile.am 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/Makefile.am 2010-04-01 22:53:37.000000000 +0200 @@ -10,6 +10,7 @@ enchant.spec.in \ enchant.spec \ lt-compile-resource \ + compile-resource \ README \ TODO \ HACKING \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/README new/enchant-1.6.0/README --- old/enchant-1.5.0/README 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/README 2010-04-01 22:53:37.000000000 +0200 @@ -39,7 +39,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/compile-resource new/enchant-1.6.0/compile-resource --- old/enchant-1.5.0/compile-resource 1970-01-01 01:00:00.000000000 +0100 +++ new/enchant-1.6.0/compile-resource 2010-04-01 22:53:37.000000000 +0200 @@ -0,0 +1,46 @@ +#!/bin/sh + +# Script to compile a resource file for a DLL if there is a .rc file +# for it. The resource source file is supposed to contain a version +# info section, that uses the string BUILDNUMBER as the least +# significant part of the version numbers. This script replaces that +# string with a "build number" before compiling the binary resource +# file. The build number is kept between builds in a "stamp" file, and +# incremented each time. (If there is no stamp file, build number 0 is +# used.) The intention is that only the "official" maintainer of a DLL +# keeps such a stamp file, and thus the DLLs he releases have +# increasing version number resources, which can be used by an +# installer program to decide whether to replace an existing DLL with +# the same name. + +# This is just my (tml(a)iki.fi) idea, if somebody comes up with a +# better way to generate version number resources, don't hesitate to +# suggest. + +# The command line arguments are: +# $1: the name of the .rc file to check +# $2: the name of the resource object file to produce, if the rc file exists + +# Check if we have a resource file for this DLL. +rcfile=$1 +resfile=$2 +if [ -f $rcfile ]; then + # Check if we have a build number stamp file. + basename=`basename $rcfile .rc` + if [ -f $basename-build.stamp ]; then + read number <$basename-build.stamp + buildnumber=$[number] + echo Build number $buildnumber + rm -rf $basename-build.stamp + else + echo Using zero as build number + buildnumber=0 + fi + + m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc && + ${WINDRES-windres} $$.rc $resfile && + rm $$.rc +else + # Return failure + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/configure.in new/enchant-1.6.0/configure.in --- old/enchant-1.5.0/configure.in 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/configure.in 2010-04-01 22:56:07.000000000 +0200 @@ -8,7 +8,7 @@ ENCHANT_MAJOR_VERSION=1 dnl 4a) 5) Increment when adding interfaces. dnl 6) Set to zero when removing or changing interfaces. -ENCHANT_MINOR_VERSION=5 +ENCHANT_MINOR_VERSION=6 dnl 3) Increment when interfaces not changed at all, dnl only bug fixes or internal changes made. dnl 4b) Set to zero when adding, removing or changing interfaces. @@ -295,9 +295,15 @@ fi MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'" -PKG_CHECK_MODULES(MYSPELL, [hunspell], have_system_myspell=true, have_system_myspell=false) -AC_SUBST(MYSPELL_CFLAGS) -AC_SUBST(MYSPELL_LIBS) + +AC_ARG_WITH(system-myspell, AS_HELP_STRING([--with-system-myspell=yes/no],[use the system myspell/hunspell @<:@default=auto@:>@])) +if test "x$with_system_myspell" != "xno"; then + PKG_CHECK_MODULES(MYSPELL, [hunspell], have_system_myspell=true, have_system_myspell=false) + AC_SUBST(MYSPELL_CFLAGS) + AC_SUBST(MYSPELL_LIBS) +else + have_system_myspell=false; +fi AM_CONDITIONAL(WITH_SYSTEM_MYSPELL, test "x$have_system_myspell" = "xtrue") check_aspell=yes @@ -457,9 +463,9 @@ AM_CONDITIONAL(WITH_HSPELL, test "$build_hspell" = yes) -build_zemberek=yes +build_zemberek=no -AC_ARG_ENABLE(zemberek, AS_HELP_STRING([--disable-zemberek],[enable the zemberek backend @<:@default=auto@:>@]), build_zemberek="$enableval", build_zemberek=yes) +AC_ARG_ENABLE(zemberek, AS_HELP_STRING([--disable-zemberek],[enable the experimental zemberek (turkish) backend @<:@default=auto@:>@]), build_zemberek="$enableval", build_zemberek=no) if test "x$have_cxx" = "xno"; then build_zemberek=no @@ -522,6 +528,11 @@ Build Hspell backend: ${build_hspell} Build Myspell/Hunspell backend: ${build_myspell} Build Voikko backend: ${build_voikko} - Build Zemberek backend: ${build_zemberek} - Build a relocatable library: ${relocatable_library} -" + Build Zemberek backend: ${build_zemberek} + Build a relocatable library: ${relocatable_library}" + +if test "x$build_zemberek" = "xyes"; then + echo " +The Zemberek Turkish spell-checking plugin is enabled. It is known +to cause crashes with WebKit. Use at your own discretion." +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/enchant.spec new/enchant-1.6.0/enchant.spec --- old/enchant-1.5.0/enchant.spec 2009-05-23 11:44:52.000000000 +0200 +++ new/enchant-1.6.0/enchant.spec 2010-04-01 22:56:46.000000000 +0200 @@ -1,5 +1,5 @@ %define name enchant -%define version 1.5.0 +%define version 1.6.0 %define release 1 Summary: An Enchanting Spell Checking Library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/missing new/enchant-1.6.0/missing --- old/enchant-1.5.0/missing 2009-05-23 11:44:34.000000000 +0200 +++ new/enchant-1.6.0/missing 2010-04-01 22:56:37.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/Makefile.am new/enchant-1.6.0/src/Makefile.am --- old/enchant-1.5.0/src/Makefile.am 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/Makefile.am 2010-04-01 22:53:37.000000000 +0200 @@ -1,6 +1,6 @@ SUBDIRS=. aspell ispell uspell myspell hspell applespell voikko zemberek -INCLUDES=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 +INCLUDES=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 -DENCHANT_VERSION_STRING=\"@ENCHANT_MAJOR_VERSION@.@ENCHANT_MINOR_VERSION@.@ENCHANT_MICRO_VERSION@\" lib_LTLIBRARIES = libenchant.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/applespell/applespell_checker.h new/enchant-1.6.0/src/applespell/applespell_checker.h --- old/enchant-1.5.0/src/applespell/applespell_checker.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/applespell/applespell_checker.h 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * 02110-1301, USA. */ #import <Cocoa/Cocoa.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/applespell/applespell_checker.mm new/enchant-1.6.0/src/applespell/applespell_checker.mm --- old/enchant-1.5.0/src/applespell/applespell_checker.mm 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/applespell/applespell_checker.mm 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * 02110-1301, USA. */ #include <glib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/aspell/aspell_provider.c new/enchant-1.6.0/src/aspell/aspell_provider.c --- old/enchant-1.5.0/src/aspell/aspell_provider.c 2009-05-23 11:44:14.000000000 +0200 +++ new/enchant-1.6.0/src/aspell/aspell_provider.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant++.h new/enchant-1.6.0/src/enchant++.h --- old/enchant-1.5.0/src/enchant++.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant++.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant-provider.h new/enchant-1.6.0/src/enchant-provider.h --- old/enchant-1.5.0/src/enchant-provider.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant-provider.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant.c new/enchant-1.6.0/src/enchant.c --- old/enchant-1.5.0/src/enchant.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -106,10 +106,15 @@ /********************************************************************************/ /********************************************************************************/ +#ifdef _WIN32 +#define path_cmp g_utf8_collate +#else +#define path_cmp strcmp +#endif -static GSList* enchant_slist_prepend_unique_string (GSList *slist, gchar* data) +static GSList* enchant_slist_prepend_unique_path (GSList *slist, gchar* data) { - if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)strcmp)) + if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)path_cmp)) { return g_slist_prepend (slist, data); } @@ -120,9 +125,9 @@ } } -static GSList* enchant_slist_append_unique_string (GSList *slist, gchar* data) +static GSList* enchant_slist_append_unique_path (GSList *slist, gchar* data) { - if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)strcmp)) + if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)path_cmp)) { return g_slist_append (slist, data); } @@ -138,14 +143,15 @@ { GSList *dirs = NULL; const char* home_dir; + char *tmp; - home_dir = enchant_get_registry_value_ex (1, "Config", "Home_Dir"); - if (home_dir) - dirs = enchant_slist_append_unique_string (dirs, g_strdup (home_dir)); + tmp = enchant_get_registry_value_ex (1, "Config", "Home_Dir"); + if (tmp) + dirs = enchant_slist_append_unique_path (dirs, tmp); home_dir = g_get_home_dir (); if (home_dir) - dirs = enchant_slist_append_unique_string (dirs, g_strdup (home_dir)); + dirs = enchant_slist_append_unique_path (dirs, g_strdup (home_dir)); return dirs; } @@ -171,7 +177,7 @@ user_config_dir = g_get_user_config_dir(); if (user_config_dir) - user_dirs = enchant_slist_append_unique_string (user_dirs, g_build_filename (user_config_dir, + user_dirs = enchant_slist_append_unique_path (user_dirs, g_build_filename (user_config_dir, "enchant", NULL)); } @@ -182,7 +188,7 @@ for (dir = home_dirs; dir; dir = dir->next) { - user_dirs = enchant_slist_append_unique_string (user_dirs, + user_dirs = enchant_slist_append_unique_path (user_dirs, g_build_filename (dir->data, ENCHANT_USER_PATH_EXTENSION, NULL)); @@ -209,11 +215,11 @@ user_module_dir = enchant_get_registry_value_ex (1, "Config", "Module_Dir"); if (user_module_dir) - module_dirs = enchant_slist_append_unique_string (module_dirs, user_module_dir); + module_dirs = enchant_slist_append_unique_path (module_dirs, user_module_dir); } #ifdef XP_TARGET_COCOA - module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup ([[EnchantResourceProvider instance] moduleFolder])); + module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup ([[EnchantResourceProvider instance] moduleFolder])); #endif { @@ -222,7 +228,7 @@ user_dirs = enchant_get_user_dirs(); for (iter = user_dirs; iter; iter = iter->next) - module_dirs = enchant_slist_append_unique_string (module_dirs, iter->data); + module_dirs = enchant_slist_append_unique_path (module_dirs, iter->data); g_slist_free (user_dirs); } @@ -230,19 +236,19 @@ /* Look for explicitly set registry values */ module_dir = enchant_get_registry_value_ex (0, "Config", "Module_Dir"); if (module_dir) - module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir); + module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir); +#if defined(ENCHANT_GLOBAL_MODULE_DIR) + module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR)); +#else /* Dynamically locate library and search for modules relative to it. */ prefix = enchant_get_prefix_dir(); if(prefix) { module_dir = g_build_filename(prefix,"lib","enchant",NULL); g_free(prefix); - module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir); + module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir); } - -#if defined(ENCHANT_GLOBAL_MODULE_DIR) - module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR)); #endif return module_dirs; @@ -258,19 +264,19 @@ for (iter = user_conf_dirs; iter != NULL; iter = iter->next) { - conf_dirs = enchant_slist_append_unique_string (conf_dirs, iter->data); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, iter->data); } g_slist_free (user_conf_dirs); #ifdef XP_TARGET_COCOA - conf_dirs = enchant_slist_append_unique_string (conf_dirs, g_strdup ([[EnchantResourceProvider instance] configFolder])); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup ([[EnchantResourceProvider instance] configFolder])); #endif /* Look for explicitly set registry values */ ordering_dir = enchant_get_registry_value_ex (0, "Config", "Data_Dir"); if (ordering_dir) - conf_dirs = enchant_slist_append_unique_string (conf_dirs, ordering_dir); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir); /* Dynamically locate library and search for files relative to it. */ prefix = enchant_get_prefix_dir(); @@ -278,11 +284,11 @@ { ordering_dir = g_build_filename(prefix,"share","enchant",NULL); g_free(prefix); - conf_dirs = enchant_slist_append_unique_string (conf_dirs, ordering_dir); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir); } #if defined(ENCHANT_GLOBAL_ORDERING) - conf_dirs = enchant_slist_append_unique_string (conf_dirs, g_strdup (ENCHANT_GLOBAL_ORDERING)); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup (ENCHANT_GLOBAL_ORDERING)); #endif return conf_dirs; @@ -346,7 +352,7 @@ user_config = enchant_get_registry_value_ex (1, "Config", "Data_Dir"); if (user_config) - dirs = enchant_slist_prepend_unique_string (dirs, user_config); + dirs = enchant_slist_prepend_unique_path (dirs, user_config); return dirs; } @@ -388,6 +394,7 @@ wszValue = g_new0(WCHAR, dwSize + 1); RegQueryValueExW(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize); } + RegCloseKey(hKey); } if(wszValue && *wszValue) @@ -1270,7 +1277,6 @@ EnchantSession * session; g_return_if_fail (dict); - g_return_if_fail (string_list); session = ((EnchantDictPrivateData*)dict->enchant_private_data)->session; enchant_session_clear_error (session); g_strfreev(string_list); @@ -1417,6 +1423,10 @@ if ((entry_len > g_module_suffix_len) && !strcmp(dir_entry+(entry_len-g_module_suffix_len), G_MODULE_SUFFIX)) { +#ifdef _WIN32 + /* Suppress error popups for failing to load plugins */ + UINT old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS); +#endif filename = g_build_filename (dir_name, dir_entry, NULL); module = g_module_open (filename, (GModuleFlags) 0); @@ -1451,6 +1461,10 @@ } g_free (filename); +#ifdef _WIN32 + /* Restore the original error mode */ + SetErrorMode(old_error_mode); +#endif } if (provider) { @@ -1610,11 +1624,13 @@ EnchantDict *dict; EnchantProvider *owner; EnchantSession *session; + EnchantDictPrivateData *enchant_dict_private_data; g_return_if_fail (data); dict = (EnchantDict *) data; - session = ((EnchantDictPrivateData*)dict->enchant_private_data)->session; + enchant_dict_private_data = (EnchantDictPrivateData*)dict->enchant_private_data; + session = enchant_dict_private_data->session; owner = session->provider; if (owner && owner->dispose_dict) @@ -1622,6 +1638,8 @@ else if(session->is_pwl) g_free (dict); + g_free(enchant_dict_private_data); + enchant_session_destroy (session); } @@ -1719,7 +1737,7 @@ * @pwl: A non-null pathname in the GLib file name encoding (UTF-8 on Windows) * to the personal wordlist file * - * Returns: + * Returns: An EnchantDict. This dictionary is reference counted. */ ENCHANT_MODULE_EXPORT (EnchantDict *) enchant_broker_request_pwl_dict (EnchantBroker * broker, const char *const pwl) @@ -1814,7 +1832,7 @@ * @broker: A non-null #EnchantBroker * @tag: The non-null language tag you wish to request a dictionary for ("en_US", "de_DE", ...) * - * Returns: An #EnchantDict, or %null if no suitable dictionary could be found. + * Returns: An #EnchantDict, or %null if no suitable dictionary could be found. This dictionary is reference counted. */ ENCHANT_MODULE_EXPORT (EnchantDict *) enchant_broker_request_dict (EnchantBroker * broker, const char *const tag) @@ -2312,3 +2330,8 @@ return dirs; } + +ENCHANT_MODULE_EXPORT(char *) +enchant_get_version (void) { + return ENCHANT_VERSION_STRING; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant.h new/enchant-1.6.0/src/enchant.h --- old/enchant-1.5.0/src/enchant.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -51,6 +51,10 @@ typedef struct str_enchant_broker EnchantBroker; typedef struct str_enchant_dict EnchantDict; +/* const */ +ENCHANT_MODULE_EXPORT (char *) + enchant_get_version (void); + ENCHANT_MODULE_EXPORT (EnchantBroker *) enchant_broker_init (void); ENCHANT_MODULE_EXPORT (void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/hspell/hspell_provider.c new/enchant-1.6.0/src/hspell/hspell_provider.c --- old/enchant-1.5.0/src/hspell/hspell_provider.c 2009-05-23 11:44:14.000000000 +0200 +++ new/enchant-1.6.0/src/hspell/hspell_provider.c 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz and Yaacov Zamir * give permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/correct.cpp new/enchant-1.6.0/src/ispell/correct.cpp --- old/enchant-1.5.0/src/ispell/correct.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/correct.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * correct.c - Routines to manage the higher-level aspects of spell-checking * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/good.cpp new/enchant-1.6.0/src/ispell/good.cpp --- old/enchant-1.5.0/src/ispell/good.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/good.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * good.c - see if a word or its root word * is in the dictionary. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/hash.cpp new/enchant-1.6.0/src/ispell/hash.cpp --- old/enchant-1.5.0/src/ispell/hash.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/hash.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * hash.c - a simple hash function for ispell * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell.h new/enchant-1.6.0/src/ispell/ispell.h --- old/enchant-1.5.0/src/ispell/ispell.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,40 +1,11 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - #ifndef ISPELL_H #define ISPELL_H #include <sys/types.h> /* - * $Id: ispell.h 20792 2003-08-14 17:51:30Z dom $ + * $Id: ispell.h 28601 2010-01-11 12:40:00Z dom $ */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell_checker.cpp new/enchant-1.6.0/src/ispell/ispell_checker.cpp --- old/enchant-1.5.0/src/ispell/ispell_checker.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell_checker.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -465,11 +436,11 @@ if (prefstringchar < 0) { - std::string teststring; + char teststring[64]; for(int n1 = 1; n1 <= 15; n1++) { - teststring = "latin" + n1; - prefstringchar = findfiletype(teststring.c_str(), 1, + sprintf(teststring, "latin%d", n1); + prefstringchar = findfiletype(teststring, 1, deftflag < 0 ? &deftflag : static_cast<int *>(NULL)); if (prefstringchar >= 0) break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell_checker.h new/enchant-1.6.0/src/ispell/ispell_checker.h --- old/enchant-1.5.0/src/ispell/ispell_checker.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell_checker.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - #ifndef ISPELL_CHECKER_H #define ISPELL_CHECKER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell_def.h new/enchant-1.6.0/src/ispell/ispell_def.h --- old/enchant-1.5.0/src/ispell/ispell_def.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell_def.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* largest word accepted from a file by any input routine, plus one */ #ifndef INPUTWORDLEN #define INPUTWORDLEN 100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/lookup.cpp new/enchant-1.6.0/src/ispell/lookup.cpp --- old/enchant-1.5.0/src/ispell/lookup.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/lookup.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * lookup.c - see if a word appears in the dictionary * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/makedent.cpp new/enchant-1.6.0/src/ispell/makedent.cpp --- old/enchant-1.5.0/src/ispell/makedent.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/makedent.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * Copyright 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA * All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/msgs.h new/enchant-1.6.0/src/ispell/msgs.h --- old/enchant-1.5.0/src/ispell/msgs.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/msgs.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,35 +1,6 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* - * $Id: msgs.h 20792 2003-08-14 17:51:30Z dom $ + * $Id: msgs.h 28601 2010-01-11 12:40:00Z dom $ * * Copyright 1992, 1993, Geoff Kuenning, Granada Hills, CA * All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/sp_spell.h new/enchant-1.6.0/src/ispell/sp_spell.h --- old/enchant-1.5.0/src/ispell/sp_spell.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/sp_spell.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,32 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version.* - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - #ifndef SPELL_H #define SPELL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/tgood.cpp new/enchant-1.6.0/src/ispell/tgood.cpp --- old/enchant-1.5.0/src/ispell/tgood.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/tgood.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * Copyright 1987, 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA * All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/myspell/myspell_checker.cpp new/enchant-1.6.0/src/myspell/myspell_checker.cpp --- old/enchant-1.5.0/src/myspell/myspell_checker.cpp 2009-05-23 11:44:14.000000000 +0200 +++ new/enchant-1.6.0/src/myspell/myspell_checker.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -38,6 +38,10 @@ #include "enchant.h" #include "enchant-provider.h" +#ifdef near +#undef near +#endif + /* built against hunspell 1.2.2 on 2008-04-12 */ #ifdef HUNSPELL_STATIC @@ -341,6 +345,27 @@ return g_file_test(aff.c_str(), G_FILE_TEST_EXISTS) != 0; } +static bool is_plausible_dict_for_tag(const char *dir_entry, const char *tag) +{ + const char *dic_suffix = ".dic"; + size_t dic_suffix_len = strlen(dic_suffix); + size_t dir_entry_len = strlen(dir_entry); + size_t tag_len = strlen(tag); + + if (dir_entry_len - dic_suffix_len < tag_len) + return false; + if (strcmp(dir_entry+dir_entry_len-dic_suffix_len, dic_suffix) != 0) + return false; + if (strncmp (dir_entry, tag, tag_len) != 0) + return false; + //e.g. requested dict for "fi", + //reject "fil_PH.dic" + //allow "fi-FOO.dic", "fi_FOO.dic", "fi.dic", etc. + if (!ispunct(dir_entry[tag_len])) + return false; + return true; +} + static char * myspell_request_dictionary (EnchantBroker * broker, const char * tag) { @@ -364,8 +389,7 @@ if (dir) { const char *dir_entry; while ((dir_entry = g_dir_read_name (dir)) != NULL) { - if (strncmp (dir_entry, tag, strlen(tag)) == 0 && - strstr (dir_entry, ".dic") != NULL) { + if (is_plausible_dict_for_tag(dir_entry, tag)) { char *dict = g_build_filename (dirs[i].c_str(), dir_entry, NULL); if(s_hasCorrespondingAffFile(dict)){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/pwl.c new/enchant-1.6.0/src/pwl.c --- old/enchant-1.5.0/src/pwl.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/pwl.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -264,7 +264,7 @@ g_return_val_if_fail (file != NULL, NULL); - fd = enchant_fopen(file, "wb"); + fd = enchant_fopen(file, "ab+"); if(fd == NULL) { return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/pwl.h new/enchant-1.6.0/src/pwl.h --- old/enchant-1.5.0/src/pwl.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/pwl.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/uspell/uspell_provider.cpp new/enchant-1.6.0/src/uspell/uspell_provider.cpp --- old/enchant-1.5.0/src/uspell/uspell_provider.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/uspell/uspell_provider.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/voikko/voikko_provider.c new/enchant-1.6.0/src/voikko/voikko_provider.c --- old/enchant-1.5.0/src/voikko/voikko_provider.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/voikko/voikko_provider.c 2010-04-01 22:53:37.000000000 +0200 @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/zemberek/zemberek.cpp new/enchant-1.6.0/src/zemberek/zemberek.cpp --- old/enchant-1.5.0/src/zemberek/zemberek.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/zemberek/zemberek.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -43,10 +43,11 @@ g_error_free (Error); return false; } - proxy = dbus_g_proxy_new_for_name (connection, + proxy = dbus_g_proxy_new_for_name_owner (connection, "net.zemberekserver.server.dbus", "/net/zemberekserver/server/dbus/ZemberekDbus", - "net.zemberekserver.server.dbus.ZemberekDbusInterface"); + "net.zemberekserver.server.dbus.ZemberekDbusInterface", + &Error); dbus_g_connection_unref (connection); if (proxy == NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/zemberek/zemberek.h new/enchant-1.6.0/src/zemberek/zemberek.h --- old/enchant-1.5.0/src/zemberek/zemberek.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/zemberek/zemberek.h 2010-04-01 22:53:37.000000000 +0200 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/zemberek/zemberek_provider.cpp new/enchant-1.6.0/src/zemberek/zemberek_provider.cpp --- old/enchant-1.5.0/src/zemberek/zemberek_provider.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/zemberek/zemberek_provider.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/enchant-ispell.c new/enchant-1.6.0/tests/enchant-ispell.c --- old/enchant-1.5.0/tests/enchant-ispell.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/enchant-ispell.c 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -431,6 +431,8 @@ do_mode_a (out, dict, word, pos, lineCount); else if (mode == MODE_L) do_mode_l (out, dict, word, lineCount); + + g_string_free(word, TRUE); } if (token_ptr) g_slist_free (token_ptr); @@ -446,8 +448,6 @@ enchant_broker_free_dict (broker, dict); enchant_broker_free (broker); - if (word) - g_string_free (word, TRUE); g_string_free (str, TRUE); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/enchant-lsmod.c new/enchant-1.6.0/tests/enchant-lsmod.c --- old/enchant-1.5.0/tests/enchant-lsmod.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/enchant-lsmod.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/test-enchant.c new/enchant-1.6.0/tests/test-enchant.c --- old/enchant-1.5.0/tests/test-enchant.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/test-enchant.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/test-enchantxx.cpp new/enchant-1.6.0/tests/test-enchantxx.cpp --- old/enchant-1.5.0/tests/test-enchantxx.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/test-enchantxx.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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