summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Kral <a.kral@bobek.cz>2012-05-10 07:00:59 +0200
committerAntonin Kral <a.kral@bobek.cz>2012-05-10 07:00:59 +0200
commit36ec56f187952adb3f0a424273b1b0eec4c58e31 (patch)
treedae349ae5eae0479b2c22602c2a9fe6a2e416735
parent8813daaab256108f7aa6300875e8562d031f2c2f (diff)
downloadmongodb-36ec56f187952adb3f0a424273b1b0eec4c58e31.tar.gz
Regenarate patches for 2.0.5
-rw-r--r--debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch4
-rw-r--r--debian/patches/0002-Ignore-unused-but-set-variables-and-params-Closes-62.patch (renamed from debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch)4
-rw-r--r--debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch21
-rw-r--r--debian/patches/0003-use-system-wide-pcre.patch (renamed from debian/patches/0004-use-system-wide-pcre.patch)28
-rw-r--r--debian/patches/series5
5 files changed, 20 insertions, 42 deletions
diff --git a/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch b/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
index 9e550f6..b7c383c 100644
--- a/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
+++ b/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
@@ -4,10 +4,10 @@ Subject: install libs to /usr/lib not /usr/lib64 (Closes: #588557)
---
SConstruct | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
-index dbe95a3..e142f29 100644
+index 3d40050..02813ea 100644
--- a/SConstruct
+++ b/SConstruct
@@ -525,7 +525,7 @@ elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
diff --git a/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch b/debian/patches/0002-Ignore-unused-but-set-variables-and-params-Closes-62.patch
index bf8adb4..76a8cf1 100644
--- a/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
+++ b/debian/patches/0002-Ignore-unused-but-set-variables-and-params-Closes-62.patch
@@ -4,10 +4,10 @@ Subject: Ignore unused but set variables and params (Closes: #625401)
---
SConstruct | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
-index b5a2e30..3bf6aca 100644
+index 02813ea..86518ff 100644
--- a/SConstruct
+++ b/SConstruct
@@ -704,7 +704,8 @@ if nix:
diff --git a/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch b/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch
deleted file mode 100644
index 4205f54..0000000
--- a/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Antonin Kral <a.kral@bobek.cz>
-Date: Tue, 5 Apr 2011 10:19:55 +0200
-Subject: return empty TERM if not set (Closes: #620910)
-
----
- SConstruct | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index e142f29..b5a2e30 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -714,7 +714,7 @@ if nix:
-
- #make scons colorgcc friendly
- env['ENV']['HOME'] = os.environ['HOME']
-- env['ENV']['TERM'] = os.environ['TERM']
-+ env['ENV']['TERM'] = os.environ.get('TERM', '')
-
- if linux and has_option( "sharedclient" ):
- env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
diff --git a/debian/patches/0004-use-system-wide-pcre.patch b/debian/patches/0003-use-system-wide-pcre.patch
index 54e8a80..3d71d59 100644
--- a/debian/patches/0004-use-system-wide-pcre.patch
+++ b/debian/patches/0003-use-system-wide-pcre.patch
@@ -3,11 +3,11 @@ Date: Thu, 15 Dec 2011 11:22:43 +0100
Subject: use system-wide pcre
---
- SConstruct | 98 ++++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 53 insertions(+), 45 deletions(-)
+ SConstruct | 98 ++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 53 insertions(+), 45 deletions(-)
diff --git a/SConstruct b/SConstruct
-index 3bf6aca..15bd3f5 100644
+index 86518ff..42369ff 100644
--- a/SConstruct
+++ b/SConstruct
@@ -48,7 +48,11 @@ def getThirdPartyShortNames():
@@ -228,7 +228,7 @@ index 3bf6aca..15bd3f5 100644
env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux:
-@@ -729,7 +737,7 @@ if nix:
+@@ -732,7 +740,7 @@ if nix:
#env.Append( LINKFLAGS=" -fprofile-generate" )
# then:
#env.Append( CPPFLAGS=" -fprofile-use" )
@@ -237,7 +237,7 @@ index 3bf6aca..15bd3f5 100644
if debugLogging:
env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -789,14 +797,14 @@ if not windows:
+@@ -792,14 +800,14 @@ if not windows:
os.chmod( keyfile , stat.S_IWUSR|stat.S_IRUSR )
moduleFiles = {}
@@ -255,7 +255,7 @@ index 3bf6aca..15bd3f5 100644
if has_option( "use-system-" + shortName ) or has_option( "use-system-all" ):
print( "using system version of: " + shortName )
myModule.configureSystem( env , fileLists , options_topass )
-@@ -1003,7 +1011,7 @@ def doConfigure( myenv , shell=False ):
+@@ -983,7 +991,7 @@ def doConfigure( myenv , shell=False ):
if not found:
raise "can't find a static %s" % l
@@ -264,7 +264,7 @@ index 3bf6aca..15bd3f5 100644
# point.
if has_option( "heapcheck" ) and not shell:
if ( not debugBuild ) and ( not debugLogging ):
-@@ -1018,7 +1026,7 @@ def doConfigure( myenv , shell=False ):
+@@ -998,7 +1006,7 @@ def doConfigure( myenv , shell=False ):
myenv.Append( CPPDEFINES=[ "HEAP_CHECKING" ] )
myenv.Append( CPPFLAGS="-fno-omit-frame-pointer" )
@@ -273,7 +273,7 @@ index 3bf6aca..15bd3f5 100644
# with shell==True, it'd be on its second call and it would need to rearrange the libraries'
# order. The following removes tcmalloc from the LIB's list and reinserts it at the end.
if has_option( "heapcheck" ) and shell:
-@@ -1128,7 +1136,7 @@ checkErrorCodes()
+@@ -1108,7 +1116,7 @@ checkErrorCodes()
# main db target
mongodOnlyFiles = [ "db/db.cpp", "db/compact.cpp" ]
if windows:
@@ -282,7 +282,7 @@ index 3bf6aca..15bd3f5 100644
mongod = env.Program( "mongod" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + mongodOnlyFiles )
Default( mongod )
-@@ -1215,7 +1223,7 @@ elif not onlyServer:
+@@ -1195,7 +1203,7 @@ elif not onlyServer:
coreShellFiles.append( "third_party/linenoise/linenoise.cpp" )
shellEnv.Prepend( LIBPATH=[ "." ] )
@@ -291,7 +291,7 @@ index 3bf6aca..15bd3f5 100644
shellEnv = doConfigure( shellEnv , shell=True )
shellEnv.Prepend( LIBS=[ "mongoshellfiles"] )
-@@ -1364,14 +1372,14 @@ env.AlwaysBuild("docs")
+@@ -1344,14 +1352,14 @@ env.AlwaysBuild("docs")
# ---- astyle ----
def doStyling( env , target , source ):
@@ -308,7 +308,7 @@ index 3bf6aca..15bd3f5 100644
files = filter( lambda x: not x.endswith( ".c" ) , files )
files.remove( "./shell/mongo_vstudio.cpp" )
-@@ -1396,7 +1404,7 @@ def getSystemInstallName():
+@@ -1376,7 +1384,7 @@ def getSystemInstallName():
n += "-debugsymbols"
if nix and os.uname()[2].startswith( "8." ):
n += "-tiger"
@@ -317,7 +317,7 @@ index 3bf6aca..15bd3f5 100644
if len(moduleNames) > 0:
n += "-" + "-".join( moduleNames )
-@@ -1408,7 +1416,7 @@ def getSystemInstallName():
+@@ -1388,7 +1396,7 @@ def getSystemInstallName():
except:
pass
@@ -326,7 +326,7 @@ index 3bf6aca..15bd3f5 100644
dn = GetOption( "distmod" )
if dn and len(dn) > 0:
n = n + "-" + dn
-@@ -1521,7 +1529,7 @@ if installSetup.clientSrc:
+@@ -1501,7 +1509,7 @@ if installSetup.clientSrc:
#lib
if installSetup.libraries:
env.Install( installDir + "/" + nixLibPrefix, clientLibName )
@@ -335,7 +335,7 @@ index 3bf6aca..15bd3f5 100644
env.Install( installDir + "/" + nixLibPrefix, sharedClientLibName )
-@@ -1603,7 +1611,7 @@ def s3push( localName , remoteName=None , remotePrefix=None , fixName=True , pla
+@@ -1583,7 +1591,7 @@ def s3push( localName , remoteName=None , remotePrefix=None , fixName=True , pla
name = name.lower()
else:
name = remoteName
diff --git a/debian/patches/series b/debian/patches/series
index a018508..f818da6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
-0002-return-empty-TERM-if-not-set-Closes-620910.patch
-0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
-0004-use-system-wide-pcre.patch
+0002-Ignore-unused-but-set-variables-and-params-Closes-62.patch
+0003-use-system-wide-pcre.patch