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: 05-Feb-2003 16:15:29
Branch: OPENPKG_1_STABLE Handle: 2003020515152501
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/openpkg README aux.prereq.sh aux.wrapbin.sh dot.bash_login
dot.bashrc openpkg.boot openpkg.spec rc rpmtool
Log:
MFC: all changes since OpenPKG 1.2 release
Summary:
Revision Changes Path
1.14.2.1 +18 -20 openpkg-src/openpkg/README
1.5.2.1 +5 -8 openpkg-src/openpkg/aux.prereq.sh
1.5.2.1 +21 -10 openpkg-src/openpkg/aux.wrapbin.sh
1.1.1.1.6.1 +26 -0 openpkg-src/openpkg/dot.bash_login
1.2.4.1 +0 -29 openpkg-src/openpkg/dot.bashrc
1.17.2.2 +2 -1 openpkg-src/openpkg/openpkg.boot
1.127.2.3 +5 -5 openpkg-src/openpkg/openpkg.spec
1.19.2.1 +5 -9 openpkg-src/openpkg/rc
1.15.2.1 +1 -0 openpkg-src/openpkg/rpmtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/README
============================================================================
$ cvs diff -u -r1.14 -r1.14.2.1 README
--- openpkg-src/openpkg/README 15 Jan 2003 11:12:59 -0000 1.14
+++ openpkg-src/openpkg/README 5 Feb 2003 15:15:25 -0000 1.14.2.1
@@ -137,25 +137,23 @@
tarball of this directory. This script is like openpkg-X.X-X.src.rpm, but
for bootstrapping situations.
- Supported Platforms
- -------------------
+ Platforms and Level of Support
+ ------------------------------
- Currently the following platforms are fully supported:
-
- Operating System Official Unofficial
- ----------------------- -------- ----------
- FreeBSD (ix86) 4.7 4.[0-6], 5.0
- Debian GNU/Linux (ix86) 3.0 2.2
- RedHat Linux (ix86) 7.2 7.[01], 8.0
- Solaris (SPARC) 2.9 2.[678]
- Solaris (ix86) - 2.8
- ----------------------- -------- ----------
- NetBSD (ix86) 1.5.2 1.5.[01]
- OpenBSD (ix86) 2.9 -
- Tru64 (ix86) 5.0A 5.1A
- HP-UX (PA/IPF) 10.20 -
- ----------------------- -------- ----------
- UnixWare - -
- IRIX - -
- AIX - -
+ Operating System Fully Supported Partially Supported Known to work
+ ----------------------- --------------- ------------------- -------------
+ FreeBSD (ix86) 4.7, 5.0 4.[0-6] -
+ Debian GNU/Linux (ix86) 3.0, 2.2 - -
+ RedHat Linux (ix86) - 7.[0-2], 8.0 -
+ Solaris (SPARC64) 8, 9 2.6, 7 -
+ Solaris (ix86) - - 2.8
+ NetBSD (ix86) - - 1.5.[0-2], 1.6
+ OpenBSD (ix86) - - 2.9
+ HP-UX (PA/IPF) - - 10.20
+ Tru64 (ix86) - - 5.0A, 5.1A
+ UnixWare - - -
+ Darwin - - -
+ Cygwin - - -
+ IRIX - - -
+ AIX - - -
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.prereq.sh
============================================================================
$ cvs diff -u -r1.5 -r1.5.2.1 aux.prereq.sh
--- openpkg-src/openpkg/aux.prereq.sh 30 Dec 2002 22:05:34 -0000 1.5
+++ openpkg-src/openpkg/aux.prereq.sh 5 Feb 2003 15:15:25 -0000 1.5.2.1
@@ -50,10 +50,7 @@
if [ -f /etc/redhat-release ]; then
redhat=`cat /etc/redhat-release | sed -e 's;^.*\([0-9]\.[0-9]*\).*$;\1;'`
case "$redhat" in
- 7.2 )
- support=yes
- ;;
- 7.[13] )
+ 7.[123] )
support=maybe
;;
esac
@@ -68,13 +65,13 @@
;;
*-freebsd* )
case $platform in
- *-freebsd4.[56] )
+ *-freebsd4.[789] )
support=yes
;;
- *-freebsd4.[01234789] )
- support=maybe
- ;;
*-freebsd5.0 )
+ support=yes
+ ;;
+ *-freebsd4.[0123456] )
support=maybe
;;
esac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.wrapbin.sh
============================================================================
$ cvs diff -u -r1.5 -r1.5.2.1 aux.wrapbin.sh
--- openpkg-src/openpkg/aux.wrapbin.sh 13 Jan 2003 14:09:23 -0000 1.5
+++ openpkg-src/openpkg/aux.wrapbin.sh 5 Feb 2003 15:15:26 -0000 1.5.2.1
@@ -81,18 +81,29 @@
@PRE@
# make sure prefix/root directory exists
-d=''
-for c in `IFS=/; echo $prefix`; do
- d="$d/$c"
- if [ ! -d $d ]; then
- mkdir $d || exit 1
- chmod 755 $d || exit 1
- if [ ".$cusr" = .root ]; then
- chown $musr $d >/dev/null 2>&1 || true
- chgrp $mgrp $d >/dev/null 2>&1 || true
+# and has correct permissions and owner/group
+if [ ! -d $prefix ]; then
+ # create prefix/root directory from scratch
+ d=''
+ for c in `IFS=/; echo $prefix`; do
+ d="$d/$c"
+ if [ ! -d $d ]; then
+ mkdir $d || exit 1
+ chmod 755 $d || exit 1
+ if [ ".$cusr" = .root ]; then
+ chown $musr $d >/dev/null 2>&1 || true
+ chgrp $mgrp $d >/dev/null 2>&1 || true
+ fi
fi
+ done
+else
+ # adjust already existing prefix/root directory
+ chmod 755 $prefix || exit 1
+ if [ ".$cusr" = .root ]; then
+ chown $musr $prefix >/dev/null 2>&1 || true
+ chgrp $mgrp $prefix >/dev/null 2>&1 || true
fi
-done
+fi
# extract installation files
uudecode $f
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/dot.bash_login
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.1.1.1.6.1 dot.bash_login
--- openpkg-src/openpkg/dot.bash_login 18 Sep 2001 09:48:33 -0000 1.1.1.1
+++ openpkg-src/openpkg/dot.bash_login 5 Feb 2003 15:15:26 -0000
1.1.1.1.6.1
@@ -2,6 +2,32 @@
## @l_prefix@/.bash_login -- Local Bash Login Script
##
+# provide user and host information in default prompt
+PS1="\u@\h\$ "
+
+# environment permissions
+umask 022
+ulimit -c 16384
+
+# history functionality
+shopt -s histappend
+HISTSIZE=100
+HISTFILESIZE=100
+
+# various additional variables
+export TMPDIR=/tmp
+export TEMPDIR=$TMPDIR
+export BLOCKSIZE=1024
+
+# suck in the whole Bourne-Shell
+# environment of OpenPKG hierarchy
+eval `@l_prefix@/etc/rc --eval all env`
+
+# make sure some non-standard but usually
+# important executable directories are active
+test -d /usr/ccs/bin && PATH="$PATH:/usr/ccs/bin"
+test -d /usr/local/bin && PATH="$PATH:/usr/local/bin"
+
# initially adjust $PWD to symbolic path
cd $HOME
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/dot.bashrc
============================================================================
$ cvs diff -u -r1.2 -r1.2.4.1 dot.bashrc
--- openpkg-src/openpkg/dot.bashrc 16 Jan 2002 08:22:19 -0000 1.2
+++ openpkg-src/openpkg/dot.bashrc 5 Feb 2003 15:15:26 -0000 1.2.4.1
@@ -2,32 +2,3 @@
## @l_prefix@/.bashrc -- Local Bash Profile
##
-# provide user and host information in default prompt
-PS1="\u@\h\$ "
-
-# environment permissions
-umask 022
-ulimit -c 16384
-
-# history functionality
-shopt -s histappend
-HISTSIZE=100
-HISTFILESIZE=100
-
-# various additional variables
-export TMPDIR=/tmp
-export TEMPDIR=$TMPDIR
-export BLOCKSIZE=1024
-
-# suck in the whole Bourne-Shell
-# environment of OpenPKG hierarchy
-eval `@l_prefix@/etc/rc --eval all env`
-
-# make sure some non-standard but usually
-# important executable directories are active
-test -d /usr/ccs/bin && PATH="$PATH:/usr/ccs/bin"
-test -d /usr/local/bin && PATH="$PATH:/usr/local/bin"
-
-# path to us
-BASH_ENV=$HOME/.bashrc
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.17.2.1 -r1.17.2.2 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 28 Jan 2003 16:44:23 -0000 1.17.2.1
+++ openpkg-src/openpkg/openpkg.boot 5 Feb 2003 15:15:26 -0000 1.17.2.2
@@ -469,7 +469,8 @@
files=`cat $spec |\
sed -e '1,/%files/d' -e '/%clean/,$d' |\
grep -v '^ *$' | grep -v '%defattr' |\
- sed -e 's;%config *;;' -e 's;%dir *;;' -e 's;%{l_prefix}/;;' -e 's;^ *;;' -e
"s;%{V_rpm};${V_rpm};"`
+ sed -e 's;%config *;;' -e 's;%config(noreplace) *;;' \
+ -e 's;%dir *;;' -e 's;%{l_prefix}/;;' -e 's;^ *;;' -e
"s;%{V_rpm};${V_rpm};"`
for dbfile in Basenames Conflictname Group Name Packages Providename \
Requirename Triggername; do
files="$files RPM/DB/$dbfile"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.127.2.2 -r1.127.2.3 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 28 Jan 2003 16:44:24 -0000 1.127.2.2
+++ openpkg-src/openpkg/openpkg.spec 5 Feb 2003 15:15:26 -0000 1.127.2.3
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 1.20030128
-%define R_openpkg 1.20030128
+%define V_openpkg 1.20020305
+%define R_openpkg 1.20020305
# the used software versions
%define V_rpm 4.0.2
@@ -704,8 +704,8 @@
%files
%defattr(-,%{?l_musr}%{!?l_musr:%{l_fsusr}},%{?l_mgrp}%{!?l_mgrp:%{l_fsgrp}})
%{l_prefix}/README
- %{l_prefix}/.bashrc
- %{l_prefix}/.bash_login
+ %config(noreplace) %{l_prefix}/.bashrc
+ %config(noreplace) %{l_prefix}/.bash_login
%dir %{l_prefix}/RPM
%dir %{l_prefix}/RPM/SRC
%dir %{l_prefix}/RPM/PKG
@@ -717,7 +717,7 @@
%{l_prefix}/bin/rpm
%dir %{l_prefix}/etc
%{l_prefix}/etc/rc
- %config %{l_prefix}/etc/rc.conf
+ %config(noreplace) %{l_prefix}/etc/rc.conf
%{l_prefix}/etc/rc.func
%dir %{l_prefix}/etc/rc.d
%{l_prefix}/etc/rc.d/rc.openpkg
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.19 -r1.19.2.1 rc
--- openpkg-src/openpkg/rc 8 Jan 2003 16:16:54 -0000 1.19
+++ openpkg-src/openpkg/rc 5 Feb 2003 15:15:26 -0000 1.19.2.1
@@ -88,15 +88,11 @@
PATH="@l_prefix@/sbin:$PATH"
PATH="@l_prefix@/lib/openpkg:$PATH"
-# find a reasonable temporary location
-if [ ".$TMPDIR" != . ]; then
- tmpdir="$TMPDIR"
-elif [ ".$TEMPDIR" != . ]; then
- tmpdir="$TEMPDIR"
-else
- tmpdir="/tmp"
-fi
+# set a reasonable temporary location
+tmpdir="/tmp"
tmpfile="$tmpdir/rc.$$.tmp"
+TMPDIR="$tmpdir"; export TMPDIR
+TEMPDIR="$tmpdir"; export TEMPDIR
# handle --query option
if [ ".$query" = .1 ]; then
@@ -317,7 +313,7 @@
sed <$rcdir/rc.$s_name >>$tmpfile -e "1,/^%$cmd/d" -e '/^%.*/,$d'
sh='sh'
if [ ".$user" != ".$s_user" ]; then
- su - $s_user -c "sh $tmpfile"
+ su - $s_user -c "PATH=\"$PATH\"; sh $tmpfile"
rc=$?
else
sh $tmpfile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.15 -r1.15.2.1 rpmtool
--- openpkg-src/openpkg/rpmtool 30 Dec 2002 22:05:34 -0000 1.15
+++ openpkg-src/openpkg/rpmtool 5 Feb 2003 15:15:26 -0000 1.15.2.1
@@ -412,6 +412,7 @@
# what we can do here in Bourne-Shell.
perl=''
for dir in `echo $PATH | sed -e 's/:/ /g'` .; do
+ [ ".$dir" = .. -o ".$dir" = . ] && continue
for tool in perl5 perl miniperl; do
if [ -f "$dir/$tool" ]; then
perl="$dir/$tool"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
