OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Mar-2009 10:39:12
Branch: HEAD Handle: 2009032709391100
Modified files:
openpkg-src/bochs bochs.patch bochs.spec
Log:
upgrading package: bochs 2.2.6 -> 2.3.7
Summary:
Revision Changes Path
1.12 +7 -43 openpkg-src/bochs/bochs.patch
1.57 +2 -6 openpkg-src/bochs/bochs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 bochs.patch
--- openpkg-src/bochs/bochs.patch 14 Jun 2006 19:33:29 -0000 1.11
+++ openpkg-src/bochs/bochs.patch 27 Mar 2009 09:39:11 -0000 1.12
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2005-07-06 22:28:23 +0200
-+++ Makefile.in 2005-07-09 22:18:29 +0200
-@@ -101,7 +101,7 @@
+--- Makefile.in.orig 2008-06-01 18:48:13 +0200
++++ Makefile.in 2009-03-27 10:23:04 +0100
+@@ -102,7 +102,7 @@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
XPM_LIB = @XPM_LIB@
@@ -11,27 +11,9 @@
GUI_LINK_OPTS_SVGA = -lvga -lvgagl
GUI_LINK_OPTS_BEOS = -lbe
Index: iodev/eth_vde.cc
---- iodev/eth_vde.cc.orig 2005-12-10 19:37:35 +0100
-+++ iodev/eth_vde.cc 2006-03-10 10:04:14 +0100
-@@ -41,13 +41,17 @@
- #include <sys/poll.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#if defined(__linux__)
- #include <asm/types.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/uio.h>
- #include <sys/wait.h>
- #include <sys/un.h>
-+#if defined(__linux__)
- #include <linux/netlink.h>
- #include <linux/if.h>
-+#endif
- #include <assert.h>
- #include <fcntl.h>
- #include <errno.h>
-@@ -111,6 +115,9 @@
+--- iodev/eth_vde.cc.orig 2008-02-15 23:05:42 +0100
++++ iodev/eth_vde.cc 2009-03-27 10:23:04 +0100
+@@ -117,6 +117,9 @@
//if (strncmp (netif, "vde", 3) != 0) {
// BX_PANIC (("eth_vde: interface name (%s) must be vde", netif));
//}
@@ -39,23 +21,5 @@
+#define IFNAMSIZ 1024
+#endif
char intname[IFNAMSIZ];
- if (netif == NULL || strcmp(netif,"") == 0)
+ if (netif == NULL || strcmp(netif,"") == 0)
strcpy(intname,"/tmp/vde.ctl");
-Index: iodev/hdimage.h
---- iodev/hdimage.h.orig 2005-11-06 12:07:01 +0100
-+++ iodev/hdimage.h 2006-06-14 21:29:22 +0200
-@@ -273,14 +273,8 @@
-
- void panic(const char * message);
- off_t
--#ifndef PARANOID
-- sparse_image_t::
--#endif
- get_physical_offset();
- void
--#ifndef PARANOID
-- sparse_image_t::
--#endif
- set_virtual_page(Bit32u new_virtual_page);
- void read_header();
- ssize_t read_page_fragment(Bit32u read_virtual_page, Bit32u
read_page_offset, size_t read_size, void * buf);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
============================================================================
$ cvs diff -u -r1.56 -r1.57 bochs.spec
--- openpkg-src/bochs/bochs.spec 1 Jan 2008 14:51:26 -0000 1.56
+++ openpkg-src/bochs/bochs.spec 27 Mar 2009 09:39:11 -0000 1.57
@@ -31,8 +31,8 @@
Class: EVAL
Group: Emulator
License: LGPL
-Version: 2.2.6
-Release: 20080101
+Version: 2.3.7
+Release: 20090327
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ -123,10 +123,6 @@
# perform standard installation procedure
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- # post-adjust manual pages
- rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/bochs-dlx.1.gz
- %{l_gzip} -d $RPM_BUILD_ROOT%{l_prefix}/man/man*/*.gz
-
# provide configuration file
mv $RPM_BUILD_ROOT%{l_prefix}/share/doc/bochs/bochsrc-sample.txt \
$RPM_BUILD_ROOT%{l_prefix}/etc/bochs/bochsrc.sample
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
