January 2009 - openSUSE Commits - openSUSE Mailing Lists

commit libgnomecups for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package libgnomecups for openSUSE:Factory checked in at Thu Jan 29 00:17:53 CET 2009. -------- --- GNOME/libgnomecups/libgnomecups.changes 2009-01-07 10:10:36.000000000 +0100 +++ libgnomecups/libgnomecups.changes 2009-01-27 00:37:29.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 27 00:36:52 CET 2009 - crrodriguez(a)suse.de + +- remove "la" files [BNC#357465] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomecups.spec ++++++ --- /var/tmp/diff_new_pack.X14456/_old 2009-01-29 00:17:11.000000000 +0100 +++ /var/tmp/diff_new_pack.X14456/_new 2009-01-29 00:17:11.000000000 +0100 @@ -21,7 +21,7 @@ Name: libgnomecups BuildRequires: cups-devel fdupes glib2-devel gnome-common intltool zlib-devel Version: 0.2.3 -Release: 109 +Release: 111 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 or later; LGPL v2.0 only @@ -87,12 +87,13 @@ %build autoreconf -f -i -%configure\ +%configure --with-pic\ --disable-static make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install +%{__rm} -f %{buildroot}%{_libdir}/*.la %find_lang %{name} %clean @@ -111,12 +112,13 @@ %files devel %defattr (-, root, root) -%{_libdir}/*.*a %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/* %changelog +* Tue Jan 27 2009 crrodriguez(a)suse.de +- remove "la" files [BNC#357465] * Wed Jan 07 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Thu Apr 10 2008 ro(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libfprint for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package libfprint for openSUSE:Factory checked in at Thu Jan 29 00:17:03 CET 2009. -------- --- libfprint/libfprint.changes 2008-11-05 16:12:26.000000000 +0100 +++ libfprint/libfprint.changes 2009-01-27 14:06:26.566705000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 27 13:53:25 CET 2009 - thoenig(a)suse.de + +- add libfprint-deinit-01.patch: Add new function fp_dev_reset used + to settle the USB device if it was driven into a undefined state. + (bnc#463557) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libfprint-deinit-01.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfprint.spec ++++++ --- /var/tmp/diff_new_pack.v20266/_old 2009-01-29 00:11:35.000000000 +0100 +++ /var/tmp/diff_new_pack.v20266/_new 2009-01-29 00:11:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libfprint (Version 0.0.6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,13 +24,14 @@ Group: Development/Libraries/C and C++ PreReq: %fillup_prereq Version: 0.0.6 -Release: 8 +Release: 10 Summary: Library for fingerprint reader support BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: glib2 ImageMagick Source0: %{name}-%{version}.tar.bz2 Patch0: libfprint-gcc-g++-thoenig-01.patch Patch1: libfprint-hal-fdi.patch +Patch2: libfprint-deinit-01.patch %description The fprint project aims to plug a gap in the Linux desktop: support for @@ -74,6 +75,7 @@ %setup %patch0 -p0 %patch1 -p0 +%patch2 -p0 %build ./configure CFLAGS="$RPM_OPT_FLAGS" \ @@ -109,6 +111,10 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Jan 27 2009 thoenig(a)suse.de +- add libfprint-deinit-01.patch: Add new function fp_dev_reset used + to settle the USB device if it was driven into a undefined state. + (bnc#463557) * Wed Nov 05 2008 thoenig(a)suse.de - move supplementing USB IDs from libfprint0 to pam_fp (bnc#441754) * Tue Oct 28 2008 thoenig(a)suse.de ++++++ libfprint-deinit-01.patch ++++++ --- libfprint/fprint.h 2009-01-26 14:22:08.000000000 +0100 +++ libfprint/fprint.h 2009-01-26 14:25:40.000000000 +0100 @@ -89,6 +89,7 @@ /* Device handling */ struct fp_dev *fp_dev_open(struct fp_dscv_dev *ddev); void fp_dev_close(struct fp_dev *dev); +void fp_dev_reset(struct fp_dev *dev); struct fp_driver *fp_dev_get_driver(struct fp_dev *dev); int fp_dev_get_nr_enroll_stages(struct fp_dev *dev); uint32_t fp_dev_get_devtype(struct fp_dev *dev); --- libfprint/drivers/aes2501.c 2008-03-20 14:37:33.000000000 +0100 +++ libfprint/drivers/aes2501.c 2009-01-26 14:25:40.000000000 +0100 @@ -248,6 +248,11 @@ usb_release_interface(dev->udev, 0); } +static void dev_reset(struct fp_img_dev *dev) +{ + // reset stub +} + static const struct aes_regwrite finger_det_reqs[] = { { AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET }, { AES2501_REG_EXCITCTRL, 0x40 }, @@ -584,6 +589,7 @@ .init = dev_init, .exit = dev_exit, + .reset = dev_reset, .await_finger_on = await_finger_on, .capture = capture, }; --- libfprint/drivers/upekts.c 2008-03-20 14:37:33.000000000 +0100 +++ libfprint/drivers/upekts.c 2009-01-26 14:29:04.000000000 +0100 @@ -546,6 +546,14 @@ g_free(dev->priv); } +static void dev_reset(struct fp_dev *dev) +{ + /* should not be necessary */ + //dev_init(dev, 0L); + do_init(dev); + do_deinit(dev); +} + static const unsigned char enroll_init[] = { 0x02, 0xc0, 0xd4, 0x01, 0x00, 0x04, 0x00, 0x08 }; @@ -817,6 +825,7 @@ .id_table = id_table, .init = dev_init, .exit = dev_exit, + .reset = dev_reset, .enroll = enroll, .verify = verify, }; --- libfprint/core.c 2009-01-26 14:22:08.000000000 +0100 +++ libfprint/core.c 2009-01-26 14:25:40.000000000 +0100 @@ -1167,3 +1167,10 @@ registered_drivers = NULL; } +API_EXPORTED void fp_dev_reset(struct fp_dev *dev) +{ + if (!dev) + return; + if (dev->drv->reset) + dev->drv->reset(dev); +} --- libfprint/fp_internal.h 2009-01-26 14:33:49.000000000 +0100 +++ libfprint/fp_internal.h 2009-01-26 14:25:40.000000000 +0100 @@ -111,6 +111,7 @@ int (*discover)(const struct usb_id *usb_id, uint32_t *devtype); int (*init)(struct fp_dev *dev, unsigned long driver_data); void (*exit)(struct fp_dev *dev); + void (*reset)(struct fp_dev *dev); int (*enroll)(struct fp_dev *dev, gboolean initial, int stage, struct fp_print_data **print_data, struct fp_img **img); int (*verify)(struct fp_dev *dev, struct fp_print_data *data, @@ -135,6 +136,7 @@ /* Device operations */ int (*init)(struct fp_img_dev *dev, unsigned long driver_data); void (*exit)(struct fp_img_dev *dev); + void (*reset)(struct fp_dev *dev); int (*await_finger_on)(struct fp_img_dev *dev); int (*await_finger_off)(struct fp_img_dev *dev); int (*capture)(struct fp_img_dev *dev, gboolean unconditional, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libeigen2-devel for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package libeigen2-devel for openSUSE:Factory checked in at Thu Jan 29 00:11:28 CET 2009. -------- --- KDE/libeigen2-devel/libeigen2-devel.changes 2009-01-06 18:16:03.000000000 +0100 +++ libeigen2-devel/libeigen2-devel.changes 2009-01-28 03:18:07.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 28 03:17:57 CET 2009 - dmueller(a)suse.de + +- update to 2.0 rc1: + * no upstream changelog available + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- eigen-2.0-beta5.tar.bz2 New: ---- eigen-2.0-rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libeigen2-devel.spec ++++++ --- /var/tmp/diff_new_pack.s14762/_old 2009-01-29 00:09:57.000000000 +0100 +++ /var/tmp/diff_new_pack.s14762/_new 2009-01-29 00:09:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libeigen2-devel (Version 1.90.0+2.0beta5) +# spec file for package libeigen2-devel (Version 1.90.0+2.0rc1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Summary: lightweight linear algebra C++ template library BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://eigen.tuxfamily.org/ -%define rversion 2.0-beta5 -Version: 1.90.0+2.0beta5 +%define rversion 2.0-rc1 +Version: 1.90.0+2.0rc1 Release: 1 Source: eigen-%{rversion}.tar.bz2 @@ -58,6 +58,9 @@ /usr/include/eigen2 %changelog +* Wed Jan 28 2009 dmueller(a)suse.de +- update to 2.0 rc1: + * no upstream changelog available * Tue Jan 06 2009 dmueller(a)suse.de - update to 2.0 beta 5: * no upstream changelog available ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcroco for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package libcroco for openSUSE:Factory checked in at Thu Jan 29 00:09:50 CET 2009. -------- --- GNOME/libcroco/libcroco.changes 2009-01-07 10:03:15.000000000 +0100 +++ libcroco/libcroco.changes 2009-01-26 23:19:37.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 26 23:19:17 CET 2009 - crrodriguez(a)suse.de + +- remove "la" files [BNC#357465] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcroco.spec ++++++ --- /var/tmp/diff_new_pack.Dm9931/_old 2009-01-29 00:08:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Dm9931/_new 2009-01-29 00:08:20.000000000 +0100 @@ -21,7 +21,7 @@ Name: libcroco BuildRequires: glib2-devel gtk-doc libxml2-devel Version: 0.6.1 -Release: 156 +Release: 158 Url: http://www.freespiders.org/projects/libcroco/ Group: System/Libraries License: GPL v2 or later; LGPL v2.1 or later @@ -97,21 +97,20 @@ autoreconf -f -i # needed for libcroco-0.6.1: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure\ +%configure --with-pic\ --disable-static make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install +%{__rm} -f %{buildroot}%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT -%post 0_6-3 -/sbin/ldconfig +%post 0_6-3 -p /sbin/ldconfig -%postun 0_6-3 -/sbin/ldconfig +%postun 0_6-3 -p /sbin/ldconfig %files %defattr (-, root, root) @@ -127,10 +126,11 @@ %{_bindir}/*-config %{_includedir}/* %{_libdir}/*.so -%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jan 26 2009 crrodriguez(a)suse.de +- remove "la" files [BNC#357465] * Wed Jan 07 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Sun May 11 2008 coolo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcpuset for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package libcpuset for openSUSE:Factory checked in at Thu Jan 29 00:08:12 CET 2009. -------- --- libcpuset/libcpuset.changes 2008-10-22 16:20:18.000000000 +0200 +++ libcpuset/libcpuset.changes 2009-01-28 18:09:33.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 28 18:07:30 CET 2009 - bwalle(a)suse.de + +- Fix problem that cpunodemap shows wrong number of cpus + (bnc #468091). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libcpuset-rm-cpuonline.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcpuset.spec ++++++ --- /var/tmp/diff_new_pack.q24696/_old 2009-01-29 00:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.q24696/_new 2009-01-29 00:05:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcpuset (Version 1.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,10 +23,11 @@ License: LGPL v2.1 or later Summary: cpuset processor and memory placement library Version: 1.0 -Release: 5 +Release: 6 AutoReqProv: on Source: libcpuset-%{version}.tar.bz2 Patch0: libcpuset-fix-missing-syscall.diff +Patch1: libcpuset-rm-cpuonline.diff Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libbitmask-devel @@ -84,6 +85,7 @@ %prep %setup -n %{name} %patch0 -p1 +%patch1 -p1 %build autoreconf -i @@ -115,6 +117,9 @@ %dir %{_docdir}/libcpuset %changelog +* Wed Jan 28 2009 bwalle(a)suse.de +- Fix problem that cpunodemap shows wrong number of cpus + (bnc #468091). * Wed Oct 22 2008 mrueckert(a)suse.de - fix debug_packages_requires define * Mon Aug 04 2008 bwalle(a)suse.de ++++++ libcpuset-rm-cpuonline.diff ++++++ From: Paul Jackson <pj(a)sgi.com> Subject: Fix wrong number of CPUs References: bnc #468091 Acked-by: Bernhard Walle <bwalle(a)suse.de> --- libcpuset.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) --- a/libcpuset.c +++ b/libcpuset.c @@ -1,7 +1,7 @@ /* * cpuset user library implementation. * - * Copyright (c) 2006-2007 Silicon Graphics, Inc. All rights reserved. + * Copyright (c) 2006-2008 Silicon Graphics, Inc. All rights reserved. * * Paul Jackson <pj(a)sgi.com> */ @@ -1016,24 +1016,6 @@ static int store_mask(const char *path, } /* - * Return 1 if 'cpu' is online, else 0 if offline. Tests the file - * /sys/devices/system/cpu/cpuN/online file for 0 or 1 contents - * were N == cpu number. - */ - -static char cpu_online(unsigned int cpu) -{ - char online; - char cpupath[PATH_MAX]; - - (void) snprintf(cpupath, sizeof(cpupath), - "/sys/devices/system/cpu/cpu%d/online", cpu); - if (read_flag(cpupath, &online) < 0) - return 0; /* oops - guess that cpu's not there */ - return online; -} - -/* * The cpunodemap maps each cpu in [0 ... cpuset_cpus_nbits()), * to the node on which that cpu resides or cpuset_mems_nbits(). * @@ -1136,8 +1118,6 @@ static void rebuild_map() continue; if (cpu >= ncpus || mem >= nmems) continue; - if (!cpu_online(cpu)) - continue; cpunodemap.map[cpu] = mem; } closedir(dir2); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lapack for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package lapack for openSUSE:Factory checked in at Thu Jan 29 00:05:08 CET 2009. -------- --- lapack/lapack.changes 2008-05-11 14:30:39.000000000 +0200 +++ lapack/lapack.changes 2009-01-28 13:24:16.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Jan 28 13:22:03 CET 2009 - rguenther(a)suse.de + +- Update to version 3.2.0. [bnc#456384] + * Extra Precise Iterative Refinement + * XBLAS + * Non-Negative Diagonals from Householder QR + * High Performance QR and Householder Reflections on Low-Profile Matrices + * New fast and accurate Jacobi SVD + * Routines for Rectangular Full Packed format + * Pivoted Cholesky + * Mixed precision iterative refinement + * Some new variants added for the one sided factorization + * More robust DQDS algorithm + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lapack-3.1.1.tar.bz2 lapack-make.patch New: ---- lapack-3.2.0.tar.bz2 lapack-rpmlintrc manpages-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lapack.spec ++++++ --- /var/tmp/diff_new_pack.W18959/_old 2009-01-29 00:02:55.000000000 +0100 +++ /var/tmp/diff_new_pack.W18959/_new 2009-01-29 00:02:55.000000000 +0100 @@ -1,10 +1,17 @@ # -# spec file for package lapack (Version 3.1.1) +# spec file for package lapack (Version 3.2.0) # -# Copyright (c) 2008 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. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,12 +21,13 @@ Name: lapack BuildRequires: gcc-fortran Summary: Linear Algebra Package -Version: 3.1.1 -Release: 64 +Version: 3.2.0 +Release: 1 License: Public Domain, Freeware Group: Development/Libraries/Parallel Source0: lapack-%{version}.tar.bz2 -Patch: %{name}-make.patch +Source1: manpages-%{version}.tar.bz2 +Source99: lapack-rpmlintrc Url: http://www.netlib.org/lapack/ Requires: blas = %{version} Requires: liblapack3 = %{version} @@ -133,16 +141,18 @@ UTK <lapack(a)cs.utk.edu> %prep -%setup -q -%patch +%setup -q -n lapack-3.2 +cd .. +ln -s lapack-3.2 lapack-3.2.0 +tar xjf $RPM_SOURCE_DIR/manpages-3.2.0.tar.bz2 +cd lapack-3.2 %build -rm -rf $RPM_BUILD_ROOT -export F77=gfortran -export OPTOPTS="$RPM_OPT_FLAGS -O3 -funroll-all-loops" cp make.inc.example make.inc make cleanlib -make %{?jobs:-j%jobs} blaslib PICOPTS=-fPIC +make %{?jobs:-j%jobs} blaslib \ + OPTS="$RPM_OPT_FLAGS -O3 -funroll-all-loops -fPIC" \ + NOOPT="$RPM_OPT_FLAGS -O0 -fPIC" mv blas_LINUX.a libblas_pic.a mkdir tmp ( cd tmp; ar x ../libblas_pic.a ) @@ -150,10 +160,14 @@ ln -s libblas.so.%version libblas.so rm -rf tmp make cleanlib -make %{?jobs:-j%jobs} blaslib +make %{?jobs:-j%jobs} blaslib \ + OPTS="$RPM_OPT_FLAGS -O3 -funroll-all-loops" \ + NOOPT="$RPM_OPT_FLAGS -O0" mv blas_LINUX.a libblas.a make cleanlib -make %{?jobs:-j%jobs} lapacklib PICOPTS=-fPIC +make %{?jobs:-j%jobs} lapacklib \ + OPTS="$RPM_OPT_FLAGS -O3 -funroll-all-loops -fPIC" \ + NOOPT="$RPM_OPT_FLAGS -O0 -fPIC" mv lapack_LINUX.a liblapack_pic.a mkdir tmp ( cd tmp; ar x ../liblapack_pic.a ) @@ -161,11 +175,12 @@ ln -s liblapack.so.%version liblapack.so rm -rf tmp make cleanlib -make %{?jobs:-j%jobs} lapacklib +make %{?jobs:-j%jobs} lapacklib \ + OPTS="$RPM_OPT_FLAGS -O3 -funroll-all-loops" \ + NOOPT="$RPM_OPT_FLAGS -O0" mv lapack_LINUX.a liblapack.a %install -rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_libdir} install -m 644 libblas.a $RPM_BUILD_ROOT/%{_libdir} install -m 644 libblas_pic.a $RPM_BUILD_ROOT/%{_libdir} @@ -177,6 +192,16 @@ install -m 755 liblapack.so.%version $RPM_BUILD_ROOT/%{_libdir} ln -s liblapack.so.%version $RPM_BUILD_ROOT/%{_libdir}/liblapack.so.3 ln -s liblapack.so.%version $RPM_BUILD_ROOT/%{_libdir}/liblapack.so +# remove duplicate manpages +rm manpages/man/manl/xerbla.l +rm manpages/man/manl/xerbla_array.l +rm manpages/man/manl/lsame.l +rm manpages/man/manl/zdrot.l +rm manpages/man/manl/csrot.l +# remove bogus files +rm manpages/blas/man/manl/ssyrk.txt_new +rm manpages/blas/man/manl/intro_blas1.man +# move and rename manpages install -d $RPM_BUILD_ROOT%{_mandir}/man3 function CopyFile { NEW_FILENAME=$(basename $1 .l).3 @@ -185,8 +210,6 @@ for MANFILE in manpages/blas/man/manl/*.l; do CopyFile $MANFILE done -rm manpages/man/manl/xerbla.l -rm manpages/man/manl/lsame.l for MANFILE in manpages/man/manl/*.l; do CopyFile $MANFILE done @@ -235,6 +258,18 @@ %defattr(-,root,root) %changelog +* Wed Jan 28 2009 rguenther(a)suse.de +- Update to version 3.2.0. [bnc#456384] + * Extra Precise Iterative Refinement + * XBLAS + * Non-Negative Diagonals from Householder QR + * High Performance QR and Householder Reflections on Low-Profile Matrices + * New fast and accurate Jacobi SVD + * Routines for Rectangular Full Packed format + * Pivoted Cholesky + * Mixed precision iterative refinement + * Some new variants added for the one sided factorization + * More robust DQDS algorithm * Sun May 11 2008 lrupp(a)suse.de - use versioned requires/obsoletes - %%run_ldconfig is deprecated @@ -268,7 +303,7 @@ - fixed all other instances of -fno-f2c, and g77 -> gfortran use. * Thu Apr 21 2005 meissner(a)suse.de - g77 -> gfortran, -fno-f2c is no more. -* Sun Jan 30 2005 nashif(a)suse.de +* Sat Jan 29 2005 nashif(a)suse.de - Updated manpages (#48784) * Thu Jan 20 2005 ro(a)suse.de - remove BuildPrereq, BuildRequires is generated @@ -299,7 +334,7 @@ - Modified group, url and files in spec * Mon Feb 21 2000 nashif(a)suse.de - Applied new patches -* Wed Jan 19 2000 nashif(a)suse.de +* Tue Jan 18 2000 nashif(a)suse.de - Applied new patched - Moved manpages to /usr/share/man * Thu Dec 23 1999 nashif(a)suse.de ++++++ lapack-3.1.1.tar.bz2 -> lapack-3.2.0.tar.bz2 ++++++ ++++ 829329 lines of diff (skipped) ++++++ lapack-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * # both lapack and blas are devel packages (but have non -devel names # for legacy reasons) addFilter ("lapack.*devel-file-in-non-devel-package") addFilter ("blas.*devel-file-in-non-devel-package") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kvm for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at Thu Jan 29 00:00:22 CET 2009. -------- --- kvm/kvm.changes 2009-01-26 18:41:25.000000000 +0100 +++ kvm/kvm.changes 2009-01-27 10:12:23.782373000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 27 10:12:02 CET 2009 - agraf(a)suse.de + +- activate sound again (dropped in last update) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.iY3424/_old 2009-01-28 23:57:47.000000000 +0100 +++ /var/tmp/diff_new_pack.iY3424/_new 2009-01-28 23:57:47.000000000 +0100 @@ -46,7 +46,7 @@ Summary: Kernel-based Virtual Machine Url: http://kvm.qumranet.com/ Version: 83 -Release: 1 +Release: 2 Source0: %name-%version.tar.bz2 ### To update to new version, recompress the kvm-??.tar.gz using: # rpmbuild -bp kvm.spec --define="_sourcedir `pwd`" @@ -219,6 +219,12 @@ # Temporary workaround until qemu's configure is fixed: sed -i 's/-lcurses/-lncurses/' qemu/configure ./configure --prefix=%{_prefix} \ + --audio-card-list="ac97 adlib cs4231a gus" \ +%if %suse_version >= 1100 + --audio-drv-list="alsa sdl pa oss" \ +%else + --audio-drv-list="alsa sdl oss" \ +%endif --qemu-cflags="%{optflags}" # Aborts if curses support is not enabled: grep "^CONFIG_CURSES=yes" qemu/config-host.mak @@ -317,6 +323,8 @@ %_mandir/man1/qemu-kvm.1.gz %changelog +* Tue Jan 27 2009 agraf(a)suse.de +- activate sound again (dropped in last update) * Mon Jan 26 2009 agraf(a)suse.de - update to kvm-83 - add device assignment (Intel and AMD) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iproute2 for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '09

28 Jan '09

Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at Wed Jan 28 23:51:23 CET 2009. -------- --- iproute2/iproute2.changes 2008-12-11 15:10:40.000000000 +0100 +++ iproute2/iproute2.changes 2009-01-27 11:56:35.885275000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 27 11:47:57 CET 2009 - ms(a)suse.de + +- fixed a bug in which the memory for the tc_skbedit struct was + being used uninitialized to 0. This patch corrects the issue + by using a memset to 0 out the memory of the + structure (bnc #438950) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix-hardware-address-size-problem.diff iproute2-m_skbedit.patch iproute2-q_multiq.patch New: ---- iproute2-2.6.25-hw-address-size.diff iproute2-2.6.25-m_skbedit.patch iproute2-2.6.25-q_multiq.patch iproute2-2.6.25-skbedit-memset.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.D13029/_old 2009-01-28 23:46:15.000000000 +0100 +++ /var/tmp/diff_new_pack.D13029/_new 2009-01-28 23:46:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package iproute2 (Version 2.6.25) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Provides: iproute AutoReqProv: on Version: 2.6.25 -Release: 42 +Release: 43 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version.tar.bz2 @@ -36,11 +36,12 @@ Patch4: %name-2.6.25-resolve-address.diff Patch5: %name-2.6.25-fragtimeout.diff Patch6: %name-2.6.25-flushcheckuid.diff -Patch7: %name-m_skbedit.patch -Patch8: %name-q_multiq.patch +Patch7: %name-2.6.25-m_skbedit.patch +Patch8: %name-2.6.25-q_multiq.patch Patch9: %name-2.6.25-DCCP-redefine Patch10: %name-2.6.25-warnings.diff -Patch11: fix-hardware-address-size-problem.diff +Patch11: %name-2.6.25-hw-address-size.diff +Patch12: %name-2.6.25-skbedit-memset.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnetlink-devel @@ -81,6 +82,7 @@ %patch9 -p1 %patch10 %patch11 -p1 +%patch12 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -131,6 +133,11 @@ %_libdir/lib* %changelog +* Tue Jan 27 2009 ms(a)suse.de +- fixed a bug in which the memory for the tc_skbedit struct was + being used uninitialized to 0. This patch corrects the issue + by using a memset to 0 out the memory of the + structure (bnc #438950) * Thu Dec 11 2008 agruen(a)suse.de - Change max length of the MAC address from 16 bytes to 32 bytes to accommodate infiniband (bnc#445014). ++++++ iproute2-2.6.25-hw-address-size.diff ++++++ diff -Naurp iproute2-2.6.25/include/utils.h iproute2-2.6.25.patched/include/utils.h --- iproute2-2.6.25/include/utils.h 2008-04-17 10:12:54.000000000 -0700 +++ iproute2-2.6.25.patched/include/utils.h 2008-12-09 12:43:53.000000000 -0800 @@ -46,7 +46,7 @@ typedef struct __u8 bytelen; __s16 bitlen; __u32 flags; - __u32 data[4]; + __u32 data[8]; } inet_prefix; #define PREFIXLEN_SPECIFIED 1 diff -Naurp iproute2-2.6.25/ip/ipmaddr.c iproute2-2.6.25.patched/ip/ipmaddr.c --- iproute2-2.6.25/ip/ipmaddr.c 2008-12-09 12:41:58.000000000 -0800 +++ iproute2-2.6.25.patched/ip/ipmaddr.c 2008-12-09 12:43:53.000000000 -0800 @@ -43,11 +43,11 @@ static void usage(void) exit(-1); } -static int parse_hex(char *str, unsigned char *addr) +static int parse_hex(char *str, unsigned char *addr, size_t size) { int len=0; - while (*str) { + while (*str && (len < 2 * size)) { int tmp; if (str[1] == 0) return -1; @@ -104,7 +104,7 @@ void read_dev_mcast(struct ma_info **res m.addr.family = AF_PACKET; - len = parse_hex(hexa, (unsigned char*)&m.addr.data); + len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data)); if (len >= 0) { struct ma_info *ma = malloc(sizeof(m)); @@ -177,7 +177,7 @@ void read_igmp6(struct ma_info **result_ m.addr.family = AF_INET6; - len = parse_hex(hexa, (unsigned char*)&m.addr.data); + len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data)); if (len >= 0) { struct ma_info *ma = malloc(sizeof(m)); ++++++ iproute2-2.6.25-m_skbedit.patch ++++++ IPROUTE: add support for skbedit action From: Alexander Duyck <alexander.h.duyck(a)intel.com> Add support for skbedit action. Provides ability to edit queue_mapping field Provides ability to edit priority field usage: action skbedit [queue_mapping QUEUE_MAPPING] [priority PRIORITY] at least one option must be select, or both at the same time Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com> --- include/linux/tc_act/tc_skbedit.h | 43 ++++++++ tc/Makefile | 1 tc/m_skbedit.c | 192 +++++++++++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+), 0 deletions(-) create mode 100644 include/linux/tc_act/tc_skbedit.h create mode 100644 tc/m_skbedit.c diff --git a/include/linux/tc_act/tc_skbedit.h b/include/linux/tc_act/tc_skbedit.h new file mode 100644 index 0000000..98311f0 --- /dev/null +++ b/include/linux/tc_act/tc_skbedit.h @@ -0,0 +1,43 @@ +/* Copyright (c) 2008, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Author: Alexander Duyck <alexander.h.duyck(a)intel.com> + */ + +#ifndef __LINUX_TC_SKBEDIT_H +#define __LINUX_TC_SKBEDIT_H + +#include <linux/pkt_cls.h> + +#define TCA_ACT_SKBEDIT 11 + +#define SKBEDIT_F_PRIORITY 0x1 +#define SKBEDIT_F_QUEUE_MAPPING 0x2 + +struct tc_skbedit { + tc_gen; +}; + +enum { + TCA_SKBEDIT_UNSPEC, + TCA_SKBEDIT_TM, + TCA_SKBEDIT_PARMS, + TCA_SKBEDIT_PRIORITY, + TCA_SKBEDIT_QUEUE_MAPPING, + __TCA_SKBEDIT_MAX +}; +#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1) + +#endif diff --git a/tc/Makefile b/tc/Makefile index 4116983..1b4169d 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -30,6 +30,7 @@ TCMODULES += m_mirred.o TCMODULES += m_ipt.o TCMODULES += m_nat.o TCMODULES += m_pedit.o +TCMODULES += m_skbedit.o TCMODULES += p_ip.o TCMODULES += p_icmp.o TCMODULES += p_tcp.o diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c new file mode 100644 index 0000000..55e3f89 --- /dev/null +++ b/tc/m_skbedit.c @@ -0,0 +1,192 @@ +/* + * m_skbedit.c SKB Editing module + * + * Copyright (c) 2008, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: Alexander Duyck <alexander.h.duyck(a)intel.com> + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include "utils.h" +#include "tc_util.h" +#include <linux/tc_act/tc_skbedit.h> + +static void +explain(void) +{ + fprintf(stderr, "Usage: ... skbedit " + "queue_mapping QUEUE_MAPPING | priority PRIORITY \n" + "QUEUE_MAPPING = device transmit queue to use\n" + "PRIORITY = classID to assign to priority field\n"); +} + +static void +usage(void) +{ + explain(); + exit(-1); +} + +static int +parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + struct nlmsghdr *n) +{ + struct tc_skbedit sel; + int argc = *argc_p; + char **argv = *argv_p; + int ok = 0; + struct rtattr *tail; + unsigned int tmp; + __u16 queue_mapping; + __u32 flags = 0, priority; + + if (matches(*argv, "skbedit") != 0) + return -1; + + NEXT_ARG(); + + while (argc > 0) { + if (matches(*argv, "queue_mapping") == 0) { + flags |= SKBEDIT_F_QUEUE_MAPPING; + NEXT_ARG(); + if (get_unsigned(&tmp, *argv, 10) || tmp > 65535) { + fprintf(stderr, "Illegal queue_mapping\n"); + return -1; + } + queue_mapping = tmp; + ok++; + } else if (matches(*argv, "priority") == 0) { + flags |= SKBEDIT_F_PRIORITY; + NEXT_ARG(); + if (get_tc_classid(&priority, *argv)) { + fprintf(stderr, "Illegal priority\n"); + return -1; + } + ok++; + } else if (matches(*argv, "help") == 0) { + usage(); + } else { + break; + } + argc--; + argv++; + } + + if (argc) { + if (matches(*argv, "reclassify") == 0) { + sel.action = TC_ACT_RECLASSIFY; + NEXT_ARG(); + } else if (matches(*argv, "pipe") == 0) { + sel.action = TC_ACT_PIPE; + NEXT_ARG(); + } else if (matches(*argv, "drop") == 0 || + matches(*argv, "shot") == 0) { + sel.action = TC_ACT_SHOT; + NEXT_ARG(); + } else if (matches(*argv, "continue") == 0) { + sel.action = TC_ACT_UNSPEC; + NEXT_ARG(); + } else if (matches(*argv, "pass") == 0) { + sel.action = TC_ACT_OK; + NEXT_ARG(); + } + } + + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); + if (get_u32(&sel.index, *argv, 10)) { + fprintf(stderr, "Pedit: Illegal \"index\"\n"); + return -1; + } + argc--; + argv++; + ok++; + } + } + + if (!ok) { + explain(); + return -1; + } + + + tail = NLMSG_TAIL(n); + addattr_l(n, MAX_MSG, tca_id, NULL, 0); + addattr_l(n, MAX_MSG, TCA_SKBEDIT_PARMS, &sel, sizeof(sel)); + if (flags & SKBEDIT_F_QUEUE_MAPPING) + addattr_l(n, MAX_MSG, TCA_SKBEDIT_QUEUE_MAPPING, + &queue_mapping, sizeof(queue_mapping)); + if (flags & SKBEDIT_F_PRIORITY) + addattr_l(n, MAX_MSG, TCA_SKBEDIT_PRIORITY, + &priority, sizeof(priority)); + tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail; + + *argc_p = argc; + *argv_p = argv; + return 0; +} + +static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg) +{ + struct tc_skbedit *sel; + struct rtattr *tb[TCA_SKBEDIT_MAX + 1]; + SPRINT_BUF(b1); + __u32 *priority; + __u16 *queue_mapping; + + if (arg == NULL) + return -1; + + parse_rtattr_nested(tb, TCA_SKBEDIT_MAX, arg); + + if (tb[TCA_SKBEDIT_PARMS] == NULL) { + fprintf(f, "[NULL skbedit parameters]"); + return -1; + } + + sel = RTA_DATA(tb[TCA_SKBEDIT_PARMS]); + + fprintf(f, " skbedit"); + + if (tb[TCA_SKBEDIT_QUEUE_MAPPING] != NULL) { + queue_mapping = RTA_DATA(tb[TCA_SKBEDIT_QUEUE_MAPPING]); + fprintf(f, " queue_mapping %u", *queue_mapping); + } + if (tb[TCA_SKBEDIT_PRIORITY] != NULL) { + priority = RTA_DATA(tb[TCA_SKBEDIT_PRIORITY]); + fprintf(f, " priority %s", sprint_tc_classid(*priority, b1)); + } + + if (show_stats) { + if (tb[TCA_SKBEDIT_TM]) { + struct tcf_t *tm = RTA_DATA(tb[TCA_SKBEDIT_TM]); + print_tm(f, tm); + } + } + + return 0; +} + +struct action_util skbedit_action_util = { + .id = "skbedit", + .parse_aopt = parse_skbedit, + .print_aopt = print_skbedit, +}; ++++++ iproute2-2.6.25-q_multiq.patch ++++++ IPROUTE: add support for multiq qdisc From: Alexander Duyck <alexander.h.duyck(a)intel.com> Add support for multiq qdisc This patch adds the ability to configure the multiq qdisc. Since the qdisc does not require any input it will pull the number of bands directly from the device that it is added to the root of. usage: tc qdisc add dev <DEV> root handle <HANDLE> multiq Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com> --- include/linux/pkt_sched.h | 7 ++++ tc/Makefile | 1 + tc/q_multiq.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 0 deletions(-) create mode 100644 tc/q_multiq.c diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index dbb7ac3..3b0e633 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -112,6 +112,13 @@ enum #define TCA_PRIO_MAX (__TCA_PRIO_MAX - 1) +/* MULTIQ section */ + +struct tc_multiq_qopt { + __u16 bands; /* Number of bands */ + __u16 max_bands; /* Maximum number of queues */ +}; + /* TBF section */ struct tc_tbf_qopt diff --git a/tc/Makefile b/tc/Makefile index 1b4169d..743a946 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -12,6 +12,7 @@ TCMODULES += q_prio.o TCMODULES += q_tbf.o TCMODULES += q_cbq.o TCMODULES += q_rr.o +TCMODULES += q_multiq.o TCMODULES += q_netem.o TCMODULES += f_rsvp.o TCMODULES += f_u32.o diff --git a/tc/q_multiq.c b/tc/q_multiq.c new file mode 100644 index 0000000..d3f6188 --- /dev/null +++ b/tc/q_multiq.c @@ -0,0 +1,87 @@ +/* + * q_multiq.c Multiqueue aware qdisc + * + * Copyright (c) 2008, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Author: Alexander Duyck <alexander.h.duyck(a)intel.com> + * + * Original Authors: PJ Waskiewicz, <peter.p.waskiewicz.jr(a)intel.com> (RR) + * Alexey Kuznetsov, <kuznet(a)ms2.inr.ac.ru> (from PRIO) + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <syslog.h> +#include <fcntl.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#include <string.h> + +#include "utils.h" +#include "tc_util.h" + +static void explain(void) +{ + fprintf(stderr, "Usage: ... multiq [help]\n"); +} + +#define usage() return(-1) + +static int multiq_parse_opt(struct qdisc_util *qu, int argc, char **argv, + struct nlmsghdr *n) +{ + struct tc_multiq_qopt opt; + + if (argc > 0) { + if (strcmp(*argv, "help") == 0) { + explain(); + return -1; + } else { + fprintf(stderr, "What is \"%s\"?\n", *argv); + explain(); + return -1; + } + argc--; argv++; + } + + addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt)); + return 0; +} + +int multiq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) +{ + struct tc_multiq_qopt *qopt; + + if (opt == NULL) + return 0; + if (RTA_PAYLOAD(opt) < sizeof(*qopt)) + return 0; + + qopt = RTA_DATA(opt); + + fprintf(f, "bands %u/%u ", qopt->bands, qopt->max_bands); + + return 0; +} + +struct qdisc_util multiq_qdisc_util = { + .id = "multiq", + .parse_qopt = multiq_parse_opt, + .print_qopt = multiq_print_opt, +}; ++++++ iproute2-2.6.25-skbedit-memset.diff ++++++ --- tc/m_skbedit.c 2009-01-27 10:42:39.000000000 +0000 +++ tc/m_skbedit.c 2009-01-27 10:45:09.000000000 +0000 @@ -57,6 +57,8 @@ __u16 queue_mapping; __u32 flags = 0, priority; + memset(&sel, 0, sizeof(struct tc_skbedit)); + if (matches(*argv, "skbedit") != 0) return -1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit input-utils for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '09

28 Jan '09

Hello community, here is the log from the commit of package input-utils for openSUSE:Factory checked in at Wed Jan 28 23:46:06 CET 2009. -------- --- input-utils/input-utils.changes 2008-10-29 16:39:09.000000000 +0100 +++ input-utils/input-utils.changes 2009-01-28 16:36:42.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 28 16:27:55 CET 2009 - prusnak(a)suse.cz + +- added absset program (absset.patch) [bnc#468966] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- input-utils-absset.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ input-utils.spec ++++++ --- /var/tmp/diff_new_pack.sT4536/_old 2009-01-28 23:41:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sT4536/_new 2009-01-28 23:41:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package input-utils (Version 2007.06.22) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: input-utils BuildRequires: SDL-devel linux-kernel-headers Version: 2007.06.22 -Release: 155 +Release: 156 Provides: joystick Obsoletes: joystick AutoReqProv: on @@ -33,8 +33,9 @@ Patch0: %{name}-makefile.patch Patch1: %{name}-on_exit.patch Patch2: %{name}-dtor.patch +Patch3: %{name}-absset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define programs evtest ffcfstress ffmvforce ffset fftest inputattach jscal jstest +%define programs absset evtest ffcfstress ffmvforce ffset fftest inputattach jscal jstest %description Utilities for input devices. It includes joystick testing and @@ -51,6 +52,7 @@ %patch0 %patch1 %patch2 +%patch3 %build make CFLAGS="$RPM_OPT_FLAGS -Wall" PROGRAMS="%{programs}" @@ -67,6 +69,8 @@ %{_bindir}/* %changelog +* Wed Jan 28 2009 prusnak(a)suse.cz +- added absset program (absset.patch) [bnc#468966] * Wed Oct 29 2008 prusnak(a)suse.cz - applied changes from dtor (dtor.patch) [http://www.kernel.org/pub/linux/kernel/people/dtor/inputattach.c] ++++++ input-utils-absset.patch ++++++ --- Makefile +++ Makefile @@ -57,3 +57,6 @@ acceltest: acceltest.c $(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@ + +absset: absset.c + $(CC) $(CFLAGS) $(CPPFLAGS) $^ -o $@ --- absset.c +++ absset.c @@ -0,0 +1,180 @@ +/* + * absset.c + * Sets Absolute limits/values + * Copyright 2009 Dan Streetman <ddstreet(a)ieee.org> + */ + +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <fcntl.h> +#include <linux/input.h> +#include <unistd.h> +#include <string.h> +#include <stdio.h> +#include <stdlib.h> +#include <getopt.h> +#include <errno.h> + +char *progname; + +void print_usage() +{ + printf("Usage: %s [param...] <axis> <device>\n", progname); + printf("Modifies the parameters of an absolute-value axis.\n"); + printf("\n"); + printf("Params:\n"); + printf(" -v --value=VALUE Set the current value.\n"); + printf(" -m --min=MIN Set the minimum value.\n"); + printf(" -M --max=MAX Set the maximum value.\n"); + printf(" -f --fuzz=FUZZ Set the fuzz value.\n"); + printf(" -F --flat=FLAT Set the flat value.\n"); + printf("\n"); + printf("Axis setting:\n"); + printf(" -a --axis=N Change the values of axis number N.\n"); + printf(" -x Change the X axis values, same as '-a 0'.\n"); + printf(" -y Change the Y axis values, same as '-a 1'.\n"); + printf(" -z Change the Z axis values, same as '-a 2'.\n"); +} + +int set_axis(char *arg, int *axisSet) +{ + if (*axisSet) { + fprintf(stderr, "Cannot set more than 1 axis\n\n"); + print_usage(); + exit(1); + } + + *axisSet = 1; + + return strtol(arg, NULL, 0); +} + +int main(int argc, char** argv) +{ + int fd = 0; + char *device_file_name; + int retval = 0; + + int opt; + char *shortopts = "hv:m:M:f:F:a:xyz"; + struct option longopts[] = { + { "value", 1, NULL, 'v' }, + { "min", 1, NULL, 'm' }, + { "max", 1, NULL, 'M' }, + { "fuzz", 1, NULL, 'f' }, + { "flat", 1, NULL, 'F' }, + { "axis", 1, NULL, 'a' }, + { 0, 0, 0, 0 } + }; + + __s32 value=0, min=0, max=0, fuzz=0, flat=0, axis=0; + int valueSet=0, minSet=0, maxSet=0, fuzzSet=0, flatSet=0, axisSet=0; + struct input_absinfo *ia = NULL; + + progname = argv[0]; + + while ((opt = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) { + switch (opt) { + case 'v': value = strtol(optarg, NULL, 0); valueSet = 1; break; + case 'm': min = strtol(optarg, NULL, 0); minSet = 1; break; + case 'M': max = strtol(optarg, NULL, 0); maxSet = 1; break; + case 'f': fuzz = strtol(optarg, NULL, 0); fuzzSet = 1; break; + case 'F': flat = strtol(optarg, NULL, 0); flatSet = 1; break; + case 'a': axis = set_axis(optarg, &axisSet); break; + case 'x': axis = set_axis("0", &axisSet); break; + case 'y': axis = set_axis("1", &axisSet); break; + case 'z': axis = set_axis("2", &axisSet); break; + case 'h': /* fall through */ + default: + print_usage(); + exit(1); + } + } + + if (optind >= argc) { + fprintf(stderr, "No device node specified.\n\n"); + print_usage(); + exit(1); + } + + device_file_name = argv[optind]; + + if (!valueSet && !minSet && !maxSet && !fuzzSet && !flatSet && !axisSet) { + fprintf(stderr, "No param specified. You must specify at least one param.\n\n"); + print_usage(); + exit(1); + } + + if (!axisSet) { + fprintf(stderr, "No axis specified.\n\n"); + print_usage(); + exit(1); + } + + /* Open device */ + fd = open(device_file_name, O_RDWR); + if (fd == -1) { + retval = -errno; + fprintf(stderr, "Error opening device %s : %s\n", device_file_name, strerror(-retval)); + goto end; + } + + if (!(ia = malloc(sizeof(*ia)))) { + fprintf(stderr, "Out of memory!\n"); + retval = -ENOMEM; + goto end; + } + + if (!valueSet || !minSet || !maxSet || !fuzzSet || !flatSet || !axisSet) { + if (ioctl(fd, EVIOCGABS(axis), ia) == -1) { + retval = -errno; + fprintf(stderr, "Error getting current axis %d values : %s\n", axis, strerror(-retval)); + goto end; + } + } + + if (valueSet) + ia->value = value; + if (minSet) + ia->minimum = min; + if (maxSet) + ia->maximum = max; + if (fuzzSet) + ia->fuzz = fuzz; + if (flatSet) + ia->flat = flat; + if (ioctl(fd, EVIOCSABS(axis), ia) == -1) { + fprintf(stderr, "Error setting axis %d values : %s\n", axis, strerror(errno)); + retval = -1; + } else { + char *axisstr = ""; + switch (axis) { + case 0: axisstr = " (X)"; break; + case 1: axisstr = " (Y)"; break; + case 2: axisstr = " (Z)"; break; + } + printf("Set axis %d%s parameters:\n\tvalue: %d\n\tminimum: %d\n\tmaximum: %d\n\tfuzz: %d\n\tflat: %d\n", + axis, axisstr, ia->value, ia->minimum, ia->maximum, ia->fuzz, ia->flat); + } + +end: + if (fd) + close(fd); + if (ia) + free(ia); + exit(retval); +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit html2text for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '09

28 Jan '09

Hello community, here is the log from the commit of package html2text for openSUSE:Factory checked in at Wed Jan 28 23:41:18 CET 2009. -------- --- html2text/html2text.changes 2007-04-03 20:24:23.000000000 +0200 +++ html2text/html2text.changes 2009-01-28 14:24:31.932268000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 28 14:24:26 CET 2009 - kssingvo(a)suse.de + +- added RPM_OPT_FLAGS + +------------------------------------------------------------------- +Tue Jan 27 18:00:50 CET 2009 - kssingvo(a)suse.de + +- added a lot of debians patches, adapted some of them +- modified manual page with approval from author: debian to openSUSE + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- patch-utf8-html2text-1.3.2a.diff New: ---- html2text-1.3.2a-400_remove_builtin_http_support.patch html2text-1.3.2a-611_recognize_input_encoding.patch html2text.1.gz html2text-debian-200_close_files_inside_main_loop.patch html2text-debian-220_nobs_when_stdout_is_a_tty.patch html2text-debian-500_utf8_support.patch html2text-debian-510_disable_backspaces.patch html2text-debian-600_multiple_meta_tags.patch html2text-debian-630_recode_output_to_locale_charset.patch html2text-debian-810_fix_deprecated_conversion_warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ html2text.spec ++++++ --- /var/tmp/diff_new_pack.VY2454/_old 2009-01-28 23:38:28.000000000 +0100 +++ /var/tmp/diff_new_pack.VY2454/_new 2009-01-28 23:38:28.000000000 +0100 @@ -1,29 +1,46 @@ # # spec file for package html2text (Version 1.3.2a) # -# Copyright (c) 2007 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. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: html2text BuildRequires: gcc-c++ -URL: http://www.mbayer.de/html2text/ -License: GNU General Public License (GPL) +Url: http://www.mbayer.de/html2text/ +License: GPL v2 or later Group: Productivity/Publishing/HTML/Tools Provides: html2txt Obsoletes: html2txt -Autoreqprov: on +AutoReqProv: on Version: 1.3.2a -Release: 46 +Release: 141 Summary: HTML to ASCII Converter Source: html2text-%{version}.tar.bz2 -Patch0: http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff -Patch1: http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff +Source1: html2text.1.gz +Patch0: html2text-debian-200_close_files_inside_main_loop.patch +Patch1: html2text-debian-220_nobs_when_stdout_is_a_tty.patch +Patch2: html2text-1.3.2a-400_remove_builtin_http_support.patch +Patch3: html2text-debian-500_utf8_support.patch +Patch4: html2text-debian-510_disable_backspaces.patch +Patch5: html2text-debian-600_multiple_meta_tags.patch +Patch6: html2text-1.3.2a-611_recognize_input_encoding.patch +Patch7: html2text-debian-630_recode_output_to_locale_charset.patch +Patch8: http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff +Patch9: html2text-debian-810_fix_deprecated_conversion_warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -36,15 +53,25 @@ -------- Arno Unkrig <arno.unkrig(a)gmrs.de> Martin Bayer <mbayer(a)zedat.fu-berlin.de> + Eugene V. Lyubimkin <jackyf.devel(a)gmail.com> %prep %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +cp -a %{SOURCE1} . %build ./configure --prefix=/usr --mandir=%{_mandir} -make +make EXPLICIT="${RPM_OPT_FLAGS}" %install mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -61,54 +88,59 @@ %doc %{_mandir}/man5/html2textrc.5.gz %changelog -* Tue Apr 03 2007 - kssingvo(a)suse.de +* Wed Jan 28 2009 kssingvo(a)suse.de +- added RPM_OPT_FLAGS +* Tue Jan 27 2009 kssingvo(a)suse.de +- added a lot of debians patches, adapted some of them +- modified manual page with approval from author: debian to openSUSE +* Tue Apr 03 2007 kssingvo(a)suse.de - using now upstream patch for 64bit - added upstream utf-8 patch -* Tue Feb 06 2007 - kssingvo(a)suse.de +* Tue Feb 06 2007 kssingvo(a)suse.de - fixed 64bit pointer issue (bugzilla#242105) -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Jan 16 2006 - schwab(a)suse.de +* Mon Jan 16 2006 schwab(a)suse.de - Don't strip binaries. -* Thu Jan 20 2005 - ro(a)suse.de +* Thu Jan 20 2005 ro(a)suse.de - renamed to html2text -* Tue Jan 20 2004 - kssingvo(a)suse.de +* Tue Jan 20 2004 kssingvo(a)suse.de - upgrade to 1.3.2a - norootforbuild - added %%doc RELEASE_NOTES -* Sun Jan 11 2004 - adrian(a)suse.de +* Sun Jan 11 2004 adrian(a)suse.de - add %%defattr -* Wed Apr 23 2003 - coolo(a)suse.de +* Wed Apr 23 2003 coolo(a)suse.de - use BuildRoot -* Tue Mar 11 2003 - fehr(a)suse.de +* Tue Mar 11 2003 fehr(a)suse.de - update to new version 1.3.1 -* Thu Apr 18 2002 - fehr(a)suse.de +* Thu Apr 18 2002 fehr(a)suse.de - make it compile with gcc 3.1 -* Fri Jun 22 2001 - fehr(a)suse.de +* Fri Jun 22 2001 fehr(a)suse.de - change to version 1.2.4 -* Wed Mar 28 2001 - fehr(a)suse.de +* Wed Mar 28 2001 fehr(a)suse.de - change to version 1.2.3 -* Fri Nov 17 2000 - fehr(a)suse.de +* Fri Nov 17 2000 fehr(a)suse.de - set group tag -* Fri May 26 2000 - fehr(a)suse.de +* Fri May 26 2000 fehr(a)suse.de - move documentation to /usr/share/doc/packages -* Tue Feb 29 2000 - fehr(a)suse.de +* Tue Feb 29 2000 fehr(a)suse.de - change to version 1.2.2 -* Mon Jan 31 2000 - fehr(a)suse.de +* Mon Jan 31 2000 fehr(a)suse.de - fixed for new gcc 2.95.2 -* Wed Jan 12 2000 - fehr(a)suse.de +* Wed Jan 12 2000 fehr(a)suse.de - change to version 1.2.1 -* Wed Nov 24 1999 - fehr(a)suse.de +* Wed Nov 24 1999 fehr(a)suse.de - change to version 1.2 -* Tue Nov 23 1999 - fehr(a)suse.de +* Tue Nov 23 1999 fehr(a)suse.de - change to version 1.1.1 -* Wed Sep 29 1999 - fehr(a)suse.de +* Wed Sep 29 1999 fehr(a)suse.de - change to version 1.04 -* Tue Sep 21 1999 - fehr(a)suse.de +* Tue Sep 21 1999 fehr(a)suse.de - change to version 1.03 -* Fri Jul 02 1999 - fehr(a)suse.de +* Fri Jul 02 1999 fehr(a)suse.de - change to version 1.02 -* Fri Jun 18 1999 - fehr(a)suse.de +* Fri Jun 18 1999 fehr(a)suse.de - change to version 1.01 -* Wed Jun 16 1999 - fehr(a)suse.de +* Wed Jun 16 1999 fehr(a)suse.de - add version 1.0 of package to suse distribution ++++++ html2text-1.3.2a-400_remove_builtin_http_support.patch ++++++ --- html2text-1.3.2a/html2text.C.orig 2009-01-22 16:59:21.000000000 +0100 +++ html2text-1.3.2a/html2text.C 2009-01-22 17:01:28.000000000 +0100 @@ -36,13 +36,14 @@ #include <iostream> +#include <fstream> #include <string.h> #include <stdlib.h> #include <unistd.h> #include "html.h" #include "HTMLControl.h" -#include "urlistream.h" +// #include "urlistream.h" #include "format.h" #define stringify(x) stringify2(x) @@ -50,13 +51,15 @@ /* ------------------------------------------------------------------------- */ +using std::ifstream; + class MyParser : public HTMLControl { public: enum { PRINT_AS_ASCII, UNPARSE, SYNTAX_CHECK }; MyParser( - urlistream &is_, + istream &is_, bool debug_scanner_, bool debug_parser_, ostream &os_, @@ -357,15 +360,14 @@ main(int argc, char **argv) } istream *isp; - urlistream uis; + ifstream uis; uis.open(input_url); if (!uis.is_open()) { std::cerr - << "Opening input URL \"" + << "Cannot open input file \"" << input_url - << "\": " - << uis.open_error() + << "\"." << std::endl; exit(1); } --- html2text-1.3.2a/HTMLControl.h.orig 2003-11-23 12:05:29.000000000 +0100 +++ html2text-1.3.2a/HTMLControl.h 2009-01-27 17:22:05.000000000 +0100 @@ -38,7 +38,6 @@ /* ------------------------------------------------------------------------- */ #include "HTMLParser.h" -#include "urlistream.h" #include <istream> using std::istream; @@ -48,7 +47,7 @@ using std::istream; class HTMLControl : public HTMLParser { public: - HTMLControl(urlistream &is_, bool debug_scanner_, bool debug_parser_) : + HTMLControl(istream &is_, bool debug_scanner_, bool debug_parser_) : HTMLParser(), current_line(1), current_column(0), @@ -84,7 +83,7 @@ private: bool debug_scanner; - urlistream &is; + istream &is; int ungotten_chars[5]; int number_of_ungotten_chars; }; --- html2text-1.3.2a/Makefile.in.orig 2004-01-14 14:47:02.000000000 +0100 +++ html2text-1.3.2a/Makefile.in 2009-01-27 17:22:05.000000000 +0100 @@ -68,7 +68,7 @@ all : html2text @echo '"/usr/local/bin", "/usr/local/man/man1" and "/usr/local/man/man5").'; @echo -OBJS = html2text.o html.o HTMLControl.o HTMLParser.o Area.o format.o sgml.o table.o urlistream.o Properties.o cmp_nocase.o +OBJS = html2text.o html.o HTMLControl.o HTMLParser.o Area.o format.o sgml.o table.o Properties.o cmp_nocase.o html2text : $(OBJS) $(LIBSTDCXX_LIBS) $(CXX) $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LDLIBS) -o $@ ++++++ html2text-1.3.2a-611_recognize_input_encoding.patch ++++++ --- html2text-1.3.2a/html2text.C.orig 2009-01-22 17:02:57.000000000 +0100 +++ html2text-1.3.2a/html2text.C 2009-01-22 17:04:07.000000000 +0100 @@ -37,10 +37,16 @@ #include <iostream> #include <fstream> +#include <sstream> +#include <algorithm> +#include <iterator> #include <string.h> #include <stdlib.h> #include <unistd.h> +#include <iconv.h> +#include <errno.h> + #include "html.h" #include "HTMLControl.h" // #include "urlistream.h" @@ -52,11 +58,15 @@ /* ------------------------------------------------------------------------- */ using std::ifstream; +using std::stringstream; +using std::istream_iterator; +using std::ostream_iterator; class MyParser : public HTMLControl { public: enum { PRINT_AS_ASCII, UNPARSE, SYNTAX_CHECK }; + string meta_encoding; MyParser( istream &is_, @@ -108,6 +118,23 @@ MyParser::yyerror(char *p) /*virtual*/ void MyParser::process(const Document &document) { + list<auto_ptr<Meta> >::const_iterator i; + for(i = document.head.metas.begin(); i != document.head.metas.end(); ++i) { + bool exists = false; + get_attribute(i->get()->attributes.get(), "http-equiv", &exists); + if (exists) { + string content = get_attribute(i->get()->attributes.get(), "content", ""); + char to_find[] = "charset="; + string::size_type found_pos = content.find(to_find); + if (found_pos != string::npos) + { + this->meta_encoding = content.substr(found_pos + sizeof(to_find) - 1); + //std::cerr << this->meta_encoding << std::endl; + } + break; + } + } + switch (mode) { case PRINT_AS_ASCII: @@ -128,6 +155,70 @@ MyParser::process(const Document &docume } } +bool recode(stringstream& stream, const char* to_encoding, const char* from_encoding) +{ + iconv_t iconv_handle = iconv_open(to_encoding, from_encoding); + if (iconv_handle != iconv_t(-1)) + { + stream.seekg(0); + string input_string = stream.str(); + size_t input_size = input_string.size(); + char* raw_input = new char[input_size+1]; + char* const orig_raw_input = raw_input; + strcpy(raw_input, input_string.data()); + size_t max_output_size = input_size * 4; // maximum possible overhead + char* raw_output = new char[max_output_size+1]; + char* const orig_raw_output = raw_output; + size_t iconv_value = + iconv(iconv_handle, &raw_input, &input_size, &raw_output, &max_output_size); + + if (iconv_value != (size_t)-1) + { + *raw_output = '\0'; + stream.str(string(orig_raw_output)); + /* debug */ + //std::copy(istream_iterator<char>(input_stream), istream_iterator<char>(), ostream_iterator<char>(std::cerr)); + } + + delete [] orig_raw_input; + delete [] orig_raw_output; + iconv_close(iconv_handle); + + if (iconv_value == (size_t)-1) + { + std::cerr << "Input recoding failed due to "; + if (errno == EILSEQ) + { + std::cerr << "invalid input sequence."; + /* debug */ + std::cout << raw_input; + } + else + { + std::cerr << "unknown reason."; + } + std::cerr << std::endl; + return false; + } + } + else + { + if (errno == EINVAL) + { + std::cerr << "Recoding from '" << from_encoding + << "' to '" << to_encoding << "' is not available." << std::endl; + std::cerr << "Check that '" << from_encoding + << "' is a valid encoding." << std::endl; + } + else + { + std::cerr << "Error: cannot setup recoding." << std::endl; + } + return false; + } + return true; +} + /* ------------------------------------------------------------------------- */ static const char *usage = "\ @@ -153,6 +244,7 @@ text.\n\ -nobs Do not use backspaces for boldface and underlining\n\ -ascii Use plain ASCII for output instead of ISO-8859-1\n\ -utf8 Assume both terminal and input stream are in UTF-8 mode\n\ + -nometa Don't try to recode input using 'meta' tag\n\ "; int use_encoding = ISO8859; @@ -190,6 +282,7 @@ main(int argc, char **argv) int width = 79; const char *output_file_name = "-"; bool use_backspaces = false; + bool use_meta = true; int i; for (i = 1; i < argc && argv[i][0] == '-' && argv[i][1]; i++) { @@ -206,6 +299,7 @@ main(int argc, char **argv) if (!strcmp(arg, "-nobs" )) { use_backspaces = false; } else if (!strcmp(arg, "-ascii" )) { use_encoding = ASCII; } else if (!strcmp(arg, "-utf8" )) { use_encoding = UTF8; } else + if (!strcmp(arg, "-nometa" )) { use_meta = false; } else { std::cerr << "Unrecognized command line option \"" @@ -362,30 +456,117 @@ main(int argc, char **argv) } istream *isp; - ifstream uis; + istream *uis; + ifstream* infile = NULL; + stringstream input_stream; + + if (strcmp(input_url, "-") == 0) + { + uis = &std::cin; + } + else + { + infile = new ifstream(input_url); + if (!infile->is_open()) + { + delete infile; + std::cerr + << "Cannot open input file \"" + << input_url + << "\"." + << std::endl; + exit(1); + } + uis = infile; + } - uis.open(input_url); - if (!uis.is_open()) { - std::cerr - << "Cannot open input file \"" - << input_url - << "\"." - << std::endl; - exit(1); + *uis >> std::noskipws; + std::copy(istream_iterator<char>(*uis), istream_iterator<char>(), ostream_iterator<char>(input_stream)); + + if (infile) + { + infile->close(); + delete infile; + } + + string from_encoding; + if (use_meta) + { + std::ofstream fake_osp("/dev/null"); + // fake parsing to determine meta + MyParser parser( + input_stream, + debug_scanner, + debug_parser, + fake_osp, + mode, + width, + input_url + ); + if (parser.yyparse() != 0) exit(1); + + from_encoding = parser.meta_encoding; + + // don't need to debug twice ... + debug_scanner = false; + debug_parser = false; + + /* + * It will be good to show warning in this case. But there are too many + * html documents without encoding info, so this branch is commented by + * now. + if (parser.meta_encoding.empty()) + { + std::cerr << "Warning: cannot determine encoding from html file." << std::endl; + std::cerr << "To remove this warning, use '-nometa' option with, optionally, '-utf8' or '-ascii' options" << std::endl; + std::cerr << "to process file \"" << input_url << "\"." << std::endl; + } + */ + } + if (from_encoding.empty()) // -nometa supplied or no appropriate tag + { + if (use_encoding == UTF8) + { + from_encoding = "UTF-8"; + } + else if (use_encoding == ASCII) + { + from_encoding = "ASCII"; + } + else + { + from_encoding = "ISO_8859-1"; + } + } + + // recode input + bool result = recode(input_stream, "UTF-8", from_encoding.data()); + if (!result) + { + continue; + } + + if (number_of_input_urls != 1) { + *osp << "###### " << input_url << " ######" << std::endl; } - MyParser parser( - uis, - debug_scanner, - debug_parser, - *osp, - mode, - width, - input_url - ); + // real parsing now always process UTF-8 + use_encoding = UTF8; + // real parsing + input_stream.clear(); + input_stream.seekg(0); + MyParser parser( + input_stream, + debug_scanner, + debug_parser, + *osp, + mode, + width, + input_url + ); if (parser.yyparse() != 0) exit(1); - uis.close(); + } return 0; ++++++ html2text.1.gz ++++++ .\" This documentation was last modified by .\" Eugene V. Lyubimkin <jackyf.devel(a)gmail.com> .\" on Sep 20, 2008 .\" .\" Comments and suggestions are welcome. .\" .TH html2text 1 2008\-09\-20 .SH NAME html2text \- an advanced HTML\-to\-text converter .SH SYNOPSIS .B html2text -help .br .B html2text -version .br .B html2text [ .B \-unparse | .B \-check ] [ .B \-debug\-scanner ] [ .B \-debug\-parser ] [ .B \-rcfile .I path ] [ .B \-style ( .B compact | .B pretty ) ] [ .B \-width .I width ] [ .B \-o .I output-file ] [ .B \-nobs ] [ .B \-ascii | .B \-utf8 ] [ .B \-nometa ] [ .IR input-url " ..." ] .SH DESCRIPTION .B html2text reads HTML documents from the .IR input-url s, formats each of them into a stream of plain text characters, and writes the result to standard output (or into .IR output-file , if the .B -o command line option is used). .P If no .IR input-url s are specified on the command line, .B html2text reads from standard input. A dash as the .I input-url is an alternate way to specify standard input. .P .B html2text understands all HTML 3.2 constructs, but can render only part of them due to the limitations of the text output format. However, the program attempts to provide good substitutes for the elements it cannot render. .B html2text parses HTML 4 input, too, but not always as successful as other HTML processors. It also accepts syntactically incorrect input, and attempts to interpret it "reasonably". .P The way .B html2text formats the HTML documents is controlled by formatting properties read from an RC file. .B html2text attempts to read .I $HOME/.html2textrc (or the file specified by the .B -rcfile command line option); if that file cannot be read, .B html2text attempts to read .IR /etc/html2textrc . If no RC file can be read (or if the RC file does not override all formatting properties), then "reasonable" defaults are assumed. The RC file format is described in the .BR html2textrc (5) manual page. .P (open)SUSE version of \fBhtml2text\fP also can do input and output recoding. \fBhtml2text\fP tries to fetch encoding from HTML document. If encoding is not specified, you can use \fB\-ascii\fP and \fB\-utf8\fP options. Output is converted to user's locale charset (LC_CTYPE). .SH OPTIONS .TP .B \-nometa By default, (open)SUSE version of \fBhtml2text\fP use 'meta http-equiv' tag for input recoding. This option cancels this behavior. .TP .B \-ascii By default, when \fB\-nometa\fP is supplied, .B html2text uses .B ISO 8859\-1 for the input. Specifying this option, plain .B ASCII is used instead. To find out how non\-ASCII characters are rendered, refer to the file "ascii.substitutes". .TP .B \-utf8 By default, when \fB\-nometa\fP is supplied, .B html2text uses .B ISO 8859\-1 for the input. Specifying this option, .B UTF-8 is used instead (both for input and output). This option implies \fB\-nobs\fP. . .TP .B \-check This option is for diagnostic purposes: The HTML document is only parsed and not processed otherwise. In this mode of operation, .B html2text will report on parse errors and scan errors, which it does not in other modes of operation. Note that parse and scan errors are not fatal for .BR html2text , but may cause mis-interpretation of the HTML code and/or portions of the document being swallowed. .TP .B \-debug\-parser Let .B html2text report on the tokens being shifted, rules being applied, etc., while scanning the HTML document. This option is for diagnostic purposes. .TP .B \-debug\-scanner Let .B html2text report on each lexical token scanned, while scanning the HTML document. This option is for diagnostic purposes. .TP .B \-help Print command line summary and exit. .TP .B \-nobs By default, original .B html2text renders underlined letters with sequences like "underscore-backspace-character" and boldface letters like "character-backspace-character". Because of issues with UTF-8, (open)SUSE version of \fBhtml2text\fP doesn't produce backspaces, so this option really does nothing. .TP .BI \-o " output\-file" Write the output to .I output\-file instead of standard output. A dash as the .I output\-file is an alternate way to specify the standard output. .TP .BI \-rcfile " path" Attempt to read the file specified in .I path as RC file. .TP .BR \-style " ( " compact " | " pretty " )" Style .B pretty changes some of the default values of the formatting parameters documented in .BR html2textrc (5). To find out which and how the formatting parameter defaults are changed, check the file "pretty.style". If this option is omitted, style .B compact is assumed as default. .TP .B \-unparse This option is for diagnostic purposes: Instead of formatting the parsed document, generate HTML code, that is guaranteed to be syntactically correct. If .B html2text has problems parsing a syntactically incorrect HTML document, this option may help you to understand what .B html2text thinks that the original HTML code means. .TP .B \-version Print program version and exit. .TP .BI \-width " width" By default, .B html2text formats the HTML documents for a screen width of 79 characters. If redirecting the output into a file, or if your terminal has a width other than 80 characters, or if you just want to get an idea how .B html2text deals with large tables and different terminal widths, you may want to specify a different .IR width . .SH FILES .TP .I /etc/html2textrc System wide parser configuration file. .TP .I $HOME/.html2textrc Personal parser configuration file, overrides the system wide values. .SH "CONFORMING TO" .B "HTML 3.2" (HTML 3.2 Reference Specification \- http://www.w3.org/TR/REC-html32), .SH RESTRICTIONS (open)SUSE version of .B html2text have no http support. Use \fBhtml2text\fP through pipes with curl or wget instead. .P .B html2text was written to convert HTML 3.2 documents. When using it with HTML 4 or even XHTML 1 documents, some constructs present only in these HTML versions might not be rendered. .SH AUTHOR .B html2text was written up to version 1.2.2 by Arno Unkrig <arno(a)unkrig.de> for GMRS Software GmbH, Unterschleissheim. .P Current maintainer and primary download location is: .br Martin Bayer <mail(a)mbayer.de> .br .UR http://www.mbayer.de/html2text/files.shtml .P This man page was modified for Debian by Eugene V. Lyubimkin <jackyf.devel(a)gmail.com> .P This man page was modified for (open)SUSE by Klaus Singvogel <klaus(a)singvogel.net> .UE .SH SEE ALSO .BR html2textrc (5), .BR less (1), .BR more (1) ++++++ html2text-debian-200_close_files_inside_main_loop.patch ++++++ Close every file after processing, not at the end of program. Index: html2text-1.3.2a/html2text.C =================================================================== --- html2text-1.3.2a.orig/html2text.C 2008-07-13 16:13:16.364186789 +0300 +++ html2text-1.3.2a/html2text.C 2008-07-13 16:13:36.175939260 +0300 @@ -376,6 +376,7 @@ ); if (parser.yyparse() != 0) exit(1); + uis.close(); } return 0; ++++++ html2text-debian-220_nobs_when_stdout_is_a_tty.patch ++++++ Don't use backslashes when output is not a tty. Index: html2text-1.3.2a/html2text.C =================================================================== --- html2text-1.3.2a.orig/html2text.C 2008-08-25 22:38:58.002779823 +0300 +++ html2text-1.3.2a/html2text.C 2008-08-25 22:51:16.633493573 +0300 @@ -38,6 +38,7 @@ #include <iostream> #include <string.h> #include <stdlib.h> +#include <unistd.h> #include "html.h" #include "HTMLControl.h" @@ -217,6 +218,10 @@ << std::endl; exit(1); } + if (!isatty(1)) // standard output is not a tty + { + use_backspaces = false; + } const char *const *input_urls; int number_of_input_urls; ++++++ html2text-debian-500_utf8_support.patch ++++++ ++++ 741 lines (skipped) ++++++ html2text-debian-510_disable_backspaces.patch ++++++ Don't use backspaces. Index: html2text-1.3.2a/html2text.C =================================================================== --- html2text-1.3.2a.orig/html2text.C 2008-09-20 00:36:07.709605411 +0300 +++ html2text-1.3.2a/html2text.C 2008-09-20 00:50:20.938879802 +0300 @@ -188,7 +188,7 @@ const char *style = "compact"; int width = 79; const char *output_file_name = "-"; - bool use_backspaces = true; + bool use_backspaces = false; int i; for (i = 1; i < argc && argv[i][0] == '-' && argv[i][1]; i++) { ++++++ html2text-debian-600_multiple_meta_tags.patch ++++++ ++++ 1155 lines (skipped) ++++++ html2text-debian-630_recode_output_to_locale_charset.patch ++++++ Convert output to user's locale charset. Index: html2text-1.3.2a/html2text.C =================================================================== --- html2text-1.3.2a.orig/html2text.C 2008-09-20 14:09:32.009308515 +0300 +++ html2text-1.3.2a/html2text.C 2008-09-20 14:09:40.133207014 +0300 @@ -45,6 +45,7 @@ #include <iconv.h> #include <errno.h> +#include <langinfo.h> #include "html.h" #include "HTMLControl.h" @@ -59,6 +60,7 @@ using std::stringstream; using std::istream_iterator; using std::ostream_iterator; +using std::noskipws; class MyParser : public HTMLControl { @@ -474,7 +476,7 @@ uis = infile; } - *uis >> std::noskipws; + *uis >> noskipws; std::copy(istream_iterator<char>(*uis), istream_iterator<char>(), ostream_iterator<char>(input_stream)); if (infile) @@ -547,6 +549,8 @@ // real parsing now always process UTF-8 use_encoding = UTF8; + stringstream output_stream; + // real parsing input_stream.clear(); input_stream.seekg(0); @@ -554,13 +558,28 @@ input_stream, debug_scanner, debug_parser, - *osp, + output_stream, mode, width, input_url ); if (parser.yyparse() != 0) exit(1); + // recode output + setlocale(LC_CTYPE,""); + char output_encoding[64]; + strcpy(output_encoding, nl_langinfo(CODESET)); + strcat(output_encoding, "//translit"); + + result = recode(output_stream, output_encoding, "UTF-8"); + if (!result) + { + continue; + } + output_stream.clear(); + output_stream.seekg(0); + output_stream >> noskipws; + std::copy(istream_iterator<char>(output_stream), istream_iterator<char>(), ostream_iterator<char>(*osp)); } return 0; ++++++ html2text-debian-810_fix_deprecated_conversion_warnings.patch ++++++ Substituted 'char*' with 'const char*' in needed places to avoid 'deprecated conversion from string constant to ‘char*’' warnings. Index: html2text-1.3.2a/sgml.C =================================================================== --- html2text-1.3.2a.orig/sgml.C 2008-09-20 14:06:15.259781132 +0300 +++ html2text-1.3.2a/sgml.C 2008-09-20 14:09:53.589039389 +0300 @@ -61,7 +61,7 @@ static const struct TextToInt { char name[8]; int iso8859code; - char *asciistr; + const char *asciistr; unsigned long unicode; } entities[] = { { "AElig", LATIN1_AElig, "AE", 0x00c6}, Index: html2text-1.3.2a/HTMLParser.h =================================================================== --- html2text-1.3.2a.orig/HTMLParser.h 2008-09-20 13:59:22.124974404 +0300 +++ html2text-1.3.2a/HTMLParser.h 2008-09-20 14:09:53.589039389 +0300 @@ -487,7 +487,7 @@ /* decl const */ public: int YY_HTMLParser_PARSE(YY_HTMLParser_PARSE_PARAM); - virtual void YY_HTMLParser_ERROR(char *) YY_HTMLParser_ERROR_BODY; + virtual void YY_HTMLParser_ERROR(const char *) YY_HTMLParser_ERROR_BODY; #ifdef YY_HTMLParser_PURE #ifdef YY_HTMLParser_LSP_NEEDED virtual int YY_HTMLParser_LEX(YY_HTMLParser_STYPE *YY_HTMLParser_LVAL,YY_HTMLParser_LTYPE *YY_HTMLParser_LLOC) YY_HTMLParser_LEX_BODY; Index: html2text-1.3.2a/html2text.C =================================================================== --- html2text-1.3.2a.orig/html2text.C 2008-09-20 14:09:40.133207014 +0300 +++ html2text-1.3.2a/html2text.C 2008-09-20 14:09:53.589039389 +0300 @@ -85,7 +85,7 @@ {} private: - /*virtual*/ void yyerror(char *); + /*virtual*/ void yyerror(const char *); /*virtual*/ void process(const Document &); ostream &os; @@ -95,7 +95,7 @@ }; /*virtual*/ void -MyParser::yyerror(char *p) +MyParser::yyerror(const char *p) { /* Index: html2text-1.3.2a/HTMLParser.C =================================================================== --- html2text-1.3.2a.orig/HTMLParser.C 2008-09-20 14:08:49.593844329 +0300 +++ html2text-1.3.2a/HTMLParser.C 2008-09-20 14:09:53.593036056 +0300 @@ -600,7 +600,7 @@ /* decl const */ public: int YY_HTMLParser_PARSE (YY_HTMLParser_PARSE_PARAM); - virtual void YY_HTMLParser_ERROR(char *msg) YY_HTMLParser_ERROR_BODY; + virtual void YY_HTMLParser_ERROR(const char *msg) YY_HTMLParser_ERROR_BODY; #ifdef YY_HTMLParser_PURE #ifdef YY_HTMLParser_LSP_NEEDED virtual int YY_HTMLParser_LEX (YY_HTMLParser_STYPE *YY_HTMLParser_LVAL,YY_HTMLParser_LTYPE *YY_HTMLParser_LLOC) YY_HTMLParser_LEX_BODY; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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