Merge remote-tracking branch 'origin/master' into next_opensuse

Conflicts: .gitignore package/yast2-core.changes
yast · Oct 3, 2013 · ad1e72d · ad1e72d
2 parents e213728 + 2cfa734
commit ad1e72d
Show file tree

Hide file tree

Showing 38 changed files with 153 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,11 +30,11 @@ libtool.m4
 missing
 pluglib-bindings.ami
 autodocs*.ami
+autodocs/doxygen.conf
 ylwrap
 *.pc
 stamp-h*
 package/*.tar.bz2
-package/*.spec
 # testsuites
 site.bak
 /test-driver

diff --git a/Rakefile b/Rakefile
@@ -0,0 +1,8 @@
+require "yast/rake"
+
+Packaging.configuration do |conf|
+  conf.skip_license_check << /testsuite/ #skip all testsuites
+  conf.skip_license_check << /scr\/doc\/scr-arch.sda/ #skip binary file
+  conf.skip_license_check << /.*/ #skip all temporary, as there is too much failures
+end
+
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.1
+3.1.1
diff --git a/agent-any/src/Makefile.am b/agent-any/src/Makefile.am
@@ -20,4 +20,4 @@ libpy2ag_anyagent_la_SOURCES =				\
 libpy2ag_anyagent_la_LDFLAGS = -version-info 2:0
 libpy2ag_anyagent_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-any/testsuite/Makefile.am b/agent-any/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runag_anyagent
 

diff --git a/agent-dummy/src/Makefile.am b/agent-dummy/src/Makefile.am
@@ -13,7 +13,7 @@ libpy2ag_dummy_la_SOURCES =			\
 libpy2ag_dummy_la_LDFLAGS = -version-info 2:0
 libpy2ag_dummy_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)/libycp/src/include	\
 	-I$(top_srcdir)/liby2/src/include	\
 	-I$(top_srcdir)/libscr/src/include	\

diff --git a/agent-ini/src/Makefile.am b/agent-ini/src/Makefile.am
@@ -29,4 +29,4 @@ libpy2ag_ini_la_LIBADD =			\
 	@AGENT_LIBADD@				\
 	${Y2UTIL_LIBS}
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-ini/testsuite/Makefile.am b/agent-ini/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runag_ini
 

diff --git a/agent-modules/src/Makefile.am b/agent-modules/src/Makefile.am
@@ -20,4 +20,4 @@ libpy2ag_modules_la_SOURCES =				\
 libpy2ag_modules_la_LDFLAGS = -version-info 2:0
 libpy2ag_modules_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
diff --git a/agent-modules/testsuite/Makefile.am b/agent-modules/testsuite/Makefile.am
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runmodules
 

diff --git a/agent-process/src/Makefile.am b/agent-process/src/Makefile.am
@@ -20,4 +20,4 @@ libpy2ag_process_la_SOURCES =				\
 libpy2ag_process_la_LDFLAGS = -version-info 2:0
 libpy2ag_process_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-process/testsuite/Makefile.am b/agent-process/testsuite/Makefile.am
@@ -12,7 +12,7 @@ PACKAGE = ag_process
 AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = run_ag_process
 

diff --git a/agent-resolver/src/Makefile.am b/agent-resolver/src/Makefile.am
@@ -12,4 +12,4 @@ libpy2ag_resolver_la_SOURCES =	\
 libpy2ag_resolver_la_LDFLAGS = -version-info 2:0
 libpy2ag_resolver_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
diff --git a/agent-resolver/testsuite/Makefile.am b/agent-resolver/testsuite/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 export top_srcdir
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runresolver
 

diff --git a/agent-system/src/Makefile.am b/agent-system/src/Makefile.am
@@ -14,4 +14,4 @@ libpy2ag_system_la_SOURCES =			\
 libpy2ag_system_la_LDFLAGS = -version-info 2:0
 libpy2ag_system_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES = @AGENT_INCLUDES@
+AM_CPPFLAGS = @AGENT_INCLUDES@
diff --git a/agent-system/testsuite/Makefile.am b/agent-system/testsuite/Makefile.am
@@ -12,7 +12,7 @@ PACKAGE = ag_system
 AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 noinst_PROGRAMS = runag_system
 

diff --git a/agents-perl/testsuite/test-common.exp b/agents-perl/testsuite/test-common.exp
@@ -1,5 +1,13 @@
 # common setup for test cases of ag_backgound
 
+if { [catch {exec grep devpts.*mode=620 /proc/mounts} ] } {
+    # Something in our Jenkins instance remounts it with mode 600
+    # and then "spawn" fails.
+    puts "SKIP: need devpts with mode=620."
+    puts "  See also https://bugzilla.redhat.com/show_bug.cgi?id=510183"
+    exit 77
+}
+
 set prog "../ag_background"
 set env(PERL5LIB) "../lib"
 
