Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 net/samba/DETAILS   |    5 ++---
 net/samba/HISTORY   |    5 +++++
 net/samba/PRE_BUILD |    1 -
 net/samba/pie.patch |   11 -----------
 4 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit ce209834e4f60f2ddd1cb9a195784a072b3d367b
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    samba: Updated to version 3.0.25a

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index bb44a83..1f8ed7c 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,6 +1,6 @@
            SPELL=samba
-         VERSION=3.0.25
-     
SOURCE_HASH=sha512:86d6070513bdbd1a656ec5c64bf81dfadac8271955a39e96e712d8ebc016756fba071cc2df3bcaad086963b8022d39cb7e177f4772e4c047369c4afc77ae3a8c
+         VERSION=3.0.25a
+     
SOURCE_HASH=sha512:e506e6e413c1089c893d1c97fa1075a7f72863cf36e8d7b1b5bed66f55ef88758385495145c25817636c29700628f57bff655a7aafe29be6afc5c051a2acdfe2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://us1.samba.org/samba/ftp/$SOURCE
@@ -16,7 +16,6 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then
     
SOURCE2_HASH=sha512:9e1fba0f59bf10450a6f6a17aa261ae321385fd539b9757d57bfe8fea29ceccdef01427bbf7327f906000ecae41b87ed85853151be52f9ceb2dce0afc519f063
 fi
   SECURITY_PATCH=3
-      PATCHLEVEL=2
       LICENSE[0]=GPL
         WEB_SITE=http://www.samba.org/
         KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 01b3243..b96a621 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,8 @@
+2007-05-26 George Sherwood <george AT beernabeer.com>
+       * DETAILS: updated spell to 3.0.25a
+       * PRE_BUILD: Removed pie.patch.  Incorporated upstream.
+       * pie.patch: Removed.
+
 2007-05-17 Ladislav Hagara <hgr AT vabo.cz>
        * PRE_BUILD, pie.patch: added patch [Bug 13782]
 
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index d742b1c..0292bd6 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -2,7 +2,6 @@ default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 
 sedit  's!libsmbclient.*\$(LIBDIR)!&/..!'  source/Makefile.in  &&
-patch -p2 < $SCRIPT_DIRECTORY/pie.patch                        &&
 
 if [[ "$SAMBA_VSCAN" == "y" ]] ; then
         cd $SOURCE_DIRECTORY/examples/VFS/ &&
diff --git a/net/samba/pie.patch b/net/samba/pie.patch
deleted file mode 100644
index f92cb1d..0000000
--- a/net/samba/pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- branches/SAMBA_3_0_25/source/python/setup.py       2007/02/05 15:28:11   
  21153
-+++ branches/SAMBA_3_0_25/source/python/setup.py       2007/05/14 09:47:58   
  22840
-@@ -67,6 +67,8 @@
-         libraries.append(lib[2:])
-     elif lib[0:8] == ("-pthread"):
-         pass # Skip linker flags
-+    elif lib[0:4] == ("-pie"):
-+        pass # Skip linker flags
-     elif lib[0:2] == "-L":
-         library_dirs.append(lib[2:])
-     elif lib[0:2] in ("-W","-s"):