Hello community,
here is the log from the commit of package sblim-sfcb
checked in at Tue Oct 14 19:18:36 CEST 2008.
--------
--- sblim-sfcb/sblim-sfcb.changes 2008-10-07 10:51:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/sblim-sfcb/sblim-sfcb.changes 2008-10-14 15:50:24.828294000 +0200
@@ -1,0 +2,7 @@
+Tue Oct 14 15:35:31 CEST 2008 - kkaempf@suse.de
+
+- Fix compiler warnings (on 64bit systems) (bnc#435043)
+- Adapt for latest autotools
+- Fix rpmlint warnings in .spec (%preun/%postun)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
autoconfiscate.sh
autoconfiscate.sh-mofc
sblim-sfcb-1.3.2-automake.patch
sblim-sfcb-1.3.2-Werror.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-sfcb.spec ++++++
--- /var/tmp/diff_new_pack.aW1307/_old 2008-10-14 19:16:21.000000000 +0200
+++ /var/tmp/diff_new_pack.aW1307/_new 2008-10-14 19:16:21.000000000 +0200
@@ -21,17 +21,21 @@
Name: sblim-sfcb
Version: 1.3.2
-Release: 5
+Release: 6
Group: System/Management
License: Other uncritical OpenSource License; CPL 1.0
Url: http://sblim.sf.net/
Source0: %{name}-%{version}.tar.bz2
+Source1: autoconfiscate.sh
%if 0%{?suse_version}
Source2: sblim-sfcb.init
%endif
+Source3: autoconfiscate.sh-mofc
Patch1: sblim-sfcb-1.3.0-uds_auth.patch
Patch2: sblim-sfcb-1.3.0-root_only_auth.patch
Patch3: sblim-sfcb-align.patch
+Patch4: sblim-sfcb-1.3.2-Werror.patch
+Patch5: sblim-sfcb-1.3.2-automake.patch
Provides: cimserver
Provides: cim-server
%if 0%{?suse_version} >= 1030
@@ -43,6 +47,7 @@
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: cim-schema
+BuildRequires: bison flex
Requires: curl
Requires: zlib
Requires: openssl
@@ -64,10 +69,16 @@
%patch1 -b .uds_auth.patch
%patch2 -b .root_only_auth.patch
%patch3
+%patch4
+%patch5
export PATCH_GET=0
%build
-autoconf
+#autoreconf -f -i
+cp %SOURCE1 .
+cp %SOURCE3 mofc/autoconfiscate.sh
+./autoconfiscate.sh
+#if test -d mofc; then cd mofc && autoreconf -f -i; fi
#%%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CIMSCHEMA_SOURCE=%{SOURCE1} CIMSCHEMA_MOF=cimv216.mof CIMSCHEMA_SUBDIRS=y
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6
make
@@ -126,8 +137,12 @@
/sbin/ldconfig
exit 0
+%preun
+%stop_on_removal
+
%postun
/sbin/ldconfig
+%insserv_cleanup
# comment out - NWP - removing schema pkg
#%post schema
#sfcbrepos -f 2> /dev/null
@@ -140,6 +155,10 @@
%files -f _pkg_list
%changelog
+* Tue Oct 14 2008 kkaempf@suse.de
+- Fix compiler warnings (on 64bit systems) (bnc#435043)
+- Adapt for latest autotools
+- Fix rpmlint warnings in .spec (%%preun/%%postun)
* Tue Oct 07 2008 schwab@suse.de
- Fix alignment.
- Rebuild configure to get fixed AC_FUNC_MKTIME.
++++++ sblim-sfcb-1.3.2-automake.patch ++++++
diff -wruN ../orig-sblim-sfcb-1.3.2/configure.ac ./configure.ac
--- ../orig-sblim-sfcb-1.3.2/configure.ac 2008-10-06 19:45:25.000000000 +0200
+++ ./configure.ac 2008-10-14 11:02:05.000000000 +0200
@@ -24,6 +24,7 @@
AC_INIT(Small Footprint CIM Broker, 1.3.2, sblim-devel@lists.sourceforge.net, sblim-sfcb)
AC_CONFIG_SRCDIR([providerDrv.c])
+AC_CONFIG_MACRO_DIR([m4])
#disable "seems to ignore the --datarootdir setting" warnings
#AC_DEFUN([AC_DATAROOTDIR_CHECKED])
diff -wruN ../orig-sblim-sfcb-1.3.2/Makefile.am ./Makefile.am
--- ../orig-sblim-sfcb-1.3.2/Makefile.am 2008-09-05 22:01:56.000000000 +0200
+++ ./Makefile.am 2008-10-14 11:01:31.000000000 +0200
@@ -35,7 +35,7 @@
BUILT_SOURCES=queryParser.c queryLexer.c sqlParser.c sqlLexer.c cimXmlOps.c cimXmlParserProcessed.c $(MANFILES)
AM_YFLAGS=-d
-
+ACLOCAL_AMFLAGS=-I m4
AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
-DSFCB_STATEDIR=\"$(sfcbstatedir)\" \
-DSFCB_LIBDIR=\"$(libdir)\" \
diff -wruN ../orig-sblim-sfcb-1.3.2/mofc/configure.ac ./mofc/configure.ac
--- ../orig-sblim-sfcb-1.3.2/mofc/configure.ac 2008-04-16 20:43:05.000000000 +0200
+++ ./mofc/configure.ac 2008-10-14 11:03:10.000000000 +0200
@@ -73,6 +73,7 @@
# Checks for programs.
AC_PROG_CC
+AM_PROG_CC_C_O
AC_PROG_YACC
AC_PROG_LEX
++++++ sblim-sfcb-1.3.2-Werror.patch ++++++
diff -wruN ../orig-sblim-sfcb-1.3.2/cimcClientSfcbLocal.c ./cimcClientSfcbLocal.c
--- ../orig-sblim-sfcb-1.3.2/cimcClientSfcbLocal.c 2008-10-03 02:24:47.000000000 +0200
+++ ./cimcClientSfcbLocal.c 2008-10-14 11:45:47.000000000 +0200
@@ -29,7 +29,7 @@
#define CIMCSetStatusWithChars(st,rcp,chars) \
- { if (st) { (st)->rc=(rcp); \
+ { if (st != NULL) { (st)->rc=(rcp); \
(st)->msg=NewCMPIString((chars),NULL); }}
#define NewCMPIString sfcb_native_new_CMPIString
diff -wruN ../orig-sblim-sfcb-1.3.2/httpAdapter.c ./httpAdapter.c
--- ../orig-sblim-sfcb-1.3.2/httpAdapter.c 2008-08-09 04:15:51.000000000 +0200
+++ ./httpAdapter.c 2008-10-14 11:46:36.000000000 +0200
@@ -814,7 +814,7 @@
int authorized = 0;
if (!discardInput && doUdsAuth) {
struct ucred cr;
- int cl = sizeof(cr);
+ socklen_t cl = sizeof(cr);
if (getsockopt(conn_fd.socket, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) {
if (cr.uid == 0) {
authorized = 1;
diff -wruN ../orig-sblim-sfcb-1.3.2/httpComm.c ./httpComm.c
--- ../orig-sblim-sfcb-1.3.2/httpComm.c 2006-03-06 05:11:08.000000000 +0100
+++ ./httpComm.c 2008-10-14 11:47:10.000000000 +0200
@@ -122,7 +122,7 @@
#if defined USE_SSL
if (hndl.bio) {
- BIO_flush(hndl.bio);
+ (void)BIO_flush(hndl.bio);
} else
#endif
if (hndl.file) {
diff -wruN ../orig-sblim-sfcb-1.3.2/mofc/mofparse.c ./mofc/mofparse.c
--- ../orig-sblim-sfcb-1.3.2/mofc/mofparse.c 2006-10-27 15:14:21.000000000 +0200
+++ ./mofc/mofparse.c 2008-10-14 11:51:40.000000000 +0200
@@ -112,7 +112,7 @@
static void help(const char * name)
{
usage(name);
- version(name);
+ version();
printf(" Allowed options are\n");
printf(" -h display this message\n");
printf(" -v print some extra information\n");
diff -wruN ../orig-sblim-sfcb-1.3.2/mofc/mofs.l ./mofc/mofs.l
--- ../orig-sblim-sfcb-1.3.2/mofc/mofs.l 2007-06-22 12:34:44.000000000 +0200
+++ ./mofc/mofs.l 2008-10-14 11:52:07.000000000 +0200
@@ -24,7 +24,7 @@
# include