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 openpkg-web Date: 14-Oct-2003 15:09:42
Branch: HEAD Handle: 2003101414093902
Modified files:
openpkg-src/openpkg HISTORY aux.prereq.sh dot.bash_login mkproxyrpm.pl
openpkg.boot openpkg.spec rpmmacros rpmtool
openpkg-web news.txt
Log:
1. fix filesystem space checking (aux.prereq.sh)
2. get rid of TEMPDIR (we use more canonical TMPDIR now only)
Summary:
Revision Changes Path
1.69 +2 -0 openpkg-src/openpkg/HISTORY
1.12 +1 -1 openpkg-src/openpkg/aux.prereq.sh
1.3 +0 -1 openpkg-src/openpkg/dot.bash_login
1.8 +2 -2 openpkg-src/openpkg/mkproxyrpm.pl
1.36 +1 -3 openpkg-src/openpkg/openpkg.boot
1.230 +1 -1 openpkg-src/openpkg/openpkg.spec
1.44 +1 -2 openpkg-src/openpkg/rpmmacros
1.22 +0 -2 openpkg-src/openpkg/rpmtool
1.6997 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.68 -r1.69 HISTORY
--- openpkg-src/openpkg/HISTORY 10 Oct 2003 18:42:50 -0000 1.68
+++ openpkg-src/openpkg/HISTORY 14 Oct 2003 13:09:41 -0000 1.69
@@ -2,6 +2,8 @@
2003
====
+20031014 fix filesystem space checking (aux.prereq.sh)
+20031014 get rid of TEMPDIR (we use more canonical TMPDIR now only)
20031010 provide %{_rpmdb_private} macro and --db-private for operating the RPM DB
in DB_PRIVATE mode.
20031010 working off the aux.prereq.sh script for adjusted platform checks and
additional disk space checks
20031008 make sure RPM does not pick up headers of a vendor BeeCrypt package under
RedHat Linux
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.prereq.sh
============================================================================
$ cvs diff -u -r1.11 -r1.12 aux.prereq.sh
--- openpkg-src/openpkg/aux.prereq.sh 10 Oct 2003 13:53:37 -0000 1.11
+++ openpkg-src/openpkg/aux.prereq.sh 14 Oct 2003 13:09:41 -0000 1.12
@@ -84,7 +84,7 @@
fs_free=""
case "$platform_tech" in
*-freebsd* | *-linux* | *-sunos* )
- fs_free=`/bin/df -k /tmp | tail -1 | awk '{ print $4; }'`
+ fs_free=`cd $fs_path && /bin/df -k . | tail -1 | awk '{ print $4; }'`
;;
esac
if [ ".$fs_free" != . ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/dot.bash_login
============================================================================
$ cvs diff -u -r1.2 -r1.3 dot.bash_login
--- openpkg-src/openpkg/dot.bash_login 5 Feb 2003 14:32:26 -0000 1.2
+++ openpkg-src/openpkg/dot.bash_login 14 Oct 2003 13:09:41 -0000 1.3
@@ -16,7 +16,6 @@
# various additional variables
export TMPDIR=/tmp
-export TEMPDIR=$TMPDIR
export BLOCKSIZE=1024
# suck in the whole Bourne-Shell
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/mkproxyrpm.pl
============================================================================
$ cvs diff -u -r1.7 -r1.8 mkproxyrpm.pl
--- openpkg-src/openpkg/mkproxyrpm.pl 8 Oct 2003 10:06:48 -0000 1.7
+++ openpkg-src/openpkg/mkproxyrpm.pl 14 Oct 2003 13:09:41 -0000 1.8
@@ -40,7 +40,7 @@
my $debug = 0;
my $help = 0;
my $rpm = 'rpm';
-my $tmpdir = ($ENV{TMPDIR} || $ENV{TEMPDIR} || "/tmp") . "/$progname";
+my $tmpdir = ($ENV{TMPDIR} || "/tmp") . "/$progname";
my $output = '.';
my $input = '-';
my $prefix = '';
@@ -440,7 +440,7 @@
=item B<--tmpdir>=I<DIR>
Set a particular temporary directory. The default is determined from
-C<$TMPDIR>, C<$TEMPDIR> or C</tmp> (in that order).
+C<$TMPDIR>, or C</tmp> (in that order).
=item B<--output>=I<DIR>|I<FILE>|C<->
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.35 -r1.36 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 10 Oct 2003 13:53:37 -0000 1.35
+++ openpkg-src/openpkg/openpkg.boot 14 Oct 2003 13:09:41 -0000 1.36
@@ -218,9 +218,7 @@
##
# find reasonable temporary directory
-tmpdir="/tmp"
-test ".$TMPDIR" != . && tmpdir="$TMPDIR"
-test ".$TEMPDIR" != . && tmpdir="$TEMPDIR"
+tmpdir="${TMPDIR-/tmp}"
# find reasonable safe program path
test ".$PATH" = . && PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.229 -r1.230 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 10 Oct 2003 13:53:37 -0000 1.229
+++ openpkg-src/openpkg/openpkg.spec 14 Oct 2003 13:09:41 -0000 1.230
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20031010
+%define V_openpkg 20031014
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.43 -r1.44 rpmmacros
--- openpkg-src/openpkg/rpmmacros 27 Sep 2003 11:13:51 -0000 1.43
+++ openpkg-src/openpkg/rpmmacros 14 Oct 2003 13:09:41 -0000 1.44
@@ -342,12 +342,11 @@
SHELL="%{l_build_shell_cmd}"\
TERM="%(echo $TERM)"\
TMPDIR="%{_tmppath}"\
-TEMPDIR="%{_tmppath}"\
USER="%(echo $USER)"\
LOGNAME="%(echo $LOGNAME)"\
PATH="%{l_build_path}"\
LD_LIBRARY_PATH="%{l_build_ldlp}"\
-export HOME SHELL TMPDIR TEMPDIR USER LOGNAME PATH LD_LIBRARY_PATH\
+export HOME SHELL TMPDIR USER LOGNAME PATH LD_LIBRARY_PATH\
RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
RPM_OPT_FLAGS=\"%{optflags}\"\
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.21 -r1.22 rpmtool
--- openpkg-src/openpkg/rpmtool 12 Sep 2003 14:56:17 -0000 1.21
+++ openpkg-src/openpkg/rpmtool 14 Oct 2003 13:09:41 -0000 1.22
@@ -296,8 +296,6 @@
if [ ".$gen_tmpfile" = .yes ]; then
if [ ".$TMPDIR" != . ]; then
tmpdir="$TMPDIR"
- elif [ ".$TEMPDIR" != . ]; then
- tmpdir="$TEMPDIR"
else
tmpdir="/tmp"
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6996 -r1.6997 news.txt
--- openpkg-web/news.txt 14 Oct 2003 13:03:18 -0000 1.6996
+++ openpkg-web/news.txt 14 Oct 2003 13:09:39 -0000 1.6997
@@ -1,3 +1,4 @@
+14-Oct-2003: Upgraded package: P<openpkg-20031014-20031014>
14-Oct-2003: Upgraded package: P<apache2-2.0.47-20031014>
14-Oct-2003: Upgraded package: P<apr-0.9.4-20031014>
14-Oct-2003: Upgraded package: P<vim-6.2.121-20031014>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
