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: 25-Nov-2004 10:38:30
Branch: HEAD Handle: 2004112509382900
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
Log:
port RPM to NetBSD 2.0 (pre-release)
Summary:
Revision Changes Path
1.227 +1 -0 openpkg-src/openpkg/HISTORY
1.375 +1 -1 openpkg-src/openpkg/openpkg.spec
1.52 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.56 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.61 +7 -4 openpkg-src/openpkg/rpm.patch.porting
1.51 +1 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.226 -r1.227 HISTORY
--- openpkg-src/openpkg/HISTORY 19 Nov 2004 19:22:48 -0000 1.226
+++ openpkg-src/openpkg/HISTORY 25 Nov 2004 09:38:29 -0000 1.227
@@ -2,6 +2,7 @@
2004
====
+20041125 port RPM to NetBSD 2.0 (pre-release)
20041119 upgrade to BeeCrypt 4.1.1 (excluded in 2.2.2)
20041118 upgrade to BeeCrypt 4.1.0 (excluded in 2.2.2)
20041118 upgrade to OSSP uuid 1.1.1 (excluded in 2.2.2)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.374 -r1.375 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 19 Nov 2004 19:22:48 -0000 1.374
+++ openpkg-src/openpkg/openpkg.spec 25 Nov 2004 09:38:29 -0000 1.375
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20041119
+%define V_openpkg 20041125
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.51 -r1.52 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 21 Jul 2004 14:30:30 -0000
1.51
+++ openpkg-src/openpkg/rpm.patch.bugfix 25 Nov 2004 09:38:29 -0000
1.52
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.55 -r1.56 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 21 Jul 2004 14:30:31 -0000
1.55
+++ openpkg-src/openpkg/rpm.patch.feature 25 Nov 2004 09:38:29 -0000
1.56
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.60 -r1.61 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 21 Jul 2004 14:30:31 -0000
1.60
+++ openpkg-src/openpkg/rpm.patch.porting 25 Nov 2004 09:38:29 -0000
1.61
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -251,12 +251,15 @@
+---------------------------------------------------------------------------
Index: lib/fs.c
--- lib/fs.c 4 Jun 2003 18:09:43 -0000 1.1.1.13
-+++ lib/fs.c 22 Jan 2004 21:42:23 -0000 1.2
-@@ -164,6 +164,12 @@
++++ lib/fs.c 25 Nov 2004 09:32:16 -0000 1.3
+@@ -164,6 +164,15 @@
int nextMount = 0;
getmntinfo_r(&mounts, flags, &mntCount, &bufSize);
+# elif HAVE_GETMNTINFO
++# if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000)
++# define statfs statvfs
++# endif
+ struct statfs * mounts = NULL;
+ int mntCount, flags = MNT_NOWAIT;
+ int nextMount = 0;
@@ -265,7 +268,7 @@
# endif
filesystems = xcalloc((numAlloced + 1), sizeof(*filesystems)); /* XXX
memory leak */
-@@ -193,6 +199,9 @@
+@@ -193,6 +202,9 @@
# elif HAVE_GETMNTINFO_R
if (nextMount == mntCount) break;
mntdir = mounts[nextMount++].f_mntonname;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.50 -r1.51 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 21 Jul 2004 14:30:31 -0000
1.50
+++ openpkg-src/openpkg/rpm.patch.regen 25 Nov 2004 09:38:29 -0000
1.51
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
