Hello community, here is the log from the commit of package yast2-transfer for openSUSE:Factory checked in at Thu Sep 1 14:55:46 CEST 2011.
-------- --- yast2-transfer/yast2-transfer.changes 2009-06-19 12:32:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-transfer/yast2-transfer.changes 2011-07-29 16:10:53.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jul 29 14:16:32 CEST 2011 - [email protected] + +- add support for client certificates for HTTPS +- 2.21.0 + +------------------------------------------------------------------- +Fri Oct 9 14:13:13 CEST 2009 - [email protected] + +- 2.18.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-transfer-2.18.0.tar.bz2 New: ---- yast2-transfer-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-transfer.spec ++++++ --- /var/tmp/diff_new_pack.MXu3kS/_old 2011-09-01 14:54:57.000000000 +0200 +++ /var/tmp/diff_new_pack.MXu3kS/_new 2011-09-01 14:54:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-transfer (Version 2.18.0) +# spec file for package yast2-transfer # -# Copyright (c) 2009 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,13 +19,16 @@ Name: yast2-transfer -Version: 2.18.0 -Release: 2 -License: GPL -Group: System/YaST +Version: 2.21.0 +Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-transfer-2.18.0.tar.bz2 +Source0: yast2-transfer-2.21.0.tar.bz2 + Prefix: /usr + +Group: System/YaST +License: GPL v2 or later BuildRequires: curl-devel doxygen gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Summary: YaST2 - Agent for Various Transfer Protocols Provides: yast2-agent-curl yast2-agent-tftp yast2-agent-curl-devel yast2-agent-tftp-devel @@ -36,17 +39,21 @@ A YaST2 Agent for various Transfer Protocols: FTP, HTTP, and TFTP. %prep -%setup -n yast2-transfer-2.18.0 +%setup -n yast2-transfer-2.21.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" @@ -55,6 +62,7 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ag_curl.la rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ag_tftp.la @@ -73,5 +81,6 @@ /usr/share/YaST2/modules/* #%dir /usr/share/YaST2/include/transfer #/usr/share/YaST2/include/transfer/url.ycp + %doc %{prefix}/share/doc/packages/yast2-transfer %changelog ++++++ yast2-transfer-2.18.0.tar.bz2 -> yast2-transfer-2.21.0.tar.bz2 ++++++ ++++ 18320 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-transfer-2.18.0/VERSION new/yast2-transfer-2.21.0/VERSION --- old/yast2-transfer-2.18.0/VERSION 2009-05-25 15:30:55.000000000 +0200 +++ new/yast2-transfer-2.21.0/VERSION 2011-07-29 16:01:59.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.21.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/yast2-transfer-2.18.0/agent-curl/src/CurlAgent.cc new/yast2-transfer-2.21.0/agent-curl/src/CurlAgent.cc --- old/yast2-transfer-2.18.0/agent-curl/src/CurlAgent.cc 2008-01-04 09:49:10.000000000 +0100 +++ new/yast2-transfer-2.21.0/agent-curl/src/CurlAgent.cc 2011-07-29 14:17:08.000000000 +0200 @@ -7,7 +7,7 @@ * Authors: * Anas Nashif <[email protected]> * - * $Id: CurlAgent.cc 43263 2008-01-04 08:49:10Z ug $ + * $Id: CurlAgent.cc 65085 2011-07-29 12:17:07Z ug $ */ #include "CurlAgent.h" @@ -22,6 +22,8 @@ CurlAgent::CurlAgent() : SCRAgent() { easySSL_val = false; + clientKeyPath_val = NULL; + clientCertPath_val = NULL; } /** @@ -37,6 +39,30 @@ return; } +void CurlAgent::clientCertSSL( const char *path ) +{ + if( clientCertPath_val != NULL ) + free(clientCertPath_val); + if( path != NULL ) { + clientCertPath_val = new char [strlen (path) + 1]; + if( clientCertPath_val != NULL ) + strcpy( clientCertPath_val, path ); + } + return; +} + +void CurlAgent::clientKeySSL( const char *path ) +{ + if( clientKeyPath_val != NULL ) + free(clientKeyPath_val); + if( path != NULL ) { + clientKeyPath_val = new char [strlen (path) + 1]; + if( clientKeyPath_val != NULL ) + strcpy( clientKeyPath_val, path ); + } + return; +} + YCPValue CurlAgent::Get( const char *url, const char *target) { @@ -64,6 +90,10 @@ curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); if( easySSL_val ) curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); + if( clientCertPath_val != NULL ) + curl_easy_setopt(curl, CURLOPT_SSLCERT, clientCertPath_val); + if( clientKeyPath_val != NULL ) + curl_easy_setopt(curl, CURLOPT_SSLKEY, clientKeyPath_val); res = curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile); if ( res != 0 ) { fclose( outfile ); @@ -235,6 +265,18 @@ easySSL( (bool)(value->asBoolean()->value()) ); } } + else if (path_name == "clientKeySSL") + { + if ( !value.isNull() ) { + clientKeySSL( (const char *)(value->asString()->value().c_str()) ); + } + } + else if (path_name == "clientCertSSL") + { + if ( !value.isNull() ) { + clientCertSSL( (const char *)(value->asString()->value().c_str()) ); + } + } /* else if (path_name == "post") { 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-transfer-2.18.0/agent-curl/src/CurlAgent.h new/yast2-transfer-2.21.0/agent-curl/src/CurlAgent.h --- old/yast2-transfer-2.18.0/agent-curl/src/CurlAgent.h 2006-01-05 10:58:00.000000000 +0100 +++ new/yast2-transfer-2.21.0/agent-curl/src/CurlAgent.h 2011-07-29 14:17:08.000000000 +0200 @@ -7,7 +7,7 @@ * Authors: * Anas Nashif <[email protected]> * - * $Id: CurlAgent.h 26811 2006-01-05 09:58:00Z locilka $ + * $Id: CurlAgent.h 65085 2011-07-29 12:17:07Z ug $ */ #ifndef _CurlAgent_h @@ -27,6 +27,8 @@ * Agent private variables */ bool easySSL_val; + char* clientKeyPath_val; + char* clientCertPath_val; public: /** @@ -76,6 +78,8 @@ // virtual YCPValue Post( const char *url, const char *post, const char *target); virtual string getMapValue ( const YCPMap map, const string key, const string defaultValue); virtual void easySSL( bool easy ); + virtual void clientCertSSL( const char *path ); + virtual void clientKeySSL( const char *path ); private: 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-transfer-2.18.0/autodocs-cc-base.ami new/yast2-transfer-2.21.0/autodocs-cc-base.ami --- old/yast2-transfer-2.18.0/autodocs-cc-base.ami 2009-06-22 08:19:51.000000000 +0200 +++ new/yast2-transfer-2.21.0/autodocs-cc-base.ami 2011-07-29 16:02:29.000000000 +0200 @@ -15,7 +15,7 @@ AUTODOCS_CC ?= $(srcdir)/../../src AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h -html_data = index.html $(wildcard *.html *.png) doxygen.css @[email protected] +html_data = index.html $(filter-out index.html, $(wildcard *.html *.png)) doxygen.css @[email protected] CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox doxygen.css @[email protected]: index.html 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-transfer-2.18.0/config.h.in new/yast2-transfer-2.21.0/config.h.in --- old/yast2-transfer-2.18.0/config.h.in 2009-06-22 08:20:01.000000000 +0200 +++ new/yast2-transfer-2.21.0/config.h.in 2011-07-29 16:02:36.000000000 +0200 @@ -64,6 +64,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -80,3 +83,6 @@ /* Version number of package */ #undef VERSION + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +#undef size_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/yast2-transfer-2.18.0/configure.in new/yast2-transfer-2.21.0/configure.in --- old/yast2-transfer-2.18.0/configure.in 2009-06-22 08:19:51.000000000 +0200 +++ new/yast2-transfer-2.21.0/configure.in 2011-07-29 16:02:29.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-transfer dnl -dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-transfer, 2.18.0, http://bugs.opensuse.org/, yast2-transfer) +AC_INIT(yast2-transfer, 2.21.0, http://bugs.opensuse.org/, yast2-transfer) 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.18.0" +VERSION="2.21.0" RPMNAME="yast2-transfer" MAINTAINER="Uwe Gansert <[email protected]>" @@ -91,7 +91,9 @@ AC_SUBST(fillupdir) - +dnl Automake 1.11 enables silent compilation, +dnl Disable it by "configure --disable-silent-rules" or "make V=1" +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Checks for programs. AC_PROG_INSTALL 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-transfer-2.18.0/libtool.m4 new/yast2-transfer-2.21.0/libtool.m4 --- old/yast2-transfer-2.18.0/libtool.m4 2009-06-22 08:19:56.000000000 +0200 +++ new/yast2-transfer-2.21.0/libtool.m4 2011-07-29 16:02:33.000000000 +0200 @@ -684,7 +684,6 @@ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # _LT_COPYING @@ -1021,7 +1020,7 @@ # to the aix ld manual. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +AC_LINK_IFELSE([AC_LANG_PROGRAM],[ lt_aix_libpath_sed=' /Import File Strings/,/^$/ { /^0/ { @@ -4826,9 +4825,18 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], [ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) + ]) LDFLAGS="$save_LDFLAGS" else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' 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-transfer-2.18.0/ltversion.m4 new/yast2-transfer-2.21.0/ltversion.m4 --- old/yast2-transfer-2.18.0/ltversion.m4 2009-06-22 08:19:56.000000000 +0200 +++ new/yast2-transfer-2.21.0/ltversion.m4 2011-07-29 16:02:33.000000000 +0200 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3018 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3018]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3018' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 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/yast2-transfer-2.18.0/missing new/yast2-transfer-2.21.0/missing --- old/yast2-transfer-2.18.0/missing 2009-06-22 08:20:02.000000000 +0200 +++ new/yast2-transfer-2.21.0/missing 2011-07-29 16:02:37.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 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 <[email protected]>." 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/yast2-transfer-2.18.0/module/HTTP.ycp new/yast2-transfer-2.21.0/module/HTTP.ycp --- old/yast2-transfer-2.18.0/module/HTTP.ycp 2006-06-01 14:32:41.000000000 +0200 +++ new/yast2-transfer-2.21.0/module/HTTP.ycp 2011-07-29 14:17:08.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <[email protected]> * Flags: Stable * - * $Id: HTTP.ycp 31241 2006-06-01 12:32:41Z locilka $ + * $Id: HTTP.ycp 65085 2011-07-29 12:17:07Z ug $ */ { @@ -58,5 +58,18 @@ return; } +global define void clientCertSSL( string cert_path ) ``{ + y2debug("setting clientCertSSL to %1",cert_path); + SCR::Execute(.curl.clientCertSSL, cert_path, $[]); + return; +} + +global define void clientKeySSL( string key_path ) ``{ + y2debug("setting clientKeySSL to %1",key_path); + SCR::Execute(.curl.clientKeySSL, key_path, $[]); + return; +} + + /* EOF */ } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
