SHA256
8
0
forked from pool/xmlrpc-c
Pascal Bleser
2010-10-30 18:14:12 +00:00
committed by Git OBS Bridge
parent 0a3c43bfba
commit 718b35254a
9 changed files with 247 additions and 106 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ad35c85db6521755bd3c03e187b60700ee500aacb48bb8905539608bc10eb83
size 567626

3
xmlrpc-c-1.06.41.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24cde10cf121264db75e45c22ac87b7ff4bef05ab546f3f31aeee6b293f60db0
size 570847

View File

@@ -0,0 +1,45 @@
--- xmlrpc-c-config.in.orig 2010-10-30 19:57:49.000000000 +0200
+++ xmlrpc-c-config.in 2010-10-30 19:58:30.000000000 +0200
@@ -59,8 +59,6 @@
the_libdirs="-L$libdir $the_libdirs"
the_libs="-lxmlrpc -lxmlrpc_util ${LIBXML}"
-the_rpath=
-the_wl_rpath=
cpp_libs=
cflags=
@@ -112,18 +110,12 @@
if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then
the_libs="$the_libs @WININET_LDADD@"
- the_rpath="@WININET_RPATH@ $the_rpath"
- the_wl_rpath="@WININET_WL_RPATH@ $the_wl_rpath"
fi
if test "${MUST_BUILD_CURL_CLIENT}" = "yes"; then
the_libs="$the_libs @CURL_LDADD@"
- the_rpath="@CURL_RPATH@ $the_rpath"
- the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath"
fi
if test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then
the_libs="$the_libs @LIBWWW_LDADD@"
- the_rpath="@LIBWWW_RPATH@ $the_rpath"
- the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath"
fi
if test "${needCpp}" = "yes"; then
the_libs="-lxmlrpc_client++ $the_libs"
@@ -142,13 +134,12 @@
echo "$cflags"
;;
--libs)
- echo "$the_libdirs $the_libs $the_wl_rpath"
+ echo "$the_libdirs $the_libs"
;;
--ldadd)
echo "$the_libdirs $the_libs"
;;
--ldflags)
- echo "$the_rpath"
;;
--prefix)
echo "@prefix@"

View File

@@ -0,0 +1,62 @@
--- src/xmlrpc_parse.c.orig 2010-10-30 20:02:08.000000000 +0200
+++ src/xmlrpc_parse.c 2010-10-30 20:04:08.000000000 +0200
@@ -122,7 +122,7 @@
/* Look for out-of-range errors which didn't produce ERANGE. */
if (i < min || i > max)
XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR,
- "\"%s\" must be in range %ld to %ld", str, min, max);
+ "\"%s\" must be in range %zd to %zd", str, min, max);
/* Check for unused characters. */
if (end != str + strlen)
--- lib/abyss/src/response.c.orig 2010-10-30 20:00:10.000000000 +0200
+++ lib/abyss/src/response.c 2010-10-30 20:00:26.000000000 +0200
@@ -225,7 +225,7 @@
uint64_t const len) {
char contentLengthValue[32];
- sprintf(contentLengthValue, "%llu", len);
+ sprintf(contentLengthValue, "%zu", len);
return ResponseAddField(sessionP, "Content-length", contentLengthValue);
}
--- lib/abyss/src/socket_unix.c.orig 2010-10-30 20:01:22.000000000 +0200
+++ lib/abyss/src/socket_unix.c 2010-10-30 20:01:33.000000000 +0200
@@ -200,7 +200,7 @@
fprintf(stderr, "Abyss socket: send() failed. "
"Socket closed.\n");
else
- fprintf(stderr, "Abyss socket: sent %u bytes: '%.*s'\n",
+ fprintf(stderr, "Abyss socket: sent %zu bytes: '%.*s'\n",
rc, rc, &buffer[len-bytesLeft]);
}
if (rc <= 0)
--- lib/abyss/src/server.c.orig 2010-10-30 20:00:32.000000000 +0200
+++ lib/abyss/src/server.c 2010-10-30 20:01:16.000000000 +0200
@@ -277,7 +277,7 @@
}
}
- sprintf(z3, "%5llu %c", fi->size, u);
+ sprintf(z3, "%5zu %c", fi->size, u);
if (xmlrpc_streq(fi->name, ".."))
z4 = "";
@@ -440,7 +440,7 @@
if (decoded) {
/* Entity header, not response header */
sprintf(z, "Content-type: %s" CRLF
- "Content-range: bytes %llu-%llu/%llu" CRLF
+ "Content-range: bytes %zu-%zu/%zu" CRLF
"Content-length: %llu" CRLF
CRLF, mediatype, start, end,
filesize, end-start+1);
@@ -509,7 +509,7 @@
break;
}
- sprintf(z, "bytes %llu-%llu/%llu", start, end, filesize);
+ sprintf(z, "bytes %zu-%zu/%zu", start, end, filesize);
ResponseAddField(r, "Content-range", z);
ResponseContentLength(r, end - start + 1);

