Hello community, here is the log from the commit of package libidmef for openSUSE:Factory checked in at Fri Aug 28 23:55:24 CEST 2009. -------- --- libidmef/libidmef.changes 2009-03-07 00:07:05.000000000 +0100 +++ libidmef/libidmef.changes 2009-08-27 15:53:01.000000000 +0200 @@ -1,0 +2,65 @@ +Thu Aug 27 15:52:40 CEST 2009 - thomas@novell.com + +- fixed more build problems + +------------------------------------------------------------------- +Wed Aug 26 13:43:46 CEST 2009 - thomas@novell.com + +- changed BuildRequiers filed + +------------------------------------------------------------------- +Thu Aug 13 19:54:35 CEST 2009 - thomas@novell.com + +- removed file libidmef-1.0.2-rpmlintrc + +------------------------------------------------------------------- +Thu Aug 13 10:36:10 CEST 2009 - thomas@novell.com + +- fixed lib path for 64bit archs + +------------------------------------------------------------------- +Wed Aug 12 15:04:06 CEST 2009 - thomas@novell.com + +- fixed build error (shlib-policy-name-error) caused by package + name conventions + +------------------------------------------------------------------- +Wed Aug 12 11:18:17 CEST 2009 - thomas@novell.com + +- fixed error handling in parser.c (removed exit(2) etc.) + +------------------------------------------------------------------- +Tue Aug 11 17:40:05 CEST 2009 - thomas@novell.com + +- fixed compiling errors + +------------------------------------------------------------------- +Thu Aug 6 09:46:22 CEST 2009 - thomas@novell.com + +- added rpmlint filter + +------------------------------------------------------------------- +Wed Aug 5 07:44:14 CEST 2009 - thomas@novell.com + +- fixed build failures + +------------------------------------------------------------------- +Mon Aug 3 12:03:43 CEST 2009 - thomas@novell.com + +- updated to version 1.0.2 + - fixed a segfault issue when a tag <IDMEF-Message> was given + without attributes and idmefp should be generated + - cleaned up code from commented out test code + - fixed issues which could lead to segfaults (Thanks to Joel + Winteregg for reporting) + - idmef-messages.dtd updated to last draft + - fixed missing checks for memory allocation errrors + - fixed a missing return in get_checksum_algorithm() + - added tty attribute to UserID which has been forgotten ;) + - added newUserId_tty to libidmef-functions.map + - fixed various segfault issues (NULL pointer dereference) in + parser.c when debugging was enabled AND gen_idmefp was set to TRUE + - added newToolAlert_analyzerid, newCorrelationAlert_analyzerid + - changed newAnalyzer_id to newAnalyzer_analyzerid + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libidmef-0.7.2.tar.gz libidmef-0.7.2_idmefxml_bufferoverflow_detection.diff New: ---- libidmef-1.0.2.tar.gz libidmef-1.0.2_cleanup_autoconf.diff libidmef-1.0.2_parser_fatal_error_handling.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libidmef.spec ++++++ --- /var/tmp/diff_new_pack.FlCcKg/_old 2009-08-28 23:54:36.000000000 +0200 +++ /var/tmp/diff_new_pack.FlCcKg/_new 2009-08-28 23:54:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libidmef (Version 0.7.2) +# spec file for package libidmef (Version 1.0.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,33 +19,42 @@ Name: libidmef -BuildRequires: libxml2-devel +BuildRequires: dos2unix gcc-c++ libxml2-devel Url: http://sourceforge.net/projects/libidmef Summary: C Library for the Intrusion Detection Message Exchange Format (IDMEF) -Version: 0.7.2 -Release: 199 -License: BSD 3-Clause; GPL v2 or later +Version: 1.0.2 +Release: 1 +License: BSD 3-clause (or similar) ; GPL v2 or later Group: Development/Libraries/C and C++ -Source: libidmef-0.7.2.tar.gz -Patch: libidmef-0.7.2_idmefxml_bufferoverflow_detection.diff +Source: libidmef-%{version}.tar.gz +Patch1: libidmef-%{version}_cleanup_autoconf.diff +Patch2: libidmef-%{version}_parser_fatal_error_handling.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Libidmef is a C implementation of the Intrusion Detection Message -Exchange Format (IDMEF) made by Silicon Defense. +Libidmef is a C implementation of the "Intrusion Detection Message +Exchange Format" (IDMEF) made by Silicon Defense. +%define library_name libidmef1 +%define debug_package_requires %{library_name} = %{version}-%{release} + +%package -n libidmef1 +License: BSD 3-clause (or similar) ; GPL v2 or later +Group: Development/Libraries/C and C++ +Summary: C Library for the "Intrusion Detection Message Exchange Format" (IDMEF) +Requires: %{library_name} = %{version} + +%description -n libidmef1 +Libidmef is a C implementation of the "Intrusion Detection Message +Exchange Format" (IDMEF) made by Silicon Defense. -Authors: --------- - Joe McAlerney, joey@silicondefense.com - Adam Migus, NAI Labs, amigus@NAI.com %package devel -License: BSD 3-Clause; GPL v2 or later +License: BSD 3-clause (or similar) ; GPL v2 or later Group: Development/Libraries/C and C++ Summary: C Library for the "Intrusion Detection Message Exchange Format" (IDMEF) -Requires: %{name} = %{version} libxml2-devel +Requires: %{library_name} = %{version} %description devel Libidmef is a C implementation of the "Intrusion Detection Message @@ -60,16 +69,17 @@ %prep %setup -q -%patch +dos2unix ChangeLog +%patch1 -p1 +%patch2 -p1 %build %{?suse_update_config:%{suse_update_config -f .}} -rm acinclude.m4 +cp libidmef-functions.map libidmef-functions-rfc.map autoreconf -i -f -LDFLAGS="$(xml2-config --libs)" \ -CFLAGS="$RPM_OPT_FLAGS $(xml2-config --cflags) -fno-strict-aliasing" \ -%configure --disable-static --with-pic \ - --with-libxml2-includes=/usr/include/libxml2 --with-libxml2-libraries=%{_libdir} +#LDFLAGS="$(xml2-config --libs)" \ +#CFLAGS="$RPM_OPT_FLAGS $(xml2-config --cflags) -fno-strict-aliasing" \ +%configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} %install @@ -78,31 +88,62 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir} # install files make DESTDIR=$RPM_BUILD_ROOT install -install idmef-message.dtd $RPM_BUILD_ROOT/etc/idmef/ +install xml/idmef-message.dtd $RPM_BUILD_ROOT/etc/idmef/ %{__rm} -f %{buildroot}%{_libdir}/*.la +#strip $RPM_BUILD_ROOT/%{_libdir}/libidmef.so.%{version} -%post -p /sbin/ldconfig +%post -n %{library_name} -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %{library_name} -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files +%files -n %{library_name} %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO %attr(755,root,root) %dir /etc/idmef -%attr(644,root,root) %config(noreplace) /etc/idmef/idmef-message.dtd +%attr(755,root,root) %dir /usr/share/idmef-messages +%attr(644,root,root) %config /etc/idmef/idmef-message.dtd %attr(555,root,root) %{_libdir}/libidmef.so.* %files devel %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO %attr(755,root,root) %dir /usr/include/libidmef -%attr(644,root,root) /usr/include/libidmef/idmefxml.h -%attr(644,root,root) /usr/include/libidmef/idmefxml_gen.h -%attr(644,root,root) /usr/include/libidmef/idmefxml_parse.h -%attr(644,root,root) /usr/include/libidmef/idmefxml_types.h +%attr(755,root,root) %dir /etc/idmef +%attr(755,root,root) %dir /usr/share/idmef-messages %attr(555,root,root) %{_libdir}/libidmef.so +#%attr(644,root,root) %config /etc/idmef/idmef-message.dtd +%attr(755,root,root) /usr/bin/libidmef-config +%attr(644,root,root) /usr/include/libidmef/idmef_create.h +%attr(644,root,root) /usr/include/libidmef/idmef_global.h +%attr(644,root,root) /usr/include/libidmef/idmef_list.h +%attr(644,root,root) /usr/include/libidmef/idmef_message.h +%attr(644,root,root) /usr/include/libidmef/idmef_parser.h +%attr(644,root,root) /usr/include/libidmef/idmef_parser_helpers.h +%attr(644,root,root) /usr/include/libidmef/idmef_strings.h +%attr(644,root,root) /usr/include/libidmef/idmef_types.h +%attr(644,root,root) %{_libdir}/pkgconfig/libidmef.pc +%attr(644,root,root) /usr/share/idmef-message.dtd +%attr(644,root,root) /usr/share/idmef-messages/example1.xml +%attr(644,root,root) /usr/share/idmef-messages/example10.xml +%attr(644,root,root) /usr/share/idmef-messages/example11.xml +%attr(644,root,root) /usr/share/idmef-messages/example12.xml +%attr(644,root,root) /usr/share/idmef-messages/example13.xml +%attr(644,root,root) /usr/share/idmef-messages/example14.xml +%attr(644,root,root) /usr/share/idmef-messages/example15.xml +%attr(644,root,root) /usr/share/idmef-messages/example16.xml +%attr(644,root,root) /usr/share/idmef-messages/example17.xml +%attr(644,root,root) /usr/share/idmef-messages/example18.xml +%attr(644,root,root) /usr/share/idmef-messages/example2.xml +%attr(644,root,root) /usr/share/idmef-messages/example20.xml +%attr(644,root,root) /usr/share/idmef-messages/example3.xml +%attr(644,root,root) /usr/share/idmef-messages/example4.xml +%attr(644,root,root) /usr/share/idmef-messages/example5.xml +%attr(644,root,root) /usr/share/idmef-messages/example6.xml +%attr(644,root,root) /usr/share/idmef-messages/example7.xml +%attr(644,root,root) /usr/share/idmef-messages/example8.xml +%attr(644,root,root) /usr/share/idmef-messages/example9.xml %changelog ++++++ libidmef-0.7.2.tar.gz -> libidmef-1.0.2.tar.gz ++++++ ++++ 99555 lines of diff (skipped) ++++++ libidmef-1.0.2_cleanup_autoconf.diff ++++++ --- libidmef-1.0.2/configure.in.bak 2009-08-11 15:37:15.000000000 +0200 +++ libidmef-1.0.2/configure.in 2009-08-11 16:00:02.000000000 +0200 @@ -116,22 +116,22 @@ # Checks for libraries. -#AM_PATH_XML2(2.5.10, [ -#libidmef_cflags="$XML_CFLAGS ${libidmef_cflags## }" -#libidmef_libs="$XML_LIBS ${libidmef_libs## }" -#CFLAGS="$XML_CFLAGS ${CFLAGS## }" -#CPPFLAGS="$XML_CFLAGS ${CFLAGS## }" -#LDFLAGS="$XML_LIBS ${LDFLAGS## }" -#]) - -PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2.5.10, -[libidmef_cflags="$XML2_CFLAGS ${libidmef_cflags## }" -libidmef_libs="$XML2_LIBS ${libidmef_libs## }" -CFLAGS="$XML2_CFLAGS ${CFLAGS## }" -CPPFLAGS="$XML2_CFLAGS ${CFLAGS## }" -LDFLAGS="$XML2_LIBS ${LDFLAGS## }" +AM_PATH_XML2(2.5.10, [ +libidmef_cflags="$XML_CFLAGS ${libidmef_cflags## }" +libidmef_libs="$XML_LIBS ${libidmef_libs## }" +CFLAGS="$XML_CFLAGS ${CFLAGS## }" +CPPFLAGS="$XML_CFLAGS ${CFLAGS## }" +LDFLAGS="$XML_LIBS ${LDFLAGS## }" ]) +#PKG_CHECK_MODULES(XML2, libxml2 >= 2.5.10, +#[libidmef_cflags="$XML2_CFLAGS ${libidmef_cflags## }" +#libidmef_libs="$XML2_LIBS ${libidmef_libs## }" +#CFLAGS="$XML2_CFLAGS ${CFLAGS## }" +#CPPFLAGS="$XML2_CFLAGS ${CFLAGS## }" +#LDFLAGS="$XML2_LIBS ${LDFLAGS## }" +#]) + AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) --- libidmef-1.0.2/include/Makefile.am.bak 2009-08-11 16:21:46.000000000 +0200 +++ libidmef-1.0.2/include/Makefile.am 2009-08-11 16:57:00.000000000 +0200 @@ -23,18 +23,4 @@ @$(SED) -e "s|@inst_dtd_dir@|$(datadir)|" $< > $@ idmef_create.h: idmef_create.h.in ../libidmef-functions.map - @list="`$(CAT) ../libidmef-functions.map | $(SED) -e \"s|#.*||\"`"; \ - set -- $$list; \ - while test -n "$$1"; do \ - _func="$$1"; shift; \ - _element="$$1"; shift; \ - _type="$$1"; shift; \ - case "$${_type}" in \ - DOC|NODE) \ - $(ECHO) "IDMEFPtr $${_func}(IDMEFPtr first, ...);"; ;; \ - CONTENT|ATTRIBUTE) \ - $(ECHO) "IDMEFPtr $${_func}(const char *first, ...);"; ;; \ - esac; \ - done | \ - $(AWK) "/@input@/ {while(getline <\"/dev/stdin\") print \$$0} {print}" \ - $< > $@; + perl ./gen.pl --- libidmef-1.0.2/include/gen.pl.bak 1970-01-01 01:00:00.000000000 +0100 +++ libidmef-1.0.2/include/gen.pl 2009-08-11 17:22:31.000000000 +0200 @@ -0,0 +1,44 @@ +#!/usr/bin/perl + +open FIN , "< idmef_create.h.in" || exit 1; +open FOUT, "> idmef_create.h" || exit 1; + +while(<FIN>) +{ + unless(/\@input\@/) + { + print FOUT; + next; + } + + open FD, "< ../libidmef-functions.map" || exit 1; + while(<FD>) + { + next if /^#/; + + if(/([\d\w_-]+)\s+([\d\w_-]+)\s+([\d\w_-]+)/) + { + $func = $1; + $elem = $2; + $type = $3; + } + else + { + next + } + + if($type =~ /DOC/ || $type =~ /NODE/) + { + print FOUT "IDMEFPtr $func(IDMEFPtr first, ...);\n" + } + elsif($type =~ /CONTENT/ || $type =~ /ATTRIBUTE/) + { + print FOUT "IDMEFPtr $func(const char *first, ...);\n" + } + } + close FD; +} +close FIN; +close FOUT; + +0; --- libidmef-1.0.2/configure.in.bak 2009-08-12 13:07:52.000000000 +0200 +++ libidmef-1.0.2/configure.in 2009-08-12 13:08:21.000000000 +0200 @@ -35,7 +35,7 @@ LIBIDMEF_MAJOR_VERSION=1 LIBIDMEF_MINOR_VERSION=0 LIBIDMEF_MICRO_VERSION=2 -LIBIDMEF_TAG_VERSION=beta2 +LIBIDMEF_TAG_VERSION= LIBIDMEF_VERSION=$LIBIDMEF_MAJOR_VERSION.$LIBIDMEF_MINOR_VERSION.$LIBIDMEF_MICRO_VERSION LIBIDMEF_VERSION_INFO=`expr $LIBIDMEF_MAJOR_VERSION + $LIBIDMEF_MINOR_VERSION`:$LIBIDMEF_MICRO_VERSION:$LIBIDMEF_MINOR_VERSION LIBIDMEF_VERSION_NUMBER=`expr $LIBIDMEF_MAJOR_VERSION \* 10000 + $LIBIDMEF_MINOR_VERSION \* 100 + $LIBIDMEF_MICRO_VERSION` ++++++ libidmef-1.0.2_parser_fatal_error_handling.diff ++++++ ++++ 3141 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org