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: 24-Jan-2004 21:55:31
Branch: HEAD Handle: 2004012420552902
Added files:
openpkg-src/pv pv.patch
Modified files:
openpkg-src/pv pv.spec
openpkg-web news.txt
Log:
try to fix building
Summary:
Revision Changes Path
1.1 +101 -0 openpkg-src/pv/pv.patch
1.12 +3 -1 openpkg-src/pv/pv.spec
1.8222 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pv/pv.patch
============================================================================
$ cvs diff -u -r0 -r1.1 pv.patch
--- /dev/null 2004-01-24 21:55:31.000000000 +0100
+++ pv.patch 2004-01-24 21:55:31.000000000 +0100
@@ -0,0 +1,101 @@
+Index: src/main/file.c
+--- src/main/file.c.orig Wed Jan 14 20:10:51 2004
++++ src/main/file.c Sat Jan 24 21:51:55 2004
+@@ -27,20 +27,20 @@
+ */
+ void main_getsize(opts_t options)
+ {
+- struct stat64 sb;
++ struct stat sb;
+ int i, fd;
+
+ options->size = 0;
+
+ if (options->argc < 1) {
+- if (fstat64(STDIN_FILENO, &sb) == 0)
++ if (fstat(STDIN_FILENO, &sb) == 0)
+ options->size = sb.st_size;
+ return;
+ }
+
+ for (i = 0; i < options->argc; i++) {
+ if (strcmp(options->argv[i], "-") == 0) {
+- if (fstat64(STDIN_FILENO, &sb) == 0) {
++ if (fstat(STDIN_FILENO, &sb) == 0) {
+ options->size = sb.st_size;
+ } else {
+ options->size = 0;
+@@ -48,11 +48,11 @@
+ }
+ }
+
+- if (stat64(options->argv[i], &sb) == 0) {
++ if (stat(options->argv[i], &sb) == 0) {
+ if (S_ISBLK(sb.st_mode)) {
+- fd = open64(options->argv[i], O_RDONLY);
++ fd = open(options->argv[i], O_RDONLY);
+ if (fd >= 0) {
+- options->size += lseek64(fd, 0, SEEK_END);
++ options->size += lseek(fd, 0, SEEK_END);
+ close(fd);
+ }
+ } else {
+@@ -70,8 +70,8 @@
+ */
+ int main_nextfd(opts_t options, int filenum, int oldfd)
+ {
+- struct stat64 isb;
+- struct stat64 osb;
++ struct stat isb;
++ struct stat osb;
+ int fd;
+
+ if (oldfd > 0) {
+@@ -91,7 +91,7 @@
+ return STDIN_FILENO;
+ }
+
+- fd = open64(options->argv[filenum], O_RDONLY);
++ fd = open(options->argv[filenum], O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr, "%s: %s: %s: %s\n",
+ options->program_name,
+@@ -101,7 +101,7 @@
+ return -1;
+ }
+
+- if (fstat64(fd, &isb)) {
++ if (fstat(fd, &isb)) {
+ fprintf(stderr, "%s: %s: %s: %s\n",
+ options->program_name,
+ _("failed to stat file"),
+@@ -111,7 +111,7 @@
+ return -1;
+ }
+
+- if (fstat64(STDOUT_FILENO, &osb)) {
++ if (fstat(STDOUT_FILENO, &osb)) {
+ fprintf(stderr, "%s: %s: %s\n",
+ options->program_name,
+ _("failed to stat output file"),
+Index: src/main/main.c
+--- src/main/main.c.orig Wed Jan 14 20:10:42 2004
++++ src/main/main.c Sat Jan 24 21:52:10 2004
+@@ -65,7 +65,7 @@
+ struct timeval start_time, next_update, next_reset, cur_time;
+ struct timeval init_time;
+ long double elapsed, tilreset;
+- struct stat64 sb;
++ struct stat sb;
+ int fd, n;
+
+ fd = -1;
+@@ -102,7 +102,7 @@
+ fd = main_nextfd(options, n, -1);
+ if (fd < 0)
+ return 1;
+- if (fstat64(fd, &sb) == 0) {
++ if (fstat(fd, &sb) == 0) {
+ main_transfer_bufsize (sb.st_blksize * 32);
+ }
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pv/pv.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 pv.spec
--- openpkg-src/pv/pv.spec 23 Jan 2004 13:13:15 -0000 1.11
+++ openpkg-src/pv/pv.spec 24 Jan 2004 20:55:31 -0000 1.12
@@ -33,10 +33,11 @@
Group: System
License: GPL
Version: 0.6.4
-Release: 20040116
+Release: 20040124
# list of sources
Source0: http://osdn.dl.sourceforge.net/pipeviewer/pv-%{version}.tar.gz
+Patch0: pv.patch
# build information
Prefix: %{l_prefix}
@@ -56,6 +57,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8221 -r1.8222 news.txt
--- openpkg-web/news.txt 24 Jan 2004 20:48:15 -0000 1.8221
+++ openpkg-web/news.txt 24 Jan 2004 20:55:29 -0000 1.8222
@@ -1,3 +1,4 @@
+24-Jan-2004: Upgraded package: P<pv-0.6.4-20040124>
24-Jan-2004: Upgraded package: P<pdnsd-1.1.9-20040124>
24-Jan-2004: Upgraded package: P<p0f-2.0.3-20040124>
24-Jan-2004: Upgraded package: P<oidentd-2.0.7-20040124>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
