diff -r b363f8ef6dcb -r 9b4bbbae3a98 openpkg/rpm.patch.regen
--- a/openpkg/rpm.patch.regen	Tue Jul 31 12:27:54 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1038 +0,0 @@
-##
-##  rpm.patch.regen -- Annotated OpenPKG RPM Patch file
-##  Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
-##  Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
-##
-##  This file assembles changes to existing RPM source files between
-##  the original RedHat RPM and the OpenPKG RPM variant. It can be
-##  automatically applied to a vanilla RedHat RPM source tree with the
-##  'patch' tool to upgrade those files. Each patch snippet is annotated
-##  with a short description.
-##
-##  Created on: 13-Sep-2006
-##
-##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
-##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
-##
-
-+---------------------------------------------------------------------------
-| Corresponding patches in "config.h.in" script after regeneration from
-| patched "configure.ac" with "autoheader".
-+---------------------------------------------------------------------------
-Index: config.h.in
---- config.h.in	16 Jul 2003 17:17:13 -0000	1.1.1.18
-+++ config.h.in	13 Sep 2006 13:41:41 -0000
-@@ -108,6 +108,9 @@
- /* Define if you have the getmntent() function */
- #undef HAVE_GETMNTENT
- 
-+/* Define as 1 if you have the getmntinfo() function */
-+#undef HAVE_GETMNTINFO
-+
- /* Define as 1 if you have getmntinfo_r() (only osf?) */
- #undef HAVE_GETMNTINFO_R
- 
-@@ -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
- 
-@@ -586,6 +574,17 @@
- /* Define to `unsigned' if <sys/types.h> does not define. */
- #undef size_t
- 
-+#ifndef HAVE_STDINT_H
-+/* uint16_t */
-+#undef uint16_t
-+
-+/* uint32_t */
-+#undef uint32_t
-+
-+/* uint8_t */
-+#undef uint8_t
-+#endif
-+
- /* Define to unsigned long or unsigned long long if <inttypes.h> and
-    <stdint.h> don't define. */
- #undef uintmax_t
-
-+---------------------------------------------------------------------------
-| Corresponding patches in "configure" script after regeneration from
-| patched "configure.ac" with "autoconf".
-+---------------------------------------------------------------------------
-Index: configure
---- configure	16 Jul 2003 17:05:55 -0000	1.1.1.23
-+++ configure	13 Sep 2006 13:41:43 -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 -O2 -D_GNU_SOURCE -D_REENTRANT"
- fi
- export CFLAGS
- 
-@@ -4837,16 +4837,13 @@
- 	# just link it dynamically
- 	LDFLAGS_STATIC=""
- fi
-+LDFLAGS_STATIC="" # OpenPKG wants dynamically linked RPM tools
- LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}"	# libtool format
- echo "$as_me:$LINENO: result: $LDFLAGS_STATIC" >&5
- echo "${ECHO_T}$LDFLAGS_STATIC" >&6
- 
- 
- 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
--	MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`"
-+	MKDIR_P="@l_prefix@/lib/openpkg/shtool mkdir -f -p -m 755"
- else
- 	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -5878,6 +5875,7 @@
-     ;;
-   *) # Darwin 1.3 on
-     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    lt_cv_deplibs_check_method=pass_all
-     ;;
-   esac
-   ;;
-@@ -5903,7 +5901,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 +5940,7 @@
-   ;;
- 
- netbsd*)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
--  fi
-+  lt_cv_deplibs_check_method='pass_all'
-   ;;
- 
- newos6*)
-@@ -5981,7 +5975,7 @@
-   lt_cv_file_magic_test_file=/lib/libc.so
-   ;;
- 
--sysv5uw[78]* | sysv4*uw2*)
-+sysv5uw[78]* | sysv4*uw2* | sysv5UnixWare7* )
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -6682,7 +6676,7 @@
- case $host in
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6685 "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 +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: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 +8063,7 @@
-     runpath_var=LD_RUN_PATH
-     ;;
- 
--  sysv5uw7* | unixware7*)
-+  sysv5uw7* | unixware7* | sysv5UnixWare7* )
-     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 +8389,7 @@
-   libsuff=
-   case "$host_cpu" in
-   x86_64*|s390x*)
--    echo '#line 8398 "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 +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 9064 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -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 9162 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11266,7 +11260,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}"
-@@ -11284,44 +11278,6 @@
- 
- localdone=
- 
--dirs=$prefix
--if test "$cross_compiling" != "yes"; then
--  dirs="$dirs /usr/local"
--fi
--for dir in $dirs
--do
--	case $dir in
--	NONE|/usr)	continue;;
--	/usr/local)
--		if test X$localdone != X ; then continue; fi
--		localdone="$dir"
--		;;
--	esac
--
--	echo "$as_me:$LINENO: checking for $dir/lib in LIBS" >&5
--echo $ECHO_N "checking for $dir/lib in LIBS... $ECHO_C" >&6
--	if test -d $dir/lib 2> /dev/null ; then
--		addlib $dir/lib
--		echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--	else
--		echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--	fi
--
--	echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
--echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
--	if test -d $dir/include 2>/dev/null ; then
--		if  "$dir" != "/usr/local"  ; then
--		    INCPATH="$INCPATH -I$dir/include"
--		fi
--		echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--	else
--		echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--	fi
--done
- 
- 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 +12007,7 @@
- #define HAVE_LIBBEECRYPT 1
- _ACEOF
- 
--	    WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
-+	    WITH_BEECRYPT_INCLUDE=""
- 	    WITH_BEECRYPT_LIB="-lbeecrypt"
- 
- fi
-@@ -12647,287 +12603,13 @@
- 
- 
- 
--
--
--
--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 bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_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 bug-autoconf@gnu.org. ##
--## ------------------------------------ ##
--_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 "$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 +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.  */
--char mutex_lock ();
-+char svc_run ();
- int
- main ()
- {
--mutex_lock ();
-+svc_run ();
-   ;
-   return 0;
- }
-@@ -12963,33 +12645,28 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_thread_mutex_lock=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_nsl_svc_run=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
-+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_LIBNSL 1
- _ACEOF
- 
--  LIBS="-lthread $LIBS"
--
--fi
--
-+  LIBS="-lnsl $LIBS"
- 
- fi
- 
- 
--fi
--
- 
- 
- for ac_header in aio.h
-@@ -22911,6 +22588,86 @@
- 
- else
- 
-+ echo "$as_me:$LINENO: checking for getmntinfo" >&5
-+echo $ECHO_N "checking for getmntinfo... $ECHO_C" >&6
-+if test "${ac_cv_func_getmntinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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.  */
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getmntinfo (); 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 getmntinfo ();
-+/* 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_getmntinfo) || defined (__stub___getmntinfo)
-+choke me
-+#else
-+char (*f) () = getmntinfo;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != getmntinfo;
-+  ;
-+  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_getmntinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_getmntinfo=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_getmntinfo" >&5
-+echo "${ECHO_T}$ac_cv_func_getmntinfo" >&6
-+if test $ac_cv_func_getmntinfo = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETMNTINFO 1
-+_ACEOF
-+
-+else
-+
-   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 +22905,8 @@
- 
- fi
- 
-+fi
-+
- 
- echo "$as_me:$LINENO: checking for lchown" >&5
- echo $ECHO_N "checking for lchown... $ECHO_C" >&6
-@@ -23454,9 +23213,6 @@
- fi
- 
- MARK64=
--case "${target_cpu}" in
--x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
--esac
- 
- 
- autorelocate_path='%{nil}'
-@@ -23515,7 +23271,7 @@
- 
- LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
- 
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="@l_prefix@/lib/openpkg"
- 
- cat >>confdefs.h <<_ACEOF
- #define RPMCONFIGDIR "$RPMCONFIGDIR"
-@@ -23523,7 +23279,7 @@
- 
- 
- 
--SYSCONFIGDIR="`echo /etc/rpm`"
-+SYSCONFIGDIR="@l_prefix@/etc/openpkg"
- 
- cat >>confdefs.h <<_ACEOF
- #define SYSCONFIGDIR "$SYSCONFIGDIR"
-@@ -23539,7 +23295,7 @@
- 
- 
- 
--LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
-+LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc"
- 
- cat >>confdefs.h <<_ACEOF
- #define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
-@@ -23547,7 +23303,7 @@
- 
- 
- 
--VENDORRPMRC_FILENAME="${RPMCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
-+VENDORRPMRC_FILENAME="${SYSCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
- 
- cat >>confdefs.h <<_ACEOF
- #define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
-@@ -23555,7 +23311,7 @@
- 
- 
- 
--LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}"
-+LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
- 
- cat >>confdefs.h <<_ACEOF
- #define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23588,9 +23344,202 @@
- 
- 
- 
-+echo "$as_me:$LINENO: checking for uint8_t" >&5
-+echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
-+if test "${ac_cv_type_uint8_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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.  */
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "(^|[^a-zA-Z_0-9])uint8_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+  ac_cv_type_uint8_t=yes
-+else
-+  ac_cv_type_uint8_t=no
-+fi
-+rm -f conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
-+if test $ac_cv_type_uint8_t = no; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define uint8_t unsigned char
-+_ACEOF
-+
-+fi
-+echo "$as_me:$LINENO: checking for uint16_t" >&5
-+echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
-+if test "${ac_cv_type_uint16_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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.  */
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "(^|[^a-zA-Z_0-9])uint16_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+  ac_cv_type_uint16_t=yes
-+else
-+  ac_cv_type_uint16_t=no
-+fi
-+rm -f conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
-+if test $ac_cv_type_uint16_t = no; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define uint16_t unsigned short
-+_ACEOF
-+
-+fi
-+echo "$as_me:$LINENO: checking for uint32_t" >&5
-+echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
-+if test "${ac_cv_type_uint32_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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.  */
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+  ac_cv_type_uint32_t=yes
-+else
-+  ac_cv_type_uint32_t=no
-+fi
-+rm -f conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
-+if test $ac_cv_type_uint32_t = no; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define uint32_t unsigned int
-+_ACEOF
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for madvise" >&5
-+echo $ECHO_N "checking for madvise... $ECHO_C" >&6
-+if test "${ac_cv_func_madvise+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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.  */
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char madvise (); 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 madvise ();
-+/* 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_madvise) || defined (__stub___madvise)
-+choke me
-+#else
-+char (*f) () = madvise;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != madvise;
-+  ;
-+  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_madvise=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_madvise=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_madvise" >&5
-+echo "${ECHO_T}$ac_cv_func_madvise" >&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 +25106,6 @@
-       esac
-     done ;;
-     default ) 	echo timestamp > popt/stamp-h.in
--	echo timestamp > beecrypt/stamp-h.in
- 	echo timestamp > stamp-h.in
- 
-  ;;
-
-+---------------------------------------------------------------------------
-| Corresponding patches in "configure" script after regeneration from
-| patched "configure.ac" with "autoconf".
-+---------------------------------------------------------------------------
-Index: popt/configure
---- popt/configure	16 Jul 2003 17:04:51 -0000	1.1.1.16
-+++ popt/configure	12 May 2004 14:34:35 -0000	1.18
-@@ -9359,9 +9359,6 @@
- 
- 
- MARK64=
--case "${target_cpu}" in
--x86_64*|powerpc64*|ppc64*|sparc64*|s390x*)        MARK64=64 ;;
--esac
- 
- 
-