@@ -15,7 +23,7 @@ spawn $prog $argv
 match_max 100000
 
 set timeout 15
-expect_after {    
+expect_after {
     default {
 	puts "OOPS"
 	puts "last matched <<$expect_out(buffer)>>"

diff --git a/base/src/.gitignore b/base/src/.gitignore
@@ -1,2 +1,4 @@
 scr
 y2base
+*.log
+*.trs
diff --git a/base/src/Makefile.am b/base/src/Makefile.am
@@ -36,7 +36,7 @@ AM_CXXFLAGS = -DY2LOG=\"scr\" -DSUSEVERSION=\"${SUSEVERSION}\"
 serversdir = $(execcompdir)/servers
 servers_PROGRAMS = scr
 
-INCLUDES = ${AGENT_INCLUDES}                 		\
+AM_CPPFLAGS = ${AGENT_INCLUDES}                 		\
 	-I$(srcdir)/../../libscr/src/include		\
 	-I$(srcdir)/../../scr/src
 
@@ -50,3 +50,6 @@ scr_LDFLAGS =                                   \
         $(top_builddir)/scr/src/libpy2scr.la            \
 	$(top_builddir)/wfm/src/libpy2wfm.la		\
         -Xlinker --no-whole-archive
+
+TESTS = scr-smoke-test
+EXTRA_DIST = $(TESTS)
diff --git a/base/src/scr-smoke-test b/base/src/scr-smoke-test
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# smoke test:
+echo "WHEN" "simply run with noting to do"
+echo "  IT" "exits with no error (in particular it does not segfault)"
+$DIR/scr stdio scr < /dev/null
diff --git a/base/tools/tty_wrapper/Makefile.am b/base/tools/tty_wrapper/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for tools/ttywrapper
 #
 
-INCLUDES = ${AGENT_INCLUDES}
+AM_CPPFLAGS = ${AGENT_INCLUDES}
 
 ybin_PROGRAMS = tty_wrapper
 

diff --git a/base/tools/ycpc/Makefile.am b/base/tools/ycpc/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = doc
 
 AM_CXXFLAGS = -DY2LOG=\"libycp\"
 
-INCLUDES = -I$(top_srcdir)/libycp/src/include \
+AM_CPPFLAGS = -I$(top_srcdir)/libycp/src/include \
 	-I$(top_srcdir)/liby2/src/include \
 	-I$(top_srcdir)/libscr/src/include \
 	-I$(top_srcdir)/wfm/src		\

diff --git a/debugger/Makefile.am b/debugger/Makefile.am
@@ -13,7 +13,7 @@ liby2debug_la_SOURCES =	\
 
 #liby2debug_la_LIBADD = @AGENT_LIBADD@
 
-INCLUDES =	\
+AM_CPPFLAGS =	\
 	-I$(srcdir)/../libycp/src/include \
 	-I$(srcdir)/../liby2/src/include \
 	-I$(srcdir)/../liby2util-r/src/include \

diff --git a/libscr/src/Makefile.am b/libscr/src/Makefile.am
@@ -11,7 +11,7 @@ lib_LTLIBRARIES = libscr.la
 libscr_la_SOURCES =  \
 	SCRAgent.cc SCR.cc
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(srcdir)/../../libycp/src/include		\
 	-I$(srcdir)/../../liby2/src/include		\
 	-I$(srcdir)/include				\

diff --git a/libscr/testsuite/Makefile.am b/libscr/testsuite/Makefile.am
@@ -4,7 +4,7 @@
 
 AM_CXXFLAGS = -DY2LOG=\"libscr\"
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)/libycp/src/include		\
 	-I$(top_srcdir)/liby2/src/include		\
 	-I$(srcdir)/../src/include			\

diff --git a/liby2/src/Makefile.am b/liby2/src/Makefile.am
@@ -30,7 +30,7 @@ libpy2serial_la_SOURCES =				\
 	Y2SerialComponent.cc Y2CCSerial.cc
 libpy2serial_la_LDFLAGS = -version-info 2:0
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(srcdir)/../../libycp/src/include		\
 	-I$(srcdir)/include				\
 	-I$(srcdir)/include/y2				\

diff --git a/liby2/src/genericfrontend.cc b/liby2/src/genericfrontend.cc
@@ -772,9 +772,7 @@ main (int argc, char **argv)
     server->result(result);
 
     // Cleanup
-    delete server;
     delete[] server_argv;
-    delete client;
 
     // might be useful in tracking segmentation faults
     y2milestone ("Finished YaST2 component '%s'", progname);

diff --git a/liby2/src/include/y2/Y2ComponentBroker.h b/liby2/src/include/y2/Y2ComponentBroker.h
@@ -156,6 +156,10 @@ class Y2ComponentBroker
      * If set to false only servers are created.
      * @return A pointer to the new component if one has been found, 0 if no
      * component matching spec has been found.
+     * Pointer returned by this function is owned by ComponentCreator so do not
+     * delete it at your own.
+     * @see Y2ComponentCreator#create for details what ComponentCreator must
+     * return
      */
     static Y2Component *createComponent(const char *name, bool look_for_clients);
 

diff --git a/liby2util-r/src/Makefile.am b/liby2util-r/src/Makefile.am
@@ -4,11 +4,9 @@
 
 SUBDIRS = include
 
-INCLUDES = -I$(srcdir)/include #-I$(oldincludedir)/libxml2 
-
 AM_LDFLAGS = -L$(libdir)
 
-AM_CPPFLAGS = -DY2LOG=\"liby2util\" $(DEBUG_FLAGS) -D_GNU_SOURCE -DLOCALEDIR=\"${localedir}\"
+AM_CPPFLAGS = -I$(srcdir)/include -DY2LOG=\"liby2util\" $(DEBUG_FLAGS) -D_GNU_SOURCE -DLOCALEDIR=\"${localedir}\"
 
 lib_LTLIBRARIES = liby2util.la
 

diff --git a/liby2util-r/testsuite/Makefile.am b/liby2util-r/testsuite/Makefile.am
@@ -6,9 +6,7 @@ PACKAGE = liby2util
 AUTOMAKE_OPTIONS = dejagnu
 export Y2DISABLELANGUAGEPLUGINS = 1
 
-INCLUDES= -I$(srcdir)/../src/include
-
-AM_CPPFLAGS = -DY2LOG=\"liby2util-testsuite\"
+AM_CPPFLAGS = -I$(srcdir)/../src/include -DY2LOG=\"liby2util-testsuite\"
 
 AM_LDFLAGS = \
 	-Xlinker --whole-archive	\

diff --git a/libycp/src/Makefile.am b/libycp/src/Makefile.am
@@ -60,7 +60,7 @@ BUILT_SOURCES = parser.hh
 
 AM_YFLAGS = -d -v
 
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/include/ycp -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS} \
+AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/ycp -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS} \
 	-I$(top_srcdir)/debugger
 
 # CURRENT:REVISION:AGE

