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: 23-Aug-2003 23:32:54
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082322325400
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.boot
Log:
fix bootstrapping from scratch (rpmpopt now has no longer a version
extension) and install the OpenPKG OpenPGP public key into RPM
database initially so one can out-of-the-box verify signed packages
(due to BeeCrypt not even GPG is required)
Summary:
Revision Changes Path
1.28.2.2 +8 -1 openpkg-src/openpkg/openpkg.boot
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.28.2.1 -r1.28.2.2 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 22 Aug 2003 10:57:07 -0000 1.28.2.1
+++ openpkg-src/openpkg/openpkg.boot 23 Aug 2003 21:32:54 -0000 1.28.2.2
@@ -449,7 +449,7 @@
# use an own $HOME/.popt in order to make sure the "rpm"
# tool is able to execute its sub-tools "rpm<x>".
V_rpm=`grep V_rpm $spec | head -1 | awk '{ printf("%s", $3); }'`
-sed <$RPM_BUILD_ROOT$prefix/lib/openpkg/rpmpopt-${V_rpm} >$tmpdir/.popt \
+sed <$RPM_BUILD_ROOT$prefix/lib/openpkg/rpmpopt >$tmpdir/.popt \
-e
"s;^\\(rpm.*exec.*\\)\\(rpm[bdeukv]*\\);\\1$RPM_BUILD_ROOT$prefix/lib/openpkg/\\2;"
# activate the .popt file
@@ -496,6 +496,13 @@
echo "++ overwriting RPM installation by installing via RPM itself"
$tmpdir/rpm --install --justdb --force --noscripts --notriggers --ignoresize \
$RPM_BUILD_ROOT$prefix/RPM/PKG/openpkg-*.rpm
+
+##
+## install OpenPKG OpenPGP public key into RPM database
+##
+
+echo "++ installing OpenPKG OpenPGP public key into RPM database"
+$tmpdir/rpm --import $RPM_BUILD_ROOT$prefix/etc/openpkg/openpkg.pgp
## Puhhhh!!! what a tricky bootstrapping procedure. But now we are
## mostly finished. All we finally have to do is to roll a bootstrap
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
