diff options
author | Ladislav Hagara | 2007-05-17 02:24:16 +0200 |
---|---|---|
committer | Eric Sandall | 2007-05-17 10:15:47 -0700 |
commit | ac1ceb1d0c0acf5033a7378c65e9e6ad83c1cb77 (patch) | |
tree | d1a80fa258c57594badc6e84997dbc4d7ecc9e94 | |
parent | 8c95714d7017ff63d3d3d31c2b5a1946c8b61413 (diff) |
samba: added patch [Bug 13782]
(cherry picked from commit 1f632a97b3cd0f716af1e08501d2f93210cfe39d)
-rwxr-xr-x | net/samba/DETAILS | 2 | ||||
-rw-r--r-- | net/samba/HISTORY | 3 | ||||
-rwxr-xr-x | net/samba/PRE_BUILD | 1 | ||||
-rw-r--r-- | net/samba/pie.patch | 11 | ||||
-rw-r--r-- | net/samba/samba-3.0.24.tar.gz.sig | bin | 280 -> 0 bytes |
5 files changed, 16 insertions, 1 deletions
diff --git a/net/samba/DETAILS b/net/samba/DETAILS index 4646d3dce6..bb44a83739 100755 --- a/net/samba/DETAILS +++ b/net/samba/DETAILS @@ -16,7 +16,7 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then SOURCE2_HASH=sha512:9e1fba0f59bf10450a6f6a17aa261ae321385fd539b9757d57bfe8fea29ceccdef01427bbf7327f906000ecae41b87ed85853151be52f9ceb2dce0afc519f063 fi SECURITY_PATCH=3 - PATCHLEVEL=1 + PATCHLEVEL=2 LICENSE[0]=GPL WEB_SITE=http://www.samba.org/ KEYWORDS="net" diff --git a/net/samba/HISTORY b/net/samba/HISTORY index 5d4c37a55b..01b324313f 100644 --- a/net/samba/HISTORY +++ b/net/samba/HISTORY @@ -1,3 +1,6 @@ +2007-05-17 Ladislav Hagara <hgr@vabo.cz> + * PRE_BUILD, pie.patch: added patch [Bug 13782] + 2007-05-16 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.0.35 SECURITY_PATCH++ diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD index 0292bd6eed..d742b1c323 100755 --- a/net/samba/PRE_BUILD +++ b/net/samba/PRE_BUILD @@ -2,6 +2,7 @@ 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 new file mode 100644 index 0000000000..f92cb1d6a7 --- /dev/null +++ b/net/samba/pie.patch @@ -0,0 +1,11 @@ +--- 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"): diff --git a/net/samba/samba-3.0.24.tar.gz.sig b/net/samba/samba-3.0.24.tar.gz.sig Binary files differdeleted file mode 100644 index f3199c24db..0000000000 --- a/net/samba/samba-3.0.24.tar.gz.sig +++ /dev/null |