OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Oct-2003 21:14:51
Branch: HEAD Handle: 2003102320144902
Added files:
openpkg-src/bsdiff bsdiff.patch
Modified files:
openpkg-src/bsdiff bsdiff.spec
openpkg-web news.txt
Log:
Make more portable by using an own minimalize err(3) stuff.
Submitted by: Matthias Kurz <[EMAIL PROTECTED]>
Summary:
Revision Changes Path
1.1 +44 -0 openpkg-src/bsdiff/bsdiff.patch
1.3 +7 -5 openpkg-src/bsdiff/bsdiff.spec
1.7130 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bsdiff/bsdiff.patch
============================================================================
$ cvs diff -u -r0 -r1.1 bsdiff.patch
--- /dev/null 2003-10-23 21:14:51.000000000 +0200
+++ bsdiff.patch 2003-10-23 21:14:51.000000000 +0200
@@ -0,0 +1,44 @@
+Index: err.h
+--- err.h.orig 2003-10-23 21:12:13.000000000 +0200
++++ err.h 2003-10-23 21:13:10.000000000 +0200
+@@ -0,0 +1,10 @@
++#ifndef __ERR_H__
++#define __ERR_H__
++
++#include <stdio.h>
++#include <stdlib.h>
++
++#define err(bla, ...) { fprintf(stderr, __VA_ARGS__); abort(); }
++#define errx(bla, ...) { fprintf(stderr, __VA_ARGS__); abort(); }
++
++#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>
+ #include <stdio.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 @@
+
+ #include <stdlib.h>
+ #include <stdio.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)
+ {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bsdiff/bsdiff.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 bsdiff.spec
--- openpkg-src/bsdiff/bsdiff.spec 20 Oct 2003 05:32:41 -0000 1.2
+++ openpkg-src/bsdiff/bsdiff.spec 23 Oct 2003 19:14:51 -0000 1.3
@@ -33,10 +33,11 @@
Group: Utility
License: BSD Protection License
Version: 4.1
-Release: 20031020
+Release: 20031023
# list of sources
Source0: http://www.daemonology.net/bsdiff/bsdiff-%{version}.tar.gz
+Patch0: bsdiff.patch
# build information
Prefix: %{l_prefix}
@@ -56,13 +57,14 @@
%prep
%setup -q
-
-%build
+ %patch -p0
%{l_shtool} subst \
-e 's;/usr/bin/bzip2;%{l_prefix}/bin/bzip2;g' \
bsdiff.c bspatch.c
- %{l_cc} %{l_cflags -O} -o bsdiff bsdiff.c
- %{l_cc} %{l_cflags -O} -o bspatch bspatch.c
+
+%build
+ %{l_cc} %{l_cflags -O} -I. -o bsdiff bsdiff.c
+ %{l_cc} %{l_cflags -O} -I. -o bspatch bspatch.c
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7129 -r1.7130 news.txt
--- openpkg-web/news.txt 23 Oct 2003 19:07:16 -0000 1.7129
+++ openpkg-web/news.txt 23 Oct 2003 19:14:49 -0000 1.7130
@@ -1,3 +1,4 @@
+23-Oct-2003: Upgraded package: P<bsdiff-4.1-20031023>
23-Oct-2003: Upgraded package: P<tcpdump-3.7.2-20031023>
23-Oct-2003: Upgraded package: P<coreutils-4.5.4-1.2.1>
23-Oct-2003: Upgraded package: P<coreutils-5.0.1-1.3.2>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