diff --git a/libycp/testsuite/Makefile.am b/libycp/testsuite/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = config lib libycp.test tests
 
 AM_CXXFLAGS = -DY2LOG=\"libycp\"
 
-INCLUDES = -I$(srcdir)/../src/include -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS}
+AM_CPPFLAGS = -I$(srcdir)/../src/include -I$(top_srcdir)/liby2/src/include ${Y2UTIL_CFLAGS}
 
 bindir = $(prefix)/bin
 libdir = ../src/.libs

diff --git a/package/yast2-core.changes b/package/yast2-core.changes
@@ -1,12 +1,34 @@
+-------------------------------------------------------------------
+Tue Oct  1 14:59:08 UTC 2013 - [email protected]
+
+- port from opensuse 13.1: fixed a segfault at the end of 'scr'
+  program used during the installation, leading to /core file
+  (BNC#841623)
+- 3.1.1
+
 -------------------------------------------------------------------
 Wed Sep 25 14:16:30 UTC 2013 - [email protected]
 
-- respect target root in: ag_any(for processes), system_agent 
+- respect target root in: ag_any(for processes), system_agent
+
+-------------------------------------------------------------------
+Wed Sep 18 14:39:27 UTC 2013 - [email protected]
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
 
 -------------------------------------------------------------------
 Wed Sep 11 12:40:58 UTC 2013 - [email protected]
 
-- respect target root in: ag_any, ag_ini, ag_modules, ag_resolver 
+- respect target root in: ag_any, ag_ini, ag_modules, ag_resolver
+
+
+-------------------------------------------------------------------
+Wed Sep  4 14:24:39 UTC 2013 - [email protected]
+
+- Avoid automake warning:
+  'INCLUDES' is the old name for 'AM_CPPFLAGS'
 
 -------------------------------------------------------------------
 Tue Sep  3 13:28:44 UTC 2013 - [email protected]
@@ -15,6 +37,7 @@ Tue Sep  3 13:28:44 UTC 2013 - [email protected]
   must be adapted to respect it instead of relying on chroot(2)
   having been run.
 
+
 -------------------------------------------------------------------
 Wed Aug  7 07:46:14 UTC 2013 - [email protected]
-Original file line number
+Diff line change
@@ -1,2 +1,4 @@
     scr
     y2base
+    *.log
+    *.trs