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: 16-Aug-2004 16:56:03
Branch: OPENPKG_2_1_SOLID Handle: 2004081615555900
Modified files: (Branch: OPENPKG_2_1_SOLID)
openpkg-src/openpkg HISTORY install.sh local.README openpkg.1
openpkg.pod openpkg.spec rc.8 rc.pod
rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
MFC: all changes except version upgrades from CURRENT up to 2004-08-11
Summary:
Revision Changes Path
1.195.2.3 +11 -0 openpkg-src/openpkg/HISTORY
1.3.2.2 +1 -1 openpkg-src/openpkg/install.sh
1.3.4.1 +1 -1 openpkg-src/openpkg/local.README
1.1.4.1 +1 -2 openpkg-src/openpkg/openpkg.1
1.1.4.1 +0 -1 openpkg-src/openpkg/openpkg.pod
1.343.2.4 +10 -8 openpkg-src/openpkg/openpkg.spec
1.5.2.1 +4 -4 openpkg-src/openpkg/rc.8
1.5.2.1 +4 -4 openpkg-src/openpkg/rc.pod
1.50.2.1 +3 -3 openpkg-src/openpkg/rpm.patch.bugfix
1.54.2.1 +5 -5 openpkg-src/openpkg/rpm.patch.feature
1.59.2.1 +27 -5 openpkg-src/openpkg/rpm.patch.porting
1.49.2.1 +54 -44 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.195.2.2 -r1.195.2.3 HISTORY
--- openpkg-src/openpkg/HISTORY 12 Jul 2004 12:15:53 -0000 1.195.2.2
+++ openpkg-src/openpkg/HISTORY 16 Aug 2004 14:55:59 -0000 1.195.2.3
@@ -2,6 +2,17 @@
2004
====
+20040811 upgrade to cURL 7.12.1 (excluded from 2.1.1)
+20040811 apply more fixes for GNU Bash 3.0 (excluded from 2.1.1)
+20040810 fix uid/gid determination loops by not being confused by multiple query
results
+20040804 upgrade to BeeCrypt 4.0.0 and GNU Bash 3.0 (excluded from 2.1.1)
+20040725 fix a few typos in rc(8) manual page
+20040725 remove useless "Provides" for the corresponding RELEASE version (excluded
from 2.1.1)
+20040721 disable special RedHat NPTL handling for portability reasons
+20040721 fixed paths in manual pages
+20040716 upgrade to OSSP uuid 1.0.1
+
+20040712 **** RELEASE AS PART OF OPENPKG 2.1.0 ***
20040712 make --prefix optional in aux.wrapsrc.sh and default to /openpkg
20040712 let the --susr/--sgrp default to "root" only if --user/--group was
specified
20040712 emulate GNU libtool environment for bzip2 to make sure RPM picks it up
before a vendor version
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
============================================================================
$ cvs diff -u -r1.3.2.1 -r1.3.2.2 install.sh
--- openpkg-src/openpkg/install.sh 12 Jul 2004 12:15:53 -0000 1.3.2.1
+++ openpkg-src/openpkg/install.sh 16 Aug 2004 14:55:59 -0000 1.3.2.2
@@ -124,7 +124,7 @@
# display final result message
if [ -d "$OPENPKG_PREFIX/lib/openpkg-tools" ]; then
( echo "Congratulations, you have bootstrapped the OpenPKG Tool Chain."
- echo "You now have additional management ommands available. Run"
+ echo "You now have additional management commands available. Run"
echo " \$ $OPENPKG_PREFIX/bin/openpkg --help"
echo "for more details on the actual list of available commands."
) | $OPENPKG_PREFIX/lib/openpkg/rpmtool msg -b -t notice
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/local.README
============================================================================
$ cvs diff -u -r1.3 -r1.3.4.1 local.README
--- openpkg-src/openpkg/local.README 28 Jan 2004 13:04:35 -0000 1.3
+++ openpkg-src/openpkg/local.README 16 Aug 2004 14:55:59 -0000 1.3.4.1
@@ -4,7 +4,7 @@
contains software which was manually installed under @l_prefix@/local/PKG/
and activated under @l_prefix@/local/ by running:
- $ @l_prefix@/sbin/lsync
+ $ @l_prefix@/bin/openpkg lsync
Use "eval [EMAIL PROTECTED]@/etc/rc --eval all env`" from within a user's
Bourne (Again) Shell startup script (.profile or .bashrc) in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.1
============================================================================
$ cvs diff -u -r1.1 -r1.1.4.1 openpkg.1
--- openpkg-src/openpkg/openpkg.1 16 Feb 2004 21:06:51 -0000 1.1
+++ openpkg-src/openpkg/openpkg.1 16 Aug 2004 14:55:59 -0000 1.1.4.1
@@ -159,14 +159,13 @@
.Ve
.IP "Local Documentation" 4
.IX Item "Local Documentation"
-.Vb 7
+.Vb 6
\& openpkg-rpm(1) RPM package manager
\& openpkg-rpmbuild(1) RPM package manager (build only)
\& openpkg-rpm2cpio(1) RPM payload utility
\& openpkg-rpm-config(1) RPM C API utility
\& openpkg-lsync(1) local area synchronization
\& openpkg-rc(1) run-command facility
-\& openpkg-tools(1) OpenPKG Tool Chain (optional)
.Ve
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.pod
============================================================================
$ cvs diff -u -r1.1 -r1.1.4.1 openpkg.pod
--- openpkg-src/openpkg/openpkg.pod 16 Feb 2004 21:06:51 -0000 1.1
+++ openpkg-src/openpkg/openpkg.pod 16 Aug 2004 14:55:59 -0000 1.1.4.1
@@ -65,7 +65,6 @@
openpkg-rpm-config(1) RPM C API utility
openpkg-lsync(1) local area synchronization
openpkg-rc(1) run-command facility
- openpkg-tools(1) OpenPKG Tool Chain (optional)
=back
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.343.2.3 -r1.343.2.4 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 12 Jul 2004 12:15:53 -0000 1.343.2.3
+++ openpkg-src/openpkg/openpkg.spec 16 Aug 2004 14:55:59 -0000 1.343.2.4
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.1.0
+%define V_openpkg 2.1.1
# the used software versions
%define V_rpm 4.2.1
@@ -52,7 +52,7 @@
%define V_patch 2.5.9
%define V_tar 1.14
%define V_bash 2.05b
-%define V_uuid 1.0.0
+%define V_uuid 1.0.1
# package information
Name: openpkg
@@ -138,7 +138,7 @@
AutoReq: no
AutoReqProv: no
Provides: OpenPKG
-Provides: openpkg = 20040712-20040712
+Provides: openpkg = 20040811-20040811
%description
This is the bootstrap package for the RPM-based Unix Software
@@ -203,7 +203,7 @@
}
prog openpkg:tar = {
version = %{V_tar}
- url = ftp://alpha.gnu.org/gnu/tar/
+ url = ftp://ftp.gnu.org/gnu/tar/
regex = tar-(__VER__)\.tar\.gz
}
prog openpkg:zlib = {
@@ -1324,7 +1324,7 @@
eval "xgid=\"\$${class}gid\""
if [ ".$xuid" = . ]; then
xuid=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump passwd .)
2>/dev/null |\
- grep "^${xusr}:" | awk -F: '{ print $3; }'`
+ grep "^${xusr}:" | awk -F: '{ print $3; }' | sed -e q`
if [ ".$xuid" = . ]; then
# seek for a reasonably uid/gid pair
xuid=1000
@@ -1332,11 +1332,13 @@
while [ ".$ok" = .0 ]; do
eval "u_exists=\$u_exists_$xuid"
if [ ".$u_exists" = . ]; then
- u_exists=`(getent passwd; cat /etc/passwd; ypcat passwd;
nidump passwd .) 2>/dev/null | grep "^[^:]*:[^:]*:$xuid:"`
+ u_exists=`(getent passwd; cat /etc/passwd; ypcat passwd;
nidump passwd .) 2>/dev/null |\
+ grep "^[^:]*:[^:]*:$xuid:"`
fi
eval "g_exists=\$g_exists_$xuid"
if [ ".$g_exists" = . ]; then
- g_exists=`(getent group; cat /etc/group; ypcat group;
nidump group .) 2>/dev/null | grep "^[^:]*:[^:]*:$xuid:"`
+ g_exists=`(getent group; cat /etc/group; ypcat group;
nidump group .) 2>/dev/null |\
+ grep "^[^:]*:[^:]*:$xuid:"`
fi
if [ ".$u_exists" = . -a ".$g_exists" = . ]; then
ok=1
@@ -1350,7 +1352,7 @@
fi
if [ ".$xgid" = . ]; then
xgid=`(getent group; cat /etc/group; ypcat group; nidump group .)
2>/dev/null |\
- grep "^${xgrp}:" | awk -F: '{ print $3; }'`
+ grep "^${xgrp}:" | awk -F: '{ print $3; }' | sed -e q`
if [ ".$xgid" = . ]; then
xgid="$xuid"
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.8
============================================================================
$ cvs diff -u -r1.5 -r1.5.2.1 rc.8
--- openpkg-src/openpkg/rc.8 4 Jun 2004 15:25:17 -0000 1.5
+++ openpkg-src/openpkg/rc.8 16 Aug 2004 14:55:59 -0000 1.5.2.1
@@ -373,7 +373,7 @@
\&\f(CW\*(C`INFOPATH\*(C'\fR, \f(CW\*(C`LD_LIBRARY_PATH\*(C'\fR and similar
variables.
.IP "\fBrcTmp\fR [\fB\-i\fR] [\fB\-f\fR] [\fB\-n\fR \fIname\fR] [\fB\-k\fR]" 4
.IX Item "rcTmp [-i] [-f] [-n name] [-k]"
-Convinience interface to secure temporary file handling. Option \fB\-i\fR
+Convenience interface to secure temporary file handling. Option \fB\-i\fR
first has to be used to initialize a secure temporary directory (option
\&\fB\-k\fR later will kill this again). Under option \fB\-f\fR you then can get
reasonable temporary filenames under the created temporary directory. By
@@ -381,17 +381,17 @@
with option \fB\-n\fR to be \fIname\fR.
.IP "\fBrcService\fR \fIpackage\fR \fIstatus\fR \fIvalue\fR" 4
.IX Item "rcService package status value"
-Convinience interface to checking the \f(CW%status\fR variables
+Convenience interface to checking the \f(CW%status\fR variables
\&\fIpackage\fR\f(CW\*(C`_\*(C'\fR\fIstatus\fR which have to be provided by the
\f(CW%config\fR (if
\&\fIstatus\fR is "\f(CW\*(C`enable\*(C'\fR" this is enough) and \f(CW%status\fR
(if \fIstatus\fR is
"\f(CW\*(C`enable\*(C'\fR\*(L", \*(R"\f(CW\*(C`usable\*(C'\fR\*(L" and
\*(R"\f(CW\*(C`active\*(C'\fR"). The \fBrcService\fR especially
caches the resolving of the variable values. Returns 0 if the resolved
-value is \fIvalue\fR, else return 1.
+value is \fIvalue\fR, else returns 1.
.IP "\fBrcVarIsYes\fR \fIname\fR" 4
.IX Item "rcVarIsYes name"
Checks whether variable \fIname\fR has a value of "\f(CW\*(C`yes\*(C'\fR\*(L",
\*(R"\f(CW\*(C`true\*(C'\fR\*(L",
\&\*(R"\f(CW\*(C`on\*(C'\fR\*(L", or \*(R"\f(CW1\fR" (with arbitrary lower or upper
case letters). Returns
-0 if value is one of these positive ones, else returns 0.
+0 if value is one of these positive ones, else returns 1.
.SH "EXAMPLES"
.IX Header "EXAMPLES"
First, an example run-command script \f(CW\*([EMAIL
PROTECTED]@/etc/rc.d/rc.foo\*(C'\fR for a
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.pod
============================================================================
$ cvs diff -u -r1.5 -r1.5.2.1 rc.pod
--- openpkg-src/openpkg/rc.pod 4 Jun 2004 15:25:17 -0000 1.5
+++ openpkg-src/openpkg/rc.pod 16 Aug 2004 14:55:59 -0000 1.5.2.1
@@ -288,7 +288,7 @@
=item B<rcTmp> [B<-i>] [B<-f>] [B<-n> I<name>] [B<-k>]
-Convinience interface to secure temporary file handling. Option B<-i>
+Convenience interface to secure temporary file handling. Option B<-i>
first has to be used to initialize a secure temporary directory (option
B<-k> later will kill this again). Under option B<-f> you then can get
reasonable temporary filenames under the created temporary directory. By
@@ -297,18 +297,18 @@
=item B<rcService> I<package> I<status> I<value>
-Convinience interface to checking the C<%status> variables
+Convenience interface to checking the C<%status> variables
I<package>C<_>I<status> which have to be provided by the C<%config> (if
I<status> is "C<enable>" this is enough) and C<%status> (if I<status> is
"C<enable>", "C<usable>" and "C<active>"). The B<rcService> especially
caches the resolving of the variable values. Returns 0 if the resolved
-value is I<value>, else return 1.
+value is I<value>, else returns 1.
=item B<rcVarIsYes> I<name>
Checks whether variable I<name> has a value of "C<yes>", "C<true>",
"C<on>", or "C<1>" (with arbitrary lower or upper case letters). Returns
-0 if value is one of these positive ones, else returns 0.
+0 if value is one of these positive ones, else returns 1.
=back
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.50 -r1.50.2.1 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 4 Jun 2004 13:11:06 -0000 1.50
+++ openpkg-src/openpkg/rpm.patch.bugfix 16 Aug 2004 14:55:59 -0000
1.50.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 04-Jun-2004
+## Created on: 21-Jul-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -50,7 +50,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -416,7 +417,7 @@
AC_CHECK_HEADER([beecrypt/beecrypt.h], [
AC_CHECK_LIB(beecrypt, mpfprintln, [
@@ -67,7 +67,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -1274,7 +1302,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.54 -r1.54.2.1 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 4 Jun 2004 14:34:29 -0000 1.54
+++ openpkg-src/openpkg/rpm.patch.feature 16 Aug 2004 14:55:59 -0000
1.54.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 04-Jun-2004
+## Created on: 21-Jul-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -837,7 +837,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -871,7 +871,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -310,7 +311,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
@@ -889,7 +889,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -324,38 +325,38 @@
localdone=
@@ -967,7 +967,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.59 -r1.59.2.1 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 4 Jun 2004 13:11:06 -0000 1.59
+++ openpkg-src/openpkg/rpm.patch.porting 16 Aug 2004 14:55:59 -0000
1.59.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 04-Jun-2004
+## Created on: 21-Jul-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -33,12 +33,34 @@
openbsd*)
+---------------------------------------------------------------------------
+| Disable special RedHat NPTL handling.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 21 Jul 2004 11:16:59 -0000
+@@ -150,10 +151,10 @@
+ dnl XXX Test for libpthread.a that is NPTL aware (static link only).
+ dnl
+ LDFLAGS_NPTL=
+-if test -f /usr/lib/nptl/libpthread.a ; then
+- LDFLAGS_NPTL="-L/usr/lib/nptl"
+-# INCPATH="$INCPATH -I/usr/include/nptl"
+-fi
++dnl if test -f /usr/lib/nptl/libpthread.a ; then
++dnl LDFLAGS_NPTL="-L/usr/lib/nptl"
++dnl # INCPATH="$INCPATH -I/usr/include/nptl"
++dnl fi
+ AC_SUBST(LDFLAGS_NPTL)
+
+ dnl
+
++---------------------------------------------------------------------------
| 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 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -446,14 +447,17 @@
AC_CHECK_LIB(socket, socket)
])
@@ -70,7 +92,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -963,12 +967,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -93,7 +115,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -1141,9 +1146,6 @@
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
@@ -115,7 +137,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 4 Jun 2004 11:57:01 -0000
++++ configure.ac 21 Jul 2004 11:16:59 -0000
@@ -1249,11 +1251,37 @@
AC_SUBST(OBJDUMP)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.49 -r1.49.2.1 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 4 Jun 2004 13:11:06 -0000 1.49
+++ openpkg-src/openpkg/rpm.patch.regen 16 Aug 2004 14:55:59 -0000
1.49.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 04-Jun-2004
+## Created on: 21-Jul-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -105,7 +105,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 4 Jun 2004 11:57:14 -0000
++++ configure 21 Jul 2004 11:20:06 -0000
@@ -467,7 +467,7 @@
# include <unistd.h>
#endif"
@@ -124,7 +124,7 @@
fi
export CFLAGS
-@@ -4837,6 +4837,7 @@
+@@ -4837,16 +4837,13 @@
# just link it dynamically
LDFLAGS_STATIC=""
fi
@@ -132,7 +132,17 @@
LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format
echo "$as_me:$LINENO: result: $LDFLAGS_STATIC" >&5
echo "${ECHO_T}$LDFLAGS_STATIC" >&6
-@@ -4937,7 +4938,7 @@
+
+
+ LDFLAGS_NPTL=
+-if test -f /usr/lib/nptl/libpthread.a ; then
+- LDFLAGS_NPTL="-L/usr/lib/nptl"
+-# INCPATH="$INCPATH -I/usr/include/nptl"
+-fi
+
+
+ echo "$as_me:$LINENO: checking POSIX chmod" >&5
+@@ -4937,7 +4934,7 @@
if test X"$MKDIR_P" = X0 ; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
@@ -141,7 +151,7 @@
else
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
-@@ -5878,6 +5879,7 @@
+@@ -5878,6 +5875,7 @@
;;
*) # Darwin 1.3 on
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
@@ -149,7 +159,7 @@
;;
esac
;;
-@@ -5903,7 +5905,7 @@
+@@ -5903,7 +5901,7 @@
;;
hpux10.20*|hpux11*)
@@ -158,7 +168,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
-@@ -5942,11 +5944,7 @@
+@@ -5942,11 +5940,7 @@
;;
netbsd*)
@@ -171,7 +181,7 @@
;;
newos6*)
-@@ -5981,7 +5979,7 @@
+@@ -5981,7 +5975,7 @@
lt_cv_file_magic_test_file=/lib/libc.so
;;
@@ -180,25 +190,25 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6682,7 +6680,7 @@
+@@ -6682,7 +6676,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6685 "configure"' > conftest.$ac_ext
-+ echo '#line 6683 "configure"' > conftest.$ac_ext
++ echo '#line 6679 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7211,7 +7209,7 @@
+@@ -7211,7 +7205,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+if { (eval echo configure:7212: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
-@@ -8069,7 +8067,7 @@
+@@ -8069,7 +8063,7 @@
runpath_var=LD_RUN_PATH
;;
@@ -207,34 +217,34 @@
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs
$compiler_flags'
-@@ -8395,7 +8393,7 @@
+@@ -8395,7 +8389,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 8398 "configure"' > conftest.$ac_ext
-+ echo '#line 8396 "configure"' > conftest.$ac_ext
++ echo '#line 8392 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9067,7 +9065,7 @@
+@@ -9067,7 +9061,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9070 "configure"
-+#line 9068 "configure"
++#line 9064 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9165,7 +9163,7 @@
+@@ -9165,7 +9159,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9168 "configure"
-+#line 9166 "configure"
++#line 9162 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11266,7 +11264,7 @@
+@@ -11266,7 +11260,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
WITH_ZLIB_LIB=
@@ -243,7 +253,7 @@
WITH_ZLIB_SUBDIR=zlib
addlib \${top_builddir}/zlib
WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}"
-@@ -11284,44 +11282,6 @@
+@@ -11284,44 +11278,6 @@
localdone=
@@ -288,7 +298,7 @@
echo "$as_me:$LINENO: checking for /usr/ucblib in LIBS" >&5
echo $ECHO_N "checking for /usr/ucblib in LIBS... $ECHO_C" >&6
-@@ -12051,7 +12011,7 @@
+@@ -12051,7 +12007,7 @@
#define HAVE_LIBBEECRYPT 1
_ACEOF
@@ -297,7 +307,7 @@
WITH_BEECRYPT_LIB="-lbeecrypt"
fi
-@@ -12647,287 +12607,13 @@
+@@ -12647,287 +12603,13 @@
@@ -450,12 +460,9 @@
-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 "$as_me:$LINENO: checking for svc_run in -lnsl" >&5
-+echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6
-+if test "${ac_cv_lib_nsl_svc_run+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
+- 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"
@@ -581,15 +588,18 @@
-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
++echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5
++echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_svc_run+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
-LIBS="-lthread $LIBS"
+LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -12942,11 +12628,11 @@
+@@ -12942,11 +12624,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -603,7 +613,7 @@
;
return 0;
}
-@@ -12963,33 +12649,28 @@
+@@ -12963,33 +12645,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -644,7 +654,7 @@
for ac_header in aio.h
-@@ -22911,6 +22592,86 @@
+@@ -22911,6 +22588,86 @@
else
@@ -731,7 +741,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 +22909,8 @@
+@@ -23148,6 +22905,8 @@
fi
@@ -740,7 +750,7 @@
echo "$as_me:$LINENO: checking for lchown" >&5
echo $ECHO_N "checking for lchown... $ECHO_C" >&6
-@@ -23454,9 +23217,6 @@
+@@ -23454,9 +23213,6 @@
fi
MARK64=
@@ -750,7 +760,7 @@
autorelocate_path='%{nil}'
-@@ -23515,7 +23275,7 @@
+@@ -23515,7 +23271,7 @@
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -759,7 +769,7 @@
cat >>confdefs.h <<_ACEOF
#define RPMCONFIGDIR "$RPMCONFIGDIR"
-@@ -23523,7 +23283,7 @@
+@@ -23523,7 +23279,7 @@
@@ -768,7 +778,7 @@
cat >>confdefs.h <<_ACEOF
#define SYSCONFIGDIR "$SYSCONFIGDIR"
-@@ -23539,7 +23299,7 @@
+@@ -23539,7 +23295,7 @@
@@ -777,7 +787,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
-@@ -23547,7 +23307,7 @@
+@@ -23547,7 +23303,7 @@
@@ -786,7 +796,7 @@
cat >>confdefs.h <<_ACEOF
#define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
-@@ -23555,7 +23315,7 @@
+@@ -23555,7 +23311,7 @@
@@ -795,7 +805,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23588,9 +23348,193 @@
+@@ -23588,9 +23344,193 @@
@@ -990,7 +1000,7 @@
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 +25101,6 @@
+@@ -25157,7 +25097,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
