Hello community,
here is the log from the commit of package lksctp-tools for openSUSE:Factory checked in at 2013-08-04 20:40:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lksctp-tools (Old)
and /work/SRC/openSUSE:Factory/.lksctp-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lksctp-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lksctp-tools/lksctp-tools.changes 2013-01-29 06:59:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lksctp-tools.new/lksctp-tools.changes 2013-08-04 23:52:29.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Aug 1 19:49:35 UTC 2013 - andreas.stieger@gmx.de
+
+- upgrade to 1.0.15
+ * withsctp: fix quoted command line arguments
+ * sctp_status: fix printstatus output
+ * do not returns an error if AM_SILENT_RULES does not exist
+- include changes from 1.0.14
+ * build: only use AM_CPPFLAGS instead of a mixture of AM_CFLAGS and AM_CPPFLAGS
+ * test_sctp_sendrecvmsg: fix bug in msg_flag passing
+ * build: fix out-of-tree build of withsctp.
+ * test_1_to_1_threads: fixup pthread hung by giving an array instead of a pointer
+ * test_1_to_1_threads: remove unused variable for t_recv and t_send
+ * sctp: Add new spinfo state values to enumeration
+ * build: Modernize autotools
+
+-------------------------------------------------------------------
Old:
----
lksctp-tools-1.0.13.tar.gz
New:
----
lksctp-tools-1.0.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lksctp-tools.spec ++++++
--- /var/tmp/diff_new_pack.yxRWvX/_old 2013-08-04 23:52:29.000000000 +0200
+++ /var/tmp/diff_new_pack.yxRWvX/_new 2013-08-04 23:52:29.000000000 +0200
@@ -20,7 +20,7 @@
Summary: Utilities for SCTP (Stream Control Transmission Protocol)
License: LGPL-2.1+
Group: Productivity/Networking/Other
-Version: 1.0.13
+Version: 1.0.15
Release: 0
Url: http://lksctp.sourceforge.net
Source0: http://downloads.sourceforge.net/project/lksctp/lksctp-tools/%{name}-%{version}.tar.gz
@@ -55,7 +55,7 @@
%patch0 -p1
%build
-autoreconf --force --install
+./bootstrap
CPPFLAGS="-I`pwd`/include" \
%configure --prefix=/usr \
--enable-shared \
++++++ lksctp-tools-1.0.13.tar.gz -> lksctp-tools-1.0.15.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/ChangeLog new/lksctp-tools-1.0.15/ChangeLog
--- old/lksctp-tools-1.0.13/ChangeLog 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/ChangeLog 2013-05-12 11:06:13.000000000 +0200
@@ -1,8 +1,18 @@
-Version 1.0.13 of the Developers' Release of the SCTP
+Version 1.0.15 of the Developers' Release of the SCTP
Linux Kernel Implementation is available from
http://www.kernel.org
+lksctp-1.0.15: Sun May 12 11:01 EDT 2013
+T:BUILD Allow build with no AM_SILENT_RULES support
+T:APP Fix sctp_status
+T:APP Fix quoted command line arguments
+
+lksctp-1.0.14: Wed Apr 05 11:54 EDT 2013
+T:BUILD Modernize and fix autotool's build system
+T:TEST Fix threading test
+T:TEST Zero out flags in sendrecvmsg test
+T:HDR Sync header with the kernel
lksctp-1.0.13: Wed Jan 23 12:13 EDT 2013
T:BUILD Use silent rules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/Makefile.am new/lksctp-tools-1.0.15/Makefile.am
--- old/lksctp-tools-1.0.13/Makefile.am 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/Makefile.am 2013-05-12 11:06:13.000000000 +0200
@@ -12,6 +12,8 @@
# bin or src products may be required to generate stuff in test/
SUBDIRS = man bin src doc
+ACLOCAL_AMFLAGS=-I m4
+
# Libtool support
LIBTOOL_DEPS = @LIBTOOL_DEPS@
libtool: $(LIBTOOL_DEPS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/configure.ac new/lksctp-tools-1.0.15/configure.ac
--- old/lksctp-tools-1.0.13/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ new/lksctp-tools-1.0.15/configure.ac 2013-05-12 11:06:13.000000000 +0200
@@ -0,0 +1,76 @@
+dnl -*-autoconf-*-
+
+dnl lksctp-tools: Autoconf script
+dnl
+dnl $Id: configure.in,v 1.1.1.2 2002/08/06 23:55:45 inaky Exp $
+
+dnl (C) 2002 Intel Corporation
+dnl I�aky P�rez-Gonz�lez
+dnl - Initial packaging
+
+dnl Package info
+dnl (CONFIG_AUX_DIR is for putting stuff in $TOPSRCDIR/bin, so we
+dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE,
+dnl configure will fail ...)
+
+AC_INIT([lksctp-tools], [1.0.15], [], [], [http://www.lksctp.org/])
+AC_CONFIG_AUX_DIR(bin)
+AC_CONFIG_SRCDIR([src/apps/sctp_darn.c])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AC_REVISION($Revision: 1.1.1.2 $)
+AM_INIT_AUTOMAKE
+m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+AM_SILENT_RULES([yes])
+
+dnl Set defaults
+dnl CFLAGS="$CFLAGS -g -Wall"
+
+dnl Checks for programs.
+AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_ISC_POSIX
+
+dnl Checks for libraries.
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_STRUCT_TM
+AC_C_VOLATILE
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_REALLOC
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_SETVBUF_REVERSED
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket strchr strerror strtol strtoul])
+
+AC_CONFIG_FILES([lksctp-tools.spec
+ Makefile
+ bin/Makefile
+ man/Makefile
+ src/Makefile
+ src/apps/Makefile
+ src/func_tests/Makefile
+ src/include/Makefile
+ src/include/netinet/Makefile
+ src/lib/Makefile
+ src/testlib/Makefile
+ src/withsctp/Makefile
+ doc/Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/configure.in new/lksctp-tools-1.0.15/configure.in
--- old/lksctp-tools-1.0.13/configure.in 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/configure.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-dnl -*-autoconf-*-
-
-dnl lksctp-tools: Autoconf script
-dnl
-dnl $Id: configure.in,v 1.1.1.2 2002/08/06 23:55:45 inaky Exp $
-
-dnl (C) 2002 Intel Corporation
-dnl I�aky P�rez-Gonz�lez
-dnl - Initial packaging
-
-dnl Package info
-dnl (CONFIG_AUX_DIR is for putting stuff in $TOPSRCDIR/bin, so we
-dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE,
-dnl configure will fail ...)
-
-AC_INIT([src/apps/sctp_darn.c])
-AC_CONFIG_AUX_DIR(bin)
-AM_INIT_AUTOMAKE(lksctp-tools,1.0.13)
-AC_CONFIG_SRCDIR([config.h.in])
-AM_CONFIG_HEADER([config.h])
-AC_REVISION($Revision: 1.1.1.2 $)
-AM_SILENT_RULES([yes])
-
-dnl Set defaults
-dnl CFLAGS="$CFLAGS -g -Wall"
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_ISC_POSIX
-
-dnl Checks for libraries.
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_C_VOLATILE
-
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_REALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_SETVBUF_REVERSED
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket strchr strerror strtol strtoul])
-
-AC_CONFIG_FILES([lksctp-tools.spec
- Makefile
- bin/Makefile
- man/Makefile
- src/Makefile
- src/apps/Makefile
- src/func_tests/Makefile
- src/include/Makefile
- src/include/netinet/Makefile
- src/lib/Makefile
- src/testlib/Makefile
- src/withsctp/Makefile
- doc/Makefile])
-AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/lksctp-tools.spec.in new/lksctp-tools-1.0.15/lksctp-tools.spec.in
--- old/lksctp-tools-1.0.13/lksctp-tools.spec.in 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/lksctp-tools.spec.in 2013-05-12 11:06:13.000000000 +0200
@@ -124,6 +124,12 @@
%doc doc/*.txt
%changelog
+* Sun May 12 2013 Daniel Borkmann 1.0.15-1
+- 1.0.15 Release
+
+* Wed Apr 05 2013 Daniel Borkmann 1.0.14-1
+- 1.0.14 Release
+
* Wed Jan 23 2013 Daniel Borkmann 1.0.13-1
- 1.0.13 Release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/apps/Makefile.am new/lksctp-tools-1.0.15/src/apps/Makefile.am
--- old/lksctp-tools-1.0.13/src/apps/Makefile.am 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/apps/Makefile.am 2013-05-12 11:06:13.000000000 +0200
@@ -1,13 +1,15 @@
# Include these two in all the Makefile.am's!!!
include $(top_srcdir)/Makefile.vars
include $(top_srcdir)/Makefile.rules
-
include $(top_srcdir)/Makefile.dirs
# General compilation flags
-INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib
-AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration
+AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib \
+ -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes \
+ -Wimplicit-function-declaration
+
AM_LDFLAGS =
+
LDADD = $(top_builddir)/src/testlib/libsctputil.la \
$(top_builddir)/src/lib/libsctp.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/apps/sctp_status.c new/lksctp-tools-1.0.15/src/apps/sctp_status.c
--- old/lksctp-tools-1.0.13/src/apps/sctp_status.c 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/apps/sctp_status.c 2013-05-12 11:06:13.000000000 +0200
@@ -860,6 +860,12 @@
struct sctp_status status;
socklen_t optlen;
FILE * fp;
+ const char *state_to_str[] = {
+ [SCTP_INACTIVE] = "INACTIVE",
+ [SCTP_PF] = "PF",
+ [SCTP_ACTIVE] = "ACTIVE",
+ [SCTP_UNCONFIRMED] = "UNCONFIRMED",
+ };
optlen = sizeof(struct sctp_status);
if(getsockopt(sk, IPPROTO_SCTP, SCTP_STATUS, &status, &optlen) < 0) {
@@ -889,7 +895,7 @@
status.sstat_assoc_id, get_sstat_state(status.sstat_state),
status.sstat_rwnd, status.sstat_unackdata, status.sstat_penddata,
status.sstat_instrms, status.sstat_outstrms, status.sstat_fragmentation_point,
- (status.sstat_primary.spinfo_state == 1) ? "ACTIVE" : "INACTIVE",
+ state_to_str[status.sstat_primary.spinfo_state],
status.sstat_primary.spinfo_cwnd, status.sstat_primary.spinfo_srtt,
status.sstat_primary.spinfo_rto, status.sstat_primary.spinfo_mtu);
}
@@ -901,7 +907,7 @@
if (fp != stdout)
fclose(fp);
- if (status.sstat_primary.spinfo_state != 1) {
+ if (status.sstat_primary.spinfo_state != SCTP_ACTIVE) {
close_r(sk);
exit(1);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/func_tests/Makefile.am new/lksctp-tools-1.0.15/src/func_tests/Makefile.am
--- old/lksctp-tools-1.0.13/src/func_tests/Makefile.am 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/func_tests/Makefile.am 2013-05-12 11:06:13.000000000 +0200
@@ -1,13 +1,15 @@
# Include these two in all the Makefile.am's!!!
include $(top_srcdir)/Makefile.vars
include $(top_srcdir)/Makefile.rules
-
include $(top_srcdir)/Makefile.dirs
# General compilation flags
-INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib
-AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration
+AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib \
+ -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes \
+ -Wimplicit-function-declaration
+
AM_LDFLAGS = -lpthread
+
LDADD = $(top_builddir)/src/testlib/libsctputil.la \
$(top_builddir)/src/lib/libsctp.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_threads.c new/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_threads.c
--- old/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_threads.c 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_threads.c 2013-05-12 11:06:13.000000000 +0200
@@ -64,7 +64,7 @@
char *message = "hello, world!\n";
void
-t_recv (int id) {
+t_recv(void) {
int cnt;
struct msghdr inmessage;
struct iovec iov;
@@ -87,7 +87,7 @@
}
void
-t_send(int id) {
+t_send(void) {
struct msghdr outmessage;
struct sctp_sndrcvinfo *sinfo;
struct cmsghdr *cmsg;
@@ -122,12 +122,10 @@
int id = *(int *) arg;
if (id == 0) {
- t_send(id);
- } else if (id == THREADS -1) {
- t_send(id);
+ t_send();
} else {
- t_recv (id);
- t_send(id);
+ t_recv();
+ t_send();
}
pthread_exit(NULL);
@@ -138,6 +136,7 @@
{
int cnt,i;
+ int pth[THREADS];
pthread_t thread[THREADS];
int status;
int exit_status;
@@ -171,8 +170,9 @@
acpt_sk = test_accept(server_sk, (struct sockaddr *)&svr_addr, &len);
for ( i = 0; i < THREAD_SND_RCV_LOOPS; i++ ) {
- for (cnt = 1; cnt < THREADS; cnt++) {
- status = pthread_create(&thread[cnt], &attr, relay, &cnt);
+ for (cnt = 0; cnt < THREADS; cnt++) {
+ pth[cnt] = cnt;
+ status = pthread_create(&thread[cnt], &attr, relay, &pth[cnt]);
if (status)
tst_brkm(TBROK, tst_exit, "pthread_create "
"failed status:%d, errno:%d", status,
@@ -180,7 +180,7 @@
}
pthread_attr_destroy(&attr);
- for (cnt = 1; cnt < THREADS ; cnt++) {
+ for (cnt = 0; cnt < THREADS ; cnt++) {
exit_status = pthread_join (thread[cnt], &result);
if (exit_status == -1)
tst_brkm(TBROK, tst_exit, "pthread_join "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/func_tests/test_sctp_sendrecvmsg.c new/lksctp-tools-1.0.15/src/func_tests/test_sctp_sendrecvmsg.c
--- old/lksctp-tools-1.0.13/src/func_tests/test_sctp_sendrecvmsg.c 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/func_tests/test_sctp_sendrecvmsg.c 2013-05-12 11:06:13.000000000 +0200
@@ -175,6 +175,7 @@
buflen = REALLY_BIG;
big_buffer = test_malloc(buflen);
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk2, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -197,6 +198,7 @@
/* Get the communication up message on sk1. */
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk1, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -210,6 +212,7 @@
/* Get the first message which was sent. */
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk2, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -271,6 +274,7 @@
do {
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
test_sctp_recvmsg(sk2, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -279,6 +283,7 @@
/* Get the message that did NOT time out. */
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk2, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -294,6 +299,7 @@
*/
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk1, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -315,6 +321,7 @@
do {
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk1, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -342,6 +349,7 @@
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk2, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
@@ -357,6 +365,7 @@
/* Get the shutdown complete notification. */
buflen = REALLY_BIG;
msgname_len = sizeof(msgname);
+ msg_flags = 0;
error = test_sctp_recvmsg(sk2, big_buffer, buflen,
(struct sockaddr *)&msgname, &msgname_len,
&sinfo, &msg_flags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/include/netinet/sctp.h new/lksctp-tools-1.0.15/src/include/netinet/sctp.h
--- old/lksctp-tools-1.0.13/src/include/netinet/sctp.h 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/include/netinet/sctp.h 2013-05-12 11:06:13.000000000 +0200
@@ -676,8 +676,10 @@
*/
enum sctp_spinfo_state {
SCTP_INACTIVE,
+ SCTP_PF,
SCTP_ACTIVE,
- SCTP_UNCONFIRMED
+ SCTP_UNCONFIRMED,
+ SCTP_UNKNOWN = 0xffff
};
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/lib/Makefile.am new/lksctp-tools-1.0.15/src/lib/Makefile.am
--- old/lksctp-tools-1.0.13/src/lib/Makefile.am 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/lib/Makefile.am 2013-05-12 11:06:13.000000000 +0200
@@ -1,12 +1,12 @@
# Include these two in all the Makefile.am's!!!
include $(top_srcdir)/Makefile.vars
include $(top_srcdir)/Makefile.rules
-
include $(top_srcdir)/Makefile.dirs
# General compilation flags
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
lib_LTLIBRARIES = libsctp.la
+
libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c addrs.c sendmsg.c recvmsg.c Versions.map
-libsctp_la_LDFLAGS = -version-info 1:13:0 -Wl,--version-script=$(srcdir)/Versions.map
+libsctp_la_LDFLAGS = -version-info 1:15:0 -Wl,--version-script=$(srcdir)/Versions.map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/testlib/Makefile.am new/lksctp-tools-1.0.15/src/testlib/Makefile.am
--- old/lksctp-tools-1.0.13/src/testlib/Makefile.am 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/testlib/Makefile.am 2013-05-12 11:06:13.000000000 +0200
@@ -5,7 +5,7 @@
include $(top_srcdir)/Makefile.dirs
# General compilation flags
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
noinst_LTLIBRARIES = libsctputil.la
libsctputil_la_SOURCES = sctputil.c sctputil.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/withsctp/Makefile.am new/lksctp-tools-1.0.15/src/withsctp/Makefile.am
--- old/lksctp-tools-1.0.13/src/withsctp/Makefile.am 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/withsctp/Makefile.am 2013-05-12 11:06:13.000000000 +0200
@@ -10,11 +10,11 @@
bin_PROGRAMS = checksctp
bin_SCRIPTS = withsctp
-AM_CPPFLAGS=-I../include
+AM_CPPFLAGS=-I$(top_srcdir)/src/include
pkglib_LTLIBRARIES = libwithsctp.la
libwithsctp_la_SOURCES = sctp_load_libs.c sctp_socket.c sctp_bind.c \
sctp_sockopt.c sctp_socket.h
-libwithsctp_la_LDFLAGS = -version-info 1:13:0 -ldl
+libwithsctp_la_LDFLAGS = -version-info 1:15:0 -ldl
pkgdoc_DATA = sctp_load_libs.c sctp_socket.c sctp_bind.c \
sctp_sockopt.c sctp_socket.h checksctp.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.13/src/withsctp/withsctp.in new/lksctp-tools-1.0.15/src/withsctp/withsctp.in
--- old/lksctp-tools-1.0.13/src/withsctp/withsctp.in 2013-01-23 15:27:55.000000000 +0100
+++ new/lksctp-tools-1.0.15/src/withsctp/withsctp.in 2013-05-12 11:06:13.000000000 +0200
@@ -2,11 +2,11 @@
# -*- sh -*-
LIBDIR=@libdir@/@PACKAGE@
BINDIR=@bindir@
-export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.13
+export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.15
if ! ${BINDIR}/checksctp 2> /dev/null
then
${BINDIR}/checksctp;
exit 1;
fi
-exec $*
+exec "$@"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org