Hello community,

here is the log from the commit of package ntrack for openSUSE:Factory
checked in at Mon Aug 29 10:48:25 CEST 2011.



--------
--- ntrack/ntrack.changes       2011-04-18 23:01:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntrack/ntrack.changes  2011-08-16 
13:39:26.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Aug 16 11:28:06 UTC 2011 - [email protected]
+
+- Add ntrack-link.patch, fix underlinking lp #750554 
+
+-------------------------------------------------------------------
+Mon Aug 15 14:23:17 UTC 2011 - [email protected]
+
+- Add dead-loop-fix.patch to fix bko #268038 
+
+-------------------------------------------------------------------
+Thu Aug 11 14:27:15 UTC 2011 - [email protected]
+
+- Fix build on openSUSE 11.3 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  dead-loop-fix.patch
  ntrack-link.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ntrack.spec ++++++
--- /var/tmp/diff_new_pack.9bA2YP/_old  2011-08-29 10:48:02.000000000 +0200
+++ /var/tmp/diff_new_pack.9bA2YP/_new  2011-08-29 10:48:02.000000000 +0200
@@ -24,18 +24,20 @@
 
 Name:           ntrack
 Version:        014
-Release:        1
+Release:        3
 License:        LGPLv3+
 Summary:        Network connectivity tracking library for desktop applications
 Url:            https://launchpad.net/ntrack
 Group:          System/Libraries
 Source:         ntrack-014.tar.gz
+Patch1:         dead-loop-fix.patch
+Patch2:         ntrack-link.patch
 BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(libnl-1)
 BuildRequires:  pkgconfig(pygobject-2.0)
-BuildRequires:  pkgconfig(python)
+BuildRequires:  python-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -179,6 +181,10 @@
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+mkdir m4
+autoreconf -fi
 
 %build
 %configure --disable-static \

++++++ dead-loop-fix.patch ++++++
Cherry pick from upstream (lp:ntrack rev 312)
Index: ntrack-011/modules/ntrack-libnl.c
===================================================================
--- ntrack-011.orig/modules/ntrack-libnl.c      2011-05-17 11:40:35.349643551 
-0400
+++ ntrack-011/modules/ntrack-libnl.c   2011-05-17 11:40:42.221643551 -0400
@@ -384,6 +384,9 @@
                if (rtnl_link_get_ifindex(link) > iindex)
                        break;
                i = i->next;
+
+               if (i == linklist)
+                       break;
        }
        return result;
 }
++++++ ntrack-link.patch ++++++
--- ntrack-014/modules/Makefile.am~     2011-04-03 23:14:35.000000000 +0200
+++ ntrack-014/modules/Makefile.am      2011-04-04 20:03:42.835840583 +0200
@@ -54,21 +54,21 @@
 if HAVE_LIBNL1
 ntrack_libnl1_la_SOURCES = $(ntrack_libnl_sources)
 ntrack_libnl1_la_CFLAGS = $(LIBNL1_CFLAGS) $(ntrack_libnl_cflags)
-ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS)
+ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS) $(top_builddir)/common/libntrack.la
 ntrack_libnl1_la_LDFLAGS = $(ntrack_libnl_ldflags)
 endif
 
 if HAVE_LIBNL2
 ntrack_libnl2_la_SOURCES = $(ntrack_libnl_sources)
 ntrack_libnl2_la_CFLAGS = $(LIBNL2_CFLAGS) $(ntrack_libnl_cflags)
-ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS)
+ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS) $(top_builddir)/common/libntrack.la
 ntrack_libnl2_la_LDFLAGS = $(ntrack_libnl_ldflags)
 endif
 
 if HAVE_LIBNL3
 ntrack_libnl3_la_SOURCES = $(ntrack_libnl_sources)
 ntrack_libnl3_la_CFLAGS = $(LIBNL3_CFLAGS) $(ntrack_libnl_cflags)
-ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS)
+ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS) $(top_builddir)/common/libntrack.la
 ntrack_libnl3_la_LDFLAGS = $(ntrack_libnl_ldflags)
 endif
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to