# HG changeset patch # User Michael Schloh von Bennewitz # Date 1343863739 -7200 # Node ID 43a74e63d4a3e671a1a1a3f5353847fa590b1f2c # Parent 59ebdf31607e8640912dadc8e61cd99a2c9b8149 Correct typical english grammar mistakes in german linguistics. diff -r 59ebdf31607e -r 43a74e63d4a3 openpkg/README --- a/openpkg/README Thu Aug 02 01:14:45 2012 +0200 +++ b/openpkg/README Thu Aug 02 01:28:59 2012 +0200 @@ -19,8 +19,8 @@ make-*.tar.gz ........... untouched distribution tarball of the GNU make tool tar-*.tar.gz ............ untouched distribution tarball of the GNU tar tool config-*.tar.gz ......... untouched distribution tarball of the GNU config scripts - gzip-*.tar .............. pre-unpacked distribution tarball of the GNU gzip tool - gzip-*-openpkg-r*.tar ... pre-patched distribution files of the GNU gzip tool + gzip-*.tar .............. preunpacked distribution tarball of the GNU gzip tool + gzip-*-openpkg-r*.tar ... prepatched distribution files of the GNU gzip tool perl-*-mini.tar.gz ...... stripped down distribution tarball of the Perl tool rpm-*.tar.gz ............ untouched distribution tarball of the RPM tool openssl-*.tar.gz ........ untouched distribution tarball of the OpenSSL toolkit @@ -62,26 +62,26 @@ dot.bash_login .......... the source for installed /.bash_login dot.lsyncrc ............. the source for installed /local/.lsyncrc - openpkg.c ............... the OpenPKG frontend (set-uid wrapper) + openpkg.c ............... the OpenPKG frontend (setuid wrapper) openpkg.mk .............. the OpenPKG frontend (build procedure) openpkg.sh .............. the OpenPKG frontend (main script) openpkg.pod ............. the OpenPKG frontend manual page (source) - openpkg.1 ............... the OpenPKG frontend manual page (pre-generated output) + openpkg.1 ............... the OpenPKG frontend manual page (pregenerated output) - rc ...................... the OpenPKG run-command handling script - rc.func ................. the OpenPKG run-command function definitions - rc.conf ................. the OpenPKG run-command configuration template - rc.openpkg .............. the OpenPKG run-command script for the bootstrap package - rc.pod .................. the OpenPKG run-command script manual page (source) - rc.8 .................... the OpenPKG run-command script manual page (pre-generated output) + rc ...................... the OpenPKG runcommand handling script + rc.func ................. the OpenPKG runcommand function definitions + rc.conf ................. the OpenPKG runcommand configuration template + rc.openpkg .............. the OpenPKG runcommand script for the bootstrap package + rc.pod .................. the OpenPKG runcommand script manual page (source) + rc.8 .................... the OpenPKG runcommand script manual page (pregenerated output) release.sh .............. the OpenPKG release information utility script release.pod ............. the OpenPKG release information utility manual page (source) - release.8 ............... the OpenPKG release information utility manual page (pre-generated output) + release.8 ............... the OpenPKG release information utility manual page (pregenerated output) uuid.sh ................. the OpenPKG UUID management utility script uuid.pod ................ the OpenPKG UUID management utility manual page (source) - uuid.8 .................. the OpenPKG UUID management utility manual page (pre-generated output) + uuid.8 .................. the OpenPKG UUID management utility manual page (pregenerated output) rpmdb ................... the OpenPKG RPM database management utility @@ -92,7 +92,7 @@ rpm-config.sh ........... the RPM C API helper script rpm-config.pod .......... the RPM C API helper manual page (source) - rpm-config.8 ............ the RPM C API helper manual page (pre-generated output) + rpm-config.8 ............ the RPM C API helper manual page (pregenerated output) lsync ................... the lsync tool (program source) lsync.8 ................. the lsync tool (manual page) @@ -110,31 +110,31 @@ dev.pl .................. the OpenPKG package development utility script dev.pod ................. the OpenPKG package development utility manual page (source) - dev.8 ................... the OpenPKG package development utility manual page (pre-generated output) + dev.8 ................... the OpenPKG package development utility manual page (pregenerated output) index.pl ................ the OpenPKG package indexing utility script index.pod ............... the OpenPKG package indexing utility manual page (source) - index.8 ................. the OpenPKG package indexing utility manual page (pre-generated output) + index.8 ................. the OpenPKG package indexing utility manual page (pregenerated output) search.pl ............... the OpenPKG package searching utility script search.pod .............. the OpenPKG package searching utility manual page (source) - search.8 ................ the OpenPKG package searching utility manual page (pre-generated output) + search.8 ................ the OpenPKG package searching utility manual page (pregenerated output) sea.sh .................. the OpenPKG shell execution archive utility script sea.pod ................. the OpenPKG shell execution archive utility manual page (source) - sea.8 ................... the OpenPKG shell execution archive utility manual page (pre-generated output) + sea.8 ................... the OpenPKG shell execution archive utility manual page (pregenerated output) mirror.pl ............... the OpenPKG package mirroing utility script mirror.pod .............. the OpenPKG package mirroing utility manual page (source) - mirror.8 ................ the OpenPKG package mirroing utility manual page (pre-generated output) + mirror.8 ................ the OpenPKG package mirroing utility manual page (pregenerated output) build.pl ................ the OpenPKG package building utility script build.pod ............... the OpenPKG package building utility manual page (source) - build.8 ................. the OpenPKG package building utility manual page (pre-generated output) + build.8 ................. the OpenPKG package building utility manual page (pregenerated output) makeproxy.pl ............ the OpenPKG proxy package building utility script makeproxy.pod ........... the OpenPKG proxy package building utility manual page (source) - makeproxy.8 ............. the OpenPKG proxy package building utility manual page (pre-generated output) + makeproxy.8 ............. the OpenPKG proxy package building utility manual page (pregenerated output) openpkg.org.pgp ......... the OpenPGP public key "OpenPKG " openpkg.com.pgp ......... the OpenPGP public key "OpenPKG GmbH " @@ -142,7 +142,7 @@ license.sh .............. the OpenPKG license management utility script license.pod ............. the OpenPKG license management utility manual page (source) - license.8 ............... the OpenPKG license management utility manual page (pre-generated output) + license.8 ............... the OpenPKG license management utility manual page (pregenerated output) license-BOOT.txt ........ the OpenPKG Framework Bootstrapping License license-COMMUNITY.txt ... the OpenPKG Framework Community License license-EVAL.txt ........ the OpenPKG Framework Evaluation License @@ -194,7 +194,7 @@ final target filesystem path). Then the $OPENPKG_BOOT variable is set and the package is _again_ build via "openpkg.spec" -- but this time with the real OpenPKG RPM. To avoid unneccessary - re-compilation, the "openpkg.spec" skips "%prep", "%build" and + recompilation, the "openpkg.spec" skips "%prep", "%build" and "%install" sections if $OPENPKG_BOOT is defined. So, on this second build phase, only the "%files" section is effectively executed, i.e., a binary OpenPKG RPM package "openpkg-V-R.P-T.rpm" is rolled from the @@ -212,7 +212,7 @@ database. Instead we use the tricky "--justdb" option for "openpkg rpm" which means "openpkg rpm" behaves as it would install into the real location, but does not actually install anything. But as a - side-effect, the database inside the "build root" is now correct. + side effect, the database inside the "build root" is now correct. After this procedure, the "build root" contains the target filesystem hierarchy with OpenPKG RPM installed with itself. What is now just @@ -226,12 +226,12 @@ The result is the binary bootstrap script "openpkg-V-R.P-T.sh" which can be used to install the target hierarchy from scratch without - any pre-installed OpenPKG RPM. Nevertheless, the installed target + any preinstalled OpenPKG RPM. Nevertheless, the installed target hierarchy looks _exactly_ as it would have been installed with OpenPKG RPM. If one later wants to upgrade this hierarchy one can just use the generated (or a newer) "openpkg-V-R.P-T.rpm". - To allow one to easily repeat this from-source bootstrapping procedure + To allow one to easily repeat this from source bootstrapping procedure on other machines, one can run "./openpkg.boot -s" which rolls a "openpkg-V-R.src.sh" script which is a self-extracting script containing an attached tarball of the sources of this directory. This diff -r 59ebdf31607e -r 43a74e63d4a3 openpkg/etc.prereq.sh --- a/openpkg/etc.prereq.sh Thu Aug 02 01:14:45 2012 +0200 +++ b/openpkg/etc.prereq.sh Thu Aug 02 01:28:59 2012 +0200 @@ -1,6 +1,6 @@ #!/bin/sh ## -## etc.prereq.sh -- Platform Pre-Requisite Checks +## etc.prereq.sh -- Platform Prerequisite Checks ## Copyright (c) 2000-2012 OpenPKG GmbH ## ## This software is property of the OpenPKG GmbH, DE MUC HRB 160208. diff -r 59ebdf31607e -r 43a74e63d4a3 openpkg/etc.wrapbin.sh --- a/openpkg/etc.wrapbin.sh Thu Aug 02 01:14:45 2012 +0200 +++ b/openpkg/etc.wrapbin.sh Thu Aug 02 01:28:59 2012 +0200 @@ -179,7 +179,7 @@ echo "BOOT" >$l_prefix/etc/openpkg/license # fixate installation files -# (ATTENTION: order of chgrp/chown and chmod is important because of "set-UID" bits) +# (ATTENTION: order of chgrp/chown and chmod is important because of "setuid" bits) echo "++ fixating OpenPKG instance filesystem hierarchy" ( echo 'fixate () {' echo ' chgrp "$3" "$4"' @@ -192,7 +192,7 @@ ) | sh 2>/dev/null || true # running the embedded %post script -echo "++ post-processing OpenPKG bootstrap installation" +echo "++ postprocessing OpenPKG bootstrap installation" prefix="$l_prefix" susr='@SUSR@'; sgrp='@SGRP@' musr='@MUSR@'; mgrp='@MGRP@' @@ -233,7 +233,7 @@ echo " \$ ${l_prefix}/bin/openpkg rpm -Uvh ${l_prefix}/RPM/PKG/foo-*.rpm" echo "" echo "To leverage from remote indexes on download.openpkg.org and" - echo "conveniently generate a shell script for all-in-one downloading" + echo "conveniently generate a shell script for all in one downloading" echo "(openpkg curl), building (openpkg rpm --rebuild) and installing" echo "(openpkg rpm -Uvh) one or more OpenPKG RPM packages, including all" echo "their transitive dependencies, in topologically correct order:" @@ -256,12 +256,12 @@ ) | $l_prefix/lib/openpkg/rpmtool msg -b -t info # die explicitly just before the shell would discover -# that we carry mega-bytes of data with us... ;-) +# that we carry megabytes of data with us... ;-) exit 0 # the distribution tarball is appended in raw format directly to the # end of this script, just leaded by padding whitespaces which make -# sure that the tarball data starts at the pre-defined offset of 64KB. +# sure that the tarball data starts at the predefined offset of 64KB. # This allows us to unpack the tarball by just skipping the leading # 64KB (= 8192*8, see above). diff -r 59ebdf31607e -r 43a74e63d4a3 openpkg/etc.wrapsrc.sh --- a/openpkg/etc.wrapsrc.sh Thu Aug 02 01:14:45 2012 +0200 +++ b/openpkg/etc.wrapsrc.sh Thu Aug 02 01:28:59 2012 +0200 @@ -39,7 +39,7 @@ export LC_CTYPE umask 022 -# pre-parse command line options +# preparse command line options for opt do case $opt in @@ -146,12 +146,12 @@ rm -rf $l_dir >/dev/null 2>&1 # die explicitly just before the shell would discover -# that we carry mega-bytes of data with us... +# that we carry megabytes of data with us... exit 0 # the distribution tarball is appended in raw format directly to the # end of this script, just leaded by padding whitespaces which make -# sure that the tarball data starts at the pre-defined offset of 64KB. +# sure that the tarball data starts at the predefined offset of 64KB. # This allows us to unpack the tarball by just skipping the leading # 64KB (= 8192*8, see above).