View File

@@ -1,5 +1,5 @@
--- ltconfig.orig 2010-07-02 01:17:54.000000000 +0200
+++ ltconfig 2010-07-02 01:18:28.000000000 +0200
--- ltconfig.orig 2010-10-30 19:53:24.000000000 +0200
+++ ltconfig 2010-10-30 19:53:43.000000000 +0200
@@ -1957,7 +1957,7 @@
;;

View File

@@ -1,63 +1,5 @@
--- configure.orig 2010-07-02 00:30:20.000000000 +0200
+++ configure 2010-07-02 00:30:48.000000000 +0200
@@ -5433,7 +5433,7 @@
if $WININET_CONFIG --rpath-dir > /dev/null 2>&1; then
WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`"
else
- WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib"
+ WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64"
fi
echo "$as_me:$LINENO: result: $WININET_LIBDIR" >&5
echo "${ECHO_T}$WININET_LIBDIR" >&6
@@ -5538,7 +5538,7 @@
if $LIBWWW_CONFIG --rpath-dir > /dev/null 2>&1; then
LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`"
else
- LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib"
+ LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64"
fi
echo "$as_me:$LINENO: result: $LIBWWW_LIBDIR" >&5
echo "${ECHO_T}$LIBWWW_LIBDIR" >&6
@@ -5618,7 +5618,7 @@
echo "$as_me:$LINENO: checking for curl library directory" >&5
echo $ECHO_N "checking for curl library directory... $ECHO_C" >&6
- CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
+ CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64"
echo "$as_me:$LINENO: result: $CURL_LIBDIR" >&5
echo "${ECHO_T}$CURL_LIBDIR" >&6
--- configure.in.orig 2010-07-02 00:30:51.000000000 +0200
+++ configure.in 2010-07-02 00:31:02.000000000 +0200
@@ -439,7 +439,7 @@
WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`"
else
dnl Yawn. We're using the regular boring version.
- WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib"
+ WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64"
fi
AC_MSG_RESULT($WININET_LIBDIR)
AC_SUBST(WININET_LIBDIR)
@@ -510,7 +510,7 @@
LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`"
else
dnl Yawn. We're using the regular boring version.
- LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib"
+ LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64"
fi
AC_MSG_RESULT($LIBWWW_LIBDIR)
AC_SUBST(LIBWWW_LIBDIR)
@@ -562,7 +562,7 @@
dnl adjust the search patch manually. Just gag me with a backquote, OK?
AC_MSG_CHECKING(for curl library directory)
dnl Yawn. We're using the regular boring version.
- CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
+ CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64"
AC_MSG_RESULT($CURL_LIBDIR)
AC_SUBST(CURL_LIBDIR)
--- ltconfig.orig 2010-07-02 00:22:59.000000000 +0200
+++ ltconfig 2010-07-02 00:29:49.000000000 +0200
--- ltconfig.orig 2010-10-30 19:50:15.000000000 +0200
+++ ltconfig 2010-10-30 19:52:55.000000000 +0200
@@ -1774,8 +1774,8 @@
shlibpath_overrides_runpath=unknown
version_type=none
@@ -90,3 +32,61 @@
dynamic_linker='GNU ld.so'
else
# Only the GNU ld.so supports shared libraries on MkLinux.
--- configure.in.orig 2010-10-30 19:49:57.000000000 +0200
+++ configure.in 2010-10-30 19:50:08.000000000 +0200
@@ -439,7 +439,7 @@
WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`"
else
dnl Yawn. We're using the regular boring version.
- WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib"
+ WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64"
fi
AC_MSG_RESULT($WININET_LIBDIR)
AC_SUBST(WININET_LIBDIR)
@@ -510,7 +510,7 @@
LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`"
else
dnl Yawn. We're using the regular boring version.
- LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib"
+ LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64"
fi
AC_MSG_RESULT($LIBWWW_LIBDIR)
AC_SUBST(LIBWWW_LIBDIR)
@@ -562,7 +562,7 @@
dnl adjust the search patch manually. Just gag me with a backquote, OK?
AC_MSG_CHECKING(for curl library directory)
dnl Yawn. We're using the regular boring version.
- CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
+ CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64"
AC_MSG_RESULT($CURL_LIBDIR)
AC_SUBST(CURL_LIBDIR)
--- configure.orig 2010-10-30 19:48:41.000000000 +0200
+++ configure 2010-10-30 19:49:55.000000000 +0200
@@ -5985,7 +5985,7 @@
if $WININET_CONFIG --rpath-dir > /dev/null 2>&1; then
WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`"
else
- WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib"
+ WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64"
fi
{ echo "$as_me:$LINENO: result: $WININET_LIBDIR" >&5
echo "${ECHO_T}$WININET_LIBDIR" >&6; }
@@ -6091,7 +6091,7 @@
if $LIBWWW_CONFIG --rpath-dir > /dev/null 2>&1; then
LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`"
else
- LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib"
+ LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64"
fi
{ echo "$as_me:$LINENO: result: $LIBWWW_LIBDIR" >&5
echo "${ECHO_T}$LIBWWW_LIBDIR" >&6; }
@@ -6172,7 +6172,7 @@
{ echo "$as_me:$LINENO: checking for curl library directory" >&5
echo $ECHO_N "checking for curl library directory... $ECHO_C" >&6; }
- CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
+ CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64"
{ echo "$as_me:$LINENO: result: $CURL_LIBDIR" >&5
echo "${ECHO_T}$CURL_LIBDIR" >&6; }

