OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Jul-2006 22:19:07
Branch: OPENPKG_2_5_SOLID Handle: 2006072821190401
Added files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/openpkg release.8 release.pod release.sh
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/openpkg build.sh install.sh lsync.8 openpkg.1 openpkg.boot
openpkg.sh openpkg.spec pod2man.sh rc rc.8
rpm-config.8 rpmmacros rpmtool rpmtool.8 uuid.8
uuid.sh
Log:
MFC: all changes from CURRENT except for addition of Perl and OpenSSL,
upgrade of GNU make and GNU bash, removal of Solaris SMF
Summary:
Revision Changes Path
1.1.2.3 +37 -30 openpkg-src/openpkg/build.sh
1.7.4.2 +13 -17 openpkg-src/openpkg/install.sh
1.6.10.1 +6 -6 openpkg-src/openpkg/lsync.8
1.2.8.1 +1 -1 openpkg-src/openpkg/openpkg.1
1.56.2.2 +3 -24 openpkg-src/openpkg/openpkg.boot
1.11.4.2 +1 -1 openpkg-src/openpkg/openpkg.sh
1.454.2.6 +24 -6 openpkg-src/openpkg/openpkg.spec
1.4.10.1 +1 -0 openpkg-src/openpkg/pod2man.sh
1.61.4.2 +1 -1 openpkg-src/openpkg/rc
1.6.8.1 +1 -1 openpkg-src/openpkg/rc.8
1.1.4.2 +219 -0 openpkg-src/openpkg/release.8
1.1.4.2 +122 -0 openpkg-src/openpkg/release.pod
1.1.4.2 +139 -0 openpkg-src/openpkg/release.sh
1.3.10.1 +1 -1 openpkg-src/openpkg/rpm-config.8
1.72.2.2 +5 -5 openpkg-src/openpkg/rpmmacros
1.45.2.2 +1 -1 openpkg-src/openpkg/rpmtool
1.9.10.1 +1 -1 openpkg-src/openpkg/rpmtool.8
1.1.12.1 +1 -1 openpkg-src/openpkg/uuid.8
1.6.4.2 +9 -6 openpkg-src/openpkg/uuid.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/build.sh
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 build.sh
--- openpkg-src/openpkg/build.sh 13 May 2006 12:24:21 -0000 1.1.2.2
+++ openpkg-src/openpkg/build.sh 28 Jul 2006 20:19:04 -0000 1.1.2.3
@@ -28,57 +28,51 @@
## in order to bootstrap the installation of the OpenPKG Tool Chain.
##
-# determine OpenPKG release and download URLs
-release=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{l_openpkg_release -F
"%s"}'`
-case "$release" in
- CURRENT )
- url_src="ftp://ftp.openpkg.org/current/SRC";
- url_upd=""
- ;;
- [0-9].[0-9] )
- url_src="ftp://ftp.openpkg.org/release/$release/SRC";
- url_upd="ftp://ftp.openpkg.org/release/$release/UPD";
- ;;
- * )
- echo "openpkg:ERROR: invalid OpenPKG release \"$release\"" 1>&2
- exit 1
- ;;
-esac
+# determine OpenPKG distribution URLs (part 1)
+url_raw=`$OPENPKG_PREFIX/bin/openpkg release --fmt="%u"`
+url_src=""
+url_upd=""
-# mimimum command line option parsing
+# minimum command line option parsing
while [ $# -gt 0 ]; do
case "$1" in
- -r ) shift; url_src="$1"; url_upd=""; shift ;;
- -r* ) url_src="${1/-r/}"; url_upd="" shift ;;
+ -r ) shift; url_raw="$1"; shift ;;
+ -r* ) url_raw="${1/-r/}"; shift ;;
* ) break ;;
esac
done
-case "$url_src" in
- /* ) url_src="file://$url_src" ;;
+case "$url_raw" in
+ /* ) url_raw="file://$url_raw" ;;
+esac
+
+# determine OpenPKG distribution URLs (part 2)
+case "$url_raw" in
+ */SRC ) ;;
+ */ ) url_src="${url_raw}SRC"; url_upd="${url_raw}UPD" ;;
+ * ) url_src="${url_raw}/SRC"; url_upd="${url_raw}/UPD" ;;
esac
# sanity check usage
if [ $# -eq 1 -a ".$1" = ".openpkg-tools" ]; then
:
else
- echo "openpkg:ERROR: still not available functionality \"build $*\""
1>&2
- echo "openpkg:INFO: This functionality is provided by the
\"openpkg-tools\" package only!" 1>&2
+ echo "openpkg:ERROR: still not available functionality \"build $*\""
1>&2
+ echo "openpkg:INFO: This functionality is provided by the
\"openpkg-tools\" package only!" 1>&2
echo "openpkg:INFO: Run the command \"$OPENPKG_PREFIX/bin/openpkg build
openpkg-tools | sh\" to" 1>&2
- echo "openpkg:INFO: bootstrap the \"openpkg-tools\" package for
additional functionality." 1>&2
- echo "openpkg:INFO: This bootstrap version only supports this particular
build command." 1>&2
+ echo "openpkg:INFO: bootstrap the \"openpkg-tools\" package for
additional functionality." 1>&2
+ echo "openpkg:INFO: This bootstrap version only supports this particular
build command." 1>&2
exit 1
fi
# determine path to binary RPMs
rpmdir=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_rpmdir}'`
-rpmtag=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{l_platform -p}-%{l_tag}'`
# iterate through package installation in dependency order
for pkg in openpkg make binutils gcc perl openpkg-tools; do
# determine latest package version and URL
pkg_srpm=""
pkg_name=""
- for url in $url_upd $url_src; do
+ for url in $url_upd $url_src $url_raw; do
if [ ".$url" = . ]; then
continue
fi
@@ -101,7 +95,10 @@
if [ ".$url_upd" != . ]; then
echo "openpkg:ERROR: $url_upd" 1>&2
fi
- echo "openpkg:ERROR: $url_src" 1>&2
+ if [ ".$url_src" != . ]; then
+ echo "openpkg:ERROR: $url_src" 1>&2
+ fi
+ echo "openpkg:ERROR: $url_raw" 1>&2
exit 1
fi
@@ -110,12 +107,22 @@
continue
fi
+ # determine RPM binary tag
+ # (has to be done _INSIDE_ the loop because of potential
+ # platform changes during bootstrap upgrading!)
+ rpmfilename=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_rpmfilename}'`
+ rpmtargetcpu=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_target_cpu}'`
+ rpmtargetos=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{_target_os}'`
+ rpmtag=`echo "$rpmfilename" |\
+ sed -e 's;^%{NAME}-%{VERSION}-%{RELEASE}\.\(.*\)\.rpm$;\1;' \
+ -e "s;%{ARCH};$rpmtargetcpu;" -e "s;%{OS};$rpmtargetos;"`
+
# output build commands
- echo ":::: $pkg_srpm ::::"
+ echo "echo :::: $pkg_srpm ::::"
if [ ! -f "$rpmdir/$pkg_name.$rpmtag.rpm" ]; then
echo "$OPENPKG_PREFIX/bin/openpkg rpm --rebuild $pkg_srpm || exit
\$?"
fi
echo "$OPENPKG_PREFIX/bin/openpkg rpm -Uvh $rpmdir/$pkg_name.$rpmtag.rpm
|| exit \$?"
- echo ":::: $pkg_srpm = \$? ::::"
+ echo "echo :::: $pkg_srpm = \$? ::::"
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
============================================================================
$ cvs diff -u -r1.7.4.1 -r1.7.4.2 install.sh
--- openpkg-src/openpkg/install.sh 13 May 2006 12:24:21 -0000 1.7.4.1
+++ openpkg-src/openpkg/install.sh 28 Jul 2006 20:19:04 -0000 1.7.4.2
@@ -40,21 +40,14 @@
exit 1
fi
-# determine OpenPKG release and download URLs
-release=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{l_openpkg_release -F
"%s"}'`
-case "$release" in
- CURRENT )
- url_src="ftp://ftp.openpkg.org/current/SRC";
- url_upd=""
- ;;
- [0-9].[0-9] )
- url_src="ftp://ftp.openpkg.org/release/$release/SRC";
- url_upd="ftp://ftp.openpkg.org/release/$release/UPD";
- ;;
- * )
- echo "openpkg:ERROR: invalid OpenPKG release \"$release\"" 1>&2
- exit 1
- ;;
+# determine OpenPKG distribution URLs
+url_raw=`$OPENPKG_PREFIX/bin/openpkg release --fmt="%u"`
+url_src=""
+url_upd=""
+case "$url_raw" in
+ */SRC ) ;;
+ */ ) url_src="${url_raw}SRC"; url_upd="${url_raw}UPD" ;;
+ * ) url_src="${url_raw}/SRC"; url_upd="${url_raw}/UPD" ;;
esac
# determine path to binary RPMs
@@ -66,7 +59,7 @@
# determine latest package version and URL
pkg_srpm=""
pkg_name=""
- for url in $url_upd $url_src; do
+ for url in $url_upd $url_src $url_raw; do
if [ ".$url" = . ]; then
continue
fi
@@ -89,7 +82,10 @@
if [ ".$url_upd" != . ]; then
echo "openpkg:ERROR: $url_upd" 1>&2
fi
- echo "openpkg:ERROR: $url_src" 1>&2
+ if [ ".$url_src" != . ]; then
+ echo "openpkg:ERROR: $url_src" 1>&2
+ fi
+ echo "openpkg:ERROR: $url_raw" 1>&2
exit 1
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/lsync.8
============================================================================
$ cvs diff -u -r1.6 -r1.6.10.1 lsync.8
--- openpkg-src/openpkg/lsync.8 18 Apr 2004 11:28:24 -0000 1.6
+++ openpkg-src/openpkg/lsync.8 28 Jul 2006 20:19:04 -0000 1.6.10.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -326,11 +326,11 @@
released and so only used at sd&m and on all machines which were under
control of Ralf S. Engelschall.
.PP
-For Cable & Wireless Deutschland GmbH, Munich, the old \fBGenOPT\fR
-principle was again needed to manage the \f(CW\*(C`/cw/local\*(C'\fR area on
their
-servers. For this in November 2000 the functionality of \fBGenOPT\fR was
-revised, heavily stripped down and finally implemented from scratch. The
-result is the current \fBopenpkg lsync\fR.
+For Cable & Wireless, Munich, the old \fBGenOPT\fR principle was again
+needed to manage the \f(CW\*(C`/cw/local\*(C'\fR area on their servers. For
this in
+November 2000 the functionality of \fBGenOPT\fR was revised, heavily
+stripped down and finally implemented from scratch. The result is the
+current \fBopenpkg lsync\fR.
.SH "AUTHOR"
.IX Header "AUTHOR"
.Vb 3
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.1
============================================================================
$ cvs diff -u -r1.2 -r1.2.8.1 openpkg.1
--- openpkg-src/openpkg/openpkg.1 21 Jul 2004 14:30:30 -0000 1.2
+++ openpkg-src/openpkg/openpkg.1 28 Jul 2006 20:19:04 -0000 1.2.8.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
.\"
.\" Standard preamble:
.\" ========================================================================
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.56.2.1 -r1.56.2.2 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 13 May 2006 12:24:22 -0000 1.56.2.1
+++ openpkg-src/openpkg/openpkg.boot 28 Jul 2006 20:19:04 -0000 1.56.2.2
@@ -194,18 +194,7 @@
sh $tmpdir/.sh
rm -f $tmpdir/.sh
l_version="$release"
- case "${l_version}" in
- [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
- l_release="CURRENT"
- ;;
- * )
- l_release=`echo "${l_version}" |\
- sed -e 's;^;#;' \
- -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
- -e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
- -e 's;^#.*;UNKNOWN;'`
- ;;
- esac
+ l_release=`sh ./release.sh -r "${l_version}" -F "%t"`
sed <$srcdir/aux.wrapsrc.sh >$tmpdir/openpkg.boot.tmp \
-e "s;@l_dir@;$name-$version-$release.src;" \
-e "s;@l_release@;$l_release;" \
@@ -524,18 +513,8 @@
$RPM_BUILD_ROOT$prefix/openpkg.bzip2
l_platform=`$tmpdir/rpm --eval '%{l_platform -p}'`
l_version=`$tmpdir/rpm -q --qf '%{version}' openpkg`
-case "${l_version}" in
- [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
- l_release="CURRENT"
- ;;
- * )
- l_release=`echo "${l_version}" |\
- sed -e 's;^;#;' \
- -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
- -e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
- -e 's;^#.*;UNKNOWN;'`
- ;;
-esac
+release_sh=`SOURCE release.sh`
+l_release=`sh $release_sh -r "$l_version" -F "%t"`
cat $spec |\
sed -e "/^%pre$/,/^%/ p" -e 'd' |\
sed -e '/^%/d' -e 's/^ //' |\
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.sh
============================================================================
$ cvs diff -u -r1.11.4.1 -r1.11.4.2 openpkg.sh
--- openpkg-src/openpkg/openpkg.sh 13 May 2006 12:24:22 -0000 1.11.4.1
+++ openpkg-src/openpkg/openpkg.sh 28 Jul 2006 20:19:04 -0000 1.11.4.2
@@ -241,7 +241,7 @@
if [ -x ${openpkg_prefix}/bin/perl ]; then
cmd_shell="${openpkg_prefix}/bin/perl"
else
- cmd_shell=`${openpkg_prefix}/lib/openpkg/shtool path -m perl
2>&1`
+ cmd_shell=`${openpkg_prefix}/lib/openpkg/shtool path -p
"$PATH:$openpkg_prefix/lib/openpkg" -m perl 2>&1`
if [ ".${cmd_shell}" = . ]; then
echo "openpkg:ERROR: No Perl interpreter found in \${PATH}"
1>&2
exit 1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.454.2.5 -r1.454.2.6 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 13 May 2006 12:24:22 -0000
1.454.2.5
+++ openpkg-src/openpkg/openpkg.spec 28 Jul 2006 20:19:04 -0000
1.454.2.6
@@ -38,22 +38,22 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.5.2
+%define V_openpkg 2.5.3
# the used software versions
%define V_rpm 4.2.1
%define V_zlib 1.2.3
%define V_bzip2 1.0.3
%define V_beecrypt 4.1.2
-%define V_curl 7.15.3
+%define V_curl 7.15.4
%define V_make 3.80
%define V_gzip 1.3.5
%define V_patch 2.5.9
%define V_tar 1.15.1
%define V_bash 3.0
-%define V_uuid 1.4.2
-%define V_config 20051002
-%define V_registry 0.4.1
+%define V_uuid 1.5.0
+%define V_config 20060310
+%define V_registry 0.6.3
# package information
Name: openpkg
@@ -79,7 +79,7 @@
Source7: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
Source8: http://www.bzip.org/%{V_bzip2}/bzip2-%{V_bzip2}.tar.gz
Source9: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
-Source10:
http://osdn.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
+Source10:
http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
Source11: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
Source12: HISTORY
Source13: README
@@ -134,6 +134,9 @@
Source62: uuid.sh
Source63:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{V_registry}.tar.gz
Source64: build.sh
+Source65: release.sh
+Source66: release.pod
+Source67: release.8
# build information
Prefix: %{l_prefix}
@@ -425,6 +428,7 @@
s=`(uname -s) 2>/dev/null` || s='Unknown'
r=`(uname -r) 2>/dev/null` || r='0.0'
plid="${s}/${r}"
+ echo "plid=\"$plid\"; export plid" >>.buildenv
# determine platform-specific build environment
case $plid in
@@ -579,6 +583,8 @@
sh $shtool subst \
-e 's;@l_openpkg_release@;OpenPKG;' \
version.c
+ sleep 1
+ touch y.tab.[ch]
) || exit $?
( cd beecrypt-%{V_beecrypt}
${l_patch} -p0 <`SOURCE beecrypt.patch`
@@ -603,6 +609,8 @@
( cd make-%{V_make}
CC="${l_cc}" \
./configure \
+ --without-libiconv-prefix \
+ --without-libintl-prefix \
--disable-nls \
--disable-largefile
${l_make}
@@ -714,6 +722,7 @@
CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
+ GREP="grep" \
./configure \
--cache-file=./config.cache \
--without-ssl \
@@ -1022,6 +1031,7 @@
sed -e "s;@l_prefix@;%{l_prefix};g" \
register.sh >$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/register
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/register
+ cp register.8 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/register.8
) || exit $?
# install RPM extension
@@ -1065,6 +1075,11 @@
sed -e "s;@l_prefix@;%{l_prefix};g" \
<`SOURCE uuid.8` >$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/uuid.8
sed -e "s;@l_prefix@;%{l_prefix};g" \
+ <`SOURCE release.sh`
>$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/release
+ chmod a+x $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/release
+ sed -e "s;@l_prefix@;%{l_prefix};g" \
+ <`SOURCE release.8`
>$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/release.8
+ sed -e "s;@l_prefix@;%{l_prefix};g" \
-e "s;@l_musr@;%{l_musr};g" \
-e "s;@l_mgrp@;%{l_mgrp};g" \
<`SOURCE rpmdb` >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmdb
@@ -1325,6 +1340,9 @@
%{l_prefix}/libexec/openpkg/rpm
%{l_prefix}/libexec/openpkg/rpm.8
%{l_prefix}/libexec/openpkg/register
+ %{l_prefix}/libexec/openpkg/register.8
+ %{l_prefix}/libexec/openpkg/release
+ %{l_prefix}/libexec/openpkg/release.8
%dir %{l_prefix}/man
%dir %{l_prefix}/man/man1
%dir %{l_prefix}/man/man2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/pod2man.sh
============================================================================
$ cvs diff -u -r1.4 -r1.4.10.1 pod2man.sh
--- openpkg-src/openpkg/pod2man.sh 21 Feb 2004 19:11:34 -0000 1.4
+++ openpkg-src/openpkg/pod2man.sh 28 Jul 2006 20:19:05 -0000 1.4.10.1
@@ -5,3 +5,4 @@
pod2man --section=8 --center="OpenPKG" --release="LSYNC(8)"
--date="OpenPKG" --quotes=none lsync.pod >lsync.8
pod2man --section=8 --center="OpenPKG" --release="RPM-CONFIG(8)"
--date="OpenPKG" --quotes=none rpm-config.pod >rpm-config.8
pod2man --section=8 --center="OpenPKG" --release="UUID(8)"
--date="OpenPKG" --quotes=none uuid.pod >uuid.8
+pod2man --section=8 --center="OpenPKG" --release="RELEASE(8)"
--date="OpenPKG" --quotes=none release.pod >release.8
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.61.4.1 -r1.61.4.2 rc
--- openpkg-src/openpkg/rc 13 May 2006 12:24:23 -0000 1.61.4.1
+++ openpkg-src/openpkg/rc 28 Jul 2006 20:19:05 -0000 1.61.4.2
@@ -293,7 +293,7 @@
# check for upgraded package with unresolved configuration file
conflicts
if [ -d "$prefix/etc/$s_name" -a ".$eval" != .1 ]; then
- if [ ".`find $prefix/etc/$s_name -type f -print 2>/dev/null |
egrep -v '.*/\.(snap|snapshot)/.*' | egrep '.*\.rpm(new|orig|save)$'`" != . ];
then
+ if [ ".`(find $prefix/etc/$s_name -type f -print; find
$prefix/etc/$s_name -type l -print) 2>/dev/null | egrep -v
'.*/\.(snap|snapshot)/.*' | egrep '.*\.rpm(new|orig|save)$'`" != . ]; then
case "$cmd" in
start|restart ) type="ERROR" ;;
* ) type="WARNING" ;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.8
============================================================================
$ cvs diff -u -r1.6 -r1.6.8.1 rc.8
--- openpkg-src/openpkg/rc.8 25 Jul 2004 10:48:16 -0000 1.6
+++ openpkg-src/openpkg/rc.8 28 Jul 2006 20:19:05 -0000 1.6.8.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
.\"
.\" Standard preamble:
.\" ========================================================================
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/release.8
============================================================================
$ cvs diff -u -r0 -r1.1.4.2 release.8
--- /dev/null 2006-07-28 22:18:56 +0200
+++ release.8 2006-07-28 22:19:06 +0200
@@ -0,0 +1,219 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. | will give a
+.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used
to
+.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10
pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12
pitch
+. ds L" ""
+. ds R" ""
+. ds C`
+. ds C'
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr
for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. nr % 0
+. rr F
+.\}
+.\"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds :
\\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o
\\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "RELEASE 8"
+.TH RELEASE 8 "OpenPKG" "RELEASE(8)" "OpenPKG"
+.SH "NAME"
+\&\fBopenpkg release\fR \- OpenPKG Release Utility
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBopenpkg release\fR [\fB\-F\fR|\fB\-\-fmt\fR \fIformat\fR]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+The \fBopenpkg release\fR command displays the OpenPKG release tag and
+distribution \s-1URL\s0. The release tag uniquely identifies an OpenPKG
+distribution and the distribution \s-1URL\s0 is the location where the
+distribution packages and indices are stored.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-F\fR, \fB\-\-fmt\fR \fIformat\fR" 4
+.IX Item "-F, --fmt format"
+The output format specification. The argument \fIformat\fR is an arbitrary
+string which can contain the special expansion constructs "\f(CW%t\fR\*(L"
for
+expanding the release tag, \*(R"\f(CW%u\fR\*(L" for expanding the
distribution \s-1URL\s0
+and \*(R"\f(CW\*(C`\en\*(C'\fR" for expanding an embedded newline character.
The default
+\&\fIformat\fR is "\f(CW\*(C`OpenPKG\-%t %u\*(C'\fR".
+.IP "\fB\-r\fR, \fB\-\-release\fR \fIrelease\fR" 4
+.IX Item "-r, --release release"
+The package "\f(CW\*(C`Release\*(C'\fR" header value to use for deriving the
release
+tag. The values in the [EMAIL PROTECTED]@/etc/openpkg/release\fR file and the
+"\f(CW\*(C`Release\*(C'\fR" header of the bootstrap package \fBopenpkg\fR
are ignored if
+this option is used.
+.SH "FILES"
+.IX Header "FILES"
+.IP "[EMAIL PROTECTED]@/etc/openpkg/release\fR" 4
+.IX Item "@l_prefix@/etc/openpkg/release"
+This optional configuration file can be used to explicitly set values
+for the OpenPKG release tag and distribution URLs. It consists of lines
+with variable name/value pairs. The following configuration variables
+are recognized:
+.RS 4
+.IP "\fBTAG=\fR\fItag\fR" 4
+.IX Item "TAG=tag"
+The default \fItag\fR is automatically derived from the
"\f(CW\*(C`Version\*(C'\fR" header
+of the OpenPKG bootstrap package \fBopenpkg\fR. One usually only sets this
+explicitly to a value if a bootstrap package is used from a foreign
+distribution version.
+.IP "\fBURL=\fR\fIurl\fR" 4
+.IX Item "URL=url"
+The fully-qualified distribution \s-1URL\s0 based on either the
"\f(CW\*(C`ftp\*(C'\fR\*(L",
+\&\*(R"\f(CW\*(C`http\*(C'\fR\*(L" or \*(R"\f(CW\*(C`file\*(C'\fR"
\s-1URL\s0 schemes. If \fIurl\fR contains a trailing
+"\f(CW\*(C`/*\*(C'\fR", this is expanded according to the \fItag\fR value of
the \fB\s-1TAG\s0\fR
+variable and the corresponding filesystem layout on
\f(CW\*(C`ftp.openpkg.org\*(C'\fR.
+The default \fIurl\fR is "\f(CW\*(C`ftp://ftp.openpkg.org/*\*(C'\fR".
+.RS 4
+.RE
+.RS 4
+.SH "EXAMPLE"
+.IX Header "EXAMPLE"
+.Vb 2
+\& $ openpkg release
+\& OpenPKG-CURRENT ftp://ftp.openpkg.org/current/SRC/
+.Ve
+.Sp
+.Vb 2
+\& $ openpkg release --fmt=%t
+\& CURRENT
+.Ve
+.Sp
+.Vb 2
+\& $ openpkg release --fmt=%u
+\& ftp://ftp.openpkg.org/current/SRC/
+.Ve
+.Sp
+.Vb 3
+\& $ openpkg release --fmt="OpenPKG %t is located at:\e\en%u"
+\& OpenPKG CURRENT is located at:
+\& ftp://ftp.openpkg.org/current/SRC/
+.Ve
+.Sp
+.Vb 2
+\& $ openpkg release --release=2.5.4 --fmt=%t
+\& 2.5-RELEASE
+.Ve
+.Sp
+.Vb 3
+\& $ cat /openpkg/etc/openpkg/release
+\& TAG=2-STABLE-20060622
+\& URL=ftp://ftp.example.com/mirror/openpkg.org/*
+.Ve
+.SH "HISTORY"
+.IX Header "HISTORY"
+The \fBopenpkg release\fR command first appeared in \fBOpenPKG
2\-STABLE\-20060622\fR.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/release.pod
============================================================================
$ cvs diff -u -r0 -r1.1.4.2 release.pod
--- /dev/null 2006-07-28 22:18:56 +0200
+++ release.pod 2006-07-28 22:19:07 +0200
@@ -0,0 +1,122 @@
+##
+## release -- OpenPKG Release Utility
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+=pod
+
+=head1 NAME
+
+B<openpkg release> - OpenPKG Release Utility
+
+=head1 SYNOPSIS
+
+B<openpkg release> [B<-F>|B<--fmt> I<format>]
+
+=head1 DESCRIPTION
+
+The B<openpkg release> command displays the OpenPKG release tag and
+distribution URL. The release tag uniquely identifies an OpenPKG
+distribution and the distribution URL is the location where the
+distribution packages and indices are stored.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-F>, B<--fmt> I<format>
+
+The output format specification. The argument I<format> is an arbitrary
+string which can contain the special expansion constructs "C<%t>" for
+expanding the release tag, "C<%u>" for expanding the distribution URL
+and "C<\n>" for expanding an embedded newline character. The default
+I<format> is "C<OpenPKG-%t %u>".
+
+=item B<-r>, B<--release> I<release>
+
+The package "C<Release>" header value to use for deriving the release
+tag. The values in the F<@l_prefix@/etc/openpkg/release> file and the
+"C<Release>" header of the bootstrap package B<openpkg> are ignored if
+this option is used.
+
+=back
+
+=head1 FILES
+
+=over 4
+
+=item F<@l_prefix@/etc/openpkg/release>
+
+This optional configuration file can be used to explicitly set values
+for the OpenPKG release tag and distribution URLs. It consists of lines
+with variable name/value pairs. The following configuration variables
+are recognized:
+
+=over 4
+
+=item B<TAG=>I<tag>
+
+The default I<tag> is automatically derived from the "C<Version>" header
+of the OpenPKG bootstrap package B<openpkg>. One usually only sets this
+explicitly to a value if a bootstrap package is used from a foreign
+distribution version.
+
+=item B<URL=>I<url>
+
+The fully-qualified distribution URL based on either the "C<ftp>",
+"C<http>" or "C<file>" URL schemes. If I<url> contains a trailing
+"C</*>", this is expanded according to the I<tag> value of the B<TAG>
+variable and the corresponding filesystem layout on C<ftp.openpkg.org>.
+The default I<url> is "C<ftp://ftp.openpkg.org/*>".
+
+=over
+
+=back
+
+=head1 EXAMPLE
+
+ $ openpkg release
+ OpenPKG-CURRENT ftp://ftp.openpkg.org/current/SRC/
+
+ $ openpkg release --fmt=%t
+ CURRENT
+
+ $ openpkg release --fmt=%u
+ ftp://ftp.openpkg.org/current/SRC/
+
+ $ openpkg release --fmt="OpenPKG %t is located at:\\n%u"
+ OpenPKG CURRENT is located at:
+ ftp://ftp.openpkg.org/current/SRC/
+
+ $ openpkg release --release=2.5.4 --fmt=%t
+ 2.5-RELEASE
+
+ $ cat /openpkg/etc/openpkg/release
+ TAG=2-STABLE-20060622
+ URL=ftp://ftp.example.com/mirror/openpkg.org/*
+
+=head1 HISTORY
+
+The B<openpkg release> command first appeared in B<OpenPKG
2-STABLE-20060622>.
+
+=cut
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/release.sh
============================================================================
$ cvs diff -u -r0 -r1.1.4.2 release.sh
--- /dev/null 2006-07-28 22:18:56 +0200
+++ release.sh 2006-07-28 22:19:07 +0200
@@ -0,0 +1,139 @@
[EMAIL PROTECTED]@/lib/openpkg/bash
+##
+## release -- OpenPKG Release Determination Utility
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# configuration
+prefix="@l_prefix@"
+
+# minimum command line parsing
+opt_F="OpenPKG-%t %u"
+opt_r=""
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -F ) opt_F="$2"; shift; shift ;;
+ --fmt ) opt_F="$2"; shift; shift ;;
+ -F* ) opt_F="`expr ".$1" : '.-F\(.*\)'`"; shift ;;
+ --fmt=* ) opt_F="`expr ".$1" : '.--fmt=\(.*\)'`"; shift ;;
+ -r ) opt_r="$2"; shift; shift ;;
+ --release ) opt_r="$2"; shift; shift ;;
+ -r* ) opt_r="`expr ".$1" : '.-r\(.*\)'`"; shift ;;
+ --release=* ) opt_r="`expr ".$1" : '.--release=\(.*\)'`"; shift ;;
+ * ) break ;;
+ esac
+done
+
+# translate a release number to a release tag
+number_to_tag () {
+ sed -e 's;^;X;' \
+ -e
's;^X\([^.-][^.-]*\.[^.-][^.-]*\)\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].*$;\1-SOLID;'
\
+ -e 's;^X\([^.-][^.-]*\.[^.-][^.-]*\)\.[^.-][^.-]*.*$;\1-RELEASE;' \
+ -e 's;^X\([^.-][^.-]*\)\.[^.-][^.-]*.*$;\1-STABLE;' \
+ -e 's;^X[^.-][^.-]*.*$;CURRENT;' \
+ -e 's;^X.*$;UNKNOWN;'
+}
+
+# sanity check a release tag
+tag_sanity () {
+ sed -e 's;^;X;' \
+ -e 's;^X[^.-][^.-]*\.[^.-][^.-]*-RELEASE$;OK;' \
+ -e
's;^X[^.-][^.-]*\.[^.-][^.-]*-SOLID-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$;OK;'
\
+ -e 's;^X[^.-][^.-]*\.[^.-][^.-]*-SOLID$;OK;' \
+ -e
's;^X[^.-][^.-]*-STABLE-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$;OK;' \
+ -e 's;^X[^.-][^.-]*-STABLE$;OK;' \
+ -e 's;^XCURRENT-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$;OK;' \
+ -e 's;^XCURRENT$;OK;' \
+ -e 's;^X.*$;ERROR;'
+}
+
+# determine release
+tag=""
+if [ ".$opt_r" != . ]; then
+ tag=`echo ".$opt_r" | sed -e 's;^\.;;' | number_to_tag`
+elif [ -f "$prefix/etc/openpkg/release" ]; then
+ tag=`sed <$prefix/etc/openpkg/release \
+ -e 's;^;X;' \
+ -e 's;^X *TAG *= *\([^ ][^ ]*\).*;\1;' \
+ -e '/^X/d'`
+else
+ tag=`$prefix/bin/openpkg rpm \
+ -q --qf '%{VERSION}' openpkg | number_to_tag`
+fi
+if [ .`echo ".$tag" | sed -e 's;^\.;;' | tag_sanity` = .ERROR ]; then
+ echo "openpkg:release: WARNING: unable to determine OpenPKG release tag"
1>&2
+ tag="UNKNOWN"
+fi
+
+# determine distribution URL
+url=""
+if [ -f "$prefix/etc/openpkg/release" ]; then
+ url=`sed <$prefix/etc/openpkg/release \
+ -e 's;^;X;' \
+ -e 's;^X *URL *= *\([^ ][^ ]*\).*;\1;' \
+ -e '/^X/d'`
+fi
+if [ ".$url" = . ]; then
+ url="ftp://ftp.openpkg.org/*";
+fi
+case ".$url" in
+ */\* )
+ url=`echo ".$url" | sed -e 's;^\.;;' -e 's;/\*$;;'`
+ case "$tag" in
+ CURRENT )
+ url="$url/current/SRC/"
+ ;;
+ CURRENT-* )
+ version=`echo "$tag" | sed -e 's;^CURRENT-;;'`
+ url="$url/current/$version/"
+ ;;
+ *-STABLE )
+ version=`echo "$tag" | sed -e 's;^\(.*\)-STABLE$;\1;'`
+ url="$url/stable/$version/"
+ ;;
+ *-STABLE-* )
+ version=`echo "$tag" | sed -e
's;^\(.*\)-STABLE-\(.*\)$;\1.\2;'`
+ url="$url/stable/$version/"
+ ;;
+ *-SOLID )
+ version=`echo "$tag" | sed -e 's;^\(.*\)-SOLID$;\1;'`
+ url="$url/solid/$version/"
+ ;;
+ *-SOLID-* )
+ version=`echo "$tag" | sed -e
's;^\(.*\)-SOLID-\(.*\)$;\1.\2;'`
+ url="$url/solid/$version/"
+ ;;
+ *-RELEASE )
+ version=`echo "$tag" | sed -e 's;^\(.*\)-RELEASE$;\1;'`
+ url="$url/release/$version/"
+ ;;
+ esac
+ ;;
+esac
+
+# generate output
+echo "X$opt_F" |\
+sed -e 's/^X//' \
+ -e "s;%t;${tag};g" \
+ -e "s;%u;${url};g" \
+ -e 's/\\n/^/g' | tr '^' '\012'
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm-config.8
============================================================================
$ cvs diff -u -r1.3 -r1.3.10.1 rpm-config.8
--- openpkg-src/openpkg/rpm-config.8 21 Feb 2004 19:11:34 -0000 1.3
+++ openpkg-src/openpkg/rpm-config.8 28 Jul 2006 20:19:05 -0000 1.3.10.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
.\"
.\" Standard preamble:
.\" ========================================================================
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.72.2.1 -r1.72.2.2 rpmmacros
--- openpkg-src/openpkg/rpmmacros 13 May 2006 12:24:25 -0000 1.72.2.1
+++ openpkg-src/openpkg/rpmmacros 28 Jul 2006 20:19:05 -0000 1.72.2.2
@@ -26,7 +26,7 @@
##
# the OpenPKG release identification (for the current package or as a
fallback for the bootstrap package)
-%l_openpkg_release(F:) %(echo "%{?release}%{!?release:%(%{l_rpm} -q --qf
'%{release}' openpkg)}" | sed -e 's;^;X;' -e
's;^X\\([0-9][0-9]*\\.[0-9][0-9]*\\).*$;\\1;' -e
's;^X\\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\\)$;CURRENT;' -e
's;^X.*$;UNKNOWN;' | awk '{ printf(%{?-F:%{-F*}}%{!?-F:"OpenPKG-%s"}, $0); }')
+%l_openpkg_release(F:) %(%{l_prefix}/libexec/openpkg/release
--release="%{?release}%{!?release:%(%{l_rpm} -q --qf '%{release}' openpkg)}"
%{?-F:-F "%(echo "%{-F*}" | sed -e 's/%%s/%%t/g')"}%{!?-F:-F "OpenPKG-%%t"})
# the OpenPKG OIDs (root is officially registered at IANA)
%l_openpkg_oid 1.3.6.1.4.1.18749
@@ -42,8 +42,8 @@
%l_tag_fmt_opt %(uuid_ns="`%{l_uuid} -v3 ns:OID
%{l_openpkg_oid_tagfmtopt}`"; %{l_uuid} -v3 $uuid_ns '%{?_options}')
%l_tag_fmt_uuid %(%{l_uuid} -v1)
%l_tag_fmt_time %(date '+%%Y%%m%%d%%H%%M%%S')
-%l_tag_fmt_user %(%{l_shtool} echo -e '%u')
-%l_tag_fmt_host %(%{l_shtool} echo -e '%h%d')
+%l_tag_fmt_user %(%{l_shtool} echo -e '%%u')
+%l_tag_fmt_host %(%{l_shtool} echo -e '%%h%%d')
%l_tag_gen %{expand:%(echo '%{l_tag_fmt}' | sed -e
's/<\\([a-zA-Z][_a-zA-Z0-9]*\\)>/%%{l_tag_fmt_\\1}/g')}
%l_tag %(echo "%{l_tag_gen}" | sed -e 's;-;;g')
@@ -281,9 +281,9 @@
%l_whoami %((id -un) 2>/dev/null || (whoami) 2>/dev/null ||
(who am i | cut "-d " -f1) 2>/dev/null || echo $LOGNAME)
# macros for dynamically generating a %files list
-%l_files_defattr '%defattr(-,%{l_musr},%{l_mgrp})'
+%l_files_defattr '%%defattr(-,%{l_musr},%{l_mgrp})'
%l_files_all '%{l_prefix}'
-%l_files_noshared '%not %dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
+%l_files_noshared '%%not %%dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
%l_files_std() %l_files_defattr %l_files_all %l_files_noshared
# path to local build root
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.45.2.1 -r1.45.2.2 rpmtool
--- openpkg-src/openpkg/rpmtool 13 May 2006 12:24:25 -0000 1.45.2.1
+++ openpkg-src/openpkg/rpmtool 28 Jul 2006 20:19:05 -0000 1.45.2.2
@@ -545,7 +545,7 @@
# with it because Perl is a magnitude (factor 10!) faster than
# what we can do here in Bourne-Shell.
perl=''
- for dir in `echo $PATH | sed -e 's/:/ /g'` .; do
+ for dir in `echo "$PATH:@l_prefix@/lib/openpkg" | sed -e 's/:/ /g'`
.; do
[ ".$dir" = .. -o ".$dir" = . ] && continue
for tool in perl5 perl miniperl; do
if [ -f "$dir/$tool" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool.8
============================================================================
$ cvs diff -u -r1.9 -r1.9.10.1 rpmtool.8
--- openpkg-src/openpkg/rpmtool.8 21 Feb 2004 19:11:34 -0000 1.9
+++ openpkg-src/openpkg/rpmtool.8 28 Jul 2006 20:19:05 -0000 1.9.10.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
.\"
.\" Standard preamble:
.\" ========================================================================
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/uuid.8
============================================================================
$ cvs diff -u -r1.1 -r1.1.12.1 uuid.8
--- openpkg-src/openpkg/uuid.8 21 Feb 2004 19:11:34 -0000 1.1
+++ openpkg-src/openpkg/uuid.8 28 Jul 2006 20:19:05 -0000 1.1.12.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
.\"
.\" Standard preamble:
.\" ========================================================================
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/uuid.sh
============================================================================
$ cvs diff -u -r1.6.4.1 -r1.6.4.2 uuid.sh
--- openpkg-src/openpkg/uuid.sh 13 May 2006 12:24:27 -0000 1.6.4.1
+++ openpkg-src/openpkg/uuid.sh 28 Jul 2006 20:19:05 -0000 1.6.4.2
@@ -173,11 +173,14 @@
echo "uuid: calculating OpenPKG Registry UUID (UUID_REGISTRY):"
echo "uuid: << $prog_uuid -v1 $opt"
fi
- UUID_REGISTRY=`$prog_uuid -v1 $opt`
- if [ ".$opt_v" = .yes ]; then
- echo "uuid: >> $UUID_REGISTRY (NOT REPEATABLE)"
+ uuid=`$prog_uuid -v1 $opt`
+ if [ ".$UUID_REGISTRY" != ".$uuid" -a ".$uuid" != . ]; then
+ UUID_REGISTRY="$uuid"
+ if [ ".$opt_v" = .yes ]; then
+ echo "uuid: >> $UUID_REGISTRY (NOT REPEATABLE)"
+ fi
+ changed=yes
fi
- changed=yes
fi
# update instance UUID
@@ -211,7 +214,7 @@
if [ ".$opt_v" = .yes ]; then
echo "uuid: >> $uuid"
fi
- if [ ".$UUID_INSTANCE" != ".$uuid" ]; then
+ if [ ".$UUID_INSTANCE" != ".$uuid" -a ".$uuid" != . ]; then
UUID_INSTANCE="$uuid"
changed=yes
fi
@@ -244,7 +247,7 @@
if [ ".$opt_v" = .yes ]; then
echo "uuid: >> $uuid"
fi
- if [ ".$UUID_PLATFORM" != ".$uuid" ]; then
+ if [ ".$UUID_PLATFORM" != ".$uuid" -a ".$uuid" != . ]; then
UUID_PLATFORM="$uuid"
changed=yes
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
