Hello community, here is the log from the commit of package yast2-transfer for openSUSE:Factory checked in at 2013-08-01 11:10:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-transfer (Old) and /work/SRC/openSUSE:Factory/.yast2-transfer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-transfer" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-transfer/yast2-transfer.changes 2013-03-01 09:12:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-transfer.new/yast2-transfer.changes 2013-08-01 11:10:29.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 31 08:43:29 UTC 2013 - [email protected] + +- converted from YCP to Ruby by YCP Killer + (https://github.com/yast/ycp-killer) +- version 3.0.0 + +------------------------------------------------------------------- Old: ---- yast2-transfer-2.21.1.tar.bz2 New: ---- yast2-transfer-3.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-transfer.spec ++++++ --- /var/tmp/diff_new_pack.ykL4v7/_old 2013-08-01 11:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ykL4v7/_new 2013-08-01 11:10:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-transfer -Version: 2.21.1 +Version: 3.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +36,8 @@ %if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel %endif +Requires: yast2-ruby-bindings >= 1.0.0 + Summary: YaST2 - Agent for Various Transfer Protocols License: GPL-2.0 Group: System/YaST ++++++ yast2-transfer-2.21.1.tar.bz2 -> yast2-transfer-3.0.0.tar.bz2 ++++++ ++++ 2205 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.21.1/Makefile.am new/yast2-transfer-3.0.0/Makefile.am --- old/yast2-transfer-2.21.1/Makefile.am 2013-02-22 11:06:56.000000000 +0100 +++ new/yast2-transfer-3.0.0/Makefile.am 2013-07-31 10:59:01.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: @@ -198,4 +193,4 @@ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agent-curl agent-tftp doc module testsuite +SUBDIRS = agent-curl agent-tftp doc module src testsuite 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.21.1/Makefile.am.common new/yast2-transfer-3.0.0/Makefile.am.common --- old/yast2-transfer-2.21.1/Makefile.am.common 2013-02-22 11:06:56.000000000 +0100 +++ new/yast2-transfer-3.0.0/Makefile.am.common 2013-07-31 10:59:01.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ 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.21.1/VERSION new/yast2-transfer-3.0.0/VERSION --- old/yast2-transfer-2.21.1/VERSION 2013-01-22 12:17:11.000000000 +0100 +++ new/yast2-transfer-3.0.0/VERSION 2013-07-30 13:55:06.000000000 +0200 @@ -1 +1 @@ -2.21.1 +3.0.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.21.1/autodocs-cc-base.ami new/yast2-transfer-3.0.0/autodocs-cc-base.ami --- old/yast2-transfer-2.21.1/autodocs-cc-base.ami 2013-02-22 11:06:56.000000000 +0100 +++ new/yast2-transfer-3.0.0/autodocs-cc-base.ami 2013-07-31 10:59:01.000000000 +0200 @@ -15,7 +15,7 @@ AUTODOCS_CC ?= $(srcdir)/../../src AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h -html_data = index.html $(filter-out index.html, $(wildcard *.html *.png)) doxygen.css @[email protected] +html_data = index.html $(filter-out index.html, $(wildcard *.html *.png *.css *.js)) @[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.21.1/config.h.in new/yast2-transfer-3.0.0/config.h.in --- old/yast2-transfer-2.21.1/config.h.in 2013-02-22 11:07:07.000000000 +0100 +++ new/yast2-transfer-3.0.0/config.h.in 2013-07-31 10:59:13.000000000 +0200 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. 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.21.1/configure.ac new/yast2-transfer-3.0.0/configure.ac --- old/yast2-transfer-2.21.1/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-transfer-3.0.0/configure.ac 2013-07-31 10:59:01.000000000 +0200 @@ -0,0 +1,213 @@ +dnl configure.ac for yast2-transfer +dnl +dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl (edit configure.ac.in or configure.in.in instead) + +AC_INIT(yast2-transfer, 3.0.0, http://bugs.opensuse.org/, yast2-transfer) +dnl Check for presence of file 'RPMNAME' +AC_CONFIG_SRCDIR([RPMNAME]) + +dnl Checking host/target/build systems, for make, install etc. +AC_CANONICAL_TARGET +dnl Perform program name transformation +AC_ARG_PROGRAM + +AC_PREFIX_DEFAULT(/usr) + +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) + +dnl Important YaST2 variables +VERSION="3.0.0" +RPMNAME="yast2-transfer" +MAINTAINER="Michael Andres <[email protected]>" + +dnl pkgconfig honors lib64 +pkgconfigdir=\${libdir}/pkgconfig +pkgconfigdatadir=\${datadir}/pkgconfig +yast2dir=\${prefix}/share/YaST2 + +ybindir=\${prefix}/lib/YaST2/bin +# FIXME duplicates execcompdir +ystartupdir=\${prefix}/lib/YaST2 +plugindir=\${libdir}/YaST2/plugin +includedir=\${prefix}/include/YaST2 +potdir=\${docdir}/pot + +docdir=\${prefix}/share/doc/packages/$RPMNAME +mandir=\${prefix}/share/man + +execcompdir=\${prefix}/lib/YaST2 +agentdir=${execcompdir}/servers_non_y2 + +ydatadir=${yast2dir}/data +imagedir=${yast2dir}/images +themedir=${yast2dir}/theme +localedir=${yast2dir}/locale +clientdir=${yast2dir}/clients +moduledir=${yast2dir}/modules +yncludedir=${yast2dir}/include +schemadir=${yast2dir}/schema +scrconfdir=${yast2dir}/scrconf +desktopdir=\${prefix}/share/applications/YaST2 + +AC_SUBST(VERSION) +AC_SUBST(RPMNAME) +AC_SUBST(MAINTAINER) + +AC_SUBST(pkgconfigdir) +AC_SUBST(pkgconfigdatadir) + +AC_SUBST(yast2dir) + +AC_SUBST(ybindir) +AC_SUBST(ystartupdir) +AC_SUBST(plugindir) +AC_SUBST(includedir) +AC_SUBST(potdir) +AC_SUBST(execcompdir) + +AC_SUBST(docdir) +AC_SUBST(mandir) + +AC_SUBST(ydatadir) +AC_SUBST(imagedir) +AC_SUBST(themedir) +AC_SUBST(localedir) +AC_SUBST(clientdir) +AC_SUBST(moduledir) +AC_SUBST(yncludedir) +AC_SUBST(schemadir) +AC_SUBST(scrconfdir) +AC_SUBST(agentdir) +AC_SUBST(desktopdir) + +fillupdir_d="/var/adm/fillup-templates" +AC_ARG_WITH(fillupdir, + AS_HELP_STRING([--with-fillupdir=DIR], + [where to place fillup templates (default $fillupdir_d.]), + [ fillupdir="$withval" ], + [ fillupdir="$fillupdir_d" ]) +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 +dnl The YCP interpreter checks whether dependent ybc files are older +dnl so we must preserve their timestamps +INSTALL="${INSTALL} -p" +AC_PROG_LN_S +AC_PROG_MAKE_SET + +dnl pkgconfig +AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) +dnl devtools +dnl ... + +dnl no need for AC_ARG_VAR +AC_PATH_PROG(XGETTEXT, xgettext) +if test -z "$XGETTEXT" ; then + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) +fi + +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` + +dnl producing pkg-config for others? +AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) +AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) + +dbdir=${devtools_yast2dir}/data/docbook +STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl +STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl +STYLESHEET_CSS=${dbdir}/css/yast2docs.css +STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl +STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl +AC_SUBST(STYLESHEET_HTML) +AC_SUBST(STYLESHEET_PDF) +AC_SUBST(STYLESHEET_CSS) +AC_SUBST(STYLESHEET_YDOC) +AC_SUBST(STYLESHEET_YCPDOC) + + +AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) +if test "$YCPDOC" = "false"; then + AC_MSG_ERROR([ycpdoc is not installed]) +fi +AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) +if test "$YCPMAKEDEP" = "false"; then + AC_MSG_ERROR([ycpmakedep is not installed]) +fi +AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) +if test "$YCPC" = "false"; then + AC_MSG_ERROR([ycpc is not installed]) +fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) + + +AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) +if test "$YDOXYGEN" = "false"; then + AC_MSG_ERROR([ydoxygen is not installed]) +fi + +AC_PROG_CXX +AC_PROG_AWK +AC_PROG_CC +AC_PROG_CPP + +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already +PKG_CHECK_EXISTS([yast2-core],[ + PKG_CHECK_MODULES(Y2CORE, yast2-core) +]) + +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" + +: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'} +AC_SUBST(AGENT_LIBADD) + +AC_DISABLE_STATIC +AC_PROG_LIBTOOL +AM_PROG_LIBTOOL dnl for libraries + +dnl generate the config header +AC_CONFIG_HEADERS([config.h]) dnl at the distribution this done + +AC_FUNC_ALLOCA +AC_HEADER_STDC + + +AC_CHECK_PROG(curl_config,curl-config,yes) +if test "$curl_config" = "yes" ; then + CURL_CFLAGS="`curl-config --cflags`" + CURL_LIBS="`curl-config --libs`" + AC_SUBST(CURL_LIBS) + AC_SUBST(CURL_CFLAGS) +fi + + +AC_CONFIG_FILES(Makefile agent-curl/doc/autodocs/Makefile +agent-curl/doc/Makefile +agent-curl/src/Makefile +agent-curl/conf/Makefile +agent-curl/Makefile +agent-tftp/doc/autodocs/Makefile +agent-tftp/doc/Makefile +agent-tftp/src/Makefile +agent-tftp/conf/Makefile +agent-tftp/Makefile +doc/Makefile +module/Makefile +src/Makefile +testsuite/Makefile) +AC_OUTPUT + 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.21.1/configure.in new/yast2-transfer-3.0.0/configure.in --- old/yast2-transfer-2.21.1/configure.in 2013-02-22 11:06:56.000000000 +0100 +++ new/yast2-transfer-3.0.0/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,212 +0,0 @@ -dnl configure.in for yast2-transfer -dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- -dnl (edit configure.in.in instead) - -AC_INIT(yast2-transfer, 2.21.1, http://bugs.opensuse.org/, yast2-transfer) -dnl Check for presence of file 'RPMNAME' -AC_CONFIG_SRCDIR([RPMNAME]) - -dnl Checking host/target/build systems, for make, install etc. -AC_CANONICAL_TARGET -dnl Perform program name transformation -AC_ARG_PROGRAM - -AC_PREFIX_DEFAULT(/usr) - -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) - -dnl Important YaST2 variables -VERSION="2.21.1" -RPMNAME="yast2-transfer" -MAINTAINER="Michael Andres <[email protected]>" - -dnl pkgconfig honors lib64 -pkgconfigdir=\${libdir}/pkgconfig -pkgconfigdatadir=\${datadir}/pkgconfig -yast2dir=\${prefix}/share/YaST2 - -ybindir=\${prefix}/lib/YaST2/bin -# FIXME duplicates execcompdir -ystartupdir=\${prefix}/lib/YaST2 -plugindir=\${libdir}/YaST2/plugin -includedir=\${prefix}/include/YaST2 -potdir=\${docdir}/pot - -docdir=\${prefix}/share/doc/packages/$RPMNAME -mandir=\${prefix}/share/man - -execcompdir=\${prefix}/lib/YaST2 -agentdir=${execcompdir}/servers_non_y2 - -ydatadir=${yast2dir}/data -imagedir=${yast2dir}/images -themedir=${yast2dir}/theme -localedir=${yast2dir}/locale -clientdir=${yast2dir}/clients -moduledir=${yast2dir}/modules -yncludedir=${yast2dir}/include -schemadir=${yast2dir}/schema -scrconfdir=${yast2dir}/scrconf -desktopdir=\${prefix}/share/applications/YaST2 - -AC_SUBST(VERSION) -AC_SUBST(RPMNAME) -AC_SUBST(MAINTAINER) - -AC_SUBST(pkgconfigdir) -AC_SUBST(pkgconfigdatadir) - -AC_SUBST(yast2dir) - -AC_SUBST(ybindir) -AC_SUBST(ystartupdir) -AC_SUBST(plugindir) -AC_SUBST(includedir) -AC_SUBST(potdir) -AC_SUBST(execcompdir) - -AC_SUBST(docdir) -AC_SUBST(mandir) - -AC_SUBST(ydatadir) -AC_SUBST(imagedir) -AC_SUBST(themedir) -AC_SUBST(localedir) -AC_SUBST(clientdir) -AC_SUBST(moduledir) -AC_SUBST(yncludedir) -AC_SUBST(schemadir) -AC_SUBST(scrconfdir) -AC_SUBST(agentdir) -AC_SUBST(desktopdir) - -fillupdir_d="/var/adm/fillup-templates" -AC_ARG_WITH(fillupdir, - AS_HELP_STRING([--with-fillupdir=DIR], - [where to place fillup templates (default $fillupdir_d.]), - [ fillupdir="$withval" ], - [ fillupdir="$fillupdir_d" ]) -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 -dnl The YCP interpreter checks whether dependent ybc files are older -dnl so we must preserve their timestamps -INSTALL="${INSTALL} -p" -AC_PROG_LN_S -AC_PROG_MAKE_SET - -dnl pkgconfig -AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) -dnl devtools -dnl ... - -dnl no need for AC_ARG_VAR -AC_PATH_PROG(XGETTEXT, xgettext) -if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) -fi - -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` - -dnl producing pkg-config for others? -AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) -AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) - -dbdir=${devtools_yast2dir}/data/docbook -STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl -STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl -STYLESHEET_CSS=${dbdir}/css/yast2docs.css -STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl -STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl -AC_SUBST(STYLESHEET_HTML) -AC_SUBST(STYLESHEET_PDF) -AC_SUBST(STYLESHEET_CSS) -AC_SUBST(STYLESHEET_YDOC) -AC_SUBST(STYLESHEET_YCPDOC) - - -AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) -if test "$YCPDOC" = "false"; then - AC_MSG_ERROR([ycpdoc is not installed]) -fi -AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) -if test "$YCPMAKEDEP" = "false"; then - AC_MSG_ERROR([ycpmakedep is not installed]) -fi -AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) -if test "$YCPC" = "false"; then - AC_MSG_ERROR([ycpc is not installed]) -fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) - - -AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) -if test "$YDOXYGEN" = "false"; then - AC_MSG_ERROR([ydoxygen is not installed]) -fi - -AC_PROG_CXX -AC_PROG_AWK -AC_PROG_CC -AC_PROG_CPP - -# If we have core, get its Y2CORE_CFLAGS. -# When building core itself, it has set Y2CORE_CFLAGS elsewhere already -PKG_CHECK_EXISTS([yast2-core],[ - PKG_CHECK_MODULES(Y2CORE, yast2-core) -]) - -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" - -: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'} -AC_SUBST(AGENT_LIBADD) - -AC_DISABLE_STATIC -AC_PROG_LIBTOOL -AM_PROG_LIBTOOL dnl for libraries - -dnl generate the config header -AC_CONFIG_HEADERS([config.h]) dnl at the distribution this done - -AC_FUNC_ALLOCA -AC_HEADER_STDC - - -AC_CHECK_PROG(curl_config,curl-config,yes) -if test "$curl_config" = "yes" ; then - CURL_CFLAGS="`curl-config --cflags`" - CURL_LIBS="`curl-config --libs`" - AC_SUBST(CURL_LIBS) - AC_SUBST(CURL_CFLAGS) -fi - - -AC_CONFIG_FILES(Makefile agent-curl/doc/autodocs/Makefile -agent-curl/doc/Makefile -agent-curl/src/Makefile -agent-curl/conf/Makefile -agent-curl/Makefile -agent-tftp/doc/autodocs/Makefile -agent-tftp/doc/Makefile -agent-tftp/src/Makefile -agent-tftp/conf/Makefile -agent-tftp/Makefile -doc/Makefile -module/Makefile -testsuite/Makefile) -AC_OUTPUT - 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.21.1/module/FTP.ycp new/yast2-transfer-3.0.0/module/FTP.ycp --- old/yast2-transfer-2.21.1/module/FTP.ycp 2013-01-22 12:17:11.000000000 +0100 +++ new/yast2-transfer-3.0.0/module/FTP.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -/**************************************************************************** - -Copyright (c) 2000 - 2012 Novell, Inc. -All Rights Reserved. - -This program is free software; you can redistribute it and/or -modify it under the terms of version 2 of the GNU General Public License as -published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, contact Novell, Inc. - -To contact Novell about this file by physical or electronic mail, -you may find current contact information at www.novell.com - -****************************************************************************/ -/** - * File: modules/FTP.ycp - * Package: Transfer Protocols - * Summary: Handle FTP Requests - * Authors: Anas Nashif <[email protected]> - * Flags: Stable - * - * $Id$ - */ - -{ - -module "FTP"; - -global string user = ""; -global string password = ""; - -/** - * Send a get request - * @param url url in any standard form - * @param output file to save result to - * @return map Reponse map with HTTP code and transfer size and time - */ -global define map Get(string url, string output) ``{ - y2debug("URL: %1", url); - map response = (map) SCR::Execute(.curl.get, url, $["output":output]); - return response; -} - -/** - * List FTP directory - */ -global define list Dir(string url) ``{ - - map dir = (map) SCR::Execute(.curl.ftp.dir, url, $[]); - y2debug("returned string: %1", dir); - - if(size(dir) <= 0) { - y2error("Error while trying to list directory"); - return []; - } - - return filter(string s, toset(splitstring(dir["output"]:"", "\r\n")), ``(s!="." && s!=".." && s!="")); -} - - -/* EOF */ -} 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.21.1/module/HTTP.ycp new/yast2-transfer-3.0.0/module/HTTP.ycp --- old/yast2-transfer-2.21.1/module/HTTP.ycp 2013-01-22 12:17:11.000000000 +0100 +++ new/yast2-transfer-3.0.0/module/HTTP.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -/**************************************************************************** - -Copyright (c) 2000 - 2012 Novell, Inc. -All Rights Reserved. - -This program is free software; you can redistribute it and/or -modify it under the terms of version 2 of the GNU General Public License as -published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, contact Novell, Inc. - -To contact Novell about this file by physical or electronic mail, -you may find current contact information at www.novell.com - -****************************************************************************/ -/** - * File: modules/HTTP.ycp - * Package: Transfer Protocols - * Summary: Handle HTTP Requests - * Authors: Anas Nashif <[email protected]> - * Flags: Stable - * - * $Id$ - */ - -{ - -module "HTTP"; - -global string user = ""; -global string password = ""; - -/** - * Send a get request - * @param url url in any standard form - * @param output file to save result to - * @return map Reponse map with HTTP code and transfer size and time - */ -global define map Get(string url, string output) ``{ - y2debug("URL: %1", url); - map response = (map) SCR::Execute(.curl.get, url, $["output":output]); - return response; -} - -/** - * Send a post request - * @param url url in any standard form - * @param output file to save result to - * @param postdata the rest of the url and whatever comes after the ? in the URL - * @return map Reponse map with HTTP code and transfer size and time - */ - -global define map Post(string url, string output, string postData) ``{ - y2debug("URL: %1", url); - map response = (map) SCR::Execute(.curl.get, url, $["output":output, "data":postData]); - return response; -} - - -/** - * Set user and password for HTTP authentication - */ - - -global define map setUserPassword() ``{ - string userpass = sformat("%1:%2", user , password ); - return (map) SCR::Execute(.curl.setUserPassword, userpass, $[]); -} - -global define void easySSL( boolean easy ) ``{ - y2debug("setting easySSL to %1",easy); - SCR::Execute(.curl.easySSL, easy, $[]); - 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 */ -} 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.21.1/module/Makefile.am new/yast2-transfer-3.0.0/module/Makefile.am --- old/yast2-transfer-2.21.1/module/Makefile.am 2013-01-22 12:17:11.000000000 +0100 +++ new/yast2-transfer-3.0.0/module/Makefile.am 2013-07-30 13:55:06.000000000 +0200 @@ -1,14 +0,0 @@ -# -# Makefile.am for xml/module/src -# - -yncludedir = @yncludedir@/transfer - -module_DATA = \ - HTTP.ycp \ - FTP.ycp \ - TFTP.ycp - -EXTRA_DIST = $(module_DATA) - -include $(top_srcdir)/Makefile.am.common 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.21.1/module/TFTP.ycp new/yast2-transfer-3.0.0/module/TFTP.ycp --- old/yast2-transfer-2.21.1/module/TFTP.ycp 2013-01-22 12:17:11.000000000 +0100 +++ new/yast2-transfer-3.0.0/module/TFTP.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -/**************************************************************************** - -Copyright (c) 2000 - 2012 Novell, Inc. -All Rights Reserved. - -This program is free software; you can redistribute it and/or -modify it under the terms of version 2 of the GNU General Public License as -published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, contact Novell, Inc. - -To contact Novell about this file by physical or electronic mail, -you may find current contact information at www.novell.com - -****************************************************************************/ -/** - * File: modules/TFTP.ycp - * Package: Transfer Protocols - * Summary: Handle TFTP Requests - * Authors: Anas Nashif <[email protected]> - * Flags: Stable - * - * $Id$ - * - */ - -{ - -module "TFTP"; - -/** - * Send a get request - * @param server server address - * @param remote remote file - * @param local file to save result to - * @return boolean true on success - */ -global define boolean Get(string server, string remote , string local) ``{ - string serverstr = sformat("%1:%2", server, remote); - return (boolean) SCR::Execute(.tftp.get, serverstr, local); -} - -/** - * Send a put request - * @param server server address - * @param remote remote file - * @param local file to save result to - * @return boolean true on success - */ -global define boolean Put(string server, string remote , string local) ``{ - string serverstr = sformat("%1:%2", server, remote); - return (boolean) SCR::Execute(.tftp.put, serverstr, local); -} - -/* EOF */ -} 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.21.1/src/Makefile.am new/yast2-transfer-3.0.0/src/Makefile.am --- old/yast2-transfer-2.21.1/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-transfer-3.0.0/src/Makefile.am 2013-07-30 13:55:06.000000000 +0200 @@ -0,0 +1,10 @@ +# Sources for transfer + +module_DATA = \ + modules/FTP.rb \ + modules/HTTP.rb \ + modules/TFTP.rb + +EXTRA_DIST = $(module_DATA) + +include $(top_srcdir)/Makefile.am.common \ No newline at end of file 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.21.1/src/modules/FTP.rb new/yast2-transfer-3.0.0/src/modules/FTP.rb --- old/yast2-transfer-2.21.1/src/modules/FTP.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-transfer-3.0.0/src/modules/FTP.rb 2013-07-30 13:55:06.000000000 +0200 @@ -0,0 +1,78 @@ +# encoding: utf-8 + +# *************************************************************************** +# +# Copyright (c) 2000 - 2012 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +# +# *************************************************************************** +# File: modules/FTP.ycp +# Package: Transfer Protocols +# Summary: Handle FTP Requests +# Authors: Anas Nashif <[email protected]> +# Flags: Stable +# +# $Id$ +require "yast" + +module Yast + class FTPClass < Module + def main + + @user = "" + @password = "" + end + + # Send a get request + # @param [String] url url in any standard form + # @param [String] output file to save result to + # @return [Hash] Reponse map with HTTP code and transfer size and time + def Get(url, output) + Builtins.y2debug("URL: %1", url) + response = Convert.to_map( + SCR.Execute(path(".curl.get"), url, { "output" => output }) + ) + deep_copy(response) + end + + # List FTP directory + def Dir(url) + dir = Convert.to_map(SCR.Execute(path(".curl.ftp.dir"), url, {})) + Builtins.y2debug("returned string: %1", dir) + + if Ops.less_or_equal(Builtins.size(dir), 0) + Builtins.y2error("Error while trying to list directory") + return [] + end + + Builtins.filter( + Builtins.toset( + Builtins.splitstring(Ops.get_string(dir, "output", ""), " \n") + ) + ) { |s| s != "." && s != ".." && s != "" } + end + + publish :variable => :user, :type => "string" + publish :variable => :password, :type => "string" + publish :function => :Get, :type => "map (string, string)" + publish :function => :Dir, :type => "list (string)" + end + + FTP = FTPClass.new + FTP.main +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.21.1/src/modules/HTTP.rb new/yast2-transfer-3.0.0/src/modules/HTTP.rb --- old/yast2-transfer-2.21.1/src/modules/HTTP.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-transfer-3.0.0/src/modules/HTTP.rb 2013-07-30 13:55:06.000000000 +0200 @@ -0,0 +1,110 @@ +# encoding: utf-8 + +# *************************************************************************** +# +# Copyright (c) 2000 - 2012 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +# +# *************************************************************************** +# File: modules/HTTP.ycp +# Package: Transfer Protocols +# Summary: Handle HTTP Requests +# Authors: Anas Nashif <[email protected]> +# Flags: Stable +# +# $Id$ +require "yast" + +module Yast + class HTTPClass < Module + def main + + @user = "" + @password = "" + end + + # Send a get request + # @param [String] url url in any standard form + # @param [String] output file to save result to + # @return [Hash] Reponse map with HTTP code and transfer size and time + def Get(url, output) + Builtins.y2debug("URL: %1", url) + response = Convert.to_map( + SCR.Execute(path(".curl.get"), url, { "output" => output }) + ) + deep_copy(response) + end + + # Send a post request + # @param [String] url url in any standard form + # @param [String] output file to save result to + # @param postdata the rest of the url and whatever comes after the ? in the URL + # @return [Hash] Reponse map with HTTP code and transfer size and time + + def Post(url, output, postData) + Builtins.y2debug("URL: %1", url) + response = Convert.to_map( + SCR.Execute( + path(".curl.get"), + url, + { "output" => output, "data" => postData } + ) + ) + deep_copy(response) + end + + + # Set user and password for HTTP authentication + + + def setUserPassword + userpass = Builtins.sformat("%1:%2", @user, @password) + Convert.to_map(SCR.Execute(path(".curl.setUserPassword"), userpass, {})) + end + + def easySSL(easy) + Builtins.y2debug("setting easySSL to %1", easy) + SCR.Execute(path(".curl.easySSL"), easy, {}) + nil + end + + def clientCertSSL(cert_path) + Builtins.y2debug("setting clientCertSSL to %1", cert_path) + SCR.Execute(path(".curl.clientCertSSL"), cert_path, {}) + nil + end + + def clientKeySSL(key_path) + Builtins.y2debug("setting clientKeySSL to %1", key_path) + SCR.Execute(path(".curl.clientKeySSL"), key_path, {}) + nil + end + + publish :variable => :user, :type => "string" + publish :variable => :password, :type => "string" + publish :function => :Get, :type => "map (string, string)" + publish :function => :Post, :type => "map (string, string, string)" + publish :function => :setUserPassword, :type => "map ()" + publish :function => :easySSL, :type => "void (boolean)" + publish :function => :clientCertSSL, :type => "void (string)" + publish :function => :clientKeySSL, :type => "void (string)" + end + + HTTP = HTTPClass.new + HTTP.main +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.21.1/src/modules/TFTP.rb new/yast2-transfer-3.0.0/src/modules/TFTP.rb --- old/yast2-transfer-2.21.1/src/modules/TFTP.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-transfer-3.0.0/src/modules/TFTP.rb 2013-07-30 13:55:06.000000000 +0200 @@ -0,0 +1,66 @@ +# encoding: utf-8 + +# *************************************************************************** +# +# Copyright (c) 2000 - 2012 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +# +# *************************************************************************** +# File: modules/TFTP.ycp +# Package: Transfer Protocols +# Summary: Handle TFTP Requests +# Authors: Anas Nashif <[email protected]> +# Flags: Stable +# +# $Id$ +# +require "yast" + +module Yast + class TFTPClass < Module + def main + + end + + # Send a get request + # @param [String] server server address + # @param [String] remote remote file + # @param [String] local file to save result to + # @return [Boolean] true on success + def Get(server, remote, local) + serverstr = Builtins.sformat("%1:%2", server, remote) + Convert.to_boolean(SCR.Execute(path(".tftp.get"), serverstr, local)) + end + + # Send a put request + # @param [String] server server address + # @param [String] remote remote file + # @param [String] local file to save result to + # @return [Boolean] true on success + def Put(server, remote, local) + serverstr = Builtins.sformat("%1:%2", server, remote) + Convert.to_boolean(SCR.Execute(path(".tftp.put"), serverstr, local)) + end + + publish :function => :Get, :type => "boolean (string, string, string)" + publish :function => :Put, :type => "boolean (string, string, string)" + end + + TFTP = TFTPClass.new + TFTP.main +end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
