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 Date: 07-Nov-2004 11:55:58
Branch: HEAD Handle: 2004110710555700
Modified files:
openpkg-src/pv pv.patch pv.spec
Log:
upgrading package: pv 0.8.6 -> 0.8.9
Summary:
Revision Changes Path
1.3 +41 -37 openpkg-src/pv/pv.patch
1.22 +2 -2 openpkg-src/pv/pv.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pv/pv.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 pv.patch
--- openpkg-src/pv/pv.patch 13 Feb 2004 10:26:31 -0000 1.2
+++ openpkg-src/pv/pv.patch 7 Nov 2004 10:55:57 -0000 1.3
@@ -1,49 +1,53 @@
Index: src/main/file.c
---- src/main/file.c.orig 2004-02-12 23:50:35.000000000 +0100
-+++ src/main/file.c 2004-02-13 11:18:56.000000000 +0100
+--- src/main/file.c.orig 2004-11-06 22:07:05 +0100
++++ src/main/file.c 2004-11-07 11:54:34 +0100
@@ -27,20 +27,20 @@
*/
- void main_getsize(opts_t options)
+ void main_getsize(opts_t opts)
{
- struct stat64 sb;
+ struct stat sb;
int i, fd;
- options->size = 0;
+ opts->size = 0;
- if (options->argc < 1) {
+ if (opts->argc < 1) {
- if (fstat64(STDIN_FILENO, &sb) == 0)
+ if (fstat(STDIN_FILENO, &sb) == 0)
- options->size = sb.st_size;
+ opts->size = sb.st_size;
return;
}
- for (i = 0; i < options->argc; i++) {
- if (strcmp(options->argv[i], "-") == 0) {
+ for (i = 0; i < opts->argc; i++) {
+ if (strcmp(opts->argv[i], "-") == 0) {
- if (fstat64(STDIN_FILENO, &sb) == 0) {
+ if (fstat(STDIN_FILENO, &sb) == 0) {
- options->size = sb.st_size;
+ opts->size = sb.st_size;
} else {
- options->size = 0;
-@@ -48,12 +48,12 @@
+ opts->size = 0;
+@@ -48,16 +48,16 @@
}
}
-- if (stat64(options->argv[i], &sb) == 0) {
-+ if (stat(options->argv[i], &sb) == 0) {
+- if (stat64(opts->argv[i], &sb) == 0) {
++ if (stat(opts->argv[i], &sb) == 0) {
if (S_ISBLK(sb.st_mode)) {
-- fd = open64(options->argv[i], O_RDONLY);
-+ fd = open(options->argv[i], O_RDONLY);
+ /*
+ * Get the size of block devices by opening
+ * them and seeking to the end.
+ */
+- fd = open64(opts->argv[i], O_RDONLY);
++ fd = open(opts->argv[i], O_RDONLY);
if (fd >= 0) {
- options->size +=
+ opts->size +=
- lseek64(fd, 0, SEEK_END);
+ lseek(fd, 0, SEEK_END);
close(fd);
}
} else {
-@@ -71,8 +71,8 @@
+@@ -76,8 +76,8 @@
*/
- int main_nextfd(opts_t options, int filenum, int oldfd)
+ int main_nextfd(opts_t opts, int filenum, int oldfd)
{
- struct stat64 isb;
- struct stat64 osb;
@@ -52,37 +56,37 @@
int fd;
if (oldfd > 0) {
-@@ -92,7 +92,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;
+@@ -99,7 +99,7 @@
+ if (strcmp(opts->argv[filenum], "-") == 0) {
+ fd = STDIN_FILENO;
+ } else {
+- fd = open64(opts->argv[filenum], O_RDONLY);
++ fd = open(opts->argv[filenum], O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr, "%s: %s: %s: %s\n",
+ opts->program_name,
+@@ -109,7 +109,7 @@
+ }
}
- if (fstat64(fd, &isb)) {
+ if (fstat(fd, &isb)) {
fprintf(stderr, "%s: %s: %s: %s\n",
- options->program_name,
+ opts->program_name,
_("failed to stat file"),
-@@ -110,7 +110,7 @@
+@@ -118,7 +118,7 @@
return -1;
}
- if (fstat64(STDOUT_FILENO, &osb)) {
+ if (fstat(STDOUT_FILENO, &osb)) {
fprintf(stderr, "%s: %s: %s\n",
- options->program_name,
+ opts->program_name,
_("failed to stat output file"), strerror(errno));
Index: src/main/main.c
---- src/main/main.c.orig 2004-02-12 23:50:35.000000000 +0100
-+++ src/main/main.c 2004-02-13 11:19:13.000000000 +0100
-@@ -65,7 +65,7 @@
+--- src/main/main.c.orig 2004-11-06 22:07:05 +0100
++++ src/main/main.c 2004-11-07 11:53:34 +0100
+@@ -66,7 +66,7 @@
struct timeval start_time, next_update, next_reset, cur_time;
struct timeval init_time;
long double elapsed, tilreset;
@@ -91,8 +95,8 @@
int fd, n;
fd = -1;
-@@ -102,7 +102,7 @@
- fd = main_nextfd(options, n, -1);
+@@ -103,7 +103,7 @@
+ fd = main_nextfd(opts, n, -1);
if (fd < 0)
return 1;
- if (fstat64(fd, &sb) == 0) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pv/pv.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 pv.spec
--- openpkg-src/pv/pv.spec 30 Jun 2004 17:48:20 -0000 1.21
+++ openpkg-src/pv/pv.spec 7 Nov 2004 10:55:57 -0000 1.22
@@ -33,8 +33,8 @@
Class: EVAL
Group: System
License: GPL
-Version: 0.8.6
-Release: 20040630
+Version: 0.8.9
+Release: 20041107
# list of sources
Source0: http://osdn.dl.sourceforge.net/pipeviewer/pv-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
