January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit libimobiledevice for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libimobiledevice for openSUSE:Factory checked in at Fri Jan 7 09:36:34 CET 2011. -------- --- libimobiledevice/libimobiledevice.changes 2010-10-05 23:44:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/libimobiledevice/libimobiledevice.changes 2010-12-30 00:36:56.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Dec 29 23:36:07 UTC 2010 - andreas.hanke(a)gmx-topmail.de + +- backport commit 0b40ddb1f41c94a3ee58abc6326e59d65662e5c7 to fix build + +------------------------------------------------------------------- +Wed Dec 8 21:34:37 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- disable silent rules, breaks post build checks. +- fix -devel package dependencies + +------------------------------------------------------------------- +Sat Nov 27 20:58:54 CEST 2010 - opensuse(a)sukimashita.com + +- Update to 1.0.4: + * Fix a possible crash in lockdownd_client_new_with_handshake() + * Do not not check for Swig/Python if --without-swig is set + * Fail with an error message if libgcrypt is not found + * Pass host certificate with GNUTLS correctly + * Fix connecting to iOS 4.2.1+ devices + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libimobiledevice-1.0.3.tar.bz2 New: ---- 0b40ddb1f41c94a3ee58abc6326e59d65662e5c7.patch libimobiledevice-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libimobiledevice.spec ++++++ --- /var/tmp/diff_new_pack.AqwmvN/_old 2011-01-07 09:35:04.000000000 +0100 +++ /var/tmp/diff_new_pack.AqwmvN/_new 2011-01-07 09:35:04.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libimobiledevice (Version 1.0.3) +# spec file for package libimobiledevice (Version 1.0.4) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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: libimobiledevice %define _name libimobiledevice1 -Version: 1.0.3 +Version: 1.0.4 Release: 1 License: LGPL v2 or later BuildRequires: gcc-c++ glib2-devel libtasn1-devel libxml2-devel sed @@ -36,6 +36,7 @@ %endif BuildRequires: libgcrypt-devel libgnutls-devel Source: %{name}-%{version}.tar.bz2 +Patch0: 0b40ddb1f41c94a3ee58abc6326e59d65662e5c7.patch Group: System/Libraries Summary: Native protocols library for iPhone, iPod Touch and iPad Url: http://www.libimobiledevice.org @@ -101,8 +102,9 @@ Summary: Development files for %{_name} Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} -Requires: libplist-devel >= 0.16 -Requires: libusbmuxd-devel >= 1.0.0 +Requires: libplist-devel +Requires: glib2-devel +Requires: glibc-devel %description devel The %{name}-devel package contains libraries and header files for @@ -204,12 +206,13 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build sed -i -e '/Requires:/d' %{name}-1.0.pc.in sed -i -e 's/-L${libdir}//' %{name}-1.0.pc.in export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure\ +%configure --disable-silent-rules \ --disable-static make %{?jobs:-j%jobs} ++++++ 0b40ddb1f41c94a3ee58abc6326e59d65662e5c7.patch ++++++ From 0b40ddb1f41c94a3ee58abc6326e59d65662e5c7 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Thu, 16 Dec 2010 22:01:15 +0000 Subject: Python: Fix SWIG includes to pass make distcheck --- diff --git a/swig/Makefile.am b/swig/Makefile.am index 0953a56..8c1f2b9 100644 --- a/swig/Makefile.am +++ b/swig/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include $(libplist_CFLAGS) $(SWIG_PYTHON_CPPFLAGS) -I$(oldincludedir) +AM_CPPFLAGS = -I$(top_srcdir)/include $(libglib2_CFLAGS) $(libplist_CFLAGS) $(SWIG_PYTHON_CPPFLAGS) -I$(oldincludedir) if HAVE_SWIG BUILT_SOURCES = imobiledevice_wrap.cxx -- cgit v0.8.3.1-34-gbf3d ++++++ libimobiledevice-1.0.3.tar.bz2 -> libimobiledevice-1.0.4.tar.bz2 ++++++ ++++ 6386 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/configure.ac new/libimobiledevice-1.0.4/configure.ac --- old/libimobiledevice-1.0.3/configure.ac 2010-10-04 16:27:36.000000000 +0200 +++ new/libimobiledevice-1.0.4/configure.ac 2010-11-27 19:34:30.000000000 +0100 @@ -2,30 +2,26 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(libimobiledevice, 1.0.3, nospam(a)nowhere.com) +AC_INIT(libimobiledevice, 1.0.4, nospam(a)nowhere.com) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_CONFIG_SRCDIR([src/]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_PATH_PYTHON(2.3) -AC_PROG_SWIG(1.3.21) -AX_SWIG_ENABLE_CXX -SWIG_PYTHON - dnl libtool versioning # +1 : 0 : +1 == adds new functions to the interface # +1 : 0 : 0 == changes or removes functions (changes include both # changes to the signature and the semantic) # ? :+1 : ? == just internal changes # CURRENT : REVISION : AGE -LIBIMOBILEDEVICE_SO_VERSION=1:3:0 +LIBIMOBILEDEVICE_SO_VERSION=1:4:0 AC_SUBST(LIBIMOBILEDEVICE_SO_VERSION) # Checks for programs. AC_PROG_CC +AC_PROG_CXX AM_PROG_CC_C_O AC_PROG_LIBTOOL @@ -37,7 +33,7 @@ PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1) PKG_CHECK_MODULES(libplist, libplist >= 0.15) PKG_CHECK_MODULES(libplistmm, libplist++ >= 0.15) -AC_CHECK_LIB(gcrypt, gcry_control, [AC_SUBST(libgcrypt_LIBS,[-lgcrypt])], ["libgcrypt is required to build libimobiledevice"]) +AC_CHECK_LIB(gcrypt, gcry_control, [AC_SUBST(libgcrypt_LIBS,[-lgcrypt])], [AC_MSG_ERROR([libgcrypt is required to build libimobiledevice])]) # Checks for header files. AC_HEADER_STDC @@ -63,6 +59,10 @@ [build_swig=false], [build_swig=true]) if test "$build_swig" = "true" -a "$SWIG" != "false" ; then + AM_PATH_PYTHON(2.3) + AC_PROG_SWIG(1.3.21) + AX_SWIG_ENABLE_CXX + SWIG_PYTHON SWIG_SUB=swig else SWIG_SUB= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/annotated.html new/libimobiledevice-1.0.4/docs/html/annotated.html --- old/libimobiledevice-1.0.3/docs/html/annotated.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/annotated.html 2010-11-27 19:58:07.000000000 +0100 @@ -46,7 +46,7 @@ <tr><td class="indexkey"><a class="el" href="structssl__data__private.html">ssl_data_t</a></td><td class="indexvalue"></td></tr> </table> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/classes.html new/libimobiledevice-1.0.4/docs/html/classes.html --- old/libimobiledevice-1.0.3/docs/html/classes.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/classes.html 2010-11-27 19:58:07.000000000 +0100 @@ -37,7 +37,7 @@ </td><td><a name="letter_P"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  P  </div></td></tr></table> </td><td><a class="el" href="structssl__data__private.html">ssl_data_private</a>   </td></tr><tr><td><a class="el" href="structdevice__link__service__client__private.html">device_link_service_client_private</a>   </td><td><a class="el" href="structidevice__private.html">idevice_private</a>   </td><td><a class="el" href="structmobile__image__mounter__client__private.html">mobile_image_mounter_client_private</a>   </td></tr></table><div class="qindex"><a class="qindex" href="#letter_A">A</a> | <a class="qindex" href="#letter_D">D</a> | <a class="qindex" href="#letter_F">F</a> | <a class="qindex" href="#letter_I">I</a> | <a class="qindex" href="#letter_L">L</a> | <a class="qindex" href="#letter_M">M</a> | <a class="qindex" href="#letter_N">N</a> | <a class="qindex" href="#letter_P">P</a> | <a class="qindex" href="#letter_S">S</a></div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/files.html new/libimobiledevice-1.0.4/docs/html/files.html --- old/libimobiledevice-1.0.3/docs/html/files.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/files.html 2010-11-27 19:58:08.000000000 +0100 @@ -38,7 +38,7 @@ <tr><td class="indexkey">libimobiledevice/<a class="el" href="include_2libimobiledevice_2screenshotr_8h.html">screenshotr.h</a></td><td class="indexvalue">Screenshot service implementation </td></tr> </table> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:08 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/functions.html new/libimobiledevice-1.0.4/docs/html/functions.html --- old/libimobiledevice-1.0.3/docs/html/functions.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/functions.html 2010-11-27 19:58:07.000000000 +0100 @@ -54,7 +54,7 @@ </li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/functions_vars.html new/libimobiledevice-1.0.4/docs/html/functions_vars.html --- old/libimobiledevice-1.0.3/docs/html/functions_vars.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/functions_vars.html 2010-11-27 19:58:07.000000000 +0100 @@ -54,7 +54,7 @@ </li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/globals_enum.html new/libimobiledevice-1.0.4/docs/html/globals_enum.html --- old/libimobiledevice-1.0.3/docs/html/globals_enum.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/globals_enum.html 2010-11-27 19:58:08.000000000 +0100 @@ -48,7 +48,7 @@ </li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:08 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/globals_eval.html new/libimobiledevice-1.0.4/docs/html/globals_eval.html --- old/libimobiledevice-1.0.3/docs/html/globals_eval.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/globals_eval.html 2010-11-27 19:58:08.000000000 +0100 @@ -63,7 +63,7 @@ </li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:08 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/globals_func.html new/libimobiledevice-1.0.4/docs/html/globals_func.html --- old/libimobiledevice-1.0.3/docs/html/globals_func.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/globals_func.html 2010-11-27 19:58:08.000000000 +0100 @@ -379,7 +379,7 @@ </li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:08 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/globals.html new/libimobiledevice-1.0.4/docs/html/globals.html --- old/libimobiledevice-1.0.3/docs/html/globals.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/globals.html 2010-11-27 19:58:08.000000000 +0100 @@ -496,7 +496,7 @@ </li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:08 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/globals_type.html new/libimobiledevice-1.0.4/docs/html/globals_type.html --- old/libimobiledevice-1.0.3/docs/html/globals_type.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/globals_type.html 2010-11-27 19:58:08.000000000 +0100 @@ -114,7 +114,7 @@ </li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:08 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2afc_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2afc_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2afc_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2afc_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -1155,7 +1155,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2file__relay_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2file__relay_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2file__relay_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2file__relay_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -220,7 +220,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2installation__proxy_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2installation__proxy_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2installation__proxy_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2installation__proxy_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -684,7 +684,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2lockdown_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2lockdown_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2lockdown_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2lockdown_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -1013,7 +1013,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2mobilebackup_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2mobilebackup_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2mobilebackup_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2mobilebackup_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -363,7 +363,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2mobile__image__mounter_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2mobile__image__mounter_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2mobile__image__mounter_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2mobile__image__mounter_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -304,7 +304,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2mobilesync_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2mobilesync_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2mobilesync_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2mobilesync_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -225,7 +225,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2notification__proxy_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2notification__proxy_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2notification__proxy_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2notification__proxy_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -396,7 +396,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2sbservices_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2sbservices_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2sbservices_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2sbservices_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -289,7 +289,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2screenshotr_8h.html new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2screenshotr_8h.html --- old/libimobiledevice-1.0.3/docs/html/include_2libimobiledevice_2screenshotr_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/include_2libimobiledevice_2screenshotr_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -208,7 +208,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/index.html new/libimobiledevice-1.0.4/docs/html/index.html --- old/libimobiledevice-1.0.3/docs/html/index.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/index.html 2010-11-27 19:58:06.000000000 +0100 @@ -18,8 +18,8 @@ </div> </div> <div class="contents"> -<h1>libimobiledevice Documentation</h1><h3 class="version">1.0.3 </h3></div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<h1>libimobiledevice Documentation</h1><h3 class="version">1.0.4 </h3></div> +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:06 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/libimobiledevice_8h.html new/libimobiledevice-1.0.4/docs/html/libimobiledevice_8h.html --- old/libimobiledevice-1.0.3/docs/html/libimobiledevice_8h.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/libimobiledevice_8h.html 2010-11-27 19:58:07.000000000 +0100 @@ -639,7 +639,7 @@ </div> </div> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structafc__client__private.html new/libimobiledevice-1.0.4/docs/html/structafc__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structafc__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structafc__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -41,7 +41,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/afc.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/struct_a_f_c_file_packet.html new/libimobiledevice-1.0.4/docs/html/struct_a_f_c_file_packet.html --- old/libimobiledevice-1.0.3/docs/html/struct_a_f_c_file_packet.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/struct_a_f_c_file_packet.html 2010-11-27 19:58:07.000000000 +0100 @@ -35,7 +35,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/afc.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/struct_a_f_c_packet.html new/libimobiledevice-1.0.4/docs/html/struct_a_f_c_packet.html --- old/libimobiledevice-1.0.3/docs/html/struct_a_f_c_packet.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/struct_a_f_c_packet.html 2010-11-27 19:58:07.000000000 +0100 @@ -41,7 +41,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/afc.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structdevice__link__service__client__private.html new/libimobiledevice-1.0.4/docs/html/structdevice__link__service__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structdevice__link__service__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structdevice__link__service__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -33,7 +33,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/device_link_service.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structfile__relay__client__private.html new/libimobiledevice-1.0.4/docs/html/structfile__relay__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structfile__relay__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structfile__relay__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -33,7 +33,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/file_relay.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structidevice__connection__private.html new/libimobiledevice-1.0.4/docs/html/structidevice__connection__private.html --- old/libimobiledevice-1.0.3/docs/html/structidevice__connection__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structidevice__connection__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -37,7 +37,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/idevice.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structidevice__event__t.html new/libimobiledevice-1.0.4/docs/html/structidevice__event__t.html --- old/libimobiledevice-1.0.3/docs/html/structidevice__event__t.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structidevice__event__t.html 2010-11-27 19:58:07.000000000 +0100 @@ -89,7 +89,7 @@ <li>libimobiledevice/<a class="el" href="libimobiledevice_8h.html">libimobiledevice.h</a></li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structidevice__private.html new/libimobiledevice-1.0.4/docs/html/structidevice__private.html --- old/libimobiledevice-1.0.3/docs/html/structidevice__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structidevice__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -37,7 +37,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/idevice.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structinstproxy__client__private.html new/libimobiledevice-1.0.4/docs/html/structinstproxy__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structinstproxy__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structinstproxy__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -37,7 +37,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/installation_proxy.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structlockdownd__client__private.html new/libimobiledevice-1.0.4/docs/html/structlockdownd__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structlockdownd__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structlockdownd__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -41,7 +41,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/lockdown.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structlockdownd__pair__record.html new/libimobiledevice-1.0.4/docs/html/structlockdownd__pair__record.html --- old/libimobiledevice-1.0.3/docs/html/structlockdownd__pair__record.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structlockdownd__pair__record.html 2010-11-27 19:58:07.000000000 +0100 @@ -48,7 +48,7 @@ <li>libimobiledevice/<a class="el" href="include_2libimobiledevice_2lockdown_8h.html">lockdown.h</a></li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structmobilebackup__client__private.html new/libimobiledevice-1.0.4/docs/html/structmobilebackup__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structmobilebackup__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structmobilebackup__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -33,7 +33,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/mobilebackup.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structmobile__image__mounter__client__private.html new/libimobiledevice-1.0.4/docs/html/structmobile__image__mounter__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structmobile__image__mounter__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structmobile__image__mounter__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -35,7 +35,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/mobile_image_mounter.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structmobilesync__client__private.html new/libimobiledevice-1.0.4/docs/html/structmobilesync__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structmobilesync__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structmobilesync__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -33,7 +33,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/mobilesync.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structnp__client__private.html new/libimobiledevice-1.0.4/docs/html/structnp__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structnp__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structnp__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -37,7 +37,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/notification_proxy.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structproperty__list__service__client__private.html new/libimobiledevice-1.0.4/docs/html/structproperty__list__service__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structproperty__list__service__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structproperty__list__service__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -33,7 +33,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/property_list_service.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structsbservices__client__private.html new/libimobiledevice-1.0.4/docs/html/structsbservices__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structsbservices__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structsbservices__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -35,7 +35,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/sbservices.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structscreenshotr__client__private.html new/libimobiledevice-1.0.4/docs/html/structscreenshotr__client__private.html --- old/libimobiledevice-1.0.3/docs/html/structscreenshotr__client__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structscreenshotr__client__private.html 2010-11-27 19:58:07.000000000 +0100 @@ -33,7 +33,7 @@ <li>/home/mszulecki/Software/code/libimobiledevice/src/screenshotr.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:07 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/html/structssl__data__private.html new/libimobiledevice-1.0.4/docs/html/structssl__data__private.html --- old/libimobiledevice-1.0.3/docs/html/structssl__data__private.html 2010-10-04 16:38:48.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/html/structssl__data__private.html 2010-11-27 19:58:08.000000000 +0100 @@ -30,12 +30,20 @@ gnutls_certificate_credentials_t </td><td class="memItemRight" valign="bottom"><b>certificate</b></td></tr> <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7566a02e033c87a7e4f90f8253f2d002"></a> gnutls_session_t </td><td class="memItemRight" valign="bottom"><b>session</b></td></tr> +<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0527a21cfbe7af803bac276dd036a464"></a> +gnutls_x509_privkey_t </td><td class="memItemRight" valign="bottom"><b>root_privkey</b></td></tr> +<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adfc59e4ce101738957ece01cbe757701"></a> +gnutls_x509_crt_t </td><td class="memItemRight" valign="bottom"><b>root_cert</b></td></tr> +<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae25fa607e69661e59a28fe449541dab2"></a> +gnutls_x509_privkey_t </td><td class="memItemRight" valign="bottom"><b>host_privkey</b></td></tr> +<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a819f864bef54ced28eb6bd1244c2eeb2"></a> +gnutls_x509_crt_t </td><td class="memItemRight" valign="bottom"><b>host_cert</b></td></tr> </table> <hr/>The documentation for this struct was generated from the following file:<ul> <li>/home/mszulecki/Software/code/libimobiledevice/src/idevice.h</li> </ul> </div> -<hr class="footer"/><address style="text-align: right;"><small>Generated on Mon Oct 4 16:38:48 2010 for libimobiledevice by  +<hr class="footer"/><address style="text-align: right;"><small>Generated on Sat Nov 27 19:58:08 2010 for libimobiledevice by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.3 </small></address> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/docs/Makefile new/libimobiledevice-1.0.4/docs/Makefile --- old/libimobiledevice-1.0.3/docs/Makefile 2010-10-04 16:38:46.000000000 +0200 +++ new/libimobiledevice-1.0.4/docs/Makefile 2010-11-27 19:58:05.000000000 +0100 @@ -123,7 +123,7 @@ LD = /usr/i586-suse-linux/bin/ld LDFLAGS = LFS_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -LIBIMOBILEDEVICE_SO_VERSION = 1:3:0 +LIBIMOBILEDEVICE_SO_VERSION = 1:4:0 LIBOBJS = LIBS = LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -141,10 +141,10 @@ PACKAGE = libimobiledevice PACKAGE_BUGREPORT = nospam(a)nowhere.com PACKAGE_NAME = libimobiledevice -PACKAGE_STRING = libimobiledevice 1.0.3 +PACKAGE_STRING = libimobiledevice 1.0.4 PACKAGE_TARNAME = libimobiledevice PACKAGE_URL = -PACKAGE_VERSION = 1.0.3 +PACKAGE_VERSION = 1.0.4 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PYTHON = /usr/bin/python @@ -166,7 +166,7 @@ SWIG_LIB = /usr/share/swig/1.3.40 SWIG_PYTHON_CPPFLAGS = -I/usr/include/python2.6 SWIG_PYTHON_OPT = -python -VERSION = 1.0.3 +VERSION = 1.0.4 abs_builddir = /home/mszulecki/Software/code/libimobiledevice/docs abs_srcdir = /home/mszulecki/Software/code/libimobiledevice/docs abs_top_builddir = /home/mszulecki/Software/code/libimobiledevice @@ -226,7 +226,7 @@ pdfdir = ${docdir} pkgpyexecdir = ${pyexecdir}/libimobiledevice pkgpythondir = ${pythondir}/libimobiledevice -prefix = /usr/local +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} pyexecdir = ${exec_prefix}/lib/python2.6/site-packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/NEWS new/libimobiledevice-1.0.4/NEWS --- old/libimobiledevice-1.0.3/NEWS 2010-10-04 14:59:40.000000000 +0200 +++ new/libimobiledevice-1.0.4/NEWS 2010-11-27 20:00:40.000000000 +0100 @@ -1,3 +1,14 @@ +Version 1.0.4 +~~~~~~~~~~~~~ + +* Maintenance release of stable series +* Changes: + - Fix a possible crash in lockdownd_client_new_with_handshake() + - Do not not check for Swig/Python if --without-swig is set + - Fail with an error message if libgcrypt is not found + - Pass host certificate with GNUTLS correctly + - Fix connecting to iOS 4.2.1+ devices + Version 1.0.3 ~~~~~~~~~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/src/idevice.c new/libimobiledevice-1.0.4/src/idevice.c --- old/libimobiledevice-1.0.3/src/idevice.c 2010-06-20 17:02:07.000000000 +0200 +++ new/libimobiledevice-1.0.4/src/idevice.c 2010-11-27 19:34:41.000000000 +0100 @@ -27,6 +27,7 @@ #include <usbmuxd.h> #include <gnutls/gnutls.h> #include "idevice.h" +#include "userpref.h" #include "debug.h" static idevice_event_cb_t event_cb = NULL; @@ -444,7 +445,7 @@ */ idevice_error_t idevice_get_uuid(idevice_t device, char **uuid) { - if (!device) + if (!device || !uuid) return IDEVICE_E_INVALID_ARG; *uuid = strdup(device->uuid); @@ -523,6 +524,40 @@ if (ssl_data->certificate) { gnutls_certificate_free_credentials(ssl_data->certificate); } + if (ssl_data->root_cert) { + gnutls_x509_crt_deinit(ssl_data->root_cert); + } + if (ssl_data->host_cert) { + gnutls_x509_crt_deinit(ssl_data->host_cert); + } + if (ssl_data->root_privkey) { + gnutls_x509_privkey_deinit(ssl_data->root_privkey); + } + if (ssl_data->host_privkey) { + gnutls_x509_privkey_deinit(ssl_data->host_privkey); + } +} + +/** + * Internally used gnutls callback function that gets called during handshake. + */ +static int internal_cert_callback (gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr_st * st) +{ + int res = -1; + gnutls_certificate_type_t type = gnutls_certificate_type_get (session); + if (type == GNUTLS_CRT_X509) { + ssl_data_t ssl_data = (ssl_data_t)gnutls_session_get_ptr (session); + if (ssl_data && ssl_data->host_privkey && ssl_data->host_cert) { + debug_info("Passing certificate"); + st->type = type; + st->ncerts = 1; + st->cert.x509 = &ssl_data->host_cert; + st->key.x509 = ssl_data->host_privkey; + st->deinit_all = 0; + res = 0; + } + } + return res; } /** @@ -549,7 +584,7 @@ errno = 0; gnutls_global_init(); gnutls_certificate_allocate_credentials(&ssl_data_loc->certificate); - gnutls_certificate_set_x509_trust_file(ssl_data_loc->certificate, "hostcert.pem", GNUTLS_X509_FMT_PEM); + gnutls_certificate_client_set_retrieve_function (ssl_data_loc->certificate, internal_cert_callback); gnutls_init(&ssl_data_loc->session, GNUTLS_CLIENT); { int protocol_priority[16] = { GNUTLS_SSL3, 0 }; @@ -564,7 +599,18 @@ gnutls_protocol_set_priority(ssl_data_loc->session, protocol_priority); gnutls_mac_set_priority(ssl_data_loc->session, mac_priority); } - gnutls_credentials_set(ssl_data_loc->session, GNUTLS_CRD_CERTIFICATE, ssl_data_loc->certificate); /* this part is killing me. */ + gnutls_credentials_set(ssl_data_loc->session, GNUTLS_CRD_CERTIFICATE, ssl_data_loc->certificate); + gnutls_session_set_ptr(ssl_data_loc->session, ssl_data_loc); + + gnutls_x509_crt_init(&ssl_data_loc->root_cert); + gnutls_x509_crt_init(&ssl_data_loc->host_cert); + gnutls_x509_privkey_init(&ssl_data_loc->root_privkey); + gnutls_x509_privkey_init(&ssl_data_loc->host_privkey); + + userpref_error_t uerr = userpref_get_keys_and_certs(ssl_data_loc->root_privkey, ssl_data_loc->root_cert, ssl_data_loc->host_privkey, ssl_data_loc->host_cert); + if (uerr != USERPREF_E_SUCCESS) { + debug_info("Error %d when loading keys and certificates! %d", uerr); + } debug_info("GnuTLS step 1..."); gnutls_transport_set_ptr(ssl_data_loc->session, (gnutls_transport_ptr_t)connection); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/src/idevice.h new/libimobiledevice-1.0.4/src/idevice.h --- old/libimobiledevice-1.0.3/src/idevice.h 2010-03-31 22:09:42.000000000 +0200 +++ new/libimobiledevice-1.0.4/src/idevice.h 2010-11-27 15:07:18.000000000 +0100 @@ -22,6 +22,7 @@ #define IDEVICE_H #include <gnutls/gnutls.h> +#include <gnutls/x509.h> #include "libimobiledevice/libimobiledevice.h" @@ -30,8 +31,12 @@ }; struct ssl_data_private { - gnutls_certificate_credentials_t certificate; + gnutls_certificate_credentials_t certificate; gnutls_session_t session; + gnutls_x509_privkey_t root_privkey; + gnutls_x509_crt_t root_cert; + gnutls_x509_privkey_t host_privkey; + gnutls_x509_crt_t host_cert; }; typedef struct ssl_data_private *ssl_data_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libimobiledevice-1.0.3/src/lockdown.c new/libimobiledevice-1.0.4/src/lockdown.c --- old/libimobiledevice-1.0.3/src/lockdown.c 2010-10-04 14:59:18.000000000 +0200 +++ new/libimobiledevice-1.0.4/src/lockdown.c 2010-11-27 19:34:55.000000000 +0100 @@ -666,8 +666,11 @@ char *host_id = NULL; char *type = NULL; - ret = lockdownd_client_new(device, &client_loc, label); + if (LOCKDOWN_E_SUCCESS != ret) { + debug_info("failed to create lockdownd client."); + return ret; + } /* perform handshake */ if (LOCKDOWN_E_SUCCESS != lockdownd_query_type(client_loc, &type)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 coreutils for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package coreutils for openSUSE:Factory checked in at Fri Jan 7 09:34:48 CET 2011. -------- --- coreutils/coreutils.changes 2010-11-17 09:33:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/coreutils/coreutils.changes 2011-01-05 14:31:58.000000000 +0100 @@ -1,0 +2,82 @@ +Wed Jan 5 14:25:16 CET 2011 - pth(a)suse.de + +- Update to 8.9: + Bug fixes + + split no longer creates files with a suffix length that + is dependent on the number of bytes or lines per file. + [bug introduced in coreutils-8.8] + +------------------------------------------------------------------- +Mon Jan 3 19:32:57 CET 2011 - pth(a)suse.de + +- Update to 8.8. Changes since 8.6: + + Bug fixes: + + cp -u no longer does unnecessary copying merely because the source + has finer-grained time stamps than the destination. + + od now prints floating-point numbers without losing information, and + it no longer omits spaces between floating-point columns in some cases. + + sort -u with at least two threads could attempt to read through a + corrupted pointer. [bug introduced in coreutils-8.6] + + sort with at least two threads and with blocked output would busy-loop + (spinlock) all threads, often using 100% of available CPU cycles to + do no work. I.e., "sort < big-file | less" could waste a lot of power. + [bug introduced in coreutils-8.6] + + sort with at least two threads no longer segfaults due to use of pointers + into the stack of an expired thread. [bug introduced in coreutils-8.6] + + sort --compress no longer mishandles subprocesses' exit statuses, + no longer hangs indefinitely due to a bug in waiting for subprocesses, + and no longer generates many more than NMERGE subprocesses. + + sort -m -o f f ... f no longer dumps core when file descriptors are limited. + + csplit no longer corrupts heap when writing more than 999 files, + nor does it leak memory for every chunk of input processed + [the bugs were present in the initial implementation] + + tail -F once again notices changes in a currently unavailable + remote directory [bug introduced in coreutils-7.5] + + Changes in behavior: + + sort will not create more than 8 threads by default due to diminishing + performance gains. Also the --parallel option is no longer restricted + to the number of available processors. + + cp --attributes-only now completely overrides --reflink. + Previously a reflink was needlessly attempted. + + stat's %X, %Y, and %Z directives once again print only the integer + part of seconds since the epoch. This reverts a change from + coreutils-8.6, that was deemed unnecessarily disruptive. + To obtain a nanosecond-precision time stamp for %X use %.X; + if you want (say) just 3 fractional digits, use %.3X. + Likewise for %Y and %Z. + + stat's new %W format directive would print floating point seconds. + However, with the above change to %X, %Y and %Z, we've made %W work + the same way as the others. + + New features: + + split accepts the --number option to generate a specific number of files. + +- Add a complete german translation. +- Add upstreams patch for suffix calculation in split. + +------------------------------------------------------------------- +Wed Dec 22 15:53:13 UTC 2010 - pth(a)novell.com + +- Use software services. +- Remove coreutils tarball. +- Don't use version specific patches as it breaks automatic + updates. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- coreutils-8.6.patch coreutils-8.6.tar.xz New: ---- coreutils-8.9.de.po coreutils-misc.patch coreutils-split_suffix.patch _service _service:download_url:coreutils-8.9.tar.xz _service:set_version:coreutils.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.BuQCjK/_old 2011-01-07 09:30:18.000000000 +0100 +++ /var/tmp/diff_new_pack.BuQCjK/_new 2011-01-07 09:30:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package coreutils (Version 8.6) +# spec file for package coreutils (Version 8.9) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,8 @@ Url: http://www.gnu.org/software/coreutils/ License: GFDLv1.2 ; GPLv2+ ; GPLv3+ Group: System/Base -Version: 8.6 -Release: 2 +Version: 8.9 +Release: 1 Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version} Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 @@ -36,7 +36,8 @@ Source1: su.pamd Source2: su.default Source3: baselibs.conf -Patch0: coreutils-%{version}.patch +Source4: coreutils-8.9.de.po +Patch0: coreutils-misc.patch Patch1: coreutils-no_hostname_and_hostid.patch Patch2: coreutils-gl_printf_safe.patch Patch4: coreutils-8.6-i18n.patch @@ -83,8 +84,8 @@ %patch2 %patch8 %patch16 -%patch20 -p1 -%patch21 -p1 +%patch20 +%patch21 %patch22 -p1 %patch23 -p1 %patch24 -p1 @@ -93,6 +94,7 @@ %patch30 -p1 %patch31 %patch32 +cp %{S:4} po/de.po %build AUTOPOINT=true autoreconf -fi @@ -102,20 +104,9 @@ gl_cv_func_printf_directive_n=yes \ gl_cv_func_isnanl_works=yes \ DEFAULT_POSIX2_VERSION=199209 +make -C po update-po make %{?_smp_mflags} V=1 -#%check -#if test $EUID -eq 0; then -# su nobody -c make %{?_smp_mflags} check VERBOSE=yes V=1 -# make %{?_smp_mflags} check-root VERBOSE=yes V=1 -#else -#%ifarch %arm -# make -k %{?_smp_mflags} check VERBOSE=yes V=1 || echo make check failed -#%else -# make %{?_smp_mflags} check VERBOSE=yes V=1 -#%endif -#fi - %install %makeinstall test -f $RPM_BUILD_ROOT%{_bindir}/su || \ ++++++ _service:set_version:coreutils.spec ++++++ # # spec file for package coreutils (Version 8.9) # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: coreutils Summary: GNU Core Utilities BuildRequires: help2man libacl-devel libcap-devel libselinux-devel pam-devel xz Url: http://www.gnu.org/software/coreutils/ License: GFDLv1.2 ; GPLv2+ ; GPLv3+ Group: System/Base Version: 8.9 Release: 1 Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version} Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 AutoReqProv: on PreReq: %{install_info_prereq} Recommends: %{name}-lang = %version Requires: pam >= 1.1.1.90 Source: coreutils-%{version}.tar.xz Source1: su.pamd Source2: su.default Source3: baselibs.conf Source4: coreutils-8.9.de.po Patch0: coreutils-misc.patch Patch1: coreutils-no_hostname_and_hostid.patch Patch2: coreutils-gl_printf_safe.patch Patch4: coreutils-8.6-i18n.patch Patch5: coreutils-i18n-uninit.patch Patch6: coreutils-i18n-infloop.patch Patch8: coreutils-sysinfo.patch Patch16: coreutils-invalid-ids.patch Patch20: coreutils-8.6-pam-support-for-su.diff Patch21: coreutils-8.6-update-man-page-for-pam.diff Patch22: coreutils-8.6-log-all-su-attempts.diff Patch23: coreutils-8.6-set-sane-default-path.diff Patch24: coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # Patch30: coreutils-8.6-compile-su-with-fpie.diff Patch31: coreutils-getaddrinfo.patch Patch32: coreutils-ptr_int_casts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # this will create a cycle, broken up randomly - coreutils is just too core to have other # prerequires #PreReq: permissions %description Basic file, shell, and text manipulation utilities. The package contains the following programs: [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold groups head id install join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split stat stty su sum sync tac tail tee test timeout touch tr true tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes %lang_package %prep %setup -q %patch4 %patch5 %patch6 %patch0 %patch1 %patch2 %patch8 %patch16 %patch20 %patch21 %patch22 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 # %patch30 -p1 %patch31 %patch32 cp %{S:4} po/de.po %build AUTOPOINT=true autoreconf -fi export CFLAGS="%optflags -Wall" %configure --without-included-regex \ --enable-install-program=arch,su \ gl_cv_func_printf_directive_n=yes \ gl_cv_func_isnanl_works=yes \ DEFAULT_POSIX2_VERSION=199209 make -C po update-po make %{?_smp_mflags} V=1 %install %makeinstall test -f $RPM_BUILD_ROOT%{_bindir}/su || \ install src/su $RPM_BUILD_ROOT%{_bindir}/su install -d $RPM_BUILD_ROOT/bin for i in arch basename cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat stty su sync touch true uname readlink md5sum do mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT/bin/$i test $i = su && echo -n '%%attr(4755,root,root) ' echo /bin/$i done > bin.files ln -sf ../../bin/{basename,sort,stat,touch,readlink,md5sum} $RPM_BUILD_ROOT%{_bindir} install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d install -m 644 $RPM_SOURCE_DIR/su.pamd $RPM_BUILD_ROOT/etc/pam.d/su install -m 644 $RPM_SOURCE_DIR/su.pamd $RPM_BUILD_ROOT/etc/pam.d/su-l install -d -m 755 $RPM_BUILD_ROOT/etc/default install -m 644 $RPM_SOURCE_DIR/su.default $RPM_BUILD_ROOT/etc/default/su echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1 %find_lang %name %post %install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz # may fail if permissions is not there, but there is no way around that %run_permissions %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz %verifyscript %verify_permissions -e /bin/su %clean rm -rf $RPM_BUILD_ROOT %files -f bin.files %defattr(-,root,root) %doc README NEWS %config /etc/pam.d/su %config /etc/pam.d/su-l %config(noreplace) /etc/default/su %{_bindir}/* %{_libdir}/%{name} %doc %{_infodir}/coreutils.info*.gz %doc %{_mandir}/man1/*.1.gz %dir %{_prefix}/share/locale/*/LC_TIME %files lang -f %name.lang %defattr(-,root,root) %changelog ++++++ coreutils-8.6-i18n.patch ++++++ --- /var/tmp/diff_new_pack.BuQCjK/_old 2011-01-07 09:30:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BuQCjK/_new 2011-01-07 09:30:19.000000000 +0100 @@ -19,8 +19,8 @@ Index: lib/linebuffer.h =================================================================== ---- lib/linebuffer.h.orig 2010-06-10 18:45:26.000000000 +0200 -+++ lib/linebuffer.h 2010-11-11 16:26:25.524211797 +0100 +--- lib/linebuffer.h.orig 2011-01-01 22:19:27.000000000 +0100 ++++ lib/linebuffer.h 2011-01-05 14:05:49.026494005 +0100 @@ -21,6 +21,11 @@ # include <stdio.h> @@ -45,8 +45,8 @@ /* Initialize linebuffer LINEBUFFER for use. */ Index: src/cut.c =================================================================== ---- src/cut.c.orig 2010-10-11 19:35:11.000000000 +0200 -+++ src/cut.c 2010-11-11 16:28:46.581137538 +0100 +--- src/cut.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/cut.c 2011-01-05 14:05:49.027494034 +0100 @@ -28,6 +28,11 @@ #include <assert.h> #include <getopt.h> @@ -639,8 +639,8 @@ if (optind == argc) Index: src/expand.c =================================================================== ---- src/expand.c.orig 2010-10-11 19:35:11.000000000 +0200 -+++ src/expand.c 2010-11-11 16:26:25.580221695 +0100 +--- src/expand.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/expand.c 2011-01-05 14:05:49.091495874 +0100 @@ -38,12 +38,29 @@ #include <stdio.h> #include <getopt.h> @@ -830,8 +830,8 @@ error (EXIT_FAILURE, errno, "-"); Index: src/fold.c =================================================================== ---- src/fold.c.orig 2010-10-11 19:35:11.000000000 +0200 -+++ src/fold.c 2010-11-11 16:27:26.402969548 +0100 +--- src/fold.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/fold.c 2011-01-05 14:05:49.116496593 +0100 @@ -22,12 +22,34 @@ #include <getopt.h> #include <sys/types.h> @@ -961,7 +961,7 @@ - return false; - } - fadvise (stdin, FADVISE_SEQUENTIAL); + fadvise (istream, FADVISE_SEQUENTIAL); @@ -171,6 +199,15 @@ fold_file (char const *filename, size_t bool found_blank = false; @@ -1232,8 +1232,8 @@ case 's': /* Break at word boundaries. */ Index: src/join.c =================================================================== ---- src/join.c.orig 2010-10-11 19:35:11.000000000 +0200 -+++ src/join.c 2010-11-11 16:29:37.838194915 +0100 +--- src/join.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/join.c 2011-01-05 14:05:49.157497772 +0100 @@ -22,18 +22,32 @@ #include <sys/types.h> #include <getopt.h> @@ -1718,8 +1718,8 @@ case NOCHECK_ORDER_OPTION: Index: src/pr.c =================================================================== ---- src/pr.c.orig 2010-10-11 19:35:11.000000000 +0200 -+++ src/pr.c 2010-11-11 16:26:25.640232300 +0100 +--- src/pr.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/pr.c 2011-01-05 14:05:49.170498145 +0100 @@ -312,6 +312,32 @@ #include <getopt.h> @@ -2444,8 +2444,8 @@ Index: src/sort.c =================================================================== ---- src/sort.c.orig 2010-10-14 11:39:14.000000000 +0200 -+++ src/sort.c 2010-11-11 16:26:54.553341480 +0100 +--- src/sort.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/sort.c 2011-01-05 14:05:49.184498547 +0100 @@ -22,11 +22,20 @@ #include <config.h> @@ -2467,7 +2467,7 @@ #include "system.h" #include "argmatch.h" #include "error.h" -@@ -159,12 +168,34 @@ static int thousands_sep; +@@ -163,12 +172,34 @@ static int thousands_sep; /* Nonzero if the corresponding locales are hard. */ static bool hard_LC_COLLATE; @@ -2503,7 +2503,7 @@ /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -328,13 +359,11 @@ static bool reverse; +@@ -335,13 +366,11 @@ static bool reverse; they were read if all keys compare equal. */ static bool stable; @@ -2520,8 +2520,8 @@ /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -782,6 +811,46 @@ reap_some (void) - update_proc (pid); +@@ -775,6 +804,46 @@ reap_all (void) + reap (-1); } +/* Function pointers. */ @@ -2567,7 +2567,7 @@ /* Clean up any remaining temporary files. */ static void -@@ -1205,7 +1274,7 @@ zaptemp (char const *name) +@@ -1207,7 +1276,7 @@ zaptemp (char const *name) free (node); } @@ -2576,7 +2576,7 @@ static int struct_month_cmp (void const *m1, void const *m2) -@@ -1220,7 +1289,7 @@ struct_month_cmp (void const *m1, void c +@@ -1222,7 +1291,7 @@ struct_month_cmp (void const *m1, void c /* Initialize the character class tables. */ static void @@ -2585,7 +2585,7 @@ { size_t i; -@@ -1232,7 +1301,7 @@ inittables (void) +@@ -1234,7 +1303,7 @@ inittables (void) fold_toupper[i] = toupper (i); } @@ -2594,7 +2594,7 @@ /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -1314,6 +1383,84 @@ specify_nmerge (int oi, char c, char con +@@ -1316,6 +1385,84 @@ specify_nmerge (int oi, char c, char con xstrtol_fatal (e, oi, c, long_options, s); } @@ -2679,7 +2679,7 @@ /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (int oi, char c, char const *s) -@@ -1540,7 +1687,7 @@ buffer_linelim (struct buffer const *buf +@@ -1544,7 +1691,7 @@ buffer_linelim (struct buffer const *buf by KEY in LINE. */ static char * @@ -2688,7 +2688,7 @@ { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -1549,10 +1696,10 @@ begfield (struct line const *line, struc +@@ -1553,10 +1700,10 @@ begfield (struct line const *line, struc /* The leading field separator itself is included in a field when -t is absent. */ @@ -2701,7 +2701,7 @@ ++ptr; if (ptr < lim) ++ptr; -@@ -1578,11 +1725,70 @@ begfield (struct line const *line, struc +@@ -1582,11 +1729,70 @@ begfield (struct line const *line, struc return ptr; } @@ -2773,7 +2773,7 @@ { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -1597,10 +1803,10 @@ limfield (struct line const *line, struc +@@ -1601,10 +1807,10 @@ limfield (struct line const *line, struc `beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first `blank' character after the preceding field. */ @@ -2786,7 +2786,7 @@ ++ptr; if (ptr < lim && (eword || echar)) ++ptr; -@@ -1646,10 +1852,10 @@ limfield (struct line const *line, struc +@@ -1650,10 +1856,10 @@ limfield (struct line const *line, struc */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -2799,7 +2799,7 @@ if (newlim) lim = newlim; } -@@ -1680,6 +1886,130 @@ limfield (struct line const *line, struc +@@ -1684,6 +1890,130 @@ limfield (struct line const *line, struc return ptr; } @@ -2930,7 +2930,7 @@ /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1766,8 +2096,22 @@ fillbuf (struct buffer *buf, FILE *fp, c +@@ -1770,8 +2100,22 @@ fillbuf (struct buffer *buf, FILE *fp, c else { if (key->skipsblanks) @@ -2955,7 +2955,7 @@ line->keybeg = line_start; } } -@@ -1888,7 +2232,7 @@ human_numcompare (char const *a, char co +@@ -1892,7 +2236,7 @@ human_numcompare (char const *a, char co hideously fast. */ static int @@ -2964,7 +2964,7 @@ { while (blanks[to_uchar (*a)]) a++; -@@ -1898,6 +2242,25 @@ numcompare (char const *a, char const *b +@@ -1902,6 +2246,25 @@ numcompare (char const *a, char const *b return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -2990,7 +2990,7 @@ static int general_numcompare (char const *sa, char const *sb) { -@@ -1930,7 +2293,7 @@ general_numcompare (char const *sa, char +@@ -1934,7 +2297,7 @@ general_numcompare (char const *sa, char Return 0 if the name in S is not recognized. */ static int @@ -2999,9 +2999,9 @@ { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -2204,13 +2567,12 @@ debug_key (struct line const *line, stru - { - char saved = *lim; *lim = '\0'; +@@ -2209,13 +2572,12 @@ debug_key (struct line const *line, stru + char saved = *lim; + *lim = '\0'; - while (blanks[to_uchar (*beg)]) - beg++; @@ -3015,7 +3015,7 @@ else if (key->general_numeric) ignore_value (strtold (beg, &tighter_lim)); else if (key->numeric || key->human_numeric) -@@ -2354,7 +2716,7 @@ key_warnings (struct keyfield const *gke +@@ -2359,7 +2721,7 @@ key_warnings (struct keyfield const *gke bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key) && !(key->schar || key->echar); bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ @@ -3024,7 +3024,7 @@ && ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned)) || (!key->skipsblanks && key->schar) || (!key->skipeblanks && key->echar))) -@@ -2412,11 +2774,83 @@ key_warnings (struct keyfield const *gke +@@ -2417,11 +2779,83 @@ key_warnings (struct keyfield const *gke error (0, 0, _("option `-r' only applies to last-resort comparison")); } @@ -3109,7 +3109,7 @@ { struct keyfield *key = keylist; -@@ -2501,7 +2935,7 @@ keycompare (struct line const *a, struct +@@ -2506,7 +2940,7 @@ keycompare (struct line const *a, struct else if (key->human_numeric) diff = human_numcompare (ta, tb); else if (key->month) @@ -3118,7 +3118,7 @@ else if (key->random) diff = compare_random (ta, tlena, tb, tlenb); else if (key->version) -@@ -2617,6 +3051,179 @@ keycompare (struct line const *a, struct +@@ -2622,6 +3056,179 @@ keycompare (struct line const *a, struct return key->reverse ? -diff : diff; } @@ -3298,7 +3298,7 @@ /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -4006,7 +4613,7 @@ main (int argc, char **argv) +@@ -4084,7 +4691,7 @@ main (int argc, char **argv) initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -3307,7 +3307,7 @@ hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -4027,6 +4634,29 @@ main (int argc, char **argv) +@@ -4105,6 +4712,29 @@ main (int argc, char **argv) thousands_sep = -1; } @@ -3337,7 +3337,7 @@ have_read_stdin = false; inittables (); -@@ -4297,13 +4927,34 @@ main (int argc, char **argv) +@@ -4375,13 +5005,34 @@ main (int argc, char **argv) case 't': { @@ -3376,7 +3376,7 @@ else { /* Provoke with `sort -txx'. Complain about -@@ -4314,9 +4965,12 @@ main (int argc, char **argv) +@@ -4392,9 +5043,12 @@ main (int argc, char **argv) quote (optarg)); } } @@ -3393,8 +3393,8 @@ Index: src/unexpand.c =================================================================== ---- src/unexpand.c.orig 2010-10-11 19:35:11.000000000 +0200 -+++ src/unexpand.c 2010-11-11 16:26:25.692241489 +0100 +--- src/unexpand.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/unexpand.c 2011-01-05 14:05:49.249500416 +0100 @@ -39,12 +39,29 @@ #include <stdio.h> #include <getopt.h> @@ -3650,8 +3650,8 @@ error (EXIT_FAILURE, errno, "-"); Index: src/uniq.c =================================================================== ---- src/uniq.c.orig 2010-10-11 19:35:11.000000000 +0200 -+++ src/uniq.c 2010-11-11 16:29:55.653342929 +0100 +--- src/uniq.c.orig 2011-01-01 22:19:23.000000000 +0100 ++++ src/uniq.c 2011-01-05 14:05:49.291501624 +0100 @@ -21,6 +21,16 @@ #include <getopt.h> #include <sys/types.h> @@ -4021,9 +4021,9 @@ check_chars = SIZE_MAX; Index: tests/Makefile.am =================================================================== ---- tests/Makefile.am.orig 2010-10-12 13:13:20.000000000 +0200 -+++ tests/Makefile.am 2010-11-11 16:26:25.772255629 +0100 -@@ -230,6 +230,7 @@ TESTS = \ +--- tests/Makefile.am.orig 2010-12-17 07:35:51.000000000 +0100 ++++ tests/Makefile.am 2011-01-05 14:05:49.316502343 +0100 +@@ -234,6 +234,7 @@ TESTS = \ misc/sort-debug-keys \ misc/sort-debug-warn \ misc/sort-files0-from \ @@ -4031,7 +4031,7 @@ misc/sort-float \ misc/sort-merge \ misc/sort-merge-fdlimit \ -@@ -486,6 +487,10 @@ TESTS = \ +@@ -498,6 +499,10 @@ TESTS = \ $(root_tests) pr_data = \ @@ -4044,8 +4044,8 @@ pr/0FFnt \ Index: tests/misc/cut =================================================================== ---- tests/misc/cut.orig 2010-10-11 19:35:11.000000000 +0200 -+++ tests/misc/cut 2010-11-11 16:26:25.796259871 +0100 +--- tests/misc/cut.orig 2011-01-01 22:19:23.000000000 +0100 ++++ tests/misc/cut 2011-01-05 14:06:41.365998730 +0100 @@ -26,7 +26,7 @@ use strict; my $prog = 'cut'; my $try = "Try \`$prog --help' for more information.\n"; @@ -4055,7 +4055,7 @@ my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; my @Tests = -@@ -141,7 +141,7 @@ my @Tests = +@@ -143,7 +143,7 @@ my @Tests = # None of the following invalid ranges provoked an error up to coreutils-6.9. ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1}, @@ -4063,11 +4063,11 @@ + {ERR=>"$prog: invalid byte, character or field list\n$try"}], ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], - ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], + ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, Index: tests/misc/mb1.I =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb1.I 2010-11-11 16:26:25.828265527 +0100 ++++ tests/misc/mb1.I 2011-01-05 14:05:49.384504297 +0100 @@ -0,0 +1,4 @@ +Apple＠10 +Banana＠5 @@ -4076,7 +4076,7 @@ Index: tests/misc/mb1.X =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb1.X 2010-11-11 16:26:25.860271180 +0100 ++++ tests/misc/mb1.X 2011-01-05 14:05:49.425505477 +0100 @@ -0,0 +1,4 @@ +Banana＠5 +Apple＠10 @@ -4085,7 +4085,7 @@ Index: tests/misc/mb2.I =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb2.I 2010-11-11 16:26:25.896277545 +0100 ++++ tests/misc/mb2.I 2011-01-05 14:05:49.451506224 +0100 @@ -0,0 +1,4 @@ +Apple＠ＡＡ10＠＠20 +Banana＠ＡＡ5＠＠30 @@ -4094,7 +4094,7 @@ Index: tests/misc/mb2.X =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb2.X 2010-11-11 16:26:25.924282493 +0100 ++++ tests/misc/mb2.X 2011-01-05 14:05:49.476506942 +0100 @@ -0,0 +1,4 @@ +Citrus＠ＡＡ20＠＠5 +Cherry＠ＡＡ30＠＠10 @@ -4103,7 +4103,7 @@ Index: tests/misc/sort-mb-tests =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/sort-mb-tests 2010-11-11 16:26:25.952287441 +0100 ++++ tests/misc/sort-mb-tests 2011-01-05 14:05:49.518508150 +0100 @@ -0,0 +1,58 @@ +#! /bin/sh +case $# in ++++++ coreutils-8.6-pam-support-for-su.diff ++++++ --- /var/tmp/diff_new_pack.BuQCjK/_old 2011-01-07 09:30:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BuQCjK/_new 2011-01-07 09:30:19.000000000 +0100 @@ -9,11 +9,11 @@ src/su.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 278 insertions(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 4ac30e8..eacd57f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -135,6 +135,20 @@ fi +Index: configure.ac +=================================================================== +--- configure.ac.orig 2011-01-03 13:27:37.268088087 +0100 ++++ configure.ac 2011-01-03 13:28:05.256895209 +0100 +@@ -134,6 +134,20 @@ fi AC_FUNC_FORK @@ -34,10 +34,10 @@ optional_bin_progs= AC_CHECK_FUNCS([chroot], gl_ADD_PROG([optional_bin_progs], [chroot])) -diff --git a/src/Makefile.am b/src/Makefile.am -index 00c7ff7..bc27274 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig 2011-01-03 13:27:37.268088087 +0100 ++++ src/Makefile.am 2011-01-03 13:28:16.038206110 +0100 @@ -351,8 +351,8 @@ factor_LDADD += $(LIB_GMP) # for getloadavg uptime_LDADD += $(GETLOADAVG_LIBS) @@ -49,10 +49,10 @@ # for various ACL functions copy_LDADD += $(LIB_ACL) -diff --git a/src/su.c b/src/su.c -index f8f5b61..1d3d007 100644 ---- a/src/su.c -+++ b/src/su.c +Index: src/su.c +=================================================================== +--- src/su.c.orig 2011-01-03 13:27:37.268088087 +0100 ++++ src/su.c 2011-01-03 13:28:16.177210120 +0100 @@ -37,6 +37,16 @@ restricts who can su to UID 0 accounts. RMS considers that to be fascist. @@ -106,7 +106,7 @@ static struct option const longopts[] = { {"command", required_argument, NULL, 'c'}, -@@ -200,7 +224,164 @@ log_su (struct passwd const *pw, bool successful) +@@ -200,7 +224,164 @@ log_su (struct passwd const *pw, bool su } #endif @@ -271,7 +271,7 @@ Return true if the user gives the correct password for entry PW, false if not. Return true without asking for a password if run by UID 0 or if PW has an empty password. */ -@@ -208,10 +389,52 @@ log_su (struct passwd const *pw, bool successful) +@@ -208,10 +389,52 @@ log_su (struct passwd const *pw, bool su static bool correct_password (const struct passwd *pw) { @@ -325,7 +325,7 @@ endspent (); if (sp) -@@ -232,6 +455,7 @@ correct_password (const struct passwd *pw) +@@ -232,6 +455,7 @@ correct_password (const struct passwd *p encrypted = crypt (unencrypted, correct); memset (unencrypted, 0, strlen (unencrypted)); return STREQ (encrypted, correct); @@ -333,7 +333,7 @@ } /* Update `environ' for the new shell based on PW, with SHELL being -@@ -274,19 +498,41 @@ modify_environment (const struct passwd *pw, const char *shell) +@@ -274,19 +498,41 @@ modify_environment (const struct passwd } } } @@ -400,6 +400,3 @@ if (simulate_login && chdir (pw->pw_dir) != 0) error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); --- -1.7.1 - ++++++ coreutils-8.6-update-man-page-for-pam.diff ++++++ --- /var/tmp/diff_new_pack.BuQCjK/_old 2011-01-07 09:30:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BuQCjK/_new 2011-01-07 09:30:19.000000000 +0100 @@ -7,11 +7,11 @@ doc/coreutils.texi | 34 +++++----------------------------- 1 files changed, 5 insertions(+), 29 deletions(-) -diff --git a/doc/coreutils.texi b/doc/coreutils.texi -index 4d17ed1..27681da 100644 ---- a/doc/coreutils.texi -+++ b/doc/coreutils.texi -@@ -15172,8 +15172,11 @@ to certain shells, etc.). +Index: doc/coreutils.texi +=================================================================== +--- doc/coreutils.texi.orig 2011-01-05 14:27:40.715232991 +0100 ++++ doc/coreutils.texi 2011-01-05 14:27:41.929267939 +0100 +@@ -15290,8 +15290,11 @@ to certain shells, etc.). @findex syslog @command{su} can optionally be compiled to use @code{syslog} to report failed, and optionally successful, @command{su} attempts. (If the system @@ -25,7 +25,7 @@ The program accepts the following options. Also see @ref{Common options}. -@@ -15254,33 +15257,6 @@ Exit status: +@@ -15372,33 +15375,6 @@ Exit status: the exit status of the subshell otherwise @end display @@ -59,6 +59,3 @@ @node timeout invocation @section @command{timeout}: Run a command with a time limit --- -1.7.1 - ++++++ coreutils-8.9.de.po ++++++ ++++ 12475 lines (skipped) ++++++ coreutils-gl_printf_safe.patch ++++++ --- /var/tmp/diff_new_pack.BuQCjK/_old 2011-01-07 09:30:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BuQCjK/_new 2011-01-07 09:30:19.000000000 +0100 @@ -1,8 +1,8 @@ Index: configure =================================================================== ---- configure.orig 2010-10-15 16:51:34.000000000 +0200 -+++ configure 2010-11-11 15:41:45.854686621 +0100 -@@ -3399,7 +3399,6 @@ as_fn_append ac_func_list " alarm" +--- configure.orig 2011-01-04 12:23:03.000000000 +0100 ++++ configure 2011-01-05 14:27:40.804235553 +0100 +@@ -3423,7 +3423,6 @@ as_fn_append ac_func_list " alarm" as_fn_append ac_header_list " sys/statvfs.h" as_fn_append ac_header_list " sys/select.h" as_fn_append ac_func_list " nl_langinfo" @@ -12,9 +12,9 @@ as_fn_append ac_func_list " readlinkat" Index: m4/gnulib-comp.m4 =================================================================== ---- m4/gnulib-comp.m4.orig 2010-10-06 00:44:51.000000000 +0200 -+++ m4/gnulib-comp.m4 2010-11-11 15:40:57.318112527 +0100 -@@ -1181,7 +1181,6 @@ AC_DEFUN([gl_INIT], +--- m4/gnulib-comp.m4.orig 2011-01-01 22:23:14.000000000 +0100 ++++ m4/gnulib-comp.m4 2011-01-05 14:27:40.806235609 +0100 +@@ -1190,7 +1190,6 @@ AC_DEFUN([gl_INIT], # Code from module printf-frexpl: gl_FUNC_PRINTF_FREXPL # Code from module printf-safe: ++++++ coreutils-i18n-infloop.patch ++++++ --- /var/tmp/diff_new_pack.BuQCjK/_old 2011-01-07 09:30:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BuQCjK/_new 2011-01-07 09:30:19.000000000 +0100 @@ -1,8 +1,8 @@ Index: src/sort.c =================================================================== ---- src/sort.c.orig 2010-11-11 16:30:21.993997426 +0100 -+++ src/sort.c 2010-11-11 16:30:39.685123508 +0100 -@@ -3129,7 +3129,8 @@ keycompare_mb (const struct line *a, con +--- src/sort.c.orig 2011-01-05 14:27:40.227218942 +0100 ++++ src/sort.c 2011-01-05 14:27:40.574228931 +0100 +@@ -3134,7 +3134,8 @@ keycompare_mb (const struct line *a, con if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \ STATE = state_bak; \ if (!ignore) \ ++++++ coreutils-misc.patch ++++++ Index: gnulib-tests/test-isnanl.h =================================================================== --- gnulib-tests/test-isnanl.h.orig 2010-11-27 16:11:07.000000000 +0100 +++ gnulib-tests/test-isnanl.h 2011-01-03 13:26:31.990205613 +0100 @@ -48,7 +48,7 @@ main () /* Quiet NaN. */ ASSERT (isnanl (NaNl ())); -#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT +#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT && 0 /* A bit pattern that is different from a Quiet NaN. With a bit of luck, it's a Signalling NaN. */ { @@ -90,6 +90,7 @@ main () { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) }; ASSERT (isnanl (x.value)); } +#if 0 /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in Intel IA-64 Architecture Software Developer's Manual, Volume 1: @@ -123,6 +124,7 @@ main () ASSERT (isnanl (x.value)); } #endif +#endif return 0; } Index: src/system.h =================================================================== --- src/system.h.orig 2010-07-07 12:08:06.000000000 +0200 +++ src/system.h 2011-01-03 13:26:32.043207142 +0100 @@ -138,7 +138,7 @@ enum # define DEV_BSIZE BBSIZE #endif #ifndef DEV_BSIZE -# define DEV_BSIZE 4096 +# define DEV_BSIZE 512 #endif /* Extract or fake data from a `struct stat'. Index: tests/misc/help-version =================================================================== --- tests/misc/help-version.orig 2010-05-31 10:21:14.000000000 +0200 +++ tests/misc/help-version 2011-01-03 13:26:32.068207863 +0100 @@ -250,6 +250,7 @@ parted_setup () { args="-s $tmp_in mklab for i in $built_programs; do # Skip these. case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac + case $i in df) continue;; esac rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out $bigZ_in $zin $zin2 echo z |gzip > $zin Index: tests/other-fs-tmpdir =================================================================== --- tests/other-fs-tmpdir.orig 2010-01-01 14:06:47.000000000 +0100 +++ tests/other-fs-tmpdir 2011-01-03 13:26:32.109209046 +0100 @@ -43,6 +43,8 @@ for d in $CANDIDATE_TMP_DIRS; do fi done +# Autobuild hack +test -f /bin/uname.bin && other_partition_tmpdir= if test -z "$other_partition_tmpdir"; then skip_test_ \ ++++++ coreutils-no_hostname_and_hostid.patch ++++++ --- /var/tmp/diff_new_pack.BuQCjK/_old 2011-01-07 09:30:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BuQCjK/_new 2011-01-07 09:30:19.000000000 +0100 @@ -1,7 +1,7 @@ Index: doc/coreutils.texi =================================================================== ---- doc/coreutils.texi.orig 2010-11-11 16:30:59.012538722 +0100 -+++ doc/coreutils.texi 2010-11-11 16:31:03.953411789 +0100 +--- doc/coreutils.texi.orig 2011-01-01 22:19:23.000000000 +0100 ++++ doc/coreutils.texi 2011-01-05 14:28:30.410663582 +0100 @@ -65,8 +65,6 @@ * fold: (coreutils)fold invocation. Wrap long input lines. * groups: (coreutils)groups invocation. Print group names a user is in. @@ -29,7 +29,7 @@ * uptime invocation:: Print system uptime and load @command{date}: Print or set system date and time -@@ -13514,8 +13510,6 @@ information. +@@ -13683,8 +13679,6 @@ information. * arch invocation:: Print machine hardware name. * nproc invocation:: Print the number of processors. * uname invocation:: Print system information. @@ -38,7 +38,7 @@ * uptime invocation:: Print system uptime and load. @end menu -@@ -14337,55 +14331,6 @@ Print the kernel version. +@@ -14507,55 +14501,6 @@ Print the kernel version. @exitstatus @@ -96,8 +96,8 @@ Index: man/Makefile.am =================================================================== ---- man/Makefile.am.orig 2010-11-11 16:30:59.012538722 +0100 -+++ man/Makefile.am 2010-11-11 16:31:03.953411789 +0100 +--- man/Makefile.am.orig 2011-01-01 22:19:23.000000000 +0100 ++++ man/Makefile.am 2011-01-05 14:27:40.742233767 +0100 @@ -197,7 +197,7 @@ check-x-vs-1: @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ t=$@-t; \ @@ -109,9 +109,9 @@ rm $$t Index: man/Makefile.in =================================================================== ---- man/Makefile.in.orig 2010-11-11 16:30:59.012538722 +0100 -+++ man/Makefile.in 2010-11-11 16:31:16.511630860 +0100 -@@ -1614,7 +1614,7 @@ check-x-vs-1: +--- man/Makefile.in.orig 2011-01-04 12:23:07.000000000 +0100 ++++ man/Makefile.in 2011-01-05 14:27:40.768234515 +0100 +@@ -1641,7 +1641,7 @@ check-x-vs-1: @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ t=$@-t; \ (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ ++++++ coreutils-split_suffix.patch ++++++ From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P(a)draigBrady.com> Date: Thu, 30 Dec 2010 01:36:59 +0000 Subject: [PATCH] split: fix the suffix length calculation * src/split.c (set_suffix_length): Only auto calculate the suffix length when the number of files is specified. * tests/misc/split-a: Add a case to trigger the bug. * NEWS: Mention the fix. --- NEWS | 6 ++++++ src/split.c | 32 ++++++++++++++++++++------------ tests/misc/split-a | 5 +++++ 3 files changed, 31 insertions(+), 12 deletions(-) --- src/split.c +++ src/split.c @@ -78,6 +78,13 @@ static bool elide_empty_files; input to output, which is much slower, so disabled by default. */ static bool unbuffered; +/* The split mode to use. */ +enum Split_type +{ + type_undef, type_bytes, type_byteslines, type_lines, type_digits, + type_chunk_bytes, type_chunk_lines, type_rr +}; + /* For long options that have no equivalent short option, use a non-character as a pseudo short option, starting with CHAR_MAX + 1. */ enum @@ -105,16 +112,21 @@ static struct option const longopts[] = }; static void -set_suffix_length (uintmax_t n_units) +set_suffix_length (uintmax_t n_units, enum Split_type split_type) { #define DEFAULT_SUFFIX_LENGTH 2 size_t suffix_needed = 0; - size_t alphabet_len = strlen (suffix_alphabet); - bool alphabet_slop = (n_units % alphabet_len) != 0; - while (n_units /= alphabet_len) - suffix_needed++; - suffix_needed += alphabet_slop; + + if (split_type == type_chunk_bytes || split_type == type_chunk_lines + || split_type == type_rr) + { + size_t alphabet_len = strlen (suffix_alphabet); + bool alphabet_slop = (n_units % alphabet_len) != 0; + while (n_units /= alphabet_len) + suffix_needed++; + suffix_needed += alphabet_slop; + } if (suffix_length) /* set by user */ { @@ -780,11 +792,7 @@ int main (int argc, char **argv) { struct stat stat_buf; - enum - { - type_undef, type_bytes, type_byteslines, type_lines, type_digits, - type_chunk_bytes, type_chunk_lines, type_rr - } split_type = type_undef; + enum Split_type split_type = type_undef; size_t in_blk_size = 0; /* optimal block size of input file device */ char *buf; /* file i/o buffer */ size_t page_size = getpagesize (); @@ -984,7 +992,7 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - set_suffix_length (n_units); + set_suffix_length (n_units, split_type); /* Get out the filename arguments. */ --- tests/misc/split-a +++ tests/misc/split-a @@ -63,4 +63,9 @@ for f in $files; do n=$(expr $n + 1) done +# Ensure that -a is independent of -[bCl] +split -a2 -b1000 < /dev/null || fail=1 +split -a2 -l1000 < /dev/null || fail=1 +split -a2 -C1000 < /dev/null || fail=1 + Exit $fail -- 1.7.3.4 ++++++ _service ++++++ <services> <service name="download_url"> <param name="protocol">http</param> <param name="host">ftp.gnu.org</param> <param name="path">/gnu/coreutils/coreutils-8.9.tar.xz</param> </service> <service name="verify_file"> <param name="file">_service:download_url:coreutils-8.9.tar.xz</param> <param name="verifier">sha256</param> <param name="checksum">ca22d06effd0c8bc506a7c57932d0ed08d7dbc75629a92264d67d34982f2b5b7</param> </service> <service name="set_version"> </service> </services> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at Fri Jan 7 09:29:59 CET 2011. -------- --- openldap2/openldap2.changes 2010-11-12 13:45:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/openldap2/openldap2.changes 2011-01-05 16:52:33.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 5 15:48:27 UTC 2011 - rhafer(a)novell.com + +- Fixed quotation in init-script to avoid errors when calling it + from within /etc/openldap/slapd.d/cn=config/ (bnc#660492). + +------------------------------------------------------------------- openldap2-client.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.5TmfC0/_old 2011-01-07 09:29:31.000000000 +0100 +++ /var/tmp/diff_new_pack.5TmfC0/_new 2011-01-07 09:29:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openldap2-client (Version 2.4.23) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif Version: 2.4.23 -Release: 4 +Release: 5 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" openldap2.spec: same change ++++++ openldap-rc.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rc.ldap new/rc.ldap --- old/rc.ldap 2010-08-26 16:03:48.000000000 +0200 +++ new/rc.ldap 2011-01-05 15:48:54.000000000 +0100 @@ -109,7 +109,7 @@ depth=0; function chown_database_dirs_bconfig() { - ldapdir=$(grep -i olcdbdirectory `find $1 -name olcDatabase*` | awk '{print $2}') + ldapdir=$(grep -i olcdbdirectory `find $1 -name "olcDatabase*"` | awk '{print $2}') for dir in $ldapdir; do [ -d "$dir" ] && [ -n "$OPENLDAP_USER" ] && \ chown -R $OPENLDAP_USER $dir 2>/dev/null ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pciutils-ids for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package pciutils-ids for openSUSE:Factory checked in at Fri Jan 7 09:28:49 CET 2011. -------- --- AUTO/all/pciutils-ids/pciutils-ids.changes 2011-01-01 03:40:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/pciutils-ids/pciutils-ids.changes 2011-01-06 16:40:09.000000000 +0100 @@ -2 +2 @@ -Sat Jan 1 03:40:08 CET 2011 - autobuild(a)suse.de +Thu Jan 6 16:40:09 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-01-01 +- automated update on 2011-01-06 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils-ids.spec ++++++ --- /var/tmp/diff_new_pack.JZJqtC/_old 2011-01-07 09:28:42.000000000 +0100 +++ /var/tmp/diff_new_pack.JZJqtC/_new 2011-01-07 09:28:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package pciutils-ids (Version 2011.1.1) +# spec file for package pciutils-ids (Version 2011.1.6) # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: pciutils-ids -Version: 2011.1.1 +Version: 2011.1.6 Release: 1 AutoReqProv: on Group: Hardware/Other ++++++ pci.ids.bz2 ++++++ --- /var/tmp/diff_new_pack.JZJqtC/_old 2011-01-07 09:28:42.000000000 +0100 +++ /var/tmp/diff_new_pack.JZJqtC/_new 2011-01-07 09:28:42.000000000 +0100 @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2011.01.01 -# Date: 2011-01-01 03:15:02 +# Version: 2011.01.06 +# Date: 2011-01-06 14:51:03 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pciids.sf.net/. @@ -94,9 +94,6 @@ 8818 CS8818 USB2.0-to-ATAPI Bridge Controller with Embedded PHY 050d Belkin 001a FSD7000 802.11g PCI Wireless card - 700f F5D7001 - Wireless G Plus Desktop Card - 7050 F5D7050 802.11g Wireless USB Adapter - 705c F5D7050 v4 058f Alcor Micro Corporation 05a9 OmniVision 8519 OV519 series @@ -1439,6 +1436,7 @@ 5e6d RV410 [Radeon X700 (PCIE)] (Secondary) 148c 2117 PowerColor Bravo X700 5f57 R423 [Radeon X800XT (PCIE)] + 6738 AMD Radeon HD 6800 Series Video Card 6741 NI Whistler [AMD Radeon HD 6600M Series] 6759 NI Turks [AMD Radeon HD 6500] 6760 NI Seymour [AMD Radeon HD 6470M] @@ -6627,6 +6625,8 @@ 0a69 G98M [GeForce G105M] 0a6a GT218 [NVS 2100M] 0a6c GT218 [NVS 3100M] + 1028 040b Latitude E6510 + 17aa 2142 ThinkPad T410 0a6e GT218 [GeForce 305M] 0a6f GT218 [ION] 0a70 GT218 [GeForce 310M] @@ -6706,8 +6706,11 @@ 0ad8 MCP78S [GeForce 8200] SATA Controller (RAID mode) 0be2 High Definition Audio Controller 0be3 High Definition Audio Controller + 1028 040b Latitude E6510 0be4 High Definition Audio Controller 0be5 GF100 High Definition Audio Controller + 0be9 GF106 High Definition Audio Controller + 1558 8687 CLEVO/KAPOK W860CU 0bea GF108 High Definition Audio Controller 0beb GF104 High Definition Audio Controller 1462 2322 N460GTX Cyclone 1GD5/OC @@ -6738,6 +6741,8 @@ 0d9c MCP89 OHCI USB 1.1 Controller 0d9d MCP89 EHCI USB 2.0 Controller 0dc4 GF106 [GeForce 450 GTS] + 0dd1 GeForce GTX 460M (rev a1) + 1558 8687 CLEVO/KAPOK W860CU 0de1 GF108 [GeForce GT 430] 0e09 GF110 High Definition Audio Controller 0e22 GF104 [GeForce GTX 460] @@ -8743,7 +8748,9 @@ 1324 10cf P7120 e230 Memory Stick Host Controller e822 MMC/SD Host Controller + 1028 040b Latitude E6510 e832 FireWire Host Controller + 1028 040b Latitude E6510 1181 Telmatics International 1183 Fujikura Ltd 1184 Forks Inc @@ -9040,7 +9047,8 @@ 436d 88E8055 PCI-E Gigabit Ethernet Controller 4370 88E8075 PCI-E Gigabit Ethernet Controller 4380 88E8057 PCI-E Gigabit Ethernet Controller - 4381 88E8059 PCI-E Gigabit Ethernet Controller +# AVB = "Audio Video Bridging" + 4381 Yukon Optima 88E8059 [PCIe Gigabit Ethernet Controller with AVB] 4611 GT-64115 System Controller 4620 GT-64120/64120A/64121A System Controller 4801 GT-48001 @@ -12097,7 +12105,10 @@ 1737 0042 WMP54GS v1.1 802.11g Wireless-G PCI Adapter with SpeedBooster 1737 0048 WPC54G v3 802.11g Wireless-G Notebook Adapter 1737 0049 WPC54GS v2 802.11g Wireless-G Notebook Adapter with SpeedBooster + 1799 7000 F5D7000 v4000 Wireless G Desktop Card + 1799 7001 F5D7001 v2000 Wireless G Plus Desktop Card 1799 7010 F5D7010 v4000 Wireless G Notebook Card + 1799 7011 F5D7011 v2000 High-Speed Mode Wireless G Notebook Card 4319 BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver 1028 0005 Wireless 1470 Dual Band WLAN Mini-PCI Card 1028 0006 Wireless 1470 Dual Band WLAN PC Card @@ -12122,10 +12133,10 @@ 14e4 4320 Linksys WMP54G PCI 1737 0015 WMP54GS v1.0 802.11g Wireless-G PCI Adapter with SpeedBooster 1737 4320 WPC54G v1 / WPC54GS v1 802.11g Wireless-G Notebook Adapter - 1799 7000 F5D7000uk 54G Wireless Network Card - 1799 7001 Belkin F5D7001 High-Speed Mode Wireless G Network Card + 1799 7000 F5D7000 v1000 Wireless G Desktop Card + 1799 7001 F5D7001 v1000 Wireless G Plus Desktop Card 1799 7010 F5D7010 v1000 Wireless G Notebook Card - 1799 7011 F5D7011 54g+ Wireless Network card + 1799 7011 F5D7011 v1000 High-Speed Mode Wireless G Notebook Card 185f 1220 TravelMate 290E WLAN Mini-PCI Card 4321 BCM4306 802.11a Wireless LAN Controller 4322 BCM4306 UART @@ -13151,6 +13162,7 @@ 168c 2052 Compex Wireless 802.11 b/g MiniPCI Adapter, Rev A1 [WLM54G] 16ec 0122 Wireless PCI Adapter Model 5418 1737 0053 WPC54G v7 802.11g Wireless-G Notebook Adapter + 1799 700c F5D7000 v5000 Wireless G Desktop Card 1799 701d F5D7010 v5000 Wireless G Notebook Card # the name AR5006X is used for the reference design using AR5413 001b AR5413 802.11abg NIC @@ -13174,6 +13186,7 @@ 168c 3067 AR242x 802.11abg Wireless PCI Express Adapter (rev 01) 1a3b 1026 AR5007EG 802.11bg Wi-Fi mini PCI express card 001d AR5007G Wireless Network Adapter + 1799 720b F5D7000 v8000 Wireless G Desktop Card 1799 721b F5D7010 v8000 Wireless G Notebook Card # the name AR5005VL is used for some AR5513 based designs 0020 AR5513 802.11abg Wireless NIC @@ -13384,11 +13397,10 @@ 6801 TW6802 multimedia video card 6802 TW6802 multimedia other device 1799 Belkin - 6001 Wireless PCI Card - F5D6001 - 6020 Wireless PCMCIA Card - F5D6020 v3000 [Realtek RTL8180] - 6060 Wireless PDA Card - F5D6060 - 7000 Wireless PCI Card - F5D7000 - 700a Wireless PCI Card - F5D7000UK + 6001 F5D6001 Wireless PCI Card [Realtek RTL8180] + 6020 F5D6020 v3000 Wireless PCMCIA Card [Realtek RTL8180] + 6060 F5D6060 Wireless PDA Card + 700f F5D7000 v7000 Wireless G Desktop Card [Realtek RTL8185] 701f F5D7010 v7000 Wireless G Notebook Card [Realtek RTL8185] 179a id Quantique 0001 Quantis PCI 16Mbps @@ -13526,7 +13538,7 @@ 1462 6833 Unknown 802.11g mini-PCI Adapter 1462 6835 Wireless 11G CardBus CB54G2 1737 0032 WMP54G 2.0 PCI Adapter - 1799 700a F5D7000 Wireless G Desktop Network Card + 1799 700a F5D7000 v2000/v3000 Wireless G Desktop Card 1799 701a F5D7010 v2000/v3000 Wireless G Notebook Card 185f 22a0 CN-WF513 Wireless Cardbus Adapter 0300 Wireless Adapter Canyon CN-WF511 @@ -13537,6 +13549,7 @@ 1458 e933 GN-WI01GS 1458 e934 GN-WP01GS 1737 0055 WMP54G ver 4.1 + 1799 700e F5D7000 v6000 Wireless G Desktop Card 1799 701e F5D7010 v6000 Wireless G Notebook Card 1814 2561 EW-7108PCg 0302 RT2561/RT61 rev B 802.11g @@ -14809,24 +14822,24 @@ 8086 5221 Centrino Advanced-N 6230 AGN 8086 5225 Centrino Advanced-N 6230 BGN 8086 5226 Centrino Advanced-N 6230 ABG - 0100 Sandy Bridge DRAM Controller - 0101 Sandy Bridge PCI Express Root Port - 0102 Sandy Bridge Integrated Graphics Controller - 0103 Sandy Bridge Thermal Management Controller - 0104 Sandy Bridge DRAM Controller - 0105 Sandy Bridge PCI Express Root Port - 0106 Sandy Bridge Integrated Graphics Controller - 0108 Sandy Bridge DRAM Controller - 0109 Sandy Bridge PCI Express Root Port - 010a Sandy Bridge Integrated Graphics Controller - 010b Sandy Bridge Integrated Graphics Controller - 010c Sandy Bridge DRAM Controller - 010d Sandy Bridge PCI Express Root Port - 010e Sandy Bridge Integrated Graphics Controller - 0112 Sandy Bridge Integrated Graphics Controller - 0116 Sandy Bridge Integrated Graphics Controller - 0122 Sandy Bridge Integrated Graphics Controller - 0126 Sandy Bridge Integrated Graphics Controller + 0100 2nd Generation Core Processor Family DRAM Controller + 0101 2nd Generation Core Processor Family PCI Express Root Port + 0102 2nd Generation Core Processor Family Integrated Graphics Controller + 0103 2nd Generation Core Processor Family Thermal Management Controller + 0104 2nd Generation Core Processor Family DRAM Controller + 0105 2nd Generation Core Processor Family PCI Express Root Port + 0106 2nd Generation Core Processor Family Integrated Graphics Controller + 0108 2nd Generation Core Processor Family DRAM Controller + 0109 2nd Generation Core Processor Family PCI Express Root Port + 010a 2nd Generation Core Processor Family Integrated Graphics Controller + 010b 2nd Generation Core Processor Family Integrated Graphics Controller + 010c 2nd Generation Core Processor Family DRAM Controller + 010d 2nd Generation Core Processor Family PCI Express Root Port + 010e 2nd Generation Core Processor Family Integrated Graphics Controller + 0112 2nd Generation Core Processor Family Integrated Graphics Controller + 0116 2nd Generation Core Processor Family Integrated Graphics Controller + 0122 2nd Generation Core Processor Family Integrated Graphics Controller + 0126 2nd Generation Core Processor Family Integrated Graphics Controller 0309 80303 I/O Processor PCI-to-PCI Bridge 030d 80312 I/O Companion Chip PCI-to-PCI Bridge 0326 6700/6702PXH I/OxAPIC Interrupt Controller A @@ -15368,6 +15381,7 @@ 8086 a02b Gigabit ET Quad Port Server Adapter 8086 a02c Gigabit ET Quad Port Server Adapter 10ea 82577LM Gigabit Network Connection + 1028 040b Latitude E6510 10eb 82577LC Gigabit Network Connection 10ec 82598EB 10-Gigabit AT CX4 Network Connection 8086 a01f 10-Gigabit CX4 Dual Port Server Adapter @@ -15701,74 +15715,67 @@ 1b48 82597EX 10GbE Ethernet Controller 8086 a01f PRO/10GbE LR Server Adapter 8086 a11f PRO/10GbE LR Server Adapter - 1c00 Cougar Point 4 port SATA IDE Controller - 1c01 Cougar Point 4 port SATA IDE Controller - 1c02 Cougar Point 6 port SATA AHCI Controller - 1c03 Cougar Point 6 port SATA AHCI Controller - 1c04 Cougar Point SATA RAID Controller - 1c05 Cougar Point SATA RAID Controller - 1c06 Cougar Point SATA Premium RAID Controller - 1c07 Cougar Point SATA Premium RAID Controller - 1c08 Cougar Point 2 port SATA IDE Controller - 1c09 Cougar Point 2 port SATA IDE Controller - 1c10 Cougar Point PCI Express Root Port 1 - 1c12 Cougar Point PCI Express Root Port 2 - 1c14 Cougar Point PCI Express Root Port 3 - 1c16 Cougar Point PCI Express Root Port 4 - 1c18 Cougar Point PCI Express Root Port 5 - 1c1a Cougar Point PCI Express Root Port 6 - 1c1c Cougar Point PCI Express Root Port 7 - 1c1e Cougar Point PCI Express Root Port 8 - 1c20 Cougar Point High Definition Audio Controller - 1c22 Cougar Point SMBus Controller - 1c24 Cougar Point Thermal Management Controller - 1c25 Cougar Point DMI to PCI Bridge - 1c26 Cougar Point USB Enhanced Host Controller #1 - 1c27 Cougar Point USB Universal Host Controller #1 - 1c28 Cougar Point USB Universal Host Controller #2 - 1c29 Cougar Point USB Universal Host Controller #3 - 1c2a Cougar Point USB Universal Host Controller #4 - 1c2b Cougar Point USB Universal Host Controller #8 - 1c2c Cougar Point USB Universal Host Controller #5 - 1c2d Cougar Point USB Enhanced Host Controller #2 - 1c2e Cougar Point USB Universal Host Controller #6 - 1c2f Cougar Point USB Universal Host Controller #7 - 1c30 Cougar Point USB Universal Host Controller #9 - 1c33 Cougar Point LAN Controller - 1c35 Cougar Point VECI Controller - 1c3a Cougar Point HECI Controller #1 - 1c3b Cougar Point HECI Controller #2 - 1c3c Cougar Point IDE-r Controller - 1c3d Cougar Point KT Controller - 1c42 Cougar Point LPC Controller - 1c43 Cougar Point LPC Controller - 1c44 Cougar Point LPC Controller - 1c45 Cougar Point LPC Controller - 1c46 Cougar Point LPC Controller - 1c47 Cougar Point LPC Controller - 1c48 Cougar Point LPC Controller - 1c49 Cougar Point LPC Controller - 1c4a Cougar Point LPC Controller - 1c4b Cougar Point LPC Controller - 1c4c Cougar Point LPC Controller - 1c4d Cougar Point LPC Controller - 1c4e Cougar Point LPC Controller - 1c4f Cougar Point LPC Controller - 1c50 Cougar Point LPC Controller - 1c51 Cougar Point LPC Controller - 1c52 Cougar Point LPC Controller - 1c53 Cougar Point LPC Controller - 1c54 Cougar Point LPC Controller - 1c55 Cougar Point LPC Controller - 1c56 Cougar Point LPC Controller - 1c57 Cougar Point LPC Controller - 1c58 Cougar Point LPC Controller - 1c59 Cougar Point LPC Controller - 1c5a Cougar Point LPC Controller - 1c5b Cougar Point LPC Controller - 1c5c Cougar Point LPC Controller - 1c5d Cougar Point LPC Controller - 1c5f Cougar Point LPC Controller + 1c00 6 Series Chipset Family 4 port SATA IDE Controller + 1c01 6 Series Chipset Family 4 port SATA IDE Controller + 1c02 6 Series Chipset Family 6 port SATA AHCI Controller + 1c03 6 Series Chipset Family 6 port SATA AHCI Controller + 1c04 6 Series Chipset Family SATA RAID Controller + 1c05 6 Series Chipset Family SATA RAID Controller + 1c06 6 Series Chipset Family SATA RAID Controller + 1c08 6 Series Chipset Family 2 port SATA IDE Controller + 1c09 6 Series Chipset Family 2 port SATA IDE Controller + 1c10 6 Series Chipset Family PCI Express Root Port 1 + 1c12 6 Series Chipset Family PCI Express Root Port 2 + 1c14 6 Series Chipset Family PCI Express Root Port 3 + 1c16 6 Series Chipset Family PCI Express Root Port 4 + 1c18 6 Series Chipset Family PCI Express Root Port 5 + 1c1a 6 Series Chipset Family PCI Express Root Port 6 + 1c1c 6 Series Chipset Family PCI Express Root Port 7 + 1c1e 6 Series Chipset Family PCI Express Root Port 8 + 1c20 6 Series Chipset Family High Definition Audio Controller + 1c22 6 Series Chipset Family SMBus Controller + 1c24 6 Series Chipset Family Thermal Management Controller + 1c25 6 Series Chipset Family DMI to PCI Bridge + 1c26 6 Series Chipset Family USB Enhanced Host Controller #1 + 1c2d 6 Series Chipset Family USB Enhanced Host Controller #2 + 1c33 6 Series Chipset Family LAN Controller + 1c35 6 Series Chipset Family VECI Controller + 1c3a 6 Series Chipset Family HECI Controller #1 + 1c3b 6 Series Chipset Family HECI Controller #2 + 1c3c 6 Series Chipset Family IDE-r Controller + 1c3d 6 Series Chipset Family KT Controller + 1c40 6 Series Chipset Family LPC Controller + 1c41 6 Series Chipset Family LPC Controller + 1c42 6 Series Chipset Family LPC Controller + 1c43 6 Series Chipset Family LPC Controller + 1c44 6 Series Chipset Family LPC Controller + 1c45 6 Series Chipset Family LPC Controller + 1c46 P67 Express Chipset Family LPC Controller + 1c47 6 Series Chipset Family LPC Controller + 1c48 6 Series Chipset Family LPC Controller + 1c49 HM65 Express Chipset Family LPC Controller + 1c4a H67 Express Chipset Family LPC Controller + 1c4b HM67 Express Chipset Family LPC Controller + 1c4c 6 Series Chipset Family LPC Controller + 1c4d 6 Series Chipset Family LPC Controller + 1c4e 6 Series Chipset Family LPC Controller + 1c4f 6 Series Chipset Family LPC Controller + 1c50 6 Series Chipset Family LPC Controller + 1c51 6 Series Chipset Family LPC Controller + 1c52 6 Series Chipset Family LPC Controller + 1c53 6 Series Chipset Family LPC Controller + 1c54 6 Series Chipset Family LPC Controller + 1c55 6 Series Chipset Family LPC Controller + 1c56 6 Series Chipset Family LPC Controller + 1c57 6 Series Chipset Family LPC Controller + 1c58 6 Series Chipset Family LPC Controller + 1c59 6 Series Chipset Family LPC Controller + 1c5a 6 Series Chipset Family LPC Controller + 1c5b 6 Series Chipset Family LPC Controller + 1c5c 6 Series Chipset Family LPC Controller + 1c5d 6 Series Chipset Family LPC Controller + 1c5e 6 Series Chipset Family LPC Controller + 1c5f 6 Series Chipset Family LPC Controller 1d00 Patsburg 4-Port SATA IDE Controller 1d02 Patsburg 6-Port SATA AHCI Controller 1d04 Patsburg SATA RAID Controller @@ -17118,6 +17125,7 @@ 17aa 20a7 ThinkPad T61 e4bf cc47 CCG-RUMBA 282a Mobile 82801 SATA RAID Controller + 1028 040b Latitude E6510 2830 82801H (ICH8 Family) USB UHCI Controller #1 1025 0121 Acer Aspire 5920G 1028 01da OptiPlex 745 @@ -18103,6 +18111,7 @@ 3b05 Mobile 5 Series Chipset LPC Interface Controller 3b06 5 Series Chipset LPC Interface Controller 3b07 Mobile 5 Series Chipset LPC Interface Controller + 1028 040b Latitude E6510 3b08 5 Series Chipset LPC Interface Controller 3b09 Mobile 5 Series Chipset LPC Interface Controller 1025 0347 Aspire 7740G @@ -18143,10 +18152,12 @@ 3b2f 5 Series/3400 Series Chipset 6 port SATA AHCI Controller 3b30 5 Series/3400 Series Chipset SMBus Controller 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 3b32 5 Series/3400 Series Chipset Thermal Subsystem 1025 0347 Aspire 7740G 3b34 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 3b36 5 Series/3400 Series Chipset USB Universal Host Controller 3b37 5 Series/3400 Series Chipset USB Universal Host Controller 3b38 5 Series/3400 Series Chipset USB Universal Host Controller @@ -18155,6 +18166,7 @@ 3b3b 5 Series/3400 Series Chipset USB Universal Host Controller 3b3c 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 3b3e 5 Series/3400 Series Chipset USB Universal Host Controller 3b3f 5 Series/3400 Series Chipset USB Universal Host Controller 3b40 5 Series/3400 Series Chipset USB Universal Host Controller @@ -18170,6 +18182,7 @@ 3b53 5 Series/3400 Series Chipset VECI Controller 3b56 5 Series/3400 Series Chipset High Definition Audio 1025 0347 Aspire 7740G + 1028 040b Latitude E6510 3b57 5 Series/3400 Series Chipset High Definition Audio 3b64 5 Series/3400 Series Chipset HECI Controller 1025 0347 Aspire 7740G @@ -18625,6 +18638,7 @@ d130 Core Processor DMI d131 Core Processor DMI d132 Core Processor DMI + 1028 040b Latitude E6510 d133 Core Processor DMI d134 Core Processor DMI d135 Core Processor DMI ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysconfig for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Fri Jan 7 09:15:25 CET 2011. -------- --- sysconfig/sysconfig.changes 2010-12-07 12:23:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2010-12-09 16:13:47.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Dec 9 15:13:27 UTC 2010 - mt(a)suse.de + +- version 0.74.3 +- Use iBFT primary or PXE BOOTIF inteface as primary dhcp interface + (sets the default route and hostname) and the "first up interface + wins" selection used before as fallback, when there is explicit + user configuration available. Updated the DHCLIENT_PRIMARY_DEVICE + variable description, added it also to the global network/dhcp + config file (bnc#653365). +- Improved default vlan name scheme docs in ifcfg-vlan.5 man page. +- Use startmode auto instead of onboot in ifcfg-lo (bnc#533818) +- Dropped obsolete and confusing etc/modprobe.d/50-ipv6.conf file + (bnc#632530, bnc#656916). +- Fixed link_wait scriptname check and ping usage (bnc#644738); + improved to allow the user to specify the steps. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sysconfig-0.74.2.tar.bz2 New: ---- sysconfig-0.74.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.xc8HQf/_old 2011-01-07 09:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.xc8HQf/_new 2011-01-07 09:15:12.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sysconfig (Version 0.74.2) +# spec file for package sysconfig (Version 0.74.3) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,8 @@ Name: sysconfig -Version: 0.74.2 -Release: 2 +Version: 0.74.3 +Release: 1 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig Group: System/Base @@ -102,7 +102,6 @@ %dir /etc/modprobe.d %config /etc/sysconfig/network/ifcfg.template %config /etc/modprobe.d/50-blacklist.conf -%config(noreplace) /etc/modprobe.d/50-ipv6.conf /etc/sysconfig/network/scripts/* /etc/sysconfig/network/if-up.d/ndp-proxy /etc/sysconfig/network/if-down.d/ndp-proxy @@ -187,15 +186,6 @@ done # erroneous move from network/dhcp to network/config while 11.1 beta sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS -# -# * update to >= 11.2 -# -# FIXME: use disable_ipv6 -# move ipv6 settings created by yast2-network before 11.2 -# -if test -f etc/modprobe.d/ipv6 ; then - mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf -fi %postun %{insserv_cleanup} ++++++ sysconfig-0.74.2.tar.bz2 -> sysconfig-0.74.3.tar.bz2 ++++++ ++++ 14613 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/ChangeLog new/sysconfig-0.74.3/ChangeLog --- old/sysconfig-0.74.2/ChangeLog 2010-11-11 14:42:45.000000000 +0100 +++ new/sysconfig-0.74.3/ChangeLog 2011-01-06 10:53:18.000000000 +0100 @@ -1,4 +1,62 @@ -commit 7cda3f6f76b177f2cbc3aa91e84fffbba2508ffa (HEAD, master) +commit e38938065e356e5b96ee42ea616c1796037fd89b (HEAD, origin/master, export/master, opensuse-11.4) +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Wed Jan 5 16:58:56 2011 +0100 + + version 0.74.3, updated sysconfig.changes + +commit 9f83ac4f48920bc5d781d75702ccd59a4dae2944 +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Thu Dec 9 16:16:51 2010 +0100 + + Use iBFT primary or PXE BOOTIF as primary in dhcp + + Use iBFT primary or PXE BOOTIF inteface as primary dhcp interface + (sets the default route and hostname) and the "first up interface + wins" selection used before as fallback, when there is explicit + user configuration available. Updated the DHCLIENT_PRIMARY_DEVICE + variable description, added it also to the global network/dhcp + config file (bnc#653365). + +commit e4aca9a3dc0853c6087fdf271a7ae18440e7c0cf +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Thu Dec 9 14:13:56 2010 +0100 + + Merged changes from openSUSE:Factory + +commit c2285de766d1b4146d7215bafea5bc1f0a2e3fa6 +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Thu Dec 9 14:09:41 2010 +0100 + + Default vlan name scheme in ifcfg-vlan.5 man page + + Make it clear, that <ifname>.<vlan-id> (eth0.42) is the default and + prefered name scheme for vlan interfaces. + +commit de4ae9ea2c1617fde5594ef99a136180df9e0fd5 +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Thu Dec 9 10:12:03 2010 +0100 + + Use startmode auto instead of onboot in ifcfg-lo + + The startmode onboot is still valid, but a backward compatibility + alias to auto (bnc#533818). + +commit ed94c15257f8816eff66f7d603c2152fa4950718 +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Wed Dec 1 15:51:17 2010 +0100 + + Dropped obsolete /etc/modprobe.d/50-ipv6.conf (see bnc#632530) + +commit 10da7e74aff7ecb6399fc8bcf126689a0b3be64e +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Tue Nov 16 18:02:03 2010 +0100 + + Fixed link_wait scriptname check improved the script + + Fixed link_wait scriptname check and ping usage (bnc#644738); + improved to allow the user to specify the steps. + +commit 7cda3f6f76b177f2cbc3aa91e84fffbba2508ffa Author: Marius Tomaschewski <mt(a)suse.de> Date: Thu Nov 11 14:42:03 2010 +0100 @@ -25,7 +83,7 @@ Signed-off-by: Marius Tomaschewski <mt(a)suse.de> -commit 7a325b566171b4c696c7e55567f6ba2aea59fe20 (origin/master, export/master) +commit 7a325b566171b4c696c7e55567f6ba2aea59fe20 Author: Marius Tomaschewski <mt(a)suse.de> Date: Tue Oct 26 13:16:42 2010 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/hardware/50-ipv6.conf new/sysconfig-0.74.3/config/hardware/50-ipv6.conf --- old/sysconfig-0.74.2/config/hardware/50-ipv6.conf 2010-11-05 14:01:26.000000000 +0100 +++ new/sysconfig-0.74.3/config/hardware/50-ipv6.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -# -# Using this file does not work when the module is compiled -# into the kernel (11.2 and above). Instead, please use the -# net.ipv6.conf.all.disable_ipv6 = 1 -# global sysctl setting in /etc/sysctl.conf or also a per -# interface settings in ifsysctl(5) files. -# - -# Comment out to disable IPv6: -#install ipv6 /bin/true - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/hardware/Makefile.am new/sysconfig-0.74.3/config/hardware/Makefile.am --- old/sysconfig-0.74.2/config/hardware/Makefile.am 2010-10-05 22:42:15.000000000 +0200 +++ new/sysconfig-0.74.3/config/hardware/Makefile.am 2011-01-06 10:45:47.000000000 +0100 @@ -5,7 +5,7 @@ udevrules_DATA = 81-mount.rules -modprobe_DATA = 50-blacklist.conf 50-ipv6.conf +modprobe_DATA = 50-blacklist.conf EXTRA_DIST = $(modprobe_DATA) $(udevrules_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/ifcfg-lo new/sysconfig-0.74.3/config/ifcfg-lo --- old/sysconfig-0.74.2/config/ifcfg-lo 2010-01-20 17:57:54.000000000 +0100 +++ new/sysconfig-0.74.3/config/ifcfg-lo 2011-01-06 10:45:47.000000000 +0100 @@ -4,6 +4,6 @@ NETWORK=127.0.0.0 BROADCAST=127.255.255.255 IPADDR_2=127.0.0.2/8 -STARTMODE=onboot +STARTMODE=auto USERCONTROL=no FIREWALL=no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/ifcfg.template new/sysconfig-0.74.3/config/ifcfg.template --- old/sysconfig-0.74.2/config/ifcfg.template 2010-11-05 14:01:26.000000000 +0100 +++ new/sysconfig-0.74.3/config/ifcfg.template 2011-01-06 10:45:47.000000000 +0100 @@ -212,38 +212,6 @@ UNIQUE= ########################################################################## -### FIXME: -### From here one up to 'bridge settings' the file is not up to date - - -## Multiple addresses -## You can extend the variable name 'IPADDR' by any string you like (IPADDR_1, -## IPADDR_FOO, IPADDRxxx, ...) and use these variables for your IP addresses. -## If you need some additional parameters for these addresses, then just add -## the same extension to these variable names. -## IPADDR_AAA=1.2.3.4 -## NETMASK_AAA=255.0.0.0 -## BROADCAST_AAA=1.2.3.55 -## IPADDR_BBB=10.10.2.3/16 -## LABEL_BBB=BBB -## an so on ... -## -## You do not need to set a label for any address. But then you should not use -## ifconfig any longer; go and use ip. If you want to use ifconfig then omit the -## label for your main address and set a label for every additional address. - -## Routing: -## If you need special routes for a configuration, then use a file named -## ifroute-<config> where <config> is the same string as in ifcfg-<config>. -## It has the same syntax like routes except one difference: -## If you omit the interface name (4th field) in the ifroute file it will be -## set to the current interface name when setting up the interface. You need to -## do this with hotpluggable devices, where you do not know which interface name -## they will get at the time when you plug them. -## See man 5 routes. - - -########################################################################## ## DHCP settings ## Type: list("",yes,no) @@ -252,31 +220,54 @@ # Multiple DHCP clients: # # With two or more DHCP clients running, they would concurrently try to replace -# the default route or rewrite resolv.conf, rewrite ntp.conf etc. There are two -# ways of dealing with this conflict (and it is a conflict, because you can -# have only one default route even though routes are stackable, and there can -# only be one resolv.conf file): +# the default route or set the hostname. There are several ways of dealing with +# this conflict (and it is a conflict, because you can have only one default +# route even though routes are stackable and the dhcp clients would change it +# while every lease renew): # -# 1) allow both clients to do that stuff. This would work in many cases if +# 1) Allow both clients to do that stuff. This would work in many cases if # only one of the interfaces is used at a time. However, it would lead to -# undefined behaviour. +# undefined behaviour such as changing default route e.g. on dhcp renew. # -# 2) allow only one of the DHCP clients to do that stuff. This implies -# that there would be a "primary" interface and a "secondary". This is the -# assumption the default configuration is based on. But since the system -# can't guess which interface is "more important" and should have the -# default route and resolver configuration associated with it, it simply -# chooses the first interface that is started with DHCP to be -# "authoritative". Which one that is can be influenced by adding -# DHCLIENT_PRIMARY_DEVICE=yes to one of the /etc/sysconfig/network/ifcfg-* -# files. This can even be added to more than one file, to achieve the -# behaviour described in 1). Thus, there is the flexibility to do it -# either way. -# -# Per default, only the DHCP client that is started first will be allowed to -# change the default route / resolver configuration etc. All other running -# clients will only configure the interface with an address, but not change -# "global" configuration. +# 2) When both interfaces are connected to the same network, you may configure +# a bonding interface in active-backup mode (or another, e.g. 802.3ad, when +# supported and configured by the switch) and configure dhcp on the bonding +# instead. +# +# 3) When only one of the interfaces is used at time, you may set STARTMODE to +# ifplugd and specify the priority of the interfaces in IFPLUGD_PRIORITY. +# This is a common scenario for notebooks to use the wired interface when +# connected, wireless otherwise. +# +# 4) allow only one of the DHCP clients to do that stuff. +# This implies that there would be a "primary" interface and a "secondary". +# This is the assumption the default configuration is based on. But since +# the system often can't guess which interface is "more important", we +# simply choose one depending on related configuration or take the first +# interface that is started with DHCP to be primary ("authoritative"). +# This can be configured by setting DHCLIENT_PRIMARY_DEVICE=yes in one of +# the /etc/sysconfig/network/ifcfg-* files and DHCLIENT_PRIMARY_DEVICE=no +# in /etc/sysconfig/network/dhcp (or in all other ifcfg files using DHCP). +# +# When DHCLIENT_PRIMARY_DEVICE is not explicitly configured to yes/no, the +# "primary" interface is choosed as follows: +# +# - On systems with iSCSI Boot Firmare Table, the iBFT primary interface +# is used as the primary DHCP interface by default. +# - On systems booting via PXE, the interface specified by the BOOTIF kernel +# parameter is used as primary DHCP interface. Set the global "ipappend 2" +# parameter in pxelinux.cfg/* files, so the BOOTIF kernel parameter is set. +# - Otherwise, the DHCP client that is started first will be "primary" and +# allowed the set the default route and hostname ("first up wins" mode, +# the only one before openSUSE 11.4). To force this "first up wins" mode, +# set DHCLIENT_PRIMARY_DEVICE="first" in /etc/sysconfig/network/dhcp. +# +# All other running dhcp clients will only configure the interface with an +# address and network routes, but not change the "global" default route or +# hostname. +# See also DHCLIENT_SET_DEFAULT_ROUTE and DHCLIENT_SET_HOSTNAME variables, +# that allow to modify the DHCLIENT_PRIMARY_DEVICE parameter behaviour once +# again. # # Thus, to specifically allow an interface's DHCP client to change "global" # configuration, set the following variable to "yes". Or you can make an @@ -285,17 +276,16 @@ # DHCLIENT_PRIMARY_DEVICE= - ## Type: ## Default: # -# Even more finegrained control can be excerted by setting any of the variables -# from /etc/sysconfig/network/dhcp here: +# Even more finegrained control can be excerted by setting any of the +# variables from /etc/sysconfig/network/dhcp in ifcfg files: +# DHCLIENT_DEBUG= DHCLIENT_SET_HOSTNAME= DHCLIENT_SET_DEFAULT_ROUTE= DHCLIENT_TIMEOUT= -DHCLIENT_REBOOT_TIMEOUT= DHCLIENT_CLIENT_ID= DHCLIENT_HOSTNAME_OPTION= DHCLIENT_VENDOR_CLASS_ID= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/config/sysconfig.dhcp-network new/sysconfig-0.74.3/config/sysconfig.dhcp-network --- old/sysconfig-0.74.2/config/sysconfig.dhcp-network 2010-11-05 14:01:26.000000000 +0100 +++ new/sysconfig-0.74.3/config/sysconfig.dhcp-network 2011-01-06 10:45:47.000000000 +0100 @@ -72,6 +72,68 @@ # DHCLIENT_DEBUG="no" +## Type: list("",yes,no,first) +## Default: "" +# +# Multiple DHCP clients: +# +# With two or more DHCP clients running, they would concurrently try to replace +# the default route or set the hostname. There are several ways of dealing with +# this conflict (and it is a conflict, because you can have only one default +# route even though routes are stackable and the dhcp clients would change it +# while every lease renew): +# +# 1) Allow both clients to do that stuff. This would work in many cases if +# only one of the interfaces is used at a time. However, it would lead to +# undefined behaviour such as changing default route e.g. on dhcp renew. +# +# 2) When both interfaces are connected to the same network, you may configure +# a bonding interface in active-backup mode (or another, e.g. 802.3ad, when +# supported and configured by the switch) and configure dhcp on the bonding +# instead. +# +# 3) When only one of the interfaces is used at time, you may set STARTMODE to +# ifplugd and specify the priority of the interfaces in IFPLUGD_PRIORITY. +# This is a common scenario for notebooks to use the wired interface when +# connected, wireless otherwise. +# +# 4) allow only one of the DHCP clients to do that stuff. +# This implies that there would be a "primary" interface and a "secondary". +# This is the assumption the default configuration is based on. But since +# the system often can't guess which interface is "more important", we +# simply choose one depending on related configuration or take the first +# interface that is started with DHCP to be primary ("authoritative"). +# This can be configured by setting DHCLIENT_PRIMARY_DEVICE=yes in one of +# the /etc/sysconfig/network/ifcfg-* files and DHCLIENT_PRIMARY_DEVICE=no +# in /etc/sysconfig/network/dhcp (or in all other ifcfg files using DHCP). +# +# When DHCLIENT_PRIMARY_DEVICE is not explicitly configured to yes/no, the +# "primary" interface is choosed as follows: +# +# - On systems with iSCSI Boot Firmare Table, the iBFT primary interface +# is used as the primary DHCP interface by default. +# - On systems booting via PXE, the interface specified by the BOOTIF kernel +# parameter is used as primary DHCP interface. Set the global "ipappend 2" +# parameter in pxelinux.cfg/* files, so the BOOTIF kernel parameter is set. +# - Otherwise, the DHCP client that is started first will be "primary" and +# allowed the set the default route and hostname ("first up wins" mode, +# the only one before openSUSE 11.4). To force this "first up wins" mode, +# set DHCLIENT_PRIMARY_DEVICE="first" in /etc/sysconfig/network/dhcp. +# +# All other running dhcp clients will only configure the interface with an +# address and network routes, but not change the "global" default route or +# hostname. +# See also DHCLIENT_SET_DEFAULT_ROUTE and DHCLIENT_SET_HOSTNAME variables, +# that allow to modify the DHCLIENT_PRIMARY_DEVICE parameter behaviour once +# again. +# +# Thus, to specifically allow an interface's DHCP client to change "global" +# configuration, set the following variable to "yes". Or you can make an +# interface's DHCP client never change these settings if you set it to "no". +# If you leave it empty then ifup-dhcp will decide. +# +DHCLIENT_PRIMARY_DEVICE= + ## Type: yesno ## Default: no # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/doc/ifcfg-vlan.5 new/sysconfig-0.74.3/doc/ifcfg-vlan.5 --- old/sysconfig-0.74.2/doc/ifcfg-vlan.5 2010-01-21 16:39:40.000000000 +0100 +++ new/sysconfig-0.74.3/doc/ifcfg-vlan.5 2011-01-06 10:45:47.000000000 +0100 @@ -27,35 +27,41 @@ number at the end of the interface name is the VLAN ID. Preferably the interface name and the configuration file follow the -VLAN interface name scheme (type), that is either: +VLAN interface name schemes (types), that is either: .RS .PD 0 .P -ifcfg-\fBvlan\fR<\fBVLAN-ID\fR> (e.g. ifcfg-\fIvlan42\fR) +ifcfg-\fBname\fR.<\fBVLAN-ID\fR> (e.g. ifcfg-\fIeth0.42\fR) or .P -ifcfg-\fBname\fR.<\fBVLAN-ID\fR> (e.g. ifcfg-\fIeth0.42\fR) +ifcfg-\fBvlan\fR<\fBVLAN-ID\fR> (e.g. ifcfg-\fIvlan42\fR) .PD .RE +The ifcfg-\fBname\fR.<\fBVLAN-ID\fR> scheme is default on Linux. +Note also, that the ifcfg-\fBvlan\fR<\fBVLAN-ID\fR> scheme makes +it impossible to use same VLAN-ID on more than one interface +(e.g. ifcfg-eth\fI0\fR.42 and ifcfg-eth\fI1\fR.42). + The VLAN-ID can be also 0-padded (e.g. ifcfg-vlan0042 or ifcfg-eth0.0042). Also in case of custom names, trailing digits are interpreted as VLAN-ID by default (e.g. ifcfg-dmz42). When \fBVLAN_ID\fR is set in the config, -the interface name have any name (e.g. ifcfg-foobar). +the interface name can have any name (e.g. ifcfg-foobar). Note: The drawback of custom interface names and VLAN_ID usage is, that a rename of the interface is required and that they violate -the name scheme. +the vlan name scheme. .PP The real interface will be set UP automatically and doesn't need a config file in case of a physical interface. But without a config file YaST will consider this interface as unused, if will not follow hotplug events and -you're unable to apply any settings, e.g. ETHTOOL_OPTIONS. To avoid that, -provide an config file with at least STARTMODE='auto'. +you're unable to apply any settings, e.g. ETHTOOL_OPTIONS. To avoid these +problems, it is strongly recommended to provide a config file with at +least STARTMODE='auto' for the physical interface as well. The rest of the VLAN interface IP and routes configuration do not differ from ordinary interfaces. See also \fIman\ ifcfg\fR and \fIman\ routes\fR @@ -63,9 +69,9 @@ .SH EXAMPLES .TP -Sets up \fIvlan3\fR vlan interface on top of \fBeth0\fR: +Sets up \fIeth0.3\fR vlan interface on top of \fBeth0\fR: -.I ifcfg-vlan3 +.I ifcfg-eth0.3 .nf STARTMODE='auto' ETHERDEVICE='\fBeth0\fR' @@ -73,9 +79,9 @@ .fi .TP -Sets up \fIeth0.3\fR vlan interface on top of \fBeth0\fR: +Sets up \fIvlan3\fR vlan interface on top of \fBeth0\fR: -.I ifcfg-eth0.3 +.I ifcfg-vlan3 .nf STARTMODE='auto' ETHERDEVICE='\fBeth0\fR' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/missing new/sysconfig-0.74.3/missing --- old/sysconfig-0.74.2/missing 2010-11-11 14:42:39.000000000 +0100 +++ new/sysconfig-0.74.3/missing 2011-01-06 10:46:02.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/scripts/functions new/sysconfig-0.74.3/scripts/functions --- old/sysconfig-0.74.2/scripts/functions 2010-11-05 14:01:26.000000000 +0100 +++ new/sysconfig-0.74.3/scripts/functions 2011-01-06 10:45:47.000000000 +0100 @@ -273,7 +273,25 @@ } get_hwaddress () { - cat /sys/class/net/$1/address >/dev/null + cat /sys/class/net/$1/address 2>/dev/null +} + +get_bonding_slave_hwaddrs() +{ + local ifname="${1}" + local saddrs=() + if test -f "/proc/net/bonding/$ifname" ; then + while read line ; do + case $line in + "Permanent HW addr:"*) + saddr+=("${line//Permanent HW addr: /}") + ;; + esac + done < "/proc/net/bonding/$ifname" 2>/dev/null + echo "${saddr[*]}" + return 0 + fi + return 1 } # This will echo the first address listed for the given interface. @@ -820,3 +838,77 @@ return 1 } +get_pxe_bootif_param() +{ + local cmdline=$(cat /proc/cmdline 2>/dev/null) + local rx='^(.*[[:space:]])?BOOTIF=([[:xdigit:]]{2}([-[:xdigit:]]{2})+)([[:space:]].*)?$' + if [[ ${cmdline} =~ ${rx} ]] ; then + echo "${BASH_REMATCH[2]}" + fi +} + +is_pxe_boot_iface() +{ + # params <interface name> + # output 'yes': bootif param available, $1 interface match + # 'no' : bootif param available, no $1 interface match + # '' : otherwise (no bootif param, errors) + # returns 0 on success, 1 on errors + local bootif=`get_pxe_bootif_param 2>/dev/null` + test "x$bootif" = x && return 0 + + local ifname="$1" + test "x$ifname" != x -a -d "/sys/class/net/$ifname" || return 1 + local iftype=`cat "/sys/class/net/$ifname/type" 2>/dev/null` + local ifaddr=`get_hwaddress "$ifname"` + test "x$iftype" != x -a "x$ifaddr" != x || return 1 + + local maddr=${bootif//-/:} + local addrs="$ifaddr" addr + case $iftype in + 1) + # TODO: bridge and vlan inherit hwaddrs as well + if test -d "/sys/class/net/$ifname/bonding" ; then + addrs=`get_bonding_slave_hwaddrs "$ifname" 2>/dev/null` + fi + ;; + esac + for addr in ${addrs} ; do + local x=`printf "%02x:%s" "$iftype" "$addr" 2>/dev/null` + if test "x$maddr" = "x$x" ; then + echo "yes" + return 0 + fi + done + echo "no" +} + +is_ibft_primary_iface() +{ + # params <interface name> + # output 'yes': ibft interfaces available, $1 interface is ibft primary + # 'no' : ibft interfaces available, $1 interface is not primary + # '' : otherwise (no ibft, errors) + # returns 0 on success, 1 on errors + case $1 in ""|.|..|*/*) return 1 ;; esac + test -d "/sys/class/net/$1" || return 1 + + local IF="$1" sysfs_ibft="/sys/firmware/ibft" + test -d "$sysfs_ibft" || return 1 + + # ibft ethernet0 is the primary ibft => dhcp primary + local ibft_nic0 enic edir="$sysfs_ibft/ethernet0" + if test -d "$edir" -a -d "$edir/device/net" ; then + for enic in `ls -1 $edir/device/net/ 2>/dev/null` ; do + test -d "$edir/device/net/$enic" || continue + ibft_nic0=$enic + break + done + fi + + if test "x$ibft_nic0" != "x" ; then + test "x$ibft_nic0" = "x$IF" && echo yes || echo no + fi + return 0 +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/scripts/ifup-dhcp new/sysconfig-0.74.3/scripts/ifup-dhcp --- old/sysconfig-0.74.2/scripts/ifup-dhcp 2010-11-05 14:06:58.000000000 +0100 +++ new/sysconfig-0.74.3/scripts/ifup-dhcp 2011-01-06 10:45:47.000000000 +0100 @@ -502,21 +502,60 @@ # that is provided by the cached config data in a way that a user-defined # DHCLIENT_PRIMARY_DEVICE remains untouched. - if [ -z "$DHCLIENT_PRIMARY_DEVICE" ]; then - + case $DHCLIENT_PRIMARY_DEVICE in + yes|no) + # -> explicit configuration, use as is + ;; + first|*) # read cached config data into PRIMARY_FROM_CACHE PRIMARY_FROM_CACHE="`grep_cached_config_data primary yes`" if [ -z "$PRIMARY_FROM_CACHE" ]; then - # no primary interface up-> we're the primary interface - DHCLIENT_PRIMARY_DEVICE='yes' - # save this fact to cached config data - write_cached_config_data primary yes $INTERFACE - commit_cached_config_data $INTERFACE + case $DHCLIENT_PRIMARY_DEVICE in + first) + # 'first' is to disable the ibft / pxe bootif checks + # and revert to use the old "first up wins" mode + + # no primary interface up-> we're the primary interface + DHCLIENT_PRIMARY_DEVICE='yes' + ;; + *) + # check if ibft is available and whether this + # interface is the primary ibft interface + ibft_primary=`is_ibft_primary_iface $INTERFACE 2>/dev/null` + case $ibft_primary in + yes|no) + DHCLIENT_PRIMARY_DEVICE=$ibft_primary + ;; + *) + # check the BOOTIF PXE kernel parameter and + # set the primary flag when BOOTIF matches + # the interface or BOOTIF is not set at all + pxe_bootif=`is_pxe_boot_iface $INTERFACE 2>/dev/null` + if test "x$pxe_bootif" = xno ; then + # there is a BOOTIF param, but it + # does not match this interface + DHCLIENT_PRIMARY_DEVICE='no' + else + DHCLIENT_PRIMARY_DEVICE='yes' + fi + ;; + esac + ;; + esac + + if test "x$DHCLIENT_PRIMARY_DEVICE" != "xno" ; then + # OK, we are the primary + DHCLIENT_PRIMARY_DEVICE=yes + + # save this fact to cached config data + write_cached_config_data primary yes $INTERFACE + commit_cached_config_data $INTERFACE + fi else # primary interface already up -> DHCLIENT_PRIMARY_DEVICE='no' - if [ "${PRIMARY_FROM_CACHE% }" = $INTERFACE ]; then + if [ "${PRIMARY_FROM_CACHE// /}" = $INTERFACE ]; then # special case for ifrenew: # we are the primary interface which is up DHCLIENT_PRIMARY_DEVICE='yes' @@ -524,8 +563,8 @@ DHCLIENT_PRIMARY_DEVICE='no' fi fi - - fi + ;; + esac DHCP4_STATUS=$R_NOTCONFIGURED DHCP6_STATUS=$R_NOTCONFIGURED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/scripts/link_wait new/sysconfig-0.74.3/scripts/link_wait --- old/sysconfig-0.74.2/scripts/link_wait 2010-11-05 14:01:26.000000000 +0100 +++ new/sysconfig-0.74.3/scripts/link_wait 2011-01-06 10:45:47.000000000 +0100 @@ -21,7 +21,7 @@ # usage () { echo $@ - echo "usage: $SCRIPTNAME [<config>] <interface> [-o <options>]" + echo "usage: if-up.d/$SCRIPTNAME [<config>] <interface> [-o <options>]" echo "" echo "Options are:" echo " [on]boot : we are currently booting (or shutting down)" @@ -33,13 +33,16 @@ echo "Per interface ifcfg-<config> file variables are:" echo " LINK_WAIT=no (or empty/unset)" echo " - default, don't do anything" - echo " LINK_WAIT=check (or yes)" - echo " - check the link state flags" - echo " LINK_WAIT=<secs>" - echo " - seconds to just sleep without any check" + echo " LINK_WAIT=<steps>" + echo " - space separated list of steps to preform:" + echo " sleep: just sleep" + echo " check: check link state flags" + echo " ping : ping specified address" + echo " LINK_WAIT_SECS=<secs>" + echo " - seconds for each check/sleep/ping step" + echo " (limit is WAIT_FOR_INTERFACES for all)" echo " LINK_WAIT_PING_IPV4=<ipv4 address to ping>" - echo " - sleep half of the time in LINK_WAIT, then" - echo " ping the address the rest of the time" + echo " - ping the specified address" echo "" echo "Install using:" echo " ln -s ../scripts/link_wait /etc/sysconfig/network/if-up.d/" @@ -59,7 +62,8 @@ # check arguments and how we are called (in case of links) # SCRIPTNAME=${0##*/} -debug $* +echo debug $* +#set -x case $1 in ""|-h|*help*) usage ;; esac CONFIG="$1" shift @@ -93,6 +97,7 @@ # source interface config and make sure we use the # per interface setting for wait for link check... unset LINK_WAIT +unset LINK_WAIT_SECS unset LINK_WAIT_PING_IPV4 test -f ./ifcfg-$CONFIG && . ./ifcfg-$CONFIG || exit 0 @@ -119,72 +124,96 @@ test "$c" = "1" -a "$d" = "0" -a \ $ "$o" = "up" -o "$o" = "unknown" $ && return 0 else - # SLE 10 does not have operstate/dormant + # e.g. SLE 10 does not have operstate/dormant test "$c" = "1" && return 0 fi } -case $SCRIPTNAME in +do_ping() +{ + local ifname=$1 + local target=$2 + local -i limit=$3 + local -i ret=0 + local beg now sec rest + IFS=. read beg rest < /proc/uptime + for ((now=$beg; $now < ($beg + $limit); )) ; do + sec=$(($limit - ($now - $beg))) + out=`ping -q -I $ifname -w $sec -c 1 $target 2>&1` + ret=$? + debug "$out" + test $ret -eq 0 && break + IFS=. read now rest < /proc/uptime + done + return $ret +} + +case $0 in *if-up.d*) if test "$MODE" = onboot -a "${LINK_WAIT:-no}" != no ; then - test "$LINK_WAIT" = yes && LINK_WAIT=check - - if test "$LINK_WAIT" != check -a $(( $LINK_WAIT )) -gt 0 ; - then - # don't wait more than WAIT_FOR_INTERFACES / 3 - test $(( $LINK_WAIT )) -gt \ - $(( $WAIT_FOR_INTERFACES / 4 )) && \ - LINK_WAIT=$(( $WAIT_FOR_INTERFACES / 4 )) - - case $LINK_WAIT_PING_IPV4 in - (*\.*\.*\.*) - declare -i secs=$(( $LINK_WAIT / 2 )) - - ifprint message "waiting $secs secs" - sleep $secs - - ifprint message "pinging $LINK_WAIT_PING_IPV4 up to $secs secs" - ping -I $INTERFACE -w $secs -c 1 $LINK_WAIT_PING_IPV4 - ifprint message "ping returned $?" - ;; - (*) - declare -i secs=$(( $LINK_WAIT )) - - ifprint message "waiting $secs secs" - sleep $secs - ;; - esac - else - # don't wait more than WAIT_FOR_INTERFACES / 3 - declare -i secs=$(( $WAIT_FOR_INTERFACES / 4 )) - declare -i lmax=$secs - declare -i loop=0 - case $LINK_WAIT_PING_IPV4 in - (*\.*\.*\.*) lmax=$(( $lmax / 2 )) ;; - esac - - check_link_detected "$INTERFACE" || \ - ifprint message "no link detected ... waiting up to $secs secs" - - while ! check_link_detected "$INTERFACE" ; do - sleep 1 - test $((++loop)) -ge $lmax && break + # some compatibility to older version + if test "$LINK_WAIT" = yes ; then + LINK_WAIT=check + fi + if test -z "$LINK_WAIT_SECS" ; then + test $(( $LINK_WAIT )) -gt 0 && \ + LINK_WAIT_SECS=$LINK_WAIT + case $LINK_WAIT_PING_IPV4 in + *\.*\.*\.*) LINK_WAIT="ping" ;; + *) LINK_WAIT="check" ;; + esac + fi + + steps=($LINK_WAIT) + # don't wait more than WAIT_FOR_INTERFACES + if test ${#steps[@]} -gt 0 ; then + if test $(( $LINK_WAIT_SECS )) -eq 0 -o \ + $(( $(($LINK_WAIT_SECS)) * ${#steps[@]} )) -gt \ + $(( $WAIT_FOR_INTERFACES )) ; then + LINK_WAIT_SECS=$(( $WAIT_FOR_INTERFACES / ${#steps[@]} )) + fi + fi + spend=0 + for step in ${steps[@]} ; do + case $step in + check) + declare -i secs=$LINK_WAIT_SECS + declare -i loop=0 + + check_link_detected "$INTERFACE" || \ + ifprint message "no link detected ... waiting up to $secs secs" + + while ! check_link_detected "$INTERFACE" ; do + sleep 1 + test $((++loop)) -ge $secs && break + done + + spend=$((spend + loop)) + check_link_detected "$INTERFACE" \ + && ifprint message "link detected after $spend secs" \ + || ifprint message "no link detected ... continue" + ;; + sleep) + ifprint message "sleeping for $LINK_WAIT_SECS secs" + sleep $LINK_WAIT_SECS + spend=$((spend + LINK_WAIT_SECS)) + ;; + ping) + case $LINK_WAIT_PING_IPV4 in + *\.*\.*\.*) + ifprint message "ping $LINK_WAIT_PING_IPV4 up to $LINK_WAIT_SECS secs" + if do_ping "$INTERFACE" "$LINK_WAIT_PING_IPV4" "$LINK_WAIT_SECS" ; then + ifprint message "ping reports reachable $LINK_WAIT_PING_IPV4" + else + ifprint message "ping reports unreachable $LINK_WAIT_PING_IPV4" + fi + spend=$((spend + LINK_WAIT_SECS)) + ;; + esac + ;; + esac done - - check_link_detected "$INTERFACE" \ - && ifprint message "link detected after $loop secs" \ - || ifprint message "no link detected ... continue" - - case $LINK_WAIT_PING_IPV4 in - (*\.*\.*\.*) - ifprint message "pinging $LINK_WAIT_PING_IPV4 up to $secs secs" - ping -I $INTERFACE -w $(( $secs - $loop )) -c 1 $LINK_WAIT_PING_IPV4 - ifprint message "ping returned $?" - ;; - esac - fi - fi ;; *if-down.d*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/sysconfig.spec new/sysconfig-0.74.3/sysconfig.spec --- old/sysconfig-0.74.2/sysconfig.spec 2010-11-11 14:42:42.000000000 +0100 +++ new/sysconfig-0.74.3/sysconfig.spec 2011-01-06 10:46:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.74.2) +# spec file for package sysconfig (Version 0.74.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: sysconfig -Version: 0.74.2 +Version: 0.74.3 Release: 0 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig @@ -27,6 +27,8 @@ License: GPLv2+ AutoReqProv: on PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep +# we may create these automatically from rpm later +Provides: sysvinit(network) Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 @@ -100,7 +102,6 @@ %dir /etc/modprobe.d %config /etc/sysconfig/network/ifcfg.template %config /etc/modprobe.d/50-blacklist.conf -%config(noreplace) /etc/modprobe.d/50-ipv6.conf /etc/sysconfig/network/scripts/* /etc/sysconfig/network/if-up.d/ndp-proxy /etc/sysconfig/network/if-down.d/ndp-proxy @@ -185,15 +186,6 @@ done # erroneous move from network/dhcp to network/config while 11.1 beta sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS -# -# * update to >= 11.2 -# -# FIXME: use disable_ipv6 -# move ipv6 settings created by yast2-network before 11.2 -# -if test -f etc/modprobe.d/ipv6 ; then - mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf -fi %postun %{insserv_cleanup} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/sysconfig.spec.in new/sysconfig-0.74.3/sysconfig.spec.in --- old/sysconfig-0.74.2/sysconfig.spec.in 2010-11-05 14:01:26.000000000 +0100 +++ new/sysconfig-0.74.3/sysconfig.spec.in 2011-01-06 10:45:47.000000000 +0100 @@ -27,6 +27,8 @@ License: GPLv2+ AutoReqProv: on PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep +# we may create these automatically from rpm later +Provides: sysvinit(network) Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 @@ -100,7 +102,6 @@ %dir /etc/modprobe.d %config /etc/sysconfig/network/ifcfg.template %config /etc/modprobe.d/50-blacklist.conf -%config(noreplace) /etc/modprobe.d/50-ipv6.conf /etc/sysconfig/network/scripts/* /etc/sysconfig/network/if-up.d/ndp-proxy /etc/sysconfig/network/if-down.d/ndp-proxy @@ -185,15 +186,6 @@ done # erroneous move from network/dhcp to network/config while 11.1 beta sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS -# -# * update to >= 11.2 -# -# FIXME: use disable_ipv6 -# move ipv6 settings created by yast2-network before 11.2 -# -if test -f etc/modprobe.d/ipv6 ; then - mv -f etc/modprobe.d/ipv6 etc/modprobe.d/50-ipv6.conf -fi %postun %{insserv_cleanup} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sysconfig-0.74.2/VERSION new/sysconfig-0.74.3/VERSION --- old/sysconfig-0.74.2/VERSION 2010-11-11 14:40:18.000000000 +0100 +++ new/sysconfig-0.74.3/VERSION 2011-01-06 10:45:47.000000000 +0100 @@ -1 +1 @@ -0.74.2 +0.74.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 net-snmp for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '11

