March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit libqt4 for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Tue Mar 3 22:26:47 CET 2009. -------- --- libqt4/libqt4.changes 2009-02-11 19:43:02.000000000 +0100 +++ libqt4/libqt4.changes 2009-03-03 10:48:42.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 3 10:34:50 CET 2009 - dmueller(a)suse.de + +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option + +------------------------------------------------------------------- +Sun Mar 1 22:07:48 CET 2009 - dmueller(a)suse.de + +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change calling whatdependson for head-i586 Old: ---- qt-x11-opensource-src-4.5.0-rc1.tar.bz2 New: ---- build-install-qdoc3.diff qt-x11-opensource-src-4.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:20.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.4.90+4.5.0rc1) +# spec file for package libqt4-devel-doc-data (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ BuildRequires: update-desktop-files %endif Url: http://www.trolltech.com -License: GPL v2 only; GPL v3 only +License: GPL v3 only; LGPL v2.1 or later Group: Documentation/HTML AutoReqProv: on Summary: Qt Documentation (Architecture Independent Files) @@ -34,11 +34,11 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -72,6 +72,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support @@ -129,6 +130,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -175,6 +177,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %files %defattr(-,root,root,755) @@ -184,6 +190,13 @@ /usr/share/doc/packages/%base_name/src %changelog +* Tue Mar 03 2009 dmueller(a)suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller(a)suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller(a)suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo(a)suse.de ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:21.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.4.90+4.5.0rc1) +# spec file for package libqt4 (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,8 +31,8 @@ BuildRequires: clucene-core-devel %endif %define with_qt3support 1 -Url: http://www.trolltech.com -License: GPL v2 only; GPL v3 only +Url: http://www.qtsoftware.com +License: GPL v3 only; LGPL v2.1 or later Group: System/Libraries AutoReqProv: on Summary: C++ Program Library, Core Components @@ -46,11 +46,11 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -84,6 +84,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support @@ -106,7 +107,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %prep %define plugindir %_libdir/qt4/plugins @@ -142,6 +143,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -183,7 +185,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %package -n libqt4-sql-sqlite License: GPL v2 only; GPL v3 only @@ -202,7 +204,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %package x11 License: GPL v2 only; GPL v3 only @@ -224,7 +226,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %if %with_qt3support @@ -251,7 +253,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %endif @@ -280,7 +282,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %build export QTDIR=$PWD @@ -313,11 +315,6 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=/usr/bin/moc," -e "s,uic_location=.*,uic_location=/usr/bin/uic," {} \; find $RPM_BUILD_ROOT/%_libdir/ -name 'lib*.a' -exec chmod -x -- {} \; mkdir -p $RPM_BUILD_ROOT/%plugindir/sqldrivers -for ch in changes-*; do - if test -f $ch; then - install -D -m 644 $ch $RPM_BUILD_ROOT/%_defaultdocdir/%name/$(basename $ch) - fi -done # overwrite config install -m 644 fullconfig/qconfig.pri $RPM_BUILD_ROOT/usr/share/qt4/mkspecs/qconfig.pri install -m 644 fullconfig/qconfig.h $RPM_BUILD_ROOT/usr/include/QtCore/ @@ -337,6 +334,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %post -p /sbin/ldconfig @@ -358,6 +359,7 @@ %files %defattr(-,root,root,755) +%doc changes-* *.TXT LICENSE.GPL3 %dir %_libdir/qt4 %dir %plugindir %if %suse_version > 910 @@ -370,7 +372,6 @@ %dir %plugindir/accessible %dir %plugindir/graphicssystems %dir /usr/share/qt4 -#%doc %_defaultdocdir/%name/changes-* %_libdir/libQtCore*.so.* %_libdir/libQtNetwork*.so.* %_libdir/libQtXml*.so.* @@ -431,6 +432,7 @@ %if %with_qt3support /usr/bin/uic3 %endif +/usr/bin/qdoc3 /usr/bin/moc /usr/bin/qmake /usr/bin/designer @@ -495,6 +497,13 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Tue Mar 03 2009 dmueller(a)suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller(a)suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller(a)suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo(a)suse.de ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:21.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.4.90+4.5.0rc1) +# spec file for package libqt4-sql-plugins (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,17 +27,17 @@ BuildRequires: update-desktop-files %endif Url: http://www.trolltech.com/ -License: GPL v2 only; GPL v3 only +License: GPL v3 only; LGPL v2.1 or later Group: Development/Libraries/C and C++ AutoReqProv: on Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -71,6 +71,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support @@ -127,6 +128,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -230,6 +232,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %files -n libqt4-sql-unixODBC %defattr(-,root,root,755) @@ -247,6 +253,13 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Tue Mar 03 2009 dmueller(a)suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller(a)suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller(a)suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo(a)suse.de ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:21.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.4.90+4.5.0rc1) +# spec file for package libQtWebKit-devel (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,7 @@ BuildRequires: update-desktop-files %endif Url: http://www.trolltech.com -License: GPL v2 only; GPL v3 only +License: GPL v3 only; LGPL v2.1 or later Group: System/Libraries AutoReqProv: on Summary: C++ Program Library, Core Components @@ -37,11 +37,11 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -75,6 +75,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support @@ -133,6 +134,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -249,6 +251,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %if %suse_version > 910 %post -n libQtWebKit4 -p /sbin/ldconfig @@ -301,6 +307,13 @@ /usr/bin/qt4-browser %changelog +* Tue Mar 03 2009 dmueller(a)suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller(a)suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller(a)suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo(a)suse.de ++++++ build-install-qdoc3.diff ++++++ --- tools/qdoc3/qdoc3.pro +++ tools/qdoc3/qdoc3.pro @@ -106,3 +106,6 @@ win32 { QT_WINCONFIG = debug } } + +target.path=$$[QT_INSTALL_BINS] +INSTALLS += target --- tools/tools.pro +++ tools/tools.pro @@ -25,6 +25,7 @@ mac { contains(QT_CONFIG, dbus):SUBDIRS += qdbus !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns embedded: SUBDIRS += makeqpf +SUBDIRS += qdoc3 CONFIG+=ordered QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" ++++++ libqt4-devel-doc-data.spec.in ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:22.000000000 +0100 @@ -69,6 +69,11 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif + %files %defattr(-,root,root,755) ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:22.000000000 +0100 @@ -121,6 +121,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %files -n libqt4-sql-unixODBC %defattr(-,root,root,755) ++++++ libQtWebKit-devel.spec.in ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:22.000000000 +0100 @@ -144,6 +144,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %if %suse_version > 910 ++++++ qt-x11-opensource-src-4.5.0-rc1.tar.bz2 -> qt-x11-opensource-src-4.5.0.tar.bz2 ++++++ libqt4/qt-x11-opensource-src-4.5.0-rc1.tar.bz2 libqt4/qt-x11-opensource-src-4.5.0.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_6_0-openjdk for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Tue Mar 3 22:23:45 CET 2009. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-02-09 11:29:32.000000000 +0100 +++ java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-03-02 09:56:13.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 2 09:55:53 CET 2009 - mvyskocil(a)suse.cz + +- fixed ppc/ppc64 build bnc#471829 comment#28 + - added openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.wIh986/_old 2009-03-03 22:19:50.000000000 +0100 +++ /var/tmp/diff_new_pack.wIh986/_new 2009-03-03 22:19:50.000000000 +0100 @@ -107,7 +107,7 @@ Obsoletes: %obsoletes %endif Version: %{icedteaver}_%{openjdkver} -Release: 23 +Release: 25 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPL v2 only; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -172,6 +172,9 @@ Patch107: openjdk-6-src-b14-no-return-in-nonvoid-function.patch Patch108: openjdk-6-src-b14-undefined-operation.patch Patch109: openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch +# PATCH-FIX-OPENSUSE bnc#471829 comment#28 +# will be sent to upstream after sign of SCA (http://openjdk.java.net/contribute/) +Patch110: openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-lib-devel @@ -448,6 +451,9 @@ patch -l $* --input=%PATCH108 patch -l $* --input=%PATCH109 %endif +%ifarch ppc ppc64 + patch -l $* --input=%PATCH110 +%endif } %if %{gcjbootstrap} make stamps/patch-ecj.stamp @@ -895,6 +901,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so %changelog +* Mon Mar 02 2009 mvyskocil(a)suse.cz +- fixed ppc/ppc64 build bnc#471829 comment#28 + - added openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch * Mon Feb 09 2009 mvyskocil(a)suse.cz - updates: * openjdk b14 (25_nov_2008) ++++++ openjdk-6-src-b14-no-return-in-nonvoid-function-ppc.patch ++++++ --- ./ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp @@ -874,6 +874,7 @@ void BytecodeInterpreter::layout_interpreterState(interpreterState istate, address CppInterpreter::return_entry(TosState state, int length) { Unimplemented(); + return NULL; } address CppInterpreter::deopt_entry(TosState state, int length) @@ -882,6 +883,7 @@ address CppInterpreter::deopt_entry(TosState state, int length) return NULL; #else Unimplemented(); + return NULL; #endif // SHARK } @@ -898,6 +900,7 @@ bool CppInterpreter::contains(address pc) { #ifdef PRODUCT ShouldNotCallThis(); + return false; #else return false; // make frame::print_value_on work #endif // !PRODUCT --- ./ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp @@ -28,8 +28,10 @@ static int pd_instruction_alignment() { Unimplemented(); + return 0; } static const char* pd_cpu_opts() { Unimplemented(); + return ""; } --- ./ports/hotspot/src/cpu/zero/vm/frame_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.cpp @@ -90,6 +90,7 @@ frame frame::sender(RegisterMap* map) const return sender_for_deoptimizer_frame(map); Unimplemented(); + return NULL; } #ifdef CC_INTERP @@ -119,6 +120,7 @@ void frame::patch_pc(Thread* thread, address pc) bool frame::safe_for_sender(JavaThread *thread) { Unimplemented(); + return false; } void frame::pd_gc_epilog() @@ -128,6 +130,7 @@ void frame::pd_gc_epilog() bool frame::is_interpreted_frame_valid(JavaThread *thread) const { Unimplemented(); + return false; } BasicType frame::interpreter_frame_result(oop* oop_result, @@ -191,6 +194,7 @@ int frame::frame_size() const { #ifdef PRODUCT ShouldNotCallThis(); + return 0; #else return 0; // make javaVFrame::print_value work #endif // PRODUCT --- ./ports/hotspot/src/cpu/zero/vm/frame_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.hpp @@ -43,6 +43,7 @@ { #ifdef PRODUCT ShouldNotCallThis(); + return NULL; #else return (intptr_t *) -1; // make frame::print_value_on work #endif // !PRODUCT --- ./ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp +++ ./ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp @@ -78,6 +78,7 @@ inline intptr_t* frame::sender_sp() const inline intptr_t* frame::link() const { Unimplemented(); + return NULL; } #ifdef CC_INTERP @@ -154,6 +155,7 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) inline oop frame::saved_oop_result(RegisterMap* map) const { Unimplemented(); + return NULL; } inline bool frame::is_older(intptr_t* id) const @@ -164,6 +166,7 @@ inline bool frame::is_older(intptr_t* id) const inline intptr_t* frame::entry_frame_argument_at(int offset) const { Unimplemented(); + return NULL; } inline intptr_t* frame::unextended_sp() const --- ./ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp @@ -43,10 +43,12 @@ address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) { // NB ic_stub_code_size() must return the size of the code we generate Unimplemented(); + return NULL; } oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) { // NB ic_stub_code_size() must return the size of the code we generate Unimplemented(); + return NULL; } --- ./ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp @@ -38,6 +38,7 @@ { assert(TaggedStackInterpreter, "should not call this"); Unimplemented(); + return 0; } static int expr_offset_in_bytes(int i) @@ -59,4 +60,5 @@ { assert(TaggedStackInterpreter, "should not call this"); Unimplemented(); + return 0; } --- ./ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp +++ ./ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp @@ -67,21 +67,25 @@ class NativeCall : public NativeInstruction address instruction_address() const { Unimplemented(); + return NULL; } address next_instruction_address() const { Unimplemented(); + return NULL; } address return_address() const { Unimplemented(); + return NULL; } address destination() const { Unimplemented(); + return NULL; } void set_destination_mt_safe(address dest) @@ -102,17 +106,20 @@ class NativeCall : public NativeInstruction static bool is_call_before(address return_address) { Unimplemented(); + return false; } }; inline NativeCall* nativeCall_before(address return_address) { Unimplemented(); + return NULL; } inline NativeCall* nativeCall_at(address address) { Unimplemented(); + return NULL; } class NativeMovConstReg : public NativeInstruction @@ -121,6 +128,7 @@ class NativeMovConstReg : public NativeInstruction address next_instruction_address() const { Unimplemented(); + return NULL; } intptr_t data() const @@ -137,6 +145,7 @@ class NativeMovConstReg : public NativeInstruction inline NativeMovConstReg* nativeMovConstReg_at(address address) { Unimplemented(); + return NULL; } class NativeMovRegMem : public NativeInstruction @@ -195,6 +204,7 @@ class NativeJump : public NativeInstruction inline NativeJump* nativeJump_at(address address) { Unimplemented(); + return NULL; } class NativeGeneralJump : public NativeInstruction --- ./ports/hotspot/src/cpu/zero/vm/register_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/register_zero.cpp @@ -32,8 +32,10 @@ const int ConcreteRegisterImpl::max_fpr = const char* RegisterImpl::name() const { Unimplemented(); + return ""; } const char* FloatRegisterImpl::name() const { Unimplemented(); + return ""; } --- ./ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp @@ -34,6 +34,7 @@ void Relocation::pd_set_data_value(address x, intptr_t o) address Relocation::pd_call_destination(address orig_addr) { Unimplemented(); + return NULL; } void Relocation::pd_set_call_destination(address x) @@ -44,16 +45,19 @@ void Relocation::pd_set_call_destination(address x) address Relocation::pd_get_address_from_code() { Unimplemented(); + return NULL; } address* Relocation::pd_address_in_code() { Unimplemented(); + return NULL; } int Relocation::pd_breakpoint_size() { Unimplemented(); + return 0; } void Relocation::pd_swap_in_breakpoint(address x, short* instrs, --- ./ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp @@ -65,6 +65,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm, BasicType ret_type) { Unimplemented(); + return NULL; } int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) @@ -73,12 +74,14 @@ int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) return 0; #else Unimplemented(); + return 0; #endif // SHARK } uint SharedRuntime::out_preserve_stack_slots() { Unimplemented(); + return 0; } static RuntimeStub* generate_empty_runtime_stub(const char* name) @@ -117,4 +120,5 @@ int SharedRuntime::c_calling_convention(const BasicType *sig_bt, int total_args_passed) { Unimplemented(); + return 0; } --- ./ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp +++ ./ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp @@ -29,19 +29,23 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) { Unimplemented(); + return NULL; } VtableStub* VtableStubs::create_itable_stub(int vtable_index) { Unimplemented(); + return NULL; } int VtableStub::pd_code_size_limit(bool is_vtable_stub) { Unimplemented(); + return 0; } int VtableStub::pd_code_alignment() { Unimplemented(); + return 0; } --- ./ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ ./ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -35,11 +35,13 @@ address os::current_stack_pointer() frame os::get_sender_for_C_frame(frame* fr) { Unimplemented(); + return NULL; } frame os::current_frame() { Unimplemented(); + return NULL; } char* os::non_memory_address_word() @@ -65,17 +67,20 @@ void os::initialize_thread() address os::Linux::ucontext_get_pc(ucontext_t* uc) { Unimplemented(); + return NULL; } ExtendedPC os::fetch_frame_from_context(void* ucVoid, intptr_t** ret_sp, intptr_t** ret_fp) { Unimplemented(); + return NULL; } frame os::fetch_frame_from_context(void* ucVoid) { Unimplemented(); + return NULL; } extern "C" int @@ -232,6 +237,7 @@ void os::Linux::init_thread_fpu_state(void) int os::Linux::get_fpu_control_word() { Unimplemented(); + return 0; } void os::Linux::set_fpu_control_word(int fpu) @@ -242,6 +248,7 @@ void os::Linux::set_fpu_control_word(int fpu) bool os::is_allocatable(size_t bytes) { Unimplemented(); + return false; } /////////////////////////////////////////////////////////////////////////////// @@ -372,6 +379,7 @@ void os::print_context(outputStream* st, void* context) extern "C" { int SpinPause() { + return 0; } int SafeFetch32(int *adr, int errValue) @@ -463,6 +471,7 @@ extern "C" { long long unsigned int newval) { Unimplemented(); + return 0; } }; #endif // !_LP64 --- ./ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +++ ./ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp @@ -100,6 +100,7 @@ bool isInJava) { Unimplemented(); + return false; } // These routines are only used on cpu architectures that -- 1.6.1.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 deb for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package deb for openSUSE:Factory checked in at Tue Mar 3 22:19:37 CET 2009. -------- --- deb/deb.changes 2009-01-20 10:03:09.000000000 +0100 +++ deb/deb.changes 2009-03-03 10:17:46.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 3 10:10:53 CET 2009 - puzel(a)suse.cz + +- update to dpkg-1.15.0 and debhelper-7.2.1 + - huge number of changes, please see + /usr/share/doc/packages/deb/dpkg/changelog and + /usr/share/doc/packages/deb/debhelper/changelog + for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- debhelper_7.1.1.tar.bz2 dpkg_1.14.21.tar.bz2 New: ---- debhelper_7.2.1.tar.bz2 dpkg_1.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deb.spec ++++++ --- /var/tmp/diff_new_pack.p30841/_old 2009-03-03 22:18:33.000000000 +0100 +++ /var/tmp/diff_new_pack.p30841/_new 2009-03-03 22:18:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package deb (Version 1.14.21) +# spec file for package deb (Version 1.15.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild -%define debhelper_ver 7.1.1 +%define debhelper_ver 7.2.1 Name: deb BuildRequires: gcc-c++ ncurses-devel texlive-latex update-alternatives zlib-devel @@ -30,8 +30,8 @@ Requires: perl = %{perl_version} Requires: cpio patch make html2text update-alternatives AutoReqProv: on -Version: 1.14.21 -Release: 12 +Version: 1.15.0 +Release: 1 Summary: Tools for Debian Packages Source: dpkg_%{version}.tar.bz2 Source1: debhelper_%{debhelper_ver}.tar.bz2 @@ -169,6 +169,12 @@ %{perl_vendorlib}/Dpkg.pm %changelog +* Tue Mar 03 2009 puzel(a)suse.cz +- update to dpkg-1.15.0 and debhelper-7.2.1 + - huge number of changes, please see + /usr/share/doc/packages/deb/dpkg/changelog and + /usr/share/doc/packages/deb/debhelper/changelog + for details * Tue Jan 20 2009 puzel(a)suse.cz - partially revert change from Aug 12 2008 (bnc#467332) * Thu Dec 18 2008 puzel(a)suse.cz ++++++ debhelper_7.1.1.tar.bz2 -> debhelper_7.2.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/postinst-gconf-defaults new/debhelper/autoscripts/postinst-gconf-defaults --- old/debhelper/autoscripts/postinst-gconf-defaults 2007-12-31 23:45:13.000000000 +0100 +++ new/debhelper/autoscripts/postinst-gconf-defaults 2009-03-01 02:01:01.000000000 +0100 @@ -1,3 +1,3 @@ if [ "$1" = "configure" ] && which update-gconf-defaults >/dev/null 2>&1; then - update-gconf-defaults + update-gconf-defaults #OPT# fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/postrm-gconf-defaults new/debhelper/autoscripts/postrm-gconf-defaults --- old/debhelper/autoscripts/postrm-gconf-defaults 2007-12-31 23:45:13.000000000 +0100 +++ new/debhelper/autoscripts/postrm-gconf-defaults 2009-03-01 02:01:01.000000000 +0100 @@ -1,3 +1,3 @@ if which update-gconf-defaults >/dev/null 2>&1; then - update-gconf-defaults + update-gconf-defaults #OPT# fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debhelper.pod new/debhelper/debhelper.pod --- old/debhelper/debhelper.pod 2008-12-15 03:40:11.000000000 +0100 +++ new/debhelper/debhelper.pod 2009-03-01 02:01:01.000000000 +0100 @@ -366,8 +366,8 @@ =item - -Commands that generate maintainer script fragements will order the -fragements in reverse order for the prerm and postrm scripts. +Commands that generate maintainer script fragments will order the +fragments in reverse order for the prerm and postrm scripts. =item - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/changelog new/debhelper/debian/changelog --- old/debhelper/debian/changelog 2008-12-15 05:19:31.000000000 +0100 +++ new/debhelper/debian/changelog 2009-03-01 02:01:54.000000000 +0100 @@ -1,3 +1,25 @@ +debhelper (7.2.1) experimental; urgency=low + + * Merged debhelper 7.0.52. + + -- Joey Hess <joeyh(a)debian.org> Sat, 28 Feb 2009 20:01:22 -0500 + +debhelper (7.2.0) experimental; urgency=low + + * Merged debhelper 7.0.50. + * dh: Fix typo. Closes: #509754 + * debhelper.pod: Fix typo. Closes: #510180 + * dh_gconf: Support mandatory settings. Closes: #513923 + * Improve error messages when child commands fail. + * Depend on dpkg-dev 1.14.19, the first to support Package-Type + fields in dpkg-gencontrol. + * dh_gencontrol: No longer need to generate the udeb filename + when calling dpkg-gencontrol. + * dh_gencontrol: Do not need to tell dpkg-gencontol not to + include the Homepage field in udebs (fixed in dpkg-dev 1.14.17). + + -- Joey Hess <joeyh(a)debian.org> Thu, 26 Feb 2009 18:33:44 -0500 + debhelper (7.1.1) experimental; urgency=low * dh_install(1): Order options alphabetically. Closes:# 503896 @@ -40,6 +62,38 @@ -- Joey Hess <joeyh(a)debian.org> Wed, 10 Sep 2008 13:58:00 -0400 +debhelper (7.0.52) unstable; urgency=low + + * dh: Fix make parsing to not be broken by locale settings. + Closes: #517617 + + -- Joey Hess <joeyh(a)debian.org> Sat, 28 Feb 2009 19:52:34 -0500 + +debhelper (7.0.51) unstable; urgency=low + + * dh: Man page typos. Closes: #517549, #517550 + + -- Joey Hess <joeyh(a)debian.org> Sat, 28 Feb 2009 13:23:30 -0500 + +debhelper (7.0.50) unstable; urgency=low + + * This release is designed to be easily backportable to stable, + to support the new style of rules file that I expect many packages will + use. + * dh: debian/rules override targets can change what is run + for a specific debhelper command in a sequence. + (Thanks Modestas Vainius for the improved makefile parser.) + * dh: Redid all the examples to use override targets, since these + eliminate all annoying boilerplate and are much easier to understand + than the old method. + * Remove rules.simple example, there's little need to use explicit targets + with dh anymore. + * dh: Support debian/rules calling make with -B, + which is useful to avoid issues with phony implicit + rules (see bug #509756). + + -- Joey Hess <joeyh(a)debian.org> Fri, 27 Feb 2009 15:25:52 -0500 + debhelper (7.0.17) unstable; urgency=low [ Per Olofsson ] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/control new/debhelper/debian/control --- old/debhelper/debian/control 2008-12-04 18:38:09.000000000 +0100 +++ new/debhelper/debian/control 2009-03-01 02:01:02.000000000 +0100 @@ -10,7 +10,7 @@ Package: debhelper Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.14.15), html2text, binutils, po-debconf, man-db (>= 2.5.1-1) +Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.14.19), html2text, binutils, po-debconf, man-db (>= 2.5.1-1) Suggests: dh-make Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6) Description: helper programs for debian/rules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/rules new/debhelper/debian/rules --- old/debhelper/debian/rules 2008-06-15 19:30:08.000000000 +0200 +++ new/debhelper/debian/rules 2009-02-27 21:31:05.000000000 +0100 @@ -5,6 +5,7 @@ # Each debhelper command in this rules file has to be run using ./run, # to ensure that the commands and libraries in the source tree are used, # rather than the installed ones. + %: ./run dh $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/Debian/Debhelper/Dh_Getopt.pm new/debhelper/Debian/Debhelper/Dh_Getopt.pm --- old/debhelper/Debian/Debhelper/Dh_Getopt.pm 2008-12-15 04:09:26.000000000 +0100 +++ new/debhelper/Debian/Debhelper/Dh_Getopt.pm 2009-03-01 02:01:01.000000000 +0100 @@ -159,12 +159,20 @@ } } + # DH_INTERNAL_OPTIONS is used to pass additional options from + # dh through an override target to a command. + if (defined $ENV{DH_INTERNAL_OPTIONS}) { + $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//; + $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//; + unshift @ARGV, split(/\s+/,$ENV{DH_INTERNAL_OPTIONS}); + } + my $ret=getoptions(\@ARGV, $options); if (!$ret) { warning("warning: unknown options will be a fatal error in a future debhelper release"); #error("unknown option; aborting"); } - + # Check to see if -V was specified. If so, but no parameters were # passed, the variable will be defined but empty. if (defined($dh{V_FLAG})) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/Debian/Debhelper/Dh_Lib.pm new/debhelper/Debian/Debhelper/Dh_Lib.pm --- old/debhelper/Debian/Debhelper/Dh_Lib.pm 2008-12-15 04:01:26.000000000 +0100 +++ new/debhelper/Debian/Debhelper/Dh_Lib.pm 2009-03-01 02:01:01.000000000 +0100 @@ -27,6 +27,7 @@ # If so, we need to pass this off to the resource intensive # Getopt::Long, which I'd prefer to avoid loading at all if possible. if ((defined $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS}) || + (defined $ENV{DH_INTERNAL_OPTIONS} && length $ENV{DH_INTERNAL_OPTIONS}) || grep /^-/, @ARGV) { eval "use Debian::Debhelper::Dh_Getopt"; error($@) if $@; @@ -102,14 +103,20 @@ my $write_log=1; sub END { if ($? == 0 && $write_log) { - my $cmd=basename($0); - foreach my $package (@{$dh{DOPACKAGES}}) { - my $ext=pkgext($package); - my $log="debian/${ext}debhelper.log"; - open(LOG, ">>", $log) || error("failed to write to ${log}: $!"); - print LOG $cmd."\n"; - close LOG; - } + write_log(basename($0), @{$dh{DOPACKAGES}}); + } +} + +sub write_log { + my $cmd=shift; + my @packages=@_; + + foreach my $package (@packages) { + my $ext=pkgext($package); + my $log="debian/${ext}debhelper.log"; + open(LOG, ">>", $log) || error("failed to write to ${log}: $!"); + print LOG $cmd."\n"; + close LOG; } } @@ -155,8 +162,7 @@ verbose_print(escape_shell(@_)); if (! $dh{NO_ACT}) { - my $ret=system(@_); - $ret == 0 || error("command returned error code $ret"); + system(@_) == 0 || _error_exitcode($_[0]); } } @@ -169,11 +175,23 @@ if (! $dh{NO_ACT}) { # The join makes system get a scalar so it forks off a shell. - system(join(" ",@_)) == 0 - || error("command returned error code"); + system(join(" ", @_)) == 0 || _error_exitcode(join(" ", @_)) } } +sub _error_exitcode { + my $command=shift; + if ($? == -1) { + error("$command failed to to execute: $!"); + } + elsif ($? & 127) { + error("$command died with signal ".($? & 127)); + } + else { + error("$command returned exit code ".($? >> 8)); + } +} + # Run a command that may have a huge number of arguments, like xargs does. # Pass in a reference to an array containing the arguments, and then other # parameters that are the command and any parameters that should be passed to diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh new/debhelper/dh --- old/debhelper/dh 2008-10-31 18:19:02.000000000 +0100 +++ new/debhelper/dh 2009-03-01 02:01:04.000000000 +0100 @@ -11,7 +11,7 @@ =head1 SYNOPSIS -B<dh> sequence [B<--until> I<cmd>] [B<--before> I<cmd>] [B<--after> I<cmd>] [B<--remaining>] [B<--with> I<addon>] [S<I<debhelper options>>] +B<dh> sequence [B<--with> I<addon>] [B<--until> I<cmd>] [B<--before> I<cmd>] [B<--after> I<cmd>] [B<--remaining>] [S<I<debhelper options>>] =head1 DESCRIPTION @@ -34,10 +34,25 @@ in the sequence. The B<--until>, B<--before>, B<--after>, and B<--remaining> options can override this behavior. +If debian/rules contains a target with a name like "override_I<dh_command>", +then when it gets to that command in the sequence, dh will run that +target from the rules file, rather than running the actual command. The +override target can then run the command with additional options, or run +entirely different commands instead. (Note that to use this feature, +you should Build-Depend on debhelper 7.0.50 or above.) + =head1 OPTIONS =over 4 +=item B<--with> I<addon> + +Add the debhelper commands specified by the given addon to appropriate places +in the sequence of commands that is run. This option can be repeated more +than once, and is used when there is a third-party package that provides +debhelper commands. See "SEQUENCE ADDONS" below for documentation about what +such packages should do to be supported by --with. + =item B<--until> I<cmd> Run commands in the sequence until and including I<cmd>, then stop. @@ -54,14 +69,6 @@ Run all commands in the sequence that have yet to be run. -=item B<--with> I<addon> - -Add the debhelper commands specified by the given addon to appropriate places -in the sequence of commands that is run. This option can be repeated more -than once, and is used when there is a third-party package that provides -debhelper commands. See "SEQUENCE ADDONS" below for documentation about what -such packages should do to be supported by --with. - =back All other options passed to dh are passed on to each command it runs. This @@ -137,84 +144,50 @@ %: dh $@ -This is a simple rules file that is a good starting place for customisation. -(It's also available in F</usr/share/doc/debhelper/examples/rules.simple> +Often you'll want to pass an option to a specific debhelper command. The +easy way to do with is by adding an override target for that command. + + #!/usr/bin/make -f + %: + dh $@ + + override_dh_strip: + dh_strip -Xfoo + + override_dh_installdocs: + dh_installdocs README TODO + +Sometimes the automated dh_auto_configure and dh_auto_build can't guess +what to do for a strange package. Here's how to avoid running either +and instead run your own commands. #!/usr/bin/make -f + %: + dh $@ - build: build-stamp - build-stamp: - dh build - touch build-stamp - - clean: - dh clean - - install: build install-stamp - install-stamp: - dh install - touch install-stamp - - binary-arch: install - dh binary-arch - - binary-indep: install - dh binary-indep - - binary: binary-arch binary-indep - -Often you'll want to pass an option to ./configure. This uses dh to run all -commands before L<dh_auto_configure(1)>, then runs that command by hand, -and then finishes up by running the rest of the sequence. You could also -run ./configure by hand, instead of bothering with using dh_auto_configure. -And if necessary, you can add commands to run automake, etc here too. - - build: build-stamp - build-stamp: - dh build --before configure - dh_auto_configure -- --kitchen-sink=yes - dh build --after configure - touch build-stamp - -Here's how to skip two automated in a row (configure and build), and -instead run the commands by hand. - - build: build-stamp - build-stamp: - dh build --before configure + override_dh_auto_configure: ./mondoconfig + + override_dh_auto_build: make universe-explode-in-delight - dh build --after build - touch build-stamp -Another common case is wanting to run some code manually after a particular -debhelper command is run. +Another common case is wanting to do something manually before or +after a particular debhelper command is run. + + #!/usr/bin/make -f + %: + dh $@ - install: build install-stamp - install-stamp: - dh install --until dh_fixperms - # dh_fixperms has run, now override it for one program + override_dh_fixperms: + dh_fixperms chmod 4755 debian/foo/usr/bin/foo - # and continue - dh install --after dh_fixperms - touch install-stamp - -It's also fine to run debhelper commands early. Just make sure that at -least dh_prep is run from the sequence first, and be sure to use the -B<--remaining> option to ensure that commands that normally come before -those in the sequence are still run. - - install: build install-stamp - install-stamp: - dh install --until dh_prep - dh_installdocs README TODO - dh_installchangelogs Changes - dh install --remaining - touch install-stamp - - binary-arch: install - dh_strip -X foo - dh binary-arch --remaining + +If your package is a python package, dh will use dh_pysupport by +default. This is how to use dh_pycentral instead. + + #!/usr/bin/make -f + %: + dh --with python-central $@ =cut @@ -354,8 +327,14 @@ error "specify a sequence to run"; } my $sequence=shift; -if (! exists $sequences{$sequence}) { - error "Unknown sequence $sequence (chose from: ". +if ($sequence eq 'debian/rules' || + $sequence =~ /^override_dh_/) { + # make -B causes the rules file to be run as a target + # and support completly empty override targets + exit 0 +} +elsif (! exists $sequences{$sequence}) { + error "Unknown sequence $sequence (choose from: ". join(" ", sort keys %sequences).")"; } my @sequence=@{$sequences{$sequence}}; @@ -406,7 +385,7 @@ # no commands remain to run after it, communicating to # future dh instances that the specified command should not # be run again. - writelog($package, $sequence[$startpoint{$package}-1]); + writelog($sequence[$startpoint{$package}-1], $package); } elsif ($dh{REMAINING}) { # Start at the beginning so all remaining commands will get @@ -453,21 +432,33 @@ # Command already done for all packages. next; } - elsif (! @exclude) { - # Run command for all packages. - run($sequence[$i], @options); - } - else { - # Run command for only a subset of packages. - run($sequence[$i], @options, - map { "-N$_" } @exclude); - } + + run($sequence[$i], \@packages, \@exclude, @options); } sub run { my $command=shift; + my @packages=@{shift()}; + my @exclude=@{shift()}; my @options=@_; + # Check for override targets in debian/rules and + # run them instead of running the command directly. + my $override_command; + if (rules_explicit_target("override_".$command)) { + $override_command=$command; + # This passes the options through to commands called + # inside the target. + $ENV{DH_INTERNAL_OPTIONS}=join(" ", @options); + $command="debian/rules"; + @options="override_".$override_command; + } + else { + # If some packages are excluded, add flags + # to prevent them from being acted on. + push @options, map { "-N$_" } @exclude; + } + # 3 space indent lines the command being run up under the # sequence name after "dh ". print " ".escape_shell($command, @options)."\n"; @@ -480,6 +471,16 @@ elsif ($ret) { exit 1; } + + if (defined $override_command) { + delete $ENV{DH_INTERNAL_OPTIONS}; + # Need to handle logging for overriden commands here, + # because the actual debhelper command may not have + # been run by the rules file target. + my %packages=map { $_ => 1 } @packages; + map { delete $packages{$_} } @exclude; + writelog($override_command, keys %packages); + } } } @@ -497,15 +498,53 @@ close LOG; return @log; } - + sub writelog { - my $package=shift; - my $cmd=shift; - my $ext=pkgext($package); + Debian::Debhelper::Dh_Lib::write_log(@_); +} + +{ +my %targets; +my $rules_parsed; + +sub rules_explicit_target { + # Checks if a specified target exists as an explicit target + # in debian/rules. + my $target=shift; - open(LOG, ">>", "debian/${ext}debhelper.log") || error("failed to write to log"); - print LOG $cmd."\n"; - close LOG; + if (! $rules_parsed) { + my $processing_targets = 0; + my $not_a_target = 0; + open(MAKE, "LANG=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |"); + while (<MAKE>) { + if ($processing_targets) { + if (/^# Not a target:/) { + $not_a_target = 1; + } + else { + if (!$not_a_target && /^([^#:]+)::?/) { + # Target is defined. + # NOTE: if it is a depenency + # of .PHONY it will be + # defined too but that's ok. + $targets{$1} = 1; + } + # "Not a target:" is always followed by + # a target name, so resetting this one + # here is safe. + $not_a_target = 0; + } + } elsif (/^# Files$/) { + $processing_targets = 1; + } + } + close MAKE; + $rules_parsed = 1; + } + + return exists $targets{$target}; +} + } =head1 SEE ALSO diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_gconf new/debhelper/dh_gconf --- old/debhelper/dh_gconf 2008-07-31 18:27:07.000000000 +0200 +++ new/debhelper/dh_gconf 2009-03-01 02:01:02.000000000 +0100 @@ -27,6 +27,11 @@ directory, with "package" replaced by the package name. Some postinst and postrm fragments will be generated to launch update-gconf-defaults. +If a file named debian/package.gconf-mandatory exists, then it is +installed into usr/share/gconf/mandatory/10_package in the package build +directory, with "package" replaced by the package name, and similar +postinst and postrm fragments will be generated. + The gconf-schemas and update-gconf-defaults scripts are provided by the gconf2 package. An appropriate dependency will be generated in ${misc:Depends}. @@ -57,13 +62,22 @@ my $tmp=tmpdir($package); my $gconf_dep = 0; + my $mandatory = pkgfile($package, "gconf-mandatory"); + if ($mandatory ne '') { + doit("mkdir","-p","$tmp/usr/share/gconf/mandatory"); + doit("install","-p","-m644",$mandatory,"$tmp/usr/share/gconf/mandatory/${priority}_$package"); + autoscript($package,"postinst","postinst-gconf-defaults","s%#OPT#%--mandatory%"); + autoscript($package,"postrm","postrm-gconf-defaults","s%#OPT#%--mandatory%"); + addsubstvar($package, "misc:Depends", "gconf2 (>= 2.24.0-5)"); + $gconf_dep = 1; + } my $defaults = pkgfile($package,"gconf-defaults"); if ($defaults ne '') { doit("mkdir","-p","$tmp/usr/share/gconf/defaults"); doit("install","-p","-m644",$defaults,"$tmp/usr/share/gconf/defaults/${priority}_$package"); - autoscript($package,"postinst","postinst-gconf-defaults"); - autoscript($package,"postrm","postrm-gconf-defaults"); - addsubstvar($package, "misc:Depends", "gconf2 (>= 2.12.1-1)"); + autoscript($package,"postinst","postinst-gconf-defaults","s%#OPT#%%"); + autoscript($package,"postrm","postrm-gconf-defaults","s%#OPT#%%"); + addsubstvar($package, "misc:Depends", "gconf2 (>= 2.12.1-1)") unless $gconf_dep; $gconf_dep = 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_gencontrol new/debhelper/dh_gencontrol --- old/debhelper/dh_gencontrol 2008-10-21 20:23:06.000000000 +0200 +++ new/debhelper/dh_gencontrol 2009-03-01 02:01:02.000000000 +0100 @@ -66,10 +66,6 @@ if (getpackages() > 1) { push @command, "-p$package"; } - if (is_udeb($package)) { - push @command, "-UHomepage"; - push @command, "-n".udeb_filename($package); - } doit(@command, "-l$changelog", "-T$substvars", "-P$tmp",@{$dh{U_PARAMS}}); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_prep new/debhelper/dh_prep --- old/debhelper/dh_prep 2008-07-31 18:27:07.000000000 +0200 +++ new/debhelper/dh_prep 2009-03-01 02:01:02.000000000 +0100 @@ -2,7 +2,7 @@ =head1 NAME -dh_prep - preform cleanups in preparation for building a binary package +dh_prep - perform cleanups in preparation for building a binary package =cut diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/doc/TODO new/debhelper/doc/TODO --- old/debhelper/doc/TODO 2008-10-21 20:46:18.000000000 +0200 +++ new/debhelper/doc/TODO 2009-03-01 02:01:02.000000000 +0100 @@ -30,5 +30,5 @@ * dh_python * dh_clean -k (make it warn) * Convert warning about unknown command-line options back to an error. - Need to wait a file (from Oct 2008) to ensure that most rules files + Need to wait a while (from Oct 2008) to ensure that most rules files that pass unknown options to commands are fixed. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/examples/rules.simple new/debhelper/examples/rules.simple --- old/debhelper/examples/rules.simple 2008-06-15 19:29:09.000000000 +0200 +++ new/debhelper/examples/rules.simple 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/usr/bin/make -f - -build: build-stamp -build-stamp: - dh build - touch build-stamp - -clean: - dh clean - -install: build install-stamp -install-stamp: - dh install - touch install-stamp - -binary-arch: install - dh binary-arch - -binary-indep: install - dh binary-indep - -binary: binary-arch binary-indep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/man/po4a/po/debhelper.pot new/debhelper/man/po4a/po/debhelper.pot --- old/debhelper/man/po4a/po/debhelper.pot 2008-12-15 05:19:41.000000000 +0100 +++ new/debhelper/man/po4a/po/debhelper.pot 2009-03-01 02:02:38.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2008-12-14 23:19-0500\n" +"POT-Creation-Date: 2009-02-27 15:37-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -676,8 +676,8 @@ # type: textblock #: debhelper.pod:369 msgid "" -"Commands that generate maintainer script fragements will order the " -"fragements in reverse order for the prerm and postrm scripts." +"Commands that generate maintainer script fragments will order the fragments " +"in reverse order for the prerm and postrm scripts." msgstr "" # type: textblock @@ -904,7 +904,7 @@ msgstr "" # type: =head1 -#: debhelper.pod:506 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 dh_fixperms:110 dh_gconf:92 dh_gencontrol:83 dh_installcatalogs:109 dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:111 dh_installexamples:103 dh_installinfo:103 dh_installinit:224 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226 dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114 +#: debhelper.pod:506 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 dh_installcatalogs:109 dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:111 dh_installexamples:103 dh_installinfo:103 dh_installinit:224 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226 dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114 msgid "SEE ALSO" msgstr "" @@ -929,12 +929,12 @@ msgstr "" # type: =head1 -#: debhelper.pod:520 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 dh_fixperms:116 dh_gconf:98 dh_gencontrol:89 dh_installcatalogs:115 dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109 dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:257 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:278 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120 +#: debhelper.pod:520 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 dh_installcatalogs:115 dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109 dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:257 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:278 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120 msgid "AUTHOR" msgstr "" # type: textblock -#: debhelper.pod:522 dh_builddeb:95 dh_clean:138 dh_compress:198 dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:119 dh_installexamples:111 dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:259 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:280 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170 dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36 +#: debhelper.pod:522 dh_builddeb:95 dh_clean:138 dh_compress:198 dh_fixperms:118 dh_gencontrol:87 dh_installchangelogs:148 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:119 dh_installexamples:111 dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:259 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:280 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170 dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36 msgid "Joey Hess <joeyh(a)debian.org>" msgstr "" @@ -958,7 +958,7 @@ msgstr "" # type: =head1 -#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34 dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44 dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:39 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39 +#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44 dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:39 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39 msgid "OPTIONS" msgstr "" @@ -1002,12 +1002,12 @@ msgstr "" # type: textblock -#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:94 dh_gencontrol:85 dh_installcatalogs:111 dh_installchangelogs:142 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:113 dh_installexamples:105 dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:274 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116 +#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:108 dh_gencontrol:81 dh_installcatalogs:111 dh_installchangelogs:142 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:113 dh_installexamples:105 dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:274 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116 msgid "L<debhelper(7)>" msgstr "" # type: textblock -#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114 dh_gconf:96 dh_gencontrol:87 dh_installchangelogs:144 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107 dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230 dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118 +#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114 dh_gconf:110 dh_gencontrol:83 dh_installchangelogs:144 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107 dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230 dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118 msgid "This program is a part of debhelper." msgstr "" @@ -1297,18 +1297,27 @@ # type: textblock #: dh_gconf:30 msgid "" +"If a file named debian/package.gconf-mandatory exists, then it is installed " +"into usr/share/gconf/mandatory/10_package in the package build directory, " +"with \"package\" replaced by the package name, and similar postinst and " +"postrm fragments will be generated." +msgstr "" + +# type: textblock +#: dh_gconf:35 +msgid "" "The gconf-schemas and update-gconf-defaults scripts are provided by the " "gconf2 package. An appropriate dependency will be generated in " "${misc:Depends}." msgstr "" # type: =item -#: dh_gconf:38 +#: dh_gconf:43 msgid "B<--priority> I<priority>" msgstr "" # type: textblock -#: dh_gconf:40 +#: dh_gconf:45 msgid "" "Use I<priority> (which should be a 2-digit number) as the defaults priority " "instead of 10. Higher values than ten can be used by derived distributions " @@ -1316,7 +1325,7 @@ msgstr "" # type: textblock -#: dh_gconf:100 +#: dh_gconf:114 msgid "Ross Burton <ross(a)burtonini.com> Josselin Mouette <joss(a)debian.org>" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/man/po4a/po/es.po new/debhelper/man/po4a/po/es.po --- old/debhelper/man/po4a/po/es.po 2008-12-15 05:19:44.000000000 +0100 +++ new/debhelper/man/po4a/po/es.po 2009-03-01 02:01:02.000000000 +0100 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2008-12-14 23:19-0500\n" +"POT-Creation-Date: 2009-02-27 15:37-0500\n" "PO-Revision-Date: 2005-09-18 00:11+0200\n" "Last-Translator: Rub�n Porras Campo <debian-l10n-spanish(a)lists.debian.org>\n" "Language-Team: SPANISH <debian-l10n-spanish(a)lists.debian.org>\n" @@ -901,8 +901,8 @@ # type: textblock #: debhelper.pod:369 msgid "" -"Commands that generate maintainer script fragements will order the " -"fragements in reverse order for the prerm and postrm scripts." +"Commands that generate maintainer script fragments will order the fragments " +"in reverse order for the prerm and postrm scripts." msgstr "" # type: textblock @@ -1184,7 +1184,7 @@ # type: =head1 #: debhelper.pod:506 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 -#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:83 dh_installcatalogs:109 +#: dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 dh_installcatalogs:109 #: dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118 #: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:111 #: dh_installexamples:103 dh_installinfo:103 dh_installinit:224 @@ -1220,7 +1220,7 @@ # type: =head1 #: debhelper.pod:520 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 -#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:89 dh_installcatalogs:115 +#: dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 dh_installcatalogs:115 #: dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124 #: dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 #: dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109 @@ -1237,7 +1237,7 @@ # type: textblock #: debhelper.pod:522 dh_builddeb:95 dh_clean:138 dh_compress:198 -#: dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 dh_installcron:69 +#: dh_fixperms:118 dh_gencontrol:87 dh_installchangelogs:148 dh_installcron:69 #: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 #: dh_installdocs:245 dh_installemacsen:119 dh_installexamples:111 #: dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58 @@ -1275,7 +1275,7 @@ "paquetes Debian." # type: =head1 -#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34 +#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39 #: dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44 #: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51 #: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 @@ -1333,8 +1333,8 @@ msgstr "Pasa I<par�metros> a L<dpkg-deb(1)> cuando se construye el paquete." # type: textblock -#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:94 -#: dh_gencontrol:85 dh_installcatalogs:111 dh_installchangelogs:142 +#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:108 +#: dh_gencontrol:81 dh_installcatalogs:111 dh_installchangelogs:142 #: dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 #: dh_installdocs:239 dh_installemacsen:113 dh_installexamples:105 #: dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53 @@ -1349,7 +1349,7 @@ # type: textblock #: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114 -#: dh_gconf:96 dh_gencontrol:87 dh_installchangelogs:144 dh_installcron:65 +#: dh_gconf:110 dh_gencontrol:83 dh_installchangelogs:144 dh_installcron:65 #: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 #: dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107 #: dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201 @@ -1724,6 +1724,19 @@ # type: textblock #: dh_gconf:30 +#, fuzzy +msgid "" +"If a file named debian/package.gconf-mandatory exists, then it is installed " +"into usr/share/gconf/mandatory/10_package in the package build directory, " +"with \"package\" replaced by the package name, and similar postinst and " +"postrm fragments will be generated." +msgstr "" +"Si existe un fichero llamado debian/paquete.default, se instala en etc/" +"default/paquete en el directorio de construcci�n del paquete, con \"paquete" +"\" reemplazado por el nombre del paquete." + +# type: textblock +#: dh_gconf:35 msgid "" "The gconf-schemas and update-gconf-defaults scripts are provided by the " "gconf2 package. An appropriate dependency will be generated in ${misc:" @@ -1731,13 +1744,13 @@ msgstr "" # type: =item -#: dh_gconf:38 +#: dh_gconf:43 #, fuzzy msgid "B<--priority> I<priority>" msgstr "B<--priority=>I<n>" # type: textblock -#: dh_gconf:40 +#: dh_gconf:45 msgid "" "Use I<priority> (which should be a 2-digit number) as the defaults priority " "instead of 10. Higher values than ten can be used by derived distributions " @@ -1745,7 +1758,7 @@ msgstr "" # type: textblock -#: dh_gconf:100 +#: dh_gconf:114 #, fuzzy msgid "Ross Burton <ross(a)burtonini.com> Josselin Mouette <joss(a)debian.org>" msgstr "Josselin Mouette <joss(a)debian.org>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/man/po4a/po/fr.po new/debhelper/man/po4a/po/fr.po --- old/debhelper/man/po4a/po/fr.po 2008-12-15 05:19:47.000000000 +0100 +++ new/debhelper/man/po4a/po/fr.po 2009-03-01 02:01:02.000000000 +0100 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: debhelper manpages\n" -"POT-Creation-Date: 2008-12-14 23:19-0500\n" +"POT-Creation-Date: 2009-02-27 15:37-0500\n" "PO-Revision-Date: 2006-11-19 20:50+0100\n" "Last-Translator: Valery Perrin <valery.perrin.debian(a)free.fr>\n" "Language-Team: French <debian-l10n-french(a)lists.debian.org>\n" @@ -923,8 +923,8 @@ # type: textblock #: debhelper.pod:369 msgid "" -"Commands that generate maintainer script fragements will order the " -"fragements in reverse order for the prerm and postrm scripts." +"Commands that generate maintainer script fragments will order the fragments " +"in reverse order for the prerm and postrm scripts." msgstr "" # type: textblock @@ -1214,7 +1214,7 @@ # type: =head1 #: debhelper.pod:506 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 -#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:83 dh_installcatalogs:109 +#: dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 dh_installcatalogs:109 #: dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118 #: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:111 #: dh_installexamples:103 dh_installinfo:103 dh_installinit:224 @@ -1251,7 +1251,7 @@ # type: =head1 #: debhelper.pod:520 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 -#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:89 dh_installcatalogs:115 +#: dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 dh_installcatalogs:115 #: dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124 #: dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 #: dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109 @@ -1268,7 +1268,7 @@ # type: textblock #: debhelper.pod:522 dh_builddeb:95 dh_clean:138 dh_compress:198 -#: dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 dh_installcron:69 +#: dh_fixperms:118 dh_gencontrol:87 dh_installchangelogs:148 dh_installcron:69 #: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 #: dh_installdocs:245 dh_installemacsen:119 dh_installexamples:111 #: dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58 @@ -1306,7 +1306,7 @@ "plusieurs paquet(s) Debian." # type: =head1 -#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34 +#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39 #: dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44 #: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51 #: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 @@ -1365,8 +1365,8 @@ "Fournit les I<paramètres> à L<dpkg-deb(1)> lors de la construction du paquet." # type: textblock -#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:94 -#: dh_gencontrol:85 dh_installcatalogs:111 dh_installchangelogs:142 +#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:108 +#: dh_gencontrol:81 dh_installcatalogs:111 dh_installchangelogs:142 #: dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 #: dh_installdocs:239 dh_installemacsen:113 dh_installexamples:105 #: dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53 @@ -1381,7 +1381,7 @@ # type: textblock #: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114 -#: dh_gconf:96 dh_gencontrol:87 dh_installchangelogs:144 dh_installcron:65 +#: dh_gconf:110 dh_gencontrol:83 dh_installchangelogs:144 dh_installcron:65 #: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 #: dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107 #: dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201 @@ -1760,6 +1760,21 @@ # type: textblock #: dh_gconf:30 +#, fuzzy +msgid "" +"If a file named debian/package.gconf-mandatory exists, then it is installed " +"into usr/share/gconf/mandatory/10_package in the package build directory, " +"with \"package\" replaced by the package name, and similar postinst and " +"postrm fragments will be generated." +msgstr "" +"S'il existe un fichier nommé debian/paquet.gconf-defaults, il sera installé " +"dans le répertoire de construction du paquet sous usr/share/gconf/" +"defaults/10_paquet où le mot S<« paquet »> sera remplacé par le nom du " +"paquet. Certaines parties des scripts de maintenance postinst et postrm " +"seront produites pour exécuter update-gconf-defaults." + +# type: textblock +#: dh_gconf:35 msgid "" "The gconf-schemas and update-gconf-defaults scripts are provided by the " "gconf2 package. An appropriate dependency will be generated in ${misc:" @@ -1770,12 +1785,12 @@ "Depends}." # type: =item -#: dh_gconf:38 +#: dh_gconf:43 msgid "B<--priority> I<priority>" msgstr "B<--priority> I<priorité>" # type: textblock -#: dh_gconf:40 +#: dh_gconf:45 msgid "" "Use I<priority> (which should be a 2-digit number) as the defaults priority " "instead of 10. Higher values than ten can be used by derived distributions " @@ -1787,7 +1802,7 @@ "(50), ou les paquets spécifiques à un site (90)." # type: textblock -#: dh_gconf:100 +#: dh_gconf:114 msgid "Ross Burton <ross(a)burtonini.com> Josselin Mouette <joss(a)debian.org>" msgstr "Ross Burton <ross(a)burtonini.com> Josselin Mouette <joss(a)debian.org>" ++++++ dpkg_1.14.21.tar.bz2 -> dpkg_1.15.0.tar.bz2 ++++++ ++++ 451219 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cyrus-sasl for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package cyrus-sasl for openSUSE:Factory checked in at Tue Mar 3 22:18:26 CET 2009. -------- --- cyrus-sasl/cyrus-sasl.changes 2008-12-10 13:52:30.000000000 +0100 +++ cyrus-sasl/cyrus-sasl.changes 2009-03-02 21:28:26.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 2 21:28:09 CET 2009 - crrodriguez(a)suse.de + +- fix build with GCC 4.4 +- remove all "la" files + +------------------------------------------------------------------- cyrus-sasl-saslauthd.changes: same change calling whatdependson for head-i586 New: ---- cyrus-sasl-2.1.22-gcc44.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-sasl-saslauthd.spec ++++++ --- /var/tmp/diff_new_pack.l27832/_old 2009-03-03 22:16:11.000000000 +0100 +++ /var/tmp/diff_new_pack.l27832/_new 2009-03-03 22:16:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl-saslauthd (Version 2.1.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 @@ -28,7 +28,7 @@ Provides: cyrus-sasl2:/usr/sbin/saslauthd Summary: The SASL Authentication Server Version: 2.1.22 -Release: 182 +Release: 183 Source: cyrus-sasl-%{version}.tar.bz2 Source1: cyrus-sasl-rc.tar.bz2 Patch: cyrus-sasl-%{version}.dif @@ -188,6 +188,9 @@ %{_libdir}/sasl2/libldapdb.so* %changelog +* Mon Mar 02 2009 crrodriguez(a)suse.de +- fix build with GCC 4.4 +- remove all "la" files * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) ++++++ cyrus-sasl.spec ++++++ --- /var/tmp/diff_new_pack.l27832/_old 2009-03-03 22:16:11.000000000 +0100 +++ /var/tmp/diff_new_pack.l27832/_new 2009-03-03 22:16:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl (Version 2.1.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 @@ -20,7 +20,7 @@ Name: cyrus-sasl Version: 2.1.22 -Release: 173 +Release: 174 BuildRequires: db-devel krb5-devel openssl-devel opie pam-devel Obsoletes: cyrus-sasl2 <= %{version} Provides: cyrus-sasl2 = %{version} @@ -41,6 +41,7 @@ Patch1: shared_link_on_ppc.patch Patch2: cyrus-sasl-gcc4.patch Patch3: cyrus-sasl-implicitfunc.dif +Patch4: cyrus-sasl-2.1.22-gcc44.patch PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -211,7 +212,7 @@ <tech-transfer> tech-transfer(a)andrew.cmu.edu %prep -%setup -n cyrus-sasl-%{version} -a 1 +%setup -q -n cyrus-sasl-%{version} -a 1 if [ -e %{_builddir}/%{name}-%{version}/dlcompat-*/ ] then echo "dlcompat contains potential legal risks." @@ -221,6 +222,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 %build find . -name \*.cvsignore -print0 | xargs -0 rm -fv @@ -240,12 +242,9 @@ cd - export CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" export CPPFLAGS=-I/usr/include/heimdal -./configure --libdir=%{_libdir} \ +%configure --with-pic \ --with-plugindir=%{_libdir}/sasl2 \ --with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=%{_mandir} \ --with-saslauthd=/var/run/sasl2/ \ --enable-pam \ --enable-sample \ @@ -255,7 +254,7 @@ --enable-krb4=no \ --enable-sql=no \ --with-devrandom=/dev/urandom -make sasldir=%{_libdir}/sasl2 +%{__make} %{?jobs:-j%jobs} sasldir=%{_libdir}/sasl2 %install make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install @@ -274,7 +273,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd* rm -f $RPM_BUILD_ROOT/usr/sbin/saslauthd rm -f $RPM_BUILD_ROOT/usr/sbin/testsaslauthd -find $RPM_BUILD_ROOT/%{_libdir}/sasl2 -name "*.la" | xargs rm -f +find $RPM_BUILD_ROOT -type f -name "*.la" -exec %{__rm} -fv {} + %post -p /sbin/ldconfig @@ -329,9 +328,11 @@ /usr/include/sasl %doc %{_mandir}/man3/sasl_*.gz %{_libdir}/libsasl2.so -%{_libdir}/libsasl2.la %changelog +* Mon Mar 02 2009 crrodriguez(a)suse.de +- fix build with GCC 4.4 +- remove all "la" files * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) ++++++ cyrus-sasl-2.1.22-gcc44.patch ++++++ Index: plugins/digestmd5.c =================================================================== --- plugins/digestmd5.c.orig 2006-05-17 18:46:17.000000000 +0200 +++ plugins/digestmd5.c 2009-03-02 21:00:49.000000000 +0100 @@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv "DIGEST-MD5", /* mech_name */ #ifdef WITH_RC4 128, /* max_ssf */ -#elif WITH_DES +#elif defined(WITH_DES) 112, #else 1, @@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie "DIGEST-MD5", #ifdef WITH_RC4 /* mech_name */ 128, /* max ssf */ -#elif WITH_DES +#elif defined(WITH_DES) 112, #else 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 curl for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package curl for openSUSE:Factory checked in at Tue Mar 3 22:12:48 CET 2009. -------- --- curl/curl.changes 2008-12-10 13:52:19.000000000 +0100 +++ curl/curl.changes 2009-03-03 11:04:57.000000000 +0100 @@ -1,0 +2,39 @@ +Mon Mar 2 15:44:14 CET 2009 - mmarek(a)suse.cz + +- updated to 7.19.4 + * don't follow redirects to file:// and scp:// by default; add + new curl_easy_setopt options CURLOPT_PROTOCOLS and + CURLOPT_REDIR_PROTOCOLS to specify which protocols are allowed + and which protocols are allowed to redirect to (bnc#475103, + CVE-2009-0037) + * Added CURLOPT_NOPROXY and the corresponding --noproxy + * the OpenSSL-specific code disables TICKET (rfc5077) which is + enabled by default in openssl 0.9.8j + * Added CURLOPT_TFTP_BLKSIZE + * Added CURLOPT_SOCKS5_GSSAPI_SERVICE and + CURLOPT_SOCKS5_GSSAPI_NEC - with the corresponding curl options + --socks5-gssapi-service and --socks5-gssapi-nec + * Improved IPv6 support when built with with c-ares >= 1.6.1 + * Added CURLPROXY_HTTP_1_0 and --proxy1.0 + * Added docs/libcurl/symbols-in-versions + * Added CURLINFO_CONDITION_UNMET + * Added support for Digest and NTLM authentication using GnuTLS + * CURLOPT_FTP_CREATE_MISSING_DIRS can now be set to 2 to retry + the CWD even when MKD fails + * GnuTLS initing moved to curl_global_init() + * CURLAUTH_DIGEST_IE bit added for CURLOPT_HTTPAUTH and + CURLOPT_PROXYAUTH + * pkg-config can now show supported_protocols and + supported_features + * Added CURLOPT_CERTINFO and CURLINFO_CERTINFO + * Added CURLOPT_POSTREDIR + * Better detect HTTP 1.0 servers and don't do HTTP 1.1 requests + on them + * configure --disable-proxy disables proxy support + * Added CURLOPT_USERNAME and CURLOPT_PASSWORD + * --interface now works with IPv6 connections on glibc systems + * Added CURLOPT_PROXYUSERNAME and CURLOPT_PROXYPASSWORD + + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- curl-7.19.0.tar.bz2 New: ---- curl-7.19.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.Dx7023/_old 2009-03-03 21:59:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Dx7023/_new 2009-03-03 21:59:02.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package curl (Version 7.19.0) +# spec file for package curl (Version 7.19.4) # -# 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 @@ -32,8 +32,9 @@ # used by the testsuite BuildRequires: stunnel %endif -Version: 7.19.0 -Release: 11 +#define cvs_suffix -20090302 +Version: 7.19.4 +Release: 1 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -44,7 +45,7 @@ Group: Productivity/Networking/Web/Utilities Summary: A Tool for Transferring Data from URLs Url: http://curl.haxx.se/ -Source: curl-%{version}.tar.bz2 +Source: curl-%version%{?cvs_suffix}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -99,7 +100,7 @@ Daniel Stenberg <Daniel.Stenberg(a)haxx.se> %prep -%setup -q +%setup -q -n curl-%version%{?cvs_suffix} %build autoreconf -fi @@ -178,8 +179,43 @@ %{_libdir}/pkgconfig/libcurl.pc %doc %{_mandir}/man1/curl-config.1.gz %doc %{_mandir}/man3/* +%doc docs/libcurl/symbols-in-versions %changelog +* Mon Mar 02 2009 mmarek(a)suse.cz +- updated to 7.19.4 + * don't follow redirects to file:// and scp:// by default; add + new curl_easy_setopt options CURLOPT_PROTOCOLS and + CURLOPT_REDIR_PROTOCOLS to specify which protocols are allowed + and which protocols are allowed to redirect to (bnc#475103, + CVE-2009-0037) + * Added CURLOPT_NOPROXY and the corresponding --noproxy + * the OpenSSL-specific code disables TICKET (rfc5077) which is + enabled by default in openssl 0.9.8j + * Added CURLOPT_TFTP_BLKSIZE + * Added CURLOPT_SOCKS5_GSSAPI_SERVICE and + CURLOPT_SOCKS5_GSSAPI_NEC - with the corresponding curl options + --socks5-gssapi-service and --socks5-gssapi-nec + * Improved IPv6 support when built with with c-ares >= 1.6.1 + * Added CURLPROXY_HTTP_1_0 and --proxy1.0 + * Added docs/libcurl/symbols-in-versions + * Added CURLINFO_CONDITION_UNMET + * Added support for Digest and NTLM authentication using GnuTLS + * CURLOPT_FTP_CREATE_MISSING_DIRS can now be set to 2 to retry + the CWD even when MKD fails + * GnuTLS initing moved to curl_global_init() + * CURLAUTH_DIGEST_IE bit added for CURLOPT_HTTPAUTH and + CURLOPT_PROXYAUTH + * pkg-config can now show supported_protocols and + supported_features + * Added CURLOPT_CERTINFO and CURLINFO_CERTINFO + * Added CURLOPT_POSTREDIR + * Better detect HTTP 1.0 servers and don't do HTTP 1.1 requests + on them + * configure --disable-proxy disables proxy support + * Added CURLOPT_USERNAME and CURLOPT_PASSWORD + * --interface now works with IPv6 connections on glibc systems + * Added CURLOPT_PROXYUSERNAME and CURLOPT_PROXYPASSWORD * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) ++++++ curl-7.19.0.tar.bz2 -> curl-7.19.4.tar.bz2 ++++++ ++++ 147272 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmake for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at Tue Mar 3 21:55:33 CET 2009. -------- --- cmake/cmake.changes 2008-12-22 13:58:23.000000000 +0100 +++ cmake/cmake.changes 2009-03-03 08:23:53.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 3 08:07:25 CET 2009 - puzel(a)suse.cz + +- update to 2.6.3 + - add parenthetical expressions to if + - improve scoping of policies (see cmake_policy and CMP0011) + - teach find_package more config file locations + - many improved Find scripts in Modules + - added an unset command + - better reporting when nmake compiler environment is not correct + - lots of bug fixes +- use fdupes to remove duplicate files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cmake-2.6.2.tar.bz2 New: ---- cmake-2.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.kg1905/_old 2009-03-03 21:54:48.000000000 +0100 +++ /var/tmp/diff_new_pack.kg1905/_new 2009-03-03 21:54:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cmake (Version 2.6.2) +# spec file for package cmake (Version 2.6.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cmake -Version: 2.6.2 -Release: 3 +Version: 2.6.3 +Release: 1 License: BSD 3-Clause Group: Development/Tools/Building %define tar_version %version @@ -36,6 +36,7 @@ BuildRequires: libexpat-devel libqt4-devel update-desktop-files %endif BuildRequires: curl-devel expat gcc-c++ ncurses-devel openssl-devel zlib-devel +BuildRequires: fdupes Requires: make %description @@ -97,6 +98,7 @@ %if 0%{?suse_version} > 1020 %suse_update_desktop_file CMake Development IDE Tools Qt %endif +%fdupes %buildroot %clean rm -rf %{buildroot} @@ -119,6 +121,7 @@ %doc %_mandir/man1/cmakeprops.1.* %doc %_mandir/man1/cmakevars.1.* %doc %_mandir/man1/cpack.1.* +%doc %_mandir/man1/cmake-gui.1.* %if 0%{?suse_version} > 1020 %files gui @@ -130,6 +133,16 @@ %endif %changelog +* Tue Mar 03 2009 puzel(a)suse.cz +- update to 2.6.3 + - add parenthetical expressions to if + - improve scoping of policies (see cmake_policy and CMP0011) + - teach find_package more config file locations + - many improved Find scripts in Modules + - added an unset command + - better reporting when nmake compiler environment is not correct + - lots of bug fixes +- use fdupes to remove duplicate files * Mon Dec 22 2008 ro(a)suse.de - Fix java detection also for ia64 s390 s390x * Mon Oct 13 2008 dmueller(a)suse.de ++++++ cmake-2.6.2.tar.bz2 -> cmake-2.6.3.tar.bz2 ++++++ ++++ 24148 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit boost for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package boost for openSUSE:Factory checked in at Tue Mar 3 21:54:33 CET 2009. -------- --- boost/boost.changes 2009-02-22 04:11:50.000000000 +0100 +++ boost/boost.changes 2009-03-03 11:30:25.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 3 11:30:07 CET 2009 - pth(a)suse.de + +- Fix misplaced ifdef in template_function.hpp:move_assign. Fixes + building software that defines BOOST_NO_EXCEPTION (bnc#479659). + +------------------------------------------------------------------- +Wed Feb 25 18:06:32 CET 2009 - pth(a)suse.de + +- Fix packaging of the documentation. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- boost-function_without_exception.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ boost.spec ++++++ --- /var/tmp/diff_new_pack.A30485/_old 2009-03-03 21:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.A30485/_new 2009-03-03 21:51:59.000000000 +0100 @@ -45,7 +45,7 @@ Summary: Boost C++ Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 1.38.0 -Release: 3 +Release: 4 Source0: %{name}_1_38_0.tar.bz2 Source1: boost-rpmlintrc Source2: boost_1_33_1_man.tar.bz2 @@ -64,6 +64,8 @@ Patch19: boost-sane_versioning.patch Patch20: boost-strict_aliasing.patch Patch21: boost-lib64.patch +#Added 2009-03-03 +Patch22: boost-function_without_exception.patch Recommends: %{all_libs} %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -321,6 +323,7 @@ %patch19 %patch20 %patch21 +%patch22 chmod +x configure #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} + @@ -448,13 +451,12 @@ libs/test/test/test_files/errors_handling_test.pattern \ libs/test/test/test_files/result_report_test.pattern find . -name \*.htm\* -o -name \*.gif -o -name \*.css -o -name \*.jpg -o -name \*.png -o -name \*.ico | \ - tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir}/boost-%{version} -xf - + tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir} -xf - rm -rf %{buildroot}%{_docdir}/boost ln -s /usr/include/boost %{buildroot}%{_docdir} ln -s ../LICENSE_1_0.txt %{buildroot}%{_docdir}/libs -#only for documentation, don't need to be executable +#only for documentation, doesn't need to be executable find %{buildroot}%{_docdir} -name \*.py -exec chmod -x {} + -mkdir #symlink dupes %if 0%suse_version > 1020 %fdupes %buildroot @@ -526,6 +528,7 @@ %files -n boost-license1_38_0 %defattr(-, root, root, -) +%dir %{_docdir} %doc %{_docdir}/LICENSE_1_0.txt %files -n libboost_date_time1_38_0 @@ -610,6 +613,11 @@ %doc %{_mandir}/man7/*.7.gz %changelog +* Tue Mar 03 2009 pth(a)suse.de +- Fix misplaced ifdef in template_function.hpp:move_assign. Fixes + building software that defines BOOST_NO_EXCEPTION (bnc#479659). +* Wed Feb 25 2009 pth(a)suse.de +- Fix packaging of the documentation. * Sun Feb 22 2009 pth(a)suse.de - Fix the line in the spec that copies the documentation. * Fri Feb 20 2009 pth(a)suse.de ++++++ boost-function_without_exception.patch ++++++ The ifdef is misplaced and leads to compilation errors when when BOOST_NO_EXCEPTIONS is defined (bnc#479659). --- boost/function/function_template.hpp +++ boost/function/function_template.hpp @@ -950,10 +950,10 @@ f.vtable->manager(f.functor, this->functor, boost::detail::function::move_functor_tag); f.vtable = 0; -#if !defined(BOOST_NO_EXCEPTIONS) } else { clear(); } +#if !defined(BOOST_NO_EXCEPTIONS) } catch (...) { vtable = 0; throw; ++++++ boost.spec.in ++++++ --- /var/tmp/diff_new_pack.A30485/_old 2009-03-03 21:52:01.000000000 +0100 +++ /var/tmp/diff_new_pack.A30485/_new 2009-03-03 21:52:01.000000000 +0100 @@ -74,6 +74,8 @@ Patch19: boost-sane_versioning.patch Patch20: boost-strict_aliasing.patch Patch21: boost-lib64.patch +#Added 2009-03-03 +Patch22: boost-function_without_exception.patch Recommends: %{all_libs} %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -328,6 +330,7 @@ %patch19 %patch20 %patch21 +%patch22 chmod +x configure #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} + @@ -480,16 +483,13 @@ libs/test/test/test_files/errors_handling_test.pattern \ libs/test/test/test_files/result_report_test.pattern find . -name \*.htm\* -o -name \*.gif -o -name \*.css -o -name \*.jpg -o -name \*.png -o -name \*.ico | \ - tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir}/boost-%{version} -xf - + tar --files-from=%{S:3} -cf - --files-from=- | tar -C %{buildroot}%{_docdir} -xf - rm -rf %{buildroot}%{_docdir}/boost ln -s /usr/include/boost %{buildroot}%{_docdir} ln -s ../LICENSE_1_0.txt %{buildroot}%{_docdir}/libs -#only for documentation, don't need to be executable +#only for documentation, doesn't need to be executable find %{buildroot}%{_docdir} -name \*.py -exec chmod -x {} + -mkdir - - #symlink dupes %if 0%suse_version > 1020 %fdupes %buildroot @@ -533,6 +533,7 @@ %files -n boost-license@lib_appendix@ %defattr(-, root, root, -) +%dir %{_docdir} %doc %{_docdir}/LICENSE_1_0.txt %files -n libboost_date_time@lib_appendix@ ++++++ existing_extra_docs ++++++ --- /var/tmp/diff_new_pack.A30485/_old 2009-03-03 21:52:01.000000000 +0100 +++ /var/tmp/diff_new_pack.A30485/_new 2009-03-03 21:52:01.000000000 +0100 @@ -26,7 +26,6 @@ libs/conversion/cast_test.cpp libs/conversion/lexical_cast_test.cpp libs/crc/crc_example.cpp -libs/crc/crc_test.cpp libs/filesystem/build/Jamfile.v2 libs/filesystem/example/simple_ls.cpp libs/filesystem/test/fstream_test.cpp @@ -37,7 +36,6 @@ libs/format/example/sample_formats.cpp libs/format/example/sample_new_features.cpp libs/format/example/sample_userType.cpp -libs/functional/function_test.cpp libs/functional/hash/examples/books.cpp libs/functional/hash/examples/point.cpp libs/functional/hash/examples/portable.cpp @@ -74,7 +72,6 @@ libs/graph/example/dfs-example.cpp libs/graph/example/dfs_parenthesis.cpp libs/graph/example/dijkstra-example.cpp -libs/graph/example/edmunds-karp-eg.cpp libs/graph/example/family-tree-eg.cpp libs/graph/example/file_dependencies.cpp libs/graph/example/fr_layout.cpp @@ -102,9 +99,6 @@ libs/graph/example/undirected_dfs.cpp libs/graph/test/dominator_tree_test.cpp libs/graph/test/graph.cpp -libs/integer/cstdint_test.cpp -libs/integer/integer_test.cpp -libs/integer/integer_traits_test.cpp libs/integer/test/integer_mask_test.cpp libs/integer/test/static_log2_test.cpp libs/integer/test/static_min_max_test.cpp @@ -324,8 +318,6 @@ libs/range/test/std_container.cpp libs/range/test/string.cpp libs/range/test/sub_range.cpp -libs/rational/rational_example.cpp -libs/rational/rational_test.cpp libs/regex/build/generic.mak libs/regex/example/grep/grep.cpp libs/regex/example/snippets/captures_example.cpp @@ -454,7 +446,6 @@ libs/test/test/test_files/result_report_test.pattern libs/test/test/test_fp_comparisons.cpp libs/test/test/test_tools_test.cpp -libs/timer/timer_test.cpp libs/type_traits/examples/copy_example.cpp libs/type_traits/examples/fill_example.cpp libs/type_traits/examples/iter_swap_example.cpp @@ -471,7 +462,6 @@ libs/wave/ChangeLog LICENSE_1_0.txt more/blanket-permission.txt -tools/build/v2/doc/userman.pdf tools/build/v2/hacking.txt tools/inspect/build/Jamfile.v2 tools/inspect/inspect.cpp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 at for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package at for openSUSE:Factory checked in at Tue Mar 3 21:45:35 CET 2009. -------- --- at/at.changes 2009-02-12 15:04:20.000000000 +0100 +++ at/at.changes 2009-03-02 17:12:16.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 2 16:52:17 CET 2009 - sebo(a)suse.de + +- added cleanup_perm.patch to fix permissions for unlink (bnc#478733) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- at-3.1.8-cleanup_perm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.K17800/_old 2009-03-03 21:42:18.000000000 +0100 +++ /var/tmp/diff_new_pack.K17800/_new 2009-03-03 21:42:18.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Daemons AutoReqProv: on Version: 3.1.8 -Release: 1071 +Release: 1072 Summary: A Job Manager Source: at_3.1.8-11.tar.gz Source1: atd.init @@ -45,6 +45,8 @@ Patch10: %{name}-%{version}-massive_batch.patch Patch11: %{name}-%{version}-documentation-dir.patch Patch12: %{name}-%{version}-queue-nice-level.patch +# PATCH-FIX-UPSTREAM cleanup_perm fix permissions for unlink (bnc#478733) +Patch13: %{name}-%{version}-cleanup_perm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/sbin/useradd /usr/sbin/groupadd %fillup_prereq %insserv_prereq @@ -75,6 +77,7 @@ %patch10 %patch11 %patch12 +%patch13 %build %{?suse_update_config:%{suse_update_config -f}} @@ -151,6 +154,8 @@ /var/adm/fillup-templates/sysconfig.atd %changelog +* Mon Mar 02 2009 sebo(a)suse.de +- added cleanup_perm.patch to fix permissions for unlink (bnc#478733) * Thu Feb 12 2009 mseben(a)suse.cz - fixed nice level of queues : queue-nice-level.patch [bnc#225463] * Thu Jan 08 2009 prusnak(a)suse.cz ++++++ at-3.1.8-cleanup_perm.patch ++++++ --- panic.c +++ panic.c @@ -58,8 +58,11 @@ /* Something fatal has happened, print error message and exit. */ fprintf(stderr, "%s: %s\n", namep, a); - if (fcreated) + if (fcreated){ + PRIV_START unlink(atfile); + PRIV_END + } exit(EXIT_FAILURE); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mpfr for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package mpfr for openSUSE:Factory checked in at Tue Mar 3 18:34:42 CET 2009. -------- --- mpfr/mpfr.changes 2009-01-27 10:46:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/mpfr/mpfr.changes 2009-02-25 15:58:47.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 25 15:57:54 CET 2009 - rguenther(a)suse.de + +- Apply current cummulative bugfixing patch. + * Fixes mpfr_snprintf and mpfr_vsnprintf buffer overflows. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mpfr-2.4.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpfr.spec ++++++ --- /var/tmp/diff_new_pack.b14911/_old 2009-03-03 18:34:34.000000000 +0100 +++ /var/tmp/diff_new_pack.b14911/_new 2009-03-03 18:34:34.000000000 +0100 @@ -26,10 +26,11 @@ AutoReqProv: on Requires: gmp Version: 2.4.0 -Release: 1 +Release: 2 Summary: The MPFR multiple-precision floating-point library Url: http://www.mpfr.org/ Source: mpfr-%{version}.tar.bz2 +Patch1: mpfr-2.4.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -98,6 +99,7 @@ %prep %setup -q +%patch1 -p1 %build %configure \ @@ -143,6 +145,9 @@ %{_prefix}/include/mpfr.h %changelog +* Wed Feb 25 2009 rguenther(a)suse.de +- Apply current cummulative bugfixing patch. + * Fixes mpfr_snprintf and mpfr_vsnprintf buffer overflows. * Tue Jan 27 2009 rguenther(a)suse.de - Update to version 2.4.0. * Function mpfr_init_gmp_rand is no longer defined. ++++++ mpfr-2.4.0.patch ++++++ diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES --- mpfr-2.4.0-a/PATCHES 2009-01-26 12:52:01.000000000 +0000 +++ mpfr-2.4.0-b/PATCHES 2009-02-20 17:27:44.000000000 +0000 @@ -0,0 +1 @@ +printf-hh-ll diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION --- mpfr-2.4.0-a/VERSION 2009-01-26 12:52:01.000000000 +0000 +++ mpfr-2.4.0-b/VERSION 2009-02-20 17:27:44.000000000 +0000 @@ -1 +1 @@ -2.4.0 +2.4.0-p1 diff -Naurd mpfr-2.4.0-a/acinclude.m4 mpfr-2.4.0-b/acinclude.m4 --- mpfr-2.4.0-a/acinclude.m4 2009-01-26 12:52:01.000000000 +0000 +++ mpfr-2.4.0-b/acinclude.m4 2009-01-26 12:52:01.000000000 +0000 @@ -722,6 +722,16 @@ [AC_DEFINE([NPRINTF_J], 1, [gmp_printf cannot read intmax_t])]) fi +MPFR_FUNC_PRINTF_SPEC([%hhd], [char], [ +#include <gmp.h> + ], [gmp_],, + [AC_DEFINE([NPRINTF_HH], 1, [gmp_printf cannot use 'hh' length modifier])]) + +MPFR_FUNC_PRINTF_SPEC([%lld], [long long int], [ +#include <gmp.h> + ], [gmp_],, + [AC_DEFINE([NPRINTF_LL], 1, [gmp_printf cannot read long long int])]) + MPFR_FUNC_PRINTF_SPEC([%.0Lf], [long double], [ #include <gmp.h> ], [gmp_],, diff -Naurd mpfr-2.4.0-a/configure mpfr-2.4.0-b/configure --- mpfr-2.4.0-a/configure 2009-01-26 12:54:36.000000000 +0000 +++ mpfr-2.4.0-b/configure 2009-02-20 17:38:36.000000000 +0000 @@ -24874,6 +24874,170 @@ fi +{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%hhd\"" >&5 +$as_echo_n "checking if gmp_printf supports \"%hhd\"... " >&6; } +if test "$cross_compiling" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <stdio.h> + +#include <gmp.h> + + +int +main () +{ + + char s[256]; + char a = 0; + return (gmp_sprintf (s, "%hhd", a) != 1) ? 1 : 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define NPRINTF_HH 1 +_ACEOF + +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + + + +{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%lld\"" >&5 +$as_echo_n "checking if gmp_printf supports \"%lld\"... " >&6; } +if test "$cross_compiling" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <stdio.h> + +#include <gmp.h> + + +int +main () +{ + + char s[256]; + long long int a = 0; + return (gmp_sprintf (s, "%lld", a) != 1) ? 1 : 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define NPRINTF_LL 1 +_ACEOF + +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + + + { $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%.0Lf\"" >&5 $as_echo_n "checking if gmp_printf supports \"%.0Lf\"... " >&6; } if test "$cross_compiling" = yes; then diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h --- mpfr-2.4.0-a/mpfr.h 2009-01-26 12:52:01.000000000 +0000 +++ mpfr-2.4.0-b/mpfr.h 2009-02-20 17:27:44.000000000 +0000 @@ -27,7 +27,7 @@ #define MPFR_VERSION_MAJOR 2 #define MPFR_VERSION_MINOR 4 #define MPFR_VERSION_PATCHLEVEL 0 -#define MPFR_VERSION_STRING "2.4.0" +#define MPFR_VERSION_STRING "2.4.0-p1" /* Macros dealing with MPFR VERSION */ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) diff -Naurd mpfr-2.4.0-a/tests/tfprintf.c mpfr-2.4.0-b/tests/tfprintf.c --- mpfr-2.4.0-a/tests/tfprintf.c 2009-01-26 12:52:00.000000000 +0000 +++ mpfr-2.4.0-b/tests/tfprintf.c 2009-02-20 16:31:02.000000000 +0000 @@ -146,6 +146,7 @@ short sh = -1; unsigned short ush = 1; int i = -1; + int j = 1; unsigned int ui = 1; long lo = -1; unsigned long ulo = 1; @@ -179,12 +180,11 @@ limb[0] = limb[1] = limb[2] = ~ (mp_limb_t) 0; - check_vfprintf (fout, "a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui, - ulo, &uch); - check_length (1, uch, 28, hhu); - check_vfprintf (fout, "a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i, + check_vfprintf (fout, "a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j); + check_length (1, j, 22, d); + check_vfprintf (fout, "a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo); - check_length (2, ulo, 37, lu); + check_length (2, ulo, 36, lu); check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); check_length (3, ush, 29, hu); check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); @@ -208,13 +208,18 @@ check_length (9, sz, 30, zu); #endif +#ifndef NPRINTF_HH + check_vfprintf (fout, "a. %hhi, b.%RA, c. %hhu%hhn", sch, mpfr, uch, &uch); + check_length (10, uch, 21, hhu); +#endif + #if (__GNU_MP_VERSION * 10 + __GNU_MP_VERSION_MINOR) >= 42 /* The 'M' specifier was added in gmp 4.2.0 */ check_vfprintf (fout, "a. %Mx b. %Re%Mn", limb[0], mpfr, &limb[0]); if (limb[0] != 14 + BITS_PER_MP_LIMB / 4 || limb[1] != ~ (mp_limb_t) 0 || limb[2] != ~ (mp_limb_t) 0) { - printf ("Error in test #10: mpfr_vfprintf did not print %d characters" + printf ("Error in test #11: mpfr_vfprintf did not print %d characters" " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4); exit (1); } @@ -227,13 +232,13 @@ if (limb[0] != 14 + 3 * BITS_PER_MP_LIMB / 4 || limb[1] != (mp_limb_t) 0 || limb[2] != ~ (mp_limb_t) 0) { - printf ("Error in test #11: mpfr_vfprintf did not print %d characters" + printf ("Error in test #12: mpfr_vfprintf did not print %d characters" " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4); exit (1); } #endif -#ifdef HAVE_LONG_LONG +#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL) { long long llo = -1; unsigned long long ullo = 1; diff -Naurd mpfr-2.4.0-a/tests/tprintf.c mpfr-2.4.0-b/tests/tprintf.c --- mpfr-2.4.0-a/tests/tprintf.c 2009-01-26 12:52:00.000000000 +0000 +++ mpfr-2.4.0-b/tests/tprintf.c 2009-02-20 16:31:02.000000000 +0000 @@ -150,6 +150,7 @@ short sh = -1; unsigned short ush = 1; int i = -1; + int j = 1; unsigned int ui = 1; long lo = -1; unsigned long ulo = 1; @@ -178,11 +179,10 @@ mpfr_set_f (mpfr, mpf, GMP_RNDN); prec = mpfr_get_prec (mpfr); - check_vprintf ("a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui, ulo, - &uch); - check_length (1, uch, 28, hhu); - check_vprintf ("a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i, lo, &ulo); - check_length (2, ulo, 37, lu); + check_vprintf ("a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j); + check_length (1, j, 22, d); + check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo); + check_length (2, ulo, 36, lu); check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); check_length (3, ush, 29, hu); check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); @@ -204,7 +204,12 @@ check_length (9, sz, 30, zu); #endif -#ifdef HAVE_LONG_LONG +#ifndef NPRINTF_HH + check_vprintf ("a. %hhi, b. %Ra, c. %hhu%hhn", sch, mpfr, uch, &uch); + check_length (10, uch, 22, hhu); +#endif + +#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL) { long long llo = -1; unsigned long long ullo = 1; diff -Naurd mpfr-2.4.0-a/vasprintf.c mpfr-2.4.0-b/vasprintf.c --- mpfr-2.4.0-a/vasprintf.c 2009-01-26 12:52:01.000000000 +0000 +++ mpfr-2.4.0-b/vasprintf.c 2009-02-20 16:31:02.000000000 +0000 @@ -235,10 +235,14 @@ break; case 'h': if (*++format == 'h') +#ifndef NPRINTF_HH { ++format; specinfo->arg_type = CHAR_ARG; } +#else + specinfo->arg_type = UNSUPPORTED; +#endif else specinfo->arg_type = SHORT_ARG; break; @@ -246,7 +250,7 @@ if (*++format == 'l') { ++format; -#ifdef HAVE_LONG_LONG +#if defined (HAVE_LONG_LONG) && !defined(NPRINTF_LL) specinfo->arg_type = LONG_LONG_ARG; #else specinfo->arg_type = UNSUPPORTED; diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c --- mpfr-2.4.0-a/version.c 2009-01-26 12:52:01.000000000 +0000 +++ mpfr-2.4.0-b/version.c 2009-02-20 17:27:44.000000000 +0000 @@ -25,5 +25,5 @@ const char * mpfr_get_version (void) { - return "2.4.0"; + return "2.4.0-p1"; } diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES --- mpfr-2.4.0-a/PATCHES 2009-02-25 13:27:38.000000000 +0000 +++ mpfr-2.4.0-b/PATCHES 2009-02-25 13:42:26.000000000 +0000 @@ -0,0 +1 @@ +mpfr_snprintf diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION --- mpfr-2.4.0-a/VERSION 2009-02-20 17:27:44.000000000 +0000 +++ mpfr-2.4.0-b/VERSION 2009-02-25 13:41:31.000000000 +0000 @@ -1 +1 @@ -2.4.0-p1 +2.4.0-p2 diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h --- mpfr-2.4.0-a/mpfr.h 2009-02-20 17:27:44.000000000 +0000 +++ mpfr-2.4.0-b/mpfr.h 2009-02-25 13:41:31.000000000 +0000 @@ -27,7 +27,7 @@ #define MPFR_VERSION_MAJOR 2 #define MPFR_VERSION_MINOR 4 #define MPFR_VERSION_PATCHLEVEL 0 -#define MPFR_VERSION_STRING "2.4.0-p1" +#define MPFR_VERSION_STRING "2.4.0-p2" /* Macros dealing with MPFR VERSION */ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) diff -Naurd mpfr-2.4.0-a/printf.c mpfr-2.4.0-b/printf.c --- mpfr-2.4.0-a/printf.c 2009-01-26 12:52:01.000000000 +0000 +++ mpfr-2.4.0-b/printf.c 2009-02-25 13:41:22.000000000 +0000 @@ -154,16 +154,16 @@ int ret; size_t min_size; - /* C99 allows SIZE to be null */ - if (size == 0) - return 0; - - MPFR_ASSERTD (buf != NULL); - GET_STR (ret, str, fmt); - min_size = (size_t)ret < size ? (size_t)ret : size - 1; - strncpy (buf, str, min_size); - buf[min_size + 1] = '\0'; + + /* C99 allows SIZE to be zero */ + if (size != 0) + { + MPFR_ASSERTN (buf != NULL); + min_size = (size_t)ret < size ? (size_t)ret : size - 1; + strncpy (buf, str, min_size); + buf[min_size] = '\0'; + } mpfr_free_str (str); return ret; @@ -176,16 +176,17 @@ int ret; int min_size; - /* C99 allows SIZE to be null */ - if (size == 0) - return 0; + GET_STR_VA (ret, str, fmt, ap); - MPFR_ASSERTD (buf != NULL); + /* C99 allows SIZE to be zero */ + if (size != 0) + { + MPFR_ASSERTN (buf != NULL); + min_size = (size_t)ret < size ? (size_t)ret : size - 1; + strncpy (buf, str, min_size); + buf[min_size] = '\0'; + } - GET_STR_VA (ret, str, fmt, ap); - min_size = (size_t)ret < size ? (size_t)ret : size - 1; - strncpy (buf, str, min_size); - buf[min_size + 1] = '\0'; mpfr_free_str (str); return ret; } diff -Naurd mpfr-2.4.0-a/tests/tsprintf.c mpfr-2.4.0-b/tests/tsprintf.c --- mpfr-2.4.0-a/tests/tsprintf.c 2009-01-26 12:52:00.000000000 +0000 +++ mpfr-2.4.0-b/tests/tsprintf.c 2009-02-25 13:41:22.000000000 +0000 @@ -72,21 +72,37 @@ /* test mpfr_snprintf */ p = (int) (randlimb () % n0); - n1 = mpfr_snprintf (buffer, p, fmt, x); - if ((p != 0 && n0 != n1) || (p == 0 && n1 != 0)) + if (p == 0 && (randlimb () & 1) == 0) + { + n1 = mpfr_snprintf (NULL, 0, fmt, x); + } + else + { + buffer[p] = 17; + n1 = mpfr_snprintf (buffer, p, fmt, x); + if (buffer[p] != 17) + { + printf ("Buffer overflow in mpfr_snprintf for p = %d!\n", p); + exit (1); + } + } + if (n0 != n1) { printf ("Error in mpfr_snprintf (s, %d, \"%s\", x) return value\n", p, fmt); printf ("expected: %d\ngot: %d\n", n0, n1); exit (1); } - if (strncmp (expected, buffer, p) != 0) + if ((p > 1 && strncmp (expected, buffer, p-1) != 0) + || (p == 1 && buffer[0] != '\0')) { - printf ("Error in mpfr_snprintf (s, %d, \"%s\", x);\n", p, fmt); - printf ("expected: \"%s\"\ngot: \"%s\"\n", expected, buffer); + char part_expected[p]; + strncpy (part_expected, expected, p); + part_expected[p-1] = '\0'; + printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...);\n", p, fmt); + printf ("expected: \"%s\"\ngot: \"%s\"\n", part_expected, buffer); exit (1); } - return n0; } @@ -116,8 +132,21 @@ /* test mpfr_snprintf */ p = (int) (randlimb () % n0); - n1 = mpfr_vsnprintf (buffer, p, fmt, ap1); - if ((p != 0 && n0 != n1) || (p == 0 && n1 != 0)) + if (p == 0 && (randlimb () & 1) == 0) + { + n1 = mpfr_vsnprintf (NULL, 0, fmt, ap1); + } + else + { + buffer[p] = 17; + n1 = mpfr_vsnprintf (buffer, p, fmt, ap1); + if (buffer[p] != 17) + { + printf ("Buffer overflow in mpfr_vsnprintf for p = %d!\n", p); + exit (1); + } + } + if (n0 != n1) { printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...) return value\n", p, fmt); @@ -126,10 +155,14 @@ va_end (ap1); exit (1); } - if (strncmp (expected, buffer, p) != 0) + if ((p > 1 && strncmp (expected, buffer, p-1) != 0) + || (p == 1 && buffer[0] != '\0')) { + char part_expected[p]; + strncpy (part_expected, expected, p); + part_expected[p-1] = '\0'; printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...);\n", p, fmt); - printf ("expected: \"%s\"\ngot: \"%s\"\n", expected, buffer); + printf ("expected: \"%s\"\ngot: \"%s\"\n", part_expected, buffer); va_end (ap1); exit (1); diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c --- mpfr-2.4.0-a/version.c 2009-02-20 17:27:44.000000000 +0000 +++ mpfr-2.4.0-b/version.c 2009-02-25 13:41:31.000000000 +0000 @@ -25,5 +25,5 @@ const char * mpfr_get_version (void) { - return "2.4.0-p1"; + return "2.4.0-p2"; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzio for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package libzio for openSUSE:Factory checked in at Tue Mar 3 18:34:26 CET 2009. -------- --- libzio/libzio.changes 2009-02-23 11:05:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzio/libzio.changes 2009-02-23 16:15:11.664701042 +0100 @@ -1,0 +2,5 @@ +Mon Feb 23 16:01:17 CET 2009 - werner(a)suse.de + +- Add fseek(3) support for bzip and LZW files + +------------------------------------------------------------------- @@ -6,0 +12 @@ + calling whatdependson for head-i586 Old: ---- libzio-0.93.diff libzio-0.93.tar.bz2 New: ---- libzio-0.99.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzio.spec ++++++ --- /var/tmp/diff_new_pack.F12904/_old 2009-03-03 18:34:10.000000000 +0100 +++ /var/tmp/diff_new_pack.F12904/_new 2009-03-03 18:34:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libzio (Version 0.93) +# spec file for package libzio (Version 0.99) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,12 +33,11 @@ Obsoletes: libzio-64bit %endif # -Version: 0.93 -Release: 2 +Version: 0.99 +Release: 1 Summary: A Library for Accessing Compressed Text Files BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libzio-%{version}.tar.bz2 -Patch: libzio-%{version}.diff %description Libzio provides a wrapper function for reading or writing gzip or bzip2 @@ -74,7 +73,6 @@ %prep %setup -q -%patch %build make @@ -114,6 +112,8 @@ /usr/include/zio.h %changelog +* Mon Feb 23 2009 werner(a)suse.de +- Add fseek(3) support for bzip and LZW files * Mon Feb 23 2009 schwab(a)suse.de - Fix namespace violations. * Fri Feb 13 2009 werner(a)suse.de ++++++ libzio-0.93.tar.bz2 -> libzio-0.99.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzio-0.93/fzopen.3.in new/libzio-0.99/fzopen.3.in --- old/libzio-0.93/fzopen.3.in 2009-02-13 14:03:59.000000000 +0100 +++ new/libzio-0.99/fzopen.3.in 2009-02-23 15:59:59.000000000 +0100 @@ -112,9 +112,9 @@ rb l l l l l. fread fwrite fseek suffix library gzip yes yes yes .gz -lz - bzip2 yes yes no .bz2 -lbz2 -LZW yes no no .Z builtin -lzma yes yes yes .lzma -llzma (or -llzmadec) +bzip2 yes yes yes .bz2 -lbz2 +LZW yes no yes .Z builtin +lzma yes yes(no) yes .lzma -llzma (-llzmadec) xz yes yes yes .xz -llzma .TE .PP @@ -250,10 +250,8 @@ .B ESPIPE This happens if .BR fseek (3) -is used in the case of bzip2ed files because -the -.B libbz2 -does not provide a seek function. +is used in the case of seesking files is not +supported. .\" .SH WARNINGS The functions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzio-0.93/Makefile new/libzio-0.99/Makefile --- old/libzio-0.93/Makefile 2009-02-13 16:10:41.000000000 +0100 +++ new/libzio-0.99/Makefile 2009-02-23 15:55:44.000000000 +0100 @@ -8,7 +8,7 @@ CFLAGS = $(RPM_OPT_FLAGS) -pipe -Wall -D_GNU_SOURCE -D_REENTRANT $(LARGE) CC = gcc MAJOR = 0 -MINOR = 93 +MINOR = 99 VERSION = $(MAJOR).$(MINOR) SONAME = libzio.so.$(MAJOR) LDMAP = -Wl,--version-script=zio.map diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzio-0.93/zio.c new/libzio-0.99/zio.c --- old/libzio-0.93/zio.c 2009-02-13 16:01:14.000000000 +0100 +++ new/libzio-0.99/zio.c 2009-02-23 15:54:21.000000000 +0100 @@ -20,23 +20,40 @@ #if defined(HAS_ZLIB_H) static ssize_t zread(void *cookie, char *buf, size_t count) { + if (!cookie) { + errno = EINVAL; + return -1; + } return (ssize_t)gzread((gzFile)cookie, (voidp)buf, count); } static ssize_t zwrite(void *cookie, const char *buf, size_t count) { + if (!cookie) { + errno = EINVAL; + return -1; + } return (ssize_t)gzwrite((gzFile)cookie, (const voidp)buf, count); } static zio_int_t zseek(void *cookie, zio_off_t *poffset, int whence) { + if (!cookie) { + errno = EINVAL; + return -1; + } return (zio_int_t)gzseek((gzFile)cookie, (z_off_t)(*poffset), whence); } static int zclose(void *cookie) { + int status; + if (!cookie) { + errno = EINVAL; + return -1; + } (void)gzflush((gzFile)cookie, Z_FINISH); - int status = gzclose((gzFile)cookie); + status = gzclose((gzFile)cookie); return (status >= 0) ? 0 : EOF; } @@ -52,26 +69,137 @@ #endif /* !HAS_ZLIB_H */ #if defined(HAS_BZLIB_H) +# ifndef MIN +# define MIN(x,y) ((x) < (y) ? (x) : (y)) +# endif + +typedef struct bzfile_s { + size_t total_out; + BZFILE *file; + char *mode; + char *path; + int fd; +} bzfile_t; + static ssize_t bzread(void *cookie, char *buf, size_t count) { - return (ssize_t)BZ2_bzread((BZFILE*)cookie, (void*)buf, count); + bzfile_t *bzf = (bzfile_t*)cookie; + ssize_t len = -1; + if (!bzf) + goto out; + if (bzf->file) + len = (ssize_t)BZ2_bzread(bzf->file, (void*)buf, count); + if (len > 0) + bzf->total_out += len; +out: + if (len < 0) + errno = EINVAL; + return len; } static ssize_t bzwrite(void *cookie, const char *buf, size_t count) { - return (ssize_t)BZ2_bzwrite((BZFILE*)cookie, (void*)buf, count); + bzfile_t *bzf = (bzfile_t*)cookie; + ssize_t len = -1; + if (!bzf) + goto out; + if (bzf->file) + len = (ssize_t)BZ2_bzread(bzf->file, (void*)buf, count); + if (len > 0) + bzf->total_out += len; +out: + if (len < 0) + errno = EINVAL; + return len; } -static zio_int_t bzseek(void *cookie __unused, zio_off_t *poffset __unused, int whence __unused) +static zio_int_t bzseek(void *cookie, zio_off_t *poffset, int whence) { - errno = ESPIPE; - return -1; + bzfile_t *bzf = (bzfile_t*)cookie; + off_t offset = (off_t)*poffset; + off_t oldpos, newpos; + if (!bzf) { + errno = EINVAL; + return -1; + } + + oldpos = (off_t)bzf->total_out; + switch (whence) { + case SEEK_SET: + if (offset < 0) + return -1; + newpos = offset; + break; + case SEEK_CUR: + if ((offset < 0 && (off_t)(-1 * offset) > oldpos) || (offset > 0 && (offset+oldpos) < oldpos)) + return -1; + newpos = (off_t)bzf->total_out + offset; + break; + case SEEK_END: + newpos = -1; + break; + default: + errno = EINVAL; + return -1; + } + + if (whence != SEEK_END && newpos < oldpos) { + int status = BZ2_bzflush(bzf->file); + BZ2_bzclose(bzf->file); + if (status < 0) { + errno = EINVAL; + return -1; + } + if (bzf->fd >= 0) { + lseek(bzf->fd, 0, SEEK_SET); + bzf->file = BZ2_bzdopen(bzf->fd, bzf->mode); + } else if (bzf->path) { + bzf->file = BZ2_bzopen(bzf->path, bzf->mode); + } else { + errno = EINVAL; + return -1; + } + if (bzf->file == (BZFILE*)0) { + errno = EINVAL; + return -1; + } + bzf->total_out = 0; + } + if (newpos == oldpos) + return oldpos; + else { + char buf[1<<12]; + while (newpos > oldpos || newpos == -1) { + size_t req_size = MIN(sizeof(buf), newpos - oldpos); + ssize_t got_size = BZ2_bzread(bzf->file, buf, req_size); + if (got_size != (ssize_t)(req_size)) { + if (got_size < 0) + return -1; + else { + newpos = oldpos + got_size; + break; + } + } + oldpos += got_size; + } + return newpos; + } } static int bzclose(void *cookie) { - int status = BZ2_bzflush((BZFILE*)cookie); - BZ2_bzclose((BZFILE*)cookie); + bzfile_t *bzf = (bzfile_t*)cookie; + int status = -1; + if (!bzf) { + errno = EINVAL; + goto out; + } + if (bzf->file) { + status = BZ2_bzflush(bzf->file); + BZ2_bzclose(bzf->file); + } + free(cookie); +out: return (status >= 0) ? 0 : EOF; } @@ -91,6 +219,16 @@ # define MIN(x,y) ((x) < (y) ? (x) : (y)) # endif +typedef struct lzfile_s { + uint8_t buf[1<<12]; + lzma_stream strm; + FILE *file; + int encoding; + int level; + int what; + int eof; +} lzfile_t; + static lzma_ret lzmaopen(lzma_stream *__restrict strm, const char mode, const char what, int level) { lzma_ret ret; @@ -195,8 +333,7 @@ newpos = offset; break; case SEEK_CUR: - if ((offset < 0 && (off_t)(-1 * offset) > oldpos) || - (offset > 0 && (offset+oldpos) < oldpos)) + if ((offset < 0 && (off_t)(-1 * offset) > oldpos) || (offset > 0 && (offset+oldpos) < oldpos)) return -1; newpos = (off_t)strm->total_out + offset; break; @@ -284,6 +421,10 @@ # if defined(HAS_LZMADEC_H) static ssize_t lzmaread(void *cookie, char *buf, size_t count) { + if (!cookie) { + errno = EINVAL; + return -1; + } return lzmadec_read((lzmadec_FILE*)cookie, (uint8_t*)buf, count); } @@ -295,11 +436,19 @@ static zio_int_t lzmaseek(void *cookie, zio_off_t *poffset, int whence) { + if (!cookie) { + errno = EINVAL; + return -1; + } return (zio_int_t)lzmadec_seek((lzmadec_FILE*)cookie, (off_t)(*poffset), whence); } static int lzmaclose(void *cookie) { + if (!cookie) { + errno = EINVAL; + return -1; + } int_fast8_t status = lzmadec_close((lzmadec_FILE*)cookie); return (status >= 0) ? 0 : EOF; } @@ -316,9 +465,28 @@ # endif /* !HAS_LZMADEC_H */ #endif /* !HAS_LZMA_H */ +typedef struct lzwfile_s { + size_t total_out; + LZW_t *file; + char *mode; + char *path; + int fd; +} lzwfile_t; + static ssize_t lzwread(void *cookie, char *buf, size_t count) { - return readlzw((LZW_t*)cookie, buf, count); + lzwfile_t *lzw = (lzwfile_t*)cookie; + ssize_t len = -1; + if (!lzw) + goto out; + if (lzw->file) + len = readlzw(lzw->file, buf, count); + if (len > 0) + lzw->total_out += len; +out: + if (len < 0) + errno = EINVAL; + return len; } static ssize_t lzwwrite(void *cookie, const char *buf, size_t count) @@ -327,15 +495,84 @@ return -1; } -static zio_int_t lzwseek(void *cookie __unused, zio_off_t *poffset __unused, int whence __unused) +static zio_int_t lzwseek(void *cookie, zio_off_t *poffset, int whence) { - errno = ESPIPE; - return -1; + lzwfile_t *lzw = (lzwfile_t*)cookie; + off_t offset = (off_t)*poffset; + off_t oldpos, newpos; + if (!lzw) { + errno = EINVAL; + return -1; + } + + oldpos = (off_t)lzw->total_out; + switch (whence) { + case SEEK_SET: + if (offset < 0) + return -1; + newpos = offset; + break; + case SEEK_CUR: + if ((offset < 0 && (off_t)(-1 * offset) > oldpos) || (offset > 0 && (offset+oldpos) < oldpos)) + return -1; + newpos = (off_t)lzw->total_out + offset; + break; + case SEEK_END: + newpos = -1; + break; + default: + errno = EINVAL; + return -1; + } + + if (whence != SEEK_END && newpos < oldpos) { + closelzw(lzw->file); + if (lzw->fd >= 0) { + lseek(lzw->fd, 0, SEEK_SET); + lzw->file = dopenlzw(lzw->fd, lzw->mode); + } else if (lzw->path) { + lzw->file = openlzw(lzw->path, lzw->mode); + } else { + errno = EINVAL; + return -1; + } + if (lzw->file == (LZW_t*)0) { + errno = EINVAL; + return -1; + } + lzw->total_out = 0; + } + if (newpos == oldpos) + return oldpos; + else { + char buf[1<<12]; + while (newpos > oldpos || newpos == -1) { + size_t req_size = MIN(sizeof(buf), newpos - oldpos); + ssize_t got_size = readlzw(lzw->file, buf, req_size); + if (got_size != (ssize_t)(req_size)) { + if (got_size < 0) + return -1; + else { + newpos = oldpos + got_size; + break; + } + } + oldpos += got_size; + } + return newpos; + } } static int lzwclose(void *cookie) { - closelzw((LZW_t*)cookie); + lzwfile_t *lzw = (lzwfile_t*)cookie; + if (!lzw) { + errno = EINVAL; + return -1; + } + if (lzw->file) + closelzw(lzw->file); + free(cookie); return 0; } @@ -347,60 +584,29 @@ .close = (cookie_close_function_t*)&lzwclose, }; -FILE * fzopen(const char * path, const char * mode) +static inline char autodetect(char **__restrict path, const char *__restrict check) { - FILE * ret = (FILE *)0; - char * check = (char*)0, * ext = (char*)0; - size_t n = 0, len; - unsigned int i; + const size_t len = strlen(*path); + char *suff = strrchr(*path, '.'); + char *ext = *path; char what = 'n'; - if (!mode || !(n = strlen(mode))) { - errno = EINVAL; - goto out; - } - - if (!(check = (char*)malloc(n*sizeof(char)))) - goto out; - - /* No append mode possible */ - switch (*mode) { - case 'r': check[0] = 'r'; break; - case 'w': check[0] = 'w'; break; - default: errno = EINVAL; goto out; - } - - for (i = 1; i < n; i++) { - /* We can only open for reading OR writing but NOT for both */ - switch (mode[i]) { - case '\0': break; - case '+': errno = EINVAL; goto out; - case 'b': case 'x': check[i] = mode[i]; continue; - /* Ingore switches for gzopen() */ - case 'f': case 'h': check[i] = '\0'; continue; - default: check[i] = '\0'; continue; - } - break; - } - - if (!path || !(len = strlen(path))) { - errno = EINVAL; - goto out; + if (suff) { + suff++; + if (strcmp(suff, "z" ) == 0) + what = 'z'; + else if (strcmp(suff, "gz" ) == 0) + what = 'g'; + else if (strcmp(suff, "Z" ) == 0) + what = 'Z'; + else if (strcmp(suff, "bz2" ) == 0) + what = 'b'; + else if (strcmp(suff, "lzma") == 0) + what = 'l'; + else if (strcmp(suff, "xz" ) == 0) + what = 'x'; } - if (strcmp(path + len - 2, ".z" ) == 0) - what = 'z'; - else if (strcmp(path + len - 3, ".gz" ) == 0) - what = 'g'; - else if (strcmp(path + len - 3, ".Z" ) == 0) - what = 'Z'; - else if (strcmp(path + len - 4, ".bz2" ) == 0) - what = 'b'; - else if (strcmp(path + len - 5, ".lzma") == 0) - what = 'l'; - else if (strcmp(path + len - 3, ".xz") == 0) - what = 'x'; - if (what == 'n' && *check == 'r') { int olderr, fd; struct stat st; @@ -408,39 +614,40 @@ ext = malloc(sizeof(char)*(len + 5 + 1)); if (!ext) goto out; - strcpy(ext, path); + strcpy(ext, *path); + suff = (ext+len); olderr = errno; if (stat(strcat(ext, ".gz"), &st) == 0) { what = 'g'; goto skip; } - *(ext + len) = '\0'; + *suff = '\0'; if (stat(strcat(ext, ".bz2"), &st) == 0) { what = 'b'; goto skip; } - *(ext + len) = '\0'; + *suff = '\0'; if (stat(strcat(ext, ".z"), &st) == 0) { what = 'z'; goto skip; } - *(ext + len) = '\0'; + *suff = '\0'; if (stat(strcat(ext, ".Z"), &st) == 0) { what = 'Z'; goto skip; } - *(ext + len) = '\0'; + *suff = '\0'; if (stat(strcat(ext, ".lzma"), &st) == 0) { what = 'l'; goto skip; } - *(ext + len) = '\0'; + *suff = '\0'; if (stat(strcat(ext, ".xz"), &st) == 0) { what = 'x'; goto skip; } - *(ext + len) = '\0'; + *suff = '\0'; if ((fd = open(ext, O_RDONLY|O_NOCTTY)) < 0) goto skip; @@ -461,18 +668,64 @@ what = 'x'; } close(fd); - skip: errno = olderr; - } else - ext = (char *)path; + } +out: + *path = ext; + return what; +} + +FILE * fzopen(const char * path, const char * mode) +{ + FILE * ret = (FILE *)0; + char * check = (char*)0, * ext = (char*)0; + size_t n = 0, len; + unsigned int i; + char what = 'n'; + + if (!mode || !(n = strlen(mode))) { + errno = EINVAL; + goto out; + } + + if (!(check = (char*)malloc(n*sizeof(char)))) + goto out; + + /* No append mode possible */ + switch (*mode) { + case 'r': check[0] = 'r'; break; + case 'w': check[0] = 'w'; break; + default: errno = EINVAL; goto out; + } + + for (i = 1; i < n; i++) { + /* We can only open for reading OR writing but NOT for both */ + switch (mode[i]) { + case '\0': break; + case '+': errno = EINVAL; goto out; + case 'b': case 'x': check[i] = mode[i]; continue; + /* Ingore switches for gzopen() */ + case 'f': case 'h': check[i] = '\0'; continue; + default: check[i] = '\0'; continue; + } + break; + } + + if (!path || !(len = strlen(path))) { + errno = EINVAL; + goto out; + } + + ext = (char *)path; + what = autodetect(&ext, check); switch (what) { case 'g': case 'z': /* Is this correct? Old gzip magic */ #if defined(HAS_ZLIB_H) { - gzFile cookie = (gzFile)0; + gzFile cookie; if (&gzopen == NULL) { errno = ENOSYS; @@ -485,7 +738,7 @@ goto out; } - if (!(ret = fopencookie(cookie, check, ioz))) { + if (!(ret = fopencookie((void*)cookie, check, ioz))) { gzclose(cookie); errno = EINVAL; goto out; @@ -501,20 +754,32 @@ break; case 'Z': { - LZW_t *cookie; + lzwfile_t *__restrict cookie; if (*mode != 'r') { errno = ENOTSUP; goto out; } - if (!(cookie = openlzw(ext, mode))) { + if (posix_memalign((void*)&cookie, sizeof(void*), alignof(lzwfile_t)+strsize(ext)+strsize(mode)) != 0) + goto out; + memset(cookie, 0, alignof(lzwfile_t)+strsize(ext)+strsize(mode)); + + cookie->fd = -1; + cookie->mode = ((char*)cookie)+alignof(lzwfile_t); + cookie->path = cookie->mode + strsize(mode); + strcpy(cookie->mode, mode); + strcpy(cookie->path, ext); + + if (!(cookie->file = openlzw(ext, mode))) { + free(cookie); if (!errno) errno = ENOMEM; goto out; } - if (!(ret = fopencookie(cookie, check, iolzw))) { - closelzw(cookie); + if (!(ret = fopencookie((void*)cookie, check, iolzw))) { + closelzw(cookie->file); + free(cookie); errno = EINVAL; goto out; } @@ -527,21 +792,41 @@ case 'b': #if defined(HAS_BZLIB_H) { - BZFILE* cookie = (BZFILE*)0; + bzfile_t *__restrict cookie; + int level = 5; if (&BZ2_bzopen == NULL) { errno = ENOSYS; goto out; } - if (!(cookie = BZ2_bzopen(ext, mode))) { + if (posix_memalign((void*)&cookie, sizeof(void*), alignof(bzfile_t)+strsize(ext)+strsize(mode)) != 0) + goto out; + memset(cookie, 0, alignof(bzfile_t)+strsize(ext)+strsize(mode)); + + for (i = 1; i < n; i++) { + if (mode[i] >= '0' && mode[i] <= '9') { + level = (int)mode[i]; + break; + } + } + + cookie->fd = -1; + cookie->mode = ((char*)cookie)+alignof(bzfile_t); + cookie->path = cookie->mode+strsize(mode); + strcpy(cookie->mode, mode); + strcpy(cookie->path, ext); + + if (!(cookie->file = BZ2_bzopen(ext, mode))) { + free(cookie); if (!errno) errno = ENOMEM; goto out; } - if (!(ret = fopencookie(cookie, check, iobz))) { - BZ2_bzclose(cookie); + if (!(ret = fopencookie((void*)cookie, check, iobz))) { + BZ2_bzclose(cookie->file); + free(cookie); errno = EINVAL; goto out; } @@ -559,7 +844,7 @@ case 'x': { int level = LZMA_PRESET_DEFAULT; - lzfile_t * cookie = (lzfile_t*)0; + lzfile_t *__restrict cookie; lzma_ret lret; if (&lzma_auto_decoder == NULL) { @@ -567,9 +852,9 @@ goto out; } - if ((cookie = (lzfile_t*)malloc(sizeof(lzfile_t))) == NULL) + if (posix_memalign((void*)&cookie, sizeof(void*), alignof(lzfile_t)) != 0) goto out; - memset(cookie, 0, sizeof(lzfile_t)); + memset(cookie, 0, alignof(lzfile_t)); if ((cookie->file = fopen(ext, check)) == NULL) { free(cookie); @@ -589,13 +874,14 @@ cookie->level = level; cookie->encoding = (check[0] == 'w') ? 1 : 0; lret = lzmaopen(&cookie->strm, check[0], what, level); + if (lret != LZMA_OK) { fclose(cookie->file); free(cookie); errno = EINVAL; goto out; } - if (!(ret = fopencookie(cookie, check, iolzma))) { + if (!(ret = fopencookie((void*)cookie, check, iolzma))) { lzma_end(&cookie->strm); fclose(cookie->file); free(cookie); @@ -612,10 +898,10 @@ case 'x': errno = ENOTSUP; break; -# if defined(HAS_LZMADEC_H) case 'l': +# if defined(HAS_LZMADEC_H) { - lzmadec_FILE* cookie = (lzmadec_FILE*)0; + lzmadec_FILE* cookie; if (*mode != 'r') { errno = ENOTSUP; @@ -633,7 +919,7 @@ goto out; } - if (!(ret = fopencookie(cookie, check, iolzma))) { + if (!(ret = fopencookie((void*)cookie, check, iolzma))) { lzmadec_close(cookie); errno = EINVAL; goto out; @@ -644,10 +930,9 @@ # endif } # else /* !HAS_LZMADEC_H */ - case 'l': errno = ENOTSUP; # endif /* !HAS_LZMADEC_H */ -#endif /* HAS_LZMA_H */ +#endif /* !HAS_LZMA_H */ break; default: ret = fopen(ext, mode); @@ -703,7 +988,7 @@ case 'z': /* Is this correct? Old gzip magic */ #if defined(HAS_ZLIB_H) { - gzFile cookie = (gzFile)0; + gzFile cookie; if (&gzdopen == NULL) { errno = ENOSYS; @@ -716,7 +1001,7 @@ goto out; } - if (!(ret = fopencookie(cookie, check, ioz))) { + if (!(ret = fopencookie((void*)cookie, check, ioz))) { gzclose(cookie); errno = EINVAL; goto out; @@ -732,20 +1017,30 @@ break; case 'Z': { - LZW_t *cookie; + lzwfile_t *__restrict cookie; if (*mode != 'r') { errno = ENOTSUP; goto out; } - if (!(cookie = dopenlzw(fildes, mode))) { + if (posix_memalign((void*)&cookie, sizeof(void*), alignof(lzwfile_t)+strsize(mode)) != 0) + goto out; + memset(cookie, 0, alignof(lzwfile_t)+strsize(mode)); + + cookie->fd = fildes; + cookie->mode = ((char*)cookie)+alignof(lzwfile_t); + strcpy(cookie->mode, mode); + + if (!(cookie->file = dopenlzw(fildes, mode))) { + free(cookie); if (!errno) errno = ENOMEM; goto out; } - if (!(ret = fopencookie(cookie, check, iolzw))) { - closelzw(cookie); + if (!(ret = fopencookie((void*)cookie, check, iolzw))) { + closelzw(cookie->file); + free(cookie); errno = EINVAL; goto out; } @@ -758,21 +1053,43 @@ case 'b': #if defined(HAS_BZLIB_H) { - BZFILE* cookie = (BZFILE*)0; + bzfile_t *__restrict cookie; + int level = 5; if (&BZ2_bzdopen == NULL) { errno = ENOSYS; goto out; } - if (!(cookie = BZ2_bzdopen(fildes, mode))) { + if (posix_memalign((void*)&cookie, sizeof(void*), alignof(bzfile_t)+strsize(mode)) != 0) + goto out; + memset(cookie, 0, alignof(bzfile_t)+strsize(mode)); + + for (i = 1; i < n; i++) { + if (mode[i] >= '0' && mode[i] <= '9') { + level = (int)mode[i]; + break; + } + } + + cookie->fd = fildes; + cookie->mode = ((char*)cookie)+alignof(bzfile_t); + strcpy(cookie->mode, mode); + + if (cookie->mode == (char*)0) { + free(cookie); + goto out; + } + if (!(cookie->file = BZ2_bzdopen(fildes, mode))) { + free(cookie); if (!errno) errno = ENOMEM; goto out; } - if (!(ret = fopencookie(cookie, check, iobz))) { - BZ2_bzclose(cookie); + if (!(ret = fopencookie((void*)cookie, check, iobz))) { + BZ2_bzclose(cookie->file); + free(cookie); errno = EINVAL; goto out; } @@ -790,7 +1107,7 @@ case 'x': { int level = LZMA_PRESET_DEFAULT; - lzfile_t * cookie = (lzfile_t*)0; + lzfile_t *__restrict cookie; lzma_ret lret; if (&lzma_auto_decoder == NULL) { @@ -798,9 +1115,9 @@ goto out; } - if ((cookie = (lzfile_t*)malloc(sizeof(lzfile_t))) == NULL) + if (posix_memalign((void*)&cookie, sizeof(void*), alignof(lzfile_t)) != 0) goto out; - memset(cookie, 0, sizeof(lzfile_t)); + memset(cookie, 0, alignof(lzfile_t)); if ((cookie->file = fdopen(fildes, check)) == NULL) { free(cookie); @@ -826,7 +1143,7 @@ errno = EINVAL; goto out; } - if (!(ret = fopencookie(cookie, check, iolzma))) { + if (!(ret = fopencookie((void*)cookie, check, iolzma))) { lzma_end(&cookie->strm); fclose(cookie->file); free(cookie); @@ -846,7 +1163,7 @@ case 'l': # if defined(HAS_LZMADEC_H) { - lzmadec_FILE* cookie = (lzmadec_FILE*)0; + lzmadec_FILE* cookie; if (*mode != 'r') { errno = ENOTSUP; @@ -864,7 +1181,7 @@ goto out; } - if (!(ret = fopencookie(cookie, check, iolzma))) { + if (!(ret = fopencookie((void*)cookie, check, iolzma))) { lzmadec_close(cookie); errno = EINVAL; goto out; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzio-0.93/zioP.h new/libzio-0.99/zioP.h --- old/libzio-0.93/zioP.h 2009-02-13 16:27:29.000000000 +0100 +++ new/libzio-0.99/zioP.h 2009-02-23 14:54:34.000000000 +0100 @@ -33,15 +33,17 @@ #include <stdlib.h> #include <errno.h> -#ifndef __unused -# define __unused __attribute__((__unused__)) +#ifndef unused +# define unused __attribute__((__unused__)) #endif -#ifndef __nonnull -# define __nonnull(parm) __attribute__((__nonnull__ parm)) +#ifndef nonnull +# define nonnull(parm) __attribute__((__nonnull__ parm)) #endif -#ifndef __wur -# define __wur __attribute__((__warn_unused_result__)) +#ifndef wur +# define wur __attribute__((__warn_unused_result__)) #endif +#define alignof(type) (sizeof(type)+(sizeof(type)%sizeof(void*))) +#define strsize(str) ((strlen(str)+1)*sizeof(char)) #if !defined(HAVE_FOPENCOOKIE) && !defined(HAVE_FUNOPEN) # error Requires fopencookie(3GNU) or funopen(3BSD) @@ -100,15 +102,6 @@ #if defined(HAS_LZMA_H) # include <stdint.h> # include <lzma.h> -typedef struct lzfile_s { - uint8_t buf[1<<12]; - lzma_stream strm; - FILE *file; - int encoding; - int level; - int what; - int eof; -} lzfile_t; # ifndef NO_WEAK weak_symbol(lzma_easy_encoder); weak_symbol(lzma_lzma_preset); @@ -161,9 +154,9 @@ } cookie_io_functions_t; static __inline__ FILE *fopencookie(void *__restrict, const char *__restrict, - cookie_io_functions_t) __nonnull((1,2)) __wur; + cookie_io_functions_t) nonnull((1,2)) wur; static __inline__ FILE *fopencookie(void *__restrict cookie, - const char *__restrict mode __unused, + const char *__restrict mode unused, cookie_io_functions_t io_funcs) { return funopen(cookie, io_funcs.read, io_funcs.write, io_funcs.seek, io_funcs.close); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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