openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2006
- 2 participants
- 1318 discussions
Hello community,
here is the log from the commit of package xmlto
checked in at Tue Aug 29 00:13:49 CEST 2006.
--------
--- xmlto/xmlto.changes 2006-01-25 21:43:15.000000000 +0100
+++ xmlto/xmlto.changes 2006-08-28 11:38:20.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 28 11:37:03 CEST 2006 - ke(a)suse.de
+
+- Fix find argument sequence; reported by Marcus Rueckert [#201749].
+
+-------------------------------------------------------------------
New:
----
xmlto-find-cmd.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlto.spec ++++++
--- /var/tmp/diff_new_pack.CsDYlx/_old 2006-08-29 00:13:14.000000000 +0200
+++ /var/tmp/diff_new_pack.CsDYlx/_new 2006-08-29 00:13:14.000000000 +0200
@@ -1,11 +1,11 @@
#
# spec file for package xmlto (Version 0.0.18)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -14,7 +14,7 @@
BuildRequires: docbook-xsl-stylesheets libxslt sgml-skel
Summary: Tool for Converting XML Files to Various Formats
Version: 0.0.18
-Release: 30
+Release: 43
License: GPL
Group: Productivity/Publishing/XML
URL: http://cyberelk.net/tim/xmlto/
@@ -22,6 +22,7 @@
Source10: %{name}-README.SuSE
Patch: xmlto-nonvoid.patch
Patch1: xmlto-0.0.18-overflow.patch
+Patch2: xmlto-find-cmd.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# We rely entirely on the DocBook XSL stylesheets!
Requires: docbook-xsl-stylesheets >= 1.56.0
@@ -40,7 +41,7 @@
%prep
%setup -q
%patch
-%patch -p 1 -P 1
+%patch -p 1 -P 1 -p 1 -P 2
cp %{S:10} README.SuSE
%build
@@ -50,7 +51,6 @@
%install
rm -rf %{buildroot}
-
%makeinstall
[ -d %{buildroot}%{_datadir}/xmlto/xsl ] || \
mkdir %{buildroot}%{_datadir}/xmlto/xsl
@@ -66,6 +66,8 @@
%{_datadir}/xmlto
%changelog -n xmlto
+* Mon Aug 28 2006 - ke(a)suse.de
+- Fix find argument sequence; reported by Marcus Rueckert [#201749].
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Thu Sep 29 2005 - dmueller(a)suse.de
++++++ xmlto-find-cmd.diff ++++++
--- xmlto-0.0.18/xmlto.in.~1~ 2004-01-02 13:03:24.000000000 +0100
+++ xmlto-0.0.18/xmlto.in 2006-08-28 11:39:28.000000000 +0200
@@ -47,7 +47,7 @@
EOF
if [ -d "$FORMAT_DIR" ]
then
- for source in $(${FIND} "$FORMAT_DIR" -type d -maxdepth 1)
+ for source in $(${FIND} "$FORMAT_DIR" -maxdepth 1 -type d)
do
if [ "$source" = "$FORMAT_DIR" ]; then continue; fi
Diff finished. Mon Aug 28 11:39:45 2006
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package udev
checked in at Tue Aug 29 00:13:07 CEST 2006.
--------
--- udev/udev.changes 2006-08-24 10:42:16.000000000 +0200
+++ udev/udev.changes 2006-08-28 09:28:11.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 28 09:27:56 CEST 2006 - aj(a)suse.de
+
+- Prerequire pidof since it's needed in %pre section.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ udev.spec ++++++
--- /var/tmp/diff_new_pack.Ssk9PJ/_old 2006-08-29 00:12:26.000000000 +0200
+++ /var/tmp/diff_new_pack.Ssk9PJ/_new 2006-08-29 00:12:26.000000000 +0200
@@ -13,11 +13,11 @@
Name: udev
URL: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
Version: 098
-Release: 1
+Release: 2
License: GPL
Group: System/Kernel
Summary: A Rule-Based Device Node and Kernel Event Manager
-PreReq: /bin/rm %insserv_prereq %fillup_prereq
+PreReq: /bin/pidof /bin/rm %insserv_prereq %fillup_prereq
Provides: hotplug
Obsoletes: hotplug
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -251,6 +251,8 @@
/%{_lib}/libvolume_id.so.*
%changelog -n udev
+* Mon Aug 28 2006 - aj(a)suse.de
+- Prerequire pidof since it's needed in %%pre section.
* Wed Aug 23 2006 - kay.sievers(a)suse.de
- new upstream release 098
more consistent key naming scheme:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package valgrind
checked in at Tue Aug 29 00:13:07 CEST 2006.
--------
--- valgrind/valgrind.changes 2006-08-24 14:52:54.000000000 +0200
+++ valgrind/valgrind.changes 2006-08-28 13:37:24.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 28 13:37:11 CEST 2006 - dmueller(a)suse.de
+
+- fix suppressions
+- update drd plugin
+
+-------------------------------------------------------------------
Old:
----
valgrind-5999-drd-2006-08-14.tar.bz2
valgrind-5999.patch
New:
----
valgrind-6012-drd-2006-08-26.tar.bz2
valgrind-6012.patch
valgrind-ppc.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ valgrind.spec ++++++
--- /var/tmp/diff_new_pack.fJdC20/_old 2006-08-29 00:13:00.000000000 +0200
+++ /var/tmp/diff_new_pack.fJdC20/_new 2006-08-29 00:13:00.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: valgrind
-BuildRequires: gcc-c++ glibc-devel-32bit
+BuildRequires: gcc-c++ glibc-devel-32bit xorg-x11-devel
%ifarch x86_64
BuildRequires: gcc41-32bit
%endif
@@ -21,16 +21,17 @@
Summary: Memory Management Debugger
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 3.2.0
-Release: 6
+Release: 7
Source0: %{name}-%{version}.tar.bz2
# svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_1_0 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH > 3_1_BRANCH.diff
# svn di svn://svn.valgrind.org/vex/tags/VEX_3_1_0 svn://svn.valgrind.org/vex/branches/VEX_3_1_BRANCH > VEX_3_1_BRANCH.diff
#Patch0: 3_1_BRANCH.diff
#Patch1: VEX_3_1_BRANCH.diff
-Source1: valgrind-5999-drd-2006-08-14.tar.bz2
+Source1: valgrind-6012-drd-2006-08-26.tar.bz2
Patch2: multibyte-nop.diff
-Patch3: valgrind-5999.patch
+Patch3: valgrind-6012.patch
Patch4: drd-fixes.diff
+Patch5: valgrind-ppc.diff
Provides: callgrind
Obsoletes: callgrind
ExclusiveArch: %ix86 x86_64 ppc ppc64
@@ -78,13 +79,14 @@
%patch2
%patch3
%patch4
+%patch5
%build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
autoreconf -fi
export GDB=/usr/bin/gdb
-%configure --with-x
+%configure
make %{?jobs:-j%jobs}
%install
@@ -102,6 +104,9 @@
%doc %_mandir/*/*
%changelog -n valgrind
+* Mon Aug 28 2006 - dmueller(a)suse.de
+- fix suppressions
+- update drd plugin
* Thu Aug 24 2006 - dmueller(a)suse.de
- add experimental drd plugin
- fix build on x86_64
++++++ drd-fixes.diff ++++++
--- /var/tmp/diff_new_pack.fJdC20/_old 2006-08-29 00:13:00.000000000 +0200
+++ /var/tmp/diff_new_pack.fJdC20/_new 2006-08-29 00:13:00.000000000 +0200
@@ -1,20 +1,20 @@
---- drd/drd_malloc_wrappers.c 2006/08/23 13:43:15 1.1
-+++ drd/drd_malloc_wrappers.c 2006/08/23 13:43:56
-@@ -263,6 +263,8 @@
- SizeT* const size,
- ExeContext** const where)
- {
-+ return False;
-+
- DRD_Chunk* mc;
+--- drd/drd_main.c
++++ drd/drd_main.c
+@@ -110,7 +110,7 @@
+ addr, size, VG_(get_running_tid)());
+ }
+ #endif
+- sg = thread_get_segment(VG_(running_tid));
++ sg = thread_get_segment(VG_(get_running_tid)());
+ bm_access_range(sg->bm, addr, size, eLoad);
+ }
- tl_assert(data);
-@@ -289,6 +291,8 @@
+@@ -124,7 +124,7 @@
+ addr, size, VG_(get_running_tid)());
+ }
+ #endif
+- sg = thread_get_segment(VG_(running_tid));
++ sg = thread_get_segment(VG_(get_running_tid)());
+ bm_access_range(sg->bm, addr, size, eStore);
+ }
- void drd_print_malloc_stats(void)
- {
-+ return;
-+
- DRD_Chunk* mc;
- SizeT nblocks = 0;
- SizeT nbytes = 0;
++++++ valgrind-5999-drd-2006-08-14.tar.bz2 -> valgrind-6012-drd-2006-08-26.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/Makefile.am new/drd/Makefile.am
--- old/drd/Makefile.am 2006-08-14 15:40:44.000000000 +0200
+++ new/drd/Makefile.am 2006-08-26 15:30:09.000000000 +0200
@@ -2,66 +2,28 @@
noinst_PROGRAMS =
if VG_X86_LINUX
- noinst_PROGRAMS += drd-x86-linux vgpreload_drd-x86-linux.so
+ noinst_PROGRAMS += drd-x86-linux
PLATFORM = X86
endif
if VG_AMD64_LINUX
- noinst_PROGRAMS += drd-amd64-linux vgpreload_drd-amd64-linux.so
+ noinst_PROGRAMS += drd-amd64-linux
PLATFORM = AMD64
endif
if VG_PPC32_LINUX
- noinst_PROGRAMS += drd-ppc32-linux vgpreload_drd-ppc32-linux.so
+ noinst_PROGRAMS += drd-ppc32-linux
PLATFORM = PPC32
endif
if VG_PPC64_LINUX
-noinst_PROGRAMS += drd-ppc64-linux vgpreload_drd-ppc64-linux.so
+ noinst_PROGRAMS += drd-ppc64-linux
+ PLATFORM = PPC64
endif
-VGPRELOAD_DRD_SOURCES_COMMON =
-
-vgpreload_drd_x86_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON)
-vgpreload_drd_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX)
-vgpreload_drd_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -O2
-vgpreload_drd_x86_linux_so_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX)
-vgpreload_drd_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX)
-vgpreload_drd_x86_linux_so_LDFLAGS = \
- $(PRELOAD_LDFLAGS_X86_LINUX) \
- $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX)
-
-vgpreload_drd_amd64_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON)
-vgpreload_drd_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX)
-vgpreload_drd_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -O2
-vgpreload_drd_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX)
-vgpreload_drd_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX)
-vgpreload_drd_amd64_linux_so_LDFLAGS = \
- $(PRELOAD_LDFLAGS_AMD64_LINUX) \
- $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX)
-
-vgpreload_drd_ppc32_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON)
-vgpreload_drd_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX)
-vgpreload_drd_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -O2
-vgpreload_drd_ppc32_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX)
-vgpreload_drd_ppc32_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_LINUX)
-vgpreload_drd_ppc32_linux_so_LDFLAGS = \
- $(PRELOAD_LDFLAGS_PPC32_LINUX) \
- $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX)
-
-vgpreload_drd_ppc64_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON)
-vgpreload_drd_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX)
-vgpreload_drd_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -O2
-vgpreload_drd_ppc64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX)
-vgpreload_drd_ppc64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_LINUX)
-vgpreload_drd_ppc64_linux_so_LDFLAGS = \
- $(PRELOAD_LDFLAGS_PPC64_LINUX) \
- $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX)
-
DRD_SOURCES_COMMON = \
drd_bitmap3.c \
drd_clientreq.c \
drd_error.c \
drd_main.c \
- drd_malloc_wrappers.c \
drd_mutex.c \
drd_segment.c \
drd_suppression.c \
@@ -71,6 +33,7 @@
AM_CFLAGS_X86_LINUX += -DCHECK_FORMAT_STRINGS -I$(top_srcdir)/coregrind
AM_CFLAGS_AMD64_LINUX += -DCHECK_FORMAT_STRINGS -I$(top_srcdir)/coregrind
AM_CFLAGS_PPC32_LINUX += -DCHECK_FORMAT_STRINGS -I$(top_srcdir)/coregrind
+AM_CFLAGS_PPC64_LINUX += -DCHECK_FORMAT_STRINGS -I$(top_srcdir)/coregrind
drd_x86_linux_SOURCES = $(DRD_SOURCES_COMMON)
drd_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_$(PLATFORM)_LINUX)
@@ -92,3 +55,10 @@
drd_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_$(PLATFORM)_LINUX)
drd_ppc32_linux_LDADD = $(TOOL_LDADD_$(PLATFORM)_LINUX)
drd_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_$(PLATFORM)_LINUX)
+
+drd_ppc64_linux_SOURCES = $(DRD_SOURCES_COMMON)
+drd_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_$(PLATFORM)_LINUX)
+drd_ppc64_linux_CFLAGS = $(AM_CFLAGS_$(PLATFORM)_LINUX)
+drd_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_$(PLATFORM)_LINUX)
+drd_ppc64_linux_LDADD = $(TOOL_LDADD_$(PLATFORM)_LINUX)
+drd_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_$(PLATFORM)_LINUX)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/TODO.txt new/drd/TODO.txt
--- old/drd/TODO.txt 2006-08-14 18:41:16.000000000 +0200
+++ new/drd/TODO.txt 2006-08-26 17:56:08.000000000 +0200
@@ -14,14 +14,23 @@
- testing on PPC (current implementation is only tested on x86 yet).
- Replace representation of suppression ranges as a list of ranges by a
bitmap.
+- Potential optimization: don't keep any bitmaps if only one thread is running.
Known bugs:
+- valgrind --tool=drd none/tests/pth_cvsimple triggers an assertion failure.
- Gets killed by the OOM handler for some applications.
+- drd_malloc_wrappers.c: when data addresses are reused because of a
+ malloc()/free()/malloc() sequence, the reported allocation stack will be
+ wrong.
+
+Valgrind core changes
+~~~~~~~~~~~~~~~~~~~~~
+- Explain each of the changes, and submit them as a patch. Especially explain
+ why the change in the thread state handling is necessary.
Error reporting
~~~~~~~~~~~~~~~
-- better error reporting for stack variables -- currently only an address is
- printed when a data race is detected for a stack variable, and no name.
+- Make sure that Valgrind counts data races reported by drd as errors.
Testing
~~~~~~~
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_bitmap.h new/drd/drd_bitmap.h
--- old/drd/drd_bitmap.h 2006-08-14 14:30:22.000000000 +0200
+++ new/drd/drd_bitmap.h 2006-08-26 14:26:04.000000000 +0200
@@ -60,9 +60,6 @@
Addr address,
SizeT size,
enum bm_access_type access_type);
-void bm_access_1(struct bitmap* bm,
- Addr address,
- enum bm_access_type access_type);
void bm_access_4(struct bitmap* bm,
Addr address,
enum bm_access_type access_type);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_bitmap3.c new/drd/drd_bitmap3.c
--- old/drd/drd_bitmap3.c 2006-08-14 16:45:00.000000000 +0200
+++ new/drd/drd_bitmap3.c 2006-08-26 14:33:07.000000000 +0200
@@ -88,28 +88,10 @@
}
/**
- * Record an access of type access_type at addresses a .. a + size - 1 in
- * bitmap bm.
- */
-void bm_access_range(struct bitmap* const bm,
- Addr const a,
- SizeT const size,
- enum bm_access_type access_type)
-{
- Addr b;
-
- tl_assert(bm);
- tl_assert(0 < size && size < 4096);
-
- for (b = a; b != a + size; b++)
- {
- bm_access_1(bm, b, access_type);
- }
-}
-
-/**
* Record an access of type access_type at addresses a in bitmap bm.
*/
+static
+__inline__
void bm_access_1(struct bitmap* bm,
Addr a, enum bm_access_type access_type)
{
@@ -118,7 +100,7 @@
unsigned* p0;
SPLIT_ADDRESS(a);
- tl_assert(bm);
+ // tl_assert(bm);
p2 = &bm->bm2[a2];
if (*p2 == 0)
@@ -136,7 +118,31 @@
void bm_access_4(struct bitmap* bm,
Addr a, enum bm_access_type access_type)
{
- bm_access_range(bm, a, 4, access_type);
+ tl_assert(bm);
+ bm_access_1(bm, a + 0, access_type);
+ bm_access_1(bm, a + 1, access_type);
+ bm_access_1(bm, a + 2, access_type);
+ bm_access_1(bm, a + 3, access_type);
+}
+
+/**
+ * Record an access of type access_type at addresses a .. a + size - 1 in
+ * bitmap bm.
+ */
+void bm_access_range(struct bitmap* const bm,
+ Addr const a,
+ SizeT const size,
+ enum bm_access_type access_type)
+{
+ Addr b;
+
+ tl_assert(bm);
+ tl_assert(0 < size && size < 4096);
+
+ for (b = a; b != a + size; b++)
+ {
+ bm_access_1(bm, b, access_type);
+ }
}
/**
@@ -240,7 +246,7 @@
unsigned range_access = 0;
unsigned i;
- VG_(message)(Vg_UserMsg, "Actual data races:");
+ VG_(message)(Vg_UserMsg, "Data addresses accessed by both segments:");
for (i = 0; i < ADDR2_COUNT; i++)
{
@@ -271,6 +277,7 @@
range_end = a + 1;
else
{
+ tl_assert(range_begin < range_end);
if (HAS_RACE(range_access)
&& ! drd_is_suppressed(range_begin, range_end))
{
@@ -280,11 +287,16 @@
dri.range_begin = range_begin;
dri.range_end = range_end;
dri.range_access = range_access;
+ tl_assert(dri.range_begin < dri.range_end);
+#if 0
VG_(maybe_record_error)(tid1,
DataRaceErr,
VG_(get_IP)(tid1), // where
"data race",
&dri);
+#else
+ drd_report_data_race(&dri);
+#endif
}
range_access = access;
range_begin = a;
@@ -297,7 +309,7 @@
}
}
- VG_(message)(Vg_UserMsg, "End of detected data races");
+ // VG_(message)(Vg_UserMsg, "End of detected data races");
}
void bm_print(struct bitmap const* bm)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_error.c new/drd/drd_error.c
--- old/drd/drd_error.c 2006-08-14 15:03:01.000000000 +0200
+++ new/drd/drd_error.c 2006-08-26 14:41:21.000000000 +0200
@@ -39,10 +39,10 @@
// See also memcheck/mc_main.c
-/* Describe a data address as good as you can, for error messages,
+/* Describe a data address range [a,a+len[ as good as you can, for error messages,
putting the result in ai. */
// See also memcheck/mc_main.c
-void describe_addr(Addr a, AddrInfo* ai)
+void describe_addr(Addr const a, SizeT const len, AddrInfo* const ai)
{
ThreadId tid;
Addr stack_min, stack_max;
@@ -55,7 +55,10 @@
if (stack_min <= a && a <= stack_max)
{
ai->akind = Stack;
+ ai->size = len;
+ ai->rwoffset = 0;
ai->stack_tid = tid;
+ tl_assert(a + ai->size <= stack_max);
return;
}
}
@@ -64,20 +67,71 @@
sg = VG_(find_seginfo)(a);
if (sg)
{
+ int i, n;
+
ai->akind = Segment;
ai->seginfo = sg;
+ ai->name[0] = 0;
+
+ n = VG_(seginfo_syms_howmany)(sg);
+ for (i = 0; i < n; i++)
+ {
+ Addr addr;
+ UInt size;
+ HChar* name;
+ Char filename[256];
+ Int linenum;
+
+ VG_(seginfo_syms_getidx)(sg, i, &addr, &size, &name);
+ if (addr <= a && a < addr + size)
+ {
+ ai->size = size;
+ ai->rwoffset = a - addr;
+ tl_assert(name && name[0]);
+ VG_(snprintf)(ai->name, sizeof(ai->name), "%s", name);
+ if (VG_(get_filename_linenum)(addr,
+ filename, sizeof(filename),
+ 0, 0, 0,
+ &linenum))
+ {
+ VG_(snprintf)(ai->descr, sizeof(ai->descr),
+ " in %s:%d", filename, linenum);
+ }
+ else
+ {
+ i = n;
+ }
+ break;
+ }
+ }
+ if (i == n)
+ {
+ Char sect_kind_name[16];
+
+ ai->size = 1;
+ ai->rwoffset = 0;
+ VG_(seginfo_sect_kind_name)(a, sect_kind_name,
+ sizeof(sect_kind_name));
+ VG_(snprintf)(ai->descr, sizeof(ai->descr),
+ " %s, %s:%s",
+ VG_(seginfo_filename)(sg),
+ VG_(seginfo_soname)(sg),
+ sect_kind_name);
+ }
return;
}
/* Search for a currently malloc'd block which might bracket it. */
{
+#if 0
Addr data;
- if (drd_heap_addrinfo(a, &data, &ai->blksize, &ai->lastchange))
+ if (drd_heap_addrinfo(a, &data, &ai->size, &ai->lastchange))
{
ai->akind = Mallocd;
ai->rwoffset = a - data;
return;
}
+#endif
}
/* Clueless ... */
@@ -88,14 +142,14 @@
/**
* Generate a description string for the data residing at address a.
*/
-Char* describe_addr_text(Addr const a, AddrInfo* const ai,
+Char* describe_addr_text(Addr const a, SizeT const len, AddrInfo* const ai,
Char* const buf, UInt const n_buf)
{
tl_assert(a);
tl_assert(ai);
tl_assert(buf);
- describe_addr(a, ai);
+ describe_addr(a, len, ai);
switch (ai->akind)
{
@@ -107,70 +161,29 @@
VG_(get_pthread_id)(ai->stack_tid));
break;
case Segment: {
- Char sect_kind_name[16];
- int i, n;
-
- buf[0] = 0;
-
- n = VG_(seginfo_syms_howmany)(ai->seginfo);
- for (i = 0; i < n; i++)
+ if (ai->name[0])
{
- Addr addr;
- UInt size;
- HChar* name;
- VG_(seginfo_syms_getidx)(ai->seginfo, i, &addr, &size, &name);
- if (addr <= a && a < addr + size)
- {
- Char filename[256] = "";
- UInt linenum = 0;
- VG_(snprintf)(buf + VG_(strlen)(buf), n_buf - VG_(strlen)(buf),
- "%s (offset %ld, size %d) in ",
- name, a - addr, size);
- if (VG_(get_filename_linenum)(addr,
- filename, sizeof(filename),
- 0, 0, 0,
- &linenum))
- {
- VG_(snprintf)(buf + VG_(strlen)(buf), n_buf - VG_(strlen)(buf),
- "%s:%d, ",
- filename,
- linenum);
- }
- else
- {
- i = n;
- break;
- }
- break;
- }
+ VG_(snprintf)(buf, n_buf,
+ "%s (offset %ld, size %ld) in %s",
+ ai->name, ai->rwoffset, ai->size, ai->descr);
}
- if (i == n)
+ else
{
- VG_(seginfo_sect_kind_name)(a, sect_kind_name,
- sizeof(sect_kind_name));
- VG_(snprintf)(buf + VG_(strlen)(buf), n_buf - VG_(strlen)(buf),
- "%s, %s:%s",
- VG_(seginfo_filename)(ai->seginfo),
- VG_(seginfo_soname)(ai->seginfo),
- sect_kind_name);
+ VG_(snprintf)(buf, n_buf,
+ "%s",
+ ai->descr);
}
break;
}
case Mallocd: {
- Addr data;
- SizeT size;
- ExeContext* where;
VG_(snprintf)(buf, n_buf, "heap");
- if (drd_heap_addrinfo(a, &data, &size, &where))
- {
- VG_(snprintf)(buf + VG_(strlen)(buf), n_buf - VG_(strlen)(buf),
- ", offset %ld in block at 0x%lx of size %ld",
- a - data, data, size);
- }
+ VG_(snprintf)(buf + VG_(strlen)(buf), n_buf - VG_(strlen)(buf),
+ ", offset %ld in block at 0x%lx of size %ld",
+ ai->rwoffset, a - ai->rwoffset, ai->size);
break;
}
case Unknown:
- VG_(snprintf)(buf, n_buf, "unknown");
+ VG_(snprintf)(buf, n_buf, "heap");
break;
default:
tl_assert(0);
@@ -178,12 +191,40 @@
return buf;
}
+void drd_report_data_race(DataRaceInfo const* const dri)
+{
+ AddrInfo ai;
+ Char descr[256];
+
+ tl_assert(dri);
+ tl_assert(dri->range_begin < dri->range_end);
+ describe_addr_text(dri->range_begin, dri->range_end - dri->range_begin,
+ &ai, descr, sizeof(descr));
+ VG_(message)(Vg_UserMsg,
+ "0x%08lx sz %ld %c %c (%s)",
+ dri->range_begin,
+ dri->range_end - dri->range_begin,
+ dri->range_access & LHS_W ? 'W' : 'R',
+ dri->range_access & RHS_W ? 'W' : 'R',
+ descr);
+ if (ai.akind == Mallocd && ai.lastchange)
+ {
+ VG_(message)(Vg_UserMsg, "Allocation context:");
+ VG_(pp_ExeContext)(ai.lastchange);
+ }
+ // Note: for stack and heap variables suppression should be
+ // stopped automatically as soon as the specified memory
+ // range has been freed.
+ tl_assert(dri->range_begin < dri->range_end);
+ drd_start_suppression(dri->range_begin, dri->range_end);
+}
+
static Bool drd_tool_error_eq(VgRes res, Error* e1, Error* e2)
{
return False;
}
-static void drd_tool_error_pp(Error* e)
+static void drd_tool_error_pp(Error* const e)
{
switch (VG_(get_error_kind)(e))
{
@@ -198,29 +239,7 @@
break;
}
case DataRaceErr: {
- AddrInfo ai;
- DataRaceInfo* dri;
- Char descr[256];
-
- dri = VG_(get_error_extra)(e);
- tl_assert(dri);
- describe_addr_text(dri->range_begin, &ai, descr, sizeof(descr));
- VG_(message)(Vg_UserMsg,
- "0x%08lx sz %ld %c %c (%s)",
- dri->range_begin,
- dri->range_end - dri->range_begin,
- dri->range_access & LHS_W ? 'W' : 'R',
- dri->range_access & RHS_W ? 'W' : 'R',
- descr);
- if (ai.akind == Mallocd && ai.lastchange)
- {
- VG_(message)(Vg_UserMsg, "Allocation context:");
- VG_(pp_ExeContext)(ai.lastchange);
- }
- // Note: for stack and heap variables suppression should be
- // stopped automatically as soon as the specified memory
- // range has been freed.
- drd_start_suppression(dri->range_begin, dri->range_end);
+ drd_report_data_race(VG_(get_error_extra)(e));
break;
}
default:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_error.h new/drd/drd_error.h
--- old/drd/drd_error.h 2006-08-14 14:53:04.000000000 +0200
+++ new/drd/drd_error.h 2006-08-26 18:01:29.000000000 +0200
@@ -35,8 +35,8 @@
/* DRD error types. */
typedef enum {
- DataRaceErr = 1,
- MutexErr = 2,
+ DataRaceErr = 1,
+ MutexErr = 2,
} DrdErrorKind;
/* The classification of a faulting address. */
@@ -56,13 +56,15 @@
/* Records info about a faulting address. */
typedef
- struct { // Used by:
- AddrKind akind; // ALL
- SizeT blksize; // Mallocd
- OffT rwoffset; // Mallocd
- ExeContext* lastchange; // Mallocd
- ThreadId stack_tid; // Stack
- SegInfo* seginfo; // Segment
+ struct { // Used by:
+ AddrKind akind; // ALL
+ SizeT size; // ALL
+ OffT rwoffset; // ALL
+ ExeContext* lastchange; // Mallocd
+ ThreadId stack_tid; // Stack
+ SegInfo* seginfo; // Segment
+ Char name[256]; // Segment
+ Char descr[256]; // Segment
}
AddrInfo;
@@ -75,9 +77,10 @@
UInt range_access; // How the range was accessed (LHS_[RW] | RHS_[RW]).
} DataRaceInfo;
-void describe_addr(Addr const a, AddrInfo* const ai);
-Char* describe_addr_text(Addr const a, AddrInfo* const ai,
+void describe_addr(Addr const a, SizeT const len, AddrInfo* const ai);
+Char* describe_addr_text(Addr const a, SizeT const len, AddrInfo* const ai,
Char* const buf, UInt const n_buf);
+void drd_report_data_race(DataRaceInfo const* const dri);
void drd_register_error_handlers(void);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_main.c new/drd/drd_main.c
--- old/drd/drd_main.c 2006-08-14 17:43:23.000000000 +0200
+++ new/drd/drd_main.c 2006-08-26 17:48:27.000000000 +0200
@@ -26,7 +26,9 @@
#include "drd_bitmap.h"
#include "drd_clientreq.h"
#include "drd_error.h"
+#ifdef USE_MALLOC_WRAPPERS
#include "drd_malloc_wrappers.h"
+#endif
#include "drd_mutex.h"
#include "drd_segment.h"
#include "drd_suppression.h"
@@ -101,28 +103,28 @@
VG_REGPARM(2) void drd_trace_load(Addr addr, SizeT size)
{
struct segment* sg;
-
+#if 0
if (drd_trace_mem)
{
VG_(message)(Vg_UserMsg, "load 0x%lx size %ld thread %d",
addr, size, VG_(get_running_tid)());
}
-
- sg = thread_get_segment(VG_(get_running_tid)());
+#endif
+ sg = thread_get_segment(VG_(running_tid));
bm_access_range(sg->bm, addr, size, eLoad);
}
VG_REGPARM(2) void drd_trace_store(Addr addr, SizeT size)
{
struct segment* sg;
-
+#if 0
if (drd_trace_mem)
{
VG_(message)(Vg_UserMsg, "store 0x%lx size %ld thread %d",
addr, size, VG_(get_running_tid)());
}
-
- sg = thread_get_segment(VG_(get_running_tid)());
+#endif
+ sg = thread_get_segment(VG_(running_tid));
bm_access_range(sg->bm, addr, size, eStore);
}
@@ -176,7 +178,8 @@
p = mutex_get(mutex);
if (p)
{
- // To do: report an error in case the recursion count is not zero.
+ // To do: report an error in case the recursion count is not zero
+ // before asserting.
tl_assert(p->recursion_count == 0);
mutex_destroy(p);
}
@@ -327,20 +330,35 @@
{
IRDirty* d = st->Ist.Dirty.details;
IREffect const mFx = d->mFx;
- if (mFx != Ifx_None)
- {
- VG_(message)(Vg_UserMsg,
- "Encountered Ist_Dirty with effect %s addr %p size %d",
- mFx == Ifx_None ? "-"
- : mFx == Ifx_Read ? "R"
- : mFx == Ifx_Write ? "W"
- : mFx == Ifx_Modify ? "RW"
- : "?",
- d->mAddr,
- d->mSize);
+ switch (mFx) {
+ case Ifx_None:
+ break;
+ case Ifx_Read:
+ case Ifx_Write:
+ case Ifx_Modify:
+ tl_assert(d->mAddr);
+ tl_assert(d->mSize > 0);
+ argv = mkIRExprVec_2(d->mAddr, mkIRExpr_HWord(d->mSize));
+ if (mFx == Ifx_Read || mFx == Ifx_Modify) {
+ di = unsafeIRDirty_0_N(
+ /*regparms*/2,
+ "drd_trace_load",
+ VG_(fnptr_to_fnentry)(drd_trace_load),
+ argv);
+ addStmtToIRBB(bb, IRStmt_Dirty(di));
+ }
+ if (mFx == Ifx_Write || mFx == Ifx_Modify) {
+ di = unsafeIRDirty_0_N(
+ /*regparms*/2,
+ "drd_trace_store",
+ VG_(fnptr_to_fnentry)(drd_trace_store),
+ argv);
+ addStmtToIRBB(bb, IRStmt_Dirty(di));
+ }
+ break;
+ default:
+ tl_assert(0);
}
- // To do: implement handling of Ist_Dirty.
- tl_assert(mFx == Ifx_None);
}
addStmtToIRBB(bb, st);
break;
@@ -403,12 +421,12 @@
// Other stuff.
VG_(needs_data_syms)();
+#ifdef USE_MALLOC_WRAPPERS
drd_register_malloc_wrappers();
+#endif
drd_clientreq_init();
- //VG_(needs_client_requests)(drd_handle_client_request);
-
// Unit tests.
// bm_test();
// vc_test();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_malloc_wrappers.c new/drd/drd_malloc_wrappers.c
--- old/drd/drd_malloc_wrappers.c 2006-08-14 09:07:00.000000000 +0200
+++ new/drd/drd_malloc_wrappers.c 2006-08-26 17:43:07.000000000 +0200
@@ -1,11 +1,8 @@
/*
- This file is part of drd, a data race detector. Based on
- mc_malloc_wrappers.c, part of MemCheck, a heavyweight Valgrind tool for
- detecting memory errors, and AddrCheck, a lightweight Valgrind tool
- for detecting memory errors.
+ This file is part of drd, a data race detector.
- Copyright (C) 2000-2006 Julian Seward
- jseward(a)acm.org
+ Copyright (C) 2006 Bart Van Assche
+ bart.vanassche(a)gmail.com
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -25,7 +22,9 @@
The GNU General Public License is contained in the file COPYING.
*/
+
#include "drd_malloc_wrappers.h"
+#include "drd_thread.h"
#include "pub_tool_basics.h"
#include "pub_tool_execontext.h"
#include "pub_tool_hashtable.h"
@@ -71,7 +70,7 @@
static
DRD_Chunk* create_DRD_Chunk(ThreadId tid, Addr p, SizeT size)
{
- DRD_Chunk* mc = VG_(malloc)(sizeof(DRD_Chunk));
+ DRD_Chunk* mc = VG_(malloc)(sizeof(DRD_Chunk));
mc->data = p;
mc->size = size;
mc->where = VG_(record_ExeContext)(tid);
@@ -151,7 +150,6 @@
mc = VG_(HT_remove)(drd_malloc_list, (UWord)p );
if (mc == NULL) {
tl_assert(0);
- // drd_record_free_error(tid, p );
} else {
VG_(free)(mc);
}
@@ -190,8 +188,6 @@
mc = VG_(HT_remove)(drd_malloc_list, (UWord)p_old );
if (mc == NULL) {
tl_assert(0);
- // drd_record_free_error(tid, (Addr)p_old );
- /* We return to the program regardless. */
return NULL;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_mutex.c new/drd/drd_mutex.c
--- old/drd/drd_mutex.c 2006-08-12 14:54:06.000000000 +0200
+++ new/drd/drd_mutex.c 2006-08-26 14:25:20.000000000 +0200
@@ -84,16 +84,18 @@
struct mutex_info* p;
p = mutex_get_or_allocate(mutex);
- p->recursion_count++;
- if (p->recursion_count == 1)
+ if (p->recursion_count == 0)
p->owner = tid;
else if (p->owner != tid)
{
- // The impossible happened ...
- VG_(message)(Vg_DebugMsg, "mutex 0x%lx recursion count %d owner %d -> %d",
+ VG_(message)(Vg_DebugMsg,
+ "The impossible happened: mutex 0x%lx is locked"
+ " simultaneously by two threads (recursion count %d,"
+ " owners %d and %d) !",
p->mutex, p->recursion_count, p->owner, tid);
tl_assert(0);
}
+ p->recursion_count++;
return p->recursion_count;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drd/drd_thread.c new/drd/drd_thread.c
--- old/drd/drd_thread.c 2006-08-14 16:46:26.000000000 +0200
+++ new/drd/drd_thread.c 2006-08-26 13:30:47.000000000 +0200
@@ -44,8 +44,8 @@
typedef struct
{
- struct segment* first;
- struct segment* last;
+ struct segment* first;
+ struct segment* last;
} ThreadInfo;
@@ -62,15 +62,37 @@
// Function definitions.
/**
+ * Sanity check of the doubly linked list of segments referenced by a ThreadInfo struct.
+ * @return True if sane, False if not.
+ */
+static Bool sane_ThreadInfo(ThreadInfo const* const ti)
+{
+ struct segment* p;
+ for (p = ti->first; p; p = p->next) {
+ if (p->next && p->next->prev != p)
+ return False;
+ if (p->next == 0 && p != ti->last)
+ return False;
+ }
+ for (p = ti->last; p; p = p->prev) {
+ if (p->prev && p->prev->next != p)
+ return False;
+ if (p->prev == 0 && p != ti->first)
+ return False;
+ }
+ return True;
+}
+
+/**
* Allocate thread-specific data structure. Call this just after
* pthread_create(). Assumption: thread id's are small integers.
*/
void thread_new(ThreadId const creator, ThreadId const created)
{
- tl_assert(0 < created && created < MAXTHREADS);
- tl_assert(s_threadinfo[created].first == 0);
- tl_assert(s_threadinfo[created].last == 0);
- thread_append_segment(created, sg_new(creator, created));
+ tl_assert(0 < created && created < MAXTHREADS);
+ tl_assert(s_threadinfo[created].first == 0);
+ tl_assert(s_threadinfo[created].last == 0);
+ thread_append_segment(created, sg_new(creator, created));
}
/**
@@ -79,17 +101,17 @@
*/
void thread_delete(ThreadId const threadid)
{
- struct segment* sg;
- struct segment* sg_prev;
+ struct segment* sg;
+ struct segment* sg_prev;
- tl_assert(0 < threadid && threadid < MAXTHREADS);
- for (sg = s_threadinfo[threadid].last; sg; sg = sg_prev)
- {
- sg_prev = sg->prev;
- sg_delete(sg);
- }
- s_threadinfo[threadid].first = 0;
- s_threadinfo[threadid].last = 0;
+ tl_assert(0 < threadid && threadid < MAXTHREADS);
+ for (sg = s_threadinfo[threadid].last; sg; sg = sg_prev)
+ {
+ sg_prev = sg->prev;
+ sg_delete(sg);
+ }
+ s_threadinfo[threadid].first = 0;
+ s_threadinfo[threadid].last = 0;
}
/**
@@ -97,9 +119,9 @@
*/
struct segment* thread_get_segment(ThreadId const threadid)
{
- tl_assert(0 < threadid && threadid < MAXTHREADS);
- tl_assert(s_threadinfo[threadid].last);
- return s_threadinfo[threadid].last;
+ tl_assert(0 < threadid && threadid < MAXTHREADS);
+ tl_assert(s_threadinfo[threadid].last);
+ return s_threadinfo[threadid].last;
}
/**
@@ -108,11 +130,15 @@
static void thread_append_segment(ThreadId const threadid,
struct segment* const sg)
{
- sg->prev = s_threadinfo[threadid].last;
- sg->next = 0;
- s_threadinfo[threadid].last = sg;
- if (s_threadinfo[threadid].first == 0)
- s_threadinfo[threadid].first = sg;
+ tl_assert(sane_ThreadInfo(&s_threadinfo[threadid]));
+ sg->prev = s_threadinfo[threadid].last;
+ sg->next = 0;
+ if (s_threadinfo[threadid].last)
+ s_threadinfo[threadid].last->next = sg;
+ s_threadinfo[threadid].last = sg;
+ if (s_threadinfo[threadid].first == 0)
+ s_threadinfo[threadid].first = sg;
+ tl_assert(sane_ThreadInfo(&s_threadinfo[threadid]));
}
/**
@@ -122,22 +148,24 @@
static void thread_discard_segment(ThreadId const threadid,
struct segment* const sg)
{
- if (sg->prev)
- sg->prev->next = sg->next;
- if (sg->next)
- sg->next->prev = sg->prev;
- if (sg == s_threadinfo[threadid].first)
- s_threadinfo[threadid].first = sg->next;
- if (sg == s_threadinfo[threadid].last)
- s_threadinfo[threadid].last = sg->prev;
- sg_delete(sg);
+ tl_assert(sane_ThreadInfo(&s_threadinfo[threadid]));
+ if (sg->prev)
+ sg->prev->next = sg->next;
+ if (sg->next)
+ sg->next->prev = sg->prev;
+ if (sg == s_threadinfo[threadid].first)
+ s_threadinfo[threadid].first = sg->next;
+ if (sg == s_threadinfo[threadid].last)
+ s_threadinfo[threadid].last = sg->prev;
+ sg_delete(sg);
+ tl_assert(sane_ThreadInfo(&s_threadinfo[threadid]));
}
struct vectorclock* thread_get_vc(ThreadId const threadid)
{
- tl_assert(0 < threadid && threadid < MAXTHREADS);
- tl_assert(s_threadinfo[threadid].last);
- return &s_threadinfo[threadid].last->vc;
+ tl_assert(0 < threadid && threadid < MAXTHREADS);
+ tl_assert(s_threadinfo[threadid].last);
+ return &s_threadinfo[threadid].last->vc;
}
/**
@@ -147,50 +175,50 @@
*/
static void thread_compute_minimum_vc(struct vectorclock* vc)
{
- int i;
- Bool first;
- struct segment* latest_sg;
-
- first = True;
- for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
- {
- latest_sg = s_threadinfo[i].last;
- if (latest_sg)
- {
- if (first)
+ int i;
+ Bool first;
+ struct segment* latest_sg;
+
+ first = True;
+ for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
+ {
+ latest_sg = s_threadinfo[i].last;
+ if (latest_sg)
{
- vc_cleanup(vc);
- vc_copy(vc, &latest_sg->vc);
+ if (first)
+ {
+ vc_cleanup(vc);
+ vc_copy(vc, &latest_sg->vc);
+ }
+ else
+ vc_min(vc, &latest_sg->vc);
+ first = False;
}
- else
- vc_min(vc, &latest_sg->vc);
- first = False;
- }
- }
+ }
}
static void thread_compute_maximum_vc(struct vectorclock* vc)
{
- int i;
- Bool first;
- struct segment* latest_sg;
-
- first = True;
- for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
- {
- latest_sg = s_threadinfo[i].last;
- if (latest_sg)
- {
- if (first)
+ int i;
+ Bool first;
+ struct segment* latest_sg;
+
+ first = True;
+ for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
+ {
+ latest_sg = s_threadinfo[i].last;
+ if (latest_sg)
{
- vc_cleanup(vc);
- vc_copy(vc, &latest_sg->vc);
+ if (first)
+ {
+ vc_cleanup(vc);
+ vc_copy(vc, &latest_sg->vc);
+ }
+ else
+ vc_combine(vc, &latest_sg->vc);
+ first = False;
}
- else
- vc_combine(vc, &latest_sg->vc);
- first = False;
- }
- }
+ }
}
/**
@@ -200,134 +228,134 @@
*/
static void thread_discard_ordered_segments(void)
{
- struct vectorclock thread_vc_min;
- int i;
+ struct vectorclock thread_vc_min;
+ int i;
- vc_init(&thread_vc_min, 0, 0);
- thread_compute_minimum_vc(&thread_vc_min);
- if (sg_get_trace())
- {
- char msg[256];
- struct vectorclock thread_vc_max;
-
- vc_init(&thread_vc_max, 0, 0);
- thread_compute_maximum_vc(&thread_vc_max);
- VG_(snprintf)(msg, sizeof(msg),
- "Discarding ordered segments -- min vc is ");
- vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
- &thread_vc_min);
- VG_(snprintf)(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
- ", max vc is ");
- vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
- &thread_vc_max);
- VG_(message)(Vg_DebugMsg, "%s", msg);
- vc_cleanup(&thread_vc_max);
- }
-
- for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
- {
- struct segment* sg;
- struct segment* sg_next;
- for (sg = s_threadinfo[i].first;
- sg && (sg_next = sg->next) && vc_lte(&sg->vc, &thread_vc_min);
- sg = sg_next)
- {
-#if 1
- VG_(printf)("Discarding a segment of thread %d: ", i);
- vc_print(&sg->vc);
- VG_(printf)("\n");
+ vc_init(&thread_vc_min, 0, 0);
+ thread_compute_minimum_vc(&thread_vc_min);
+ if (sg_get_trace())
+ {
+ char msg[256];
+ struct vectorclock thread_vc_max;
+
+ vc_init(&thread_vc_max, 0, 0);
+ thread_compute_maximum_vc(&thread_vc_max);
+ VG_(snprintf)(msg, sizeof(msg),
+ "Discarding ordered segments -- min vc is ");
+ vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
+ &thread_vc_min);
+ VG_(snprintf)(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
+ ", max vc is ");
+ vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
+ &thread_vc_max);
+ VG_(message)(Vg_DebugMsg, "%s", msg);
+ vc_cleanup(&thread_vc_max);
+ }
+
+ for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
+ {
+ struct segment* sg;
+ struct segment* sg_next;
+ for (sg = s_threadinfo[i].first;
+ sg && (sg_next = sg->next) && vc_lte(&sg->vc, &thread_vc_min);
+ sg = sg_next)
+ {
+#if 0
+ VG_(printf)("Discarding a segment of thread %d: ", i);
+ vc_print(&sg->vc);
+ VG_(printf)("\n");
#endif
- thread_discard_segment(i, sg);
- }
- }
- vc_cleanup(&thread_vc_min);
+ thread_discard_segment(i, sg);
+ }
+ }
+ vc_cleanup(&thread_vc_min);
}
void thread_new_segment(ThreadId const threadid)
{
- static int s_calls_since_last_discard = 0;
- struct segment* sg;
+ static int s_calls_since_last_discard = 0;
+ struct segment* sg;
- tl_assert(0 < threadid && threadid < MAXTHREADS);
+ tl_assert(0 < threadid && threadid < MAXTHREADS);
- if (s_threadinfo[threadid].last)
- {
- thread_report_races_segment(threadid, s_threadinfo[threadid].last);
- }
-
- sg = sg_new(threadid, threadid);
- thread_append_segment(threadid, sg);
-
- if (++s_calls_since_last_discard > 16)
- {
- s_calls_since_last_discard = 0;
- thread_discard_ordered_segments();
- }
+ if (s_threadinfo[threadid].last)
+ {
+ thread_report_races_segment(threadid, s_threadinfo[threadid].last);
+ }
+
+ sg = sg_new(threadid, threadid);
+ thread_append_segment(threadid, sg);
+
+ // if (++s_calls_since_last_discard > 16)
+ {
+ s_calls_since_last_discard = 0;
+ thread_discard_ordered_segments();
+ }
}
void thread_combine_vc(ThreadId joiner, ThreadId joinee)
{
- tl_assert(joiner != joinee);
- tl_assert(0 < joiner && joiner < MAXTHREADS);
- tl_assert(0 < joinee && joinee < MAXTHREADS);
- tl_assert(s_threadinfo[joiner].last);
- tl_assert(s_threadinfo[joinee].last);
- vc_combine(&s_threadinfo[joiner].last->vc, &s_threadinfo[joinee].last->vc);
- thread_discard_ordered_segments();
+ tl_assert(joiner != joinee);
+ tl_assert(0 < joiner && joiner < MAXTHREADS);
+ tl_assert(0 < joinee && joinee < MAXTHREADS);
+ tl_assert(s_threadinfo[joiner].last);
+ tl_assert(s_threadinfo[joinee].last);
+ vc_combine(&s_threadinfo[joiner].last->vc, &s_threadinfo[joinee].last->vc);
+ thread_discard_ordered_segments();
}
void thread_print_all(void)
{
- unsigned i;
- struct segment* p;
+ unsigned i;
+ struct segment* p;
- for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
- {
- if (s_threadinfo[i].first)
- {
- VG_(printf)("**************\n"
- "* thread %2d *\n"
- "**************\n",
- i);
- for (p = s_threadinfo[i].first; p; p = p->next)
+ for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
+ {
+ if (s_threadinfo[i].first)
{
- sg_print(p);
+ VG_(printf)("**************\n"
+ "* thread %2d *\n"
+ "**************\n",
+ i);
+ for (p = s_threadinfo[i].first; p; p = p->next)
+ {
+ sg_print(p);
+ }
}
- }
- }
+ }
}
static void show_call_stack(ThreadId const tid,
Char const* const msg,
ExeContext* const callstack)
{
- VG_(message)(Vg_UserMsg,
- "%s (VG t %d, kernel t %d, POSIX t %d)",
- msg,
- tid,
- VG_(get_tid_lwp)(tid),
- VG_(get_pthread_id)(tid));
- if (callstack)
- {
- VG_(pp_ExeContext)(callstack);
- }
- else
- {
- VG_(get_and_pp_StackTrace)(tid, 32/*n_ips*/);
- }
- VG_(message)(Vg_UserMsg, " ");
+ VG_(message)(Vg_UserMsg,
+ "%s (VG t %d, kernel t %d, POSIX t %d)",
+ msg,
+ tid,
+ VG_(get_tid_lwp)(tid),
+ VG_(get_pthread_id)(tid));
+ if (callstack)
+ {
+ VG_(pp_ExeContext)(callstack);
+ }
+ else
+ {
+ VG_(get_and_pp_StackTrace)(tid, 32/*n_ips*/);
+ }
+ VG_(message)(Vg_UserMsg, " ");
}
void thread_report_races(ThreadId const threadid)
{
- struct segment* p;
+ struct segment* p;
- tl_assert(0 < threadid && threadid < MAXTHREADS);
+ tl_assert(0 < threadid && threadid < MAXTHREADS);
- for (p = s_threadinfo[threadid].first; p; p = p->next)
- {
- thread_report_races_segment(threadid, p);
- }
+ for (p = s_threadinfo[threadid].first; p; p = p->next)
+ {
+ thread_report_races_segment(threadid, p);
+ }
}
/**
@@ -337,68 +365,74 @@
void thread_report_races_segment(ThreadId const threadid,
struct segment* const p)
{
- unsigned i;
+ unsigned i;
- tl_assert(0 < threadid && threadid < MAXTHREADS);
- tl_assert(p);
+ tl_assert(0 < threadid && threadid < MAXTHREADS);
+ tl_assert(p);
- for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
- {
- if (i != threadid)
- {
- struct segment* q;
- for (q = s_threadinfo[i].last; q; q = q->prev)
+ for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
+ {
+ if (i != threadid)
{
+ struct segment* q;
+ for (q = s_threadinfo[i].last; q; q = q->prev)
+ {
#if 0
- char msg[256];
- VG_(snprintf)(msg, sizeof(msg), "Examining thread %d (vc ", threadid);
- vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
- &p->vc);
- VG_(snprintf)(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
- ") versus thread %d (vc ", i);
- vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
- &q->vc);
- VG_(snprintf)(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
- ") %d %d",
- vc_lte(&p->vc, &q->vc), vc_lte(&q->vc, &p->vc));
- VG_(message)(Vg_DebugMsg, "%s", msg);
+ char msg[256];
+ VG_(snprintf)(msg, sizeof(msg), "Examining thread %d (vc ", threadid);
+ vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
+ &p->vc);
+ VG_(snprintf)(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
+ ") versus thread %d (vc ", i);
+ vc_snprint(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
+ &q->vc);
+ VG_(snprintf)(msg + VG_(strlen)(msg), sizeof(msg) - VG_(strlen)(msg),
+ ") %d %d",
+ vc_lte(&p->vc, &q->vc), vc_lte(&q->vc, &p->vc));
+ VG_(message)(Vg_DebugMsg, "%s", msg);
#endif
- // Since q iterates over the segments of thread i in order of
- // decreasing vector clocks, if q->vc <= p->vc, then
- // q->next->vc <= p->vc will also hold. Hence, break out of the
- // loop once this condition is met.
- if (vc_lte(&q->vc, &p->vc))
- break;
- if (! vc_lte(&p->vc, &q->vc))
- {
- if (bm_has_races(p->bm, q->bm))
- {
- VG_(message)(Vg_UserMsg, "Detected data races. Context:");
- tl_assert(p->stacktrace);
- show_call_stack(threadid, "1st segment start", p->stacktrace);
- show_call_stack(threadid, "1st segment end",
- p->next ? p->next->stacktrace : 0);
- tl_assert(q->stacktrace);
- show_call_stack(i, "2nd segment start", q->stacktrace);
- show_call_stack(i, "2nd segment end",
- q->next ? q->next->stacktrace : 0);
- bm_report_races(threadid, i, p->bm, q->bm);
- }
- }
+ // Since q iterates over the segments of thread i in order of
+ // decreasing vector clocks, if q->vc <= p->vc, then
+ // q->next->vc <= p->vc will also hold. Hence, break out of the
+ // loop once this condition is met.
+ if (vc_lte(&q->vc, &p->vc))
+ break;
+ if (! vc_lte(&p->vc, &q->vc))
+ {
+ if (bm_has_races(p->bm, q->bm))
+ {
+ VG_(message)(Vg_UserMsg, "----------------------------------------------------------------------");
+ tl_assert(p->stacktrace);
+ show_call_stack(threadid, "1st segment start", p->stacktrace);
+ show_call_stack(threadid, "1st segment end",
+ p->next ? p->next->stacktrace : 0);
+ tl_assert(q->stacktrace);
+ show_call_stack(i, "2nd segment start", q->stacktrace);
+ show_call_stack(i, "2nd segment end",
+ q->next ? q->next->stacktrace : 0);
+ bm_report_races(threadid, i, p->bm, q->bm);
+ }
+ }
+ }
}
- }
- }
+ }
}
void thread_report_all_races(void)
{
- unsigned i;
+ unsigned i;
- for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
- {
- if (s_threadinfo[i].last)
- {
- thread_report_races(i);
- }
- }
+ for (i = 0; i < sizeof(s_threadinfo) / sizeof(s_threadinfo[0]); i++)
+ {
+ if (s_threadinfo[i].last)
+ {
+ thread_report_races(i);
+ }
+ }
}
+
+/*
+ * Local variables:
+ * c-basic-offset: 3
+ * End:
+ */
++++++ valgrind-5999.patch -> valgrind-6012.patch ++++++
--- valgrind/valgrind-5999.patch 2006-08-24 14:43:08.000000000 +0200
+++ valgrind/valgrind-6012.patch 2006-08-26 18:06:22.000000000 +0200
@@ -1,6 +1,6 @@
Index: helgrind/hg_main.c
===================================================================
---- helgrind/hg_main.c (revision 5999)
+--- helgrind/hg_main.c (revision 6012)
+++ helgrind/hg_main.c (working copy)
@@ -2857,17 +2857,17 @@
/* Do nothing */
@@ -58,7 +58,7 @@
/*--------------------------------------------------------------------*/
Index: include/pub_tool_tooliface.h
===================================================================
---- include/pub_tool_tooliface.h (revision 5999)
+--- include/pub_tool_tooliface.h (revision 6012)
+++ include/pub_tool_tooliface.h (working copy)
@@ -411,20 +411,32 @@
void VG_(track_post_thread_join) (void(*f)(ThreadId joiner, ThreadId joinee));
@@ -110,7 +110,7 @@
*/
Index: include/pub_tool_threadstate.h
===================================================================
---- include/pub_tool_threadstate.h (revision 5999)
+--- include/pub_tool_threadstate.h (revision 6012)
+++ include/pub_tool_threadstate.h (working copy)
@@ -46,6 +46,10 @@
/* Get the TID of the thread which currently has the CPU. */
@@ -125,7 +125,7 @@
/*--------------------------------------------------------------------*/
Index: include/pub_tool_libcprint.h
===================================================================
---- include/pub_tool_libcprint.h (revision 5999)
+--- include/pub_tool_libcprint.h (revision 6012)
+++ include/pub_tool_libcprint.h (working copy)
@@ -39,15 +39,27 @@
* --log-fd/--log-file/--log-socket argument, which defaults to 2 (stderr).
@@ -173,7 +173,7 @@
#endif // __PUB_TOOL_LIBCPRINT_H
Index: include/pub_tool_debuginfo.h
===================================================================
---- include/pub_tool_debuginfo.h (revision 5999)
+--- include/pub_tool_debuginfo.h (revision 6012)
+++ include/pub_tool_debuginfo.h (working copy)
@@ -135,6 +135,9 @@
@@ -187,7 +187,7 @@
/*--------------------------------------------------------------------*/
Index: include/valgrind.h
===================================================================
---- include/valgrind.h (revision 5999)
+--- include/valgrind.h (revision 6012)
+++ include/valgrind.h (working copy)
@@ -2298,6 +2298,48 @@
VG_USERREQ__STACK_REGISTER = 0x1501,
@@ -240,21 +240,28 @@
#if !defined(__GNUC__)
Index: include/pub_tool_basics.h
===================================================================
---- include/pub_tool_basics.h (revision 5999)
+--- include/pub_tool_basics.h (revision 6012)
+++ include/pub_tool_basics.h (working copy)
-@@ -97,6 +97,9 @@
+@@ -97,6 +97,16 @@
/* ThreadIds are simply indices into the VG_(threads)[] array. */
typedef UInt ThreadId;
-+/* pthread_t as handled internally in valgrind. */
-+typedef UInt PosixThreadId;
++/* A PosixThreadId uniquely identifies a POSIX thread in the client. This
++ datatype must be able to represent any client pthread_t value. The only
++ operations performed on this datatype are copying and comparison (==).
++ Note: the POSIX standard specifies that POSIX thread IDs may be implemented
++ as a struct, and that these must be compared by calling pthread_equal().
++ Representing POSIX thread IDs by an integer, and comparing these IDs via
++ "==" is a shortcut that works (at least) on Linux.
++ */
++typedef UWord PosixThreadId;
+
/* An abstraction of syscall return values.
When .isError == False, val holds the return value.
When .isError == True, val holds the error code.
Index: configure.in
===================================================================
---- configure.in (revision 5999)
+--- configure.in (revision 6012)
+++ configure.in (working copy)
@@ -738,6 +738,9 @@
none/tests/ppc64/Makefile
@@ -268,7 +275,7 @@
cat<<EOF
Index: Makefile.am
===================================================================
---- Makefile.am (revision 5999)
+--- Makefile.am (revision 6012)
+++ Makefile.am (working copy)
@@ -8,6 +8,7 @@
callgrind \
@@ -280,17 +287,9 @@
# Temporary: we want to compile Helgrind, but not regtest it.
Index: coregrind/vg_preloaded.c
===================================================================
---- coregrind/vg_preloaded.c (revision 5999)
+--- coregrind/vg_preloaded.c (revision 6012)
+++ coregrind/vg_preloaded.c (working copy)
-@@ -46,6 +46,7 @@
- #include "pub_core_clreq.h"
- #include "pub_core_debuginfo.h" // Needed for pub_core_redir.h
- #include "pub_core_redir.h" // For VG_NOTIFY_ON_LOAD
-+#include "drd/drd_clientreq.h"
-
- /* ---------------------------------------------------------------------
- Hook for running __libc_freeres once the program exits.
-@@ -71,8 +72,6 @@
+@@ -71,8 +71,6 @@
/*--- end ---*/
/*--------------------------------------------------------------------*/
@@ -299,7 +298,7 @@
#define PTH_FUNC(ret_ty, f, args...) \
ret_ty VG_WRAP_FUNCTION_ZZ(libpthreadZdsoZd0,f)(args); \
ret_ty VG_WRAP_FUNCTION_ZZ(libpthreadZdsoZd0,f)(args)
-@@ -80,34 +79,159 @@
+@@ -80,34 +78,157 @@
#include <stdio.h>
#include <pthread.h>
@@ -331,8 +330,6 @@
+
+ VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__SET_PTHREAD_SELF,
+ pthread_self(), 0, 0, 0, 0);
-+ VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__DRD_START_NEW_SEGMENT,
-+ pthread_self(), 0, 0, 0, 0);
+ return (arg_copy.start)(arg_copy.arg);
+}
+
@@ -469,7 +466,7 @@
return ret;
}
-@@ -116,15 +240,44 @@
+@@ -116,15 +237,44 @@
pthread_mutex_t *mutex)
{
int ret;
@@ -522,7 +519,7 @@
+ */
Index: coregrind/m_syswrap/syswrap-linux.c
===================================================================
---- coregrind/m_syswrap/syswrap-linux.c (revision 5999)
+--- coregrind/m_syswrap/syswrap-linux.c (revision 6012)
+++ coregrind/m_syswrap/syswrap-linux.c (working copy)
@@ -164,7 +164,7 @@
assembler. */
@@ -553,7 +550,7 @@
"sc\n\t" /* exit(tst->os_state.exitcode) */
Index: coregrind/m_tooliface.c
===================================================================
---- coregrind/m_tooliface.c (revision 5999)
+--- coregrind/m_tooliface.c (revision 6012)
+++ coregrind/m_tooliface.c (working copy)
@@ -326,13 +326,21 @@
DEF(track_post_thread_create, ThreadId, ThreadId)
@@ -582,7 +579,7 @@
/*--------------------------------------------------------------------*/
Index: coregrind/pub_core_tooliface.h
===================================================================
---- coregrind/pub_core_tooliface.h (revision 5999)
+--- coregrind/pub_core_tooliface.h (revision 6012)
+++ coregrind/pub_core_tooliface.h (working copy)
@@ -205,10 +205,18 @@
void (*track_post_thread_create)(ThreadId, ThreadId);
@@ -608,7 +605,7 @@
Index: coregrind/m_debuginfo/debuginfo.c
===================================================================
---- coregrind/m_debuginfo/debuginfo.c (revision 5999)
+--- coregrind/m_debuginfo/debuginfo.c (revision 6012)
+++ coregrind/m_debuginfo/debuginfo.c (working copy)
@@ -912,6 +912,35 @@
return ret;
@@ -648,7 +645,7 @@
return si->symtab_used;
Index: coregrind/m_threadmodel.c
===================================================================
---- coregrind/m_threadmodel.c (revision 5999)
+--- coregrind/m_threadmodel.c (revision 6012)
+++ coregrind/m_threadmodel.c (working copy)
@@ -807,7 +807,7 @@
if (mx->state == MX_Locked && mx->owner == tid) /* deadlock */
@@ -697,7 +694,7 @@
Index: coregrind/m_scheduler/scheduler.c
===================================================================
---- coregrind/m_scheduler/scheduler.c (revision 5999)
+--- coregrind/m_scheduler/scheduler.c (revision 6012)
+++ coregrind/m_scheduler/scheduler.c (working copy)
@@ -364,7 +364,10 @@
VG_(sigemptyset)(&VG_(threads)[tid].sig_mask);
@@ -797,7 +794,7 @@
+ */
Index: coregrind/m_threadstate.c
===================================================================
---- coregrind/m_threadstate.c (revision 5999)
+--- coregrind/m_threadstate.c (revision 6012)
+++ coregrind/m_threadstate.c (working copy)
@@ -123,6 +123,41 @@
return VG_INVALID_THREADID;
@@ -843,7 +840,7 @@
/*--------------------------------------------------------------------*/
Index: coregrind/pub_core_threadstate.h
===================================================================
---- coregrind/pub_core_threadstate.h (revision 5999)
+--- coregrind/pub_core_threadstate.h (revision 6012)
+++ coregrind/pub_core_threadstate.h (working copy)
@@ -112,6 +112,7 @@
struct {
++++++ valgrind-ppc.diff ++++++
------------------------------------------------------------------------
r6010 | sewardj | 2006-08-25 13:48:38 +0200 (Fri, 25 Aug 2006) | 2 lines
SuSE 10.1 (ppc32/64) fixlet.
------------------------------------------------------------------------
Index: coregrind/m_redir.c
===================================================================
--- coregrind/m_redir.c (revision 6009)
+++ coregrind/m_redir.c (revision 6010)
@@ -762,6 +762,10 @@ void VG_(redir_initialise) ( void )
"ld.so.1", "strcmp",
(Addr)&VG_(ppc32_linux_REDIR_FOR_strcmp)
);
+ add_hardwired_spec(
+ "ld.so.1", "index",
+ (Addr)&VG_(ppc32_linux_REDIR_FOR_strchr)
+ );
}
# elif defined(VGP_ppc64_linux)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package powersave
checked in at Tue Aug 29 00:12:54 CEST 2006.
--------
--- powersave/powersave.changes 2006-08-09 14:27:12.000000000 +0200
+++ powersave/powersave.changes 2006-08-28 17:56:37.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 28 17:55:57 CEST 2006 - hmacht(a)suse.de
+
+- libpower: fix primary batteries aren't found (fseidel)
+
+-------------------------------------------------------------------
Old:
----
powersave-0.13.4.tar.bz2
New:
----
powersave-0.13.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powersave.spec ++++++
--- /var/tmp/diff_new_pack.I99JfC/_old 2006-08-29 00:12:04.000000000 +0200
+++ /var/tmp/diff_new_pack.I99JfC/_new 2006-08-29 00:12:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package powersave (Version 0.13.4)
+# spec file for package powersave (Version 0.13.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,7 +14,7 @@
BuildRequires: cpufrequtils gcc-c++ hal-devel lynx
URL: http://powersave.sourceforge.net/
Summary: General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling
-Version: 0.13.4
+Version: 0.13.5
Release: 1
License: GPL
Group: System/Daemons
@@ -171,6 +171,8 @@
%_libdir/lib*.so*
%changelog -n powersave
+* Mon Aug 28 2006 - hmacht(a)suse.de
+- libpower: fix primary batteries aren't found (fseidel)
* Wed Aug 09 2006 - fseidel(a)suse.de
- libpower: fixed minor memleaks (non valgrind-memcheck clean)
- libpower: minor speedups in often used functions
++++++ powersave-0.13.4.tar.bz2 -> powersave-0.13.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.13.4/ChangeLog new/powersave-0.13.5/ChangeLog
--- old/powersave-0.13.4/ChangeLog 2006-08-09 14:21:29.000000000 +0200
+++ new/powersave-0.13.5/ChangeLog 2006-08-14 13:17:00.000000000 +0200
@@ -1,11 +1,36 @@
-------------------------------------------------------------------
-Tue Jul 18 16:10:00 CEST 2006 - fseidel(a)suse.de
+Mon Aug 14 13:08:16 CEST 2006 - fseidel(a)suse.de
-- fix handling of writing sampling_rate for ondemand governor
- outside min-max boundaries (novell bug #178314)
+- libpower: fix primary batteries aren't found
+- r2406
-------------------------------------------------------------------
-Tue Jun 29 14:35:25 CEST 2006 - hmacht(a)suse.de
+Wed Aug 9 14:23:34 CEST 2006 - fseidel(a)suse.de
+
+- libpower: fixed minor memleaks (non valgrind-memcheck clean)
+- libpower: minor speedups in often used functions
+ (like e.g. battery.c:numBatteries()) mainly via preventing some
+ expensive libhal calls
+- code cleanups (e.g. normalisation of num_*_battery variables,
+ use of class-initialisationlists etc.)
+- fix writing of sampling_rates for ondemand governor outside
+ min-max boundaries (novell bug 178314)
+- enforce battery level limits
+ (BATTERY_CRITICAL < BATTERY_LOW < BATTERY_WARNING)
+- add missing /sbin and /usr/sbin to $PATH in thinkpad hotkey script
+- fix wttyhx with Xgl
+- fix boot kernel handling if vmlinuz-link in /boot points to an absolute
+ path
+- improved handling of non-primary batteries in powersave cmd line client
+- remove (SUSPEND2DISK|SUSPEND2RAM|STANDBY)_DELAY, it is just a useless
+ legacy feature.
+- prevent segfault if CPUFreq is disabled in configuration file
+- add warning about duplicate schemes, omitting .rpmsave and .rpmnew
+ schemefiles
+- r2396
+
+-------------------------------------------------------------------
+Thu Jun 29 13:45:11 CEST 2006 - hmacht(a)suse.de
Merge changes from CODE10 branch:
- Fix ACPI_MODULES* in update script when updating from old
@@ -35,6 +60,7 @@
running (novell bug 177347)
- shutdown from withing KDE with the power button did not work
properly under certain circumstances (novell bug 142727)
+- r2354
-------------------------------------------------------------------
Fri May 19 11:15:19 CEST 2006 - hmacht(a)suse.de
@@ -43,6 +69,7 @@
o install scheme_advanced_powersave with runtime device power
management
o CPU hotplugging support and scheme integration
+- r2248
-------------------------------------------------------------------
Mon May 8 16:19:49 CEST 2006 - hmacht(a)suse.de
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.13.4/configure new/powersave-0.13.5/configure
--- old/powersave-0.13.4/configure 2006-08-09 14:21:56.000000000 +0200
+++ new/powersave-0.13.5/configure 2006-08-14 12:57:44.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for powersave 0.13.4.
+# Generated by GNU Autoconf 2.60 for powersave 0.13.5.
#
# Report bugs to <hmacht(a)suse.de>.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='powersave'
PACKAGE_TARNAME='powersave'
-PACKAGE_VERSION='0.13.4'
-PACKAGE_STRING='powersave 0.13.4'
+PACKAGE_VERSION='0.13.5'
+PACKAGE_STRING='powersave 0.13.5'
PACKAGE_BUGREPORT='hmacht(a)suse.de'
ac_unique_file="daemon/powersaved.cpp"
@@ -1402,7 +1402,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 powersave 0.13.4 to adapt to many kinds of systems.
+\`configure' configures powersave 0.13.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1472,7 +1472,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of powersave 0.13.4:";;
+ short | recursive ) echo "Configuration of powersave 0.13.5:";;
esac
cat <<\_ACEOF
@@ -1595,7 +1595,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-powersave configure 0.13.4
+powersave configure 0.13.5
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1609,7 +1609,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by powersave $as_me 0.13.4, which was
+It was created by powersave $as_me 0.13.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2279,7 +2279,7 @@
# Define the identity of the package.
PACKAGE='powersave'
- VERSION='0.13.4'
+ VERSION='0.13.5'
cat >>confdefs.h <<_ACEOF
@@ -25257,7 +25257,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by powersave $as_me 0.13.4, which was
+This file was extended by powersave $as_me 0.13.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25310,7 +25310,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-powersave config.status 0.13.4
+powersave config.status 0.13.5
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.13.4/configure.ac new/powersave-0.13.5/configure.ac
--- old/powersave-0.13.4/configure.ac 2006-08-09 14:21:30.000000000 +0200
+++ new/powersave-0.13.5/configure.ac 2006-08-14 12:57:18.000000000 +0200
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
-AC_INIT(powersave, 0.13.4, hmacht(a)suse.de)
+AC_INIT(powersave, 0.13.5, hmacht(a)suse.de)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([daemon/powersaved.cpp])
AM_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.13.4/libpower/battery.c new/powersave-0.13.5/libpower/battery.c
--- old/powersave-0.13.4/libpower/battery.c 2006-08-09 14:21:26.000000000 +0200
+++ new/powersave-0.13.5/libpower/battery.c 2006-08-14 12:57:14.000000000 +0200
@@ -199,7 +199,7 @@
}
/* check if native battery could be found */
- if (found_native_battery) {
+ if (!found_native_battery) {
libhal_free_string_array(batteries);
return NO_DEVICE_ERROR;
}
@@ -370,7 +370,7 @@
}
/* check if native battery could be found */
- if (found_native_battery) {
+ if (!found_native_battery) {
libhal_free_string_array(batteries);
return NO_DEVICE_ERROR;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package perl-TermReadLine-Gnu
checked in at Tue Aug 29 00:12:16 CEST 2006.
--------
--- perl-TermReadLine-Gnu/perl-TermReadLine-Gnu.changes 2006-01-25 21:39:58.000000000 +0100
+++ perl-TermReadLine-Gnu/perl-TermReadLine-Gnu.changes 2006-08-28 18:38:35.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 28 18:26:30 CEST 2006 - ms(a)suse.de
+
+- synchronize the outstream fd inside the readline library (#200843)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-TermReadLine-Gnu.spec ++++++
--- /var/tmp/diff_new_pack.d5vTkg/_old 2006-08-29 00:11:48.000000000 +0200
+++ /var/tmp/diff_new_pack.d5vTkg/_new 2006-08-29 00:11:48.000000000 +0200
@@ -5,7 +5,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -13,7 +13,7 @@
Name: perl-TermReadLine-Gnu
BuildRequires: readline-devel
Version: 1.15
-Release: 1
+Release: 14
Requires: readline
Requires: perl = %{perl_version}
Autoreqprov: on
@@ -66,6 +66,8 @@
/var/adm/perl-modules/%{name}
%changelog -n perl-TermReadLine-Gnu
+* Mon Aug 28 2006 - ms(a)suse.de
+- synchronize the outstream fd inside the readline library (#200843)
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Mon Nov 28 2005 - mls(a)suse.de
++++++ Term-ReadLine-Gnu-1.15.dif ++++++
--- /var/tmp/diff_new_pack.d5vTkg/_old 2006-08-29 00:11:48.000000000 +0200
+++ /var/tmp/diff_new_pack.d5vTkg/_new 2006-08-29 00:11:48.000000000 +0200
@@ -141,3 +141,16 @@
if ( fp && do_open(gv, "+<&", 3, FALSE, 0, 0, fp) )
sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
else
+--- Gnu.pm
++++ Gnu.pm 2006/08/28 15:22:59
+@@ -277,6 +277,10 @@
+ my $self = shift;
+ my ($prompt, $preput) = @_;
+
++ # make sure the outstream fd inside the readline library is
++ # in sync (see http://bugs.debian.org/236018)
++ $Attribs{outstream} = $Attribs{outstream};
++
+ # ornament support (now prompt only)
+ $prompt = ${$Attribs{term_set}}[0] . $prompt . ${$Attribs{term_set}}[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
Hello community,
here is the log from the commit of package mutt
checked in at Tue Aug 29 00:11:18 CEST 2006.
--------
--- mutt/mutt.changes 2006-08-17 18:15:21.000000000 +0200
+++ mutt/mutt.changes 2006-08-28 14:25:02.000000000 +0200
@@ -2 +2,8 @@
-Thu Aug 17 18:13:30 CEST 2006 - werner(a)suse.de
+Mon Aug 28 14:22:33 CEST 2006 - werner(a)suse.de
+
+- Add sidebar patch to mutt to have the mailboxes around
+- Make the old variable imap_force_ssl an alias to ssl_force_tls
+ for older SuSE distributions
+
+-------------------------------------------------------------------
+Thu Aug 17 18:13:30 CEST 2006 - werner(a)suse.de
@@ -8 +15 @@
-Mon Jul 17 16:54:25 CEST 2006 - werner(a)suse.de
+Mon Jul 17 16:54:25 CEST 2006 - werner(a)suse.de
New:
----
patch-1.5.13.sidebar.20060804.txt.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.pksth8/_old 2006-08-29 00:10:46.000000000 +0200
+++ /var/tmp/diff_new_pack.pksth8/_new 2006-08-29 00:10:46.000000000 +0200
@@ -24,7 +24,7 @@
#Requires: desktop-data-SuSE
Autoreqprov: on
Version: 1.5.13
-Release: 1
+Release: 3
Summary: Mail Program
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# ftp://ftp.mutt.org/mutt/devel/
@@ -38,6 +38,8 @@
Patch3: %name-1.5.9i-sendgroupreplyto.diff
Patch4: %name-1.5.11-wrapcolumn.diff
Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1
+# http://lunar-linux.org/index.php?page=mutt-sidebar
+Patch6: patch-1.5.13.sidebar.20060804.txt.bz2
%description
A very powerful mail user agent. It supports (among other nice things)
@@ -59,6 +61,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
cp Muttrc Muttrc.SuSE
cp %{S:2} .
@@ -68,6 +71,9 @@
%if %suse_version > 1000
CFLAGS="$CFLAGS -fstack-protector"
%endif
+%if %suse_version < 1020
+CFLAGS="$CFLAGS -DSUSE_IMAP_FORCE_SSL"
+%endif
export CC CFLAGS
./configure $RPM_ARCH-suse-linux \
--disable-domain \
@@ -137,6 +143,10 @@
%config(noreplace) /etc/Muttrc
%changelog -n mutt
+* Mon Aug 28 2006 - werner(a)suse.de
+- Add sidebar patch to mutt to have the mailboxes around
+- Make the old variable imap_force_ssl an alias to ssl_force_tls
+ for older SuSE distributions
* Thu Aug 17 2006 - werner(a)suse.de
- Update to mutt 1.5.13
* Various fixes in imap handling
++++++ mutt-1.5.13.dif ++++++
--- /var/tmp/diff_new_pack.pksth8/_old 2006-08-29 00:10:46.000000000 +0200
+++ /var/tmp/diff_new_pack.pksth8/_new 2006-08-29 00:10:46.000000000 +0200
@@ -246,6 +246,18 @@
fi
saved_LIBS="$LIBS"
+--- init.h
++++ init.h 2006-08-17 19:07:25.000000000 +0200
+@@ -1951,6 +1951,9 @@ struct option_t MuttVars[] = {
+ ** since it would otherwise have to abort the connection anyway. This
+ ** option supersedes ``$$ssl_starttls''.
+ */
++#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL)
++ { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 },
++#endif
+ { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
+ /*
+ ** .pp
--- doc/Makefile.in
+++ doc/Makefile.in 2006-08-17 18:34:10.000000000 +0200
@@ -431,7 +431,7 @@ uninstall-local:
++++++ patch-1.5.13.sidebar.20060804.txt.bz2 ++++++
++++ 1657 lines (skipped)
++++++ patch-1.5.5.1.nt.xtitles.3.ab.1 ++++++
--- /var/tmp/diff_new_pack.pksth8/_old 2006-08-29 00:10:46.000000000 +0200
+++ /var/tmp/diff_new_pack.pksth8/_new 2006-08-29 00:10:46.000000000 +0200
@@ -127,16 +127,7 @@
diff -ur ../MUTT/mutt/pager.c mutt/pager.c
--- ../MUTT/mutt/pager.c 2004-01-05 19:49:00.000000000 +0100
+++ mutt/pager.c 2004-01-19 13:45:37.000000000 +0100
-@@ -26,6 +26,8 @@
- #include "pager.h"
- #include "attach.h"
- #include "mbyte.h"
-+void set_xterm_title_bar(char *title);
-+void set_xterm_icon_name(char *name);
-
- #include "mx.h"
-
-@@ -1740,6 +1742,13 @@
+@@ -1740,6 +1740,13 @@
SETCOLOR (MT_COLOR_STATUS);
mutt_paddstr (COLS, buffer);
SETCOLOR (MT_COLOR_NORMAL);
@@ -150,3 +141,14 @@
}
redraw = 0;
+diff -ur ../MUTT/mutt/mutt_menu.h mutt/mutt_menu.h
+--- ../MUTT/mutt/mutt_menu.h 2005-09-18 10:22:22.000000000 +0200
++++ mutt/mutt_menu.h 2006-08-28 13:17:19.000000000 +0200
+@@ -112,4 +112,7 @@
+ void index_make_entry (char *, size_t, struct menu_t *, int);
+ int index_color (int);
+
++void set_xterm_title_bar(char *);
++void set_xterm_icon_name(char *);
++
+ #endif /* _MUTT_MENU_H_ */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package lilo
checked in at Tue Aug 29 00:10:39 CEST 2006.
--------
--- arch/ppc/lilo/lilo.changes 2006-06-12 14:47:04.000000000 +0200
+++ lilo/lilo.changes 2006-08-27 10:37:29.000000000 +0200
@@ -1,0 +2,95 @@
+Sun Aug 27 10:35:23 CEST 2006 - olh(a)suse.de
+
+- remove unused option progressbar from lilo
+
+-------------------------------------------------------------------
+Sun Aug 27 10:32:52 CEST 2006 - olh(a)suse.de
+
+- compile yaboot with -mcpu=powerpc to reduce binary size
+
+-------------------------------------------------------------------
+Sat Aug 26 18:06:06 CEST 2006 - olh(a)suse.de
+
+- introduce lilo.conf option optional to skip unavailable kernels
+ (202072)
+
+-------------------------------------------------------------------
+Sat Aug 26 17:05:35 CEST 2006 - olh(a)suse.de
+
+- introduce lilo.conf option no-os-chooser for headless G5 crash
+ (202069)
+
+-------------------------------------------------------------------
+Sat Aug 26 14:42:18 CEST 2006 - olh(a)suse.de
+
+- add asm libgcc functions to remove libgcc.a usage
+
+-------------------------------------------------------------------
+Sat Aug 26 12:22:58 CEST 2006 - olh(a)suse.de
+
+- change static buffers to dynamically allocated ones in yaboot_text_ui
+
+-------------------------------------------------------------------
+Sat Aug 26 12:04:37 CEST 2006 - olh(a)suse.de
+
+- fs_t->open is always called with a valid partition in yaboot
+
+-------------------------------------------------------------------
+Sat Aug 26 11:44:36 CEST 2006 - olh(a)suse.de
+
+- use a shared printf_buf for prom_v{f,}printf in yaboot
+
+-------------------------------------------------------------------
+Sat Aug 26 11:30:28 CEST 2006 - olh(a)suse.de
+
+- remove unused /chosen/memory usage from yaboot
+
+-------------------------------------------------------------------
+Sat Aug 26 11:28:45 CEST 2006 - olh(a)suse.de
+
+- merge fs.c into file.c in yaboot
+
+-------------------------------------------------------------------
+Fri Aug 25 23:32:23 CEST 2006 - olh(a)suse.de
+
+- fix and simplify the filesystem detection in yaboot in file_block_open
+
+-------------------------------------------------------------------
+Fri Aug 25 17:45:29 CEST 2006 - olh(a)suse.de
+
+- parted print has now a space before the partition number in parted
+ version 1.7. Remove it leading spaces for partition numbers (196212)
+
+-------------------------------------------------------------------
+Fri Aug 18 16:36:36 CEST 2006 - olh(a)suse.de
+
+- fill mem region returned by malloc with 'Z'
+
+-------------------------------------------------------------------
+Fri Aug 18 16:35:41 CEST 2006 - olh(a)suse.de
+
+- run indent in yaboot sources
+
+-------------------------------------------------------------------
+Wed Jul 26 11:03:38 CEST 2006 - olh(a)suse.de
+
+- read /proc/device-tree/device_type instead of device-type (#177314)
+
+-------------------------------------------------------------------
+Mon Jul 17 14:25:49 CEST 2006 - olh(a)suse.de
+
+- handle IDE device_type spi on pegasos in show_of_path.sh
+
+-------------------------------------------------------------------
+Mon Jul 17 14:12:27 CEST 2006 - olh(a)suse.de
+
+- do not use the firmware filesystem driver in yaboot unless
+ it is a mac disk label. pegasos firmware behaves similar to
+ chrp as described in bug #136537
+
+-------------------------------------------------------------------
+Mon Jul 17 11:08:41 CEST 2006 - olh(a)suse.de
+
+- handle pegasos return value -2 from read stdin in yaboot
+
+-------------------------------------------------------------------
Old:
----
lilo-10.1.14.tar.bz2
yaboot-10.1.14-r716.tar.bz2
New:
----
lilo-10.1.15.tar.bz2
yaboot-10.1.15-r766.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.pdjuFf/_old 2006-08-29 00:10:05.000000000 +0200
+++ /var/tmp/diff_new_pack.pdjuFf/_new 2006-08-29 00:10:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lilo (Version 10.1.14)
+# spec file for package lilo (Version 10.1.15)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: lilo
-%define yaboot_vers 10.1.14-r716
+%define yaboot_vers 10.1.15-r766
Group: System/Boot
License: BSD, Other License(s), see package
Summary: The Linux Loader, a Boot Menu
@@ -22,7 +22,7 @@
Requires: gawk sed coreutils
Requires: powerpc-utils
Requires: binutils
-Version: 10.1.14
+Version: 10.1.15
Release: 1
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
@@ -160,6 +160,47 @@
%doc %{_mandir}/*/*
%changelog -n lilo
+* Sun Aug 27 2006 - olh(a)suse.de
+- remove unused option progressbar from lilo
+* Sun Aug 27 2006 - olh(a)suse.de
+- compile yaboot with -mcpu=powerpc to reduce binary size
+* Sat Aug 26 2006 - olh(a)suse.de
+- introduce lilo.conf option optional to skip unavailable kernels
+ (202072)
+* Sat Aug 26 2006 - olh(a)suse.de
+- introduce lilo.conf option no-os-chooser for headless G5 crash
+ (202069)
+* Sat Aug 26 2006 - olh(a)suse.de
+- add asm libgcc functions to remove libgcc.a usage
+* Sat Aug 26 2006 - olh(a)suse.de
+- change static buffers to dynamically allocated ones in yaboot_text_ui
+* Sat Aug 26 2006 - olh(a)suse.de
+- fs_t->open is always called with a valid partition in yaboot
+* Sat Aug 26 2006 - olh(a)suse.de
+- use a shared printf_buf for prom_v{f,}printf in yaboot
+* Sat Aug 26 2006 - olh(a)suse.de
+- remove unused /chosen/memory usage from yaboot
+* Sat Aug 26 2006 - olh(a)suse.de
+- merge fs.c into file.c in yaboot
+* Fri Aug 25 2006 - olh(a)suse.de
+- fix and simplify the filesystem detection in yaboot in file_block_open
+* Fri Aug 25 2006 - olh(a)suse.de
+- parted print has now a space before the partition number in parted
+ version 1.7. Remove it leading spaces for partition numbers (196212)
+* Fri Aug 18 2006 - olh(a)suse.de
+- fill mem region returned by malloc with 'Z'
+* Fri Aug 18 2006 - olh(a)suse.de
+- run indent in yaboot sources
+* Wed Jul 26 2006 - olh(a)suse.de
+- read /proc/device-tree/device_type instead of device-type (#177314)
+* Mon Jul 17 2006 - olh(a)suse.de
+- handle IDE device_type spi on pegasos in show_of_path.sh
+* Mon Jul 17 2006 - olh(a)suse.de
+- do not use the firmware filesystem driver in yaboot unless
+ it is a mac disk label. pegasos firmware behaves similar to
+ chrp as described in bug #136537
+* Mon Jul 17 2006 - olh(a)suse.de
+- handle pegasos return value -2 from read stdin in yaboot
* Mon Jun 12 2006 - jplack(a)suse.de
- added sas support on Power6, patch by Brian King (#183466)
- bump version to 10.1.14
++++++ lilo-10.1.14.tar.bz2 -> lilo-10.1.15.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.14/lilo-chrp.lib new/lilo-10.1.15/lilo-chrp.lib
--- old/lilo-10.1.14/lilo-chrp.lib 2006-05-24 13:45:53.000000000 +0200
+++ new/lilo-10.1.15/lilo-chrp.lib 2006-08-26 18:11:46.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo-chrp.lib 719 2006-05-24 11:45:53Z jplack $
+# $Id: lilo-chrp.lib 761 2006-08-26 16:11:46Z olh $
# vim: syntax=sh
#
# library for CHRP routines
@@ -206,6 +206,7 @@
# check whether any image or initrd needs relocation to a FAT boot partition
#
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
+ test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
if [ "${CONFIG_IMAGE_OTHER[$i]}" ]; then
warning "There is no chain loader support for yaboot yet" \
"Entry 'other = ${CONFIG_IMAGE_OTHER[$i]}' ignored"
@@ -423,6 +424,7 @@
echo "# image section"
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
[ "${CONFIG_IMAGE_OTHER[$i]}" ] && continue
+ [ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" ] && continue
[ "${CONFIG_IMAGE_FILE[$i]}" ] || continue
echo -n "image = "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.14/lilo-iseries.lib new/lilo-10.1.15/lilo-iseries.lib
--- old/lilo-10.1.14/lilo-iseries.lib 2006-03-01 09:13:31.000000000 +0100
+++ new/lilo-10.1.15/lilo-iseries.lib 2006-08-26 18:11:46.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: lilo-iseries.lib 595 2006-03-01 08:13:31Z olh $
+# $Id: lilo-iseries.lib 761 2006-08-26 16:11:46Z olh $
# vim: syntax=sh
#
# library for iSeries specific routines
@@ -13,6 +13,7 @@
if [ ! -z "$OPTION_DEFAULT" ] ; then
# find the default= line
for ((i=1; i<=CONFIG_IMAGE_COUNT; i++)); do
+ test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
if [ "$OPTION_DEFAULT" = "${CONFIG_IMAGE_LABEL[$i]}" ] ; then
ISERIES_IMAGE="${CONFIG_IMAGE_FILE[$i]}"
if [ -n "$OPTION_APPEND" ] ; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.14/lilo-pmac.lib new/lilo-10.1.15/lilo-pmac.lib
--- old/lilo-10.1.14/lilo-pmac.lib 2006-05-01 11:34:03.000000000 +0200
+++ new/lilo-10.1.15/lilo-pmac.lib 2006-08-26 18:11:46.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: lilo-pmac.lib 706 2006-05-01 09:34:03Z olh $
+# $Id: lilo-pmac.lib 761 2006-08-26 16:11:46Z olh $
# vim: syntax=sh
#
# library for PowerMac routings
@@ -32,6 +32,7 @@
echo
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
test -z "${CONFIG_IMAGE_OTHER[$i]}" || continue
+ test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
echo "image = ${HFS_BOOTFOLDER}:`basename ${CONFIG_IMAGE_FILE[$i]}`"
test -z "${CONFIG_IMAGE_LABEL[$i]}" || echo " label = ${CONFIG_IMAGE_LABEL[$i]}"
test -z "${CONFIG_IMAGE_ROOT[$i]}" || echo " root = ${CONFIG_IMAGE_ROOT[$i]}"
@@ -64,6 +65,7 @@
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
test -z "${CONFIG_IMAGE_OTHER[$i]}" || continue
+ test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
hcopy ${CONFIG_IMAGE_FILE[$i]} :`basename ${CONFIG_IMAGE_FILE[$i]}`
if [ "${CONFIG_IMAGE_INITRD[$i]}" ]; then
hcopy ${CONFIG_IMAGE_INITRD[$i]} :`basename ${CONFIG_IMAGE_INITRD[$i]}`
@@ -83,6 +85,7 @@
# build the pathnames, copy the files to bootfolder if / is not bootable
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
test -z ${CONFIG_IMAGE_FILE[$i]} && continue
+ test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
unset FILE_PATH
# check if the file is a real file
@@ -128,6 +131,7 @@
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
[ "${CONFIG_IMAGE_OTHER[$i]}" ] && continue
+ test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
if [ "${CONFIG_IMAGE_PATH[$i]}" = "copy" ] ; then
echo "image = `basename ${CONFIG_IMAGE_FILE[$i]}`"
else
@@ -245,21 +249,27 @@
hmkdir $HFS_BOOTFOLDER 2>/dev/null
hattrib -b $HFS_BOOTFOLDER
hcd $HFS_BOOTFOLDER
- hcopy $TEMP/os-chooser :os-chooser
hcopy $TEMP/yaboot.conf :yaboot.conf
hcopy /lib/lilo/pmac/yaboot :yaboot
hcopy /lib/lilo/pmac/Finder.bin :Finder
hcopy /lib/lilo/pmac/System.bin :System
- hattrib -t tbxi -c chrp os-chooser
hattrib -t BINA -c UNIX "Mac OS Rom" 2>/dev/null
hattrib -t BINA -c UNIX "install" 2>/dev/null
hattrib -t FNDR -c MACS Finder
hattrib -t zsys -c MACS System
hattrib -t TEXT -c "R*ch" yaboot.conf
- hattrib -t BINA -c UNIX yaboot
+ if [ "$OPTION_NO_OS_CHOOSER" = "yes" ] ; then
+ hattrib -t tbxi -c chrp yaboot
+ hattrib -t TEXT -c "R*ch" os-chooser 2>/dev/null
+ else
+ hcopy $TEMP/os-chooser :os-chooser
+ hattrib -t BINA -c UNIX yaboot
+ hattrib -t tbxi -c chrp os-chooser
+ fi
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
test -z "${CONFIG_IMAGE_OTHER[$i]}" || continue
+ test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
if [ "${CONFIG_IMAGE_PATH[$i]}" = "copy" ] ; then
hcopy ${CONFIG_IMAGE_FILE[$i]} :`basename ${CONFIG_IMAGE_FILE[$i]}`
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.14/lilo.new new/lilo-10.1.15/lilo.new
--- old/lilo-10.1.14/lilo.new 2006-05-24 13:47:01.000000000 +0200
+++ new/lilo-10.1.15/lilo.new 2006-08-27 10:37:29.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo.new 720 2006-05-24 11:47:01Z jplack $
+# $Id: lilo.new 767 2006-08-27 08:37:29Z olh $
#
# a simple lilo to store the boot loader and the kernel images
# in bash2 ... Think different [tm]
@@ -63,7 +63,7 @@
function Usage() {
cat <<EOHELP
-lilo for PowerPC 10.1.14
+lilo for PowerPC 10.1.15
configures the Linux Loader on a few different PowerPC board types,
based on the configuration file /etc/lilo.conf.
This includes IBM RS/6000 and pSeries models, IBM legacy iSeries,
@@ -218,7 +218,7 @@
}
function parted_print(){
local device=$1
- $PARTED "$device" unit s print
+ $PARTED "$device" unit s print | sed '/^[[:blank:]]\+[0-9]/s@^[[:blank:]]\+@@'
}
else
@@ -431,7 +431,7 @@
esac
fi
if [ -z "$board_type" ]; then
- case $(</proc/device-tree/device-type) in
+ case $(</proc/device-tree/device_type) in
chrp)
board_type=chrp
;;
@@ -460,7 +460,7 @@
get_arch=1
;;
--version|-v)
- echo "lilo for PowerPC 10.1.14"
+ echo "lilo for PowerPC 10.1.15"
exit 0
;;
--help)
@@ -519,6 +519,7 @@
# OPTION_OTHER contains the MacOS partition
# OPTION_BOOTFOLDER contains the MacOS folder with the bootstuff
# OPTION_ACTIVATE is a flag whether or not the boot partition must be set active in OF
+ # OPTION_NO_OS_CHOOSER is a flag whether or not the bootfile will be a Forth script or yaboot itself
# OPTION_TIMEOUT contains the timeout variable in seconds
# OPTION_DEFAULT contains the default label
# OPTION_ROOT contains the global or local root= device
@@ -529,6 +530,7 @@
# CONFIG_IMAGE_FILE array contains the kernel image for a section
# CONFIG_IMAGE_OTHER array contains the device of MacOS
# CONFIG_IMAGE_COPY array contains copy flag for images on macs
+ # CONFIG_IMAGE_OPTIONAL array contains flag about image/initrd availibility
# CONFIG_IMAGE_COUNT is a simple counter of image sections
declare option
local separator value
@@ -582,6 +584,10 @@
[ "$CONFIG_PARSE_HASIMAGE" ] && error 7
OPTION_ACTIVATE="yes"
;;
+ no-os-chooser)
+ [ "$CONFIG_PARSE_HASIMAGE" ] && error 7
+ OPTION_NO_OS_CHOOSER="yes"
+ ;;
force_fat)
[ "$CONFIG_PARSE_HASIMAGE" ] && error 7
OPTION_FORCEFAT="yes"
@@ -590,9 +596,6 @@
[ "$CONFIG_PARSE_HASIMAGE" ] && error 7
OPTION_FORCE="yes"
;;
- progressbar)
- # do nothing
- ;;
bootfolder)
[ "$CONFIG_PARSE_HASIMAGE" ] && error 7
OPTION_BOOTFOLDER=":${value}"
@@ -614,6 +617,7 @@
CONFIG_PARSE_HASIMAGE=true
let CONFIG_IMAGE_COUNT++
CONFIG_IMAGE_FILE[$CONFIG_IMAGE_COUNT]=$value
+ CONFIG_IMAGE_OPTIONAL[$CONFIG_IMAGE_COUNT]="no"
;;
other)
# check if previous image section has a label
@@ -640,6 +644,10 @@
[ "$CONFIG_PARSE_HASIMAGE" ] || error 8
CONFIG_IMAGE_COPY[$CONFIG_IMAGE_COUNT]="true"
;;
+ optional)
+ [ "$CONFIG_PARSE_HASIMAGE" ] || error 8
+ CONFIG_IMAGE_OPTIONAL[$CONFIG_IMAGE_COUNT]="yes"
+ ;;
label)
[ "$CONFIG_PARSE_HASIMAGE" ] || error 8
CONFIG_IMAGE_LABEL[$CONFIG_IMAGE_COUNT]=$value
@@ -698,10 +706,20 @@
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
if [ ! -f ${CONFIG_IMAGE_FILE[$i]} ] ; then
- error "image = ${CONFIG_IMAGE_FILE[$i]} ist not a regular file"
+ if [ ${CONFIG_IMAGE_OPTIONAL[$i]} = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
+ error "${CONFIG_IMAGE_LABEL[$i]}: image = ${CONFIG_IMAGE_FILE[$i]} ist not a regular file"
+ else
+ warning "${CONFIG_IMAGE_LABEL[$i]}: image = ${CONFIG_IMAGE_FILE[$i]} ist not a regular file"
+ CONFIG_IMAGE_OPTIONAL[$i]="skip"
+ fi
fi
if [ ! -f ${CONFIG_IMAGE_INITRD[$i]} ] ; then
- error "initrd = ${CONFIG_IMAGE_INITRD[$i]} ist not a regular file"
+ if [ ${CONFIG_IMAGE_OPTIONAL[$i]} = "no" -o "${CONFIG_IMAGE_LABEL[$i]}" = "$OPTION_DEFAULT" ] ; then
+ error "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]} ist not a regular file"
+ else
+ warning "${CONFIG_IMAGE_LABEL[$i]}: initrd = ${CONFIG_IMAGE_INITRD[$i]} ist not a regular file"
+ CONFIG_IMAGE_OPTIONAL[$i]="skip"
+ fi
fi
done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.14/man/lilo.conf.5 new/lilo-10.1.15/man/lilo.conf.5
--- old/lilo-10.1.14/man/lilo.conf.5 2006-04-19 00:49:18.000000000 +0200
+++ new/lilo-10.1.15/man/lilo.conf.5 2006-08-27 10:37:29.000000000 +0200
@@ -1,4 +1,4 @@
-.\" $Id: lilo.conf.5 695 2006-04-18 22:49:18Z olh $ \"
+.\" $Id: lilo.conf.5 767 2006-08-27 08:37:29Z olh $ \"
.\" vim: syntax=nroff
.TH lilo.conf 5
.SH NAME
@@ -22,6 +22,9 @@
.B activate
this option will tell lilo to update the OpenFirmware \fBboot-device\fR variable with the full OpenFirmware path pointing to the device specified in \fBboot=\fR. If this option is missing, the system may not boot.
.TP
+.B no-os-chooser
+this option will tell lilo to use yaboot as boot file instead of a Forth script named \fBos-chooser\fR. The OpenFirmware driver in the nVidia graphics card as shipped with Apple G5 systems will crash if there is no monitor attached. This happens because the Forth script calls the OPEN method to initialize the screen. The same crash happens if one holds down the Apple + Option + o + f keys during boot to get to the OpenFirmware prompt. Oddly enough, it does not happen if one holds down the Option key to get to the graphical bootselector. If this option is missing if no monitor is attached, the system may not boot.
+.TP
.B clone
does something wich is not yet documented in this man page
.TP
@@ -31,9 +34,6 @@
.B force
does something wich is not yet documented in this man page
.TP
-.B progressbar
-does something wich is not yet documented in this man page
-.TP
.B bootfolder=
specifies the name of the directory where boot related files like yaboot are stored on the Apple HFS partition. The default is \fBsuseboot\fR.
.TP
@@ -68,6 +68,10 @@
.B copy
forces the kernel and initrd to be copied to the HFS partition. This is required when the kernel and initrd resides on a filesystem not readable by yaboot.
.TP
+.B optional
+Omit the image if it or its initrd is not available.
+This is useful to specify test kernels that are not always present.
+.TP
.SH SEE ALSO
.BR lilo.conf (5),
.BR mkzimage (8),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.14/show_of_path.sh new/lilo-10.1.15/show_of_path.sh
--- old/lilo-10.1.14/show_of_path.sh 2006-06-12 14:27:01.000000000 +0200
+++ new/lilo-10.1.15/show_of_path.sh 2006-07-17 14:28:01.000000000 +0200
@@ -2,7 +2,7 @@
# vim: syntax=off
# set -ex
#
-# $Id: show_of_path.sh 724 2006-06-12 12:27:01Z jplack $
+# $Id: show_of_path.sh 731 2006-07-17 12:28:01Z olh $
# find a OF bootpath on Apple PowerMacintosh Newworld machines
# Copyright (C) 2000, 2004 Olaf Hering <olh(a)suse.de>,
# 2005 Joachim Plack <jplack(a)suse.de>
@@ -62,7 +62,7 @@
shopt -s extglob
-read d myversion d <<< "$Date: 2006-06-12 12:27:01 +0000 (Mon, 12 Jun 2006) $"
+read d myversion d <<< "$Date: 2006-07-17 12:28:01 +0000 (Mon, 17 Jul 2006) $"
function error() {
@@ -314,6 +314,13 @@
sas*)
file_storage_type=sas
;;
+ spi)
+ # pegasos firmware starts to count partitions at zero instead of 1
+ file_storage_type=ide
+ if [ "$file_partition" ]; then
+ file_partition=$(( file_partition - 1 ))
+ fi
+ ;;
ide|ata)
# TODO
# check for right file-storage_type == ide ??
++++++ yaboot-10.1.14-r716.tar.bz2 -> yaboot-10.1.15-r766.tar.bz2 ++++++
++++ 12248 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
Hello community,
here is the log from the commit of package m17n-lib
checked in at Tue Aug 29 00:10:39 CEST 2006.
--------
--- m17n-lib/m17n-lib.changes 2006-08-14 11:22:34.000000000 +0200
+++ m17n-lib/m17n-lib.changes 2006-08-28 12:50:32.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Aug 28 12:45:06 CEST 2006 - mfabian(a)suse.de
+
+- update to 1.3.3.20060828 (fixes bugzilla #199870).
+ • If the environment variable "M17NDIR" is not set, the
+ directory "~/.m17n.d" is serched for database files.
+ • New function mfont_list_family_names () returns a list of
+ available font family names.
+ • New functions mlanguage_list (), mlanguage_code (),
+ mlanguage_name (), and mlanguage_text () return various
+ language-related information.
+ • New functions mscript_list () and mscript_language_list ()
+ return various script-related information.
+
+-------------------------------------------------------------------
Old:
----
m17n-lib-1.3.3.20060620.tar.bz2
New:
----
m17n-lib-1.3.3.20060828.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ m17n-lib.spec ++++++
--- /var/tmp/diff_new_pack.glMc2P/_old 2006-08-29 00:10:16.000000000 +0200
+++ /var/tmp/diff_new_pack.glMc2P/_new 2006-08-29 00:10:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package m17n-lib (Version 1.3.3.20060620)
+# spec file for package m17n-lib (Version 1.3.3.20060828)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,8 +17,8 @@
%else
%define appdefdir /usr/X11R6/lib/X11
%endif
-Version: 1.3.3.20060620
-Release: 2
+Version: 1.3.3.20060828
+Release: 1
License: LGPL, X11/MIT
Group: System/I18n/Japanese
Autoreqprov: on
@@ -28,7 +28,7 @@
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n login
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-lib
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-db
-Source0: http://www.m17n.org/m17n-lib/download/m17n-lib-1.3.3.20060620.tar.bz2
+Source0: http://www.m17n.org/m17n-lib/download/m17n-lib-1.3.3.20060828.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Multilingual Text Processing Library for the C Language
@@ -113,6 +113,17 @@
%{_libdir}/pkgconfig/*.pc
%changelog -n m17n-lib
+* Mon Aug 28 2006 - mfabian(a)suse.de
+- update to 1.3.3.20060828 (fixes bugzilla #199870).
+ • If the environment variable "M17NDIR" is not set, the
+ directory "~/.m17n.d" is serched for database files.
+ • New function mfont_list_family_names () returns a list of
+ available font family names.
+ • New functions mlanguage_list (), mlanguage_code (),
+ mlanguage_name (), and mlanguage_text () return various
+ language-related information.
+ • New functions mscript_list () and mscript_language_list ()
+ return various script-related information.
* Mon Aug 14 2006 - mfabian(a)suse.de
- move app-defaults to /usr/share/X11 (for X11R7).
* Tue Jun 20 2006 - mfabian(a)suse.de
++++++ m17n-lib-1.3.3.20060620.tar.bz2 -> m17n-lib-1.3.3.20060828.tar.bz2 ++++++
++++ 4230 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
Hello community,
here is the log from the commit of package m17n-db
checked in at Tue Aug 29 00:10:09 CEST 2006.
--------
--- m17n-db/m17n-db.changes 2006-06-20 12:43:08.000000000 +0200
+++ m17n-db/m17n-db.changes 2006-08-28 15:24:25.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 28 15:22:47 CEST 2006 - mfabian(a)suse.de
+
+- update to 1.3.3.20060828:
+ ⢠several new input methods are added
+ (ru-phonetic.mim (Russian)).
+
+-------------------------------------------------------------------
Old:
----
m17n-db-1.3.3.20060620.tar.bz2
New:
----
m17n-db-1.3.3.20060828.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ m17n-db.spec ++++++
--- /var/tmp/diff_new_pack.mXtW3T/_old 2006-08-29 00:09:59.000000000 +0200
+++ /var/tmp/diff_new_pack.mXtW3T/_new 2006-08-29 00:09:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package m17n-db (Version 1.3.3.20060620)
+# spec file for package m17n-db (Version 1.3.3.20060828)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: m17n-db
BuildRequires: glibc-i18ndata
-Version: 1.3.3.20060620
+Version: 1.3.3.20060828
Release: 1
License: LGPL, distributable
Group: System/I18n/Japanese
@@ -22,7 +22,7 @@
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n login
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-lib
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-db
-Source0: http://www.m17n.org/m17n-lib/download/m17n-db-1.3.3.20060620.tar.bz2
+Source0: http://www.m17n.org/m17n-lib/download/m17n-db-1.3.3.20060828.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: m17n Database Needed by the m17n Library m17n-lib
@@ -67,6 +67,10 @@
%{_libdir}/pkgconfig/m17n-db.pc
%changelog -n m17n-db
+* Mon Aug 28 2006 - mfabian(a)suse.de
+- update to 1.3.3.20060828:
+ ⢠several new input methods are added
+ (ru-phonetic.mim (Russian)).
* Tue Jun 20 2006 - mfabian(a)suse.de
- update to 1.3.3.20060620:
+ m17n-db.pc file has been added
++++++ m17n-db-1.3.3.20060620.tar.bz2 -> m17n-db-1.3.3.20060828.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/ChangeLog new/m17n-db-1.3.3.20060828/ChangeLog
--- old/m17n-db-1.3.3.20060620/ChangeLog 2006-06-20 12:30:11.000000000 +0200
+++ new/m17n-db-1.3.3.20060828/ChangeLog 2006-08-28 15:22:17.000000000 +0200
@@ -1,3 +1,58 @@
+2006-07-26 TAKAHASHI Naoto <ntakahas(a)m17n.org>
+
+ * THAI-OTF.flt: Elaborate category.
+
+2006-07-24 TAKAHASHI Naoto <ntakahas(a)m17n.org>
+
+ * THAI-OTF.flt: New file.
+
+ * LAOO-OTF.flt: Simplify category. Add syllable segmentation.
+
+ * truetype.fst, mdb.dir, Makefile.am: Add an entry for Thai OTF.
+
+2006-07-24 Theppitak Karoonboonyanan <thep(a)linux.thai.net> (tiny change)
+
+ * th-kesmanee.mim: Several keys fixed.
+
+2006-07-21 Kenichi Handa <handa(a)m17n.org>
+
+ * generic.fst: Add an entry for Thai OTF.
+
+2006-07-14 Kenichi Handa <handa(a)m17n.org>
+
+ * SCRIPT.tbl (arabic): Delete #x656, add #x621.
+
+2006-07-14 TAKAHASHI Naoto <ntakahas(a)m17n.org>
+
+ * LAOO-OTF.flt, mdb.dir, default.fst, truetype.fst, Makefile.am:
+ Add support for Lao OTF.
+
+2006-07-10 Kenichi Handa <handa(a)m17n.org>
+
+ * ru-phonetic.mim: New input method.
+
+ * Makefile.am (INPUT_METHOD): Add ru-phonetic.mim.
+
+2006-07-03 Kenichi Handa <handa(a)m17n.org>
+
+ * SCRIPT.tbl: Fix typos (#XXXX -> #xXXXX).
+
+2006-06-30 Kenichi Handa <handa(a)m17n.org>
+
+ * SCRIPT.tbl (greek): Add representative characters.
+
+ * LANGUAGE.tbl (ja): Change representative characters.
+
+2006-06-23 Kenichi Handa <handa(a)m17n.org>
+
+ * mdb.dir: Add an entry for SCRIPT.tbl.
+
+ * SCRIPT-OTF.tbl: Add tailing spaces if necessary.
+
+ * Makefile.am (MISC_TABLE): Add SCRIPT.tbl.
+
+ * SCRIPT.tbl: New file.
+
2006-05-30 TAKAHASHI Naoto <ntakahas(a)m17n.org>
* KHMR-OTF.flt: Fix typo.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/FORMATS/CharsetList.ja.txt new/m17n-db-1.3.3.20060828/FORMATS/CharsetList.ja.txt
--- old/m17n-db-1.3.3.20060620/FORMATS/CharsetList.ja.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/FORMATS/CharsetList.ja.txt 2006-08-16 03:33:32.000000000 +0200
@@ -0,0 +1,60 @@
+/* Copyright (C) 2003, 2004
+ National Institute of Advanced Industrial Science and Technology (AIST)
+ Registration Number H15PRO112
+ See the end for copying conditions. */
+
+/***en
+
+@page mdbCharsetList Êž»ú¥»¥Ã¥ÈÄêµÁ€Î¥ê¥¹¥È
+
+@section cslist-description ÀâÌÀ
+
+m17n ¥é¥€¥Ö¥é¥ê€Ï¡¢m17n¥Ç¡Œ¥¿¥Ù¡Œ¥¹€Î¥¿¥°\<charset-list\>€Î€Ä€€€¿¥Ç¡Œ¥¿
+€«€é¡¢Êž»ú¥»¥Ã¥ÈÄêµÁ€Î¥ê¥¹¥È€ò¥í¡Œ¥É€¹€ë¡£€³€Î¥Ç¡Œ¥¿€Ï°Ê²Œ€Î¥Õ¥©¡Œ¥Þ¥Ã
+¥È€Î¥×¥í¥Ñ¥Æ¥£¥ê¥¹¥È€È€·€Æ¥í¡Œ¥É€µ€ì€ë¡£
+
+@verbatim
+CHARSET-LIST ::= DEFINITION *
+
+DEFINITION ::= '(' NAME ( KEY VALUE ) * ')'
+
+NAME ::= SYMBOL
+
+KEY ::= SYMBOL
+
+VALUE ::= SYMBOL | INTEGER | MTEXT | PLIST
+@endverbatim
+
+@c NAME €ÏÄêµÁ€¹€ëÊž»ú¥»¥Ã¥È€ÎÌŸÁ°€Ç€¢€ë¡£
+
+@c KEY €È @c VALUE €Î¥Ú¥¢€Ï¡¢ŽØ¿ô mchar_define_charset () €Ë£²ÈÖÌ܀ΰú
+¿ô $PLIST €Î³ÆÍ×ÁǀȀ·€ÆÍ¿€š€é€ì€ë¥×¥í¥Ñ¥Æ¥£€Ç€¢€ë¡£
+
+@section cslist-seealso »²ŸÈ
+
+@ref mdbGeneral "mdbGeneral(5)", mchar_define_charset ()
+*/
+
+/*
+Copyright (C) 2003, 2004
+ National Institute of Advanced Industrial Science and Technology (AIST)
+ Registration Number H15PRO112
+
+This file is part of the m17n database; a sub-part of the m17n
+library.
+
+The m17n 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.
+
+The m17n 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 the m17n library; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307, USA.
+*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/FORMATS/IM.ja.txt new/m17n-db-1.3.3.20060828/FORMATS/IM.ja.txt
--- old/m17n-db-1.3.3.20060620/FORMATS/IM.ja.txt 2005-12-20 09:40:43.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/FORMATS/IM.ja.txt 2006-08-28 15:22:18.000000000 +0200
@@ -104,6 +104,7 @@
| '@5' | '@6' | '@7' | '@8' | '@9'
| '@<' | '@=' | '@>' | '@-' | '@+' | '@[' | '@]'
| '@@
+ | '@-N | '@+N
@endverbatim
@verbatim
MACRO-LIST ::= '(' 'macro' MACRO * ')'
@@ -134,15 +135,21 @@
@verbatim
STATE-LIST ::= '(' 'state' STATE * ')'
-STATE ::= '(' STATE-NAME BRANCH * ')'
+STATE ::= '(' STATE-NAME [ STATE-TITLE-TEXT ] BRANCH * ')'
STATE-NAME ::= SYMBOL
+STATE-TITLE-TEXT ::= MTEXT
+
BRANCH ::= '(' MAP-NAME BRANCH-ACTION * ')'
| '(' nil BRANCH-ACTION * ')'
| '(' t BRANCH-ACTION * ')'
@endverbatim
+@STATE-TITLE-TEXT €Ï¡¢€â€·»ØÄꀵ€ì€Æ€€€ì€Ð¡¢¥€¥ó¥×¥Ã¥È¥á¥œ¥Ã¥É€¬€³€ÎŸõ
+Âրˀ¢€ë»þ¥¹¥¯¥ê¡Œ¥óŸå€ËÉœŒš€µ€ì€ë¥Æ¥¥¹¥È€Ç€¢€ë¡£ŸÊά€µ€ì€¿Ÿì¹ç€Ë€Ï
+@STATE-TITLE-TEXT €¬ÍÑ€€€é€ì€ë¡£
+
@c BRANCH €ÎÂè°ì€Î·ÁŒ°€Ç€Ï¡¢@c MAP-NAME €Ï @c MAP €Ëžœ€ï€ì€ë€â€Î€Ç€Ê€¯
€Æ€Ï€Ê€é€Ê€€¡£€³€ÎŸì¹ç¡¢@c MAP-NAME €Î @c KEYSEQ €Î°ì€Ä€Ë¹çÃ×€¹€ë¥¡ŒÎó
€¬¥¿¥€¥×€µ€ì€ì€Ð¡¢ @c BRANCH-ACTION €¬ŒÂ¹Ô€µ€ì€ë¡£
@@ -228,6 +235,25 @@
</ul>
+°Ê²Œ€Ï¥µ¥é¥Š¥ó¥É¥Æ¥¥¹¥ÈœèÍý€ËÍÑ€€€é€ì€ë¡£
+
+<ul>
+<li> @c @@-N
+
+€³€³€Ç @c N €ÏÀµ€ÎÀ°¿ô€Ç€¢€ë¡£€³€ÎÊÑ¿ô€ÎÃ̀ϡ¢¥µ¥é¥Š¥ó¥É¥Æ¥¥¹¥È€Îžœºß
+€Î caret €«€é¿ô€š€Æ @c N €À€±Á°€Î°ÌÃÖ€ÎÊž»ú€Ç€¢€ë¡£@c delete ¥¢¥¯¥·¥ç¥ó€Î
+°ú¿ô€È€·€ÆÍÑ€€€é€ì€¿Ÿì¹ç¡¢€³€ÎÊÑ¿ô€Ï¥µ¥é¥Š¥ó¥É¥Æ¥¥¹¥È€ÎÃæ€ÎÀè¹Ô€¹€ë²¿
+Êž»ú€òºïœü€¹€ë€«€ò»ØÄꀹ€ë¡£
+
+<li> @c @@+N
+
+€³€³€Ç @c N €ÏÀµ€ÎÀ°¿ô€Ç€¢€ë¡£€³€ÎÊÑ¿ô€ÎÃ̀ϡ¢¥µ¥é¥Š¥ó¥É¥Æ¥¥¹¥È€Îžœºß
+€Î caret €«€é¿ô€š€Æ @c N €À€±Àè€Î°ÌÃÖ€ÎÊž»ú€Ç€¢€ë¡£@c delete ¥¢¥¯¥·¥ç¥ó
+€Î°ú¿ô€È€·€ÆÍÑ€€€é€ì€¿Ÿì¹ç¡¢€³€ÎÊÑ¿ô€Ï¥µ¥é¥Š¥ó¥É¥Æ¥¥¹¥È€ÎÃæ€Îžå³€Î²¿
+Êž»ú€òºïœü€¹€ë€«€ò»ØÄꀹ€ë¡£
+
+</ul>
+
³Æ¥¢¥¯¥·¥ç¥ó€Î°ú¿ô€È¿¶Éñ€€€Ï°Ê²Œ€ÎÄ̀ꡣ
@verbatim
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/FORMATS/IM.txt new/m17n-db-1.3.3.20060828/FORMATS/IM.txt
--- old/m17n-db-1.3.3.20060620/FORMATS/IM.txt 2005-12-20 09:40:33.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/FORMATS/IM.txt 2006-08-28 15:22:18.000000000 +0200
@@ -109,6 +109,7 @@
| '@5' | '@6' | '@7' | '@8' | '@9'
| '@<' | '@=' | '@>' | '@-' | '@+' | '@[' | '@]'
| '@@
+ | '@-N | '@+N
@endverbatim
@verbatim
MACRO-LIST ::= '(' 'macro' MACRO * ')'
@@ -139,15 +140,21 @@
@verbatim
STATE-LIST ::= '(' 'state' STATE * ')'
-STATE ::= '(' STATE-NAME BRANCH * ')'
+STATE ::= '(' STATE-NAME [ STATE-TITLE-TEXT ] BRANCH * ')'
STATE-NAME ::= SYMBOL
+STATE-TITLE-TEXT ::= MTEXT
+
BRANCH ::= '(' MAP-NAME BRANCH-ACTION * ')'
| '(' nil BRANCH-ACTION * ')'
| '(' t BRANCH-ACTION * ')'
@endverbatim
+The optional @c STATE-TITLE-TEXT specifies a title text displayed on
+the screen when the input method is in this state. If @c
+STATE-TITLE-TEXT is omitted, @c TITLE-TEXT is used.
+
In the first form of @c BRANCH, @c MAP-NAME must be an item that
appears in @c MAP. In this case, if a key sequence matching one of @c
KEYSEQs of @c MAP-NAME is typed, @c BRANCH-ACTIONs are executed.
@@ -239,6 +246,24 @@
</ul>
+These are for supporting surround text handling.
+
+<ul>
+<li> @c @@-N
+
+Here, @c N is a positive integer. The value is a character at Nth
+previous position from the current caret of the surrounding text.
+When this is used as the argument of @c delete action, it specifies
+how many preceding characters in the surround text to delete.
+
+<li> @c @@+N
+
+Here, @c N is a positive integer. The value is a character at Nth
+next position from the current caret of the surrounding text.
+When this is used as the argument of @c delete action, it specifies
+how many following characters in the surround text to delete.
+</ul>
+
The arguments and the behavior of each action are listed below.
@verbatim
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/LANGUAGE.tbl new/m17n-db-1.3.3.20060828/LANGUAGE.tbl
--- old/m17n-db-1.3.3.20060620/LANGUAGE.tbl 2005-12-02 05:04:56.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/LANGUAGE.tbl 2006-08-28 15:22:17.000000000 +0200
@@ -268,7 +268,7 @@
(ita it italian "italiano")
(jav jv javanese "basa Jawa")
(jbo nil lojban "lojban")
-(jpn ja japanese "æ¥æ¬èª" "ãã¢â¯ã")
+(jpn ja japanese "æ¥æ¬èª" "ãã¢ãŒãã")
(jpr nil judeo-persian)
(jrb nil judeo-arabic)
(kaa nil kara-kalpak "ÒаÑаÒалпаÒ")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/LAOO-OTF.flt new/m17n-db-1.3.3.20060828/LAOO-OTF.flt
--- old/m17n-db-1.3.3.20060620/LAOO-OTF.flt 1970-01-01 01:00:00.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/LAOO-OTF.flt 2006-07-24 10:31:43.000000000 +0200
@@ -0,0 +1,77 @@
+;; LAOO-OTF.flt -- Font Layout Table for Lao
+;; Copyright (C) 2006
+;; National Institute of Advanced Industrial Science and Technology (AIST)
+;; Registration Number H15PRO112
+
+;; This file is part of the m17n database; a sub-part of the m17n
+;; library.
+
+;; The m17n 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.
+
+;; The m17n 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 the m17n library; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+;; 02111-1307, USA.
+
+;;; <li> LAOO-OTF.flt
+
+(category
+ ;; C: CONSONANT
+ ;; S: LAO SEMIVOWEL SIGN LO
+ ;; A: VOWEL AM
+ ;; V: DEPENDENT VOWEL
+ ;; T: TONE
+ ;; I: OTHER INDEPENDENT
+ (0x0E81 0x0EAE ?C)
+ (0x0EAF 0x0EB0 ?I)
+ (0x0EB1 ?V)
+ (0x0EB2 ?I)
+ (0x0EB3 ?A)
+ (0x0EB4 0x0EBB ?V)
+ (0x0EBC ?S)
+ (0x0EBD 0x0EC6 ?I)
+ (0x0EC8 0x0ECC ?T)
+ (0x0ECD ?V)
+ (0x0ED0 0x0ED9 ?I)
+ (0x0EDC 0x0EDD ?C)
+
+ (0x25CC ?I))
+
+;; The only GSUB is the decomposition of AM. We do it by hand because
+;; it requires reordering in addition to decomposition.
+
+(generator
+ (0
+ (cond
+ ("(CS?)(T)?A"
+ < | (1 = *) 0x0ECD (2 =) 0x0EB2 | > )
+ ("CS?V?T?"
+ < | = * | > )
+ ("[SVT]"
+ < | 0x25CC = | > )
+ ("."
+ =))
+ *))
+
+;; Then apply all GPOS features.
+
+(generator
+ (0
+ (cond
+ (" ([^ ]*) "
+ (1 otf:lao\ =))
+ ("."
+ [ otf:lao\ =+ ]))
+ *))
+
+;; Local Variables:
+;; mode: emacs-lisp
+;; End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/Makefile.am new/m17n-db-1.3.3.20060828/Makefile.am
--- old/m17n-db-1.3.3.20060620/Makefile.am 2006-06-20 12:29:42.000000000 +0200
+++ new/m17n-db-1.3.3.20060828/Makefile.am 2006-08-28 15:22:18.000000000 +0200
@@ -95,7 +95,7 @@
HEBR.flt HEBR-FF.flt \
KHMR-MULE.flt KHMR-ANLONG.flt KHMR-OTF.flt \
KNDA-OTF.flt \
- LAOO-MULE.flt LAOO-ALICE.flt LAOO-GENERIC.flt \
+ LAOO-MULE.flt LAOO-ALICE.flt LAOO-GENERIC.flt LAOO-OTF.flt \
MLYM-CDAC.flt MLYM-OTF.flt MLYM-RACHANA.flt \
MYMR-MYAZEDI.flt \
ORYA-OTF.flt \
@@ -104,7 +104,7 @@
TAML-CDAC.flt TAML-OTF.flt \
TELU-OTF.flt \
THAA-OTF.flt \
- THAI-TIS620.flt THAI-NORASI.flt THAI-GENERIC.flt \
+ THAI-TIS620.flt THAI-NORASI.flt THAI-GENERIC.flt THAI-OTF.flt \
TIBT-MULE.flt TIBT-MTIB.flt TIBT-OTF.flt \
NO-CTL.flt
@@ -134,7 +134,7 @@
my-kbd.mim \
or-itrans.mim \
pa-itrans.mim \
- ru-kbd.mim ru-yawerty.mim \
+ ru-kbd.mim ru-yawerty.mim ru-phonetic.mim \
si-samanala.mim si-wijesekera.mim \
sk-kbd.mim \
sr-kbd.mim \
@@ -159,7 +159,7 @@
default.fst xfont.fst truetype.fst generic.fst \
FONTENC.tbl FONTSIZE.tbl \
CHARSET.tbl CODING.tbl \
- LANGUAGE.tbl SCRIPT-OTF.tbl SCRIPT-LANGUAGE.tbl
+ LANGUAGE.tbl SCRIPT.tbl SCRIPT-OTF.tbl SCRIPT-LANGUAGE.tbl
UNIDATA = \
UNIDATA/README \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/NEWS new/m17n-db-1.3.3.20060828/NEWS
--- old/m17n-db-1.3.3.20060620/NEWS 2005-12-07 06:07:38.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/NEWS 2006-08-28 15:22:18.000000000 +0200
@@ -5,6 +5,14 @@
See the end for copying conditions.
+* Changes in the m17n database 1.4.0
+
+** Several new input methods are added.
+
+ru-phonetic.mim (Russian)
+
+
+
* Changes in the m17n database 1.3.0
** Wildcard handling is added to mdb.dir.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/SCRIPT-OTF.tbl new/m17n-db-1.3.3.20060828/SCRIPT-OTF.tbl
--- old/m17n-db-1.3.3.20060620/SCRIPT-OTF.tbl 2005-08-25 04:02:45.000000000 +0200
+++ new/m17n-db-1.3.3.20060828/SCRIPT-OTF.tbl 2006-08-28 15:22:18.000000000 +0200
@@ -24,7 +24,7 @@
;; The file format is this:
;; (SCRIPT OTF-TAG) ...
;; SCRIPT: script name
-;; OTF-TAG: OTF script tag (the tailing spaces are omitted).
+;; OTF-TAG: OTF script tag.
;;; <li> SCRIPT-OTF.tbl
;;;
@@ -50,7 +50,7 @@
(kannada knda)
(katakana kana)
(khmer khmr)
-(lao lao)
+(lao lao\ )
(latin latn)
(malayalam mlym)
(mongolian mong)
@@ -65,4 +65,4 @@
(thaana thaa)
(thai thai)
(tibetan tibt)
-(yi yi)
+(yi yi\ \ )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/SCRIPT.tbl new/m17n-db-1.3.3.20060828/SCRIPT.tbl
--- old/m17n-db-1.3.3.20060620/SCRIPT.tbl 1970-01-01 01:00:00.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/SCRIPT.tbl 2006-07-14 14:51:27.000000000 +0200
@@ -0,0 +1,163 @@
+;; SCRIPT.tbl -- Unicode Script -*- lisp -*-
+;; Copyright (C) 2006
+;; National Institute of Advanced Industrial Science and Technology (AIST)
+;; Registration Number H15PRO112
+
+;; This file is part of the m17n database; a sub-part of the m17n
+;; library.
+
+;; The m17n 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.
+
+;; The m17n 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 the m17n library; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+;; 02111-1307, USA.
+;;
+;; The file format is this:
+;; (SCRIPT ([ ISO639-1 | ISO639-2 ] ...) (CHAR ...]) [OTF-TAG]) ...
+;; SCRIPT: script name
+;; ISO639-1: 2-letter language code of ISO639-1.
+;; ISO639-2: 3-letter language code of ISO639-2.
+
+;; CHAR: representative characters of the script selected from "last
+;; resort" glyph of Unicode and/or by arbitrary way.
+
+;;; <li> SCRIPT-LANGUAGE.tbl
+;;;
+;;; Table of scripts vs languages using the corresponding script.
+
+(arabic (ar az fa ha kk ks ku ky pa ps sd ug ur) (#x621 #x627) arab)
+(armenian (hy) (#x531 #x55E) armn)
+
+;new
+(balinese (ban sas) (#x1B13 #x1B02) bali) ;No "last resort" glyph
+
+(bengali (as bn mni kha sat) (#x995 #x981) beng)
+(bopomofo (zh) (#x3105) bopo)
+(braille () (#x281D) brai)
+(buginese (bug) (#x1A01 #x1A1B) bugi) ;No "last resort" glyph
+(buhid (tl fil) (#x1743 #x1753) buhd)
+(canadian_aboliginal (chp oj iu den cr) (#x14C0 #x166E) cans)
+
+;new
+(carian (xcr) (#x102A9)) ;No "last resort" glyph
+ ;639-3 code xcr
+
+(cherokee (chr) (#x13E3) cher)
+(coptic (cop) (#x2CB1 #x2CFE) copt) ;No "last resort" glyph
+
+;new
+(cuneiform (sux akk elx hit xhu)(#x12000) xsux) ;No "last resort" glyph
+ ;639-3 code xhu
+
+(cyrillic (ab av az ba be bg ce cu cv kk ku kv ky mk mn os
+ ru sr hr bs tg tk tt ug uk uz) (#x42F) cyrl)
+(cypriot () (#x10800) cprt)
+(deseret (en) (#x10414) dsrt)
+(devanagari (bh hi ks mr ne sa awa new doi gon pa bra raj sd kru mwr mag mai) (#x915 #x902) deva)
+(ethiopic (am ti om byn tig gez) (#x1208 #x1361) ethi)
+(georgian (ka) (#x10D3) geor)
+(glagolitic (cu) (#x2C00) glag) ;No "last resort" glyph
+(gothic (got) (#x10330 #x1034A) goth)
+(greek (el cop) (#x3A9 #x3C9 #x3AC) grek)
+(gujarati (gu pa sd) (#xA95 #xA83) gujr)
+(gurmukhi (pa) (#xA15 #xA03) guru)
+(han (ja ko zh) (#x5B57) hani)
+(hangul (ko) (#xAC00) hang)
+(hanunoo (hnn) (#x1723 #x1732) hano) ;639-3 code hnn
+(hebrew (he yi jpr arc lad jrb) (#x5D0 #x591) hebr)
+(hiragana (ja) (#x304B) kana)
+(kannada (kn kok) (#xC95 #xC83) knda)
+(katakana (ja) (#x30AB) kana)
+
+;new
+(kayah_li (eky kyu) (#xA90A #xA92E)) ;No "last resort" glyph
+ ;639-3 code eky kyu
+
+(kharoshthi (sa) (#x10A10 #x10A0F) khar) ;No "last resort" glyph
+(khmer (km) (#x1780 #x17B6) khmr)
+(lao (lo) (#xEA5 #xEB1) lao\ )
+(latin (aa af ak tw an ay bi bm br ca ch co cs cy da de
+ ee en eo es et eu ff fi fj fo fr wa fy ga gd gl
+ gn gv ha ho ht hu hz id ig ik is it iu jv kg ki
+ kj kl kr ku kw la lb lg li ln lt lu lv mg mh mi
+ ms mt na nd ng nl no nb nn nr nv ny oc oj om pl
+ pt qu rm rn ro mo rw sc se sg sk sl sm sn so sq
+ sr hr bs ss st su sv sw tl tn to tr ts ty ve vi
+ wo xh yo za zu) (?A ?Z ?a ?z) latn)
+
+;new
+(lepcha (lep) (#x1C00 #x1C37)) ;No "last resort" glyph
+ ;639-3 code lep
+
+(limbu (lif) (#x1901 #x1920) limb) ;639-3 code lif
+(linear_b (gmy) (#x10000) linb) ;639-3 code gmy
+
+;new
+(lycian (xlc) (#x10280)) ;No "last resort" glyph
+ ;639-3 code xlc
+(lydian (xld)(#x10920 #x1093F)) ;No "last resort" glyph
+ ;639-3 code xld
+
+(malayalam (ml) (#xD15 #xD03) mlym)
+(mongolian (mn mnc) (#x1826 #x1803) mong)
+(myanmar (my pi shn kar) (#x1000 #x102C) mymr)
+(new_tai_lue () (#x1980 #x19B1)) ;No "last resort" glyph
+(ogham (gd ga) (#x168F #x169B) ogam)
+
+;new
+(ol_chiki (san) (#x1C5A #x1C7E)) ;No "last resort" glyph
+
+(old_italic () (#x10300) ital)
+(old_persian (peo) (#x103A3 #x103D0) xpeo) ;No "last resort" glyph
+(oriya (or) (#xB15 #xB03) orya)
+(osmanya (so) (#x10480) osma)
+
+;new
+(phags-pa (mn zh bo ug) (#xABA2 #xABB0) phag) ;No "last resort" glyph
+(phaistos_disc () (#x101D0)) ;No "last resort" glyph
+(phoenician (phn) (#x10900 #x1091F) phnx) ;No "last resort" glyph
+(rejang (rej) (#xA930 #xA953)) ;No "last resort" glyph
+ ;639-3 code rej
+(rod_nums () (#x1D366)) ;No "last resort" glyph
+
+
+(runic () (#x16A0) runr)
+
+
+;new
+(saurashtra (saz) (#xA892 #xA880)) ;No "last resort" glyph
+ ;639-3 code saz
+
+(shavian (eng) (#x10457) shaw)
+(sinhala (pi si sa) (#xD95 #xD83) sinh)
+
+;new
+(sundanese (sun) (#x1B8A #x1B80)) ;No "last resort" glyph
+
+(syloti_nagri (syl) (#xA807 #xA802) sylo) ;No "last resort" glyph
+ ;639-3 code syl
+(syriac (hy arc syr sam) (#x710 #x700) syrc)
+(tagalog (tl) (#x1703 #x1712) tglg)
+(tagbanwa (tbw) (#x1763 #x1772) tagb) ;639-3 code tbw
+(tamil (ta) (#xB95 #xB83) taml)
+(tai_le (tdd) (#x1950) tale) ;639-3 code tdd
+(telugu (te) (#xC15 #xC03) telu)
+(thaana (dv) (#x78C #x7B0) thaa)
+(thai (pi th hmn) (#xE17 #xE34) thai)
+(tibetan (bo dz) (#xF40 #xF71) tibt)
+(tifinagh (tmh) (#x2D30) tfng) ;No "last resort" glyph
+(ugaritic (uga) (#x10380 #x1039F) ugar)
+
+;new
+(vai (vai) (#xA501 #xA60A)) ;No "last resort" glyph
+
+(yi (ii) (#xA288) yi\ \ )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/THAI-OTF.flt new/m17n-db-1.3.3.20060828/THAI-OTF.flt
--- old/m17n-db-1.3.3.20060620/THAI-OTF.flt 1970-01-01 01:00:00.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/THAI-OTF.flt 2006-07-26 14:13:28.000000000 +0200
@@ -0,0 +1,95 @@
+;; THAI-OTF.flt -- Font Layout Table for Thai
+;; Copyright (C) 2006
+;; National Institute of Advanced Industrial Science and Technology (AIST)
+;; Registration Number H15PRO112
+
+;; This file is part of the m17n database; a sub-part of the m17n
+;; library.
+
+;; The m17n 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.
+
+;; The m17n 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 the m17n library; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+;; 02111-1307, USA.
+
+;;; <li> THAI-OTF.flt
+
+(category
+ ;; C: CONSONANT
+ ;; A: SARA-AM
+ ;; i: SARA I, SARA U (below vowel 1, above vowel 1)
+ ;; I: SARA II, SARA UEE (above vowel 3)
+ ;; U: MAIHAN-AKAT, SARA UE, SARA UU (above vowel 2, below vowel 2)
+ ;; P: PHINTHU, YAMAKKARN (below diacritic, above diacritic 3)
+ ;; T: TONE
+ ;; N: THANTHAKHAT, NIKHAHIT (above diacritic 1)
+ ;; M: MAITAIKHU (above diacritic 2)
+ ;; X: OTHER INDEPENDENT
+ (0x0E01 0x0E23 ?C)
+ (0x0E24 ?X)
+ (0x0E25 ?C)
+ (0x0E26 0x0E2E ?C)
+ (0x0E2F 0x0E30 ?X)
+ (0x0E31 ?U) ;; av2
+ (0x0E32 ?X)
+ (0x0E33 ?A)
+ (0x0E34 ?i) ;; av1
+ (0x0E35 ?I) ;; av3
+ (0x0E36 ?U) ;; av2
+ (0x0E37 ?I) ;; av3
+ (0x0E38 ?i) ;; bv1
+ (0x0E39 ?U) ;; bv2
+ (0x0E3A ?P) ;; bd
+ (0x0E3F 0x0E46 ?X)
+ (0x0E47 ?M) ;; ad2
+ (0x0E48 0x0E4B ?T)
+ (0x0E4C 0x0E4D ?N) ;; ad1
+ (0x0E4E ?P) ;; ad3
+ (0x0E4F 0x0E5B ?X)
+ (0x25CC ?X))
+
+;; Perform GSUB. The decomposition of AM is done by hand because it
+;; requires reordering in addition to decomposition.
+
+(generator
+ (0
+ (cond
+ ("(C)(T)?A"
+ < | (1 =) 0x0E4D (2 =) 0x0E32 | > )
+ ("C[UiI]T"
+ < | = * | > )
+ ("CiN"
+ < | = * | > )
+ ("CIM"
+ < | = * | > )
+ ("C[iIUPTNM]?"
+ < | = * | > )
+ ("[iIUPTNM]"
+ < | 0x25CC = | > )
+ ("."
+ =))
+ *))
+
+;; Perform GPOS.
+
+(generator
+ (0
+ (cond
+ (" ([^ ]*) "
+ (1 otf:thai))
+ ("."
+ [ otf:thai=+ ]))
+ *))
+
+;; Local Variables:
+;; mode: emacs-lisp
+;; End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/default.fst new/m17n-db-1.3.3.20060828/default.fst
--- old/m17n-db-1.3.3.20060620/default.fst 2006-06-20 12:29:42.000000000 +0200
+++ new/m17n-db-1.3.3.20060828/default.fst 2006-08-28 15:22:18.000000000 +0200
@@ -175,6 +175,11 @@
;;; <li> infopage: http://seasrc.th.net/font/font.htm
;;; <li> download: http://seasrc.th.net/font/fontlao.dir/alice0.zip
;;; </ul>
+;;; <li> Phetsarath_OT.ttf (family: Phetsarath OT; for Lao)
+;;; <ul>
+;;; <li> infopage: http://sourceforge.net/projects/laofoss
+;;; <li> download: http://prdownloads.sourceforge.net/laofoss/Phetsarath_OT.zip
+;;; </ul>
;;; <li> ANLONG.TTF (family: Anlongvill Khek; for Khmer)
;;; <ul>
;;; <li> infopage: http://www.cambodia.org/fonts/index.html#dl
@@ -328,7 +333,8 @@
(nil
((mulelao-1) laoo-mule)
((nil alice0\ lao iso8859-1) laoo-alice)
- ((nil alice0\ lao apple-roman) laoo-alice)))
+ ((nil alice0\ lao apple-roman) laoo-alice)
+ ((nil phetsarath\ ot unicode-bmp) laoo-otf)))
(tibetan
(nil
((muletibetan-2) tibt-mule)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/generic.fst new/m17n-db-1.3.3.20060828/generic.fst
--- old/m17n-db-1.3.3.20060620/generic.fst 2005-12-02 05:04:20.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/generic.fst 2006-08-28 15:22:18.000000000 +0200
@@ -81,6 +81,7 @@
((nil nil unicode-bmp :otf=mlym=haln) mlym-otf)))
(thai
(nil
+ ((nil nil unicode-bmp :otf=thai+mark,mkmk) thai-otf)
((nil norasi unicode-bmp) thai-norasi)
((nil nil unicode-bmp :lang=th) thai-generic)))
(lao
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/mdb.dir new/m17n-db-1.3.3.20060828/mdb.dir
--- old/m17n-db-1.3.3.20060620/mdb.dir 2005-12-07 06:47:54.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/mdb.dir 2006-08-28 15:22:18.000000000 +0200
@@ -1,5 +1,5 @@
;; mdb.dir -- The m17n database directory -*- lisp -*-
-;; Copyright (C) 2003, 2004, 2005
+;; Copyright (C) 2003, 2004, 2005, 2006
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H15PRO112
@@ -138,6 +138,7 @@
(font layouter laoo-alice "LAOO-ALICE.flt")
(font layouter laoo-mule "LAOO-MULE.flt")
(font layouter laoo-generic "LAOO-GENERIC.flt")
+(font layouter laoo-otf "LAOO-OTF.flt")
(font layouter mlym-cdac "MLYM-CDAC.flt")
(font layouter mlym-otf "MLYM-OTF.flt")
(font layouter mlym-rachana "MLYM-RACHANA.flt")
@@ -152,6 +153,7 @@
(font layouter thai-norasi "THAI-NORASI.flt")
(font layouter thai-tis620 "THAI-TIS620.flt")
(font layouter thai-generic "THAI-GENERIC.flt")
+(font layouter thai-otf "THAI-OTF.flt")
(font layouter tibt-mtib "TIBT-MTIB.flt")
(font layouter tibt-mule "TIBT-MULE.flt")
(font layouter tibt-otf "TIBT-OTF.flt")
@@ -183,7 +185,8 @@
(char-table integer linebreak "LINEBREAK.tab")
(standard language iso639 "LANGUAGE.tbl")
-(standard script otf "SCRIPT-OTF.tbl")
-(unicode script language "SCRIPT-LANGUAGE.tbl")
+(standard script otf "SCRIPT-OTF.tbl") ;obsolete
+(unicode script language "SCRIPT-LANGUAGE.tbl") ;obsolete
+(standard script unicode "SCRIPT.tbl")
;;; </ul>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/ru-phonetic.mim new/m17n-db-1.3.3.20060828/ru-phonetic.mim
--- old/m17n-db-1.3.3.20060620/ru-phonetic.mim 1970-01-01 01:00:00.000000000 +0100
+++ new/m17n-db-1.3.3.20060828/ru-phonetic.mim 2006-07-10 08:44:05.000000000 +0200
@@ -0,0 +1,97 @@
+;; ru-phonetic.mim -- Russian input method with YAWERTY keyboard layout
+;; Copyright (C) 2006
+;; National Institute of Advanced Industrial Science and Technology (AIST)
+;; Registration Number H15PRO112
+
+;; This file is part of the m17n database; a sub-part of the m17n
+;; library.
+
+;; The m17n 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.
+
+;; The m17n 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 the m17n library; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+;; 02111-1307, USA.
+
+;;; Input method for Russian simulating the keyboard layout based on
+;;; Roman transcription by phonetic resemblance.
+;;; @image html ru-phonetic.png "Keyboard Layout"
+;;; @image latex ru-phonetic.eps "Keyboard Layout" width=\narrowwidth
+;; 1! 2@ 3Ñ 4Ð 5Ñ 6Ъ 7& 8* 9( 0) -_ ÑЧ ÑЮ
+;; ÑЯ вРеРÑÐ ÑТ ÑЫ ÑУ ОРПРпРÑК ÑЩ
+;; аРÑС ÐŽÐ ÑЀ гРÑ
Ð¥ йРкРлР;: '" ÑÐ
+;; зРÑЬ ÑЊ жРбРМРЌР,< .> /?
+;; This layout is based on ru_phonetic map in XKB of Xorg.
+
+(input-method ru phonetic)
+
+(description
+ "Rusian input method simulating the Yawerty keyboard layout.
+This keyboard is based on Roman transcription by phonetic resemblance.
+
+ 1! 2@ 3Ñ 4Ð 5Ñ 6Ъ 7& 8* 9( 0) -_ ÑЧ ÑЮ
+ ÑЯ вРеРÑÐ ÑТ ÑЫ ÑУ ОРПРпРÑК ÑЩ
+ аРÑС ÐŽÐ ÑЀ гРÑ
Ð¥ йРкРлР;: '\" ÑÐ
+ зРÑЬ ÑЊ жРбРМРЌР,< .> /?
+
+This layout is based on ru_phonetic map in XKB of Xorg.")
+
+(title "Я")
+
+(map
+ (map
+ ("#" ?Ñ)
+ ("$" ?Ð)
+ ("%" ?Ñ)
+ ("^" ?Ъ)
+ ("=" ?Ñ) ("+" ?Ч)
+ ("`" ?Ñ) ("~" ?Ю)
+
+ ("q" ?Ñ) ("Q" ?Я)
+ ("w" ?в) ("W" ?Ð)
+ ("e" ?е) ("E" ?Ð)
+ ("r" ?Ñ) ("R" ?Ð )
+ ("t" ?Ñ) ("T" ?Т)
+ ("y" ?Ñ) ("Y" ?Ы)
+ ("u" ?Ñ) ("U" ?У)
+ ("i" ?О) ("I" ?Ð)
+ ("o" ?П) ("O" ?Ð)
+ ("p" ?п) ("P" ?Ð)
+ ("[" ?Ñ) ("{" ?К)
+ ("]" ?Ñ) ("}" ?Щ)
+
+ ("a" ?а) ("A" ?Ð)
+ ("s" ?Ñ) ("S" ?С)
+ ("d" ?ÐŽ) ("D" ?Ð)
+ ("f" ?Ñ) ("F" ?Ѐ)
+ ("g" ?г) ("G" ?Ð)
+ ("h" ?Ñ
) ("H" ?Ð¥)
+ ("j" ?й) ("J" ?Ð)
+ ("k" ?к) ("K" ?Ð)
+ ("l" ?л) ("L" ?Ð)
+ ("\\" ?Ñ) ("|" ?Ð)
+
+ ("z" ?з) ("Z" ?Ð)
+ ("x" ?Ñ) ("X" ?Ь)
+ ("c" ?Ñ) ("C" ?Њ)
+ ("v" ?ж) ("V" ?Ð)
+ ("b" ?б) ("B" ?Ð)
+ ("n" ?Ðœ) ("N" ?Ð)
+ ("m" ?ÐŒ) ("M" ?Ð)))
+
+(state
+ (init
+ (map)))
+
+;; Local Variables:
+;; coding: utf-8
+;; mode: lisp
+;; End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/si-wijesekera.mim new/m17n-db-1.3.3.20060828/si-wijesekera.mim
--- old/m17n-db-1.3.3.20060620/si-wijesekera.mim 2006-06-20 12:30:11.000000000 +0200
+++ new/m17n-db-1.3.3.20060828/si-wijesekera.mim 2006-08-28 15:22:18.000000000 +0200
@@ -23,7 +23,7 @@
(input-method si wijesekera)
(description "Sinhala input method based on SLS 1134 Rev. 2:2004.
- <http://http://www.fonts.lk/doc/sin-kbd-layout4.pdf>
+ <http://www.fonts.lk/doc/sin-kbd-layout4.pdf>
")
(title "Wijesekera")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/th-kesmanee.mim new/m17n-db-1.3.3.20060828/th-kesmanee.mim
--- old/m17n-db-1.3.3.20060620/th-kesmanee.mim 2005-10-20 03:44:06.000000000 +0200
+++ new/m17n-db-1.3.3.20060828/th-kesmanee.mim 2006-08-28 15:22:18.000000000 +0200
@@ -1,5 +1,5 @@
;; th-kesmanee.mim -- Thai input method with Kesmanee keyboard layout
-;; Copyright (C) 2003, 2004, 2005
+;; Copyright (C) 2003, 2004, 2005, 2006
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H15PRO112
@@ -30,12 +30,12 @@
(map
(map
- ("!" "#")
- ("\"" "àžŠ")
+ ("!" "+")
+ ("\"" ".")
("#" "à¹")
("$" "à¹")
("%" "à¹")
- ("&" "àž±à¹")
+ ("&" "àž¿")
("'" "àž")
("(" "à¹")
(")" "à¹")
@@ -46,9 +46,9 @@
("." "à¹")
("/" "àž")
("0" "àž")
- ("1" "àž¥")
+ ("1" "à¹
")
("2" "/")
- ("3" "_")
+ ("3" "-")
("4" "àž ")
("5" "àž")
("6" "àžž")
@@ -74,7 +74,7 @@
("J" "à¹")
("K" "àž©")
("L" "àžš")
- ("M" "à¹")
+ ("M" "?")
("N" "à¹")
("O" "àž¯")
("P" "àž")
@@ -89,11 +89,11 @@
("Y" "à¹")
("Z" "(")
("[" "àž")
- ("\\" "àž¿")
+ ("\\" "àž")
("]" "àž¥")
("^" "àž¹")
("_" "à¹")
- ("`" "àž")
+ ("`" "_")
("a" "àž")
("b" "àžŽ")
("c" "à¹")
@@ -121,9 +121,9 @@
("y" "àž±")
("z" "àž")
("{" "àž")
- ("|" "à¹")
- ("}" ".")
- ("~" "àž
")))
+ ("|" "àž
")
+ ("}" ",")
+ ("~" "%")))
(state
(init
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/m17n-db-1.3.3.20060620/truetype.fst new/m17n-db-1.3.3.20060828/truetype.fst
--- old/m17n-db-1.3.3.20060620/truetype.fst 2006-06-20 12:29:43.000000000 +0200
+++ new/m17n-db-1.3.3.20060828/truetype.fst 2006-08-28 15:22:18.000000000 +0200
@@ -1,5 +1,5 @@
;; truetype.fst -- Fontset using only TrueType fonts -*- lisp -*-
-;; Copyright (C) 2003, 2004
+;; Copyright (C) 2003, 2004, 2005, 2006
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H15PRO112
@@ -101,9 +101,11 @@
((nil ml-ttkarthika apple-roman) mlym-cdac)))
(thai
(nil
+ ((nil nil unicode-bmp :otf=thai+mark,mkmk) thai-otf)
((nil norasi unicode-bmp) thai-norasi)))
(lao
(nil
+ ((nil phetsarath\ ot unicode-bmp) laoo-otf)
((nil alice0\ lao apple-roman) laoo-alice)))
(tibetan
(nil
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package libzypp
checked in at Tue Aug 29 00:09:53 CEST 2006.
--------
--- libzypp/libzypp.changes 2006-08-16 16:10:20.000000000 +0200
+++ libzypp/libzypp.changes 2006-08-28 14:38:13.000000000 +0200
@@ -1,0 +2,70 @@
+Fri Aug 25 14:32:07 CEST 2006 - schubi(a)suse.de
+
+- zyppPattern->install_packages returns SUGGESTED package too.
+ Bug 201476
+ Revision 4036
+
+-------------------------------------------------------------------
+Fri Aug 25 13:05:33 CEST 2006 - schubi(a)suse.de
+
+- New behaviour in the solver: try with 'best' package first, try with 'all'
+ packages if this fails.
+ Bug :Bug 191983
+
+-------------------------------------------------------------------
+Fri Aug 25 11:35:48 CEST 2006 - dmacvicar(a)suse.de
+
+- libzypp 2.1.0
+- bump version due to incompatible callback changes in KeyRing
+ Sources
+
+-------------------------------------------------------------------
+Thu Aug 24 15:34:45 CEST 2006 - dmacvicar(a)suse.de
+
+- new keyring callbacks
+- separate trust key from import key
+- use PublicKey class instead of params, to be able
+ to add more info like photos later (pending #181682)
+- update zmart with those callbacks.
+- better error handling (Exception types)
+- make tmp file names more readable depending on the context
+- r4026
+
+-------------------------------------------------------------------
+Tue Aug 22 22:35:30 CEST 2006 - dmacvicar(a)suse.de
+
+- decouple probing from source creation, using the new
+ media test for existence functions.
+- r4019
+
+-------------------------------------------------------------------
+
+Tue Aug 22 17:56:53 CEST 2006 - mt(a)suse.de
+
+- Fixed getDoesFileExist to reset the transfer range
+- Added logging of curl debug messages to the zypp log.
+ The env var ZYPP_MEDIA_CURL_DEBUG=1 logs curl infos,
+ ZYPP_MEDIA_CURL_DEBUG=2 logs the in/out headers.
+- r4018
+
+-------------------------------------------------------------------
+Fri Aug 18 14:57:35 CEST 2006 - kkaempf(a)suse.de
+
+- remove the /etc/sysconfig/zypp:REWRITE_KERNEL_DEPS = yes check;
+ see rev 3810 below. (#190163)
+- rev 3998
+
+-------------------------------------------------------------------
+Thu Aug 17 18:15:14 CEST 2006 - dmacvicar(a)suse.de
+
+- fix uninstalling of atoms (noop)
+- r3995
+
+-------------------------------------------------------------------
+Wed Aug 16 17:41:40 CEST 2006 - dmacvicar(a)suse.de
+
+- Implement initial verson of Media
+ doesFileExist, for future source probing.
+- r3984
+
+-------------------------------------------------------------------
Old:
----
zypp-2.0.0.tar.bz2
New:
----
zypp-2.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.paC2ja/_old 2006-08-29 00:07:43.000000000 +0200
+++ /var/tmp/diff_new_pack.paC2ja/_new 2006-08-29 00:07:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 2.0.0)
+# spec file for package libzypp (Version 2.1.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,9 +17,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
Summary: Package, Patch, Pattern, and Product Management
-Version: 2.0.0
-Release: 4
-Source: zypp-2.0.0.tar.bz2
+Version: 2.1.0
+Release: 1
+Source: zypp-2.1.0.tar.bz2
Prefix: /usr
Provides: yast2-packagemanager
Obsoletes: yast2-packagemanager
@@ -62,7 +62,7 @@
Ladislav Slezak <lslezak(a)suse.cz>
%prep
-%setup -q -n zypp-2.0.0
+%setup -q -n zypp-2.1.0
%build
mv configure.ac x
@@ -104,6 +104,48 @@
%{_libdir}/pkgconfig/libzypp.pc
%changelog -n libzypp
+* Fri Aug 25 2006 - schubi(a)suse.de
+- zyppPattern->install_packages returns SUGGESTED package too.
+ Bug 201476
+ Revision 4036
+* Fri Aug 25 2006 - schubi(a)suse.de
+- New behaviour in the solver: try with 'best' package first, try with 'all'
+ packages if this fails.
+ Bug :Bug 191983
+* Fri Aug 25 2006 - dmacvicar(a)suse.de
+- libzypp 2.1.0
+- bump version due to incompatible callback changes in KeyRing
+ Sources
+* Thu Aug 24 2006 - dmacvicar(a)suse.de
+- new keyring callbacks
+- separate trust key from import key
+- use PublicKey class instead of params, to be able
+ to add more info like photos later (pending #181682)
+- update zmart with those callbacks.
+- better error handling (Exception types)
+- make tmp file names more readable depending on the context
+- r4026
+* Tue Aug 22 2006 - dmacvicar(a)suse.de
+- decouple probing from source creation, using the new
+ media test for existence functions.
+- r4019
+* Tue Aug 22 2006 - mt(a)suse.de
+- Fixed getDoesFileExist to reset the transfer range
+- Added logging of curl debug messages to the zypp log.
+ The env var ZYPP_MEDIA_CURL_DEBUG=1 logs curl infos,
+ ZYPP_MEDIA_CURL_DEBUG=2 logs the in/out headers.
+- r4018
+* Fri Aug 18 2006 - kkaempf(a)suse.de
+- remove the /etc/sysconfig/zypp:REWRITE_KERNEL_DEPS = yes check;
+ see rev 3810 below. (#190163)
+- rev 3998
+* Thu Aug 17 2006 - dmacvicar(a)suse.de
+- fix uninstalling of atoms (noop)
+- r3995
+* Wed Aug 16 2006 - dmacvicar(a)suse.de
+- Implement initial verson of Media
+ doesFileExist, for future source probing.
+- r3984
* Tue Aug 15 2006 - dmacvicar(a)suse.de
- more dbus_connection_close fixes
- r3974
++++++ zypp-2.0.0.tar.bz2 -> zypp-2.1.0.tar.bz2 ++++++
libzypp/zypp-2.0.0.tar.bz2 libzypp/zypp-2.1.0.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