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: 16-Sep-2003 17:32:14
Branch: HEAD Handle: 2003091616321202
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:
RPM database mutex workaround for Solaris plus the passing of option
-b to patch(1)
Summary:
Revision Changes Path
1.53 +1 -0 openpkg-src/openpkg/HISTORY
1.218 +6 -4 openpkg-src/openpkg/openpkg.spec
1.20 +22 -5 openpkg-src/openpkg/rpm.patch.bugfix
1.21 +7 -5 openpkg-src/openpkg/rpm.patch.feature
1.24 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.19 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.6583 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.52 -r1.53 HISTORY
--- openpkg-src/openpkg/HISTORY 15 Sep 2003 19:24:20 -0000 1.52
+++ openpkg-src/openpkg/HISTORY 16 Sep 2003 15:32:13 -0000 1.53
@@ -2,6 +2,7 @@
2003
====
+20030916 RPM database mutex workaround for Solaris plus the passing of option -b to
patch(1)
20030915 remove the librpmmisc.a library because its contents RPM includes in
librpmio.a
20030915 Berkeley-DB fixes for fcntl(2) usage and Linux O_DIRECT issue
20030913 update to latest OSSP platform for even more accurate Linux product
recognition
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.217 -r1.218 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 15 Sep 2003 19:24:20 -0000 1.217
+++ openpkg-src/openpkg/openpkg.spec 16 Sep 2003 15:32:13 -0000 1.218
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030915
+%define V_openpkg 20030916
# the used software versions
%define V_rpm 4.2.1
@@ -1601,7 +1601,9 @@
( # wait until RPM has released the database
i=0
while [ $i -lt 10 ]; do
- %{l_prefix}/bin/rpm -q openpkg >/dev/null 2>&1 && break
+ if %{l_prefix}/bin/rpm -q openpkg; then
+ break
+ fi
sleep 1
i=`expr $i + 1`
done
@@ -1631,9 +1633,9 @@
echo "HEADER=END"
echo "DATA=END"
) | %{l_prefix}/lib/openpkg/rpmdb_load \
- %{l_prefix}/RPM/DB/$db_file
+ %{l_prefix}/RPM/DB/$db_file || true
else
- touch %{l_prefix}/RPM/DB/$db_file
+ touch %{l_prefix}/RPM/DB/$db_file || true
fi
fi
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 15 Sep 2003 19:24:20 -0000 1.19
+++ openpkg-src/openpkg/rpm.patch.bugfix 16 Sep 2003 15:32:14 -0000 1.20
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Sep-2003
+## Created on: 16-Sep-2003
##
## 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 11 Sep 2003 19:02:14 -0000
++++ build/parsePrep.c 16 Sep 2003 15:17:44 -0000
@@ -264,11 +298,14 @@
"fi");
} else {
@@ -251,11 +251,28 @@
| non-equality to 0. In practice this does not harm on most platforms,
| because they fortunately (by conincidence and common practice)
| return 0.
+| Additionally, at least Solaris may reject (see fcntl(2) manpage) the
+| (partial) locking, because DB mmap(2)'ed the file (or vice versa).
+| The workaround is to lock the entire(!) file.
+---------------------------------------------------------------------------
Index: db/mutex/mut_fcntl.c
--- db/mutex/mut_fcntl.c 18 Jan 2003 14:05:03 -0000 1.1.1.5
-+++ db/mutex/mut_fcntl.c 15 Sep 2003 13:37:58 -0000
-@@ -101,7 +101,7 @@
++++ db/mutex/mut_fcntl.c 15 Sep 2003 19:42:52 -0000
+@@ -84,8 +84,13 @@
+
+ /* Initialize the lock. */
+ k_lock.l_whence = SEEK_SET;
++#if 0
+ k_lock.l_start = mutexp->off;
+ k_lock.l_len = 1;
++#else
++ k_lock.l_start = 0;
++ k_lock.l_len = 0;
++#endif
+
+ for (locked = waited = 0;;) {
+ /*
+@@ -101,7 +106,7 @@
/* Acquire an exclusive kernel lock. */
k_lock.l_type = F_WRLCK;
@@ -264,7 +281,7 @@
return (__os_get_errno());
/* If the resource is still available, it's ours. */
-@@ -112,7 +112,7 @@
+@@ -112,7 +117,7 @@
/* Release the kernel lock. */
k_lock.l_type = F_UNLCK;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.20 -r1.21 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 15 Sep 2003 19:24:20 -0000 1.20
+++ openpkg-src/openpkg/rpm.patch.feature 16 Sep 2003 15:32:14 -0000 1.21
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Sep-2003
+## Created on: 16-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -462,6 +462,8 @@
| In OpenPKG, the RPM package contains own local versions of the
| "patch" and "tar" tools, so we cannot accept hard-coded names here.
| Instead we expand a variable to allow us to direct RPM to our tools.
+| Additionally, pass option "-b" to patch(1) so it creates original
+| files not only if a non-standard (not ".orig") suffix is used.
| Remove "unzip" support, because in OpenPKG there are less than
| a dozend packages requiring unpacking of .zip files. For these
| it is fully sufficient to explicitly require the "infozip"
@@ -470,7 +472,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 11 Sep 2003 19:02:14 -0000
++++ build/parsePrep.c 16 Sep 2003 15:17:44 -0000
@@ -76,6 +76,7 @@
struct Source *sp;
rpmCompressedMagic compressed = COMPRESSED_NOT;
@@ -495,7 +497,7 @@
sprintf(buf,
"echo \"Patch #%d (%s):\"\n"
- "%s -d < %s | patch -p%d %s -s\n"
-+ "%s -d < %s | %s -p%d %s -s\n"
++ "%s -d <%s | %s -p%d %s -s -b\n"
"STATUS=$?\n"
"if [ $STATUS -ne 0 ]; then\n"
" exit $STATUS\n"
@@ -510,7 +512,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 < %s", c, (const char *) basename(fn),
++ "%s -p%d %s -s -b <%s", c, (const char *) basename(fn),
+ patcher, strip, args, fn);
}
@@ -597,7 +599,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 11 Sep 2003 19:02:14 -0000
++++ build/parsePrep.c 16 Sep 2003 15:17:44 -0000
@@ -87,7 +88,15 @@
return NULL;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 15 Sep 2003 19:24:21 -0000 1.23
+++ openpkg-src/openpkg/rpm.patch.porting 16 Sep 2003 15:32:14 -0000 1.24
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Sep-2003
+## Created on: 16-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.regen
============================================================================
$ cvs diff -u -r1.18 -r1.19 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 15 Sep 2003 19:24:21 -0000 1.18
+++ openpkg-src/openpkg/rpm.patch.regen 16 Sep 2003 15:32:14 -0000 1.19
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Sep-2003
+## Created on: 16-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.6582 -r1.6583 news.txt
--- openpkg-web/news.txt 16 Sep 2003 11:17:49 -0000 1.6582
+++ openpkg-web/news.txt 16 Sep 2003 15:32:12 -0000 1.6583
@@ -1,3 +1,4 @@
+16-Sep-2003: Upgraded package: P<openpkg-20030916-20030916>
16-Sep-2003: Upgraded package: P<xmame-0.74.1-20030916>
16-Sep-2003: Upgraded package: P<apache-1.3.28-20030916>
16-Sep-2003: Upgraded package: P<squid-2.5.4-20030916>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
