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: 04-Jun-2004 15:11:08
Branch: HEAD Handle: 2004060414110600
Modified files:
openpkg-src/openpkg HISTORY bash.patch openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen shtool
Log:
Bang: port to HP-UX 11.11 platform!
Summary:
Revision Changes Path
1.187 +1 -0 openpkg-src/openpkg/HISTORY
1.2 +54 -0 openpkg-src/openpkg/bash.patch
1.339 +29 -27 openpkg-src/openpkg/openpkg.spec
1.50 +4 -4 openpkg-src/openpkg/rpm.patch.bugfix
1.53 +7 -7 openpkg-src/openpkg/rpm.patch.feature
1.59 +39 -18 openpkg-src/openpkg/rpm.patch.porting
1.49 +84 -229 openpkg-src/openpkg/rpm.patch.regen
1.22 +1 -1 openpkg-src/openpkg/shtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.186 -r1.187 HISTORY
--- openpkg-src/openpkg/HISTORY 2 Jun 2004 18:54:25 -0000 1.186
+++ openpkg-src/openpkg/HISTORY 4 Jun 2004 13:11:06 -0000 1.187
@@ -2,6 +2,7 @@
2004
====
+20040604 port to HP-UX 11.11 platform
20040602 upgrade to cURL 7.12.0
20040602 add evil hack to workaround Debian 3.1 install-info(8) conflicts
20040602 remove unused code from run-command processor
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/bash.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 bash.patch
--- openpkg-src/openpkg/bash.patch 4 Sep 2003 12:08:50 -0000 1.1
+++ openpkg-src/openpkg/bash.patch 4 Jun 2004 13:11:06 -0000 1.2
@@ -148,3 +148,57 @@
builtin_error ("no job control");
}
+-----------------------------------------------------------------------------
+
+Port to HP-UX 11i and similar less smart platforms.
+
+Index: configure
+--- configure.orig 2002-07-16 15:31:47.000000000 +0200
++++ configure 2004-06-04 11:51:17.000000000 +0200
+@@ -1146,6 +1146,7 @@
+ *-beos*) opt_bash_malloc=no ;; # they say it's suitable
+ *-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment
+ *-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by
Microsoft
++*-hpux*) opt_bash_malloc=no ;; # HP HP-UX
+ esac
+
+ # memory scrambling on free()
+Index: mksyntax.c
+--- mksyntax.c.orig 2002-02-07 15:32:28.000000000 +0100
++++ mksyntax.c 2004-06-04 11:53:19.000000000 +0200
+@@ -128,7 +128,11 @@
+
+ switch (i)
+ {
++#if defined(__STDC__)
+ case '\a': xbuf[1] = 'a'; break;
++#else
++ case 7: xbuf[1] = 'a'; break;
++#endif
+ case '\v': xbuf[1] = 'v'; break;
+ case '\b': xbuf[1] = 'b'; break;
+ case '\f': xbuf[1] = 'f'; break;
+Index: syntax.h
+--- syntax.h.orig 2002-02-25 17:52:37.000000000 +0100
++++ syntax.h 2004-06-04 11:53:49.000000000 +0200
+@@ -21,6 +21,8 @@
+ #ifndef _SYNTAX_H_
+ #define _SYNTAX_H_
+
++#include "config.h"
++
+ /* Defines for use by mksyntax.c */
+
+ #define slashify_in_quotes "\\`$\"\n"
+Index: builtins/printf.def
+--- builtins/printf.def.orig 2002-05-13 20:36:04.000000000 +0200
++++ builtins/printf.def 2004-06-04 11:57:44.000000000 +0200
+@@ -114,7 +114,7 @@
+ static intmax_t getintmax __P((void));
+ static uintmax_t getuintmax __P((void));
+
+-#if defined (HAVE_LONG_DOUBLE) && HAVE_DECL_STRTOLD
++#if defined (HAVE_LONG_DOUBLE) && HAVE_DECL_STRTOLD && !defined(HPUX)
+ typedef long double floatmax_t;
+ # define FLOATMAX_CONV "L"
+ # define strtofltmax strtold
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.338 -r1.339 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 2 Jun 2004 18:54:25 -0000 1.338
+++ openpkg-src/openpkg/openpkg.spec 4 Jun 2004 13:11:06 -0000 1.339
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040602
+%define V_openpkg 20040604
# the used software versions
%define V_rpm 4.2.1
@@ -244,12 +244,11 @@
echo >>.buildenv ' else'
echo >>.buildenv ' echo "$*" | sh %{_sourcedir}/rpmtool msg'
echo >>.buildenv ' fi'
- echo >>.buildenv ' set -x'
echo >>.buildenv '}'
. ./.buildenv
# display verbosity header
- set +x; VERBOSE "PREPARATION: Determine Build Tool Paths"
+ set +x; VERBOSE "PREPARATION: Determine Build Tool Paths"; set -x
# determine path to shtool
shtool=`SOURCE shtool`
@@ -313,7 +312,7 @@
echo "usrgrp=$usrgrp" >>./.buildenv
# display verbosity header
- set +x; VERBOSE "PREPARATION: Determine OpenPKG User/Group Name/Id Pairs"
+ set +x; VERBOSE "PREPARATION: Determine OpenPKG User/Group Name/Id Pairs"; set
-x
# determine user/group name/id pairs
# - bootstrapping: %{l_[smrn]{usr,grp}} is set via sed(1)
@@ -367,7 +366,7 @@
echo "ngid=\"$ngid\"; export ngid" >>.buildenv
# display verbosity header
- set +x; VERBOSE "PREPARATION: Determine OpenPKG Instance Environment"
+ set +x; VERBOSE "PREPARATION: Determine OpenPKG Instance Environment"; set -x
# determine installation location id
if [ ".%{?l_tag_fmt:set}" = .set ]; then
@@ -413,7 +412,7 @@
echo "l_build_ulim=\"$l_build_ulim\"; export l_build_ulim" >>.buildenv
# display verbosity header
- set +x; VERBOSE "PREPARATION: Build GNU gzip (Compression Tool)"
+ set +x; VERBOSE "PREPARATION: Build GNU gzip (Compression Tool)"; set -x
# bootstrap GNU zip tool
${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null || true
@@ -429,7 +428,7 @@
echo "l_gzip=\"$l_gzip\"; export l_gzip" >>.buildenv
# display verbosity header
- set +x; VERBOSE "PREPARATION: Unpack Distribution Tarballs"
+ set +x; VERBOSE "PREPARATION: Unpack Distribution Tarballs"; set -x
# unpack distribution tarballs
${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
@@ -453,7 +452,7 @@
done
# display verbosity header
- set +x; VERBOSE "PREPARATION: Build GNU patch (Source Patching Tool)"
+ set +x; VERBOSE "PREPARATION: Build GNU patch (Source Patching Tool)"; set -x
# bootstrap GNU patch tool
( cd patch-%{V_patch}
@@ -473,7 +472,7 @@
echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv
# display verbosity header
- set +x; VERBOSE "PREPARATION: Apply OpenPKG Patches to Distibutions"
+ set +x; VERBOSE "PREPARATION: Apply OpenPKG Patches to Distibutions"; set -x
# apply OpenPKG patches to distribution trees
( cd rpm-%{V_rpm}
@@ -501,7 +500,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "PREPARATION: Build GNU make (Build Tool)"
+ set +x; VERBOSE "PREPARATION: Build GNU make (Build Tool)"; set -x
# bootstrap GNU make tool
( cd make-%{V_make}
@@ -524,7 +523,7 @@
. ./.buildenv
# display verbosity header
- set +x; VERBOSE "BUILD: Build GNU bash (Bourne-Again Shell)"
+ set +x; VERBOSE "BUILD: Build GNU bash (Bourne-Again Shell)"; set -x
# build GNU bash tool
( cd bash-%{V_bash}
@@ -553,7 +552,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "BUILD: Build GNU tar (Archiving Tool)"
+ set +x; VERBOSE "BUILD: Build GNU tar (Archiving Tool)"; set -x
# build GNU tar tool
( cd tar-%{V_tar}
@@ -577,7 +576,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "BUILD: Build GNU bzip2 (Compression Library)"
+ set +x; VERBOSE "BUILD: Build GNU bzip2 (Compression Library)"; set -x
# build BZIP2 library
( cd bzip2-%{V_bzip2}
@@ -585,7 +584,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "BUILD: Build Zlib (Compression Library)"
+ set +x; VERBOSE "BUILD: Build Zlib (Compression Library)"; set -x
# build ZLIB library
( cd zlib-%{V_zlib}
@@ -594,7 +593,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "BUILD: Build OSSP uuid (UUID Generation Tool)"
+ set +x; VERBOSE "BUILD: Build OSSP uuid (UUID Generation Tool)"; set -x
# build OSSP uuid tool
( cd uuid-%{V_uuid}
@@ -608,7 +607,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "BUILD: Build cURL (URL Fetching Tool)"
+ set +x; VERBOSE "BUILD: Build cURL (URL Fetching Tool)"; set -x
# build cURL tool
( cd curl-%{V_curl}
@@ -635,12 +634,13 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "BUILD: Build BeeCrypt (Cryptography Library)"
+ set +x; VERBOSE "BUILD: Build BeeCrypt (Cryptography Library)"; set -x
# build BeeCrypt library
( cd beecrypt-%{V_beecrypt}
( echo 'ac_cv_have_dev_dsp=no'
echo 'ac_cv_have_dev_audio=no'
+ echo 'ac_cv_func_gettimeofday=yes'
) >config.cache
CC="${l_cc}" \
CFLAGS="-O" \
@@ -656,7 +656,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "BUILD: Build RPM (RedHat Package Manager)"
+ set +x; VERBOSE "BUILD: Build RPM (RedHat Package Manager)"; set -x
# build RPM
( br=`pwd`
@@ -701,7 +701,9 @@
# provide platform identification
os_name=`(uname -s) 2>/dev/null` || os_name='Unknown'
- os_name=`echo "${os_name}" | tr 'abcdefghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ os_name=`echo "${os_name}" |\
+ sed -e 's;[^a-zA-Z0-9];;g' |\
+ tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
# set build tool flags
CC="${l_cc}"
@@ -736,7 +738,7 @@
. ./.buildenv
# display verbosity header
- set +x; VERBOSE "INSTALL: Create Installation Filesystem Hierarchy"
+ set +x; VERBOSE "INSTALL: Create Installation Filesystem Hierarchy"; set -x
# create installation hierarchy
rm -rf $RPM_BUILD_ROOT
@@ -771,7 +773,7 @@
mkdir $RPM_BUILD_ROOT%{l_prefix}/include/openpkg
# display verbosity header
- set +x; VERBOSE "INSTALL: Installation of RPM"
+ set +x; VERBOSE "INSTALL: Installation of RPM"; set -x
# install RPM into installation hierarchy
( cd rpm-%{V_rpm}
@@ -779,7 +781,7 @@
) || exit $?
# display verbosity header
- set +x; VERBOSE "INSTALL: Stripping Down Installation"
+ set +x; VERBOSE "INSTALL: Stripping Down Installation"; set -x
# strip RPM installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
@@ -810,7 +812,7 @@
done
# display verbosity header
- set +x; VERBOSE "INSTALL: Install Additional Files"
+ set +x; VERBOSE "INSTALL: Install Additional Files"; set -x
# add additional development files
cp rpm-%{V_rpm}/misc/glob.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
@@ -822,7 +824,7 @@
cp beecrypt-%{V_beecrypt}/libbeecrypt.a
$RPM_BUILD_ROOT%{l_prefix}/lib/librpmbeecrypt.a
# display verbosity header
- set +x; VERBOSE "INSTALL: Post-Adjust Installation"
+ set +x; VERBOSE "INSTALL: Post-Adjust Installation"; set -x
# post-adjust RPM installation (namespace-clean POPT inclusion)
mv $RPM_BUILD_ROOT%{l_prefix}/lib/libpopt.a \
@@ -850,7 +852,7 @@
$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpmbuild.8
# display verbosity header
- set +x; VERBOSE "INSTALL: Install Additional Tools"
+ set +x; VERBOSE "INSTALL: Install Additional Tools"; set -x
# install lsync tool
sed -e "s:@l_prefix@:%{l_prefix}:g" \
@@ -968,7 +970,7 @@
chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/shtool
# display verbosity header
- set +x; VERBOSE "INSTALL: Install Configuration Files"
+ set +x; VERBOSE "INSTALL: Install Configuration Files"; set -x
# install a few README files
sed -e "s:@l_prefix@:%{l_prefix}:g" \
@@ -1056,7 +1058,7 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/openpkg.pgp
# display verbosity header
- set +x; VERBOSE "INSTALL: Done. Thank you for flying OpenPKG..."
+ set +x; VERBOSE "INSTALL: Done. Thank you for flying OpenPKG..."; set -x
%files
%defattr(-,%{?l_musr}%{!?l_musr:%{l_fsusr}},%{?l_mgrp}%{!?l_mgrp:%{l_fsgrp}})
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.49 -r1.50 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 2 Jun 2004 08:28:22 -0000 1.49
+++ openpkg-src/openpkg/rpm.patch.bugfix 4 Jun 2004 13:11:06 -0000 1.50
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 02-Jun-2004
+## Created on: 04-Jun-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 12 May 2004 14:34:30 -0000 1.3
++++ configure.ac 4 Jun 2004 11:57:01 -0000
@@ -416,7 +417,7 @@
AC_CHECK_HEADER([beecrypt/beecrypt.h], [
AC_CHECK_LIB(beecrypt, mpfprintln, [
@@ -67,8 +67,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 May 2004 14:34:30 -0000 1.3
-@@ -1274,7 +1299,6 @@
++++ configure.ac 4 Jun 2004 11:57:01 -0000
+@@ -1274,7 +1302,6 @@
python/rpmdb/Makefile
python/test/Makefile
], [ echo timestamp > popt/stamp-h.in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.52 -r1.53 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 2 Jun 2004 08:28:22 -0000 1.52
+++ openpkg-src/openpkg/rpm.patch.feature 4 Jun 2004 13:11:06 -0000 1.53
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 02-Jun-2004
+## Created on: 04-Jun-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 12 May 2004 14:34:30 -0000 1.3
++++ configure.ac 4 Jun 2004 11:57:01 -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 12 May 2004 14:34:30 -0000 1.3
++++ configure.ac 4 Jun 2004 11:57:01 -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 12 May 2004 14:34:30 -0000 1.3
++++ configure.ac 4 Jun 2004 11:57:01 -0000
@@ -324,38 +325,38 @@
localdone=
@@ -967,8 +967,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 May 2004 14:34:30 -0000 1.3
-@@ -1200,12 +1199,12 @@
++++ configure.ac 4 Jun 2004 11:57:01 -0000
+@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
AC_SUBST(LIBDIR)
@@ -983,7 +983,7 @@
AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
[Full path to rpm system configuration directory (usually /etc/rpm)])
AC_SUBST(SYSCONFIGDIR)
-@@ -1215,17 +1214,17 @@
+@@ -1215,17 +1217,17 @@
[Colon separated paths of macro files to read.])
AC_SUBST(MACROFILES)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.58 -r1.59 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 2 Jun 2004 08:28:22 -0000 1.58
+++ openpkg-src/openpkg/rpm.patch.porting 4 Jun 2004 13:11:06 -0000 1.59
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 02-Jun-2004
+## Created on: 04-Jun-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -38,13 +38,15 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 May 2004 14:34:30 -0000 1.3
-@@ -446,14 +447,14 @@
++++ configure.ac 4 Jun 2004 11:57:01 -0000
+@@ -446,14 +447,17 @@
AC_CHECK_LIB(socket, socket)
])
-AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h)
--
++dnl # required for HP-UX because of RPC stuff in DB
++AC_CHECK_LIB(nsl, svc_run)
+
-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, [], [
@@ -68,8 +70,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 May 2004 14:34:30 -0000 1.3
-@@ -963,12 +964,13 @@
++++ configure.ac 4 Jun 2004 11:57:01 -0000
+@@ -963,12 +967,13 @@
AC_CHECK_FUNCS(getpassphrase)
AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT, 1, [Define if you have the
getmntent() function]), [
@@ -91,8 +93,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 May 2004 14:34:30 -0000 1.3
-@@ -1141,9 +1143,6 @@
++++ configure.ac 4 Jun 2004 11:57:01 -0000
+@@ -1141,9 +1146,6 @@
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
MARK64=
@@ -113,8 +115,8 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 12 May 2004 14:34:30 -0000 1.3
-@@ -1249,11 +1248,37 @@
++++ configure.ac 4 Jun 2004 11:57:01 -0000
+@@ -1249,11 +1251,37 @@
AC_SUBST(OBJDUMP)
@@ -795,7 +797,7 @@
+---------------------------------------------------------------------------
Index: rpmio/fts.c
--- rpmio/fts.c 18 Jan 2003 16:13:17 -0000 1.1.1.3
-+++ rpmio/fts.c 14 May 2004 20:53:39 -0000
++++ rpmio/fts.c 4 Jun 2004 12:14:37 -0000
@@ -34,6 +34,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -805,9 +807,19 @@
#if defined(_LIBC)
#include <sys/param.h>
#include <include/sys/stat.h>
-@@ -53,12 +55,33 @@
+@@ -45,20 +47,42 @@
+ #include <string.h>
+ #include <unistd.h>
+ #else
+-#if defined(hpux)
++#if defined(OPENPKG_HPUX)
+ # define _INCLUDE_POSIX_SOURCE
+ # define __errno_location() (&errno)
+ # define dirfd(dirp) -1
+ # define stat64 stat
# define _STAT_VER 0
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
++# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
#endif
-#if defined(sun)
+#if defined(sun) || defined(OPENPKG_UNIXWARE)
@@ -840,7 +852,7 @@
#include "system.h"
#include "fts.h"
#include "rpmio.h"
-@@ -73,7 +96,12 @@
+@@ -73,7 +97,12 @@
/* Largest alignment size needed, minus one.
Usually long double is the worst case. */
#ifndef ALIGNBYTES
@@ -853,7 +865,7 @@
#endif
/* Align P to that size. */
#ifndef ALIGN
-@@ -107,9 +135,13 @@
+@@ -107,9 +136,13 @@
/[EMAIL PROTECTED] fileSystem, internalState @*/;
#ifndef MAX
@@ -894,7 +906,7 @@
+---------------------------------------------------------------------------
Index: rpmio/rpmrpc.c
--- rpmio/rpmrpc.c 29 May 2003 22:14:04 -0000 1.1.1.8
-+++ rpmio/rpmrpc.c 14 May 2004 20:53:59 -0000
++++ rpmio/rpmrpc.c 4 Jun 2004 10:59:07 -0000
@@ -1079,6 +1079,8 @@
return rc;
}
@@ -938,7 +950,7 @@
/[EMAIL PROTECTED]@*/
static int ftpmagicdir = 0x8440291;
-#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN) &&
!defined(__osf__) && !defined(OPENPKG_IRIX64)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(sun) && !defined(OPENPKG_UNIXWARE) && !defined(OPENPKG_DARWIN) &&
!defined(__osf__) && !defined(OPENPKG_IRIX64) && !defined(OPENPKG_HPUX)
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
+#else
@@ -1091,7 +1103,7 @@
+ strncpy(dp->d_name, av[i].name, sizeof(dp->d_name) - 1);
+ dp->d_name[sizeof(dp->d_name)-1] = '\0';
+ dp->d_namlen = strlen(dp->d_name);
-+#elif defined(hpux) || defined(sun) || defined(OPENPKG_UNIXWARE) ||
defined(__osf__) || defined(OPENPKG_IRIX64)
++#elif defined(OPENPKG_HPUX) || defined(sun) || defined(OPENPKG_UNIXWARE) ||
defined(__osf__) || defined(OPENPKG_IRIX64)
+ /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
+ dp->d_ino = i + 1; /* W2DO? */
+ dp->d_reclen = 0; /* W2DO? */
@@ -1254,7 +1266,7 @@
+---------------------------------------------------------------------------
Index: aclocal.m4
--- aclocal.m4 16 Jul 2003 17:05:28 -0000 1.1.1.10
-+++ aclocal.m4 29 Apr 2004 13:08:17 -0000 1.3
++++ aclocal.m4 4 Jun 2004 11:04:22 -0000
@@ -2838,7 +2838,7 @@
runpath_var=LD_RUN_PATH
;;
@@ -1272,6 +1284,15 @@
;;
esac
;;
+@@ -4336,7 +4337,7 @@
+ ;;
+
+ hpux10.20*|hpux11*)
+- lt_cv_deplibs_check_method='file_magic
(s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++ lt_cv_deplibs_check_method='pass_all'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
@@ -4375,11 +4376,7 @@
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.48 -r1.49 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 2 Jun 2004 08:28:22 -0000 1.48
+++ openpkg-src/openpkg/rpm.patch.regen 4 Jun 2004 13:11:06 -0000 1.49
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 02-Jun-2004
+## Created on: 04-Jun-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 12 May 2004 14:34:31 -0000 1.22
++++ configure 4 Jun 2004 11:57:14 -0000
@@ -467,7 +467,7 @@
# include <unistd.h>
#endif"
@@ -149,6 +149,15 @@
;;
esac
;;
+@@ -5903,7 +5905,7 @@
+ ;;
+
+ hpux10.20*|hpux11*)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9])
shared library'
++ lt_cv_deplibs_check_method='pass_all'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
@@ -5942,11 +5944,7 @@
;;
@@ -288,143 +297,10 @@
WITH_BEECRYPT_LIB="-lbeecrypt"
fi
-@@ -12514,375 +12474,39 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char socket (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--/* 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 socket ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined (__stub_socket) || defined (__stub___socket)
--choke me
--#else
--char (*f) () = socket;
--#endif
--#ifdef __cplusplus
--}
--#endif
--
--int
--main ()
--{
--return f != socket;
-- ;
-- 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_func_socket=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_func_socket=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
--echo "${ECHO_T}$ac_cv_func_socket" >&6
--if test $ac_cv_func_socket = yes; then
-- :
--else
--
--
--echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
--echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
--if test "${ac_cv_lib_socket_socket+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsocket $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 socket ();
--int
--main ()
--{
--socket ();
-- ;
-- 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_socket_socket=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_socket_socket=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_socket_socket" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
--if test $ac_cv_lib_socket_socket = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBSOCKET 1
--_ACEOF
--
-- LIBS="-lsocket $LIBS"
--
--fi
--
--
--fi
--
--
--
+@@ -12647,287 +12607,13 @@
+
+
+
-
-
-
@@ -574,9 +450,12 @@
-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
++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="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
@@ -650,60 +529,43 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char socket (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* 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. */
+-/* 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 ();
-+char socket ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_socket) || defined (__stub___socket)
-+choke me
-+#else
-+char (*f) () = socket;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-__pthread_mutex_trylock ();
-+return f != socket;
- ;
- return 0;
- }
-@@ -12899,35 +12523,29 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ;
+- 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
-+ ac_cv_func_socket=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-ac_cv_lib_pthread___pthread_mutex_trylock=no
-+ac_cv_func_socket=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
- fi
+-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
@@ -713,53 +575,46 @@
-
- LIBS="-lpthread $LIBS"
-
-+echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
-+echo "${ECHO_T}$ac_cv_func_socket" >&6
-+if test $ac_cv_func_socket = yes; then
-+ :
- else
-
-
+-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 "$as_me:$LINENO: checking for socket in -lsocket" >&5
-+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-+if test "${ac_cv_lib_socket_socket+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="-lthread $LIBS"
-+LIBS="-lsocket $LIBS"
++LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -12942,11 +12560,11 @@
+@@ -12942,11 +12628,11 @@
#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 ();
-+char socket ();
++char svc_run ();
int
main ()
{
-mutex_lock ();
-+socket ();
++svc_run ();
;
return 0;
}
-@@ -12963,24 +12581,24 @@
+@@ -12963,33 +12649,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_thread_mutex_lock=yes
-+ ac_cv_lib_socket_socket=yes
++ ac_cv_lib_nsl_svc_run=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_thread_mutex_lock=no
-+ac_cv_lib_socket_socket=no
++ac_cv_lib_nsl_svc_run=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
@@ -767,20 +622,20 @@
-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
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-+if test $ac_cv_lib_socket_socket = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_svc_run" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6
++if test $ac_cv_lib_nsl_svc_run = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTHREAD 1
-+#define HAVE_LIBSOCKET 1
++#define HAVE_LIBNSL 1
_ACEOF
- LIBS="-lthread $LIBS"
-+ LIBS="-lsocket $LIBS"
-
- fi
+-
+-fi
+-
++ LIBS="-lnsl $LIBS"
-@@ -12988,8 +12606,6 @@
fi
@@ -789,7 +644,7 @@
for ac_header in aio.h
-@@ -22911,6 +22527,86 @@
+@@ -22911,6 +22592,86 @@
else
@@ -876,7 +731,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 +22844,8 @@
+@@ -23148,6 +22909,8 @@
fi
@@ -885,7 +740,7 @@
echo "$as_me:$LINENO: checking for lchown" >&5
echo $ECHO_N "checking for lchown... $ECHO_C" >&6
-@@ -23454,9 +23152,6 @@
+@@ -23454,9 +23217,6 @@
fi
MARK64=
@@ -895,7 +750,7 @@
autorelocate_path='%{nil}'
-@@ -23515,7 +23210,7 @@
+@@ -23515,7 +23275,7 @@
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -904,7 +759,7 @@
cat >>confdefs.h <<_ACEOF
#define RPMCONFIGDIR "$RPMCONFIGDIR"
-@@ -23523,7 +23218,7 @@
+@@ -23523,7 +23283,7 @@
@@ -913,7 +768,7 @@
cat >>confdefs.h <<_ACEOF
#define SYSCONFIGDIR "$SYSCONFIGDIR"
-@@ -23539,7 +23234,7 @@
+@@ -23539,7 +23299,7 @@
@@ -922,7 +777,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
-@@ -23547,7 +23242,7 @@
+@@ -23547,7 +23307,7 @@
@@ -931,7 +786,7 @@
cat >>confdefs.h <<_ACEOF
#define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
-@@ -23555,7 +23250,7 @@
+@@ -23555,7 +23315,7 @@
@@ -940,7 +795,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23588,9 +23283,193 @@
+@@ -23588,9 +23348,193 @@
@@ -1135,7 +990,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 +25036,6 @@
+@@ -25157,7 +25101,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.21 -r1.22 shtool
--- openpkg-src/openpkg/shtool 8 May 2004 19:17:37 -0000 1.21
+++ openpkg-src/openpkg/shtool 4 Jun 2004 13:11:06 -0000 1.22
@@ -2817,7 +2817,7 @@
AC="${AP}"
# determine system
v=`echo "${UNAME_RELEASE}" | sed -e 's;^[^0-9]*;;'`
- ST="[HP ]<HP>-<UX> ${v}"
+ ST="[HP ]<HP>-<UX ${v}>"
SP="${ST}"
case "${v}" in
10.* ) SC="SVR4.2" ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