1
xmlrpc-c-rpmlintrc Normal file
View File

@@ -0,0 +1 @@
setBadness('shared-lib-calls-exit', 0)

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Oct 30 17:46:21 UTC 2010 - pascal.bleser@opensuse.org
- update to 1.06.41:
* CGI XML-RPC server accepts (ignores) parameters after "text/xml" in Content-type header from client
- moved changelog entries from spec file to .changes file
- added patches to fix wrong usage of printf format for size_t (upstream uses llu instead of zu)
-------------------------------------------------------------------
Tue Aug 31 21:29:13 UTC 2010 - chris@computersalat.de
@@ -6,3 +15,60 @@ Tue Aug 31 21:29:13 UTC 2010 - chris@computersalat.de
- used Source from sourceforge.net
o correct named: xmlrpc-c-1.06.40.tgz
-------------------------------------------------------------------
Thu Jul 8 00:00:00 UTC 2010 - dl8fcl@darc.de
- imported fixes from pascal@links2linux.de
* C++ bytesFromBase64(): fix bug: high two bits always zero.
Broken since created (2005)
* Abyss: terminate after current request, not current connection.
(Matters with keepalive)
* fix xmlrpc_inetd_server C++ example. It has never worked.
* fix error message about invalid <int> XML
-------------------------------------------------------------------
Sun Dec 20 00:00:00 UTC 2009 - dl8fcl@darc.de
- update to 1.06.38
-------------------------------------------------------------------
Mon Sep 28 00:00:00 UTC 2009 - pascal.bleser@opensuse.org
- update to 1.06.37
-------------------------------------------------------------------
Sat May 9 00:00:00 UTC 2009 - bitshuffler #suse@irc.freenode.org
- Updated to 1.06.33
* Mon Aug 4 00:00:00 UTC 2008 - Peter Nixon
- Add xmlrpc-c-gcc43.patch from Gentoo project to placate newer GCC
version on openSUSE 11.0
- Add Packager tag
- Update group for -devel package
- replace %%%%run_ldconfig with %%post(un) -p /sbin/ldconfig
* Tue Jun 12 00:00:00 UTC 2007 - Peter Nixon
- Updated to 1.06.14
- Enabled all options
- Fixed 64bit build problems
-------------------------------------------------------------------
Tue Mar 14 00:00:00 UTC 2006 - Peter Nixon
- enabled abyss-server
-------------------------------------------------------------------
Wed Jan 25 00:00:00 UTC 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Thu Mar 18 00:00:00 UTC 2004 - hvogel@suse.de
- fix files list
-------------------------------------------------------------------
Tue Mar 16 00:00:00 UTC 2004 - kkaempf@suse.de
- initial package version 0.9.10

