OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Aug-2005 08:24:31
Branch: HEAD Handle: 2005081707243100
Modified files:
openpkg-src/bsdiff bsdiff.patch bsdiff.spec
Log:
upgrading package: bsdiff 4.2 -> 4.3
Summary:
Revision Changes Path
1.2 +14 -13 openpkg-src/bsdiff/bsdiff.patch
1.12 +4 -7 openpkg-src/bsdiff/bsdiff.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bsdiff/bsdiff.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 bsdiff.patch
--- openpkg-src/bsdiff/bsdiff.patch 23 Oct 2003 19:14:51 -0000 1.1
+++ openpkg-src/bsdiff/bsdiff.patch 17 Aug 2005 06:24:31 -0000 1.2
@@ -13,32 +13,33 @@
+
+#endif /* __ERR_H__ */
Index: bsdiff.c
---- bsdiff.c.orig 2003-10-23 21:12:13.000000000 +0200
-+++ bsdiff.c 2003-10-23 21:12:37.000000000 +0200
-@@ -14,10 +14,10 @@
- #include <stdlib.h>
+--- bsdiff.c.orig 2005-08-17 00:13:52.000000000 +0200
++++ bsdiff.c 2005-08-17 08:08:10.970297000 +0200
+@@ -31,12 +31,12 @@
+ #include <sys/types.h>
+
+ #include <bzlib.h>
+-#include <err.h>
+ #include <fcntl.h>
#include <stdio.h>
+ #include <stdlib.h>
#include <string.h>
--#include <err.h>
#include <unistd.h>
- #include <fcntl.h>
- #include <sys/wait.h>
+#include "err.h"
#define MIN(x,y) (((x)<(y)) ? (x) : (y))
Index: bspatch.c
---- bspatch.c.orig 2003-10-23 21:12:13.000000000 +0200
-+++ bspatch.c 2003-10-23 21:12:43.000000000 +0200
-@@ -13,10 +13,10 @@
-
+--- bspatch.c.orig 2005-08-17 00:14:00.000000000 +0200
++++ bspatch.c 2005-08-17 08:08:39.136025000 +0200
+@@ -32,9 +32,9 @@
#include <stdlib.h>
#include <stdio.h>
+ #include <string.h>
-#include <err.h>
#include <unistd.h>
#include <fcntl.h>
- #include <sys/wait.h>
+#include "err.h"
- ssize_t loopread(int d,void *buf,size_t nbytes)
+ static off_t offtin(u_char *buf)
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bsdiff/bsdiff.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 bsdiff.spec
--- openpkg-src/bsdiff/bsdiff.spec 24 Mar 2005 11:18:30 -0000 1.11
+++ openpkg-src/bsdiff/bsdiff.spec 17 Aug 2005 06:24:31 -0000 1.12
@@ -32,8 +32,8 @@
Class: PLUS
Group: Utility
License: BSD Protection License
-Version: 4.2
-Release: 20040712
+Version: 4.3
+Release: 20050817
# list of sources
Source0: http://www.daemonology.net/bsdiff/bsdiff-%{version}.tar.gz
@@ -65,13 +65,10 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst \
- -e 's;/usr/bin/bzip2;%{l_prefix}/bin/bzip2;g' \
- bsdiff.c bspatch.c
%build
- %{l_cc} %{l_cflags -O} -I. -o bsdiff bsdiff.c
- %{l_cc} %{l_cflags -O} -I. -o bspatch bspatch.c
+ %{l_cc} %{l_cflags -O} -I. -o bsdiff bsdiff.c %{l_ldflags} -lbz2
+ %{l_cc} %{l_cflags -O} -I. -o bspatch bspatch.c %{l_ldflags} -lbz2
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
