OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Feb-2007 18:22:14
Branch: OPENPKG_2_STABLE Handle: 2007022117221103
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg HISTORY openpkg.spec rc.openpkg rpmtool rpmtool.8
rpmtool.pod
openpkg-src/openpkg-registry
openpkg-registry.spec rc.openpkg-registry
openpkg-src/openpkg-tools
openpkg-tools.spec
Log:
MFC latest features to get them into snapshot
Summary:
Revision Changes Path
1.28.2.4 +7 -7 openpkg-src/openpkg-registry/openpkg-registry.spec
1.2.2.3 +3 -3 openpkg-src/openpkg-registry/rc.openpkg-registry
1.63.2.15 +2 -2 openpkg-src/openpkg-tools/openpkg-tools.spec
1.337.2.19 +11 -0 openpkg-src/openpkg/HISTORY
1.490.2.19 +17 -9 openpkg-src/openpkg/openpkg.spec
1.19.12.2 +18 -0 openpkg-src/openpkg/rc.openpkg
1.47.2.4 +22 -8 openpkg-src/openpkg/rpmtool
1.9.12.3 +4 -4 openpkg-src/openpkg/rpmtool.8
1.15.2.2 +4 -4 openpkg-src/openpkg/rpmtool.pod
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-registry/openpkg-registry.spec
============================================================================
$ cvs diff -u -r1.28.2.3 -r1.28.2.4 openpkg-registry.spec
--- openpkg-src/openpkg-registry/openpkg-registry.spec 22 Oct 2006
17:51:04 -0000 1.28.2.3
+++ openpkg-src/openpkg-registry/openpkg-registry.spec 21 Feb 2007
17:22:13 -0000 1.28.2.4
@@ -1,7 +1,7 @@
##
## openpkg-registry.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 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
@@ -32,8 +32,8 @@
Class: EVAL
Group: Bootstrapping
License: BSD-style
-Version: 1.0.1
-Release: 2.20061022
+Version: 1.1.0
+Release: 2.20070221
# package options
%option with_client yes
@@ -137,10 +137,10 @@
'%attr(775,%{l_musr},%{l_ngrp}) %dir
%{l_prefix}/var/openpkg-registry/ui' \
'%attr(640,%{l_musr},%{l_ngrp}) %config
%{l_prefix}/etc/openpkg-registry/*' \
%endif
- '%ghost %{l_prefix}/etc/openpkg/register.util' \
- '%ghost %{l_prefix}/etc/openpkg/register.tran' \
+ '%ghost %{l_prefix}/etc/openpkg/register.conf' \
'%ghost %{l_prefix}/etc/openpkg/register.prep' \
- '%config %{l_prefix}/etc/openpkg/register.conf'
+ '%ghost %{l_prefix}/etc/openpkg/register.tran' \
+ '%ghost %{l_prefix}/etc/openpkg/register.util'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-registry/rc.openpkg-registry
============================================================================
$ cvs diff -u -r1.2.2.2 -r1.2.2.3 rc.openpkg-registry
--- openpkg-src/openpkg-registry/rc.openpkg-registry 16 Oct 2006 14:53:42
-0000 1.2.2.2
+++ openpkg-src/openpkg-registry/rc.openpkg-registry 21 Feb 2007 17:22:13
-0000 1.2.2.3
@@ -21,7 +21,7 @@
echo "openpkg_registry_active=\"$openpkg_registry_active\""
%daily -u @l_susr@
- rcService openpkg_registry enable yes || exit 0
+ rcService openpkg-registry enable yes || exit 0
# create backup
shtool install -c -m 640 -o @l_musr@ -g @l_rgrp@ \
@@ -40,7 +40,7 @@
$openpkg_registry_dumpfile-daily
%weekly -u @l_susr@
- rcService openpkg_registry enable yes || exit 0
+ rcService openpkg-registry enable yes || exit 0
# rotate backup files
shtool rotate -f \
@@ -51,7 +51,7 @@
$openpkg_registry_dumpfile-weekly
%monthly -u @l_susr@
- rcService openpkg_registry enable yes || exit 0
+ rcService openpkg-registry enable yes || exit 0
# rotate backup files
shtool rotate -f \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tools/openpkg-tools.spec
============================================================================
$ cvs diff -u -r1.63.2.14 -r1.63.2.15 openpkg-tools.spec
--- openpkg-src/openpkg-tools/openpkg-tools.spec 7 Feb 2007 20:36:33
-0000 1.63.2.14
+++ openpkg-src/openpkg-tools/openpkg-tools.spec 21 Feb 2007 17:22:14
-0000 1.63.2.15
@@ -32,8 +32,8 @@
Class: BASE
Group: Bootstrapping
License: MIT
-Version: 1.3.2
-Release: 2.20070207
+Version: 1.4.0
+Release: 2.20070221
# package options
%option with_bf_master no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.337.2.18 -r1.337.2.19 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Jan 2007 20:34:29 -0000
1.337.2.18
+++ openpkg-src/openpkg/HISTORY 21 Feb 2007 17:22:11 -0000
1.337.2.19
@@ -2,6 +2,17 @@
2007
====
+20070221 **** RELEASE AS PART OF OPENPKG 2.20070221 ****
+20070221 autoregister for community series; always reregister
+20070221 backout capability to seed registry user/link information to avoid
register.conf file conflict
+20070221 upgrade to openpkg-tools 1.4.0 ("openpkg curl"), upgrade to
openpkg-registry 1.1.0 (autoregister)
+20070207 upgrade to openpkg-tools 1.3.2
+20070206 upgrade to GNU gzip 1.3.11
+20070204 rpmtool cflags tool detection must handle relative pathes (no gcc)
and absolute pathes (with gcc)
+20070204 unbreak rpmtool cflags tool detection
+20070130 minor fixes in rpmtool and the corresponding man page
+20070130 upgrade to cURL 7.16.1
+
20070105 **** RELEASE AS PART OF OPENPKG 2.20070105 ****
20070105 upgrade to GNU bzip2 1.0.4
20070102 upgrade to openpkg-tools 1.3.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.490.2.18 -r1.490.2.19 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Jan 2007 20:34:35 -0000
1.490.2.18
+++ openpkg-src/openpkg/openpkg.spec 21 Feb 2007 17:22:11 -0000
1.490.2.19
@@ -39,26 +39,26 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.20070105
+%define V_openpkg 2.20070221
# the used software versions
%define V_rpm 4.2.1
%define V_zlib 1.2.3
%define V_bzip2 1.0.4
%define V_beecrypt 4.1.2
-%define V_curl 7.16.0
+%define V_curl 7.16.1
%define V_make 3.81
-%define V_gzip 1.3.10
-%define V_gzip_r 1.11
+%define V_gzip 1.3.11
+%define V_gzip_r 1.12
%define V_patch 2.5.9
%define V_tar 1.16.1
%define V_bash 3.2
%define V_uuid 1.5.1
%define V_config 20060923
-%define V_registry 1.0.1
+%define V_registry 1.1.0
%define V_perl 5.8.8
%define V_openssl 0.9.8d
-%define V_tools 1.3.1
+%define V_tools 1.4.0
%define V_exec 2.0.0-C
# package information
@@ -157,7 +157,7 @@
AutoReq: no
AutoReqProv: no
Provides: OpenPKG
-Provides: openpkg = 20070105-20070105
+Provides: openpkg = 20070221-20070221
%description
This is the bootstrap package for the RPM-based Unix Software
@@ -1166,6 +1166,7 @@
# install OpenPKG Tool Chain command subset
( cd openpkg-tools-%{V_tools}
+ cp cmd/curl.sh $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/curl.sh
cp cmd/build.pl $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.pl
chmod 644 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.pl
cp cmd/build.8 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.8
@@ -1292,6 +1293,7 @@
chmod 644 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.func
mkdir $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
sed -e "s:@l_prefix@:%{l_prefix}:g" \
+ -e "s:@l_musr@:%{l_musr}:g" \
<`SOURCE rc.openpkg` \
>$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.openpkg
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.openpkg
@@ -1320,10 +1322,12 @@
# install registry configuration files (ghost)
touch \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.conf \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.prep \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.tran \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.util
chmod 644 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.conf \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.prep \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.tran \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/register.util
@@ -1395,6 +1399,7 @@
%config %{l_prefix}/etc/openpkg/platform
%config %{l_prefix}/etc/openpkg/rpmmacros
%config %{l_prefix}/etc/openpkg/rpmrc
+ %ghost %{l_prefix}/etc/openpkg/register.conf
%ghost %{l_prefix}/etc/openpkg/register.prep
%ghost %{l_prefix}/etc/openpkg/register.tran
%ghost %{l_prefix}/etc/openpkg/register.util
@@ -1491,6 +1496,7 @@
%{l_prefix}/libexec/openpkg/uuid
%{l_prefix}/libexec/openpkg/uuid.8
%{l_prefix}/libexec/openpkg/man
+ %{l_prefix}/libexec/openpkg/curl.sh
%{l_prefix}/libexec/openpkg/build.pl
%{l_prefix}/libexec/openpkg/build.8
%{l_prefix}/libexec/openpkg/install
@@ -2411,8 +2417,8 @@
fi
chown %{l_musr}:%{l_mgrp} %{l_prefix}/lib/openpkg/fallback >/dev/null
2>&1 || true
- # display license information of "openpkg" executable in case the
- # OpenPKG Community version (staying under an OSS license) is NOT used.
+ # check for "openpkg" executable from the OpenPKG Community series
+ # print license if not OSS, otherwise register with openpkg.org
community_version=`%{l_prefix}/bin/openpkg --license 2>/dev/null | \
sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C'`
if [ ".$community_version" = . ]; then
@@ -2423,6 +2429,8 @@
echo ""
%{l_prefix}/bin/openpkg --license | sed -e '1d'
) | %{l_prefix}/lib/openpkg/rpmtool msg -b -t notice
+ else
+ %{l_prefix}/bin/openpkg register </dev/null >/dev/null 2>&1 || true
fi
%preun
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.openpkg
============================================================================
$ cvs diff -u -r1.19.12.1 -r1.19.12.2 rc.openpkg
--- openpkg-src/openpkg/rc.openpkg 13 Sep 2006 19:51:06 -0000
1.19.12.1
+++ openpkg-src/openpkg/rc.openpkg 21 Feb 2007 17:22:11 -0000
1.19.12.2
@@ -8,6 +8,8 @@
openpkg_rc_all="$openpkg_rc_def"
openpkg_enable="$openpkg_rc_def"
openpkg_envprio="high"
+ openpkg_reghour="3"
+ openpkg_regrand="1"
%status -o
openpkg_usable="unknown"
@@ -24,6 +26,22 @@
# update UUID information (in background to not slow down boot
sequences)
(nohup @l_prefix@/bin/openpkg uuid update </dev/null >/dev/null 2>&1 &)
>/dev/null 2>&1
+%hourly -u @l_musr@
+ rcService openpkg enable yes || exit 0
+ reregister=0; @l_prefix@/bin/openpkg register --printstatus >/dev/null
2>&1 && reregister=1
+ # check for "openpkg" executable from the OpenPKG Community series
+ # if OSS, register with openpkg.org
+ [EMAIL PROTECTED]@/bin/openpkg --license 2>/dev/null | \
+ sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C'`
+ if [ ".$community_version" != . -o $reregister -eq 1 ]; then
+ [ $openpkg_reghour -lt 00 -o $openpkg_reghour -gt 23 ] &&
openpkg_reghour="3"
+ now=`date '+%H'`
+ [ $openpkg_reghour -eq $now ] || exit 0
+ [ $openpkg_regrand -lt 01 -o $openpkg_regrand -gt 04 ] &&
openpkg_regrand="1"
+ rnd=`expr $RANDOM \* 3600 \* $openpkg_regrand / 32768`
+ (nohup @l_prefix@/lib/openpkg/bash -c "sleep $rnd;
@l_prefix@/bin/openpkg register" </dev/null >/dev/null 2>&1 &) >/dev/null 2>&1
+ fi
+
%daily -p0
rcService openpkg enable yes || exit 0
# update UUID information
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.47.2.3 -r1.47.2.4 rpmtool
--- openpkg-src/openpkg/rpmtool 5 Jan 2007 20:34:38 -0000 1.47.2.3
+++ openpkg-src/openpkg/rpmtool 21 Feb 2007 17:22:11 -0000 1.47.2.4
@@ -364,7 +364,7 @@
fi
;;
*:FreeBSD:[4567].*:* )
- n=`/sbin/sysctl hw.ncpu | awk '{ print $2; }'`
+ n=`/sbin/sysctl -n hw.ncpu`
if [ ".$n" != . ]; then
if [ $n -gt 1 ]; then
n=`expr $n \* 2`
@@ -375,8 +375,8 @@
fi
fi
;;
- *:NetBSD:1.[56]*:* | *:NetBSD:[234].*:* )
- n=`/sbin/sysctl hw.ncpu | awk '{ print $3; }'`
+ *:NetBSD:1.[56]*:* | *:NetBSD:[2345].*:* )
+ n=`/sbin/sysctl -n hw.ncpu`
if [ ".$n" != . ]; then
if [ $n -gt 1 ]; then
n=`expr $n \* 2`
@@ -388,7 +388,7 @@
fi
;;
*:Linux:*:* )
- n=`cat /proc/cpuinfo | grep processor | wc -l | awk '{
print $1; }'`
+ n=`grep ^processor /proc/cpuinfo | wc -l | awk '{ print
$1; }'`
if [ ".$n" != . ]; then
if [ $n -gt 1 ]; then
n=`expr $n \* 2`
@@ -450,6 +450,20 @@
cflags )
tool="$1"
+ echo $tool | grep ^/ >/dev/null
+ if [ $? -eq 0 ]; then
+ if [ ! -x "$tool" -o -d "$tool" ]; then
+ echo "$msgprefix:Error: specified tool \`$tool' not found or
not executable" 1>&2
+ exit 1
+ fi
+ else
+ shtool=`echo $prog_path | sed -e 's;/[^/]*$;/shtool;'`
+ sh $shtool path --suppress $tool
+ if [ $? -ne 0 ]; then
+ echo "$msgprefix:Error: specified tool \`$tool' not found in
PATH" 1>&2
+ exit 1
+ fi
+ fi
isgcc=no
if [ ".`($tool -v; $tool --version) </dev/null 2>&1 | grep -i
'gcc'`" != . ]; then
isgcc=yes
@@ -935,7 +949,7 @@
;;
esac
if [ ".$exists" != . ]; then
- echo "$msgprefix:Error: user $user already exists" 1>&2
+ echo "$msgprefix:Error: user \`$user' already exists" 1>&2
exit 1
fi
@@ -1019,7 +1033,7 @@
;;
esac
if [ ".$exists" = . ]; then
- echo "$msgprefix:Error: user $user does not exist" 1>&2
+ echo "$msgprefix:Error: user \`$user' does not exist" 1>&2
exit 1
fi
@@ -1095,7 +1109,7 @@
;;
esac
if [ ".$exists" != . ]; then
- echo "$msgprefix:Error: group $group already exists" 1>&2
+ echo "$msgprefix:Error: group \`$group' already exists" 1>&2
exit 1
fi
@@ -1141,7 +1155,7 @@
;;
esac
if [ ".$exists" = . ]; then
- echo "$msgprefix:Error: group $group does not exist" 1>&2
+ echo "$msgprefix:Error: group \`$group' does not exist" 1>&2
exit 1
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool.8
============================================================================
$ cvs diff -u -r1.9.12.2 -r1.9.12.3 rpmtool.8
--- openpkg-src/openpkg/rpmtool.8 13 Sep 2006 19:51:08 -0000 1.9.12.2
+++ openpkg-src/openpkg/rpmtool.8 21 Feb 2007 17:22:11 -0000 1.9.12.3
@@ -182,7 +182,7 @@
Example:
.Sp
.Vb 1
-\& CC="$CC" CFLAGS=`rpmtool mflags -O $CC` ./configure ...
+\& CC="$CC" CFLAGS=`rpmtool cflags -O $CC` ./configure ...
.Ve
.ie n .IP "\fBcppflags\fR [\fB\-p\fR \fIprefix\fR]
[[\*(C`+|\-\*(C'\fR\fIsubdir ...]" 4
.el .IP "\fBcppflags\fR [\fB\-p\fR \fIprefix\fR]
[[\f(CW\*(C`+|\-\*(C'\fR\fIsubdir\fR ...]" 4
@@ -229,7 +229,7 @@
.IX Item "Trailing Tags"
\&\s-1RPM\s0 requires that all tags (like \f(CW\*(C`%attr(...)\*(C'\fR or
\f(CW%dir\fR) preceed the
path in a file list entry. This sometimes leads to ugly and unreadable
-file lists, because all paths cannot be left\-aligned. With
\fIrpmtool\fR\|(1)
+file lists, because all paths cannot be left\-aligned. With
\fIrpmtool\fR\|(8)
tags in the input file list can be at leading and trailing positions.
The output file list will nevertheless have all tags in leading
positions for \s-1RPM\s0.
@@ -237,7 +237,7 @@
.IX Item "Syntactical Set Pattern"
\&\s-1RPM\s0 supports simple wildcard patterns like
\f(CW\*(C`/path/*\*(C'\fR or \f(CW\*(C`/path/[a\-z]\*(C'\fR,
etc. Sometimes it is convenient, to also have (in addition to character
-sets) string sets like \f(CW\*(C`/path/{foo,bar,quux}\*(C'\fR.
\fIrpmtool\fR\|(1) provides this
+sets) string sets like \f(CW\*(C`/path/{foo,bar,quux}\*(C'\fR.
\fIrpmtool\fR\|(8) provides this
by syntactically (without checking the filesystem) expanding those
string sets.
.IP "\fBOverriding Entries\fR" 4
@@ -247,7 +247,7 @@
directory in a file list and then implicitly expands this recursively
into its contents, it unfortunately does not allow one to later
explcitly override particular entries (usually if an individual
-\&\f(CW\*(C`%attr(...)\*(C'\fR tag is required). \fIrpmtool\fR\|(1) now
supports overriding
+\&\f(CW\*(C`%attr(...)\*(C'\fR tag is required). \fIrpmtool\fR\|(8) now
supports overriding
entries, i.e., if a path occurs multiple times, only the last occurance
is kept.
.IP "\fBNegation Tag\fR" 4
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool.pod
============================================================================
$ cvs diff -u -r1.15.2.1 -r1.15.2.2 rpmtool.pod
--- openpkg-src/openpkg/rpmtool.pod 5 Jan 2007 20:34:38 -0000 1.15.2.1
+++ openpkg-src/openpkg/rpmtool.pod 21 Feb 2007 17:22:11 -0000 1.15.2.2
@@ -79,7 +79,7 @@
Example:
- CC="$CC" CFLAGS=`rpmtool mflags -O $CC` ./configure ...
+ CC="$CC" CFLAGS=`rpmtool cflags -O $CC` ./configure ...
=item B<cppflags> [B<-p> I<prefix>] [[C<+|->I<subdir> ...]
@@ -124,7 +124,7 @@
RPM requires that all tags (like C<%attr(...)> or C<%dir>) preceed the
path in a file list entry. This sometimes leads to ugly and unreadable
-file lists, because all paths cannot be left-aligned. With rpmtool(1)
+file lists, because all paths cannot be left-aligned. With rpmtool(8)
tags in the input file list can be at leading and trailing positions.
The output file list will nevertheless have all tags in leading
positions for RPM.
@@ -133,7 +133,7 @@
RPM supports simple wildcard patterns like C</path/*> or C</path/[a-z]>,
etc. Sometimes it is convenient, to also have (in addition to character
-sets) string sets like C</path/{foo,bar,quux}>. rpmtool(1) provides this
+sets) string sets like C</path/{foo,bar,quux}>. rpmtool(8) provides this
by syntactically (without checking the filesystem) expanding those
string sets.
@@ -144,7 +144,7 @@
directory in a file list and then implicitly expands this recursively
into its contents, it unfortunately does not allow one to later
explcitly override particular entries (usually if an individual
-C<%attr(...)> tag is required). rpmtool(1) now supports overriding
+C<%attr(...)> tag is required). rpmtool(8) now supports overriding
entries, i.e., if a path occurs multiple times, only the last occurance
is kept.
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
