openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2006
- 1 participants
- 1262 discussions
Hello community,
here is the log from the commit of package limal-runlevel
checked in at Thu Sep 28 20:41:41 CEST 2006.
--------
--- limal-runlevel/limal-runlevel.changes 2006-08-29 16:16:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/limal-runlevel/limal-runlevel.changes 2006-09-28 16:43:21.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 28 14:54:35 CEST 2006 - mt(a)suse.de
+
+- version 1.2.3
+- Adopted to build with blocxx-1.x as well as upcoming blocxx-2.x
+- Fixed to use limal::Logger interface in skeleton testcases
+
+-------------------------------------------------------------------
Old:
----
limal-runlevel-1.2.2.tar.bz2
New:
----
limal-runlevel-1.2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ limal-runlevel.spec ++++++
--- /var/tmp/diff_new_pack.9q0WsE/_old 2006-09-28 20:41:22.000000000 +0200
+++ /var/tmp/diff_new_pack.9q0WsE/_new 2006-09-28 20:41:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package limal-runlevel (Version 1.2.2)
+# spec file for package limal-runlevel (Version 1.2.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: limal-runlevel
URL: http://forge.novell.com/modules/xfmod/project/?limal
-Version: 1.2.2
+Version: 1.2.3
Release: 1
License: GPL
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: limal-runlevel-1.2.2.tar.bz2
+Source0: limal-runlevel-1.2.3.tar.bz2
prefix: /usr
%define swiglibdir %(swig -swiglib)
BuildRequires: curl gcc-c++ limal-devel limal-devtools limal-perl perl-gettext sgml-skel
@@ -69,7 +69,7 @@
Marius Tomaschewski
%prep
-%setup -n limal-runlevel-1.2.2
+%setup -n limal-runlevel-1.2.3
%build
%{prefix}/bin/limaltool limalautoconf
@@ -125,6 +125,10 @@
%{perl_vendorarch}/LIMAL/*.pm
%changelog -n limal-runlevel
+* Thu Sep 28 2006 - mt(a)suse.de
+- version 1.2.3
+- Adopted to build with blocxx-1.x as well as upcoming blocxx-2.x
+- Fixed to use limal::Logger interface in skeleton testcases
* Tue Aug 29 2006 - mt(a)suse.de
- version 1.2.2
- fixed build flags in testsuite/Makefile.am
++++++ limal-runlevel-1.2.2.tar.bz2 -> limal-runlevel-1.2.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/Makefile.am new/limal-runlevel-1.2.3/Makefile.am
--- old/limal-runlevel-1.2.2/Makefile.am 2006-08-25 17:44:52.000000000 +0200
+++ new/limal-runlevel-1.2.3/Makefile.am 2006-09-28 16:32:56.000000000 +0200
@@ -36,8 +36,11 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = configure configure.in $(RPMNAME).pc Makefile Makefile.in Makefile.am \
package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec \
- ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing
+ ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing \
+ config.rpath config.h.in ABOUT-NLS mkinstalldirs
+maintainer-clean-local:
+ -rm -rf m4
configure.in: configure.in.in $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/Makefile.in new/limal-runlevel-1.2.3/Makefile.in
--- old/limal-runlevel-1.2.2/Makefile.in 2006-08-25 17:45:06.000000000 +0200
+++ new/limal-runlevel-1.2.3/Makefile.in 2006-09-28 16:33:15.000000000 +0200
@@ -264,7 +264,8 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = configure configure.in $(RPMNAME).pc Makefile Makefile.in Makefile.am \
package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec \
- ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing
+ ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing \
+ config.rpath config.h.in ABOUT-NLS mkinstalldirs
EXTRA_DIST = VERSION RPMNAME MAINTAINER configure.in.in \
$(SUBDIRS_FILE) $(ACINCLUDE_FILE) limal*.spec.in \
@@ -701,7 +702,8 @@
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+ maintainer-clean-local
mostlyclean: mostlyclean-recursive
@@ -731,10 +733,10 @@
install-info-am install-man install-pkgconfigDATA \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-pkgconfigDATA
+ maintainer-clean-local maintainer-clean-recursive mostlyclean \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am uninstall-pkgconfigDATA
# create bzip2ed tar and make some sanity checks
@@ -744,6 +746,9 @@
exit 1 ; \
fi
+maintainer-clean-local:
+ -rm -rf m4
+
configure.in: configure.in.in $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/VERSION new/limal-runlevel-1.2.3/VERSION
--- old/limal-runlevel-1.2.2/VERSION 2006-08-25 17:43:59.000000000 +0200
+++ new/limal-runlevel-1.2.3/VERSION 2006-09-28 16:32:46.000000000 +0200
@@ -1 +1 @@
-1.2.2
+1.2.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/configure new/limal-runlevel-1.2.3/configure
--- old/limal-runlevel-1.2.2/configure 2006-08-25 17:45:02.000000000 +0200
+++ new/limal-runlevel-1.2.3/configure 2006-09-28 16:33:10.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for limal-runlevel 1.2.2.
+# Generated by GNU Autoconf 2.59 for limal-runlevel 1.2.3.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='limal-runlevel'
PACKAGE_TARNAME='limal-runlevel'
-PACKAGE_VERSION='1.2.2'
-PACKAGE_STRING='limal-runlevel 1.2.2'
+PACKAGE_VERSION='1.2.3'
+PACKAGE_STRING='limal-runlevel 1.2.3'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -979,7 +979,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 limal-runlevel 1.2.2 to adapt to many kinds of systems.
+\`configure' configures limal-runlevel 1.2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1046,7 +1046,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of limal-runlevel 1.2.2:";;
+ short | recursive ) echo "Configuration of limal-runlevel 1.2.3:";;
esac
cat <<\_ACEOF
@@ -1202,7 +1202,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-limal-runlevel configure 1.2.2
+limal-runlevel configure 1.2.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1216,7 +1216,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by limal-runlevel $as_me 1.2.2, which was
+It was created by limal-runlevel $as_me 1.2.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1946,7 +1946,7 @@
# Define the identity of the package.
PACKAGE='limal-runlevel'
- VERSION='1.2.2'
+ VERSION='1.2.3'
cat >>confdefs.h <<_ACEOF
@@ -2157,7 +2157,7 @@
-VERSION="1.2.2"
+VERSION="1.2.3"
RPMNAME="limal-runlevel"
RPMARCH=""
RPMLIB="runlevel"
@@ -23838,7 +23838,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by limal-runlevel $as_me 1.2.2, which was
+This file was extended by limal-runlevel $as_me 1.2.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23901,7 +23901,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-limal-runlevel config.status 1.2.2
+limal-runlevel config.status 1.2.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/configure.in new/limal-runlevel-1.2.3/configure.in
--- old/limal-runlevel-1.2.2/configure.in 2006-08-25 17:44:52.000000000 +0200
+++ new/limal-runlevel-1.2.3/configure.in 2006-09-28 16:32:56.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by limalautoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(limal-runlevel, 1.2.2, http://www.suse.de/feedback, limal-runlevel)
+AC_INIT(limal-runlevel, 1.2.3, http://www.suse.de/feedback, limal-runlevel)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important LiMaL variables
-VERSION="1.2.2"
+VERSION="1.2.3"
RPMNAME="limal-runlevel"
RPMARCH=""
RPMLIB="runlevel"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/po/limal-runlevel.pot new/limal-runlevel-1.2.3/po/limal-runlevel.pot
--- old/limal-runlevel-1.2.2/po/limal-runlevel.pot 2006-08-25 14:03:39.000000000 +0200
+++ new/limal-runlevel-1.2.3/po/limal-runlevel.pot 2006-09-11 13:48:12.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translation(a)suse.de\n"
-"POT-Creation-Date: 2006-08-25 14:03+0200\n"
+"POT-Creation-Date: 2006-09-11 13:48+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -36,42 +36,42 @@
msgid "Action '%1' is not allowed for service '%2'"
msgstr ""
-#: src/Runlevel.cpp:279
+#: src/Runlevel.cpp:278
msgid "can't create temporary '%1'.XXXXXX file"
msgstr ""
-#: src/Runlevel.cpp:290
+#: src/Runlevel.cpp:289
msgid "can't lock temporary '%1' file"
msgstr ""
-#: src/Runlevel.cpp:319 src/Runlevel.cpp:349
+#: src/Runlevel.cpp:318 src/Runlevel.cpp:348
msgid "can't write to temporary '%1' file"
msgstr ""
-#: src/Runlevel.cpp:332
+#: src/Runlevel.cpp:331
msgid "can't read '%1' file"
msgstr ""
-#: src/Runlevel.cpp:495
+#: src/Runlevel.cpp:554
msgid "Invalid runlevel %1 name"
msgstr ""
-#: src/Runlevel.cpp:505
+#: src/Runlevel.cpp:564
msgid "Failed to read contents of %1 directory"
msgstr ""
-#: src/Service.cpp:68
+#: src/Service.cpp:79
msgid "Failed to read contents of '%1' directory"
msgstr ""
-#: src/Service.cpp:127
+#: src/Service.cpp:138
msgid "invalid service name '%1'"
msgstr ""
-#: src/Service.cpp:135
+#: src/Service.cpp:146
msgid "invalid service script path '%1'"
msgstr ""
-#: src/Service.cpp:148
+#: src/Service.cpp:159
msgid "invalid service script name '%1'"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/src/LSBService.cpp new/limal-runlevel-1.2.3/src/LSBService.cpp
--- old/limal-runlevel-1.2.2/src/LSBService.cpp 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/src/LSBService.cpp 2006-09-28 16:32:46.000000000 +0200
@@ -33,8 +33,8 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include <climits>
+#include <climits>
#include <fstream>
@@ -102,30 +102,48 @@
command.append(getScriptName());
LOGIT("DEBUG", "executing '" << join("', '", command) << "'");
+#if BLOCXX_LIBRARY_VERSION >= 5
+ try
+ {
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ command, output
+ );
+
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
+ }
+#else
try
{
Exec::executeProcessAndGatherOutput(
command, output, status
);
+
+ if(status != -1 && WIFEXITED(status))
+ status = WEXITSTATUS(status);
+ else status = -1;
}
- catch(...)
+#endif
+ catch(const blocxx::Exception &e)
{
- status = -1;
+ LOGIT("ERROR", "Unable to execute command '"
+ << join("', '", command)
+ << "' - exception: " << e);
+ return false;
}
-
- if(status != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
- {
- return true;
- }
- else
+ if(status != 0)
{
/*
** FIXME: throw exceptions, e.g. because of dependency problems ?
*/
- LOGIT("ERROR", command[0] << " execution failed: "
- << output);
+ LOGIT("ERROR", "Failure reported by command '"
+ << join("', '", command)
+ << "' - status: " << status
+ << ", message: " << output);
return false;
}
+ return true;
}
@@ -140,30 +158,48 @@
command.append(getScriptName());
LOGIT("DEBUG", "executing '" << join("', '", command) << "'");
+#if BLOCXX_LIBRARY_VERSION >= 5
+ try
+ {
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ command, output
+ );
+
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
+ }
+#else
try
{
Exec::executeProcessAndGatherOutput(
command, output, status
);
+
+ if(status != -1 && WIFEXITED(status))
+ status = WEXITSTATUS(status);
+ else status = -1;
}
- catch(...)
+#endif
+ catch(const blocxx::Exception &e)
{
- status = -1;
+ LOGIT("ERROR", "Unable to execute command '"
+ << join("', '", command)
+ << "' - exception: " << e);
+ return false;
}
-
- if(status != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
- {
- return true;
- }
- else
+ if(status != 0)
{
/*
** FIXME: throw exceptions, e.g. because of dependency problems ?
*/
- LOGIT("ERROR", command[0] << " execution failed: "
- << output);
+ LOGIT("ERROR", "Failure reported by command '"
+ << join("', '", command)
+ << "' - status: " << status
+ << ", message: " << output);
return false;
}
+ return true;
}
@@ -289,11 +325,11 @@
{
String stdOutput;
String errOutput;
- int status;
+ int execStatus;
return executeAction(
action, ServiceCmdArgs(),
- stdOutput, errOutput, status,
+ stdOutput, errOutput, execStatus,
ServiceEnvVars(), String(), -1, -1
);
}
@@ -322,7 +358,28 @@
const ServiceCmdArgs &cmdArgs,
blocxx::String &stdOutput,
blocxx::String &errOutput,
- int &execStatus,
+ const ServiceEnvVars &envVars,
+ const blocxx::String &stdInput,
+ int timeoutSecs,
+ int outputLimit)
+{
+ int execStatus;
+
+ return executeAction(
+ action, cmdArgs,
+ stdOutput, errOutput, execStatus,
+ envVars, stdInput, timeoutSecs, outputLimit
+ );
+}
+
+
+// -------------------------------------------------------------------
+LSBExitCode
+LSBService::executeAction(const blocxx::String &action,
+ const ServiceCmdArgs &cmdArgs,
+ blocxx::String &stdOutput,
+ blocxx::String &errOutput,
+ int &execStatus,
const ServiceEnvVars &envVars,
const blocxx::String &stdInput,
int timeoutSecs,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/src/Runlevel.cpp new/limal-runlevel-1.2.3/src/Runlevel.cpp
--- old/limal-runlevel-1.2.2/src/Runlevel.cpp 2006-08-29 15:56:13.000000000 +0200
+++ new/limal-runlevel-1.2.3/src/Runlevel.cpp 2006-09-28 16:32:46.000000000 +0200
@@ -95,21 +95,43 @@
Runlevel runlevel(-1);
LOGIT("DEBUG", "executing '" << join("', '", command) << "'");
+#if BLOCXX_LIBRARY_VERSION >= 5
+ try
+ {
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ command, stdOut, errOut,
+ EnvVars(EnvVars::E_CURRENT_ENVIRONMENT)
+ );
+
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
+ }
+#else
try
{
Exec::executeProcessAndGatherOutput(
command, stdOut, errOut, status,
EnvVars(EnvVars::E_CURRENT_ENVIRONMENT)
);
+
+ if( status != -1 && WIFEXITED(status))
+ status = WEXITSTATUS(status);
+ else status = -1;
}
- catch(...)
+#endif
+ catch(const blocxx::Exception &e)
{
- status = -1;
+ LOGIT("ERROR", "Unable to execute runlevel query helper '"
+ << join("', '", command)
+ << "' - exception: " << e);
+ return runlevel;
}
- if( status < 0 || !(WIFEXITED(status) && WEXITSTATUS(status) == 0))
+ if( status != 0)
{
- LOGIT("ERROR", "Unable to execute runlevel query helper '"
- << command[0] << "'");
+ LOGIT("ERROR", "Runlevel query helper '"
+ << join("', '", command)
+ << "' failed - status: " << status);
return runlevel;
}
@@ -368,25 +390,48 @@
command.push_back("q");
LOGIT("DEBUG", "executing '" << join("', '", command) << "'");
+#if BLOCXX_LIBRARY_VERSION >= 5
try
{
- Exec::executeProcessAndGatherOutput(
- command, stdOut, errOut, status,
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ command, stdOut, errOut,
EnvVars(EnvVars::E_CURRENT_ENVIRONMENT)
);
+
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
}
- catch(...)
+#else
+ try
{
- status = -1;
+ Exec::executeProcessAndGatherOutput(
+ command, stdOut, errOut, status,
+ EnvVars(EnvVars::E_CURRENT_ENVIRONMENT)
+ );
+
+ if( status != -1 && WIFEXITED(status))
+ status = WEXITSTATUS(status);
+ else status = -1;
+ }
+#endif
+ catch(const blocxx::Exception &e)
+ {
+ LOGIT("ERROR", "Unable to execute '"
+ << join("', '", command)
+ << "' - exception: " << e);
+ ret = -1;
}
- if( status != -1 && WIFEXITED(status) &&
- WEXITSTATUS(status) == 0)
+ if( status != 0)
{
- ret = 0;
+ LOGIT("ERROR", "Failure reported by '"
+ << join("', '", command)
+ << "' - status: " << status);
+ ret = -1;
}
else
{
- ret = -1;
+ ret = 0;
}
}
return ret != -1;
@@ -412,27 +457,46 @@
command.push_back(blocxx::String(runlevel));
LOGIT("DEBUG", "executing '" << join("', '", command) << "'");
+#if BLOCXX_LIBRARY_VERSION >= 5
try
{
- Exec::executeProcessAndGatherOutput(
- command, stdOut, errOut, status,
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ command, stdOut, errOut,
EnvVars(EnvVars::E_CURRENT_ENVIRONMENT)
);
+
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
}
- catch(...)
+#else
+ try
{
- status = -1;
+ Exec::executeProcessAndGatherOutput(
+ command, stdOut, errOut, status,
+ EnvVars(EnvVars::E_CURRENT_ENVIRONMENT)
+ );
+
+ if( status != -1 && WIFEXITED(status))
+ status = WEXITSTATUS(status);
+ else status = -1;
}
- if( status != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
+#endif
+ catch(const blocxx::Exception &e)
{
- return true;
+ LOGIT("ERROR", "Unable to execute command '"
+ << join("', '", command)
+ << "' - exception: " << e);
+ return false;
}
- else
+ if( status != 0)
{
- LOGIT("ERROR", "Unable to execute command '"
- << command[0] << "'");
+ LOGIT("ERROR", "Failure reported by command '"
+ << join("', '", command)
+ << "' - status: " << status);
return false;
}
+ return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/src/Service.cpp new/limal-runlevel-1.2.3/src/Service.cpp
--- old/limal-runlevel-1.2.2/src/Service.cpp 2006-08-25 15:13:56.000000000 +0200
+++ new/limal-runlevel-1.2.3/src/Service.cpp 2006-09-28 16:32:46.000000000 +0200
@@ -236,6 +236,24 @@
Service::executeScript(const ServiceCmdArgs &cmdArgs,
blocxx::String &stdOutput,
blocxx::String &errOutput,
+ const ServiceEnvVars &envVars,
+ const blocxx::String &stdInput,
+ int timeoutSecs,
+ int outputLimit)
+{
+ int execStatus = -1;
+
+ return executeScript(
+ cmdArgs, stdOutput, errOutput, execStatus,
+ envVars, stdInput, timeoutSecs, outputLimit
+ );
+}
+
+// -------------------------------------------------------------------
+int
+Service::executeScript(const ServiceCmdArgs &cmdArgs,
+ blocxx::String &stdOutput,
+ blocxx::String &errOutput,
int &execStatus,
const ServiceEnvVars &envVars,
const blocxx::String &stdInput,
@@ -257,28 +275,65 @@
EnvVars execEnv(flag, envVars.begin(), envVars.end());
- LOGIT("DEBUG", "executing service script " << command[0]
- << "("
- << (command.size() > 1 ? command[1] : "")
- << "): ");
+ LOGIT("DEBUG", "executing service script '"
+ << join("', '", command) << "'");
+
+#if BLOCXX_LIBRARY_VERSION >= 5
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ command, stdOutput, errOutput, execEnv,
+ (timeoutSecs == -1 ? Timeout::infinite :
+ Timeout::relative(float(timeoutSecs))),
+ outputLimit, stdInput
+ );
+
+ if( ps.exitTerminated())
+ {
+ LOGIT("DEBUG", "service script '" << join("', '", command)
+ << "' returned " << ps.exitStatus());
+ return ps.exitStatus();
+ }
+ else
+ if( ps.signalTerminated())
+ {
+ LOGIT("DEBUG", "service script '" << join("', '", command)
+ << "' terminated by signal " << ps.termSignal());
+ }
+ else
+ if( ps.stopped())
+ {
+ LOGIT("DEBUG", "service script '" << join("', '", command)
+ << "' stopped by signal " << ps.stopSignal());
+ }
+ else
+ {
+ LOGIT("DEBUG", "service script '" << join("', '", command)
+ << "' execution in unknown state ("
+ << (ps.running() ? "running" : "stopped")
+ << ")");
+ }
+ return -1;
+#else
Exec::executeProcessAndGatherOutput(
command, stdOutput, errOutput, execStatus,
execEnv, timeoutSecs, outputLimit, stdInput
);
int exitStatus = -1;
- if( WIFEXITED(execStatus))
+ if( execStatus != -1 && WIFEXITED(execStatus))
{
exitStatus = WEXITSTATUS(execStatus);
+ LOGIT("DEBUG", "service script '" << join("', '", command)
+ << "' returned " << exitStatus);
+ }
+ else
+ {
+ LOGIT("DEBUG", "service script '" << join("', '", command)
+ << "' failed with exec status " << execStatus);
}
-
- LOGIT("DEBUG", "service script " << command[0]
- << "("
- << (command.size() > 1 ? command[1] : "")
- << ") returned " << exitStatus);
-
return exitStatus;
+#endif
}
// -------------------------------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/src/Utils.hpp new/limal-runlevel-1.2.3/src/Utils.hpp
--- old/limal-runlevel-1.2.2/src/Utils.hpp 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/src/Utils.hpp 2006-09-28 16:32:46.000000000 +0200
@@ -35,7 +35,7 @@
* Logging helper macro for the runlevel library.
*/
#define LOGIT(level,message) \
- LIMAL_SLOG(limal::Logger("runlevel"), level, message)
+ LIMAL_SLOG(limal::Logger("limal-runlevel"), level, message)
// -------------------------------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/src/limal/runlevel/LSBService.hpp new/limal-runlevel-1.2.3/src/limal/runlevel/LSBService.hpp
--- old/limal-runlevel-1.2.2/src/limal/runlevel/LSBService.hpp 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/src/limal/runlevel/LSBService.hpp 2006-09-28 16:32:46.000000000 +0200
@@ -218,9 +218,7 @@
*
* It returns the LSB exit code returned by the script,
* if the script terminated normally or -1 in any other
- * case (killed, core dumped). The execStatus variable
- * contains the raw execution / wait status, that can
- * be evaluated for the exact reason.
+ * case (killed, core dumped).
*
* If a timeout or output limit is reached, the process
* will be killed and an exception is thrown.
@@ -232,7 +230,6 @@
* @param cmdArgs Additional script arguments.
* @param stdOutput String reference for the standard output.
* @param errOutput String reference for the error output.
- * @param execStatus Integer reference for the raw execution status.
* @param envVars The environment to use (empty for current).
* @param stdInput String with the script input.
* @param timeoutSecs The number of seconds to wait for
@@ -256,7 +253,6 @@
const ServiceCmdArgs &cmdArgs,
blocxx::String &stdOutput,
blocxx::String &errOutput,
- int &execStatus,
const ServiceEnvVars &envVars,
const blocxx::String &stdInput,
int timeoutSecs,
@@ -264,7 +260,7 @@
/**
- * Execute the service script.
+ * Execute the service script action.
*
* This method discards the output of the script,
* uses the environment of the current process and
@@ -285,7 +281,7 @@
/**
- * Execute the service script.
+ * Execute the service script action.
*
* This method discards the output of the script and
* uses the environment of the current process.
@@ -302,6 +298,28 @@
executeAction(const blocxx::String &action);
+ /**
+ * @brief Deprecated execute the service script action variant.
+ *
+ * @deprecated This variant is deprecated, because it
+ * exposes the non-portable raw exitStatus parameter,
+ * that is not avaliable in blocxx 2.x version, where
+ * it is always set to -1.
+ */
+ LSBExitCode
+ executeAction(const blocxx::String &action,
+ const ServiceCmdArgs &cmdArgs,
+ blocxx::String &stdOutput,
+ blocxx::String &errOutput,
+ int &execStatus,
+ const ServiceEnvVars &envVars,
+ const blocxx::String &stdInput,
+ int timeoutSecs,
+ int outputLimit)
+ // BLOCXX_DEPRECATED
+ ;
+
+
protected:
void
addServiceAction(const blocxx::String &action);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/src/limal/runlevel/Service.hpp new/limal-runlevel-1.2.3/src/limal/runlevel/Service.hpp
--- old/limal-runlevel-1.2.2/src/limal/runlevel/Service.hpp 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/src/limal/runlevel/Service.hpp 2006-09-28 16:32:46.000000000 +0200
@@ -132,9 +132,7 @@
*
* It returns the exit status of the script process,
* if the script terminated normally or -1 in any other
- * case (killed, core dumped). The execStatus variable
- * contains the raw execution / wait status, that can
- * be evaluated for the exact reason.
+ * case (killed, core dumped).
*
* If a timeout or output limit is reached, the process
* will be killed and an exception is thrown.
@@ -145,7 +143,6 @@
* @param cmdArgs Additional script arguments.
* @param stdOutput String reference for the standard output.
* @param errOutput String reference for the error output.
- * @param execStatus Integer reference for the raw execution status.
* @param envVars The environment to use (empty for current).
* @param stdInput String with the script input.
* @param timeoutSecs The number of seconds to wait for
@@ -167,12 +164,12 @@
executeScript(const ServiceCmdArgs &cmdArgs,
blocxx::String &stdOutput,
blocxx::String &errOutput,
- int &execStatus,
const ServiceEnvVars &envVars,
const blocxx::String &stdInput,
int timeoutSecs,
int outputLimit);
+
/**
* Execute the service script.
*
@@ -190,6 +187,28 @@
int
executeScript(const ServiceCmdArgs &cmdArgs);
+
+ /**
+ * @brief Deprecated execute the service script variant.
+ *
+ * @deprecated This variant is deprecated, because it
+ * exposes the non-portable raw exitStatus parameter,
+ * that is not avaliable in blocxx 2.x version, where
+ * it is always set to -1.
+ */
+ int
+ executeScript(const ServiceCmdArgs &cmdArgs,
+ blocxx::String &stdOutput,
+ blocxx::String &errOutput,
+ int &execStatus,
+ const ServiceEnvVars &envVars,
+ const blocxx::String &stdInput,
+ int timeoutSecs,
+ int outputLimit)
+ // BLOCXX_DEPRECATED
+ ;
+
+
protected:
/**
* Set the service name and optionally the script path.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/testsuite/single.out/test_script.err new/limal-runlevel-1.2.3/testsuite/single.out/test_script.err
--- old/limal-runlevel-1.2.2/testsuite/single.out/test_script.err 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/testsuite/single.out/test_script.err 2006-09-28 16:32:46.000000000 +0200
@@ -1,9 +1,9 @@
-executing service script ./test_script.sh(start):
-service script ./test_script.sh(start) returned 0
-executing service script ./test_script.sh(reload):
-service script ./test_script.sh(reload) returned 3
-executing service script ./test_script.sh(probe):
-service script ./test_script.sh(probe) returned 1
-executing service script ./test_script.sh(stop):
-service script ./test_script.sh(stop) returned 0
-Parsing info tags in './test_script.sh'
+DEBUG limal-runlevel - executing service script './test_script.sh', 'start'
+DEBUG limal-runlevel - service script './test_script.sh', 'start' returned 0
+DEBUG limal-runlevel - executing service script './test_script.sh', 'reload'
+DEBUG limal-runlevel - service script './test_script.sh', 'reload' returned 3
+DEBUG limal-runlevel - executing service script './test_script.sh', 'probe'
+DEBUG limal-runlevel - service script './test_script.sh', 'probe' returned 1
+DEBUG limal-runlevel - executing service script './test_script.sh', 'stop'
+DEBUG limal-runlevel - service script './test_script.sh', 'stop' returned 0
+ERROR limal-runlevel - Parsing info tags in './test_script.sh'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/testsuite/single.out/test_script.out new/limal-runlevel-1.2.3/testsuite/single.out/test_script.out
--- old/limal-runlevel-1.2.2/testsuite/single.out/test_script.out 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/testsuite/single.out/test_script.out 2006-09-28 16:32:46.000000000 +0200
@@ -16,7 +16,6 @@
error output
:ERR
-RET=0 (RAW=0)
LSB INIT INFO tags for ./test_script.sh:
### BEGIN INIT INFO
Default-Start: 3 5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/testsuite/test_multi.cc new/limal-runlevel-1.2.3/testsuite/test_multi.cc
--- old/limal-runlevel-1.2.2/testsuite/test_multi.cc 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/testsuite/test_multi.cc 2006-09-28 16:32:46.000000000 +0200
@@ -4,8 +4,7 @@
#include <blocxx/Exception.hpp>
#include <blocxx/String.hpp>
-#include <blocxx/Logger.hpp>
-#include <blocxx/CerrLogger.hpp>
+#include <limal/Logger.hpp>
using namespace blocxx;
using namespace limal;
@@ -20,7 +19,14 @@
}
// let's allow the lib to log on stderr:
- blocxx::Logger::setDefaultLogger(new blocxx::CerrLogger());
+ limal::Logger::setDefaultLogger(
+ limal::Logger::createCerrLogger(
+ "test_script",
+ blocxx::StringArray(1, "*"),
+ blocxx::StringArray(1, "*"),
+ "%-5p %c - %m"
+ )
+ );
String file = argv[ 1 ];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/testsuite/test_runlevel.cc new/limal-runlevel-1.2.3/testsuite/test_runlevel.cc
--- old/limal-runlevel-1.2.2/testsuite/test_runlevel.cc 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/testsuite/test_runlevel.cc 2006-09-28 16:32:46.000000000 +0200
@@ -3,8 +3,7 @@
#include <limal/runlevel/LSBService.hpp>
#include <limal/runlevel/Runlevel.hpp>
-#include <blocxx/Logger.hpp>
-#include <blocxx/CerrLogger.hpp>
+#include <limal/Logger.hpp>
#include <blocxx/EnvVars.hpp>
#include <blocxx/Array.hpp>
#include <blocxx/Exec.hpp>
@@ -23,7 +22,14 @@
cout << "==================================" << endl;
// let's allow the lib to log on stderr:
- blocxx::Logger::setDefaultLogger(new blocxx::CerrLogger());
+ limal::Logger::setDefaultLogger(
+ limal::Logger::createCerrLogger(
+ "test_script",
+ blocxx::StringArray(1, "*"),
+ blocxx::StringArray(1, "*"),
+ "%-5p %c - %m"
+ )
+ );
cout << "Check if we have mode than one enabled runlevel: ";
if( getEnabledRunlevels().empty())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-runlevel-1.2.2/testsuite/test_script.cc new/limal-runlevel-1.2.3/testsuite/test_script.cc
--- old/limal-runlevel-1.2.2/testsuite/test_script.cc 2006-08-23 14:17:23.000000000 +0200
+++ new/limal-runlevel-1.2.3/testsuite/test_script.cc 2006-09-28 16:32:46.000000000 +0200
@@ -3,8 +3,7 @@
#include <limal/runlevel/LSBService.hpp>
#include <limal/runlevel/Runlevel.hpp>
-#include <blocxx/Logger.hpp>
-#include <blocxx/CerrLogger.hpp>
+#include <limal/Logger.hpp>
#include <blocxx/EnvVars.hpp>
#include <blocxx/Array.hpp>
#include <blocxx/Exec.hpp>
@@ -23,7 +22,14 @@
cout << "==================================" << endl;
// let's allow the lib to log on stderr:
- blocxx::Logger::setDefaultLogger(new blocxx::CerrLogger());
+ limal::Logger::setDefaultLogger(
+ limal::Logger::createCerrLogger(
+ "test_script",
+ blocxx::StringArray(1, "*"),
+ blocxx::StringArray(1, "*"),
+ "%-5p %c - %m"
+ )
+ );
test1("./test_script.sh", "start");
test1("./test_script.sh", "reload");
@@ -80,7 +86,6 @@
runlevel::LSBService service(script);
runlevel::LSBExitCode ret = runlevel::LSBExitCode(-1);
- int status = -1;
String in, out, err;
blocxx::EnvVars currEnv(EnvVars::E_CURRENT_ENVIRONMENT);
@@ -89,7 +94,7 @@
try
{
ret = service.executeAction(action,
- runlevel::ServiceCmdArgs(), out, err, status,
+ runlevel::ServiceCmdArgs(), out, err,
runlevel::ServiceEnvVars(currEnv.begin(), currEnv.end()),
in, -1, -1
);
@@ -106,7 +111,5 @@
cout << "ERR:" << endl
<< err << endl
<< ":ERR" << endl;
-
- cout << "RET=" << (int)ret << " (RAW=" << status << ")" << endl;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package limal-ca-mgm
checked in at Thu Sep 28 20:41:15 CEST 2006.
--------
--- limal-ca-mgm/limal-ca-mgm.changes 2006-09-12 15:03:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/limal-ca-mgm/limal-ca-mgm.changes 2006-09-28 17:27:06.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Sep 28 14:54:35 CEST 2006 - mt(a)suse.de
+
+- version 1.2.3
+- Adopted to build with blocxx-1.x as well as upcoming blocxx-2.x
+
+-------------------------------------------------------------------
+Tue Sep 26 11:04:41 CEST 2006 - mc(a)suse.de
+
+- merge proofreaded texts
+
+-------------------------------------------------------------------
Old:
----
limal-ca-mgm-1.2.2.tar.bz2
New:
----
limal-ca-mgm-1.2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ limal-ca-mgm.spec ++++++
--- /var/tmp/diff_new_pack.7rY2hy/_old 2006-09-28 20:40:47.000000000 +0200
+++ /var/tmp/diff_new_pack.7rY2hy/_new 2006-09-28 20:40:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package limal-ca-mgm (Version 1.2.2)
+# spec file for package limal-ca-mgm (Version 1.2.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: limal-ca-mgm
-Version: 1.2.2
+Version: 1.2.3
Release: 1
License: GPL
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: limal-ca-mgm-1.2.2.tar.bz2
+Source0: limal-ca-mgm-1.2.3.tar.bz2
prefix: /usr
%define swiglibdir %(swig -swiglib)
BuildRequires: curl gcc-c++ limal-devel limal-devtools limal-perl openssl-devel perl-gettext sgml-skel
@@ -72,7 +72,7 @@
Michael Calmer <mc(a)suse.de>
%prep
-%setup -n limal-ca-mgm-1.2.2
+%setup -n limal-ca-mgm-1.2.3
%build
%{prefix}/bin/limaltool limalautoconf
@@ -135,6 +135,11 @@
%{perl_vendorarch}/LIMAL/*.pm
%changelog -n limal-ca-mgm
+* Thu Sep 28 2006 - mt(a)suse.de
+- version 1.2.3
+- Adopted to build with blocxx-1.x as well as upcoming blocxx-2.x
+* Tue Sep 26 2006 - mc(a)suse.de
+- merge proofreaded texts
* Tue Sep 12 2006 - mc(a)suse.de
- version 1.2.2
- fix testcases (expired certificates)
++++++ limal-ca-mgm-1.2.2.tar.bz2 -> limal-ca-mgm-1.2.3.tar.bz2 ++++++
++++ 3591 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package limal
checked in at Thu Sep 28 20:32:37 CEST 2006.
--------
--- limal/limal.changes 2006-08-08 15:15:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/limal/limal.changes 2006-09-28 16:01:30.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 28 14:46:22 CEST 2006 - mt(a)suse.de
+
+- version 1.2.5
+- Adopted to build with blocxx-1.x as well as upcoming blocxx-2.x
+- Docummented missed %P (PID) Log-Format specifier.
+
+-------------------------------------------------------------------
Old:
----
limal-1.2.4.tar.bz2
New:
----
limal-1.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ limal.spec ++++++
--- /var/tmp/diff_new_pack.Xa0vD0/_old 2006-09-28 20:30:35.000000000 +0200
+++ /var/tmp/diff_new_pack.Xa0vD0/_new 2006-09-28 20:30:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package limal (Version 1.2.4)
+# spec file for package limal (Version 1.2.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: limal
URL: http://forge.novell.com/modules/xfmod/project/?limal
-Version: 1.2.4
+Version: 1.2.5
Release: 1
License: GPL
Group: Development/Languages/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: limal-1.2.4.tar.bz2
+Source0: limal-1.2.5.tar.bz2
prefix: /usr
%define swiglibdir %(swig -swiglib)
#!BuildIgnore: limal limal-devel limal-perl
@@ -52,7 +52,7 @@
%prep
-%setup -n limal-1.2.4
+%setup -n limal-1.2.5
%build
%{prefix}/bin/limaltool limalautoconf
@@ -73,6 +73,12 @@
export LD_LIBRARY_PATH="$RPM_BUILD_ROOT/usr/lib/limal"
make check DESTDIR="$RPM_BUILD_ROOT"
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -110,6 +116,10 @@
%{perl_vendorarch}/*.pm
%changelog -n limal
+* Thu Sep 28 2006 - mt(a)suse.de
+- version 1.2.5
+- Adopted to build with blocxx-1.x as well as upcoming blocxx-2.x
+- Docummented missed %%P (PID) Log-Format specifier.
* Tue Aug 08 2006 - mc(a)suse.de
- version 1.2.4
- add --verbose to autoreconf
++++++ limal-1.2.4.tar.bz2 -> limal-1.2.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/Makefile.am new/limal-1.2.5/Makefile.am
--- old/limal-1.2.4/Makefile.am 2006-08-08 15:08:14.000000000 +0200
+++ new/limal-1.2.5/Makefile.am 2006-09-28 15:57:26.000000000 +0200
@@ -36,8 +36,11 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = configure configure.in $(RPMNAME).pc Makefile Makefile.in Makefile.am \
package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec \
- ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing
+ ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing \
+ config.rpath config.h.in ABOUT-NLS mkinstalldirs
+maintainer-clean-local:
+ -rm -rf m4
configure.in: configure.in.in $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/Makefile.in new/limal-1.2.5/Makefile.in
--- old/limal-1.2.4/Makefile.in 2006-08-08 15:08:39.000000000 +0200
+++ new/limal-1.2.5/Makefile.in 2006-09-28 15:57:47.000000000 +0200
@@ -264,7 +264,8 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = configure configure.in $(RPMNAME).pc Makefile Makefile.in Makefile.am \
package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec \
- ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing
+ ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing \
+ config.rpath config.h.in ABOUT-NLS mkinstalldirs
EXTRA_DIST = VERSION RPMNAME MAINTAINER configure.in.in \
$(SUBDIRS_FILE) $(ACINCLUDE_FILE) limal*.spec.in \
@@ -701,7 +702,8 @@
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+ maintainer-clean-local
mostlyclean: mostlyclean-recursive
@@ -731,10 +733,10 @@
install-info-am install-man install-pkgconfigDATA \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-pkgconfigDATA
+ maintainer-clean-local maintainer-clean-recursive mostlyclean \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am uninstall-pkgconfigDATA
# create bzip2ed tar and make some sanity checks
@@ -744,6 +746,9 @@
exit 1 ; \
fi
+maintainer-clean-local:
+ -rm -rf m4
+
configure.in: configure.in.in $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/VERSION new/limal-1.2.5/VERSION
--- old/limal-1.2.4/VERSION 2006-08-08 15:07:47.000000000 +0200
+++ new/limal-1.2.5/VERSION 2006-09-28 15:49:08.000000000 +0200
@@ -1 +1 @@
-1.2.4
+1.2.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/configure new/limal-1.2.5/configure
--- old/limal-1.2.4/configure 2006-08-08 15:08:29.000000000 +0200
+++ new/limal-1.2.5/configure 2006-09-28 15:57:41.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for limal 1.2.4.
+# Generated by GNU Autoconf 2.59 for limal 1.2.5.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='limal'
PACKAGE_TARNAME='limal'
-PACKAGE_VERSION='1.2.4'
-PACKAGE_STRING='limal 1.2.4'
+PACKAGE_VERSION='1.2.5'
+PACKAGE_STRING='limal 1.2.5'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -971,7 +971,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 limal 1.2.4 to adapt to many kinds of systems.
+\`configure' configures limal 1.2.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1038,7 +1038,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of limal 1.2.4:";;
+ short | recursive ) echo "Configuration of limal 1.2.5:";;
esac
cat <<\_ACEOF
@@ -1191,7 +1191,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-limal configure 1.2.4
+limal configure 1.2.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1205,7 +1205,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by limal $as_me 1.2.4, which was
+It was created by limal $as_me 1.2.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1935,7 +1935,7 @@
# Define the identity of the package.
PACKAGE='limal'
- VERSION='1.2.4'
+ VERSION='1.2.5'
cat >>confdefs.h <<_ACEOF
@@ -2146,7 +2146,7 @@
-VERSION="1.2.4"
+VERSION="1.2.5"
RPMNAME="limal"
RPMARCH=""
RPMLIB="limal"
@@ -23651,7 +23651,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by limal $as_me 1.2.4, which was
+This file was extended by limal $as_me 1.2.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23714,7 +23714,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-limal config.status 1.2.4
+limal config.status 1.2.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/configure.in new/limal-1.2.5/configure.in
--- old/limal-1.2.4/configure.in 2006-08-08 15:08:14.000000000 +0200
+++ new/limal-1.2.5/configure.in 2006-09-28 15:57:26.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by limalautoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(limal, 1.2.4, http://www.suse.de/feedback, limal)
+AC_INIT(limal, 1.2.5, http://www.suse.de/feedback, limal)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important LiMaL variables
-VERSION="1.2.4"
+VERSION="1.2.5"
RPMNAME="limal"
RPMARCH=""
RPMLIB="limal"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/limal.spec.in new/limal-1.2.5/limal.spec.in
--- old/limal-1.2.4/limal.spec.in 2006-07-28 10:29:16.000000000 +0200
+++ new/limal-1.2.5/limal.spec.in 2006-08-17 15:49:34.000000000 +0200
@@ -3,23 +3,23 @@
@HEADER@
#!BuildIgnore: limal limal-devel limal-perl
BuildRequires: blocxx-devel curl gcc-c++ limal-devtools perl-gettext sgml-skel
-Summary: -
+Summary: LiMaL--Core Library
%description
--
+Core library of LiMaL.
@HEADER-DEVEL@
Requires: blocxx-devel libstdc++-devel pcre-devel limal-devtools
-Summary: -
+Summary: LiMaL - Core Library Development Files
%description devel
--
+LiMaL - Core Library Development Files
@HEADER-PERL@
-Summary: -
+Summary: LiMaL - Core Library Perl Bindings
%description perl
--
+LiMaL - Core Library Perl Bindings
@PREP@
@@ -27,6 +27,10 @@
@INSTALL@
+@POST@
+
+@POSTUN@
+
@CLEAN@
%files
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/po/limal.pot new/limal-1.2.5/po/limal.pot
--- old/limal-1.2.4/po/limal.pot 2006-08-07 10:08:46.000000000 +0200
+++ new/limal-1.2.5/po/limal.pot 2006-09-11 13:36:15.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translation(a)suse.de\n"
-"POT-Creation-Date: 2006-08-07 10:08+0200\n"
+"POT-Creation-Date: 2006-09-11 13:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/src/Logger.cpp new/limal-1.2.5/src/Logger.cpp
--- old/limal-1.2.4/src/Logger.cpp 2006-07-25 15:38:05.000000000 +0200
+++ new/limal-1.2.5/src/Logger.cpp 2006-09-28 15:49:08.000000000 +0200
@@ -23,6 +23,7 @@
#include <blocxx/CerrAppender.hpp>
#include <blocxx/FileAppender.hpp>
#include <blocxx/SyslogAppender.hpp>
+#include <blocxx/LogMessage.hpp>
#include <blocxx/Format.hpp>
#include "Utils.hpp"
@@ -36,6 +37,41 @@
// -------------------------------------------------------------------
+#if BLOCXX_LIBRARY_VERSION >= 5
+namespace
+{
+ class LoggerWrapper: public blocxx::Logger
+ {
+ public:
+ virtual
+ ~LoggerWrapper()
+ {}
+
+ LoggerWrapper()
+ : blocxx::Logger()
+ {}
+ LoggerWrapper(const blocxx::Logger &logger)
+ : blocxx::Logger(logger)
+ {}
+
+ bool setAsDefaultLogAppender()
+ {
+ return LogAppender::setDefaultLogAppender(
+ blocxx::Logger::m_appender
+ );
+ }
+ bool setAsThreadLogAppender()
+ {
+ return LogAppender::setThreadLogAppender(
+ blocxx::Logger::m_appender
+ );
+ }
+ };
+}
+#endif
+
+
+// -------------------------------------------------------------------
Logger::Logger(const String &component)
: m_component(component)
{
@@ -85,21 +121,9 @@
break;
}
- if( m_component.empty())
- {
- blocxx::Logger::getCurrentLogger()->logMessage(
- category, message,
- filename, fileline, methodname
- );
- }
- else
- {
- blocxx::Logger::getCurrentLogger()->logMessage(
- m_component,
- category, message,
- filename, fileline, methodname
- );
- }
+ return logMessage(
+ category, message, filename, fileline, methodname
+ );
}
@@ -111,6 +135,28 @@
int fileline,
const char *methodname) const
{
+#if BLOCXX_LIBRARY_VERSION >= 5
+ if( m_component.empty())
+ {
+ blocxx::LogAppender::getCurrentLogAppender()->logMessage(
+ blocxx::LogMessage(
+ blocxx::Logger::STR_DEFAULT_COMPONENT,
+ category, message,
+ filename, fileline, methodname
+ )
+ );
+ }
+ else
+ {
+ blocxx::LogAppender::getCurrentLogAppender()->logMessage(
+ blocxx::LogMessage(
+ m_component,
+ category, message,
+ filename, fileline, methodname
+ )
+ );
+ }
+#else
if( m_component.empty())
{
blocxx::Logger::getCurrentLogger()->logMessage(
@@ -126,33 +172,43 @@
filename, fileline, methodname
);
}
+#endif
}
// -------------------------------------------------------------------
bool
-Logger::isEnabledFor(const ELogLevel level)
+Logger::isEnabledFor(const ELogLevel level) const
{
+#if BLOCXX_LIBRARY_VERSION >= 5
+ return LogAppender::getCurrentLogAppender()->getLogLevel() >= level;
+#else
return Logger::getCurrentLogger()->levelIsEnabled(level);
+#endif
}
// -------------------------------------------------------------------
bool
-Logger::isEnabledFor(const String &category)
+Logger::isEnabledFor(const String &category) const
{
+#if BLOCXX_LIBRARY_VERSION >= 5
+ return LogAppender::getCurrentLogAppender()->categoryIsEnabled(category);
+#else
return Logger::getCurrentLogger()->categoryIsEnabled(category);
+#endif
}
// -------------------------------------------------------------------
LoggerRef
-Logger::createCerrLogger(const String &mainComponent,
+Logger::createCerrLogger(const String &component,
const StringArray &components,
const StringArray &categories,
const String &messageFormat)
{
- String defname( !mainComponent.empty() ? mainComponent : "limal");
+ String defname( !component.empty() ? component :
+ blocxx::Logger::STR_DEFAULT_COMPONENT);
String mformat( !messageFormat.empty() ? messageFormat :
CerrAppender::STR_DEFAULT_MESSAGE_PATTERN);
@@ -160,23 +216,30 @@
components, categories, mformat
));
+#if BLOCXX_LIBRARY_VERSION >= 5
+ LoggerRef logRef(new blocxx::Logger(
+ defname, appRef
+ ));
+#else
LoggerRef logRef(new AppenderLogger(
defname, E_ALL_LEVEL, appRef
));
+#endif
return logRef;
}
// -------------------------------------------------------------------
LoggerRef
-Logger::createSyslogLogger(const String &mainComponent,
+Logger::createSyslogLogger(const String &component,
const StringArray &components,
const StringArray &categories,
const String &messageFormat,
const String &identity,
const String &facility)
{
- String defname( !mainComponent.empty() ? mainComponent : "limal");
+ String defname( !component.empty() ? component :
+ blocxx::Logger::STR_DEFAULT_COMPONENT);
String mformat( !messageFormat.empty() ? messageFormat :
SyslogAppender::STR_DEFAULT_MESSAGE_PATTERN);
String log_tag( identity.empty() || identity.isSpaces() ? defname :
@@ -186,38 +249,51 @@
components, categories, mformat, log_tag, facility
));
+#if BLOCXX_LIBRARY_VERSION >= 5
+ LoggerRef logRef(new blocxx::Logger(
+ defname, appRef
+ ));
+#else
LoggerRef logRef(new AppenderLogger(
defname, E_ALL_LEVEL, appRef
));
+#endif
return logRef;
}
// -------------------------------------------------------------------
LoggerRef
-Logger::createNullLogger(const String &mainComponent,
+Logger::createNullLogger(const String &component,
const StringArray &components,
const StringArray &categories,
const String &messageFormat)
{
- String defname( !mainComponent.empty() ? mainComponent : "limal");
+ String defname( !component.empty() ? component :
+ blocxx::Logger::STR_DEFAULT_COMPONENT);
String mformat( !messageFormat.empty() ? messageFormat :
- NullAppender::STR_DEFAULT_MESSAGE_PATTERN);
+ NullAppender::STR_DEFAULT_MESSAGE_PATTERN);
LogAppenderRef appRef(new NullAppender(
components, categories, mformat
));
+#if BLOCXX_LIBRARY_VERSION >= 5
+ LoggerRef logRef(new blocxx::Logger(
+ defname, appRef
+ ));
+#else
LoggerRef logRef(new AppenderLogger(
defname, E_ALL_LEVEL, appRef
));
+#endif
return logRef;
}
// -------------------------------------------------------------------
LoggerRef
-Logger::createFileLogger(const String &mainComponent,
+Logger::createFileLogger(const String &component,
const StringArray &components,
const StringArray &categories,
const String &messageFormat,
@@ -225,9 +301,10 @@
UInt64 maxLogFileSize,
UInt32 maxBackupIndex)
{
- String defname( !mainComponent.empty() ? mainComponent : "limal");
+ String defname( !component.empty() ? component :
+ blocxx::Logger::STR_DEFAULT_COMPONENT);
String mformat( !messageFormat.empty() ? messageFormat :
- FileAppender::STR_DEFAULT_MESSAGE_PATTERN);
+ FileAppender::STR_DEFAULT_MESSAGE_PATTERN);
if( maxLogFileSize >= (UInt64(-1) / UInt64(1024)))
{
@@ -255,13 +332,75 @@
mformat, maxLogFileSize, maxBackupIndex
));
+#if BLOCXX_LIBRARY_VERSION >= 5
+ LoggerRef logRef(new blocxx::Logger(
+ defname, appRef
+ ));
+#else
LoggerRef logRef(new AppenderLogger(
defname, E_ALL_LEVEL, appRef
));
+#endif
return logRef;
}
// -------------------------------------------------------------------
+//static
+bool Logger::setDefaultFromLoggerRef(const blocxx::LoggerRef &ref)
+{
+#if BLOCXX_LIBRARY_VERSION >= 5
+ return LoggerWrapper(*ref).setAsDefaultLogAppender();
+#else
+ return blocxx::Logger::setDefaultLogger(ref);
+#endif
+}
+
+
+// -------------------------------------------------------------------
+//static
+bool Logger::setThreadFromLoggerRef(const blocxx::LoggerRef &ref)
+{
+#if BLOCXX_LIBRARY_VERSION >= 5
+ return LoggerWrapper(*ref).setAsThreadLogAppender();
+#else
+ return blocxx::Logger::setThreadLogger(ref);
+#endif
+}
+
+
+// -------------------------------------------------------------------
+//static
+blocxx::LoggerRef
+Logger::getDefaultAsLoggerRef()
+{
+#if BLOCXX_LIBRARY_VERSION >= 5
+ return blocxx::LoggerRef(new blocxx::Logger(
+ blocxx::Logger::STR_DEFAULT_COMPONENT,
+ blocxx::LogAppender::getDefaultLogAppender()
+ ));
+#else
+ return blocxx::Logger::getDefaultLogger();
+#endif
+}
+
+
+// -------------------------------------------------------------------
+//static
+blocxx::LoggerRef
+Logger::getCurrentAsLoggerRef()
+{
+#if BLOCXX_LIBRARY_VERSION >= 5
+ return blocxx::LoggerRef(new blocxx::Logger(
+ blocxx::Logger::STR_DEFAULT_COMPONENT,
+ blocxx::LogAppender::getCurrentLogAppender()
+ ));
+#else
+ return blocxx::Logger::getCurrentLogger();
+#endif
+}
+
+
+// -------------------------------------------------------------------
} // LIMAL_NAMESPACE
/* vim: set ts=8 sts=8 sw=8 ai noet: */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/src/PathUtils.cpp new/limal-1.2.5/src/PathUtils.cpp
--- old/limal-1.2.4/src/PathUtils.cpp 2006-07-25 15:38:05.000000000 +0200
+++ new/limal-1.2.5/src/PathUtils.cpp 2006-09-28 15:49:08.000000000 +0200
@@ -154,15 +154,32 @@
String stdOutput;
String errOutput;
- int status = 0;
+ int status = -1;
+#if BLOCXX_LIBRARY_VERSION >= 5
try {
-
- Exec::executeProcessAndGatherOutput(cmd, stdOutput, errOutput, status, EnvVars());
-
- } catch(Exception& e) {
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ cmd, stdOutput, errOutput, EnvVars()
+ );
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
+ }
+ catch(const blocxx::Exception &e) {
+ LOGIT_ERROR( "removeDirRecursive exception:" << e);
+ }
+#else
+ try {
+ int execStatus = -1;
+ Exec::executeProcessAndGatherOutput(
+ cmd, stdOutput, errOutput, execStatus, EnvVars()
+ );
+ if( execStatus != -1 && WIFEXITED(execStatus))
+ status = WEXITSTATUS(execStatus);
+ }
+ catch(const blocxx::Exception &e) {
LOGIT_ERROR( "removeDirRecursive exception:" << e);
- status = -1;
}
+#endif
if(status != 0) {
LOGIT_ERROR( "removeDirRecursive status:" << status );
}
@@ -172,7 +189,7 @@
if(!stdOutput.empty()) {
LOGIT_DEBUG( "removeDirRecursive stdout:" << stdOutput );
}
-
+
return status;
}
@@ -212,15 +229,32 @@
String stdOutput;
String errOutput;
- int status = 0;
+ int status = -1;
+#if BLOCXX_LIBRARY_VERSION >= 5
try {
-
- Exec::executeProcessAndGatherOutput(cmd, stdOutput, errOutput, status, EnvVars());
-
- } catch(Exception& e) {
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ cmd, stdOutput, errOutput, EnvVars()
+ );
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
+ }
+ catch(const blocxx::Exception &e) {
LOGIT_ERROR( "copyDir exception:" << e);
- status = -1;
}
+#else
+ try {
+ int execStatus = -1;
+ Exec::executeProcessAndGatherOutput(
+ cmd, stdOutput, errOutput, execStatus, EnvVars()
+ );
+ if( execStatus != -1 && WIFEXITED(execStatus))
+ status = WEXITSTATUS(execStatus);
+ }
+ catch(const blocxx::Exception &e) {
+ LOGIT_ERROR( "copyDir exception:" << e);
+ }
+#endif
if(status != 0) {
LOGIT_ERROR( "copyDir status:" << status );
}
@@ -344,15 +378,32 @@
String stdOutput;
String errOutput;
- int status = 0;
+ int status = -1;
+#if BLOCXX_LIBRARY_VERSION >= 5
try {
-
- Exec::executeProcessAndGatherOutput(cmd, stdOutput, errOutput, status, EnvVars());
-
- } catch(Exception& e) {
+ Process::Status ps;
+ ps = Exec::executeProcessAndGatherOutput(
+ cmd, stdOutput, errOutput, EnvVars()
+ );
+ if( ps.exitTerminated())
+ status = ps.exitStatus();
+ }
+ catch(const blocxx::Exception &e) {
+ LOGIT_ERROR( "copyFile exception:" << e);
+ }
+#else
+ try {
+ int execStatus = -1;
+ Exec::executeProcessAndGatherOutput(
+ cmd, stdOutput, errOutput, execStatus, EnvVars()
+ );
+ if( execStatus != -1 && WIFEXITED(execStatus))
+ status = WEXITSTATUS(execStatus);
+ }
+ catch(const blocxx::Exception &e) {
LOGIT_ERROR( "copyFile exception:" << e);
- status = -1;
}
+#endif
if(status != 0) {
LOGIT_ERROR( "copyFile status:" << status );
}
@@ -404,4 +455,4 @@
} // namespace path
} // namespace LIMAL_NAMESPACE
-
+/* vim: set ts=8 sts=4 sw=4 ai noet: */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.2.4/src/limal/Logger.hpp new/limal-1.2.5/src/limal/Logger.hpp
--- old/limal-1.2.4/src/limal/Logger.hpp 2006-07-25 15:38:05.000000000 +0200
+++ new/limal-1.2.5/src/limal/Logger.hpp 2006-09-28 15:49:08.000000000 +0200
@@ -232,6 +232,7 @@
* and ending @c "]]>"
* @li @c %%n The platform dependent line separator character (\\n) or
* characters (\\r\\n)
+ * @li @c %%P The process id
* @li @c %%p Category, aka level, aka priority
* @li @c %%r The number of milliseconds elapsed since the start of the
* application until the creation of the logging event
@@ -306,8 +307,6 @@
* );
*
* limal::Logger::setDefaultLogger(l);
- * // or:
- * //blocxx::Logger::setDefaultLogger(l);
* @endcode
*
* @param component The default component name (application name).
@@ -475,7 +474,7 @@
inline static bool
setDefaultLogger(const blocxx::LoggerRef &ref)
{
- return blocxx::Logger::setDefaultLogger(ref);
+ return limal::Logger::setDefaultFromLoggerRef(ref);
}
/**
@@ -490,7 +489,7 @@
inline static bool
setThreadLogger(const blocxx::LoggerRef &ref)
{
- return blocxx::Logger::setThreadLogger(ref);
+ return limal::Logger::setThreadFromLoggerRef(ref);
}
/**
@@ -499,7 +498,7 @@
*/
inline static blocxx::LoggerRef getDefaultLogger()
{
- return blocxx::Logger::getDefaultLogger();
+ return limal::Logger::getDefaultAsLoggerRef();
}
/**
@@ -510,7 +509,7 @@
*/
inline static blocxx::LoggerRef getCurrentLogger()
{
- return blocxx::Logger::getCurrentLogger();
+ return limal::Logger::getCurrentAsLoggerRef();
}
/**
@@ -558,7 +557,7 @@
* @return true if enabled or false
*/
bool
- isEnabledFor(const ELogLevel level);
+ isEnabledFor(const ELogLevel level) const;
/**
@@ -569,10 +568,15 @@
* @return true if enabled or false
*/
bool
- isEnabledFor(const blocxx::String &category);
+ isEnabledFor(const blocxx::String &category) const;
private:
+ static bool setDefaultFromLoggerRef(const blocxx::LoggerRef &ref);
+ static bool setThreadFromLoggerRef(const blocxx::LoggerRef &ref);
+ static blocxx::LoggerRef getDefaultAsLoggerRef();
+ static blocxx::LoggerRef getCurrentAsLoggerRef();
+
blocxx::String m_component;
};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package libtomoe-gtk
checked in at Thu Sep 28 20:30:27 CEST 2006.
--------
--- GNOME/libtomoe-gtk/libtomoe-gtk.changes 2006-01-25 21:32:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/libtomoe-gtk/libtomoe-gtk.changes 2006-09-28 12:25:23.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 28 12:25:02 CEST 2006 - mfabian(a)suse.de
+
+- Bugzilla #204090: “local variable used before set”.
+
+-------------------------------------------------------------------
New:
----
bugzilla-204093-local-variable-used-before-set.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libtomoe-gtk.spec ++++++
--- /var/tmp/diff_new_pack.FrZTur/_old 2006-09-28 20:17:54.000000000 +0200
+++ /var/tmp/diff_new_pack.FrZTur/_new 2006-09-28 20:17:54.000000000 +0200
@@ -5,7 +5,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -16,15 +16,15 @@
Group: System/I18n/Japanese
Autoreqprov: on
Version: 0.1.0
-Release: 1
+Release: 20
URL: https://sourceforge.jp/projects/tomoe/
Source0: http://osdn.dl.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.bz2
+Patch0: bugzilla-204093-local-variable-used-before-set.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: Include Files and Libraries mandatory for Development
+Summary: TOMOE GTK+ library
%description
-This package contains all necessary include files and libraries needed
-to develop applications that require these.
+TOMOE GTK+ library
@@ -34,12 +34,13 @@
HIGUCHI Daisuke <daih(a)users.sourceforge.jp>
%package devel
-Summary: TOMOE GTK+ library
+Summary: Include Files and Libraries mandatory for Development
Group: System/I18n/Japanese
Requires: %{name} = %{version}-%{release}
%description devel
-TOMOE GTK+ library
+This package contains all necessary include files and libraries needed
+to develop applications that require these.
@@ -50,6 +51,7 @@
%prep
%setup0 -q -n %{name}-%{version}
+%patch0 -p1
%build
rm -f config.cache
@@ -88,6 +90,8 @@
/usr/include/tomoe/*
%changelog -n libtomoe-gtk
+* Thu Sep 28 2006 - mfabian(a)suse.de
+- Bugzilla #204090: “local variable used before set”.
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Fri Jan 13 2006 - mfabian(a)suse.de
++++++ bugzilla-204093-local-variable-used-before-set.patch ++++++
diff -ru libtomoe-gtk-0.1.0.orig/src/tomoe_canvas.c libtomoe-gtk-0.1.0/src/tomoe_canvas.c
--- libtomoe-gtk-0.1.0.orig/src/tomoe_canvas.c 2005-10-18 10:56:15.000000000 +0200
+++ libtomoe-gtk-0.1.0/src/tomoe_canvas.c 2006-09-28 12:23:35.000000000 +0200
@@ -263,7 +263,7 @@
static void
tomoe_canvas_dispose (GObject *object)
{
- TomoeCanvas *canvas = TOMOE_CANVAS (canvas);
+ TomoeCanvas *canvas = TOMOE_CANVAS (object);
TomoeCanvasPriv *priv = TOMOE_CANVAS_GET_PRIVATE (canvas);
instance_list = g_list_remove (instance_list, (gpointer) canvas);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package hal-resmgr
checked in at Thu Sep 28 20:14:42 CEST 2006.
--------
--- hal-resmgr/hal-resmgr.changes 2006-09-08 16:20:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal-resmgr/hal-resmgr.changes 2006-09-28 14:28:05.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 28 14:23:17 CEST 2006 - lnussel(a)suse.de
+
+- fix program help text and README to reflect the new duties of
+ hal-resmgr and resmgr
+- implement device flags (eg read-only)
+
+-------------------------------------------------------------------
Old:
----
hal-resmgr-0.1_SVNr111.tar.bz2
New:
----
hal-resmgr-0.1_SVNr114.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-resmgr.spec ++++++
--- /var/tmp/diff_new_pack.N7YCAq/_old 2006-09-28 20:14:18.000000000 +0200
+++ /var/tmp/diff_new_pack.N7YCAq/_new 2006-09-28 20:14:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal-resmgr (Version 0.1_SVNr111)
+# spec file for package hal-resmgr (Version 0.1_SVNr114)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,9 +14,9 @@
BuildRequires: hal-devel libacl-devel resmgr
License: GPL, Other License(s), see package
Group: System/Daemons
-Version: 0.1_SVNr111
+Version: 0.1_SVNr114
Release: 1
-Summary: Automatically Register HAL Devices with resmgr
+Summary: Install ACLs on device nodes
Source: %{name}-%{version}.tar.bz2
Source1: rchal-resmgr
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -25,9 +25,8 @@
Requires: resmgr
%description
-hal-resmgr hooks into hald and dynamically registers devices with
-resmgr when they are plugged in and removes them when they are
-unplugged.
+hal-resmgr hooks into hald and resmgr in order to install file system
+ACLs on device nodes when users log in and out.
@@ -60,6 +59,10 @@
%{_libdir}/hal/scripts/hal-resmgr-revoke
%changelog -n hal-resmgr
+* Thu Sep 28 2006 - lnussel(a)suse.de
+- fix program help text and README to reflect the new duties of
+ hal-resmgr and resmgr
+- implement device flags (eg read-only)
* Fri Sep 08 2006 - lnussel(a)suse.de
- add match rule for scanners (#160899)
* Wed Sep 06 2006 - lnussel(a)suse.de
++++++ hal-resmgr-0.1_SVNr111.tar.bz2 -> hal-resmgr-0.1_SVNr114.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-resmgr-0.1_SVNr111/README new/hal-resmgr-0.1_SVNr114/README
--- old/hal-resmgr-0.1_SVNr111/README 2006-01-16 15:28:52.000000000 +0100
+++ new/hal-resmgr-0.1_SVNr114/README 2006-09-28 14:23:17.000000000 +0200
@@ -1,16 +1,18 @@
-hal-resmgr is used as callout from hald to notify resmgrd of new and
-removed devices. The fdi file resmgr.fdi (installed as
-/usr/share/hal/fdi/policy/10osvendor/80-resmgr.fdi) merges resmgr
-specific properties into hal.
+hal-resmgr is used as callout from hald and resmgrd to install ACLs
+on device files.
+
+Devices that should be processed by hal-resmgr need to be tagged.
+The fdi file resmgr.fdi (installed as
+/usr/share/hal/fdi/policy/10osvendor/80-resmgr.fdi) does that by
+merging resmgr specific properties into hal.
The following properties are supported:
- resmgr.class (string): the resmgr class the device should added to
- resmgr.flags (strlist): list of flags (see add command in resmgr(1))
- resmgr.device (string): the path to the device node that should be
- added to resmgr. If it's empty block.device and linux.device_file
- are tried instead. If the device is usb it will be added for
- libusb access automatically.
+ used. If it's empty the properties block.device, linux.device_file
+ and usbraw.device are checked in that order instead.
To make hald actually run hal-resmgr one needs to add hal-resmgr to
the strlist properties info.callouts.add and info.callouts.remove.
@@ -18,9 +20,10 @@
for all devices that have resmgr.class set.
EXAMPLE:
-To add a device with vendor id 0x1234 and product id 0x5678 to class
-scanner, create a file /etc/hal/fdi/policy/20user/50-scanner.fdi
-with the following content:
+To tell hal-resmgr that a device with vendor id 0x1234 and product
+id 0x5678 should be treated as class scanner, create a file
+/etc/hal/fdi/policy/20user/50-scanner.fdi with the following
+content:
<?xml version="1.0" encoding="ISO-8859-1"?>
<deviceinfo version="0.2">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-resmgr-0.1_SVNr111/file.c new/hal-resmgr-0.1_SVNr114/file.c
--- old/hal-resmgr-0.1_SVNr111/file.c 2006-09-05 14:20:29.000000000 +0200
+++ new/hal-resmgr-0.1_SVNr114/file.c 2006-09-15 14:38:34.000000000 +0200
@@ -17,13 +17,23 @@
#include "facl.h"
#include "debug.h"
-res_file_t* res_file_new(const char* name, const char* flags)
+res_file_t* res_file_new(const char* name, const char** flags)
{
res_file_t* dev;
+ unsigned i;
dev = calloc(1, sizeof(res_file_t)+strlen(name)+1);
strcpy(dev->name, name);
- // TODO: parse flags
+
+ for(i = 0; flags && flags[i]; ++i)
+ {
+ if(!strcmp(flags[i], "read-only"))
+ dev->flags |= DEV_FLAGS_RO;
+ else if(!strcmp(flags[i], "nofacl"))
+ dev->flags |= DEV_FLAGS_NOFACL;
+ else
+ warning("unknown flag %s on %s", flags[i], name);
+ }
return dev;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-resmgr-0.1_SVNr111/file.h new/hal-resmgr-0.1_SVNr114/file.h
--- old/hal-resmgr-0.1_SVNr111/file.h 2006-09-05 14:20:29.000000000 +0200
+++ new/hal-resmgr-0.1_SVNr114/file.h 2006-09-15 14:38:34.000000000 +0200
@@ -18,7 +18,7 @@
DEV_FLAGS_OWNER = 0x80,
};
-res_file_t* res_file_new(const char* name, const char* flags);
+res_file_t* res_file_new(const char* name, const char** flags);
void res_file_free(res_file_t* dev);
int res_file_grant(res_file_t *dev, uid_t uid);
int res_file_revoke(res_file_t *dev, uid_t uid);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-resmgr-0.1_SVNr111/hal-resmgr.c new/hal-resmgr-0.1_SVNr114/hal-resmgr.c
--- old/hal-resmgr-0.1_SVNr111/hal-resmgr.c 2006-09-05 14:20:29.000000000 +0200
+++ new/hal-resmgr-0.1_SVNr114/hal-resmgr.c 2006-09-28 14:17:12.000000000 +0200
@@ -122,7 +122,7 @@
{
char path[PATH_MAX];
-// TODO: use cache and resmgr C api instead of fs
+// TODO: use cache and resmgr/polkit C api instead of fs
snprintf(path, sizeof(path), RESMGR_LOGINCLASSES_PATH "%s/%s", priv, user);
if(access(path, F_OK) == 0)
@@ -132,14 +132,14 @@
}
static void
-rsm_doit(char** classes, const char* device, const char* flags)
+rsm_doit(char** classes, const char* device, const char** flaglist)
{
unsigned i, j;
res_file_t* dev;
- dev = res_file_new(device, flags);
+ dev = res_file_new(device, flaglist);
- debug(1, "%s", device);
+ debug(1, "%s", device);
if(num_login_users)
{
@@ -258,12 +258,11 @@
static void
device_register_resmgr (LibHalContext *ctx, const char *udi)
{
- unsigned i;
LibHalPropertyType proptype;
char **classes = NULL;
const char* key = "resmgr.class";
char* device = NULL;
- char* flags = NULL;
+ char** flags = NULL;
if(libhal_device_property_exists (ctx, udi, key, NULL)
&& usb_interface_hack(ctx, udi))
@@ -288,30 +287,7 @@
if(!classes)
return;
- if(1)
- {
- char** flaglist = NULL;
- flaglist = libhal_device_get_property_strlist (hal_ctx, udi, "resmgr.flags", NULL);
- if(flaglist)
- {
- unsigned len = 0;
- for(i = 0; flaglist[i]; ++i)
- {
- len += strlen(flaglist[i]) + 1;
- }
- flags = calloc(len, sizeof(char));
-
- len = 0;
- for(i = 0; flaglist[i]; ++i)
- {
- if(i) flags[len++] = ' ';
- strcpy(flags+len, flaglist[i]);
- len += strlen(flaglist[i]);
- }
-
- libhal_free_string_array (flaglist);
- }
- }
+ flags = libhal_device_get_property_strlist (hal_ctx, udi, "resmgr.flags", NULL);
if((device = guess_device_name(hal_ctx, udi)))
{
@@ -326,18 +302,23 @@
printf(" %s", classes[i]);
}
puts("");
- if(flags)
- printf("Flags %s\n", flags);
- puts("");
+ for(i = 0; flags && flags[i]; ++i)
+ {
+ if(!i) fputs("Flags ", stdout);
+ fputc(' ', stdout);
+ fputs(flags[i], stdout);
+ }
+ if(i)
+ puts("");
}
else
{
- rsm_doit(classes, device, flags);
+ rsm_doit(classes, device, (const char**)flags);
}
libhal_free_string(device);
}
- free(flags);
+ libhal_free_string_array (flags);
libhal_free_string_array(classes);
}
@@ -351,18 +332,16 @@
{
printf ("\n" "usage : %s [OPTIONS]\n", argv[0]);
printf ("\nOPTIONS:\n"
- " --monitor Monitor device list\n"
" --retries=NUM try to get device list NUM times if it failed\n"
" --debug[=NUM] set debug level\n"
" --grant=USER grant USER access to devices\n"
" --revoke=USER revoke USER's access to devices\n"
" --udi=UDI set ACLs on UDI\n"
+ " --list list devices handled by hal-resmgr\n"
" --help Show this information and exit\n"
"\n"
- "Registers devices with resmgr. If the --monitor option is given\n"
- "then the device list and all devices are monitored for changes.\n"
- "\nCan be run as callout from hald without parameters do add or\n"
- "remove devices dynamically\n"
+ "Set ACLs on device nodes according to resmgr login classes\n"
+ "The list of devices is provided by hal\n"
"\n");
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package evms
checked in at Thu Sep 28 20:13:32 CEST 2006.
--------
--- evms/evms.changes 2006-07-28 12:58:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/evms/evms.changes 2006-09-28 18:20:46.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 28 10:18:51 MDT 2006 - cgao(a)novell.com
+
+- downloaded patch cli_query_segfault.patch which fixes #198382
+
+-------------------------------------------------------------------
New:
----
cli_query_segfault.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evms.spec ++++++
--- /var/tmp/diff_new_pack.3pXq1e/_old 2006-09-28 20:11:20.000000000 +0200
+++ /var/tmp/diff_new_pack.3pXq1e/_new 2006-09-28 20:11:20.000000000 +0200
@@ -20,7 +20,7 @@
%endif
Autoreqprov: on
Version: 2.5.5
-Release: 27
+Release: 33
Summary: EVMS--Enterprise Volume Management System
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: http://prdownloads.sourceforge.net/evms/evms-%{version}.tar.bz2
@@ -50,6 +50,7 @@
Patch18: md_super_fix2.patch
Patch19: md_over_limit_error.patch
Patch20: allow_container_on_active_md.patch
+Patch21: cli_query_segfault.patch
%description
This package contains the userspace tools needed to manage EVMS
@@ -123,6 +124,7 @@
%patch18 -p1
%patch19 -p1
%patch20
+%patch21 -p1
%build
autoconf
@@ -201,6 +203,8 @@
/etc/ha.d/resource.d/evms_failover
%changelog -n evms
+* Thu Sep 28 2006 - cgao(a)novell.com
+- downloaded patch cli_query_segfault.patch which fixes #198382
* Fri Jul 28 2006 - olh(a)suse.de
- remove dropped boot.ibmsis from boot.evms
- remove unneeed boot.proc from boot.evms (#182347)
++++++ cli_query_segfault.patch ++++++
Fix for a segfault in the CLI when doing a query -- not enough memory declared
for a handle array.
--- evms-2.5.5/ui/cli/interpreter.c 2005-06-01 10:20:32.000000000 -0500
+++ evms-2.5.5-fix/ui/cli/interpreter.c 2006-09-14 09:47:16.480084103 -0500
@@ -3326,7 +3326,8 @@
dlist_t Return_Values;
object_handle_t Object_Handle;
handle_array_t * Object_List;
- handle_array_t Tmp_Array;
+ char Tmp_Buffer[sizeof(handle_array_t) + sizeof(object_handle_t)];
+ handle_array_t * Tmp_Array = (handle_array_t *)Tmp_Buffer;
handle_object_info_t * Object_Info;
expand_handle_array_t * Expand_Points;
shrink_handle_array_t * Shrink_Points;
@@ -3477,9 +3478,9 @@
case EVMS_OBJECT:
Object_List = Object_Info->info.object.parent_objects;
if (Object_List->count == 0 && Object_Info->info.object.volume != 0) {
- Tmp_Array.count = 1;
- Tmp_Array.handle[0] = Object_Info->info.object.volume;
- Object_List = &Tmp_Array;
+ Tmp_Array->count = 1;
+ Tmp_Array->handle[0] = Object_Info->info.object.volume;
+ Object_List = Tmp_Array;
}
break;
default:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package compat-libstdc++
checked in at Thu Sep 28 20:11:14 CEST 2006.
--------
--- compat-libstdc++/compat-libstdc++.changes 2006-03-06 00:03:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/compat-libstdc++/compat-libstdc++.changes 2006-09-28 14:42:05.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 28 14:41:57 CEST 2006 - rguenther(a)suse.de
+
+- Provide libstdc++5.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compat-g77.spec ++++++
--- /var/tmp/diff_new_pack.860hXT/_old 2006-09-28 20:10:46.000000000 +0200
+++ /var/tmp/diff_new_pack.860hXT/_new 2006-09-28 20:10:46.000000000 +0200
@@ -15,7 +15,7 @@
BuildRequires: dejagnu doxygen glibc-devel-32bit
Prefix: %_prefix
Version: 3.3.5
-Release: 10
+Release: 23
URL: http://gcc.gnu.org/
License: LGPL
Summary: GNU Fortran 77 Compiler
++++++ compat-libstdc++.spec ++++++
--- /var/tmp/diff_new_pack.860hXT/_old 2006-09-28 20:10:46.000000000 +0200
+++ /var/tmp/diff_new_pack.860hXT/_new 2006-09-28 20:10:46.000000000 +0200
@@ -13,7 +13,7 @@
Name: compat-libstdc++
BuildRequires: glibc-devel-32bit
Version: 5.0.7
-Release: 14
+Release: 27
Autoreqprov: on
License: GPL
Group: System/Libraries
@@ -21,6 +21,10 @@
ExclusiveArch: alpha %ix86 ia64 ppc ppc64 s390 s390x x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define gcc_version 3.3.5
+Provides: libstdc++5 = %{gcc_version}
+%ifarch x86_64 s390x ppc64
+Provides: libstdc++5-32bit = %{gcc_version}
+%endif
Source: gcc-%{gcc_version}.tar.bz2
Patch0: gcc-3.3.5-hammer.patch.bz2
Patch1: gcc-noalias-warn.diff
@@ -68,6 +72,7 @@
%package -n compat-libstdc++-64bit
Autoreqprov: on
+Provides: libstdc++5-64bit = %{gcc_version}
Group: System/Libraries
Summary: The Old stdc++ Library
@@ -237,6 +242,8 @@
%endif
%changelog -n compat-libstdc++
+* Thu Sep 28 2006 - rguenther(a)suse.de
+- Provide libstdc++5.
* Mon Mar 06 2006 - schwab(a)suse.de
- Update build check.
* Fri Feb 24 2006 - matz(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package bluez-utils
checked in at Thu Sep 28 20:10:35 CEST 2006.
--------
--- bluez-utils/bluez-utils.changes 2006-09-07 17:10:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/bluez-utils/bluez-utils.changes 2006-09-28 12:38:01.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Sep 28 12:36:08 CEST 2006 - seife(a)suse.de
+
+- update to v3.6.1:
+ * Fix IO channel race conditions.
+ * Fix pairing issues on big endian systems.
+ * Fix pairing issues with page timeout errors.
+ * Fix pairing state for security mode 3 requests.
+ * Switch to user as default security manager mode.
+- v3.6:
+ * Update D-Bus based RFCOMM interface support.
+ * Use L2CAP raw sockets for HCI connection creation.
+ * Add periodic discovery support to the D-Bus interface.
+ * Add initial support for device names via EIR.
+ * Add proper UTF-8 validation of device names.
+ * Add support for the J-Three keyboard.
+
+-------------------------------------------------------------------
Old:
----
bluez-utils-3.5.tar.gz
bluez-utils.diff
New:
----
bluez-utils-3.6.1-hcid.conf.diff
bluez-utils-3.6.1.tar.gz
bluez-utils-bfusb-readme.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-utils.spec ++++++
--- /var/tmp/diff_new_pack.xtTQTj/_old 2006-09-28 20:10:19.000000000 +0200
+++ /var/tmp/diff_new_pack.xtTQTj/_new 2006-09-28 20:10:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package bluez-utils (Version 3.5)
+# spec file for package bluez-utils (Version 3.6.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,8 +13,8 @@
Name: bluez-utils
BuildRequires: alsa-devel bluez-libs cups dbus-1-devel fuse-devel libusb openobex-devel pkgconfig resmgr xorg-x11-devel
URL: http://bluez.sourceforge.net
-Version: 3.5
-Release: 2
+Version: 3.6.1
+Release: 1
Summary: Bluetooth Daemons and Utilities
License: GPL
PreReq: %fillup_prereq %insserv_prereq
@@ -28,10 +28,11 @@
Source5: bluetooth.sysconfig
Source6: bluetooth.rc.suse
Source9: README.SUSE-factory
-Patch: bluez-utils.diff
Patch1: opd-v0.2-2003-03-18.dif
-Patch2: bluez-utils-3.4-bluetooth.rules.diff
-Patch3: bluez-utils-3.4-passkey-agent-warning.diff
+Patch2: bluez-utils-bfusb-readme.diff
+Patch3: bluez-utils-3.6.1-hcid.conf.diff
+Patch4: bluez-utils-3.4-bluetooth.rules.diff
+Patch5: bluez-utils-3.4-passkey-agent-warning.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: bluez-libs >= %{version} sysvinit
# obsoletes the first two together with bluez-libs, the other completely
@@ -91,9 +92,10 @@
%prep
%setup -n bluez-utils-%{version} -b 1 -b 2
-%patch -p1
%patch2 -p0
%patch3 -p0
+%patch4 -p0
+%patch5 -p0
%{?suse_update_config:%{suse_update_config -f . }}
cd ../opd
%patch1 -p1
@@ -256,6 +258,20 @@
%doc %{_defaultdocdir}/bluez-test
%changelog -n bluez-utils
+* Thu Sep 28 2006 - seife(a)suse.de
+- update to v3.6.1:
+ * Fix IO channel race conditions.
+ * Fix pairing issues on big endian systems.
+ * Fix pairing issues with page timeout errors.
+ * Fix pairing state for security mode 3 requests.
+ * Switch to user as default security manager mode.
+- v3.6:
+ * Update D-Bus based RFCOMM interface support.
+ * Use L2CAP raw sockets for HCI connection creation.
+ * Add periodic discovery support to the D-Bus interface.
+ * Add initial support for device names via EIR.
+ * Add proper UTF-8 validation of device names.
+ * Add support for the J-Three keyboard.
* Thu Sep 07 2006 - seife(a)suse.de
- remove invalid return() statement from opd/obex_handler.c
* Wed Sep 06 2006 - seife(a)suse.de
++++++ bluez-utils-3.6.1-hcid.conf.diff ++++++
--- hcid/hcid.conf
+++ hcid/hcid.conf
@@ -29,16 +29,29 @@
# Local device name
# %d - device id
# %h - host name
- name "BlueZ (%d)";
+ name "BlueZ %h (%d)";
# Local device class
+ # e.g.
+ # 0xsss100 = Computer
+ # 0xsss104 = Computer Desktop
+ # 0xsss108 = Computer Server
+ # 0xsss10c = Computer Laptop
+ # The 'sss' above defines the service-class (not quite, only the
+ # first 11 bits, the next 11 define the device-class, than 2 format bits.)
+ # See https://www.bluetooth.org/foundry/assignnumb/document/baseband
+ # for more information.
+ # 0x100bbb stands for "Object Transfer (v-Inbox, v-Folder, ...)"
+ # 0x020bbb stands for "Networking (LAN, Ad hoc, ...)"
class 0x3e0100;
# Default packet type
#pkt_type DH1,DM1,HV1;
# Inquiry and Page scan
- iscan enable; pscan enable;
+ # valid parameters: enable | disable
+ iscan enable;
+ pscan enable;
# Default link mode
# none - no specific policy
++++++ bluez-utils-3.5.tar.gz -> bluez-utils-3.6.1.tar.gz ++++++
++++ 5840 lines of diff (skipped)
++++++ bluez-utils-bfusb-readme.diff ++++++
--- Liesmich.bfusb
+++ Liesmich.bfusb
@@ -0,0 +1,60 @@
+Einige Hinweise um AVM's BLUE FRITZ! USB Bluetooth Dongel
+zum funktionieren zu bringen:
+
+Sie brauchen einen aktuellen SuSE Kernel um die BLUE FRITZ!USB als ISDN
+Karte benutzen zu können. Mit dem orginalen Kernel der 9.0 gibt es Probleme
+mit dem capidrv Module, nur direkte CAPI Anwendungen funktionieren stabil,
+I4L Anwendungen funktionieren nur eingeschrönkt oder garnicht, es können
+Systemstillstände eintreten.
+
+Installieren Sie alle bluez Pakete, verwenden Sie die aktuellsten Versionen:
+
+bluez-libs
+bluez-bluefw
+bluez-utils
+
+Entfernen Sie den BLUE FRITZ!USB Bluetooth Dongel vom USB Bus.
+
+Editieren Sie /etc/modules.conf
+Fügen Sie einen zusätzlichen Alias ein:
+
+alias bt-proto-5 cmtp
+
+Nach dem Abspeichern rufen Sie 'depmod' auf.
+
+
+Editieren Sie /etc/bluetooth/pin und geben die Pin Ihres Accesspoints
+ein, diese sieht in etwa so aus (Beispiel): aSdFgH123456qwer
+
+Testen Sie bluepincat :
+
+linux:~ # bluepincat
+PIN:aSdFgH123456qwer
+linux:~ #
+
+
+Starten Sie bluetooth neu:
+
+rcbluetooth restart
+
+Stecken Sie den BLUE FRITZ!USB Bluetooth Dongel an den USB Bus.
+
+Versuchen Sie sich mit dem den Accesspoint zu verbinden:
+
+linux:~ # ciptool scan
+Searching ...
+ Checking service for 00:04:0E:90:22:37
+ Connecting to device 00:04:0E:90:22:37
+linux:~ #
+
+Wenn das erfolgreich war, können Sie z.B. ein ISDN Netzwerkgerät aktivieren,
+bitte konfigurieren dazu eine ISDN Internetverbindung über das YaST ISDN
+Module. Setzen Sie den Startmode des SyncPPP Interfaces auf "Manuell".
+
+rcnetwork start -o type=ippp
+
+Jetzt können Sie sich z.B. mit kinternet einwaehlen.
+
+Bitte beachten Sie das die Bluetooth Treiber und Programme noch im
+Entwicklungsstadium sind.
+
--- Readme.bfusb
+++ Readme.bfusb
@@ -0,0 +1,54 @@
+Some hints to get AVM's BLUE FRITZ! USB working:
+
+You need a actual SuSE kernel to run the
+BLUE FRITZ! USB as an ISDN controller, with the original
+9.0 kernel here are problems to use the capidrv module only CAPI
+applications run, I4L applications can crash your system.
+
+install all bluez packages:
+
+bluez-libs
+bluez-pan
+bluez-bluefw
+bluez-utils
+
+Remove the BLUE FRITZ! USB from your USB bus.
+
+Edit /etc/modules.conf
+enter a additional alias:
+alias bt-proto-5 cmtp
+
+after saving run 'depmod'.
+
+
+Edit /etc/bluetooth/pin and enter the PIN of your accesspoint,
+something like aSdFgH123456qwer (example).
+
+test bluepincat :
+
+linux:~ # bluepincat
+PIN:aSdFgH123456qwer
+linux:~ #
+
+restart bluetooth:
+
+rcbluetooth restart
+
+Connect the BLUE FRITZ! USB to the USB port.
+
+try to find and connect the accesspoint:
+
+linux:~ # ciptool scan
+Searching ...
+ Checking service for 00:04:0E:90:22:37
+ Connecting to device 00:04:0E:90:22:37
+linux:~ #
+
+if this was successful you can add a ISDN network device
+(configure it with startmode "manual" in YaST2 isdn)
+
+rcnetwork start -o type=ippp
+
+
+Please note the bluetooth linux stack and drivers are still under
+development.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package bluez-libs
checked in at Thu Sep 28 20:10:13 CEST 2006.
--------
--- bluez-libs/bluez-libs.changes 2006-09-06 19:25:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/bluez-libs/bluez-libs.changes 2006-09-28 11:47:16.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 28 11:46:56 CEST 2006 - seife(a)suse.de
+
+- update to v3.6:
+ * Fix issues with the asynchronous API for SDP.
+
+-------------------------------------------------------------------
Old:
----
bluez-libs-3.5.tar.gz
New:
----
bluez-libs-3.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-libs.spec ++++++
--- /var/tmp/diff_new_pack.OjY05q/_old 2006-09-28 20:10:01.000000000 +0200
+++ /var/tmp/diff_new_pack.OjY05q/_new 2006-09-28 20:10:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package bluez-libs (Version 3.5)
+# spec file for package bluez-libs (Version 3.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: bluez-libs
URL: http://bluez.sourceforge.net
-Version: 3.5
+Version: 3.6
Release: 1
Summary: Bluetooth Libraries
License: GPL
@@ -64,6 +64,9 @@
%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
%changelog -n bluez-libs
+* Thu Sep 28 2006 - seife(a)suse.de
+- update to v3.6:
+ * Fix issues with the asynchronous API for SDP.
* Wed Sep 06 2006 - seife(a)suse.de
- update to v3.5:
* Add asynchronous API for SDP.
++++++ bluez-libs-3.5.tar.gz -> bluez-libs-3.6.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.5/ChangeLog new/bluez-libs-3.6/ChangeLog
--- old/bluez-libs-3.5/ChangeLog 2006-09-06 16:39:41.000000000 +0200
+++ new/bluez-libs-3.6/ChangeLog 2006-09-24 23:43:56.000000000 +0200
@@ -1,3 +1,6 @@
+ver 3.6:
+ Fix issues with the asynchronous API for SDP.
+
ver 3.5:
Add asynchronous API for SDP.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.5/configure new/bluez-libs-3.6/configure
--- old/bluez-libs-3.5/configure 2006-09-06 16:44:38.000000000 +0200
+++ new/bluez-libs-3.6/configure 2006-09-24 23:44:32.000000000 +0200
@@ -1775,7 +1775,7 @@
# Define the identity of the package.
PACKAGE=bluez-libs
- VERSION=3.5
+ VERSION=3.6
cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.5/configure.in new/bluez-libs-3.6/configure.in
--- old/bluez-libs-3.5/configure.in 2006-09-06 16:39:41.000000000 +0200
+++ new/bluez-libs-3.6/configure.in 2006-09-24 23:43:56.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT()
-AM_INIT_AUTOMAKE(bluez-libs, 3.5)
+AM_INIT_AUTOMAKE(bluez-libs, 3.6)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.5/include/sdp_lib.h new/bluez-libs-3.6/include/sdp_lib.h
--- old/bluez-libs-3.5/include/sdp_lib.h 2006-09-06 16:39:42.000000000 +0200
+++ new/bluez-libs-3.6/include/sdp_lib.h 2006-09-24 23:43:56.000000000 +0200
@@ -105,6 +105,15 @@
SDP_ATTR_REQ_RANGE
} sdp_attrreq_type_t;
+/*
+ * When the pdu_id(type) is a sdp error response, check the status value
+ * to figure out the error reason. For status values 0x0001-0x0006 check
+ * Bluetooth SPEC. If the status is 0xffff, call sdp_get_error function
+ * to get the real reason:
+ * - wrong transaction ID(EPROTO)
+ * - wrong PDU id or(EPROTO)
+ * - I/O error
+ */
typedef void sdp_callback_t(uint8_t type, uint16_t status, uint8_t *rsp, size_t size, void *udata);
/*
@@ -127,6 +136,7 @@
* SDP transaction: functions for asynchronous search.
*/
sdp_session_t *sdp_create(int sk, uint32_t flags);
+int sdp_get_error(sdp_session_t *session);
int sdp_process(sdp_session_t *session);
int sdp_set_notify(sdp_session_t *session, sdp_callback_t *func, void *udata);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.5/src/Makefile.am new/bluez-libs-3.6/src/Makefile.am
--- old/bluez-libs-3.5/src/Makefile.am 2006-09-06 16:39:42.000000000 +0200
+++ new/bluez-libs-3.6/src/Makefile.am 2006-09-24 23:43:56.000000000 +0200
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libbluetooth.la
libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 5:0:3
+libbluetooth_la_LDFLAGS = -version-info 6:0:4
INCLUDES = -I$(top_builddir)/include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.5/src/Makefile.in new/bluez-libs-3.6/src/Makefile.in
--- old/bluez-libs-3.5/src/Makefile.in 2006-09-06 16:44:37.000000000 +0200
+++ new/bluez-libs-3.6/src/Makefile.in 2006-09-24 23:44:32.000000000 +0200
@@ -165,7 +165,7 @@
target_alias = @target_alias@
lib_LTLIBRARIES = libbluetooth.la
libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 5:0:3
+libbluetooth_la_LDFLAGS = -version-info 6:0:4
INCLUDES = -I$(top_builddir)/include
MAINTAINERCLEANFILES = Makefile.in
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.5/src/sdp.c new/bluez-libs-3.6/src/sdp.c
--- old/bluez-libs-3.5/src/sdp.c 2006-09-06 16:39:45.000000000 +0200
+++ new/bluez-libs-3.6/src/sdp.c 2006-09-24 23:43:56.000000000 +0200
@@ -3050,6 +3050,7 @@
uint8_t *reqbuf; /* pointer to request PDU */
sdp_buf_t rsp_concat_buf;
uint32_t reqsize; /* without cstate */
+ int err; /* ZERO if success or the errno if failed */
};
/*
@@ -3154,20 +3155,24 @@
uint8_t *pdata;
int cstate_len, seqlen = 0;
- if (!session || !session->priv) {
- errno = EINVAL;
+ if (!session || !session->priv)
return -1;
- }
t = session->priv;
- t->reqbuf = malloc(SDP_REQ_BUFFER_SIZE);
+
+ /* check if the buffer is already allocated */
+ if (t->rsp_concat_buf.data)
+ free(t->rsp_concat_buf.data);
+ memset(&t->rsp_concat_buf, 0, sizeof(sdp_buf_t));
+
if (!t->reqbuf) {
- errno = ENOMEM;
- goto end;
+ t->reqbuf = malloc(SDP_REQ_BUFFER_SIZE);
+ if (!t->reqbuf) {
+ t->err = ENOMEM;
+ goto end;
+ }
}
-
memset(t->reqbuf, 0, SDP_REQ_BUFFER_SIZE);
- memset((char *)&t->rsp_concat_buf, 0, sizeof(sdp_buf_t));
reqhdr = (sdp_pdu_hdr_t *) t->reqbuf;
reqhdr->tid = htons(sdp_gen_tid(session));
@@ -3190,23 +3195,22 @@
t->reqsize += sizeof(uint16_t);
pdata += sizeof(uint16_t);
-
// set the request header's param length
cstate_len = copy_cstate(pdata, NULL);
reqhdr->plen = htons((t->reqsize + cstate_len) - sizeof(sdp_pdu_hdr_t));
if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
SDPERR("Error sendind data:%s", strerror(errno));
+ t->err = errno;
goto end;
}
return 0;
end:
- if (t) {
- if (t->reqbuf)
- free(t->reqbuf);
- free(t);
+ if (t->reqbuf) {
+ free(t->reqbuf);
+ t->reqbuf = NULL;
}
return -1;
@@ -3255,20 +3259,24 @@
uint8_t *pdata;
int cstate_len, seqlen = 0;
- if (!session || !session->priv) {
- errno = EINVAL;
+ if (!session || !session->priv)
return -1;
- }
t = session->priv;
- t->reqbuf = malloc(SDP_REQ_BUFFER_SIZE);
+
+ /* check if the buffer is already allocated */
+ if (t->rsp_concat_buf.data)
+ free(t->rsp_concat_buf.data);
+ memset(&t->rsp_concat_buf, 0, sizeof(sdp_buf_t));
+
if (!t->reqbuf) {
- errno = ENOMEM;
- goto end;
+ t->reqbuf = malloc(SDP_REQ_BUFFER_SIZE);
+ if (!t->reqbuf) {
+ t->err = ENOMEM;
+ goto end;
+ }
}
-
memset(t->reqbuf, 0, SDP_REQ_BUFFER_SIZE);
- memset((char *)&t->rsp_concat_buf, 0, sizeof(sdp_buf_t));
reqhdr = (sdp_pdu_hdr_t *) t->reqbuf;
reqhdr->tid = htons(sdp_gen_tid(session));
@@ -3292,7 +3300,7 @@
seqlen = gen_attridseq_pdu(pdata, attrid_list,
reqtype == SDP_ATTR_REQ_INDIVIDUAL? SDP_UINT16 : SDP_UINT32);
if (seqlen == -1) {
- errno = EINVAL;
+ t->err = EINVAL;
goto end;
}
@@ -3307,16 +3315,16 @@
if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
SDPERR("Error sendind data:%s", strerror(errno));
+ t->err = errno;
goto end;
}
return 0;
end:
- if (t) {
- if (t->reqbuf)
- free(t->reqbuf);
- free(t);
+ if (t->reqbuf) {
+ free(t->reqbuf);
+ t->reqbuf = NULL;
}
return -1;
@@ -3366,20 +3374,24 @@
uint8_t *pdata;
int cstate_len, seqlen = 0;
- if (!session || !session->priv) {
- errno = EINVAL;
+ if (!session || !session->priv)
return -1;
- }
t = session->priv;
- t->reqbuf = malloc(SDP_REQ_BUFFER_SIZE);
+
+ /* check if the buffer is already allocated */
+ if (t->rsp_concat_buf.data)
+ free(t->rsp_concat_buf.data);
+ memset(&t->rsp_concat_buf, 0, sizeof(sdp_buf_t));
+
if (!t->reqbuf) {
- errno = ENOMEM;
- goto end;
+ t->reqbuf = malloc(SDP_REQ_BUFFER_SIZE);
+ if (!t->reqbuf) {
+ t->err = ENOMEM;
+ goto end;
+ }
}
-
memset(t->reqbuf, 0, SDP_REQ_BUFFER_SIZE);
- memset((char *)&t->rsp_concat_buf, 0, sizeof(sdp_buf_t));
reqhdr = (sdp_pdu_hdr_t *) t->reqbuf;
reqhdr->tid = htons(sdp_gen_tid(session));
@@ -3408,7 +3420,7 @@
seqlen = gen_attridseq_pdu(pdata, attrid_list,
reqtype == SDP_ATTR_REQ_INDIVIDUAL ? SDP_UINT16 : SDP_UINT32);
if (seqlen == -1) {
- errno = EINVAL;
+ t->err = EINVAL;
goto end;
}
@@ -3422,22 +3434,52 @@
if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
SDPERR("Error sendind data:%s", strerror(errno));
+ t->err = errno;
goto end;
}
return 0;
end:
- if (t) {
- if (t->reqbuf)
- free(t->reqbuf);
- free(t);
+ if (t->reqbuf) {
+ free(t->reqbuf);
+ t->reqbuf = NULL;
}
return -1;
}
/*
+ * Function used to get the error reason after sdp_callback_t function has been called
+ * and the status is 0xffff or if sdp_service_{search, attr, search_attr}_async returns -1.
+ * It indicates that an error NOT related to SDP_ErrorResponse happened. Get errno directly
+ * is not safe because multiple transactions can be triggered.
+ * This function must be used with asynchronous sdp functions only.
+ *
+ * INPUT:
+ * sdp_session_t *session
+ * Current sdp session to be handled
+ * RETURN:
+ * 0 = No error in the current transaction
+ * -1 - if the session is invalid
+ * positive value - the errno value
+ *
+ */
+int sdp_get_error(sdp_session_t *session)
+{
+ struct sdp_transaction *t;
+
+ if (!session || !session->priv) {
+ SDPERR("Invalid session");
+ return -1;
+ }
+
+ t = session->priv;
+
+ return t->err;
+}
+
+/*
* Receive the incomming SDP PDU. This function must be called when there is data
* available to be read. On continuation state, the original request (with a new
* transaction ID) and the continuation state data will be appended in the initial PDU.
@@ -3452,14 +3494,14 @@
*/
int sdp_process(sdp_session_t *session)
{
- struct sdp_transaction *t = NULL;
- sdp_pdu_hdr_t *reqhdr = NULL;
- sdp_pdu_hdr_t *rsphdr = NULL;
- sdp_cstate_t *pcstate = NULL;
- uint8_t *pdata = NULL, *rspbuf = NULL, *targetPtr = NULL;
- int rsp_count = 0, err = -1;
+ struct sdp_transaction *t;
+ sdp_pdu_hdr_t *reqhdr, *rsphdr;
+ sdp_cstate_t *pcstate;
+ uint8_t *pdata, *rspbuf, *targetPtr;
+ int rsp_count, err = -1;
size_t size = 0;
- uint16_t status = 0;
+ uint16_t status = 0xffff;
+ uint8_t pdu_id = 0x00;
if (!session || !session->priv) {
SDPERR("Invalid session");
@@ -3467,8 +3509,11 @@
}
rspbuf = malloc(SDP_RSP_BUFFER_SIZE);
- if (!rspbuf)
+ if (!rspbuf) {
+ SDPERR("Response buffer alloc failure:%s (%d)",
+ strerror(errno), errno);
return -1;
+ }
memset(rspbuf, 0, SDP_RSP_BUFFER_SIZE);
@@ -3476,20 +3521,21 @@
reqhdr = (sdp_pdu_hdr_t *)t->reqbuf;
rsphdr = (sdp_pdu_hdr_t *)rspbuf;
- if (sdp_read_rsp(session, rspbuf, SDP_RSP_BUFFER_SIZE) <= 0)
- goto end;
+ pdata = rspbuf + sizeof(sdp_pdu_hdr_t);
- if (reqhdr->tid != rsphdr->tid)
+ if (sdp_read_rsp(session, rspbuf, SDP_RSP_BUFFER_SIZE) <= 0) {
+ SDPERR("Read response:%s (%d)", strerror(errno), errno);
+ t->err = errno;
goto end;
+ }
- pdata = rspbuf + sizeof(sdp_pdu_hdr_t);
-
- if (rsphdr->pdu_id == SDP_ERROR_RSP) {
- status = ntohs(bt_get_unaligned((uint16_t *) pdata));
- size = rsphdr->plen;
+ if (reqhdr->tid != rsphdr->tid) {
+ t->err = EPROTO;
+ SDPERR("Wrong transaction ID.");
goto end;
}
+ pdu_id = rsphdr->pdu_id;
switch (rsphdr->pdu_id) {
uint8_t *ssr_pdata;
uint16_t tsrc, csrc;
@@ -3512,6 +3558,7 @@
pdata += 2 * sizeof(uint16_t); /* Ignore TSRC and CSRC */
rsp_count = csrc * 4;
}
+ status = 0x0000;
break;
case SDP_SVC_ATTR_RSP:
case SDP_SVC_SEARCH_ATTR_RSP:
@@ -3519,10 +3566,15 @@
SDPDBG("Attrlist byte count : %d\n", rsp_count);
pdata += sizeof(uint16_t); // points to attribute list
+ status = 0x0000;
break;
+ case SDP_ERROR_RSP:
+ status = ntohs(bt_get_unaligned((uint16_t *) pdata));
+ size = rsphdr->plen;
+ goto end;
default:
- /* FIXME: how handle this situation? */
- SDPDBG("Illegal PDU ID!");
+ t->err = EPROTO;
+ SDPERR("Illegal PDU ID: 0x%x", rsphdr->pdu_id);
goto end;
}
@@ -3531,7 +3583,7 @@
SDPDBG("Cstate length : %d\n", pcstate->length);
/*
* This is a split response, need to concatenate intermediate
- * responses and the last one which will have cstate_len == 0
+ * responses and the last one which will have cstate length == 0
*/
// build concatenated response buffer
@@ -3546,7 +3598,7 @@
reqhdr->tid = htons(sdp_gen_tid(session));
- // add continuation state (can be null)
+ // add continuation state
cstate_len = copy_cstate(t->reqbuf + t->reqsize, pcstate);
reqsize = t->reqsize + cstate_len;
@@ -3555,8 +3607,9 @@
reqhdr->plen = htons(reqsize - sizeof(sdp_pdu_hdr_t));
if (sdp_send_req(session, t->reqbuf, reqsize) < 0) {
- SDPERR("Error sendind data:%s", strerror(errno));
- /* FIXME: how handle this error ? */
+ SDPERR("Error sendind data:%s(%d)", strerror(errno), errno);
+ status = 0xffff;
+ t->err = errno;
goto end;
}
err = 0;
@@ -3568,10 +3621,8 @@
pdata = t->rsp_concat_buf.data;
size = t->rsp_concat_buf.data_size;
}
-
if (t->cb)
- t->cb(rsphdr->pdu_id, status, pdata,
- size, t->udata);
+ t->cb(pdu_id, status, pdata, size, t->udata);
}
if (rspbuf)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package limal-devtools
checked in at Thu Sep 28 20:09:09 CEST 2006.
--------
--- limal-devtools/limal-devtools.changes 2006-08-08 15:05:30.000000000 +0200
+++ /mounts/work_src_done/NOARCH/limal-devtools/limal-devtools.changes 2006-09-28 15:52:41.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Sep 28 14:04:29 CEST 2006 - mt(a)suse.de
+
+- version 1.2.3
+- Fixed to use limal::Logger in limal-XXxx skeleton testcases
+
+-------------------------------------------------------------------
+Thu Aug 17 14:28:49 CEST 2006 - mc(a)suse.de
+
+- some changes for the opensuse buildservice
+- add @POST@ and @POSTUN@ macros to create-spec
+
+-------------------------------------------------------------------
Old:
----
limal-devtools-1.2.2.tar.bz2
New:
----
limal-devtools-1.2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ limal-devtools.spec ++++++
--- /var/tmp/diff_new_pack.p31FfX/_old 2006-09-28 20:08:41.000000000 +0200
+++ /var/tmp/diff_new_pack.p31FfX/_new 2006-09-28 20:08:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package limal-devtools (Version 1.2.2)
+# spec file for package limal-devtools (Version 1.2.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,25 +12,32 @@
Name: limal-devtools
URL: http://forge.novell.com/modules/xfmod/project/?limal
-Version: 1.2.2
+Version: 1.2.3
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArchitectures: noarch
-Source0: limal-devtools-1.2.2.tar.bz2
+Source0: limal-devtools-1.2.3.tar.bz2
prefix: /usr
%define swiglibdir %(swig -swiglib)
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel swig
Requires: perl-XML-Writer perl-Config-IniFiles
-Requires: libxslt docbook-xsl-stylesheets
-Requires: docbook_4 fop doxygen dejagnu
+Requires: libxslt
+Requires: doxygen dejagnu
Requires: gettext gettext-devel recode
Requires: autoconf automake libtool
Requires: pkgconfig swig
-Recommends: subversion
# cvs required by autopoint
-Recommends: cvs
+Requires: cvs
+%if 0%{?suse_version}
+Recommends: subversion
+Requires: docbook-xsl-stylesheets fop
+%endif
+%if 0%{?fedora_version}
+Requires: docbook-style-xsl
+AutoreqProv: off
+%endif
Summary: LiMaL--Development Tools
%description
@@ -50,7 +57,7 @@
Stefan Schubert <schubi(a)suse.de>
%prep
-%setup -n limal-devtools-1.2.2
+%setup -n limal-devtools-1.2.3
%build
autoreconf --force --install --verbose
@@ -79,6 +86,12 @@
%doc %{_prefix}/share/doc/packages/limal-devtools
%changelog -n limal-devtools
+* Thu Sep 28 2006 - mt(a)suse.de
+- version 1.2.3
+- Fixed to use limal::Logger in limal-XXxx skeleton testcases
+* Thu Aug 17 2006 - mc(a)suse.de
+- some changes for the opensuse buildservice
+- add @POST@ and @POSTUN@ macros to create-spec
* Tue Aug 08 2006 - mc(a)suse.de
- version 1.2.2
- use fix gettext template version 0.14.3
++++++ limal-devtools-1.2.2.tar.bz2 -> limal-devtools-1.2.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/Makefile.am new/limal-devtools-1.2.3/Makefile.am
--- old/limal-devtools-1.2.2/Makefile.am 2006-08-08 15:03:18.000000000 +0200
+++ new/limal-devtools-1.2.3/Makefile.am 2006-09-28 15:49:51.000000000 +0200
@@ -36,8 +36,11 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = configure configure.in $(RPMNAME).pc Makefile Makefile.in Makefile.am \
package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec \
- ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing
+ ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing \
+ config.rpath config.h.in ABOUT-NLS mkinstalldirs
+maintainer-clean-local:
+ -rm -rf m4
configure.in: configure.in.in $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/Makefile.in new/limal-devtools-1.2.3/Makefile.in
--- old/limal-devtools-1.2.2/Makefile.in 2006-08-08 15:03:37.000000000 +0200
+++ new/limal-devtools-1.2.3/Makefile.in 2006-09-28 15:50:08.000000000 +0200
@@ -239,7 +239,8 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = configure configure.in $(RPMNAME).pc Makefile Makefile.in Makefile.am \
package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec \
- ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing
+ ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing \
+ config.rpath config.h.in ABOUT-NLS mkinstalldirs
EXTRA_DIST = VERSION RPMNAME MAINTAINER configure.in.in \
$(SUBDIRS_FILE) $(ACINCLUDE_FILE) limal*.spec.in \
@@ -658,7 +659,8 @@
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+ maintainer-clean-local
mostlyclean: mostlyclean-recursive
@@ -687,10 +689,10 @@
install-exec-am install-info install-info-am install-man \
install-pkgconfigDATA install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
+ maintainer-clean-generic maintainer-clean-local \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
uninstall-pkgconfigDATA
@@ -701,6 +703,9 @@
exit 1 ; \
fi
+maintainer-clean-local:
+ -rm -rf m4
+
configure.in: configure.in.in $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/VERSION new/limal-devtools-1.2.3/VERSION
--- old/limal-devtools-1.2.2/VERSION 2006-08-08 14:45:26.000000000 +0200
+++ new/limal-devtools-1.2.3/VERSION 2006-09-28 15:49:08.000000000 +0200
@@ -1 +1 @@
-1.2.2
+1.2.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/configure new/limal-devtools-1.2.3/configure
--- old/limal-devtools-1.2.2/configure 2006-08-08 15:03:30.000000000 +0200
+++ new/limal-devtools-1.2.3/configure 2006-09-28 15:50:04.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for limal-devtools 1.2.2.
+# Generated by GNU Autoconf 2.59 for limal-devtools 1.2.3.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='limal-devtools'
PACKAGE_TARNAME='limal-devtools'
-PACKAGE_VERSION='1.2.2'
-PACKAGE_STRING='limal-devtools 1.2.2'
+PACKAGE_VERSION='1.2.3'
+PACKAGE_STRING='limal-devtools 1.2.3'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -959,7 +959,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 limal-devtools 1.2.2 to adapt to many kinds of systems.
+\`configure' configures limal-devtools 1.2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1026,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of limal-devtools 1.2.2:";;
+ short | recursive ) echo "Configuration of limal-devtools 1.2.3:";;
esac
cat <<\_ACEOF
@@ -1167,7 +1167,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-limal-devtools configure 1.2.2
+limal-devtools configure 1.2.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by limal-devtools $as_me 1.2.2, which was
+It was created by limal-devtools $as_me 1.2.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1911,7 +1911,7 @@
# Define the identity of the package.
PACKAGE='limal-devtools'
- VERSION='1.2.2'
+ VERSION='1.2.3'
cat >>confdefs.h <<_ACEOF
@@ -2122,7 +2122,7 @@
-VERSION="1.2.2"
+VERSION="1.2.3"
RPMNAME="limal-devtools"
RPMARCH="noarch"
RPMLIB="devtools"
@@ -20026,7 +20026,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by limal-devtools $as_me 1.2.2, which was
+This file was extended by limal-devtools $as_me 1.2.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20084,7 +20084,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-limal-devtools config.status 1.2.2
+limal-devtools config.status 1.2.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/configure.in new/limal-devtools-1.2.3/configure.in
--- old/limal-devtools-1.2.2/configure.in 2006-08-08 15:03:18.000000000 +0200
+++ new/limal-devtools-1.2.3/configure.in 2006-09-28 15:49:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by limalautoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(limal-devtools, 1.2.2, http://www.suse.de/feedback, limal-devtools)
+AC_INIT(limal-devtools, 1.2.3, http://www.suse.de/feedback, limal-devtools)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important LiMaL variables
-VERSION="1.2.2"
+VERSION="1.2.3"
RPMNAME="limal-devtools"
RPMARCH="noarch"
RPMLIB="devtools"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/admin/Makefile.am.toplevel new/limal-devtools-1.2.3/devtools/admin/Makefile.am.toplevel
--- old/limal-devtools-1.2.2/devtools/admin/Makefile.am.toplevel 2006-08-08 14:58:16.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/admin/Makefile.am.toplevel 2006-09-11 13:31:26.000000000 +0200
@@ -36,8 +36,11 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = configure configure.in $(RPMNAME).pc Makefile Makefile.in Makefile.am \
package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec \
- ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing
+ ltmain.sh depcomp config.sub config.guess aclocal.m4 install-sh missing \
+ config.rpath config.h.in ABOUT-NLS mkinstalldirs
+maintainer-clean-local:
+ -rm -rf m4
configure.in: configure.in.in $(srcdir)/VERSION
$(MAKE) -f Makefile.cvs all
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/bin/create-spec new/limal-devtools-1.2.3/devtools/bin/create-spec
--- old/limal-devtools-1.2.2/devtools/bin/create-spec 2006-08-08 11:35:46.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/bin/create-spec 2006-08-16 18:32:24.000000000 +0200
@@ -22,6 +22,8 @@
# @BUILD-PO@ - writes %build with special make for translations
# @INSTALL@ - writes %install with usual make install and make check
# @INSTALL-PO@ - writes %install with special make install for translations
+# @POST@ - writes %post with call to ldconfig
+# @POSTUN@ - writes %postun with call to ldconfig
# @CLEAN@ - writes %clean with removing RPM_BUILD_ROOT
#####
# Authors: Jan Holesovsky <kendy(a)suse.cz>, 2001
@@ -199,6 +201,20 @@
"\%install
make install DESTDIR=\"\$RPM_BUILD_ROOT\"",
+##### POST #####
+
+ "\@POST\@" =>
+ "\%post
+/sbin/ldconfig
+",
+
+##### POSTUN #####
+
+ "\@POSTUN\@" =>
+ "\%postun
+/sbin/ldconfig
+",
+
##### CLEAN #####
"\@CLEAN\@" =>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/bin/version new/limal-devtools-1.2.3/devtools/bin/version
--- old/limal-devtools-1.2.2/devtools/bin/version 2006-08-08 15:03:46.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/bin/version 2006-09-28 15:50:17.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 1.2.2
+echo 1.2.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/.cvsignore.skeleton new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/.cvsignore.skeleton
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/.cvsignore.skeleton 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/.cvsignore.skeleton 2006-09-28 15:51:33.000000000 +0200
@@ -17,6 +17,9 @@
config.sub
config.guess
limal-XXpkgXX.pc
-limal-XXpkgXX.pc.in
stamp-h1
XXpkgXX.pot
+m4
+config.rpath
+ABOUT-NLS
+mkinstalldirs
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/doc/autodocs/.cvsignore.skeleton new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/doc/autodocs/.cvsignore.skeleton
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/doc/autodocs/.cvsignore.skeleton 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/doc/autodocs/.cvsignore.skeleton 2006-09-28 15:51:33.000000000 +0200
@@ -1,7 +1,9 @@
Makefile
Makefile.in
-doxygen.css
doxygen.log
+installdox
+*.css
*.html
*.png
*.tag
+*.gif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/limal-XXpkgXX.spec.in new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/limal-XXpkgXX.spec.in
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/limal-XXpkgXX.spec.in 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/limal-XXpkgXX.spec.in 2006-09-28 15:51:33.000000000 +0200
@@ -27,6 +27,10 @@
@INSTALL@
+@POST@
+
+@POSTUN@
+
@CLEAN@
%files
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/po/.cvsignore.skeleton new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/po/.cvsignore.skeleton
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/po/.cvsignore.skeleton 1970-01-01 01:00:00.000000000 +0100
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/po/.cvsignore.skeleton 2006-09-28 15:51:33.000000000 +0200
@@ -0,0 +1,15 @@
+Makefile
+Makefile.in
+Makefile.in.in
+Makevars.template
+insert-header.sin
+remove-potcdate.sin
+remove-potcdate.sed
+Rules-quot
+stamp-po
+POTFILES
+*(a)quot.header
+*(a)boldquot.header
+*.gmo
+*.po~
+XXpkgXX.pot
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/.cvsignore.skeleton new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/.cvsignore.skeleton
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/.cvsignore.skeleton 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/.cvsignore.skeleton 2006-09-28 15:51:33.000000000 +0200
@@ -4,6 +4,7 @@
.deps
*.o
site.exp
+site.bak
limal.sum
limal.log
*.single
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/single.out/test_single.err new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/single.out/test_single.err
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/single.out/test_single.err 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/single.out/test_single.err 2006-09-28 15:51:33.000000000 +0200
@@ -1,5 +1,5 @@
-constructed XXPkgXX
-setting buffer to aBcDeF
-returning buffer 'aBcDeF'
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to aBcDeF
+DEBUG XXpkgXX - returning buffer 'aBcDeF'
This is an error output
-destroying XXPkgXX
+DEBUG XXpkgXX - destroying XXPkgXX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase1.err new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase1.err
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase1.err 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase1.err 2006-09-28 15:51:33.000000000 +0200
@@ -1,16 +1,16 @@
-constructed XXPkgXX
-setting buffer to line1 testcase1
-returning buffer 'line1 testcase1'
-destroying XXPkgXX
-constructed XXPkgXX
-setting buffer to line2 testcase1
-returning buffer 'line2 testcase1'
-destroying XXPkgXX
-constructed XXPkgXX
-setting buffer to line3 testcase1
-returning buffer 'line3 testcase1'
-destroying XXPkgXX
-constructed XXPkgXX
-setting buffer to
-returning buffer ''
-destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to line1 testcase1
+DEBUG XXpkgXX - returning buffer 'line1 testcase1'
+DEBUG XXpkgXX - destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to line2 testcase1
+DEBUG XXpkgXX - returning buffer 'line2 testcase1'
+DEBUG XXpkgXX - destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to line3 testcase1
+DEBUG XXpkgXX - returning buffer 'line3 testcase1'
+DEBUG XXpkgXX - destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to
+DEBUG XXpkgXX - returning buffer ''
+DEBUG XXpkgXX - destroying XXPkgXX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase2.err new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase2.err
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase2.err 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_multi/testcase2.err 2006-09-28 15:51:33.000000000 +0200
@@ -1,16 +1,16 @@
-constructed XXPkgXX
-setting buffer to line1 testcase2
-returning buffer 'line1 testcase2'
-destroying XXPkgXX
-constructed XXPkgXX
-setting buffer to line2 testcase2
-returning buffer 'line2 testcase2'
-destroying XXPkgXX
-constructed XXPkgXX
-setting buffer to line3 testcase2
-returning buffer 'line3 testcase2'
-destroying XXPkgXX
-constructed XXPkgXX
-setting buffer to
-returning buffer ''
-destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to line1 testcase2
+DEBUG XXpkgXX - returning buffer 'line1 testcase2'
+DEBUG XXpkgXX - destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to line2 testcase2
+DEBUG XXpkgXX - returning buffer 'line2 testcase2'
+DEBUG XXpkgXX - destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to line3 testcase2
+DEBUG XXpkgXX - returning buffer 'line3 testcase2'
+DEBUG XXpkgXX - destroying XXPkgXX
+DEBUG XXpkgXX - constructed XXPkgXX
+DEBUG XXpkgXX - setting buffer to
+DEBUG XXpkgXX - returning buffer ''
+DEBUG XXpkgXX - destroying XXPkgXX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_multi.cc new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_multi.cc
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_multi.cc 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_multi.cc 2006-09-28 15:51:33.000000000 +0200
@@ -3,8 +3,7 @@
#include <limal/XXpkgXX/XXPkgXX.hpp>
#include <blocxx/String.hpp>
-#include <blocxx/Logger.hpp>
-#include <blocxx/CerrLogger.hpp>
+#include <limal/Logger.hpp>
using namespace blocxx;
using namespace limal;
@@ -19,7 +18,14 @@
}
// let's allow the lib to log on stderr:
- blocxx::Logger::setDefaultLogger(new blocxx::CerrLogger());
+ limal::Logger::setDefaultLogger(
+ limal::Logger::createCerrLogger(
+ "test_multi",
+ blocxx::StringArray(1, "*"),
+ blocxx::StringArray(1, "*"),
+ "%-5p %c - %m"
+ )
+ );
String file = argv[ 1 ];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_single.cc new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_single.cc
--- old/limal-devtools-1.2.2/devtools/skeletons/limal-XXxx/testsuite/test_single.cc 2006-08-08 15:04:23.000000000 +0200
+++ new/limal-devtools-1.2.3/devtools/skeletons/limal-XXxx/testsuite/test_single.cc 2006-09-28 15:51:33.000000000 +0200
@@ -1,8 +1,7 @@
#include <iostream>
#include <limal/XXpkgXX/XXPkgXX.hpp>
-#include <blocxx/Logger.hpp>
-#include <blocxx/CerrLogger.hpp>
+#include <limal/Logger.hpp>
using namespace blocxx;
using namespace limal;
@@ -13,7 +12,14 @@
cout << "START" << endl;
// let's allow the lib to log on stderr:
- blocxx::Logger::setDefaultLogger(new blocxx::CerrLogger());
+ limal::Logger::setDefaultLogger(
+ limal::Logger::createCerrLogger(
+ "test_single",
+ blocxx::StringArray(1, "*"),
+ blocxx::StringArray(1, "*"),
+ "%-5p %c - %m"
+ )
+ );
XXpKgXX::XXPkgXX xx;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-devtools-1.2.2/limal-devtools.spec.in new/limal-devtools-1.2.3/limal-devtools.spec.in
--- old/limal-devtools-1.2.2/limal-devtools.spec.in 2006-08-08 14:45:18.000000000 +0200
+++ new/limal-devtools-1.2.3/limal-devtools.spec.in 2006-08-17 14:27:08.000000000 +0200
@@ -3,14 +3,23 @@
@HEADER@
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel swig
Requires: perl-XML-Writer perl-Config-IniFiles
-Requires: libxslt docbook-xsl-stylesheets
-Requires: docbook_4 fop doxygen dejagnu
+Requires: libxslt
+Requires: doxygen dejagnu
Requires: gettext gettext-devel recode
Requires: autoconf automake libtool
Requires: pkgconfig swig
-Recommends: subversion
# cvs required by autopoint
-Recommends: cvs
+Requires: cvs
+
+%if 0%{?suse_version}
+Recommends: subversion
+Requires: docbook-xsl-stylesheets fop
+%endif
+
+%if 0%{?fedora_version}
+Requires: docbook-style-xsl
+AutoreqProv: off
+%endif
Summary: LiMaL development tools
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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