From 74d8b5bee7adddc3ea0685f0a0833839caabcc10 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Mon, 15 Sep 2003 14:26:46 +0000 Subject: [PATCH] - improved the exim package to honor prefix, made it jail-able - improvements and some tiny clenups in misc/jailing git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1407 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 2 ++ misc/jailing/jail-functions | 30 +++++++++++---------- misc/jailing/package-functions | 36 +++++++++++++------------ misc/jailing/parse-config | 4 +-- package/rene/exim/exim-monitor.patch | 4 +-- package/rene/exim/exim.conf | 2 ++ 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 24cafcec6..65755bbb1 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -2,6 +2,8 @@ *) 2003-09-15 (2.0.0-rc1 - 2.0.0-rc2) - fixed bitlbee to use a better sysconfdir when installed into opt/ + - improved the exim package to honor prefix, made it jail-able + - improvements and some tiny clenups in misc/jailing *) 2003-09-14 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/misc/jailing/jail-functions b/misc/jailing/jail-functions index fed3ef7bc..85661b1d4 100644 --- a/misc/jailing/jail-functions +++ b/misc/jailing/jail-functions @@ -139,23 +139,25 @@ jail_ensure_gids() { # This function sets the 'confopt' and some other variables. # jail_set_confopt() { - bindir="$root/$jail/usr/bin" - sbindir="$root/$jail/usr/sbin" - libdir="$root/$jail/usr/lib" - docdir="$root/$jail/usr/doc/$pkg" - datadir="$root/$jail/usr/share" - infodir="$root/$jail/usr/info" - mandir="$root/$jail/usr/man" - sysconfdir="$root/$jail/etc" - localstatedir="$root/$jail/var" - if [ "$destvar" ] ; then - prefix=/usr + prefix=$root/usr + sysconfdir="$root/etc" + localstatedir="$root/var" else prefix="$root/$jail/usr" + sysconfdir="$root/$jail/etc" + localstatedir="$root/$jail/var" fi - - confopt="--prefix=$root/$prefix" + + bindir="$prefix/bin" + sbindir="$prefix/sbin" + libdir="$prefix/lib" + docdir="$prefix/doc/$pkg" + datadir="$prefix/share" + infodir="$prefix/info" + mandir="$prefix/man" + + confopt="--prefix=$prefix" confopt="$confopt --bindir=$prefix/bin" confopt="$confopt --sbindir=$prefix/sbin" confopt="$confopt --libdir=$prefix/lib" @@ -169,7 +171,7 @@ jail_set_confopt() { confopt="$confopt $ROCKCFG_CONFIGURE_OPTS" fi - if [ "$ROCKCFG_STRIP" != 0 ] ; then + if [ "$ROCKCFG_OPT" != 0 ] ; then confopt="$confopt --disable-debug" else confopt="$confopt --enable-debug" diff --git a/misc/jailing/package-functions b/misc/jailing/package-functions index 2c93ca7b6..5e3314f9e 100644 --- a/misc/jailing/package-functions +++ b/misc/jailing/package-functions @@ -23,15 +23,16 @@ jail_pkg_apache_postmake() { jail_ensure_users http - ### Updates paths in $datadir/build/config_vars.mk + ### Updates paths in $root/$jail/$datadir/build/config_vars.mk - echo "Updateing paths in $datadir/build/config_vars.mk" + echo "Updateing paths in $root/$jail/$datadir/build/config_vars.mk" tmp=`mktemp` # A copy of original config_vars.mk is left for reference - cp $datadir/build/config_vars.mk $datadir/build/config_vars.mk.orig + cp $root/$jail/$datadir/build/config_vars.mk \ + $root/$jail/$datadir/build/config_vars.mk.orig - cp -f $datadir/build/config_vars.mk $tmp + cp -f $root/$jail/$datadir/build/config_vars.mk $tmp # s|$base/$builddir/httpd-$ver|/$jail/usr|; is repeated many times # because it appear many times in same line ... probably there is @@ -45,25 +46,25 @@ jail_pkg_apache_postmake() { / = \/.*/ {s| = /*usr| = /$jail/usr|; \ s| = /*etc| = /$jail/etc|; s| = /*var| = /$jail/var|; \ p; d; }; \ - " < $tmp > $datadir/build/config_vars.mk + " < $tmp > $root/$jail/$datadir/build/config_vars.mk - ### END Updates paths in $datadir/build/config_vars.mk + ### END Updates paths in $root/$jail/$datadir/build/config_vars.mk - ### Updates paths in $sbindir/apxs + ### Updates paths in $root/$jail/$sbindir/apxs - echo "Updateing paths in $sbindir/apxs" - cp -f $sbindir/apxs $tmp - sed "s|/usr/share/build|/$datadir/build|" < $tmp \ - > $sbindir/apxs + echo "Updateing paths in $root/$jail/$sbindir/apxs" + cp -f $root/$jail/$sbindir/apxs $tmp + sed "s|/usr/share/build|/$jail/$datadir/build|" < $tmp \ + > $root/$jail/$sbindir/apxs - ### END Updates paths in $sbindir/apxs + ### END Updates paths in $root/$jail/$sbindir/apxs ### Update apachectl - echo "Updateing paths in $sbindir/apachectl" - cp -f $sbindir/apachectl $tmp - sed "s|HTTPD=.*|HTTPD='chroot /$jail ${sbindir/\/$jail}/httpd'|" \ - < $tmp > $sbindir/apachectl + echo "Updateing paths in $root/$jail/$sbindir/apachectl" + cp -f $root/$jail/$sbindir/apachectl $tmp + sed "s|HTTPD=.*|HTTPD='chroot /$jail /$sbindir/httpd'|" \ + < $tmp > $root/$jail/$sbindir/apachectl ### END Update apachectl @@ -83,9 +84,10 @@ jail_pkg_postfix_postmake() { } jail_pkg_mysql_postmake() { - mv $libdir/mysql/* $libdir + mv -f $libdir/mysql/* $libdir rmdir $libdir/mysql mkdir -p $docdir cp support-files/my-*.cnf $docdir chown $pkg.$pkg $localstatedir } + diff --git a/misc/jailing/parse-config b/misc/jailing/parse-config index 6cf57b51e..c88a46f05 100644 --- a/misc/jailing/parse-config +++ b/misc/jailing/parse-config @@ -78,9 +78,9 @@ jail_samejail() { } -if [ "${ROCKCFG_JAILING}" = 1 ] -then +if [ "${ROCKCFG_JAILING}" = 1 ] ; then [ "$pkg" = php ] && jail_samejail php apache + [ "$pkg" = subversion ] && jail_samejail subversion apache if eval "[ \"\${ROCKCFG_JAILING_$pkg}\" = 1 ]" ; then . $base/misc/jailing/jail-functions diff --git a/package/rene/exim/exim-monitor.patch b/package/rene/exim/exim-monitor.patch index eb221c20c..8cdf59223 100644 --- a/package/rene/exim/exim-monitor.patch +++ b/package/rene/exim/exim-monitor.patch @@ -1,5 +1,5 @@ ---- ./Local/EDITME Mon Mar 11 03:03:16 2002 -+++ ./Local/EDITME Mon Mar 11 03:08:46 2002 +--- ./src/EDITME Mon Mar 11 03:03:16 2002 ++++ ./src/EDITME Mon Mar 11 03:08:46 2002 @@ -281,7 +281,7 @@ # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. diff --git a/package/rene/exim/exim.conf b/package/rene/exim/exim.conf index 5bffa780f..4394abab9 100644 --- a/package/rene/exim/exim.conf +++ b/package/rene/exim/exim.conf @@ -49,6 +49,8 @@ exim_pm(){ install_init exim $confdir/exim.init } +makeopt="all" ; makeinstopt="install" + hook_add preconf 3 "exim_pc" hook_add postmake 3 "exim_pm"