05 Jan '11

Hello community, here is the log from the commit of package net-snmp for openSUSE:Factory checked in at Wed Jan 5 16:01:06 CET 2011. -------- --- net-snmp/net-snmp.changes 2010-11-30 19:11:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/net-snmp/net-snmp.changes 2011-01-04 12:34:47.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Jan 4 11:34:19 UTC 2011 - lchiquitto(a)novell.com + +- fix libsnmp version in baselibs.conf + +------------------------------------------------------------------- +Tue Jan 4 11:26:48 UTC 2011 - lchiquitto(a)novell.com + +- update to version 5.6.1: + new features and lots of bug fixes +- update upstream patches from branch V5-6-patches to 20110104 +- remove patches that are no longer needed: + net-snmp-5.6.0-ethtool-speed.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- net-snmp-5.6.0-ethtool-speed.patch net-snmp-5.6.0-upstream-20101129.patch.bz2 net-snmp-5.6.tar.bz2 New: ---- net-snmp-5.6.1.tar.bz2 net-snmp-5.6.1-upstream-20110104.patch.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-snmp.spec ++++++ --- /var/tmp/diff_new_pack.sxsoFY/_old 2011-01-05 16:00:36.000000000 +0100 +++ /var/tmp/diff_new_pack.sxsoFY/_new 2011-01-05 16:00:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package net-snmp (Version 5.6) +# spec file for package net-snmp (Version 5.6.1) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -27,8 +27,8 @@ %define netsnmp_agentx_socket_dir_rfc /var/agentx Name: net-snmp -Version: 5.6 -Release: 3 +Version: 5.6.1 +Release: 1 License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,7 +55,7 @@ Source7: net-snmp.sysconfig Source8: net-snmp-rpmlintrc Source9: baselibs.conf -Patch0: net-snmp-5.6.0-upstream-20101129.patch.bz2 +Patch0: net-snmp-5.6.1-upstream-20110104.patch.bz2 # unused patch atm Patch1: net-snmp-5.5.0-socket-path.patch Patch2: net-snmp-5.5.0-testing-empty-arptable.patch @@ -64,7 +64,6 @@ Patch6: net-snmp-5.5.0-perl-tk-warning.patch Patch7: net-snmp-5.5.0-velocity-mib.patch Patch9: net-snmp-5.6.0-enable-hrh-filesys.patch -Patch10: net-snmp-5.6.0-ethtool-speed.patch # Summary: SNMP Daemon @@ -207,7 +206,6 @@ %patch6 -p1 %patch7 -p1 %patch9 -p1 -%patch10 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.sxsoFY/_old 2011-01-05 16:00:37.000000000 +0100 +++ /var/tmp/diff_new_pack.sxsoFY/_new 2011-01-05 16:00:37.000000000 +0100 @@ -1,4 +1,4 @@ -libsnmp15 +libsnmp25 arch ppc package net-snmp-devel requires -net-snmp-<targettype> - requires "libsnmp15-<targettype> = <version>" + requires "libsnmp25-<targettype> = <version>" ++++++ net-snmp-5.6.tar.bz2 -> net-snmp-5.6.1.tar.bz2 ++++++ ++++ 23918 lines of diff (skipped) ++++++ net-snmp-5.6.0-upstream-20101129.patch.bz2 -> net-snmp-5.6.1-upstream-20110104.patch.bz2 ++++++ Files net-snmp/net-snmp-5.6.0-upstream-20101129.patch.bz2 and /mounts/work_src_done/STABLE/net-snmp/net-snmp-5.6.1-upstream-20110104.patch.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '11

