Hello community, here is the log from the commit of package libprelude for openSUSE:Factory checked in at 2013-04-16 06:45:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libprelude (Old) and /work/SRC/openSUSE:Factory/.libprelude.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libprelude", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-04-05 00:01:41.916011506 +0200 +++ /work/SRC/openSUSE:Factory/.libprelude.new/libprelude.changes 2013-04-16 06:45:20.000000000 +0200 @@ -0,0 +1,53 @@ +------------------------------------------------------------------- +Tue Apr 9 23:29:43 UTC 2013 - [email protected] + +- change license to GPLv3.0+ due to libmissing being incorporated (bnc#814000) +- remove requirement for libgnutls-devel as done previously (see below) + +------------------------------------------------------------------- +Fri Apr 5 12:07:24 CEST 2013 - [email protected] + +- Add a definition of perl_gen_filelist for SLE11 to the spec file. + +------------------------------------------------------------------- +Thu Mar 28 22:19:35 UTC 2013 - [email protected] + +- Update to v1.0.1 +- Add these patches + * libprelude-1.0.1-fixgnulib.patch + * libprelude-1.0.0-gcc46.patch + * libprelude-fixlibgnutls3.0.5.patch + * libprelude-ruby1.9.patch + * libprelude-fsf-address.patch + * libprelude-sles12sp2.patch + +- Create new subpackages + * libprelude-doc + * ruby-libprelude + * perl-libprelude + * python-libprelude + +------------------------------------------------------------------- +Mon Dec 5 13:11:59 UTC 2011 - [email protected] + +- Added a simple patch file to fix the compile error for OpenSUSE 12.1 + +------------------------------------------------------------------- +Mon Nov 7 22:29:42 UTC 2011 - [email protected] + +- build require libgcrypt-devel +- use gnutls-devel instead of libgnutls-devel to build on old + distributions (package provides both names) + +------------------------------------------------------------------- +Wed Oct 20 11:01:44 UTC 2010 - [email protected] + +- fixed to used pkg-config in stead of libgnutls-config + so it builds with >= gnutls-2.7.0 + +------------------------------------------------------------------- +Sat Jul 24 02:31:15 UTC 2010 - [email protected] + +- Initial package + +------------------------------------------------------------------- New: ---- libprelude-1.0.0-gcc46.patch libprelude-1.0.1-fixgnulib.patch libprelude-1.0.1.tar.gz libprelude-fixlibgnutls3.0.5.patch libprelude-fsf-address.patch libprelude-ruby1.9.patch libprelude-sles12sp2.patch libprelude.changes libprelude.spec opensuse12_compile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libprelude.spec ++++++ # # spec file for package libprelude # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define soname 2 %define soname_cpp 0 Name: libprelude Version: 1.0.1 Release: 0 # the primary code is GPL-2.0+, but libmissing and libmissing/tests are LGPL3.0+ and GPL3.0+ respectively License: GPL-3.0+ Summary: Secure Connections between all Sensors and the Prelude Manager Url: http://www.prelude-technologies.com Group: Productivity/Networking/Security Source: https://www.prelude-ids.org/attachments/download/241/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: gnutls-devel BuildRequires: libgcrypt-devel BuildRequires: pkg-config BuildRequires: chrpath BuildRequires: gcc-c++ BuildRequires: lua-devel BuildRequires: python-devel BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: swig BuildRoot: %{_tmppath}/%{name}-%{version}-build # add SLE support %if 0%suse_version <= 1110 # macro: perl_gen_filelist (from Christian <[email protected]>) # do the rpmlint happy filelist generation # with %dir in front of directories # %define perl_gen_filelist(n) \ FILES=%{name}.files\ # fgen_dir func\ # IN: dir\ fgen_dir(){\ %{__cat} >> $FILES << EOF\ %dir ${1}\ EOF\ }\ # fgen_file func\ # IN: file\ fgen_file(){\ %{__cat} >> $FILES << EOF\ ${1}\ EOF\ }\ # check for files in %{perl_vendorlib}\ RES=`find ${RPM_BUILD_ROOT}%{perl_vendorlib} -maxdepth 1 -type f`\ if [ -n "$RES" ]; then\ for file in $RES; do\ fgen_file "%{perl_vendorlib}/$(basename ${file})"\ done\ fi\ \ # get all dirs into array\ base_dir="${RPM_BUILD_ROOT}%{perl_vendorlib}/"\ for dir in `find ${base_dir} -type d | sort`; do\ if [ "$dir" = "${base_dir}" ]; then\ continue\ else\ el=`echo $dir | %{__awk} -F"${base_dir}" '{print $2}'`\ all_dir=(${all_dir[@]} $el)\ fi\ done\ \ # build filelist\ for i in ${all_dir[@]}; do\ # do not add "dir {perl_vendorlib/arch}/auto", included in perl package\ if [ "${i}" = "auto" ]; then\ continue\ fi\ if [ "%{perl_vendorlib}/${i}" = "%{perl_vendorarch}/auto" ]; then\ continue\ else\ if [ -d ${base_dir}/${i} ]; then\ RES=`find "${base_dir}/${i}" -maxdepth 1 -type f`\ if [ -n "$RES" ]; then\ fgen_dir "%{perl_vendorlib}/${i}"\ for file in $RES; do\ fgen_file "%{perl_vendorlib}/${i}/$(basename ${file})"\ done\ else\ fgen_dir "%{perl_vendorlib}/${i}"\ fi\ fi\ fi\ done\ # add man pages\ # if exist :)\ if [ -d "${RPM_BUILD_ROOT}%{_mandir}" ]; then\ fgen_file "%{_mandir}/man?/*"\ fi\ \ # add packlist file\ # generated fom perllocal.pod\ if [ -f "${RPM_BUILD_ROOT}/var/adm/perl-modules/%{name}" ]; then\ fgen_file "/var/adm/perl-modules/%{name}"\ fi\ \ # check for files in %{_bindir}\ if [ -d ${RPM_BUILD_ROOT}%{_bindir} ]; then\ RES=`find "${RPM_BUILD_ROOT}%{_bindir}" -maxdepth 1 -type f`\ if [ -n "$RES" ]; then\ for file in $RES; do\ fgen_file "%{_bindir}/$(basename ${file})"\ done\ fi\ fi %endif Patch1: opensuse12_compile.patch # PATCH-FIX-UPSTREAM libprelude-1.0.1-fixgnulib.patch [https://bugzilla.redhat.com/show_bug.cgi?id=839602] Patch2: libprelude-1.0.1-fixgnulib.patch # PATCH-FIX-UPSTREAM libprelude-1.0.0-gcc46.patch [https://dev.prelude-ids.com/issues/515] Patch3: libprelude-1.0.0-gcc46.patch Patch4: libprelude-sles12sp2.patch # PATCH-FIX-UPSTREAM libprelude-fixlibgnutls3.0.5.patch [https://dev.prelude-ids.com/issues/514] Patch5: libprelude-fixlibgnutls3.0.5.patch # PATCH-FIX-UPSTREAM libprelude-ruby1.9.patch [https://dev.prelude-ids.com/issues/513] Patch6: libprelude-ruby1.9.patch # PATCH-FIX-UPSTREAM libprelude-fsf-address.patch [https://dev.prelude-ids.com/issues/516] Patch7: libprelude-fsf-address.patch %description Libprelude is a library that guarantees secure connections between all sensors and the Prelude Manager. Libprelude provides an Application Programming Interface (API) for the communication with Prelude sub-systems, it supplies the necessary functionality for generating and emitting IDMEF events with Prelude and automates the saving and re-transmission of data in times of temporary interruption of one of the components of the system. %package -n libprelude%{soname} Summary: Prelude Libraries Group: System/Libraries %description -n libprelude%{soname} Libprelude is a library that guarantees secure connections between all sensors and the Prelude Manager. Libprelude provides an Application Programming Interface (API) for the communication with Prelude sub-systems, it supplies the necessary functionality for generating and emitting IDMEF events with Prelude and automates the saving and re-transmission of data in times of temporary interruption of one of the components of the system. %package -n libpreludecpp%{soname_cpp} Summary: Prelude Libraries Group: System/Libraries %description -n libpreludecpp%{soname_cpp} Libprelude is a library that guarantees secure connections between all sensors and the Prelude Manager. Libprelude provides an Application Programming Interface (API) for the communication with Prelude sub-systems, it supplies the necessary functionality for generating and emitting IDMEF events with Prelude and automates the saving and re-transmission of data in times of temporary interruption of one of the components of the system. %package -n libprelude-devel Summary: Development files for libprelude Group: Development/Libraries/C and C++ Requires: libprelude%{soname} = %{version} %description -n libprelude-devel Libprelude is a library that guarantees secure connections between all sensors and the Prelude Manager. Libprelude provides an Application Programming Interface (API) for the communication with Prelude sub-systems, it supplies the necessary functionality for generating and emitting IDMEF events with Prelude and automates the saving and re-transmission of data in times of temporary interruption of one of the components of the system. %package -n python-%{name} Summary: Python bindings for libprelude Group: Development/Languages/Python Requires: libprelude%{soname} = %{version} Requires: python = %{py_ver} %description -n python-%{name} Python bindings for libprelude generated by SWIG. %package -n perl-%{name} Summary: Perl bindings for libprelude Group: Development/Languages/Perl BuildRequires: perl Requires: libprelude%{soname} = %{version} Requires: perl = %{perl_version} %description -n perl-%{name} Perl bindings for libprelude generated by SWIG. %package -n ruby-%{name} Summary: Ruby bindings for libprelude Group: Development/Languages/Ruby Requires: libprelude%{soname} = %{version} Requires: ruby %description -n ruby-%{name} Ruby bindings for libprelude generated by SWIG. %package doc Summary: Libprelude documentation Group: System/Libraries %description doc Libprelude documentation files. %prep %setup -q %if 0%{?suse_version} >= 1210 %patch1 -p1 %endif %patch2 -p1 %patch3 -p1 %if 0%{?sles_version} == 11 %patch4 -p1 %endif %if 0%{?suse_version} > 1210 %patch4 -p1 %patch5 -p1 %patch6 -p1 %endif %patch7 -p1 %build %configure --disable-static \ --with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \ --with-perl-installdirs=vendor \ --enable-easy-bindings make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} find %{buildroot}%{_libdir} -name "*.la" -delete %perl_process_packlist %perl_gen_filelist %post -n libprelude%{soname} -p /sbin/ldconfig %post -n libpreludecpp%{soname_cpp} -p /sbin/ldconfig %postun -n libprelude%{soname} -p /sbin/ldconfig %postun -n libpreludecpp%{soname_cpp} -p /sbin/ldconfig %clean test %{buildroot} != "/" && rm -rf %{buildroot} %files -n libprelude%{soname} %defattr(-,root,root) %doc AUTHORS ChangeLog README NEWS COPYING LICENSE.README HACKING.README %config(noreplace) %{_sysconfdir}/prelude %{_bindir}/prelude-adduser %{_bindir}/prelude-admin %{_libdir}/libprelude.so.%{soname}* %{_mandir}/man1/prelude-admin.1.* %files -n libpreludecpp%{soname_cpp} %defattr(-,root,root) %{_libdir}/libpreludecpp.so.%{soname_cpp}* %files -n libprelude-devel %defattr(-,root,root) %{_bindir}/libprelude-config %{_includedir}/libprelude %{_libdir}/libprelude.so %{_libdir}/libpreludecpp.so %{_libdir}/pkgconfig/libprelude.pc %{_datadir}/aclocal/libprelude.m4 # %%dir %%{_datadir}/gtk-doc # %%dir %%{_datadir}/gtk-doc/html # %%{_datadir}/gtk-doc/html/libprelude %files -n python-%{name} %defattr(-,root,root) %{python_sitearch}/* %files -n perl-%{name} -f %{name}.files %defattr(-,root,root) %exclude %{_bindir}/libprelude-config %exclude %{_bindir}/prelude-adduser %exclude %{_bindir}/prelude-admin %exclude %{_mandir}/man1/prelude-admin.1.gz %files -n ruby-%{name} %defattr(-,root,root) # SLES 11, opensuse 12.1 and newer put PreludeEasy in the libdir %if 0%{?suse_version} >= 1210 || 0%suse_version <= 1110 %{_libdir}/PreludeEasy.so %endif # opensuse 12.1 and older put PreludeEasy in the ruby dir, note that 12.1 has it both places %if 0%{?suse_version} <= 1210 %{rb_sitearch}/PreludeEasy.so %endif %files doc %defattr(-,root,root,-) %doc AUTHORS ChangeLog README NEWS COPYING LICENSE.README HACKING.README %{_docdir}/%{name}-%{version} %changelog ++++++ libprelude-1.0.0-gcc46.patch ++++++ diff -urp libprelude-1.0.0.orig/bindings/c++/include/prelude.hxx libprelude-1.0.0/bindings/c++/include/prelude.hxx --- libprelude-1.0.0.orig/bindings/c++/include/prelude.hxx 2011-06-24 12:58:29.000000000 -0400 +++ libprelude-1.0.0/bindings/c++/include/prelude.hxx 2011-06-24 12:59:01.000000000 -0400 @@ -26,6 +26,8 @@ #ifndef _LIBPRELUDE_PRELUDE_HXX #define _LIBPRELUDE_PRELUDE_HXX +#include <stddef.h> + #include "prelude-client.hxx" #include "prelude-client-easy.hxx" #include "prelude-connection.hxx" ++++++ libprelude-1.0.1-fixgnulib.patch ++++++ --- a/libmissing/m4/stdio_h.m4 +++ a/libmissing/m4/stdio_h.m4 @@ -34,9 +34,9 @@ AC_DEFUN([gl_STDIO_H], dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use, and which is not - dnl guaranteed by C89. + dnl guaranteed by both C89 and C11. gl_WARN_ON_USE_PREPARE([[#include <stdio.h> - ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat + ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat snprintf vdprintf vsnprintf]) ]) --- a/libmissing/m4/warn-on-use.m4 +++ a/libmissing/m4/warn-on-use.m4 @@ -18,8 +18,8 @@ dnl with or without modifications, as long as this notice is preserved. # some systems declare functions in the wrong header, then INCLUDES # should do likewise. # -# If you assume C89, then it is generally safe to assume declarations -# for functions declared in that standard (such as gets) without +# It is generally safe to assume declarations for functions declared +# in the intersection of C89 and C11 (such as printf) without # needing gl_WARN_ON_USE_PREPARE. AC_DEFUN([gl_WARN_ON_USE_PREPARE], [ --- a/libmissing/stdio.in.h +++ a/libmissing/stdio.in.h @@ -114,10 +114,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " #endif /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ + so any use of gets warrants an unconditional warning; besides, C11 + removed it. */ #undef gets +#if HAVE_RAW_DECL_GETS _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +#endif #if @GNULIB_FOPEN@ # if @REPLACE_FOPEN@ ++++++ libprelude-fixlibgnutls3.0.5.patch ++++++ --- libprelude-1.0.1-old/prelude-admin/prelude-admin.c 2012-06-01 12:12:22.000000000 -0300 +++ libprelude-1.0.1/prelude-admin/prelude-admin.c 2012-08-03 19:23:29.998711311 -0300 @@ -57,7 +57,9 @@ #include <errno.h> #include <gnutls/gnutls.h> #include <gnutls/x509.h> +#if GNUTLS_VERSION_NUMBER < 0x030005 #include <gnutls/extra.h> +#endif #include "common.h" #include "config-engine.h" --- libprelude-1.0.1-old/prelude-admin/server.c 2012-06-01 12:12:22.000000000 -0300 +++ libprelude-1.0.1/prelude-admin/server.c 2012-08-03 19:23:02.195712002 -0300 @@ -39,7 +39,9 @@ #include <gcrypt.h> #include <gnutls/gnutls.h> +#if GNUTLS_VERSION_NUMBER < 0x030005 #include <gnutls/extra.h> +#endif #include "prelude-client.h" #include "prelude-error.h" ++++++ libprelude-fsf-address.patch ++++++ ++++ 2403 lines (skipped) ++++++ libprelude-ruby1.9.patch ++++++ --- libprelude-1.0.1-old/configure.in 2012-06-04 11:28:01.000000000 -0300 +++ libprelude-1.0.1/configure.in 2012-08-03 19:45:51.778726467 -0300 @@ -468,13 +468,13 @@ AM_PATH_RUBY(,with_ruby=yes, with_ruby=no) if test x$with_ruby != xno; then - RUBY_ARCHDIR=`$RUBY -e 'require "rbconfig.rb"; puts Config::expand("\$(archdir)")'` - RUBY_LIBRUBYARG=`$RUBY -e 'require "rbconfig.rb"; puts Config::expand("\$(LIBRUBYARG)")'` + RUBY_ARCHDIR=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(archdir)")'` + RUBY_LIBRUBYARG=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(LIBRUBYARG)")'` RUBY_LIBS="-L$RUBY_ARCHDIR $RUBY_LIBRUBYARG" AC_SUBST(RUBY_LIBS) - RUBY_CCFLAGS=`$RUBY -rrbconfig -e "print Config::CONFIG[['CFLAGS']]"` + RUBY_CCFLAGS=`$RUBY -rrbconfig -e "print RbConfig::CONFIG[['CFLAGS']]"` AC_SUBST(RUBY_CCFLAGS) old_CPPFLAGS="$CPPFLAGS" --- libprelude-1.0.1-old/m4/am_path_ruby.m4 2012-04-02 06:41:15.000000000 -0300 +++ libprelude-1.0.1/m4/am_path_ruby.m4 2012-08-03 20:17:05.476741375 -0300 @@ -86,7 +86,7 @@ dnl rubydir -- where to install ruby scripts. AC_CACHE_CHECK([for $am_display_RUBY script directory], [am_cv_ruby_rubydir], - [am_cv_ruby_rubydir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(Config::CONFIG[['prefix']])); \\$prefix = Config::CONFIG[['prefix']].sub(drive, ''); \\$archdir = Config::CONFIG[['archdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$archdir;"`]) + [am_cv_ruby_rubydir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG[['prefix']])); \\$prefix = RbConfig::CONFIG[['prefix']].sub(drive, ''); \\$archdir = RbConfig::CONFIG[['archdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$archdir;"`]) AC_SUBST([rubydir], [$am_cv_ruby_rubydir]) dnl pkgrubydir -- $PACKAGE directory under rubydir. @@ -96,11 +96,12 @@ dnl (shared libraries) AC_CACHE_CHECK([for $am_display_RUBY extension module directory], [am_cv_ruby_rbexecdir], - [am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(Config::CONFIG[['prefix']])); \\$prefix = Config::CONFIG[['prefix']].sub(drive, ''); \\$sitearchdir = Config::CONFIG[['sitearchdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`]) + [am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG[['prefix']])); \\$prefix = RbConfig::CONFIG[['prefix']].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG[['sitearchdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`]) AC_SUBST([rbexecdir], [$am_cv_ruby_rbexecdir]) - RUBY_INCLUDES=`$RUBY -r rbconfig -e 'if Config::CONFIG[["archdir"]] then print " -I" + Config::CONFIG[["archdir"]] end - if Config::CONFIG[["rubyhdrdir"]] then print " -I" + Config::CONFIG[["rubyhdrdir"]] end'` + RUBY_INCLUDES=`$RUBY -rrbconfig -e 'if RbConfig::CONFIG[["archdir"]] then print " -I" + RbConfig::CONFIG[["archdir"]] end + if RbConfig::CONFIG[["rubyhdrdir"]] then print " -I" + RbConfig::CONFIG[["rubyhdrdir"]]; print " -I" + RbConfig::CONFIG[["rubyhdrdir"]]+File::SEPARATOR+RbConfig::CONFIG[["sitearch"]] end + '` AC_SUBST([RUBY_INCLUDES]) dnl pkgrbexecdir -- $(rbexecdir)/$(PACKAGE) --- libprelude-1.0.1-old/bindings/ruby/libpreludecpp-ruby.i 2012-06-01 12:12:00.000000000 -0300 +++ libprelude-1.0.1/bindings/ruby/libpreludecpp-ruby.i 2012-08-03 23:45:22.090875875 -0300 @@ -44,7 +44,11 @@ %{ extern "C" { +#ifdef HAVE_RUBY_IO_H +#include "ruby/io.h" +#else #include "rubyio.h" +#endif } %}; @@ -68,11 +72,15 @@ { FILE *f; ssize_t ret; - OpenFile *fptr; + rb_io_t *fptr; VALUE *io = (VALUE *) prelude_msgbuf_get_data(fd); GetOpenFile(*io, fptr); - f = fptr->f; +%#ifdef HAVE_RUBY_IO_H + f = rb_io_stdio_file(fptr); +%#else + f = GetWriteFile(fptr); +%#endif ret = fwrite((const char *) prelude_msg_get_message_data(msg), 1, prelude_msg_get_len(msg), f); if ( ret != prelude_msg_get_len(msg) ) @@ -88,11 +96,15 @@ { FILE *f; ssize_t ret; - OpenFile *fptr; + rb_io_t *fptr; VALUE *io = (VALUE *) prelude_io_get_fdptr(fd); GetOpenFile(*io, fptr); - f = fptr->f; +%#ifdef HAVE_RUBY_IO_H + f = rb_io_stdio_file(fptr); +%#else + f = GetReadFile(fptr); +%#endif ret = fread(buf, 1, size, f); if ( ret < 0 ) @@ -155,11 +167,9 @@ if ( ret < 0 ) return Qnil; - RARRAY(ary)->ptr[j++] = val; + rb_ary_store(ary, j++, val); } - RARRAY(ary)->len = result.size(); - return ary; } } @@ -184,12 +194,12 @@ int ret; char **argv; int _i, argc; - VALUE rbargv, *ptr; + VALUE rbargv, *ptr, tmp; __initial_thread = (gl_thread_t) gl_thread_self(); rbargv = rb_const_get(rb_cObject, rb_intern("ARGV")); - argc = RARRAY(rbargv)->len + 1; + argc = RARRAY_LEN(rbargv) + 1; if ( argc + 1 < 0 ) throw PreludeError("Invalid argc length"); @@ -198,11 +208,12 @@ if ( ! argv ) throw PreludeError("Allocation failure"); - argv[0] = STR2CSTR(rb_gv_get("$0")); + tmp = rb_gv_get("$0"); + argv[0] = StringValuePtr(tmp); - ptr = RARRAY(rbargv)->ptr; - for ( ptr = RARRAY(rbargv)->ptr, _i = 1; _i < argc; _i++, ptr++ ) - argv[_i] = STR2CSTR(*ptr); + ptr = RARRAY_PTR(rbargv); + for ( ptr = RARRAY_PTR(rbargv), _i = 1; _i < argc; _i++, ptr++ ) + argv[_i] = StringValuePtr(*ptr); argv[_i] = NULL; ++++++ libprelude-sles12sp2.patch ++++++ --- libprelude-1.0.1/bindings/python/Makefile.in.old 2012-08-03 17:11:44.000000000 -0300 +++ libprelude-1.0.1/bindings/python/Makefile.in 2012-08-03 17:11:04.000000000 -0300 @@ -1245,10 +1245,10 @@ @HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@ CC="$(CXX)" $(PYTHON) setup.py build @HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@install-exec-hook: -@HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` +@HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix=$(prefix) @HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@uninstall-hook: -@HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` +@HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix=$(prefix) @HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@clean-local: @HAVE_EASY_BINDINGS_TRUE@@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py clean -a --- libprelude-1.0.1/bindings/low-level/python/Makefile.in.old 2012-08-03 17:18:10.000000000 -0300 +++ libprelude-1.0.1/bindings/low-level/python/Makefile.in 2012-08-03 17:18:30.000000000 -0300 @@ -1242,10 +1242,10 @@ @HAVE_PYTHON_TRUE@ CC="$(BINDINGS_CC)" $(PYTHON) setup.py build @HAVE_PYTHON_TRUE@install-exec-hook: -@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` +@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix=$(prefix) @HAVE_PYTHON_TRUE@uninstall-hook: -@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` +@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix=$(prefix) @HAVE_PYTHON_TRUE@clean-local: @HAVE_PYTHON_TRUE@ $(PYTHON) setup.py clean -a ++++++ opensuse12_compile.patch ++++++ diff -Naur libprelude-1.0.0.org/src/include/prelude-plugin.h libprelude-1.0.0/src/include/prelude-plugin.h --- libprelude-1.0.0.org/src/include/prelude-plugin.h 2010-03-10 07:18:20.000000000 -0500 +++ libprelude-1.0.0/src/include/prelude-plugin.h 2011-12-05 07:54:41.921409724 -0500 @@ -63,7 +63,9 @@ # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols #endif +#ifndef lt_preloaded_symbols extern const void *lt_preloaded_symbols[]; +#endif #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \ prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
