diff --git a/.cvsignore b/.cvsignore index c5c51f2..c49ef97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lksctp-tools-1.0.2.tar.gz +lksctp-tools-1.0.5.tar.gz diff --git a/lksctp-tools-1.0.5-syntax.patch b/lksctp-tools-1.0.5-syntax.patch new file mode 100644 index 0000000..7caf7a7 --- /dev/null +++ b/lksctp-tools-1.0.5-syntax.patch @@ -0,0 +1,42 @@ +diff -urN lksctp-tools-1.0.5.orig/src/apps/sctp_test.c lksctp-tools-1.0.5/src/apps/sctp_test.c +--- lksctp-tools-1.0.5.orig/src/apps/sctp_test.c 2006-01-04 14:06:22.000000000 -0500 ++++ lksctp-tools-1.0.5/src/apps/sctp_test.c 2006-01-24 01:13:09.000000000 -0500 +@@ -72,7 +72,7 @@ + #define REPEAT 10 + #define BIG_REPEAT 1000000 + #define MAX_BIND_RETRYS 10 +-#define BODYSIZE 10 ++#define BODYSIZE 11 + #define MSG_CNT 10 /* If this is changed the msg_sizes array + needs to be modified accordingly. */ + +@@ -325,7 +325,7 @@ + DEBUG_PRINT(DEBUG_MIN, "Data %d bytes.", msg_len); + + DEBUG_PRINT(DEBUG_MAX, " First %d bytes: ", +- (msg_len < BODYSIZE)?msg_len:BODYSIZE); ++ (msg_len < (BODYSIZE - 1))?msg_len:(BODYSIZE - 1)); + /* Make sure that everything is printable and that we + * are NUL terminated... + */ +@@ -355,7 +355,7 @@ + if (!isprint(text[i])) text[i] = '.'; + } + +- strncpy(tmptext, text, BODYSIZE); ++ strncpy(tmptext, text, (BODYSIZE - 1)); + tmptext[BODYSIZE-1] = '\0'; + + DEBUG_PRINT(DEBUG_MAX, "%s", tmptext); +diff -urN lksctp-tools-1.0.5.orig/src/func_tests/test_basic.c lksctp-tools-1.0.5/src/func_tests/test_basic.c +--- lksctp-tools-1.0.5.orig/src/func_tests/test_basic.c 2006-01-04 14:06:22.000000000 -0500 ++++ lksctp-tools-1.0.5/src/func_tests/test_basic.c 2006-01-24 01:14:09.000000000 -0500 +@@ -82,7 +82,7 @@ + int pf_class; + uint32_t ppid; + uint32_t stream; +- sctp_assoc_t associd1, associd2; ++ sctp_assoc_t associd1 = NULL, associd2; + struct sctp_assoc_change *sac; + char *big_buffer; + struct sockaddr *laddrs, *paddrs; diff --git a/lksctp-tools.spec b/lksctp-tools.spec index 5b582a5..054e768 100644 --- a/lksctp-tools.spec +++ b/lksctp-tools.spec @@ -1,25 +1,20 @@ -%define lksctp_version 1.0.2 - -%define file_version %{lksctp_version} - Summary: User-space access to Linux Kernel SCTP Name: lksctp-tools -Version: %{lksctp_version} -Release: 5.1 +Version: 1.0.5 +Release: 0.fc5 License: LGPL Group: System Environment/Libraries -URL: http://lksctp.sourceforge.net -Source0: %{name}-%{file_version}.tar.gz -Patch0 : lksctp-tools-1.0.2-syntax.patch +URL: http://lksctp.sourceforge.net/ +Source: http://dl.sf.net/lksctp/lksctp-tools-%{version}.tar.gz +Patch0: lksctp-tools-1.0.5-syntax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: gcc #BuildRequires: tetex, tetex-latex, tetex-xdvi, tetex-dvips #BuildRequires: ghostscript, enscript BuildRequires: libtool, automake, autoconf %description -This is the lksctp-tools package for Linux Kernel SCTP Reference -Implementation. +This is the lksctp-tools package for Linux Kernel SCTP (Stream Control +Transmission Protocol) Reference Implementation. This package is intended to supplement the Linux Kernel SCTP Reference Implementation now available in the Linux kernel source tree in @@ -27,22 +22,16 @@ versions 2.5.36 and following. For more information on LKSCTP see the package documentation README file, section titled "LKSCTP - Linux Kernel SCTP." -This package contains the base run-time library & command-line tools. +This package contains the base run-time library and command-line tools. %package devel -Summary: Development kit for lksctp-tools +Summary: Development files for lksctp-tools Group: Development/Libraries Requires: %{name} = %{version} -Requires: glibc-devel %description devel -Development kit for lksctp-tools - -- Man pages -- Header files -- Static libraries -- Symlinks to dynamic libraries -- Tutorial source code +Development files for lksctp-tools which include man pages, header files, +static libraries, symlinks to dynamic libraries and some tutorial source code. %package doc Summary: Documents pertaining to SCTP @@ -50,15 +39,16 @@ Group: System Environment/Libraries Requires: %{name} = %{version} %description doc -Documents pertaining to LKSCTP & SCTP in general -- IETF RFC's & Internet Drafts +Documents pertaining to LKSCTP & SCTP in general (IETF RFC's & Internet +Drafts). %prep -%setup -q -n %{name}-%{file_version} +%setup -q %patch0 -p1 %build -%configure --enable-shared --enable-static +[ ! -x ./configure ] && sh bootstrap +%configure make %install @@ -68,35 +58,49 @@ make install DESTDIR="$RPM_BUILD_ROOT" %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog COPYING.lib README +%defattr(-,root,root,0755) +%doc AUTHORS ChangeLog COPYING* README %{_bindir}/* %{_libdir}/libsctp.so.* -%{_libdir}/lksctp-tools/* +%dir %{_libdir}/lksctp-tools/ +%{_libdir}/lksctp-tools/libwithsctp.so.* +%{_mandir}/man7/* %files devel -%defattr(-,root,root,-) -%{_includedir} -%{_libdir}/libsctp.so +%defattr(-,root,root,0755) +%{_includedir}/* %{_libdir}/libsctp.a -%{_libdir}/libsctp.la -%{_datadir}/lksctp-tools/* -%{_mandir}/* +%exclude %{_libdir}/libsctp.la +%{_libdir}/libsctp.so +%dir %{_libdir}/lksctp-tools/ +%{_libdir}/lksctp-tools/libwithsctp.a +%exclude %{_libdir}/lksctp-tools/libwithsctp.la +%{_libdir}/lksctp-tools/libwithsctp.so +%{_datadir}/lksctp-tools/ +%{_mandir}/man3/* %files doc -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc doc/*.txt %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Tue Jan 24 2006 Warren Togami 1.0.5-1 +- 1.0.5 + +* Fri Nov 11 2005 Matthias Saou 1.0.4-1 +- Update to 1.0.4. +- Update syntax patch. +- Execute bootstrap if no configure script is found. +- Don't own entire man? directories. +- Own data and lib lksctp-tools directories. +- Move devel libs in _libdir/lksctp-tools/ to devel package. +- Exclude .la files. +- Minor spec file cleanups. * Wed Mar 02 2005 Karsten Hopp 1.0.2-5 - build with gcc-4 @@ -113,13 +117,13 @@ rm -rf $RPM_BUILD_ROOT * Thu Dec 30 2004 Sridhar Samudrala 1.0.2-1 - 1.0.2 Release - + * Tue May 11 2004 Sridhar Samudrala 1.0.1-1 - 1.0.1 Release - + * Thu Feb 26 2004 Sridhar Samudrala 1.0.0-1 - 1.0.0 Release - + * Fri Feb 6 2004 Francois-Xavier Kowalski 0.9.0-1 - package only .txt doc files diff --git a/sources b/sources index b8498f9..5cfb1b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4f885e3f7edabdc6b309a01800f52c9 lksctp-tools-1.0.2.tar.gz +aa6d09d392849f5456c6fbd1ebbb525e lksctp-tools-1.0.5.tar.gz