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: 03-Feb-2005 17:04:44
Branch: HEAD Handle: 2005020316044300
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
Log:
fix the basename(3) issues the correct way by including <libgen.h>
Summary:
Revision Changes Path
1.242 +1 -0 openpkg-src/openpkg/HISTORY
1.396 +1 -1 openpkg-src/openpkg/openpkg.spec
1.55 +2 -27 openpkg-src/openpkg/rpm.patch.bugfix
1.58 +6 -5 openpkg-src/openpkg/rpm.patch.feature
1.63 +8 -9 openpkg-src/openpkg/rpm.patch.porting
1.53 +1 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.241 -r1.242 HISTORY
--- openpkg-src/openpkg/HISTORY 2 Feb 2005 22:07:36 -0000 1.241
+++ openpkg-src/openpkg/HISTORY 3 Feb 2005 16:04:43 -0000 1.242
@@ -2,6 +2,7 @@
2005
====
+20050203 fix the basename(3) issues the correct way by including <libgen.h>
20050202 fix DESTDIR not being passed to subdir make
20050201 upgrade to cURL 7.13.0 (excluded in 2.2.3)
20050131 apply three vendor bugfixes for GNU tar 1.15.1 (excluded in 2.2.3)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.395 -r1.396 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 2 Feb 2005 22:07:36 -0000 1.395
+++ openpkg-src/openpkg/openpkg.spec 3 Feb 2005 16:04:43 -0000 1.396
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20050202
+%define V_openpkg 20050203
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.54 -r1.55 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 1 Feb 2005 19:29:07 -0000
1.54
+++ openpkg-src/openpkg/rpm.patch.bugfix 3 Feb 2005 16:04:43 -0000
1.55
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Nov-2004
+## Created on: 03-Feb-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -23,7 +23,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 12 Feb 2004 16:58:58 -0000 1.3
++++ build/parsePrep.c 3 Feb 2005 14:02:48 -0000
@@ -584,12 +635,15 @@
saveLines = splitString(getStringBuf(sb), strlen(getStringBuf(sb)),
'\n');
/[EMAIL PROTECTED]@*/
@@ -46,31 +46,6 @@
}
+---------------------------------------------------------------------------
-| Repair for BSD/ia64: Remove a seemingly unnecessary (and incorrect?) cast.
-| The basename(3) already returns (char *) as required by the format string.
-+---------------------------------------------------------------------------
-Index: build/parsePrep.c
---- build/parsePrep.c.orig 2002-08-07 16:20:20 +0200
-+++ build/parsePrep.c 2005-02-01 19:12:14 +0100
-@@ -136,14 +136,14 @@
- "if [ $STATUS -ne 0 ]; then\n"
- " exit $STATUS\n"
- "fi",
-- c, /[EMAIL PROTECTED]@*/ (const char *) basename(fn), /[EMAIL
PROTECTED]@*/
-+ c, /[EMAIL PROTECTED]@*/ basename(fn), /[EMAIL PROTECTED]@*/
- zipper,
- fn, strip, args);
- zipper = _free(zipper);
- } else {
- sprintf(buf,
- "echo \"Patch #%d (%s):\"\n"
-- "patch -p%d %s -s < %s", c, (const char *) basename(fn),
-+ "patch -p%d %s -s < %s", c, basename(fn),
- strip, args, fn);
- }
-
-
-+---------------------------------------------------------------------------
| Do not pick of the vendor BeeCrypt package on RedHat Linux.
+---------------------------------------------------------------------------
Index: configure.ac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.57 -r1.58 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 20 Jan 2005 11:08:53 -0000
1.57
+++ openpkg-src/openpkg/rpm.patch.feature 3 Feb 2005 16:04:43 -0000
1.58
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Nov-2004
+## Created on: 03-Feb-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -558,7 +558,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 12 Feb 2004 16:58:58 -0000 1.3
++++ build/parsePrep.c 3 Feb 2005 14:02:48 -0000
@@ -66,7 +66,7 @@
*/
/[EMAIL PROTECTED]@*/
@@ -608,7 +608,8 @@
"if [ $STATUS -ne 0 ]; then\n"
" exit $STATUS\n"
"fi",
- c, /[EMAIL PROTECTED]@*/ (const char *) basename(fn), /[EMAIL
PROTECTED]@*/
+- c, /[EMAIL PROTECTED]@*/ (const char *) basename(fn), /[EMAIL
PROTECTED]@*/
++ c, /[EMAIL PROTECTED]@*/ basename(fn), /[EMAIL PROTECTED]@*/
zipper,
- fn, strip, args);
+ fn, patcher, strip, args);
@@ -618,7 +619,7 @@
"echo \"Patch #%d (%s):\"\n"
- "patch -p%d %s -s < %s", c, (const char *) basename(fn),
- strip, args, fn);
-+ "%s -p%d %s -s -b <%s", c, (const char *) basename(fn),
++ "%s -p%d %s -s -b <%s", c, basename(fn),
+ patcher, strip, args, fn);
}
@@ -752,7 +753,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 12 Feb 2004 16:58:58 -0000 1.3
++++ build/parsePrep.c 3 Feb 2005 14:02:48 -0000
@@ -87,7 +88,15 @@
return NULL;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.62 -r1.63 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 20 Jan 2005 11:08:53 -0000
1.62
+++ openpkg-src/openpkg/rpm.patch.porting 3 Feb 2005 16:04:43 -0000
1.63
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Nov-2004
+## Created on: 03-Feb-2005
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -1168,7 +1168,7 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 15 May 2004 10:47:24 -0000
++++ system.h 3 Feb 2005 14:02:24 -0000
@@ -256,10 +256,6 @@
#include <err.h>
#endif
@@ -1186,7 +1186,7 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 15 May 2004 10:47:24 -0000
++++ system.h 3 Feb 2005 14:02:24 -0000
@@ -550,7 +546,7 @@
#define lchown chown
#endif
@@ -1202,8 +1202,8 @@
+---------------------------------------------------------------------------
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
-+++ system.h 15 May 2004 10:47:24 -0000
-@@ -603,11 +599,20 @@
++++ system.h 3 Feb 2005 14:02:24 -0000
+@@ -603,11 +599,19 @@
#if defined(__LCLINT__)
#define FILE_RCSID(id)
@@ -1218,12 +1218,11 @@
+static const char *rcsid(const char *p) { \
+ return rcsid(p = id); \
+}
-+#endif
-+
-+#ifndef HAVE_BASENAME
-+extern char *basename(const char *);
#endif
++/* for basename(3) and dirname(3) */
++#include <libgen.h>
++
#endif /* H_SYSTEM */
+---------------------------------------------------------------------------
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.52 -r1.53 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 20 Jan 2005 11:08:53 -0000
1.52
+++ openpkg-src/openpkg/rpm.patch.regen 3 Feb 2005 16:04:43 -0000
1.53
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 25-Nov-2004
+## Created on: 03-Feb-2005
##
## 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]