05 Jan '11

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Wed Jan 5 15:59:50 CET 2011. -------- --- yast2/yast2.changes 2010-11-16 15:49:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-01-04 14:49:56.000000000 +0100 @@ -1,0 +2,32 @@ +Tue Jan 4 13:42:54 UTC 2011 - lslezak(a)suse.cz + +- check PackageKit status, suggest to quit the daemon if it is + running (bnc#659522) +- 2.20.10 + +------------------------------------------------------------------- +Mon Jan 3 17:25:36 UTC 2011 - lslezak(a)suse.cz + +- fixed VLAN config type detection (wrong regexp) +- 2.20.9 + +------------------------------------------------------------------- +Mon Jan 3 16:49:18 UTC 2011 - lslezak(a)suse.cz + +- don't abort when package checksum verification failes, ask to + download the file again (bnc#657608) +- 2.20.8 + +------------------------------------------------------------------- +Wed Dec 22 18:58:19 CET 2010 - mzugec(a)suse.cz + +- ifcfg-ethX.Y style config files for VLAN(fate#309240) +- 2.20.7 + +------------------------------------------------------------------- +Mon Dec 20 11:27:17 CET 2010 - mzugec(a)suse.cz + +- fate#306855: FCoE boot support +- 2.20.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.20.5.tar.bz2 New: ---- yast2-2.20.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.yhIkeK/_old 2011-01-05 15:59:18.000000000 +0100 +++ /var/tmp/diff_new_pack.yhIkeK/_new 2011-01-05 15:59:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2 (Version 2.20.5) +# spec file for package yast2 (Version 2.20.10) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.20.5 +Version: 2.20.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.20.5.tar.bz2 +Source0: yast2-2.20.10.tar.bz2 Prefix: /usr @@ -130,7 +130,7 @@ installation with YaST2. %prep -%setup -n yast2-2.20.5 +%setup -n yast2-2.20.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.20.5.tar.bz2 -> yast2-2.20.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/aclocal.m4 new/yast2-2.20.10/aclocal.m4 --- old/yast2-2.20.5/aclocal.m4 2010-11-12 09:59:59.000000000 +0100 +++ new/yast2-2.20.10/aclocal.m4 2011-01-04 14:47:43.000000000 +0100 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/configure new/yast2-2.20.10/configure --- old/yast2-2.20.5/configure 2010-11-12 09:59:59.000000000 +0100 +++ new/yast2-2.20.10/configure 2011-01-04 14:47:44.000000000 +0100 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for yast2 2.20.3. +# Generated by GNU Autoconf 2.67 for yast2 2.20.10. # # Report bugs to <http://bugs.opensuse.org/>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -318,7 +318,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -358,19 +358,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -532,7 +532,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.20.3' -PACKAGE_STRING='yast2 2.20.3' +PACKAGE_VERSION='2.20.10' +PACKAGE_STRING='yast2 2.20.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -744,8 +744,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -790,7 +791,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -816,7 +817,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1020,7 +1021,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1036,7 +1037,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1066,8 +1067,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1075,7 +1076,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1093,13 +1094,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1122,7 +1123,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1136,8 +1137,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1152,9 +1153,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1193,11 +1194,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1223,7 +1224,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.20.3 to adapt to many kinds of systems. +\`configure' configures yast2 2.20.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1237,7 +1238,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1294,7 +1295,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.20.3:";; + short | recursive ) echo "Configuration of yast2 2.20.10:";; esac cat <<\_ACEOF @@ -1374,10 +1375,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.20.3 -generated by GNU Autoconf 2.65 +yast2 configure 2.20.10 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1391,8 +1392,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.20.3, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by yast2 $as_me 2.20.10, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1502,11 +1503,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##"[] echo # The following way of writing the cache mishandles newlines in values, ( @@ -1540,11 +1539,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##"[] echo for ac_var in $ac_subst_vars do @@ -1557,11 +1554,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##"[] echo for ac_var in $ac_subst_files do @@ -1575,11 +1570,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##"[] echo cat confdefs.h echo @@ -1634,7 +1627,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1649,7 +1647,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1725,7 +1727,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -1742,16 +1744,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1765,7 +1773,7 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -1776,16 +1784,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1810,7 +1818,7 @@ ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -1818,7 +1826,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -1843,7 +1851,7 @@ ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi @@ -1851,7 +1859,7 @@ $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -1992,11 +2000,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2018,7 +2026,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2028,7 +2036,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2256,7 +2264,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2264,7 +2272,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2298,7 +2306,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2314,7 +2322,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.20.3' + VERSION='2.20.10' cat >>confdefs.h <<_ACEOF @@ -2436,7 +2444,7 @@ -VERSION="2.20.3" +VERSION="2.20.10" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2539,7 +2547,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2547,7 +2555,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2610,7 +2618,7 @@ if test -z "$XGETTEXT" ; then - as_fn_error "xgettext is missing; please install gettext-tools." "$LINENO" 5 + as_fn_error $? "xgettext is missing; please install gettext-tools." "$LINENO" 5 fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` @@ -2691,7 +2699,7 @@ if test "$YCPDOC" = "false"; then - as_fn_error "ycpdoc is not installed" "$LINENO" 5 + as_fn_error $? "ycpdoc is not installed" "$LINENO" 5 fi # Extract the first word of "ycpmakedep", so it can be a program name with args. set dummy ycpmakedep; ac_word=$2 @@ -2736,7 +2744,7 @@ if test "$YCPMAKEDEP" = "false"; then - as_fn_error "ycpmakedep is not installed" "$LINENO" 5 + as_fn_error $? "ycpmakedep is not installed" "$LINENO" 5 fi # Extract the first word of "ycpc", so it can be a program name with args. set dummy ycpc; ac_word=$2 @@ -2781,16 +2789,16 @@ if test "$YCPC" = "false"; then - as_fn_error "ycpc is not installed" "$LINENO" 5 + as_fn_error $? "ycpc is not installed" "$LINENO" 5 fi as_ac_File=`$as_echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5 $as_echo_n "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_File+set}\"" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then eval "$as_ac_File=yes" else @@ -2800,8 +2808,7 @@ eval ac_res=\$$as_ac_File { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_File"\" = x"yes"; then : else @@ -2853,7 +2860,7 @@ if test "$MYEXPECT" = "false"; then - as_fn_error "expect not installed" "$LINENO" 5 + as_fn_error $? "expect not installed" "$LINENO" 5 fi # Extract the first word of "runtest", so it can be a program name with args. set dummy runtest; ac_word=$2 @@ -2897,7 +2904,7 @@ if test "$MYRUNTEST" = "false"; then - as_fn_error "dejagnu not installed" "$LINENO" 5 + as_fn_error $? "dejagnu not installed" "$LINENO" 5 fi @@ -3039,6 +3046,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -3055,11 +3063,11 @@ if test -z "${CREATE_PKGCONFIG_TRUE}" && test -z "${CREATE_PKGCONFIG_FALSE}"; then - as_fn_error "conditional \"CREATE_PKGCONFIG\" was never defined. + as_fn_error $? "conditional \"CREATE_PKGCONFIG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CREATE_PKGCONFIG_NOARCH_TRUE}" && test -z "${CREATE_PKGCONFIG_NOARCH_FALSE}"; then - as_fn_error "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. + as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -3209,19 +3217,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -3417,7 +3425,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -3470,8 +3478,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.20.3, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by yast2 $as_me 2.20.10, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3523,11 +3531,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.20.3 -configured by $0, generated by GNU Autoconf 2.65, +yast2 config.status 2.20.10 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3545,11 +3553,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X$[^=]*$='` ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X$[^=]*$='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -3571,6 +3584,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -3581,7 +3595,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -3724,7 +3738,7 @@ "remote/Makefile") CONFIG_FILES="$CONFIG_FILES remote/Makefile" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -3760,7 +3774,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -3777,7 +3791,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -3791,18 +3805,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -3891,20 +3905,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^$[^=]*=[ ]*$:*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/$=[ ]*$.*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -3922,7 +3944,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -3950,7 +3972,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -3977,7 +3999,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -4114,22 +4136,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -4144,7 +4166,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -4165,7 +4187,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/configure.in new/yast2-2.20.10/configure.in --- old/yast2-2.20.5/configure.in 2010-11-12 09:59:56.000000000 +0100 +++ new/yast2-2.20.10/configure.in 2011-01-04 14:47:40.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.20.3, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.20.10, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.3" +VERSION="2.20.10" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/modules/Version.ycp new/yast2-2.20.10/library/modules/Version.ycp --- old/yast2-2.20.5/library/modules/Version.ycp 2010-11-16 15:48:48.000000000 +0100 +++ new/yast2-2.20.10/library/modules/Version.ycp 2011-01-04 14:47:54.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.20.5"; +global string yast2 = "2.20.10"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/src/NetworkInterfaces.ycp new/yast2-2.20.10/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.20.5/library/network/src/NetworkInterfaces.ycp 2010-09-30 09:41:50.000000000 +0200 +++ new/yast2-2.20.10/library/network/src/NetworkInterfaces.ycp 2011-01-03 18:22:20.000000000 +0100 @@ -182,6 +182,8 @@ global string GetType(string dev) { string type = ifcfg_part (dev, "1"); + // test if this is VLAN (ethX.vlanid) + if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\\.[[:digit:]]+$")) return "vlan"; foreach(string dev_type,map confs, Devices, { if (haskey(confs, dev)){ string int_type = confs[dev, "INTERFACETYPE"]:""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/src/NetworkStorage.ycp new/yast2-2.20.10/library/network/src/NetworkStorage.ycp --- old/yast2-2.20.5/library/network/src/NetworkStorage.ycp 2010-01-14 16:33:12.000000000 +0100 +++ new/yast2-2.20.10/library/network/src/NetworkStorage.ycp 2010-12-27 08:07:49.000000000 +0100 @@ -40,6 +40,21 @@ } integer network_based=0; + // test for multipath + if (network_based==0 && issubstring(device, "/dev/dm-")) { + y2warning("multipath detected!"); + string dev_name = splitstring(device, "/")[2]:""; + y2milestone("Multipath device name %1", dev_name); + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name)); + y2milestone("Show slaves command:%1", cmd); + if (cmd["exit"]:-1==0){ + // FIXME: what about more slaves? + list<string> slaves = splitstring(cmd["stdout"]:"", "\n"); + integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:"")); + if (nb>0) network_based=nb; + } else y2error("Error while executed show slaves commad:%1", cmd["stderr"]:""); + } + // test for LVM if (network_based==0 && issubstring(device, "/dev/mapper/")) { y2warning("LVM detected!"); @@ -84,7 +99,7 @@ } } -// test for nfs (bnc#384420) + // test for nfs (bnc#384420) if (network_based==0) { string space="[[:space:]]"; if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ @@ -92,6 +107,21 @@ network_based=2; } } + + //test for FCoE + if (network_based==0){ + if (issubstring(device, "/dev/")){ + device = splitstring(device, "/")[2]:""; + } + string sys=sformat("/sys/class/block/%1", device); + if (FileUtils::Exists(sys)){ + if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q target", sys))==0){ + y2warning("FCoE detected!"); + network_based=3; + } + } + } + return network_based; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.out new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.out --- old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.out 2010-03-12 09:45:40.000000000 +0100 +++ new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.out 2011-01-03 18:24:04.000000000 +0100 @@ -9,6 +9,8 @@ Dump ifcfg-lo, type: lo Dump ifcfg-eth0#1, type: eth Dump ifcfg-eth1#20, type: eth +Dump ifcfg-eth0.1, type: vlan +Dump ifcfg-eth1.20, type: vlan Dump ifcfg-eth-pcmcia-0#3, type: eth Dump ifcfg-eth-usb-1#0, type: eth Dump ifcfg-tr-pcmcia-2#432, type: tr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.ycp new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.ycp --- old/yast2-2.20.5/library/network/testsuite/tests/NetworkInterfaces.ycp 2010-03-12 09:45:40.000000000 +0100 +++ new/yast2-2.20.10/library/network/testsuite/tests/NetworkInterfaces.ycp 2011-01-03 18:23:57.000000000 +0100 @@ -20,6 +20,8 @@ "lo", "eth0#1", "eth1#20", + "eth0.1", + "eth1.20", "eth-pcmcia-0#3", "eth-usb-1#0", "tr-pcmcia-2#432", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/packages/src/PackageCallbacks.ycp new/yast2-2.20.10/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.20.5/library/packages/src/PackageCallbacks.ycp 2010-11-12 09:59:26.000000000 +0100 +++ new/yast2-2.20.10/library/packages/src/PackageCallbacks.ycp 2011-01-03 17:53:30.000000000 +0100 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 62754 2010-11-05 13:00:44Z lslezak $ + * $Id: PackageCallbacks.ycp 63064 2011-01-03 16:53:29Z lslezak $ * */ @@ -305,7 +305,8 @@ */ global string DoneProvide (integer error, string reason, string name) { - y2milestone("DoneProvide: %1", error); + y2milestone("DoneProvide: %1, %2, %3", error, reason, name); + if (_provide_popup) { UI::CloseDialog(); @@ -318,11 +319,131 @@ CommandLine::PrintVerboseNoCR(clear_string); } - if (error != 0) + if (provide_aborted) { + provide_aborted = false; return "C"; } + // INVALID + if (error == 3) + { + // error message, %1 is a package name + string message = sformat(_("Package %1 is broken, integrity check has failed."), name); + + + if (Mode::commandline()) { + CommandLine::Print(message); + + // ask user in the interactive mode + if (CommandLine::Interactive()) + { + CommandLine::Print(""); + + // command line mode - ask user whether installation of the failed package should be retried + CommandLine::Print(_("Retry installation of the package?")); + + if (CommandLine::YesNo()) + { + // return Retry + return "R"; + } + + // command line mode - ask user whether the installation should be aborted + CommandLine::Print(_("Abort the installation?")); + if (CommandLine::YesNo()) + { + // return Abort + return "C"; + } + + // otherwise return Ignore (default) + return "I"; + } + + return "I"; + } + + term button_box = `ButtonBox ( + `PushButton (`id(`abort), `opt (`cancelButton, `key_F9), Label::AbortButton()), + `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()), + `PushButton (`id(`ignore), `opt (`okButton), Label::SkipButton()) + ); + + if ( showLongInfo ) + { + UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), sformat (_("Error: %1:"), error) + reason) ); + } + else + { + UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) ); + UI::ReplaceWidget(`id(`info), `Empty() ); + } + + any r = nil; + + repeat + { + r = UI::UserInput(); + if ( r == `show ) + { + showLongInfo = ShowLogInfo (message, button_box); + if (showLongInfo) + { + string error_symbol = "ERROR"; + + if (error == 1) + { + error_symbol = "NOT_FOUND"; + } + else if (error == 2) + { + error_symbol = "IO"; + } + else if (error == 3) + { + error_symbol = "INVALID"; + } + + UI::ReplaceWidget(`id(`info), + `RichText (`opt(`plainText), + // error message, %1 is code of the error, + // detail string is appended to the end + sformat (_("Error: %1:"), error_symbol) + reason) ); + } + else + { + UI::ReplaceWidget(`id(`info), `Empty() ); + } + } + } until (r == `abort || r == `retry || r == `ignore); + + y2milestone ("DoneProvide %1", r); + + UI::CloseDialog(); + + if (r == `abort) + return "C"; + if (r == `retry) + return "R"; + if (r == `ignore) + { + // don't show the warning when a refresh fails + if (!autorefreshing) + { + // TODO: add "Don't show again" checkbox + // a warning popup displayed after pressing [Ignore] after a download error + Popup::Warning(_("Ignoring a download failure may result in a broken system. +The system should be later verified by running the Software Management module.")); + } + + return "I"; + } + + y2error("Unknown user input: %1", r); + } + return "I"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/packages/src/PackageKit.ycp new/yast2-2.20.10/library/packages/src/PackageKit.ycp --- old/yast2-2.20.5/library/packages/src/PackageKit.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.20.10/library/packages/src/PackageKit.ycp 2011-01-04 14:31:01.000000000 +0100 @@ -0,0 +1,63 @@ +/** + * File: modules/PackageKit.ycp + * Package: yast2 + * Summary: PackageKit access functions + * Authors: Ladislav Slezak <lslezak(a)suse.cz> + * + * $Id:$ + * + * This is a wrrapper around PackageKit DBus interface. + */ + +{ + module "PackageKit"; + + /** + * Check whether PackageKit daemon is running + * @return boolean return true if PackageKit is currently running + */ + global boolean IsRunning() + { + string cmd = "dbus-send --system --dest=org.freedesktop.DBus --type=method_call --print-reply " + + "--reply-timeout=200 / org.freedesktop.DBus.NameHasOwner string:org.freedesktop.PackageKit"; + y2milestone("Checking PackageKit status: %1", cmd); + + map out = (map)SCR::Execute(.target.bash_output, cmd); + + boolean ret = false; + list<string> lines = splitstring(out["stdout"]:"", "\n"); + + foreach(string line, lines, + { + if (regexpmatch(line, "boolean.*true")) + { + ret = true; + } + } + ); + + y2milestone("PackageKit is running: %1", ret); + + return ret; + } + + /** + * Ask the PackageKit daemon to quit + * If a transaction is in progress the daemon will not quit, + * you have to check the current status using isRunning() function. + */ + global void SuggestQuit() + { + string cmd = "dbus-send --system --dest=org.freedesktop.PackageKit --type=method_call " + + "/org/freedesktop/PackageKit org.freedesktop.PackageKit.SuggestDaemonQuit"; + y2milestone("Asking PackageKit to quit: %1", cmd); + + integer ret = (integer)SCR::Execute(.target.bash, cmd); + + if (ret != 0) + { + y2error("dbus-send failed!"); + } + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/library/packages/src/PackageLock.ycp new/yast2-2.20.10/library/packages/src/PackageLock.ycp --- old/yast2-2.20.5/library/packages/src/PackageLock.ycp 2010-05-26 17:07:02.000000000 +0200 +++ new/yast2-2.20.10/library/packages/src/PackageLock.ycp 2011-01-04 14:47:26.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Packages manipulation (system) * Authors: Martin Vidner <mvidner(a)suse.cz> * - * $Id: PackageLock.ycp 61908 2010-04-29 10:16:18Z jsrain $ + * $Id: PackageLock.ycp 63074 2011-01-04 13:47:24Z lslezak $ * * This should be used everywhere before Pkg is first used. #160319 */ @@ -16,9 +16,45 @@ import "Popup"; import "Label"; +import "PackageKit"; boolean have_lock = nil; boolean aborted = false; +// display a different message in the first PackageKit quit confirmation +boolean packagekit_asked = false; + +/** + * Ask whether to quit PackageKit if it is running + * @return boolean true if PackageKit was asked to quit + */ +boolean AskPackageKit() +{ + boolean ret = false; + + if (PackageKit::IsRunning()) + { + // ask to send quit signal to PackageKit + string msg = packagekit_asked ? + _("PackageKit is still running (probably busy). +Ask PackageKit to quit again?") + : + _("PackageKit is blocking software management. +This happens when the updater applet or another software management +application is running. + +Ask PackageKit to quit?"); + + packagekit_asked = true; + + if (Popup::YesNo(msg)) + { + PackageKit::SuggestQuit(); + ret = true; + } + } + + return ret; +} /** * Tries to acquire the packager (zypp) lock. @@ -40,6 +76,13 @@ if (have_lock == true) break; if (have_lock != true) { + if (AskPackageKit()) + { + // let the PackageKit quit before retrying + sleep(2000); + continue; + } + try_again = (Popup::AnyQuestion ( // TRANSLATORS: a popup headline _("Accessing the Software Management Failed"), @@ -83,6 +126,13 @@ if (have_lock == true) break; if (have_lock != true) { + if (AskPackageKit()) + { + // let the PackageKit quit before retrying + sleep(2000); + continue; + } + if (show_continue_button) { symbol ret = Popup::AnyQuestion3( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.20.5/VERSION new/yast2-2.20.10/VERSION --- old/yast2-2.20.5/VERSION 2010-11-16 15:45:23.000000000 +0100 +++ new/yast2-2.20.10/VERSION 2011-01-04 14:42:45.000000000 +0100 @@ -1 +1 @@ -2.20.5 +2.20.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-core for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '11

05 Jan '11

Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at Wed Jan 5 15:58:57 CET 2011. -------- --- yast2-core/yast2-core.changes 2010-08-10 14:00:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2011-01-03 22:28:56.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 3 20:53:16 UTC 2011 - lslezak(a)suse.cz + +- fixed packaging in openSUSE-11.4 (perl files) +- 2.20.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-core-2.19.3.tar.bz2 New: ---- yast2-core-2.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.0kJV4q/_old 2011-01-05 15:58:07.000000000 +0100 +++ /var/tmp/diff_new_pack.0kJV4q/_new 2011-01-05 15:58:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-core (Version 2.19.3) +# spec file for package yast2-core (Version 2.20.0) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: yast2-core -Version: 2.19.3 +Version: 2.20.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-core-2.19.3.tar.bz2 +Source0: yast2-core-2.20.0.tar.bz2 Prefix: /usr @@ -77,7 +77,7 @@ applications using the YaST2 YCP interpreter. %prep -%setup -n yast2-core-2.19.3 +%setup -n yast2-core-2.20.0 %build @@ -161,9 +161,12 @@ %{perl_vendorlib}/ycp.pm %dir %{perl_vendorlib}/YaST %{perl_vendorlib}/YaST/SCRAgent.pm + +%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 # .packlist %{perl_vendorarch}/auto/ycp /var/adm/perl-modules/%name +%endif %files devel %defattr(-,root,root) ++++++ yast2-core-2.19.3.tar.bz2 -> yast2-core-2.20.0.tar.bz2 ++++++ ++++ 3486 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/agent-modules/testsuite/tests/dir.scr new/yast2-core-2.20.0/agent-modules/testsuite/tests/dir.scr --- old/yast2-core-2.19.3/agent-modules/testsuite/tests/dir.scr 2009-07-09 17:55:30.000000000 +0200 +++ new/yast2-core-2.20.0/agent-modules/testsuite/tests/dir.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -. - -`ag_modules( - `ModulesConf("tests/dir.in.test") -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/agent-modules/testsuite/tests/missing.scr new/yast2-core-2.20.0/agent-modules/testsuite/tests/missing.scr --- old/yast2-core-2.19.3/agent-modules/testsuite/tests/missing.scr 2009-07-09 17:55:30.000000000 +0200 +++ new/yast2-core-2.20.0/agent-modules/testsuite/tests/missing.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -. - -`ag_modules( - `ModulesConf("tests/missing.in.test") -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/agent-modules/testsuite/tests/read1.scr new/yast2-core-2.20.0/agent-modules/testsuite/tests/read1.scr --- old/yast2-core-2.19.3/agent-modules/testsuite/tests/read1.scr 2009-07-09 17:55:30.000000000 +0200 +++ new/yast2-core-2.20.0/agent-modules/testsuite/tests/read1.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -. - -`ag_modules( - `ModulesConf("tests/read1.in.test") -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/agent-modules/testsuite/tests/write1.scr new/yast2-core-2.20.0/agent-modules/testsuite/tests/write1.scr --- old/yast2-core-2.19.3/agent-modules/testsuite/tests/write1.scr 2009-07-09 17:55:31.000000000 +0200 +++ new/yast2-core-2.20.0/agent-modules/testsuite/tests/write1.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -. - -`ag_modules( - `ModulesConf("tests/write1.in.test") -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/agent-modules/testsuite/tests/write2.scr new/yast2-core-2.20.0/agent-modules/testsuite/tests/write2.scr --- old/yast2-core-2.19.3/agent-modules/testsuite/tests/write2.scr 2009-07-09 17:55:23.000000000 +0200 +++ new/yast2-core-2.20.0/agent-modules/testsuite/tests/write2.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -. - -`ag_modules( - `ModulesConf("tests/write2.in.test") -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/agent-modules/testsuite/tests/write3.scr new/yast2-core-2.20.0/agent-modules/testsuite/tests/write3.scr --- old/yast2-core-2.19.3/agent-modules/testsuite/tests/write3.scr 2009-07-09 17:55:30.000000000 +0200 +++ new/yast2-core-2.20.0/agent-modules/testsuite/tests/write3.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -. - -`ag_modules( - `ModulesConf("tests/write3.in.test") -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/configure.in new/yast2-core-2.20.0/configure.in --- old/yast2-core-2.19.3/configure.in 2010-08-10 13:38:56.000000000 +0200 +++ new/yast2-core-2.20.0/configure.in 2011-01-03 22:16:49.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-core, 2.19.3, http://bugs.opensuse.org/, yast2-core) +AC_INIT(yast2-core, 2.20.0, http://bugs.opensuse.org/, yast2-core) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.3" +VERSION="2.20.0" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.19.3/VERSION new/yast2-core-2.20.0/VERSION --- old/yast2-core-2.19.3/VERSION 2010-08-10 13:28:19.000000000 +0200 +++ new/yast2-core-2.20.0/VERSION 2011-01-03 21:54:03.000000000 +0100 @@ -1 +1 @@ -2.19.3 +2.20.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ppp for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '11

05 Jan '11

Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at Wed Jan 5 15:57:44 CET 2011. -------- --- ppp/ppp.changes 2010-04-06 07:40:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/ppp/ppp.changes 2011-01-05 11:17:37.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Jan 5 10:17:28 UTC 2011 - coolo(a)novell.com + +- refresh patch + +------------------------------------------------------------------- +Wed Jan 5 09:17:19 UTC 2011 - aj(a)suse.de + +- Fix build of pppol2tp - remove local copy of if_pppol2tp.h + that is out of sync with kernel definition. +- Remove ppp-makedevice.patch, it is obsolete. + +------------------------------------------------------------------- +Wed Jan 5 09:03:05 UTC 2011 - aj(a)suse.de + +- Update to final 2.4.5 version with these changes: + * Pppd now works better with 3G modems that do strange things such as + sending IPCP Configure-Naks with the same values over and over again. + * Bugfixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ppp-2.4.5_git200910141435.tar.bz2 ppp-makedevice.patch New: ---- ppp-2.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppp.spec ++++++ --- /var/tmp/diff_new_pack.uPSzRx/_old 2011-01-05 15:56:36.000000000 +0100 +++ /var/tmp/diff_new_pack.uPSzRx/_new 2011-01-05 15:56:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ppp (Version 2.4.5_git200910141435) +# spec file for package ppp (Version 2.4.5) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Name: ppp BuildRequires: libpcap-devel linux-atm-devel pam-devel Url: http://www.samba.org/ppp/ -Version: 2.4.5_git200910141435 -Release: 3 +Version: 2.4.5 +Release: 1 License: BSD3c(or similar) ; LGPLv2.1+ Group: Productivity/Networking/PPP AutoReqProv: on @@ -63,7 +63,6 @@ # Don't use __P from glibc (pppd uses it wrong) Patch9: ppp-2.4.2-__P.diff Patch10: ppp-2.4.3-pppoatm.diff -Patch11: ppp-makedevice.patch Patch12: ppp-2.4.2-pie.patch Patch13: ppp-2.4.3-demand-fix.diff Patch14: ppp-2.4.3-fork-fix.diff @@ -81,17 +80,6 @@ the details of setting up a PPP link including configuring the network interface and performing the PPP negotiations. - - -Authors: --------- - Paul Mackerras <paul.mackerras(a)cs.anu.edu.au> - Michael Callahan <callahan(a)maths.ox.ac.uk> - Al Longyear <longyear(a)netcom.com> - Brad Parker <brad(a)faster.fcr.com> - Greg Christy <gmc(a)premises1.Qutoron.COM> - Michal Ostrowski <mostrows(a)styx.uwaterloo.ca> - %package devel License: BSD3c(or similar) ; LGPLv2.1+ Summary: Header Files Required for Developing Plugins for pppd @@ -102,17 +90,6 @@ The package ppp-devel contains C header files required for developing plugins for the pppd. - - -Authors: --------- - Paul Mackerras <paul.mackerras(a)cs.anu.edu.au> - Michael Callahan <callahan(a)maths.ox.ac.uk> - Al Longyear <longyear(a)netcom.com> - Brad Parker <brad(a)faster.fcr.com> - Greg Christy <gmc(a)premises1.Qutoron.COM> - Michal Ostrowski <mostrows(a)styx.uwaterloo.ca> - %prep %setup -q %patch0 @@ -125,7 +102,6 @@ %patch8 %patch9 %patch10 -p1 -# %patch11 %patch12 -p1 %patch13 %patch14 @@ -139,6 +115,8 @@ sed -i -e '1s/local\///' scripts/secure-card %build +# Remove local copy that is out of sync and use the one from linux-header +rm -f include/linux/if_pppol2tp.h export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP" ./configure --prefix=/usr make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y ++++++ ppp-2.4.4-lib64.patch ++++++ --- /var/tmp/diff_new_pack.uPSzRx/_old 2011-01-05 15:56:36.000000000 +0100 +++ /var/tmp/diff_new_pack.uPSzRx/_new 2011-01-05 15:56:36.000000000 +0100 @@ -1,6 +1,8 @@ ---- PLUGINS -+++ PLUGINS -@@ -14,7 +14,7 @@ +Index: PLUGINS +=================================================================== +--- PLUGINS.orig 2009-11-16 23:26:07.000000000 +0100 ++++ PLUGINS 2011-01-05 11:03:50.806314592 +0100 +@@ -14,7 +14,7 @@ plugin support only under Linux and Sola Plugins are loaded into pppd using the `plugin' option, which takes one argument, the name of a shared object file. The plugin option is a privileged option. If the name given does not contain a slash, pppd @@ -9,9 +11,11 @@ <version> is the version number of pppd, for example, 2.4.2. I suggest that you either give the full path name of the shared object file or just the base name; if you don't, it may be possible for ---- README -+++ README -@@ -200,8 +200,8 @@ +Index: README +=================================================================== +--- README.orig 2009-11-16 23:26:07.000000000 +0100 ++++ README 2011-01-05 11:03:50.806314592 +0100 +@@ -207,8 +207,8 @@ What was new in ppp-2.4.1. per-tty options file are parsed correctly, and don't override values from the command line in most cases. @@ -22,8 +26,10 @@ there is no slash in the plugin name. * When loading a plugin, pppd will now check the version of pppd for ---- pppd/pathnames.h -+++ pppd/pathnames.h +Index: pppd/pathnames.h +=================================================================== +--- pppd/pathnames.h.orig 2009-11-16 23:26:07.000000000 +0100 ++++ pppd/pathnames.h 2011-01-05 11:03:53.888316500 +0100 @@ -57,9 +57,9 @@ #ifdef PLUGIN @@ -36,9 +42,11 @@ #endif /* __STDC__ */ #endif /* PLUGIN */ ---- pppd/plugins/Makefile.linux -+++ pppd/plugins/Makefile.linux -@@ -7,7 +7,7 @@ +Index: pppd/plugins/Makefile.linux +=================================================================== +--- pppd/plugins/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100 ++++ pppd/plugins/Makefile.linux 2011-01-05 11:03:50.821313579 +0100 +@@ -7,7 +7,7 @@ INSTALL = install DESTDIR = $(INSTROOT)@DESTDIR@ BINDIR = $(DESTDIR)/sbin MANDIR = $(DESTDIR)/share/man/man8 @@ -47,9 +55,11 @@ SUBDIRS := rp-pppoe pppoatm pppol2tp # Uncomment the next line to include the radius authentication plugin ---- pppd/plugins/pppoatm/Makefile.linux -+++ pppd/plugins/pppoatm/Makefile.linux -@@ -7,7 +7,7 @@ +Index: pppd/plugins/pppoatm/Makefile.linux +=================================================================== +--- pppd/plugins/pppoatm/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100 ++++ pppd/plugins/pppoatm/Makefile.linux 2011-01-05 11:03:50.829313471 +0100 +@@ -7,7 +7,7 @@ INSTALL = install #*********************************************************************** DESTDIR = $(INSTROOT)@DESTDIR@ @@ -58,9 +68,11 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/plugins/pppol2tp/Makefile.linux -+++ pppd/plugins/pppol2tp/Makefile.linux -@@ -7,7 +7,7 @@ +Index: pppd/plugins/pppol2tp/Makefile.linux +=================================================================== +--- pppd/plugins/pppol2tp/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100 ++++ pppd/plugins/pppol2tp/Makefile.linux 2011-01-05 11:03:50.829313471 +0100 +@@ -7,7 +7,7 @@ INSTALL = install #*********************************************************************** DESTDIR = @DESTDIR@ @@ -69,8 +81,10 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/plugins/radius/Makefile.linux -+++ pppd/plugins/radius/Makefile.linux +Index: pppd/plugins/radius/Makefile.linux +=================================================================== +--- pppd/plugins/radius/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100 ++++ pppd/plugins/radius/Makefile.linux 2011-01-05 11:03:50.830314899 +0100 @@ -5,7 +5,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@ @@ -80,8 +94,10 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/plugins/rp-pppoe/Makefile.linux -+++ pppd/plugins/rp-pppoe/Makefile.linux +Index: pppd/plugins/rp-pppoe/Makefile.linux +=================================================================== +--- pppd/plugins/rp-pppoe/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100 ++++ pppd/plugins/rp-pppoe/Makefile.linux 2011-01-05 11:03:50.838313490 +0100 @@ -16,7 +16,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@ @@ -91,9 +107,11 @@ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/pppd.8 -+++ pppd/pppd.8 -@@ -911,7 +911,7 @@ +Index: pppd/pppd.8 +=================================================================== +--- pppd/pppd.8.orig 2011-01-05 11:03:50.000000000 +0100 ++++ pppd/pppd.8 2011-01-05 11:03:53.888316500 +0100 +@@ -911,7 +911,7 @@ persistent connections. .B plugin \fIfilename Load the shared library object file \fIfilename\fR as a plugin. This is a privileged option. If \fIfilename\fR does not contain a slash ++++++ ppp-2.4.5_git200910141435.tar.bz2 -> ppp-2.4.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/ipcp.c new/ppp-2.4.5/pppd/ipcp.c --- old/ppp-2.4.5_git200910141435/pppd/ipcp.c 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/ipcp.c 2009-11-16 23:26:07.000000000 +0100 @@ -575,6 +575,14 @@ f->callbacks = &ipcp_callbacks; fsm_init(&ipcp_fsm[unit]); + /* + * Some 3G modems use repeated IPCP NAKs as a way of stalling + * until they can contact a server on the network, so we increase + * the default number of NAKs we accept before we start treating + * them as rejects. + */ + f->maxnakloops = 100; + memset(wo, 0, sizeof(*wo)); memset(ao, 0, sizeof(*ao)); @@ -723,7 +731,8 @@ #define LENCIADDRS(neg) (neg ? CILEN_ADDRS : 0) #define LENCIVJ(neg, old) (neg ? (old? CILEN_COMPRESS : CILEN_VJ) : 0) #define LENCIADDR(neg) (neg ? CILEN_ADDR : 0) -#define LENCIDNS(neg) (neg ? (CILEN_ADDR) : 0) +#define LENCIDNS(neg) LENCIADDR(neg) +#define LENCIWINS(neg) LENCIADDR(neg) /* * First see if we want to change our options to the old @@ -745,7 +754,9 @@ LENCIVJ(go->neg_vj, go->old_vj) + LENCIADDR(go->neg_addr) + LENCIDNS(go->req_dns1) + - LENCIDNS(go->req_dns2)) ; + LENCIDNS(go->req_dns2) + + LENCIWINS(go->winsaddr[0]) + + LENCIWINS(go->winsaddr[1])) ; } @@ -819,6 +830,19 @@ neg = 0; \ } +#define ADDCIWINS(opt, addr) \ + if (addr) { \ + if (len >= CILEN_ADDR) { \ + u_int32_t l; \ + PUTCHAR(opt, ucp); \ + PUTCHAR(CILEN_ADDR, ucp); \ + l = ntohl(addr); \ + PUTLONG(l, ucp); \ + len -= CILEN_ADDR; \ + } else \ + addr = 0; \ + } + ADDCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs, go->ouraddr, go->hisaddr); @@ -831,6 +855,10 @@ ADDCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]); + ADDCIWINS(CI_MS_WINS1, go->winsaddr[0]); + + ADDCIWINS(CI_MS_WINS2, go->winsaddr[1]); + *lenp -= len; } @@ -1185,6 +1213,15 @@ try.req_dns2 = 1; no.req_dns2 = 1; break; + case CI_MS_WINS1: + case CI_MS_WINS2: + if (cilen != CILEN_ADDR) + goto bad; + GETLONG(l, p); + ciaddr1 = htonl(l); + if (ciaddr1) + try.winsaddr[citype == CI_MS_WINS2] = ciaddr1; + break; } p = next; } @@ -1301,6 +1338,21 @@ try.neg = 0; \ } +#define REJCIWINS(opt, addr) \ + if (addr && \ + ((cilen = p[1]) == CILEN_ADDR) && \ + len >= cilen && \ + p[0] == opt) { \ + u_int32_t l; \ + len -= cilen; \ + INCPTR(2, p); \ + GETLONG(l, p); \ + cilong = htonl(l); \ + /* Check rejected value. */ \ + if (cilong != addr) \ + goto bad; \ + try.winsaddr[opt == CI_MS_WINS2] = 0; \ + } REJCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs, go->ouraddr, go->hisaddr); @@ -1314,6 +1366,10 @@ REJCIDNS(CI_MS_DNS2, req_dns2, go->dnsaddr[1]); + REJCIWINS(CI_MS_WINS1, go->winsaddr[0]); + + REJCIWINS(CI_MS_WINS2, go->winsaddr[1]); + /* * If there are any remaining CIs, then this packet is bad. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/main.c new/ppp-2.4.5/pppd/main.c --- old/ppp-2.4.5_git200910141435/pppd/main.c 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/main.c 2009-11-16 23:26:07.000000000 +0100 @@ -964,7 +964,7 @@ { 0x8051, "KNX Bridging Control Protocol" }, { 0x8053, "Encryption Control Protocol" }, { 0x8055, "Individual Link Encryption Control Protocol" }, - { 0x8057, "IPv6 Control Protovol" }, + { 0x8057, "IPv6 Control Protocol" }, { 0x8059, "PPP Muxing Control Protocol" }, { 0x805b, "Vendor-Specific Network Control Protocol (VSNCP)" }, { 0x806f, "Stampede Bridging Control Protocol" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/patchlevel.h new/ppp-2.4.5/pppd/patchlevel.h --- old/ppp-2.4.5_git200910141435/pppd/patchlevel.h 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/patchlevel.h 2009-11-16 23:26:07.000000000 +0100 @@ -1,2 +1,2 @@ #define VERSION "2.4.5" -#define DATE "6 September 2008" +#define DATE "17 November 2009" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/sys-linux.c new/ppp-2.4.5/pppd/sys-linux.c --- old/ppp-2.4.5_git200910141435/pppd/sys-linux.c 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/sys-linux.c 2009-11-16 23:26:07.000000000 +0100 @@ -1658,6 +1658,8 @@ SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); + rt.rt_dev = ifname; + if (kernel_version > KVERSION(2,1,0)) { SET_SA_FAMILY (rt.rt_genmask, AF_INET); SIN_ADDR(rt.rt_genmask) = 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/README new/ppp-2.4.5/README --- old/ppp-2.4.5_git200910141435/README 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/README 2009-11-16 23:26:07.000000000 +0100 @@ -70,10 +70,17 @@ possible to have no remote IP address assigned to the ppp interface and still route traffic over it. +* Pppd now works better with 3G modems that do strange things such as + sending IPCP Configure-Naks with the same values over and over again. + * The PPP over L2TP plugin is included, which works with the pppol2tp PPP channel code in the Linux kernel. This allows pppd to be used to set up tunnels using the Layer 2 Tunneling Protocol. +* A new 'enable-session' option has been added, which enables session + accounting via PAM or wtwp/wtmpx, as appropriate. See the pppd man + page for details. + * Several bugs have been fixed. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-SGMLS for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '11

05 Jan '11

Hello community, here is the log from the commit of package perl-SGMLS for openSUSE:Factory checked in at Wed Jan 5 15:56:14 CET 2011. -------- --- perl-SGMLS/perl-SGMLS.changes 2010-10-19 10:47:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-SGMLS/perl-SGMLS.changes 2011-01-04 14:04:37.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Jan 4 13:04:29 UTC 2011 - coolo(a)novell.com + +- ran spec-cleaner + +------------------------------------------------------------------- +Thu Dec 16 14:49:38 UTC 2010 - vcizek(a)novell.com + +- switched to %perl_requires macro + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-SGMLS.spec ++++++ --- /var/tmp/diff_new_pack.fWGr38/_old 2011-01-05 15:54:45.000000000 +0100 +++ /var/tmp/diff_new_pack.fWGr38/_new 2011-01-05 15:54:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-SGMLS (Version 1.03ii) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,50 +15,42 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-SGMLS -Url: http://www.garshol.priv.no/download/xmltools/prod/SGMLSpm.html +Version: 1.03ii +Release: 528 License: LGPLv2.1+ -Group: Productivity/Publishing/SGML -Requires: perl = %perl_version -AutoReqProv: on Summary: SGML/XML Parsers -Version: 1.03ii -Release: 527 +Url: http://www.garshol.priv.no/download/xmltools/prod/SGMLSpm.html +Group: Productivity/Publishing/SGML Source: SGMLSpm-%version.tar.bz2 +BuildRequires: perl perl-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: perl +%perl_requires %description SGMLSpm is a Perl script that reads ESIS output (from parsers like SP) and offers an event-based interface to the parser. As long as the parser can parse XML this also works for XML. - - -Authors: --------- - David Megginson <dmeggins(a)aix1.uottawa.ca> - %prep %setup -n SGMLSpm -q %build %install -mkdir -p $RPM_BUILD_ROOT/%perl_vendorlib -mkdir -p $RPM_BUILD_ROOT/%perl_vendorlib/SGMLS -mkdir -p $RPM_BUILD_ROOT/usr/bin -install SGMLS.pm $RPM_BUILD_ROOT/%perl_vendorlib -install skel.pl $RPM_BUILD_ROOT/%perl_vendorlib -install Output.pm Refs.pm $RPM_BUILD_ROOT/%perl_vendorlib/SGMLS -install sgmlspl.pl $RPM_BUILD_ROOT/usr/bin/sgmlspl +mkdir -p %{buildroot}%perl_vendorlib +mkdir -p %{buildroot}%perl_vendorlib/SGMLS +mkdir -p %{buildroot}%{_prefix}/bin +install SGMLS.pm %{buildroot}%perl_vendorlib +install skel.pl %{buildroot}%perl_vendorlib +install Output.pm Refs.pm %{buildroot}%perl_vendorlib/SGMLS +install sgmlspl.pl %{buildroot}%{_bindir}/sgmlspl mv DOC/sample.pl DOC/HTML/SGMLSpm/sample.pl %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -68,6 +60,6 @@ %perl_vendorlib/skel.pl %perl_vendorlib/SGMLS/Output.pm %perl_vendorlib/SGMLS/Refs.pm -/usr/bin/sgmlspl +%{_bindir}/sgmlspl %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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