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

3 files changed, 61 insertions, 20 deletions

diff --git a/net/misc/monkeysphere/Manifest b/net/misc/monkeysphere/Manifest
index b148b5fd..0e3e8dbf 100644
--- a/net/misc/monkeysphere/Manifest
+++ b/net/misc/monkeysphere/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST monkeysphere_0.22.orig.tar.gz 70245 MD5 2bb00c86323409b98aff53f94d9ce0a6 RMD160 1d388e26d39791ea29f45769904115b43ce6fdd2 SHA1 312882ad192b8e7303e3e0ac9db20ac8ddc529b3 SHA256 2566facda807a67a4d2d6de3833cccfa0b78b454909e8d25f47a235a9e621b24 SHA512 b098461df255945150301e28920c1034f3cb05b82e5112d32df6e48f57296de4513a78bdb92ce218d5dcf252223bdfd97567af5612512d2d37354889f3b6158e
 DIST monkeysphere_0.23.1.orig.tar.gz 97171 MD5 9ab4a35052b41d6468a4ab4758fd23b2 RMD160 324e27e9f068386d2734b8f9f33b01fc70de2c87 SHA1 1e3004505b5c2cda98194d1241f76303b154aac6 SHA256 998b8f8f0c498aa7d58eed6519c23ab9808cb8b622f97f8aa47865b718024d6c SHA512 8da95362807b7308b3c72f03d95ee436e005bd6bc60a6dbfe796676bec15e804c4f574b08f79e168ef12c05e23cd9810e4343bb40acbfc0c04a2b9a3928b2093
 DIST monkeysphere_0.24.orig.tar.gz 86044 MD5 8590532f4702fa44027a6a583657c9ef RMD160 847b6496197a4aa6c7ee378ab970702f7d29fcde SHA1 45b26ada094705e56eeff1117a28162e04226cc7 SHA256 2a58cee998ddb1b21b953826fc746a743e17d94e6fa34ac9cbee4262873b5c5f SHA512 4499095348fea0c6161bdc182944e939c16981a7fe8a1c25fce08fdae50608975ca53a19bb693150ef4de4e41f2c12c2ca2badf413cc875ad21e0028e5f99e56