View File

@@ -1,5 +1,5 @@
#
# spec file for package xmmlrpc-c (Version 1.06.40)
# spec file for package xmmlrpc-c (Version 1.06.41)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,12 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# vim: set sw=4 ts=4 et:
# norootforbuild
%define soname 3
Name: xmlrpc-c
Version: 1.06.40
Version: 1.06.41
Release: 1
License: BSD
Group: Development/Libraries/C and C++
@@ -32,6 +33,9 @@ Patch1: %{name}-fix_as_needed.patch
Patch2: %{name}-fix_without_as_needed.patch
Patch3: %{name}-lib64.patch
Patch4: %{name}-lib.patch
Patch5: %{name}-disable_rpath.patch
Patch6: %{name}-fix_wrong_printf_format_for_size_t.patch
Source99: %{name}-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf automake file gcc-c++ libtool
%if 0%{?suse_version} >= 1020
@@ -235,6 +239,8 @@ Authors:
%else
%patch4 -p0 -b .lib
%endif
%patch5 -p0 -b .rpath
%patch6 -p0 -b .format
%__rm -rf examples/.cvsignore examples/cpp/.cvsignore
@@ -366,42 +372,3 @@ s/^hardcode_shlibpath_var.*$/hardcode_shlibpath_var=no/g
%{_libdir}/libxmlrpc_util.so.%{soname}
%{_libdir}/libxmlrpc_util.so.%{soname}.*
%changelog
* Thu Jul 08 2010 dl8fcl@darc.de
- imported fixes from pascal@links2linux.de
* C++ bytesFromBase64(): fix bug: high two bits always zero.
Broken since created (2005)
* Abyss: terminate after current request, not current connection.
(Matters with keepalive)
* fix xmlrpc_inetd_server C++ example. It has never worked.
* fix error message about invalid <int> XML
* Sun Dec 20 2009 dl8fcl@darc.de
- update to 1.06.38
* Mon Sep 28 2009 pascal.bleser@opensuse.org
- update to 1.06.37
* Sat May 9 2009 bitshuffler #suse@irc.freenode.org
- Updated to 1.06.33
* Mon Aug 4 00:00:00 UTC 2008 - Peter Nixon
- Add xmlrpc-c-gcc43.patch from Gentoo project to placate newer GCC
version on openSUSE 11.0
- Add Packager tag
- Update group for -devel package
- replace %%%%run_ldconfig with %%post(un) -p /sbin/ldconfig
* Tue Jun 12 00:00:00 UTC 2007 - Peter Nixon
- Updated to 1.06.14
- Enabled all options
- Fixed 64bit build problems
* Tue Mar 14 2006 - Peter Nixon
- enabled abyss-server
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Mar 18 2004 hvogel@suse.de
- fix files list
* Tue Mar 16 2004 - kkaempf@suse.de
- fix libdir for 64bit
* Tue Mar 16 2004 - hvogel@suse.de
- fix bogus %%prefix usage
* Tue Mar 16 2004 - kkaempf@suse.de
- fix filelist
* Tue Mar 16 2004 kkaempf@suse.de
- initial package version 0.9.10