diff options
author | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2009-06-29 01:52:56 +0000 |
---|---|---|
committer | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2009-06-29 01:52:56 +0000 |
commit | 3fa16f38206f91e182b4dd17c51453522aec669e (patch) | |
tree | e40a0ec5072250b8b6b2fef4a5ae2d3731a17e43 /net/misc/monkeysphere/monkeysphere.SlackBuild | |
parent | 3a795b592e4e9a684d62c8b6a151a2429840dab6 (diff) | |
download | slackbuilds-3fa16f38206f91e182b4dd17c51453522aec669e.tar.gz slackbuilds-3fa16f38206f91e182b4dd17c51453522aec669e.tar.bz2 |
monkeysphere: adding patch for symlink deference on permission/ownership test
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2224 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'net/misc/monkeysphere/monkeysphere.SlackBuild')
-rw-r--r-- | net/misc/monkeysphere/monkeysphere.SlackBuild | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/net/misc/monkeysphere/monkeysphere.SlackBuild b/net/misc/monkeysphere/monkeysphere.SlackBuild index e8cd3f41..e4b8ff90 100644 --- a/net/misc/monkeysphere/monkeysphere.SlackBuild +++ b/net/misc/monkeysphere/monkeysphere.SlackBuild @@ -17,7 +17,7 @@ # slackbuild for monkeysphere, by Silvio Rhatto # requires: # tested: monkeysphere-0.24 -# model: generic.mkSlackBuild $Rev: 796 $ +# model: generic.mkSlackBuild $Rev: 805 $ # # Look for slackbuildrc @@ -34,7 +34,7 @@ PKG_NAME="monkeysphere" ARCH=${ARCH:=i486} SRC_VERSION=${VERSION:=0.24} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" -BUILD=${BUILD:=1rha} +BUILD=${BUILD:=2rha} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} @@ -159,6 +159,31 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`" cd "$PKG_SRC" +# Patch source +patches=" [[PATCH URLS]] + $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff + $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff" +for patch in $patches; do + patch="`basename $patch`" + if [ -f "$CWD/$patch" ]; then + patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH + elif [ -f "$CWD/patches/$patch" ]; then + patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH + elif [ -f "$CWD/$patch.gz" ]; then + gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH + elif [ -f "$CWD/patches/$patch.gz" ]; then + gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH + elif [ -f "$SRC_DIR/$patch" ]; then + if [ "`basename $patch .gz`" != "$patch" ]; then + gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH + elif [ "`basename $patch .bz2`" != "$patch" ]; then + bzip2 -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH + else + patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH + fi + fi +done + # Compile make $NUMJOBS || exit $ERROR_MAKE @@ -207,7 +232,7 @@ monkeysphere: EODESC # Move config files to .new to avoid overwriting any system config -for config_file in etc/monkeysphere/gnupg-host.conf etc/monkeysphere/gnupg-authentication.conf etc/monkeysphere/monkeysphere.conf etc/monkeysphere/monkeysphere-server.conf etc/monkeysphere/monkeysphere-authentication.conf etc/monkeysphere/monkeysphere-host.conf; do +for config_file in etc/monkeysphere/monkeysphere-host.conf etc/monkeysphere/monkeysphere.conf etc/monkeysphere/monkeysphere-authentication.conf; do mv $PKG/$config_file $PKG/$config_file.new done @@ -251,7 +276,7 @@ mkuser() { fi } -config etc/monkeysphere/gnupg-host.conf.new; config etc/monkeysphere/gnupg-authentication.conf.new; config etc/monkeysphere/monkeysphere.conf.new; config etc/monkeysphere/monkeysphere-server.conf.new ; config etc/monkeysphere/monkeysphere-authentication.conf.new ; config etc/monkeysphere/monkeysphere-host.conf.new +config etc/monkeysphere/monkeysphere-host.conf.new; config etc/monkeysphere/monkeysphere.conf.new; config etc/monkeysphere/monkeysphere-authentication.conf.new EOSCRIPT # Build the package |