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: 01-Sep-2003 09:03:48
Branch: HEAD Handle: 2003090108034502
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
openpkg-web news.txt
Log:
merge the 'port RPM 4.2.1 to OpenBSD/NetBSD' changes into the official
tree and regenerate patches
Summary:
Revision Changes Path
1.35 +1 -0 openpkg-src/openpkg/HISTORY
1.205 +1 -1 openpkg-src/openpkg/openpkg.spec
1.11 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.10 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.14 +5 -5 openpkg-src/openpkg/rpm.patch.porting
1.10 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.6357 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.34 -r1.35 HISTORY
--- openpkg-src/openpkg/HISTORY 30 Aug 2003 07:42:02 -0000 1.34
+++ openpkg-src/openpkg/HISTORY 1 Sep 2003 07:03:47 -0000 1.35
@@ -2,6 +2,7 @@
2003
====
+20030901 port RPM 4.2.1 to OpenBSD/NetBSD, too.
20030830 replace Bash variable exporting constructs with compatible Bourne-Shell
constructs
20030828 fix unpacking of non-compressed tarballs
20030827 enhance and fix %post script to correctly rebuild RPM DB and import
OpenPGP public key
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.204 -r1.205 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 30 Aug 2003 20:58:51 -0000 1.204
+++ openpkg-src/openpkg/openpkg.spec 1 Sep 2003 07:03:47 -0000 1.205
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030830
+%define V_openpkg 20030901
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.10 -r1.11 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 28 Aug 2003 13:48:47 -0000 1.10
+++ openpkg-src/openpkg/rpm.patch.bugfix 1 Sep 2003 07:03:47 -0000 1.11
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Aug-2003
+## Created on: 01-Sep-2003
##
## 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.9 -r1.10 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 28 Aug 2003 08:21:45 -0000 1.9
+++ openpkg-src/openpkg/rpm.patch.feature 1 Sep 2003 07:03:47 -0000 1.10
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Aug-2003
+## Created on: 01-Sep-2003
##
## 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.13 -r1.14 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 31 Aug 2003 21:05:50 -0000 1.13
+++ openpkg-src/openpkg/rpm.patch.porting 1 Sep 2003 07:03:47 -0000 1.14
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Aug-2003
+## Created on: 01-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -341,7 +341,7 @@
+---------------------------------------------------------------------------
Index: rpmio/fts.c
--- rpmio/fts.c 18 Jan 2003 16:13:17 -0000 1.1.1.3
-+++ rpmio/fts.c 25 Aug 2003 09:19:37 -0000
++++ rpmio/fts.c 1 Sep 2003 06:59:34 -0000
@@ -34,6 +34,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -391,12 +391,12 @@
+---------------------------------------------------------------------------
Index: rpmio/rpmrpc.c
--- rpmio/rpmrpc.c 29 May 2003 22:14:04 -0000 1.1.1.8
-+++ rpmio/rpmrpc.c 24 Aug 2003 13:10:21 -0000
++++ rpmio/rpmrpc.c 1 Sep 2003 07:00:46 -0000
@@ -1079,6 +1079,8 @@
return rc;
}
-+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) &&
!defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun)
+
struct __dirstream {
int fd; /* File descriptor. */
@@ -435,7 +435,7 @@
/[EMAIL PROTECTED]@*/
static int ftpmagicdir = 0x8440291;
-#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
-+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) &&
!defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun)
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
+#else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.9 -r1.10 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 28 Aug 2003 08:21:45 -0000 1.9
+++ openpkg-src/openpkg/rpm.patch.regen 1 Sep 2003 07:03:47 -0000 1.10
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Aug-2003
+## Created on: 01-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6356 -r1.6357 news.txt
--- openpkg-web/news.txt 31 Aug 2003 19:05:13 -0000 1.6356
+++ openpkg-web/news.txt 1 Sep 2003 07:03:45 -0000 1.6357
@@ -1,3 +1,4 @@
+01-Sep-2003: Upgraded package: P<openpkg-20030901-20030901>
31-Aug-2003: Upgraded package: P<kde-base-3.1.3-20030831>
31-Aug-2003: Upgraded package: P<kde-arts-1.1.3-20030831>
31-Aug-2003: Upgraded package: P<imlib-1.9.14-20030831>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
