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: 15-Sep-2003 21:24:21
Branch: HEAD Handle: 2003091520241902
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:
1. remove the librpmmisc.a library because its contents RPM includes in
librpmio.a. This especially fixes the "multiple definitions of symbol"
under Solaris when building APT.
2. Berkeley-DB fixes for fcntl(2) usage and Linux O_DIRECT issue.
This especially gets rid of the "Resource temporarily unavailable"
under (non-RedHat) Linux. The same problem under Solaris is still
under further investigation.
3. Display double-logging of verbose messages on the terminal.
Summary:
Revision Changes Path
1.52 +2 -0 openpkg-src/openpkg/HISTORY
1.217 +24 -26 openpkg-src/openpkg/openpkg.spec
1.19 +57 -3 openpkg-src/openpkg/rpm.patch.bugfix
1.20 +31 -13 openpkg-src/openpkg/rpm.patch.feature
1.23 +57 -12 openpkg-src/openpkg/rpm.patch.porting
1.18 +437 -15 openpkg-src/openpkg/rpm.patch.regen
1.6573 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.51 -r1.52 HISTORY
--- openpkg-src/openpkg/HISTORY 13 Sep 2003 20:22:05 -0000 1.51
+++ openpkg-src/openpkg/HISTORY 15 Sep 2003 19:24:20 -0000 1.52
@@ -2,6 +2,8 @@
2003
====
+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
20030913 fix ordering of libraries in "rpm-config --libs"
20030912 add -pipe to %{l_cflags} only if %{l_cc} is GCC and as(1) is GNU as
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.216 -r1.217 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 13 Sep 2003 19:25:06 -0000 1.216
+++ openpkg-src/openpkg/openpkg.spec 15 Sep 2003 19:24:20 -0000 1.217
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030913
+%define V_openpkg 20030915
# the used software versions
%define V_rpm 4.2.1
@@ -182,7 +182,7 @@
. ./.buildenv
# display verbosity header
- VERBOSE "PREPARATION: Determine Build Tool Paths"
+ set +x; VERBOSE "PREPARATION: Determine Build Tool Paths"
# determine path to shtool
shtool=`SOURCE shtool`
@@ -231,7 +231,7 @@
echo "usrgrp=$usrgrp" >>./.buildenv
# display verbosity header
- VERBOSE "PREPARATION: Determine OpenPKG User/Group Name/Id Pairs"
+ set +x; VERBOSE "PREPARATION: Determine OpenPKG User/Group Name/Id Pairs"
# determine user/group name/id pairs
# - bootstrapping: %{l_[smrn]{usr,grp}} is set via sed(1)
@@ -285,7 +285,7 @@
echo "ngid=\"$ngid\"; export ngid" >>.buildenv
# display verbosity header
- VERBOSE "PREPARATION: Determine OpenPKG Instance Environment"
+ set +x; VERBOSE "PREPARATION: Determine OpenPKG Instance Environment"
# determine installation location id
if [ ".%{?l_location:set}" = .set ]; then
@@ -331,7 +331,7 @@
echo "l_build_ulim=\"$l_build_ulim\"; export l_build_ulim" >>.buildenv
# display verbosity header
- VERBOSE "PREPARATION: Build GNU gzip (Compression Tool)"
+ set +x; VERBOSE "PREPARATION: Build GNU gzip (Compression Tool)"
# bootstrap GNU zip tool
${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null || true
@@ -346,7 +346,7 @@
echo "l_gzip=\"$l_gzip\"; export l_gzip" >>.buildenv
# display verbosity header
- VERBOSE "PREPARATION: Unpack Distribution Tarballs"
+ set +x; VERBOSE "PREPARATION: Unpack Distribution Tarballs"
# unpack distribution tarballs
${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
@@ -369,7 +369,7 @@
done
# display verbosity header
- VERBOSE "PREPARATION: Build GNU patch (Source Patching Tool)"
+ set +x; VERBOSE "PREPARATION: Build GNU patch (Source Patching Tool)"
# bootstrap GNU patch tool
( cd patch-%{V_patch}
@@ -387,7 +387,7 @@
echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv
# display verbosity header
- VERBOSE "PREPARATION: Apply OpenPKG Patches to Distibutions"
+ set +x; VERBOSE "PREPARATION: Apply OpenPKG Patches to Distibutions"
# apply OpenPKG patches to distribution trees
( cd rpm-%{V_rpm}
@@ -408,7 +408,7 @@
) || exit $?
# display verbosity header
- VERBOSE "PREPARATION: Build GNU make (Build Tool)"
+ set +x; VERBOSE "PREPARATION: Build GNU make (Build Tool)"
# bootstrap GNU make tool
( cd make-%{V_make}
@@ -431,7 +431,7 @@
. ./.buildenv
# display verbosity header
- VERBOSE "BUILD: Build GNU bash (Bourne-Again Shell)"
+ set +x; VERBOSE "BUILD: Build GNU bash (Bourne-Again Shell)"
# build GNU bash tool
( cd bash-%{V_bash}
@@ -460,7 +460,7 @@
) || exit $?
# display verbosity header
- VERBOSE "BUILD: Build GNU tar (Archiving Tool)"
+ set +x; VERBOSE "BUILD: Build GNU tar (Archiving Tool)"
# build GNU tar tool
( cd tar-%{V_tar}
@@ -480,7 +480,7 @@
) || exit $?
# display verbosity header
- VERBOSE "BUILD: Build GNU bzip2 (Compression Library)"
+ set +x; VERBOSE "BUILD: Build GNU bzip2 (Compression Library)"
# build BZIP2 library
( cd bzip2-%{V_bzip2}
@@ -488,7 +488,7 @@
) || exit $?
# display verbosity header
- VERBOSE "BUILD: Build Zlib (Compression Library)"
+ set +x; VERBOSE "BUILD: Build Zlib (Compression Library)"
# build ZLIB library
( cd zlib-%{V_zlib}
@@ -509,7 +509,7 @@
) || exit $?
# display verbosity header
- VERBOSE "BUILD: Build cURL (URL Fetching Tool)"
+ set +x; VERBOSE "BUILD: Build cURL (URL Fetching Tool)"
# build cURL tool
( cd curl-%{V_curl}
@@ -533,7 +533,7 @@
) || exit $?
# display verbosity header
- VERBOSE "BUILD: Build RPM (RedHat Package Manager)"
+ set +x; VERBOSE "BUILD: Build RPM (RedHat Package Manager)"
# build RPM
( br=`pwd`
@@ -604,7 +604,7 @@
. ./.buildenv
# display verbosity header
- VERBOSE "INSTALL: Create Installation Filesystem Hierarchy"
+ set +x; VERBOSE "INSTALL: Create Installation Filesystem Hierarchy"
# create installation hierarchy
rm -rf $RPM_BUILD_ROOT
@@ -637,7 +637,7 @@
done
# display verbosity header
- VERBOSE "INSTALL: Installation of RPM"
+ set +x; VERBOSE "INSTALL: Installation of RPM"
# install RPM into installation hierarchy
( cd rpm-%{V_rpm}
@@ -645,7 +645,7 @@
) || exit $?
# display verbosity header
- VERBOSE "INSTALL: Stripping Down Installation"
+ set +x; VERBOSE "INSTALL: Stripping Down Installation"
# strip RPM installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
@@ -676,11 +676,10 @@
done
# display verbosity header
- VERBOSE "INSTALL: Install Additional Files"
+ set +x; VERBOSE "INSTALL: Install Additional Files"
# add additional development files
cp rpm-%{V_rpm}/misc/glob.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
- cp rpm-%{V_rpm}/misc/libmisc.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmmisc.a
cp zlib-%{V_zlib}/zlib.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
cp zlib-%{V_zlib}/libz.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmz.a
cp bzip2-%{V_bzip2}/bzlib.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
@@ -689,7 +688,7 @@
cp beecrypt-%{V_beecrypt}/libbeecrypt.a
$RPM_BUILD_ROOT%{l_prefix}/lib/librpmbeecrypt.a
# display verbosity header
- VERBOSE "INSTALL: Post-Adjust Installation"
+ set +x; VERBOSE "INSTALL: Post-Adjust Installation"
# post-adjust RPM installation (namespace-clean POPT inclusion)
mv $RPM_BUILD_ROOT%{l_prefix}/lib/libpopt.a \
@@ -709,7 +708,7 @@
$RPM_BUILD_ROOT%{l_prefix}/bin/rpmbuild
# display verbosity header
- VERBOSE "INSTALL: Install Additional Tools"
+ set +x; VERBOSE "INSTALL: Install Additional Tools"
# install lsync tool
sed -e "s:@l_prefix@:%{l_prefix}:g" \
@@ -729,7 +728,7 @@
l_cflags=""
l_cppflags="-DOPENPKG -I${l_prefix}/include/rpm -I${l_prefix}/include"
l_ldflags="-L${l_prefix}/lib"
- l_libs="-lrpmbuild -lrpm -lrpmio -lrpmdb -lrpmpopt -lrpmmisc -lrpmbeecrypt
-lrpmbz2 -lrpmz"
+ l_libs="-lrpmbuild -lrpm -lrpmio -lrpmdb -lrpmpopt -lrpmbeecrypt -lrpmbz2
-lrpmz"
sed -e "s:@l_prefix@:%{l_prefix}:g" \
-e "s:@l_cc@:$l_cc:g" \
-e "s:@l_cflags@:$l_cflags:g" \
@@ -797,7 +796,7 @@
chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/config.sub
# display verbosity header
- VERBOSE "INSTALL: Install Configuration Files"
+ set +x; VERBOSE "INSTALL: Install Configuration Files"
# install a few README files
sed -e "s:@l_prefix@:%{l_prefix}:g" \
@@ -878,7 +877,7 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/openpkg.pgp
# display verbosity header
- VERBOSE "INSTALL: Done. Thank you for flying OpenPKG..."
+ set +x; VERBOSE "INSTALL: Done. Thank you for flying OpenPKG..."
%files
%defattr(-,%{?l_musr}%{!?l_musr:%{l_fsusr}},%{?l_mgrp}%{!?l_mgrp:%{l_fsgrp}})
@@ -987,7 +986,6 @@
%{l_prefix}/lib/librpmbz2.a
%{l_prefix}/lib/librpmdb.a
%{l_prefix}/lib/librpmio.a
- %{l_prefix}/lib/librpmmisc.a
%{l_prefix}/lib/librpmpopt.a
%{l_prefix}/lib/librpmz.a
%dir %{l_prefix}/libexec
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.18 -r1.19 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 12 Sep 2003 16:59:48 -0000 1.18
+++ openpkg-src/openpkg/rpm.patch.bugfix 15 Sep 2003 19:24:20 -0000 1.19
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 12-Sep-2003
+## Created on: 15-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -49,7 +49,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 Sep 2003 15:10:58 -0000
++++ configure.ac 15 Sep 2003 10:11:52 -0000
@@ -348,7 +349,7 @@
AC_MSG_CHECKING(for $dir/include in INCPATH)
@@ -66,7 +66,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 Sep 2003 15:10:58 -0000
++++ configure.ac 15 Sep 2003 10:11:52 -0000
@@ -1274,7 +1298,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ -244,3 +244,57 @@
dColors[dirIndexes[i]] |= fColors[i];
/*
* See if this file path needs relocating.
+
++---------------------------------------------------------------------------
+| Bugfix: POSIX/SUSv3 clearly expresses that fcntl(2) returns "value
+| other than -1" on success, so check for equality to -1 instead of
+| non-equality to 0. In practice this does not harm on most platforms,
+| because they fortunately (by conincidence and common practice)
+| return 0.
++---------------------------------------------------------------------------
+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 @@
+
+ /* Acquire an exclusive kernel lock. */
+ k_lock.l_type = F_WRLCK;
+- if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock))
++ if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock) == -1)
+ return (__os_get_errno());
+
+ /* If the resource is still available, it's ours. */
+@@ -112,7 +112,7 @@
+
+ /* Release the kernel lock. */
+ k_lock.l_type = F_UNLCK;
+- if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock))
++ if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock) == -1)
+ return (__os_get_errno());
+
+ /*
+
++---------------------------------------------------------------------------
+| The O_DIRECT feature is fully broken under at least Linux 2.2 and
+| 2.4. It is sometimes accepted by open(2) without error and later
+| causes a write(2) to fail with EINVAL -- all depending on the
+| underlying filesystem (usually works on tmpfs and fails on ext3).
+| Sometimes it also causes open(2) to fail with EINVAL. In general,
+| it does especially no "graceful degradation" and so is useless for
+| use mostly all platforms except for those where we know it works
+| (currently FreeBSD only). Interestingly, RPM works on RedHat, just
+| because RedHat's "kernel" package contains a patch which masks out
+| O_DIRECT usage... ;-)
++---------------------------------------------------------------------------
+Index: db/os/os_open.c
+--- db/os/os_open.c 18 Jan 2003 14:05:03 -0000 1.1.1.5
++++ db/os/os_open.c 15 Sep 2003 18:12:23 -0000
+@@ -93,7 +93,7 @@
+ if (LF_ISSET(DB_OSO_TRUNC))
+ oflags |= O_TRUNC;
+
+-#ifdef HAVE_O_DIRECT
++#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__)
+ if (LF_ISSET(DB_OSO_DIRECT))
+ oflags |= O_DIRECT;
+ #endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 12 Sep 2003 13:18:22 -0000 1.19
+++ openpkg-src/openpkg/rpm.patch.feature 15 Sep 2003 19:24:20 -0000 1.20
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 12-Sep-2003
+## Created on: 15-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -272,7 +272,7 @@
+---------------------------------------------------------------------------
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
-+++ build/build.c 12 Sep 2003 12:54:07 -0000
++++ build/build.c 15 Sep 2003 19:02:34 -0000
@@ -33,7 +33,15 @@
for (p = spec->sources; p != NULL; p = p->next) {
@@ -315,7 +315,7 @@
+---------------------------------------------------------------------------
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
-+++ build/build.c 12 Sep 2003 12:54:07 -0000
++++ build/build.c 15 Sep 2003 19:02:34 -0000
@@ -242,7 +258,9 @@
exit:
@@ -338,7 +338,7 @@
+---------------------------------------------------------------------------
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
-+++ build/build.c 12 Sep 2003 12:54:07 -0000
++++ build/build.c 15 Sep 2003 19:02:34 -0000
@@ -337,6 +355,21 @@
if (what & RPMBUILD_RMSPEC)
@@ -638,7 +638,7 @@
+---------------------------------------------------------------------------
Index: build/parseScript.c
--- build/parseScript.c 23 Jun 2002 19:47:12 -0000 1.1.1.12
-+++ build/parseScript.c 24 Aug 2003 13:10:15 -0000
++++ build/parseScript.c 15 Sep 2003 19:02:33 -0000
@@ -261,6 +261,7 @@
stripTrailingBlanksStringBuf(sb);
p = getStringBuf(sb);
@@ -655,7 +655,7 @@
+---------------------------------------------------------------------------
Index: build/spec.c
--- build/spec.c 4 Mar 2003 15:25:51 -0000 1.1.1.21
-+++ build/spec.c 24 Aug 2003 13:10:15 -0000
++++ build/spec.c 15 Sep 2003 19:02:34 -0000
@@ -334,7 +334,15 @@
if (tag != RPMTAG_ICON) {
@@ -682,13 +682,13 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 1 Sep 2003 09:26:45 -0000
++++ configure.ac 15 Sep 2003 10:11:52 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
if test "$ac_cv_prog_gcc" = yes; then
- CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
-+ CFLAGS="$CFLAGS -pipe -O2 -D_GNU_SOURCE -D_REENTRANT"
++ CFLAGS="$CFLAGS -O2 -D_GNU_SOURCE -D_REENTRANT"
fi
export CFLAGS
@@ -711,11 +711,28 @@
fi
+---------------------------------------------------------------------------
+| Disable the use of the internal zlib library, because
+| we build against an external one.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 15 Sep 2003 10:11:52 -0000
+@@ -310,7 +311,7 @@
+ WITH_ZLIB_SUBDIR=
+ WITH_ZLIB_INCLUDE=
+ WITH_ZLIB_LIB=
+-if test -d zlib ; then
++if false; then
+ WITH_ZLIB_SUBDIR=zlib
+ addlib \${top_builddir}/zlib
+ WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}"
+
++---------------------------------------------------------------------------
| Adjust paths for OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 1 Sep 2003 09:26:45 -0000
++++ configure.ac 15 Sep 2003 10:11:52 -0000
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -860,7 +877,7 @@
+---------------------------------------------------------------------------
Index: macros.in
--- macros.in 2 Jul 2003 19:20:52 -0000 1.1.1.14
-+++ macros.in 25 Aug 2003 18:23:11 -0000
++++ macros.in 15 Sep 2003 19:08:46 -0000
@@ -305,7 +305,7 @@
# Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not packaged.
#
@@ -1132,8 +1149,8 @@
+---------------------------------------------------------------------------
Index: rpmpopt.in
--- rpmpopt.in 24 Jan 2003 14:56:30 -0000 1.1.1.7
-+++ rpmpopt.in 25 Aug 2003 09:32:31 -0000
-@@ -147,28 +147,27 @@
++++ rpmpopt.in 14 Sep 2003 10:36:19 -0000
+@@ -147,28 +147,28 @@
# Popt glue to preserve legacy CLI behavior.
#
# XXX popt exec parsing doesn't honor POPT_ARGFLAG_ONEDASH
@@ -1166,6 +1183,7 @@
+rpm exec --ba rpmb -ba
+rpm exec --bb rpmb -bb
+rpm exec --bs rpmb -bs
++rpm exec --bt rpmb -bt
+rpm exec --tp rpmb -tp
+rpm exec --tc rpmb -tc
+rpm exec --ti rpmb -ti
@@ -1191,7 +1209,7 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 12 Sep 2003 11:58:25 -0000
++++ rpmqv.c 15 Sep 2003 19:02:34 -0000
@@ -682,6 +682,10 @@
case 'b':
ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.22 -r1.23 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 12 Sep 2003 17:00:35 -0000 1.22
+++ openpkg-src/openpkg/rpm.patch.porting 15 Sep 2003 19:24:21 -0000 1.23
@@ -10,18 +10,49 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 12-Sep-2003
+## Created on: 15-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
##
+---------------------------------------------------------------------------
+| Disable any POSIX Pthread stuff because in OpenPKG we use
+| non-Pthread mutexes in Berkeley-DB.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 15 Sep 2003 10:11:52 -0000
+@@ -446,14 +447,14 @@
+ AC_CHECK_LIB(socket, socket)
+ ])
+
+-AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h)
+-
+-AC_CHECK_LIB(pthread, pthread_mutex_trylock, [], [
+- dnl OSF 5.0 has the the symbols prefixed with __ in libpthread.
+- AC_CHECK_LIB(pthread, __pthread_mutex_trylock, [], [
+- AC_CHECK_LIB(thread, mutex_lock)
+- ])
+-])
++dnl AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h)
++dnl
++dnl AC_CHECK_LIB(pthread, pthread_mutex_trylock, [], [
++dnl dnl OSF 5.0 has the the symbols prefixed with __ in libpthread.
++dnl AC_CHECK_LIB(pthread, __pthread_mutex_trylock, [], [
++dnl AC_CHECK_LIB(thread, mutex_lock)
++dnl ])
++dnl ])
+
+ AC_CHECK_HEADERS(aio.h)
+ AC_SEARCH_LIBS(aio_read, [c rt aio posix4])
+
++---------------------------------------------------------------------------
| Add support for BSD getmntinfo(3).
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 Sep 2003 15:10:58 -0000
++++ configure.ac 15 Sep 2003 10:11:52 -0000
@@ -963,12 +964,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -43,13 +74,15 @@
| build/rpmfile.h and not available on all platforms. We do this by
| adding the same Autoconf checks file/configure already used for its
| original file.h.
+| Additionally, do not try to configure in an internal
+| beecrypt subdirectory.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 Sep 2003 15:10:58 -0000
-@@ -1253,6 +1255,28 @@
- dnl # XXX Propagate -lucb to popt ...
- dnl export LIBS INCPATH CONFIG_SITE
++++ configure.ac 15 Sep 2003 10:11:52 -0000
+@@ -1249,11 +1251,33 @@
+
+ AC_SUBST(OBJDUMP)
+dnl OpenPKG: rpmfile.h (used in RPM) from file(1) needs additional checks
+dnl for its use of uintXX_t (which are available in file/config.h, but which
@@ -73,26 +106,38 @@
+AC_CHECK_TYPE_STDC(uint16_t, unsigned short)
+AC_CHECK_TYPE_STDC(uint32_t, unsigned int)
+
- AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
+ dnl XXX this causes popt to depend on zlib et al
+ dnl # XXX Propagate -lucb to popt ...
+ dnl export LIBS INCPATH CONFIG_SITE
+
+-AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
++AC_CONFIG_SUBDIRS(popt zlib elfutils file db3)
AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+ rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
+---------------------------------------------------------------------------
| Not all Bourne-Shells support embedded TAB characters in
| here-document style constructs. Insert the TAB character indirectly
-| to workaround problems. Additionally, there is no need to build a
-| shared library version of Berkeley-DB.
+| to workaround problems.
+| Additionally, there is no need to build a shared library version of
+| Berkeley-DB.
+| Finally, enforce the use of the standard UNIX/fcntl mutex type for
+| full portability and to get rid of Pthread library dependencies
+| (which especially are nasty for the external RPM API users).
+---------------------------------------------------------------------------
Index: db3/configure
--- db3/configure 18 Jan 2003 14:04:22 -0000 1.1.1.4
-+++ db3/configure 25 Aug 2003 10:35:39 -0000
-@@ -8,18 +8,18 @@
++++ db3/configure 15 Sep 2003 19:15:42 -0000
+@@ -8,18 +8,19 @@
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e
's%--cache-file=.*$%%'`"
CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
- --enable-shared --enable-static --enable-rpc \
+- --with-uniquename=_rpmdb --srcdir=$db_dist
+ --disable-shared --enable-static --enable-rpc \
- --with-uniquename=_rpmdb --srcdir=$db_dist
++ --with-uniquename=_rpmdb --srcdir=$db_dist \
++ --with-mutex="UNIX/fcntl" --disable-largefile
mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install[:-]/c\
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.17 -r1.18 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 12 Sep 2003 16:59:49 -0000 1.17
+++ openpkg-src/openpkg/rpm.patch.regen 15 Sep 2003 19:24:21 -0000 1.18
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 12-Sep-2003
+## Created on: 15-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -22,7 +22,7 @@
+---------------------------------------------------------------------------
Index: config.h.in
--- config.h.in 16 Jul 2003 17:17:13 -0000 1.1.1.18
-+++ config.h.in 1 Sep 2003 09:26:57 -0000
++++ config.h.in 15 Sep 2003 10:59:19 -0000
@@ -108,6 +108,9 @@
/* Define if you have the getmntent() function */
#undef HAVE_GETMNTENT
@@ -33,7 +33,56 @@
/* Define as 1 if you have getmntinfo_r() (only osf?) */
#undef HAVE_GETMNTINFO_R
-@@ -585,6 +588,15 @@
+@@ -181,18 +184,12 @@
+ /* Define to 1 if you have the `port' library (-lport). */
+ #undef HAVE_LIBPORT
+
+-/* Define to 1 if you have the `pthread' library (-lpthread). */
+-#undef HAVE_LIBPTHREAD
+-
+ /* Define to 1 if you have the `rand' library (-lrand). */
+ #undef HAVE_LIBRAND
+
+ /* Define to 1 if you have the `socket' library (-lsocket). */
+ #undef HAVE_LIBSOCKET
+
+-/* Define to 1 if you have the `thread' library (-lthread). */
+-#undef HAVE_LIBTHREAD
+-
+ /* Define to 1 if you have the <limits.h> header file. */
+ #undef HAVE_LIMITS_H
+
+@@ -259,9 +256,6 @@
+ /* Define to 1 if you have the `regcomp' function. */
+ #undef HAVE_REGCOMP
+
+-/* Define to 1 if you have the <semaphore.h> header file. */
+-#undef HAVE_SEMAPHORE_H
+-
+ /* Define to 1 if you have the `setenv' function. */
+ #undef HAVE_SETENV
+
+@@ -323,9 +317,6 @@
+ /* Define as 1 if you have "struct mnttab" (only sco?) */
+ #undef HAVE_STRUCT_MNTTAB
+
+-/* Define to 1 if you have the <synch.h> header file. */
+-#undef HAVE_SYNCH_H
+-
+ /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+ #undef HAVE_SYS_DIR_H
+@@ -391,9 +382,6 @@
+ /* Define as 1 if <sys/stat.h> defines S_ISSOCK */
+ #undef HAVE_S_ISSOCK
+
+-/* Define to 1 if you have the <thread.h> header file. */
+-#undef HAVE_THREAD_H
+-
+ /* Define to 1 if you have the `tsearch' function. */
+ #undef HAVE_TSEARCH
+
+@@ -585,6 +573,15 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
@@ -56,13 +105,22 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 12 Sep 2003 15:11:28 -0000
++++ configure 15 Sep 2003 10:59:16 -0000
+@@ -467,7 +467,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subdirs_all="$ac_subdirs_all popt beecrypt zlib elfutils file db3"
++ac_subdirs_all="$ac_subdirs_all popt zlib elfutils file db3"
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir
sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir
oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N
ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os
target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR
install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP
CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS RPMUSER
RPMUID RPMGROUP RPMGID CTAGS CSCOPE LDFLAGS_STATIC LDFLAGS_NPTL FIXPERMS MKDIR MKDIR_P
U ANSI2KNR LN_S ECHO RANLIB ac_ct_RANLIB LIBTOOL AR ac_ct_AR BZIP2BIN __CAT __CHGRP
__CHMOD __CHOWN __CP __CPIO __FILE __GPG __GREP GZIPBIN UNZIPBIN __ID __ID_U __INSTALL
__MAKE __MKDIR __MV __PATCH __PERL PGPBIN __PYTHON __RM __RSH __SED __SSH __TAR __LD
__NM __OBJCOPY __OBJDUMP __STRIP WITH_ZLIB_SUBDIR WITH_ZLIB_INCLUDE WITH_ZLIB_LIB
WITH_ELFUTILS_SUBDIR WITH_LIBELF_INCLUDE WITH_LIBELF_LIB WITH_LIBDWARF_INCLUDE
WITH_BEECRYPT_SUBDIR WITH_BEECRYPT_INCLUDE WITH_BEECRYPT_LIB WITH_DB_SUBDIR
WITH_INTERNAL_DB DBLIBSRCS DBLIBOBJS libdb3 libdb3a WITH_BZIP2 MKINSTALLDIRS MSGFMT
GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS
BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT
GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS
WITH_PYTHON_SUBDIR WITH_PYTHON_SUBPACKAGE WITH_PYTHON_VERSION __DOXYGEN
WITH_APIDOCS_TARGET WITH_APIDOCS __CHOWN_RHF __CHGRP_RHF ROOT_GROUP varprefix tmpdir
MARK64 RPMCANONCOLOR autorelocate_path RPMCANONARCH RPMCANONVENDOR RPMCANONOS
LOCALEDIR LIBDIR RPMCONFIGDIR SYSCONFIGDIR MACROFILES LIBRPMRC_FILENAME
VENDORRPMRC_FILENAME LIBRPMALIAS_FILENAME FINDREQUIRES FINDPROVIDES testdir INCPATH
LIBMISC RPM OBJDUMP subdirs LTLIBOBJS'
+ ac_subst_files=''
+
@@ -4040,7 +4040,7 @@
AS=${AS-as}
if test "$ac_cv_c_compiler_gnu" = yes; then
- CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
-+ CFLAGS="$CFLAGS -pipe -O2 -D_GNU_SOURCE -D_REENTRANT"
++ CFLAGS="$CFLAGS -O2 -D_GNU_SOURCE -D_REENTRANT"
fi
export CFLAGS
@@ -128,6 +186,15 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
+@@ -11266,7 +11267,7 @@
+ WITH_ZLIB_SUBDIR=
+ WITH_ZLIB_INCLUDE=
+ WITH_ZLIB_LIB=
+-if test -d zlib ; then
++if false; then
+ WITH_ZLIB_SUBDIR=zlib
+ addlib \${top_builddir}/zlib
+ WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}"
@@ -11312,7 +11313,7 @@
echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
@@ -137,7 +204,358 @@
INCPATH="$INCPATH -I$dir/include"
fi
echo "$as_me:$LINENO: result: yes" >&5
-@@ -22911,6 +22912,86 @@
+@@ -12648,350 +12649,6 @@
+
+
+
+-
+-
+-for ac_header in thread.h pthread.h synch.h semaphore.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,
rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the
preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to [EMAIL PROTECTED] ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+- no:yes )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled"
>&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite
headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the
preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to [EMAIL PROTECTED] ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+-echo "$as_me:$LINENO: checking for pthread_mutex_trylock in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_trylock in -lpthread... $ECHO_C" >&6
+-if test "${ac_cv_lib_pthread_pthread_mutex_trylock+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char pthread_mutex_trylock ();
+-int
+-main ()
+-{
+-pthread_mutex_trylock ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_pthread_pthread_mutex_trylock=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_pthread_pthread_mutex_trylock=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_trylock" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_trylock" >&6
+-if test $ac_cv_lib_pthread_pthread_mutex_trylock = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBPTHREAD 1
+-_ACEOF
+-
+- LIBS="-lpthread $LIBS"
+-
+-else
+-
+-
+-echo "$as_me:$LINENO: checking for __pthread_mutex_trylock in -lpthread" >&5
+-echo $ECHO_N "checking for __pthread_mutex_trylock in -lpthread... $ECHO_C" >&6
+-if test "${ac_cv_lib_pthread___pthread_mutex_trylock+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char __pthread_mutex_trylock ();
+-int
+-main ()
+-{
+-__pthread_mutex_trylock ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_pthread___pthread_mutex_trylock=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_pthread___pthread_mutex_trylock=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_trylock" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_trylock" >&6
+-if test $ac_cv_lib_pthread___pthread_mutex_trylock = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBPTHREAD 1
+-_ACEOF
+-
+- LIBS="-lpthread $LIBS"
+-
+-else
+-
+-
+-echo "$as_me:$LINENO: checking for mutex_lock in -lthread" >&5
+-echo $ECHO_N "checking for mutex_lock in -lthread... $ECHO_C" >&6
+-if test "${ac_cv_lib_thread_mutex_lock+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lthread $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char mutex_lock ();
+-int
+-main ()
+-{
+-mutex_lock ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_thread_mutex_lock=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_thread_mutex_lock=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_thread_mutex_lock" >&5
+-echo "${ECHO_T}$ac_cv_lib_thread_mutex_lock" >&6
+-if test $ac_cv_lib_thread_mutex_lock = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBTHREAD 1
+-_ACEOF
+-
+- LIBS="-lthread $LIBS"
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-
+ for ac_header in aio.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -22911,6 +22568,86 @@
else
@@ -224,7 +642,7 @@
echo "$as_me:$LINENO: checking for mntctl" >&5
echo $ECHO_N "checking for mntctl... $ECHO_C" >&6
if test "${ac_cv_func_mntctl+set}" = set; then
-@@ -23148,6 +23229,8 @@
+@@ -23148,6 +22885,8 @@
fi
@@ -233,7 +651,7 @@
echo "$as_me:$LINENO: checking for lchown" >&5
echo $ECHO_N "checking for lchown... $ECHO_C" >&6
-@@ -23515,7 +23598,7 @@
+@@ -23515,7 +23254,7 @@
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -242,7 +660,7 @@
cat >>confdefs.h <<_ACEOF
#define RPMCONFIGDIR "$RPMCONFIGDIR"
-@@ -23523,7 +23606,7 @@
+@@ -23523,7 +23262,7 @@
@@ -251,7 +669,7 @@
cat >>confdefs.h <<_ACEOF
#define SYSCONFIGDIR "$SYSCONFIGDIR"
-@@ -23539,7 +23622,7 @@
+@@ -23539,7 +23278,7 @@
@@ -260,7 +678,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
-@@ -23547,7 +23630,7 @@
+@@ -23547,7 +23286,7 @@
@@ -269,7 +687,7 @@
cat >>confdefs.h <<_ACEOF
#define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
-@@ -23555,7 +23638,7 @@
+@@ -23555,7 +23294,7 @@
@@ -278,7 +696,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23589,6 +23672,116 @@
+@@ -23588,9 +23327,119 @@
@@ -393,9 +811,13 @@
+
+
- subdirs="$subdirs popt beecrypt zlib elfutils file db3"
-@@ -25157,7 +25350,6 @@
+-subdirs="$subdirs popt beecrypt zlib elfutils file db3"
++subdirs="$subdirs popt zlib elfutils file db3"
+
+
+
ac_config_files="$ac_config_files Doxyfile Makefile rpmrc macros platform
rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
scripts/Makefile scripts/brp-redhat scripts/macros.perl scripts/macros.php
scripts/macros.python tools/Makefile tests/Makefile tests/rpmrc tests/macros
tests/hello-test/Makefile misc/Makefile intl/Makefile po/Makefile.in doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile doc/pl/Makefile
doc/ru/Makefile doc/sk/Makefile python/Makefile python/rpmdb/Makefile
python/test/Makefile"
+@@ -25157,7 +25006,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6572 -r1.6573 news.txt
--- openpkg-web/news.txt 15 Sep 2003 19:12:21 -0000 1.6572
+++ openpkg-web/news.txt 15 Sep 2003 19:24:19 -0000 1.6573
@@ -1,3 +1,4 @@
+15-Sep-2003: Upgraded package: P<openpkg-20030915-20030915>
15-Sep-2003: Upgraded package: P<db-4.1.25.1-20030915>
15-Sep-2003: Upgraded package: P<mysql3-3.23.58-20030915>
15-Sep-2003: Upgraded package: P<file-4.04-20030915>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
