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: 27-Oct-2003 16:32:30
Branch: HEAD Handle: 2003102715322703
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:
try to cleanup glob(3) replacement hacks in RPM
Summary:
Revision Changes Path
1.79 +1 -0 openpkg-src/openpkg/HISTORY
1.237 +1 -1 openpkg-src/openpkg/openpkg.spec
1.34 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.34 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.41 +7 -6 openpkg-src/openpkg/rpm.patch.porting
1.32 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.7190 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.78 -r1.79 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Oct 2003 14:50:44 -0000 1.78
+++ openpkg-src/openpkg/HISTORY 27 Oct 2003 15:32:29 -0000 1.79
@@ -2,6 +2,7 @@
2003
====
+20031027 try to cleanup glob(3) replacement hacks in RPM
20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific
stuff on Linux only.
20031020 include "trigger argument passing patch" from RPM BugDB
20031020 make "rpm --setperms" and "rpm --setugids" more portable by using Bash
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.236 -r1.237 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 21 Oct 2003 14:50:44 -0000 1.236
+++ openpkg-src/openpkg/openpkg.spec 27 Oct 2003 15:32:29 -0000 1.237
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20031021
+%define V_openpkg 20031027
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.33 -r1.34 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 21 Oct 2003 14:50:44 -0000 1.33
+++ openpkg-src/openpkg/rpm.patch.bugfix 27 Oct 2003 15:32:30 -0000 1.34
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Oct-2003
+## Created on: 27-Oct-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.33 -r1.34 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 21 Oct 2003 14:50:44 -0000 1.33
+++ openpkg-src/openpkg/rpm.patch.feature 27 Oct 2003 15:32:30 -0000 1.34
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Oct-2003
+## Created on: 27-Oct-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.40 -r1.41 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 21 Oct 2003 14:50:44 -0000 1.40
+++ openpkg-src/openpkg/rpm.patch.porting 27 Oct 2003 15:32:30 -0000 1.41
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Oct-2003
+## Created on: 27-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -226,7 +226,7 @@
+---------------------------------------------------------------------------
Index: misc/glob.h
--- misc/glob.h 11 Mar 2000 20:59:30 -0000 1.1.1.3
-+++ misc/glob.h 19 Oct 2003 19:15:21 -0000
++++ misc/glob.h 27 Oct 2003 15:22:58 -0000
@@ -46,7 +46,7 @@
#endif /* C++ or ANSI C. */
@@ -245,12 +245,13 @@
# define GLOB_MAGCHAR (1 << 8)/* Set in gl_flags if any metachars seen. */
# define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions. */
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,8 @@
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
Otherwise, `glob' returns zero. */
-#if _FILE_OFFSET_BITS != 64
-+#if _FILE_OFFSET_BITS != 64 || defined(OPENPKG_UNIXWARE)
++/* #if _FILE_OFFSET_BITS != 64 || defined(OPENPKG_UNIXWARE) */
++#if !defined(__linux__)
extern int glob __P ((__const char *__pattern, int __flags,
int (*__errfunc) (__const char *, int),
glob_t *__pglob));
@@ -260,12 +261,12 @@
+---------------------------------------------------------------------------
Index: misc/glob.c
--- misc/glob.c 11 Mar 2000 21:13:18 -0000 1.1.1.4
-+++ misc/glob.c 19 Oct 2003 19:15:27 -0000
++++ misc/glob.c 27 Oct 2003 15:24:44 -0000
@@ -813,6 +813,7 @@
/* Free storage allocated in PGLOB by a previous `glob' call. */
-+#if (_FILE_OFFSET_BITS != 64) || (__GNUC__ >= 2)
++#if !defined(__linux__) || (defined(__linux__) && (_FILE_OFFSET_BITS != 64) ||
(__GNUC__ >= 2))
void
globfree (pglob)
register glob_t *pglob;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.31 -r1.32 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 21 Oct 2003 14:50:45 -0000 1.31
+++ openpkg-src/openpkg/rpm.patch.regen 27 Oct 2003 15:32:30 -0000 1.32
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Oct-2003
+## Created on: 27-Oct-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.7189 -r1.7190 news.txt
--- openpkg-web/news.txt 27 Oct 2003 15:28:36 -0000 1.7189
+++ openpkg-web/news.txt 27 Oct 2003 15:32:27 -0000 1.7190
@@ -1,3 +1,4 @@
+27-Oct-2003: Upgraded package: P<openpkg-20031027-20031027>
27-Oct-2003: Upgraded package: P<gnutls-0.9.93-20031027>
27-Oct-2003: Upgraded package: P<gcrypt-1.1.43-20031027>
27-Oct-2003: New package: P<gpg-error-0.5-20031027>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
