Hello community,
here is the log from the commit of package redland for openSUSE:Factory checked in at 2011-11-16 17:21:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/redland (Old)
and /work/SRC/openSUSE:Factory/.redland.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "redland", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/redland/redland.changes 2011-09-23 12:44:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.redland.new/redland.changes 2011-11-16 17:22:32.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Nov 16 08:11:50 UTC 2011 - tittiatcoke@gmail.com
+
+- Ensure that the patch regarding O_CLOEXEC is only applied on
+ versions equal or higher than 12.1
+
+-------------------------------------------------------------------
+Mon Nov 14 21:39:58 UTC 2011 - crrodriguez@opensuse.org
+
+- open all file descriptors with O_CLOEXEC to avoid
+ races and leaks.
+
+-------------------------------------------------------------------
New:
----
redland-ocloexec.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ redland.spec ++++++
--- /var/tmp/diff_new_pack.bU0HUD/_old 2011-11-16 17:22:33.000000000 +0100
+++ /var/tmp/diff_new_pack.bU0HUD/_new 2011-11-16 17:22:33.000000000 +0100
@@ -15,21 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%bcond_with perl
Name: redland
Version: 1.0.14
Release: 6
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
License: LGPLv2.1+ ; ASLv..
-Group: System/Libraries
+Summary: Libraries that provide support for the Resource Description Framework (RDF)
Url: http://www.librdf.org
+Group: System/Libraries
Source0: http://download.librdf.org/source/%{name}-%{version}.tar.gz
-Summary: Libraries that provide support for the Resource Description Framework (RDF)
+BuildRequires: db-devel
BuildRequires: librasqal-devel
-BuildRequires: db-devel pkg-config sqlite-devel
+BuildRequires: pkg-config
+BuildRequires: sqlite-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1210
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch1: redland-ocloexec.patch
+%endif
%description
Redland is a library that provides a high-level interface for RDF
@@ -39,11 +44,6 @@
support in their applications as well as a core library for RDF
developers to start with.
-
-Authors:
---------
- Dave Beckett
-
%package -n libredland-devel
License: LGPLv2.1+ ; ASLv..
Summary: Development package for programs that use Redland
@@ -53,11 +53,6 @@
%description -n libredland-devel
Files needed to develop with the Redland RDF library.
-
-Authors:
---------
- Dave Beckett
-
%package -n libredland0
License: LGPLv2.1+ ; ASLv..
Summary: Libraries that provide support for the Resource Description Framework (RDF)
@@ -72,16 +67,15 @@
support in their applications as well as a core library for RDF
developers to start with.
-
-Authors:
---------
- Dave Beckett
-
%prep
%setup -q
+%if 0%{?suse_version} >= 1210
+%patch1
+%endif
%build
+autoconf
# only compile bdb backend as it seems to be the recommended one?
%configure --enable-release --with-raptor=system --with-rasqal=system \
--with-threestore=no --with-sqlite=3 \
@@ -91,21 +85,21 @@
--disable-static \
--with-html-dir=%{_docdir}/%{name}-devel/ \
--includedir=%{_includedir}/%{name}
-%{__make} %{?jobs:-j %jobs}
+make %{?_smp_mflags}
%install
%makeinstall docdir=%{_docdir}/%{name}-devel/
rm -f %{buildroot}%{_libdir}/librdf*.la
%check
-%if %suse_version > 1030
+%if 0%{?suse_version} > 1030
export MALLOC_CHECK_=2
make check
unset MALLOC_CHECK_
%endif
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%post -n libredland0 -p /sbin/ldconfig
++++++ redland-ocloexec.patch ++++++
--- src/rdf_serializer.c.orig
+++ src/rdf_serializer.c
@@ -557,7 +557,7 @@ librdf_serializer_serialize_stream_to_fi
LIBRDF_ASSERT_OBJECT_POINTER_RETURN_VALUE(name, string, 1);
LIBRDF_ASSERT_OBJECT_POINTER_RETURN_VALUE(stream, librdf_stream, 1);
- fh=fopen(name, "w+");
+ fh=fopen(name, "w+e");
if(!fh) {
librdf_log(serializer->world, 0, LIBRDF_LOG_ERROR, LIBRDF_FROM_SERIALIZER,
NULL, "failed to open file '%s' for writing - %s",
@@ -596,7 +596,7 @@ librdf_serializer_serialize_model_to_fil
LIBRDF_ASSERT_OBJECT_POINTER_RETURN_VALUE(name, string, 1);
LIBRDF_ASSERT_OBJECT_POINTER_RETURN_VALUE(model, librdf_model, 1);
- fh=fopen(name, "w+");
+ fh=fopen(name, "w+e");
if(!fh) {
librdf_log(serializer->world, 0, LIBRDF_LOG_ERROR, LIBRDF_FROM_SERIALIZER,
NULL, "failed to open file '%s' for writing - %s",
@@ -1099,7 +1099,7 @@ main(int argc, char *argv[])
stream=librdf_model_as_stream(model);
#define FILENAME "test.rdf"
- fh=fopen(FILENAME, "w");
+ fh=fopen(FILENAME, "we");
if(!fh) {
fprintf(stderr, "%s: Failed to fopen for writing '%s' - %s\n",
program, FILENAME, strerror(errno));
--- src/rdf_storage_file.c.orig
+++ src/rdf_storage_file.c
@@ -329,7 +329,7 @@ librdf_storage_file_sync(librdf_storage
return 1;
}
- fh=fopen(new_name, "w+");
+ fh=fopen(new_name, "w+e");
if(!fh) {
librdf_log(storage->world, 0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
"failed to open file '%s' for writing - %s",
--- src/rdf_parser_raptor.c.orig
+++ src/rdf_parser_raptor.c
@@ -570,7 +570,7 @@ librdf_parser_raptor_parse_as_stream_com
if(!filename)
return NULL;
- fh=fopen(filename, "r");
+ fh=fopen(filename, "re");
if(!fh) {
librdf_log(pcontext->parser->world, 0, LIBRDF_LOG_ERROR,
LIBRDF_FROM_PARSER, NULL, "failed to open file '%s' - %s",
--- src/rdf_query_results.c.orig
+++ src/rdf_query_results.c
@@ -598,7 +598,7 @@ librdf_query_results_to_file2(librdf_que
LIBRDF_ASSERT_OBJECT_POINTER_RETURN_VALUE(query_results, query_results, 1);
LIBRDF_ASSERT_OBJECT_POINTER_RETURN_VALUE(name, string, 1);
- fh = fopen(name, "w+");
+ fh = fopen(name, "w+e");
if(!fh) {
librdf_log(query_results->query->world, 0, LIBRDF_LOG_ERROR,
LIBRDF_FROM_QUERY, NULL,
--- src/rdf_files.c.orig
+++ src/rdf_files.c
@@ -44,6 +44,8 @@
#endif
#endif
+#include
+
#ifdef STANDALONE
#define LIBRDF_DEBUG 1
#endif
@@ -91,7 +93,7 @@ librdf_files_temporary_file_name(void)
#ifdef HAVE_MKSTEMP
/* Proritise mkstemp() since GNU libc says: Never use mktemp(). */
- fd=mkstemp(name);
+ fd=mkostemp(name, O_CLOEXEC);
if(fd<0) {
LIBRDF_FREE(cstring, name);
return NULL;
--- configure.ac.orig
+++ configure.ac
@@ -100,7 +100,9 @@ AC_SUBST(LIBRDF_LIBTOOL_VERSION)
dnl Checks for programs.
AM_SANITY_CHECK
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_LN_S
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org