-MKBUILD monkeysphere.mkbuild 3818 MD5 1eb383a48364cbf9fa5f8316ec3d04a8 RMD160 5b2ad582d8a50f45978e017c0ceb15b14ae9ed59 SHA1 a551d6f01bcd0688c8cccef7c4083b238492d300 SHA256 1587c61d7a47ed66aafa45741c7410c8d5cc1ee10b2c51819e335d16855d6320 SHA512 c5a22699382aacd9d26d1ca855c354d0d007b6bf2fb33703d2f92e9e36c6f86c4ab150fc0438ab4c638a244317f2102e0ff86ad3a9809abc967253d37ae27c4e
-SLACKBUILD monkeysphere.SlackBuild 8679 MD5 6eff7df48fa4f3c73591672ad1a83363 RMD160 99e87d2c965bdc66a59f7350577580cb1131b02c SHA1 dea61ec3038c20d75e7eb7918987a2af8ade06e6 SHA256 4231b7a1ce8ff547fba46a1c685137e3412796a87e0fcc5b317f17c41a06e84c SHA512 a267d089d13ab7da1bc2ff6d03f64f15d7f4ab37f938d068054e2c5a6330c48b99fae6d1fbbea002e28f24797e67fe23d7c91405688b6c5bfe29e718d7a52b19
+MKBUILD monkeysphere.mkbuild 3581 MD5 da529f0190914cfa6ccdbd385edbc856 RMD160 986163a7181c363472b33c775d1ebaf5687fa43c SHA1 35b78e36b1fb019d3005543b63f5f54149aabac5 SHA256 9d1aac6b6dea1b058c0487753b4a197a7c28c2272b07cda339faba4cb29446c3 SHA512 0411632fe5ccc84a4bc1d7d66758e76c301d907aeed4028983d19237ca1223994402d3b3c911aa8e452cffe7d75e475cfe5894353a08e9fbdcae2be0eda2b994
+PATCH monkeysphere-0.24.diff 505 MD5 223a19766504a6c72b1ec853da07a39e RMD160 6dd7b4da94d59b7a7b88cb6a7b561cdf4ab3f2f9 SHA1 d5b586e2fd96781a0ca3165d42e5f093ad7f9eaa SHA256 5760d937daf02bd8970ca26b62a85936aafc65fbc8f6edd85d6b1decbd714744 SHA512 36048b8adeb330305f9150d23b86ff0de39ef729b85f85479b3a1d714e6729c1f4c47d2eadc35c8af524b8d2044f704973a33e9df90b6aecdbc0e5017000914d
+SLACKBUILD monkeysphere.SlackBuild 9383 MD5 0cf926cd92695a77974d88440403b251 RMD160 25da69bc5551a1ea0600c6201729f411425093b0 SHA1 f732f03d0e2f640395da6176ff4b7a8fed48af29 SHA256 d69ae05b5cffce10f677c4e1525e92c76db3421ee9118dd631371780160e3e4b SHA512 76b4f77af0eb7a532b26ff376c875467fbdedf17735e785904a2bc414753c9c454f21baf78ca15fbdb51b14765d0908b27546429f992eebf4cf073a7f92408e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBAgAGBQJJuZYDAAoJEEHL93ESzgeiW8YQAJMjWTt5arfBYzXW+g6rAC8/
-8Wn7FTcFEykLooimnR9WOhqdCnDNuDIMvfbTdoVqaNkceR+ufIGpiqsVnlmX6M9k
-Xxxj1ppfPuvHxaetILt27jOdiGo50u4Ptnkymq7A7NOFEhN7wuUeAH5zQLKKFoKB
-M+L3eP6KXiwGsbA/HyTnDKzD3jDTB5jIlynE1PyWXmQAFI/7VMjFO05r8/s0lN0L
-VvULQaIk9gKE81l5bO6a02ZY1vxEgS1tr6OAFNpz+huGREAzOvf9qFqzvU/w9IIe
-wnCd3fwM0gFwPCiU+QNHZS1itNtmdfKZkgEGkwSIHlnRCcbejHwFm7CcU6Ul0guC
-29bhqkkJYdSOqXzZooqVFBfxZBJGemJSJwzPFFVI1BVu7l18PoH/njDxoe0G3h5B
-WS1IqYtkvwMGQMplm6ujzsOnTXsGw7nRRKmNBaQcxMTSGXo9ee8fUE/v3zI8qXH4
-0FmIi2fCoFaVKwB7teu3ZBjQDcDFg0IzQkmcvb5DQXPgkOLNsrInI3aTwK3kBvxu
-gOkVVLlk5Cd8Rn3wDBIotjaM4h1pjOXvBZ+qETWsCNN9UVdGw1XlE3fF1BQBJb1e
-oc561L/oKKW5jkdvYLEXo6ha6lu6UDO713V01K4Ps9chwLSI0eq1xDIFPTJyM9Iv
-+SsHgxqUklwyojA94k9h
-=PdaC
+iQIcBAEBCAAGBQJKSBwiAAoJEEHL93ESzgei52EP/ivTv926vDYXudrxJhjMnZEs
+4GKdaq9IDc1yYCOKyBFj7S6ga/tfDYVQ1wIR6s53EKQ9ilnyyOCA4xo9gKNKtnAn
+DKORb+JqryS3hM0DLk0/zfwWrOQ9zu64Oqi9Mq+ywnZ4rELDo3Lj+Jc0WQ1pOTwe
+vZmKEhQOf14SRzm7qFxhZ0yZOsIHYR3GBK/ibgI718ZC7PLlCeFuM845IYByU+Kd
+wKho+F/56sPnyw06cw4AA15ASSsjWlMEB9AXA3DOJQEU5UwetLo9zeatz7aOl+Do
+kdOVfseUfiOpPZvfPLbv57Ujp77txc+ceQ8rzAZa4i1wg0nMtCDredCLyDGfWed1
+7jmSB/mQCTSUVrVs1aUaEt6uEGXKhTzHcZB7NShOZc2OUssFVC+TmBmcZXTiz96F
+2al86kZ7VyHJ7KD+mzLWL05R18iwKOF/L7GUtaD2tBHYn5m7jhywHYMjhzdmMIGn
+ljZf1j9SCj3n3wcKneamml1RN7oJrpj0NQw7vlRbuhcWKbz6yq+BKz9BlMvOeE7i
+dngKlFyhG9nAApsRs1+DkbFgJsjXZsPXFn/8ShM1rS7kwMR+aMRY40MKEx8EawH4
+2hv+aOGxXRbxH7ld3F4+oq0209wWBkbcGXHdWmseTP5K5EASr2n82ikGRTjjFEad
+xRz/dVFP6ifZ27i2IrdB
+=Z4XU
 -----END PGP SIGNATURE-----
diff --git a/net/misc/monkeysphere/monkeysphere-0.24.diff b/net/misc/monkeysphere/monkeysphere-0.24.diff
new file mode 100644
index 00000000..f7be544a
--- /dev/null
+++ b/net/misc/monkeysphere/monkeysphere-0.24.diff
@@ -0,0 +1,15 @@
+diff -Naur monkeysphere-0.24.orig/src/share/common monkeysphere-0.24/src/share/common
+--- monkeysphere-0.24.orig/src/share/common	2009-03-03 14:02:00.000000000 -0300
++++ monkeysphere-0.24/src/share/common	2009-06-28 22:39:37.000000000 -0300
+@@ -415,6 +415,11 @@
+     uname="$1"
+     path="$2"
+ 
++    # rewrite path if it points to a symlink
++    if [ -h "$path" ] ; then
++      path="`readlink $path`"
++    fi
++
+     log debug "checking path permission '$path'..."
+ 
+     # return 255 if cannot stat file
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