packages: slirp/slirp.spec, slirp/slirp-build.patch (NEW), slirp/slirp-link...

[qboosh]

Author: qboosh                       Date: Sun Jul 17 19:18:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.0.17 (using official patch)
- added build,link patches

---- Files affected:
packages/slirp:
   slirp.spec (1.31 -> 1.32) , slirp-build.patch (NONE -> 1.1)  (NEW), slirp-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/slirp/slirp.spec
diff -u packages/slirp/slirp.spec:1.31 packages/slirp/slirp.spec:1.32
--- packages/slirp/slirp.spec:1.31	Sat Jan 29 01:07:22 2011
+++ packages/slirp/slirp.spec	Sun Jul 17 21:18:00 2011
@@ -2,12 +2,16 @@
 Summary:	TCP/IP emulator for a shell account
 Summary(pl.UTF-8):	Emulator TCP/IP dla kont shellowych
 Name:		slirp
-Version:	1.0.16
-Release:	0.1
-License:	distributable
+Version:	1.0.17
+Release:	1
+License:	BSD
 Group:		Networking/Utilities
-Source0:	http://dl.sourceforge.net/sourceforge/slirp/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/slirp/%{name}-1.0.16.tar.gz
 # Source0-md5:	b712f2fe58aaf87172cfd31c95fc1e31
+Source1:	http://downloads.sourceforge.net/slirp/%{name}_1_0_17_patch.tar.gz
+# Source1-md5:	3662f4b696b6103e736063a31317d6f5
+Patch0:		%{name}-build.patch
+Patch1:		%{name}-link.patch
 URL:		http://slirp.sourceforge.net/
 BuildRequires:	autoconf
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,14 +27,24 @@
 Mosaic, CUSeeMe itp.
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.0.16
+mkdir -p patch
+%{__tar} xzf %{SOURCE1} -C patch
+mv patch/README README-1.0.17
+cd src
+patch -p1 <../patch/fix17.patch
+cd ..
+%patch0 -p1
+%patch1 -p1
 
 %build
 cd src
 %{__autoconf}
 %configure
 
-%{__make}
+# avoid running mkpro, breaks pointers in args
+%{__make} \
+	MAKEPRO='touch $@'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -44,9 +58,9 @@
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README docs TODO 
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%doc COPYRIGHT ChangeLog README README-1.0.17 README.NEXT TODO docs
+%attr(755,root,root) %{_bindir}/slirp
+%{_mandir}/man1/slirp.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -54,6 +68,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2011/07/17 19:18:00  qboosh
+- updated to 1.0.17 (using official patch)
+- added build,link patches
+
 Revision 1.31  2011/01/29 00:07:22  sparky
 - dropped pre-cvs changelog
 
@@ -125,7 +143,6 @@
 - fixed bogus Group: field
 
 Revision 1.10  1999/07/15 18:50:00  kloczek
-
 - cosmetic changes.
 
 Revision 1.9  1999/07/14 15:10:03  baggins
@@ -133,5 +150,4 @@
 - gzip instead of bzip2
 
 Revision 1.8  1999/07/12 23:06:14  kloczek
-
 - added using CVS keywords in %changelog (for automating them).

================================================================
Index: packages/slirp/slirp-build.patch
diff -u /dev/null packages/slirp/slirp-build.patch:1.1
--- /dev/null	Sun Jul 17 21:18:06 2011
+++ packages/slirp/slirp-build.patch	Sun Jul 17 21:18:00 2011
@@ -0,0 +1,20 @@
+--- slirp-1.0.16/src/mbuf.h.orig	2004-09-01 09:36:45.000000000 +0200
++++ slirp-1.0.16/src/mbuf.h	2011-07-17 17:54:49.496334690 +0200
+@@ -132,6 +132,6 @@ struct mbstat {
+ extern struct	mbstat mbstat;
+ extern int mbuf_alloced;
+ extern struct mbuf m_freelist, m_usedlist;
+-extern mbuf_max;
++extern int mbuf_max;
+ 
+ #endif
+--- slirp-1.0.16/src/ppp.c.orig	2004-09-01 09:36:44.000000000 +0200
++++ slirp-1.0.16/src/ppp.c	2011-07-17 19:37:30.736540990 +0200
+@@ -33,6 +33,7 @@
+  */
+ 
+ #include <config.h>
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>

================================================================
Index: packages/slirp/slirp-link.patch
diff -u /dev/null packages/slirp/slirp-link.patch:1.1
--- /dev/null	Sun Jul 17 21:18:06 2011
+++ packages/slirp/slirp-link.patch	Sun Jul 17 21:18:00 2011
@@ -0,0 +1,14 @@
+--- slirp-1.0.16/src/configure.in.orig	2004-09-01 11:58:50.000000000 +0200
++++ slirp-1.0.16/src/configure.in	2011-07-17 21:06:58.266720716 +0200
+@@ -169,10 +169,7 @@
+ dnl -
+ dnl - Check for libraries
+ dnl -
+-AC_CHECK_LIB(nsl, main)
+-AC_CHECK_LIB(socket, main)
+-AC_CHECK_LIB(posix, main)
+-AC_CHECK_LIB(crypt, main)
++AC_SEARCH_LIBS(crypt, crypt)
+ 
+ dnl -
+ dnl - Check for unix domain sockets
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/slirp/slirp.spec?r1=1.31&r2=1.32&f=u