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: 08-Oct-2003 20:10:01
Branch: HEAD Handle: 2003100819100000
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
make sure RPM does not pick up headers of a vendor BeeCrypt package
under RedHat Linux
Summary:
Revision Changes Path
1.66 +1 -0 openpkg-src/openpkg/HISTORY
1.26 +3 -3 openpkg-src/openpkg/rpm.patch.bugfix
1.27 +4 -4 openpkg-src/openpkg/rpm.patch.feature
1.30 +20 -4 openpkg-src/openpkg/rpm.patch.porting
1.25 +46 -2 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.65 -r1.66 HISTORY
--- openpkg-src/openpkg/HISTORY 8 Oct 2003 10:06:48 -0000 1.65
+++ openpkg-src/openpkg/HISTORY 8 Oct 2003 18:10:00 -0000 1.66
@@ -2,6 +2,7 @@
2003
====
+20031008 make sure RPM does not pick up headers of a vendor BeeCrypt package under
RedHat Linux
20031008 fix --makeproxy command after recent OpenPKG branding in "rpm --version"
output
20031006 add 'Provides: openpkg = 1.3.1-1.3.1' for easier mixing with OpenPKG 1.3
release packages
20031006 add OpenPKG branding to "rpm --version" output
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.25 -r1.26 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 6 Oct 2003 16:42:44 -0000 1.25
+++ openpkg-src/openpkg/rpm.patch.bugfix 8 Oct 2003 18:10:00 -0000 1.26
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Oct-2003
+## Created on: 08-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -49,7 +49,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -0000
@@ -348,7 +349,7 @@
AC_MSG_CHECKING(for $dir/include in INCPATH)
@@ -66,7 +66,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -0000
@@ -1274,7 +1298,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.26 -r1.27 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 6 Oct 2003 16:42:44 -0000 1.26
+++ openpkg-src/openpkg/rpm.patch.feature 8 Oct 2003 18:10:00 -0000 1.27
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Oct-2003
+## Created on: 08-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -684,7 +684,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -718,7 +718,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -0000
@@ -310,7 +311,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
@@ -734,7 +734,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -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.29 -r1.30 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 6 Oct 2003 16:42:44 -0000 1.29
+++ openpkg-src/openpkg/rpm.patch.porting 8 Oct 2003 18:10:00 -0000 1.30
@@ -10,19 +10,35 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Oct-2003
+## Created on: 08-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
##
+---------------------------------------------------------------------------
+| Do not pick of the vendor BeeCrypt package on RedHat Linux.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 8 Oct 2003 18:03:40 -0000
+@@ -416,7 +417,7 @@
+ AC_CHECK_HEADER([beecrypt/beecrypt.h], [
+ AC_CHECK_LIB(beecrypt, mpfprintln, [
+ AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the `beecrypt'
library (-lbeecrypt).])
+- WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
++ WITH_BEECRYPT_INCLUDE=""
+ WITH_BEECRYPT_LIB="-lbeecrypt"
+ ])
+ ], [
+
++---------------------------------------------------------------------------
| Disable any POSIX Pthread stuff because in OpenPKG we use
| non-Pthread mutexes in Berkeley-DB.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -0000
@@ -446,14 +447,14 @@
AC_CHECK_LIB(socket, socket)
])
@@ -52,7 +68,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -0000
@@ -963,12 +964,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -79,7 +95,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Sep 2003 10:11:52 -0000
++++ configure.ac 8 Oct 2003 18:03:40 -0000
@@ -1249,11 +1251,33 @@
AC_SUBST(OBJDUMP)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.24 -r1.25 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 6 Oct 2003 16:42:44 -0000 1.24
+++ openpkg-src/openpkg/rpm.patch.regen 8 Oct 2003 18:10:00 -0000 1.25
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Oct-2003
+## Created on: 08-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -105,7 +105,15 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 15 Sep 2003 10:59:16 -0000
++++ configure 8 Oct 2003 18:04:18 -0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.57.
++# Generated by GNU Autoconf 2.57 (OpenPKG-CURRENT).
+ #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
@@ -467,7 +467,7 @@
# include <unistd.h>
#endif"
@@ -115,6 +123,15 @@
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=''
+@@ -1135,7 +1135,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.57. Invocation command line was
++generated by GNU Autoconf 2.57 (OpenPKG-CURRENT). Invocation command line was
+
+ $ $0 $@
+
@@ -4040,7 +4040,7 @@
AS=${AS-as}
@@ -204,6 +221,15 @@
INCPATH="$INCPATH -I$dir/include"
fi
echo "$as_me:$LINENO: result: yes" >&5
+@@ -12051,7 +12052,7 @@
+ #define HAVE_LIBBEECRYPT 1
+ _ACEOF
+
+- WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
++ WITH_BEECRYPT_INCLUDE=""
+ WITH_BEECRYPT_LIB="-lbeecrypt"
+
+ fi
@@ -12648,350 +12649,6 @@
@@ -817,6 +843,24 @@
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"
+@@ -23977,7 +23826,7 @@
+ cat >&5 <<_CSEOF
+
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.57. Invocation command line was
++generated by GNU Autoconf 2.57 (OpenPKG-CURRENT). Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -24040,7 +23889,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.57,
++configured by $0, generated by GNU Autoconf 2.57 (OpenPKG-CURRENT),
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -25157,7 +25006,6 @@
esac
done ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
