gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-db/*: remove unused patches.

Browse Source 
Squash all commit messages into a single one.

Closes: https://github.com/gentoo/gentoo/pull/1936
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger (asterix)
2016-07-19 19:29:57 +02:00
committed by Patrice Clement
parent 85215a4437
commit 3e85c8c485
48 changed files with 0 additions and 2035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dev-db/ctdb/files/autoconf-2.62-fix.patch
View File

@@ -1,15 +0,0 @@
--- lib/replace/autoconf-2.60.m4.orig 2008-04-19 00:26:33.000000000 -0400
+++ lib/replace/autoconf-2.60.m4 2008-04-19 00:22:25.000000000 -0400
@@ -179,6 +179,7 @@
# ------------------------
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
[
AC_BEFORE([$0], [AC_COMPILE_IFELSE])
@@ -208,3 +209,4 @@
AC_DEFINE([__EXTENSIONS__])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
])
+])

77
dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
View File

@@ -1,77 +0,0 @@
diff -Naur ctdb-1.0.114.orig/config/functions ctdb-1.0.114/config/functions
--- ctdb-1.0.114.orig/config/functions 2010-04-04 18:01:18.278707515 +0200
+++ ctdb-1.0.114/config/functions 2010-04-04 18:08:05.792447032 +0200
@@ -22,6 +22,8 @@
. /etc/default/$1
elif [ -f $CTDB_BASE/sysconfig/$1 ]; then
. $CTDB_BASE/sysconfig/$1
+ elif [ -f /etc/config.d/$1 ]; then
+ . /etc/config.d/$name
fi
}
@@ -33,6 +35,8 @@
if [ -x /sbin/startproc ]; then
CTDB_INIT_STYLE="suse"
+ elif [ -x /bin/rc-status ] ; then
+ CTDB_INIT_STYLE="gentoo"
elif [ -x /sbin/start-stop-daemon ]; then
CTDB_INIT_STYLE="debian"
else
@@ -356,6 +360,9 @@
[ -x /etc/init.d/nfslock ] && {
PLATFORM="rhel"
}
+ [ -x etc/init.d/nfs ] && {
+ PLATFORM="gentoo"
+ }
case $PLATFORM in
sles)
@@ -380,6 +387,16 @@
;;
esac
;;
+ gentoo)
+ case $1 in
+ start)
+ service nfs start
+ ;;
+ stop)
+ service nfs stop > /dev/null 2>&1
+ ;;
+ esac
+ ;;
*)
echo "Unknown platform. NFS is not supported with ctdb"
exit 1
@@ -398,6 +415,9 @@
[ -x /etc/init.d/nfslock ] && {
PLATFORM="rhel"
}
+ [ -x etc/init.d/nfs ] && {
+ PLATFORM="gentoo"
+ }
case $PLATFORM in
sles)
@@ -422,6 +442,18 @@
;;
esac
;;
+ gentoo)
+ # for gentoo there is no service for lockmanager
+ # so we instead just shutdown/restart nfs
+ case $1 in
+ start)
+ service nfs start
+ ;;
+ stop)
+ service nfs stop > /dev/null 2>&1
+ ;;
+ esac
+ ;;
*)
echo "Unknown platform. NFS locking is not supported with ctdb"
exit 1

13
dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch
View File

@@ -1,13 +0,0 @@
--- ./config/events.d/41.httpd 2009-05-29 14:19:30.741662868 +0100
+++ ./config/events.d/41.httpd 2009-07-28 18:31:48.016042964 +0100
@@ -19,6 +19,10 @@
CTDB_SERVICE_HTTP="apache2"
CTDB_CONFIG_HTTP="apache2"
;;
+ gentoo)
+ CTDB_SERVICE_HTTP="apache2"
+ CTDB_CONFIG_HTTP="apache2"
+ ;;
*)
# should not happen.
# for now use red hat style as default

14
dev-db/ctdb/files/ctdb-50.samba_gentoo.patch
View File

@@ -1,14 +0,0 @@
--- ./config/events.d/50.samba 2009-05-29 14:19:30.741662868 +0100
+++ ./config/events.d/50.samba 2009-07-28 18:27:21.896042994 +0100
@@ -25,6 +25,11 @@
CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
;;
+ gentoo)
+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-""}
+ ;;
*)
# should not happen, but for now use redhat style as default:
CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}

76
dev-db/ctdb/files/ctdb-functions.patch
View File

@@ -1,76 +0,0 @@
--- ./config/functions 2009-05-29 14:19:30.741662868 +0100
+++ ./config/functions 2009-07-29 14:15:19.436043164 +0100
@@ -10,6 +10,8 @@
. /etc/default/$name
elif [ -f $CTDB_BASE/sysconfig/$name ]; then
. $CTDB_BASE/sysconfig/$name
+ elif [ -f /etc/config.d/$name ]; then
+ . /etc/config.d/$name
fi
}
@@ -21,6 +23,8 @@
if [ -x /sbin/startproc ]; then
CTDB_INIT_STYLE="suse"
+ elif [ -x /bin/rc-status ]; then
+ CTDB_INIT_STYLE="gentoo"
elif [ -x /sbin/start-stop-daemon ]; then
CTDB_INIT_STYLE="ubuntu"
else
@@ -400,6 +404,9 @@
[ -x /etc/init.d/nfslock ] && {
PLATFORM="rhel"
}
+ [ -x etc/init.d/nfs ] && {
+ PLATFORM="gentoo"
+ }
case $PLATFORM in
sles)
@@ -424,6 +431,16 @@
;;
esac
;;
+ gentoo)
+ case $1 in
+ start)
+ service nfs start
+ ;;
+ stop)
+ service nfs stop > /dev/null 2>&1
+ ;;
+ esac
+ ;;
*)
echo "Unknown platform. NFS is not supported with ctdb"
exit 1
@@ -442,6 +459,9 @@
[ -x /etc/init.d/nfslock ] && {
PLATFORM="rhel"
}
+ [ -x etc/init.d/nfs ] && {
+ PLATFORM="gentoo"
+ }
case $PLATFORM in
sles)
@@ -466,6 +486,18 @@
;;
esac
;;
+ gentoo)
+ # for gentoo there is no service for lockmanager
+ # so we instead just shutdown/restart nfs
+ case $1 in
+ start)
+ service nfs start
+ ;;
+ stop)
+ service nfs stop > /dev/null 2>&1
+ ;;
+ esac
+ ;;
*)
echo "Unknown platform. NFS locking is not supported with ctdb"
exit 1

81
dev-db/ctdb/files/ctdb.initd
View File

@@ -1,81 +0,0 @@
#!/sbin/openrc-run
depend() {
need localmount
need net
before samba
after bootmisc
}
start() {
ebegin "Starting ctdb"
[ -z "$CTDB_RECOVERY_LOCK" ] && {
eerror "You must configure the location of the CTDB_RECOVERY_LOCK in /etc/conf.d/ctdb"
return 1
}
[ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
eerror "You must configure the location of the CTDB_PUBLIC_ADDRESSES in /etc/conf.d/ctdb"
return 1
}
[ -z "$CTDB_PUBLIC_INTERFACE" ] && {
eerror "You must configure the location of the CTDB_PUBLIC_INTERFACE in /etc/conf.d/ctdb"
return 1
}
CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
# build up CTDB_OPTIONS variable from optional parameters
[ -z "$CTDB_LOGFILE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --logfile=$CTDB_LOGFILE"
[ -z "$CTDB_NODES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --nlist=$CTDB_NODES"
[ -z "$CTDB_SOCKET" ] || CTDB_OPTIONS="$CTDB_OPTIONS --socket=$CTDB_SOCKET"
[ -z "$CTDB_PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$CTDB_PUBLIC_ADDRESSES"
[ -z "$CTDB_PUBLIC_INTERFACE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-interface=$CTDB_PUBLIC_INTERFACE"
[ -z "$CTDB_SINGLE_PUBLIC_IP" ] || CTDB_OPTIONS="$CTDB_OPTIONS --single-public-ip=$CTDB_SINGLE_PUBLIC_IP"
[ -z "$CTDB_DBDIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir=$CTDB_DBDIR"
[ -z "$CTDB_DBDIR_PERSISTENT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir-persistent=$CTDB_DBDIR_PERSISTENT"
[ -z "$CTDB_EVENT_SCRIPT_DIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --event-script-dir $CTDB_EVENT_SCRIPT_DIR"
[ -z "$CTDB_TRANSPORT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --transport $CTDB_TRANSPORT"
[ -z "$CTDB_DEBUGLEVEL" ] || CTDB_OPTIONS="$CTDB_OPTIONS -d $CTDB_DEBUGLEVEL"
[ -z "$CTDB_START_AS_DISABLED" ] || [ "$CTDB_START_AS_DISABLED" != "yes" ] || {
CTDB_OPTIONS="$CTDB_OPTIONS --start-as-disabled"
}
[ -z "$CTDB_CAPABILITY_RECMASTER" ] || [ "$CTDB_CAPABILITY_RECMASTER" != "no" ] || {
CTDB_OPTIONS="$CTDB_OPTIONS --no-recmaster"
}
[ -z "$CTDB_CAPABILITY_LMASTER" ] || [ "$CTDB_CAPABILITY_LMASTER" != "no" ] || {
CTDB_OPTIONS="$CTDB_OPTIONS --no-lmaster"
}
[ -z "$CTDB_LVS_PUBLIC_IP" ] || {
CTDB_OPTIONS="$CTDB_OPTIONS --lvs"
}
[ -z "$CTDB_SCRIPT_LOG_LEVEL" ] || {
CTDB_OPTIONS="$CTDB_OPTIONS --script-log-level=$CTDB_SCRIPT_LOG_LEVEL"
}
# check all persistent databases that they look ok
PERSISTENT_DB_DIR="/var/ctdb/persistent"
[ -z "$CTDB_DBDIR" ] || {
PERSISTENT_DB_DIR="$CTDB_DBDIR/persistent"
}
mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2>/dev/null`; do
/usr/bin/tdbdump $PDBASE >/dev/null 2>/dev/null || {
eerror "Persistent database $PDBASE is corrupted! CTDB will not start."
return 1
}
done
start-stop-daemon --start --background --exec /usr/sbin/ctdbd \
--pidfile /var/run/ctdbd.pid -- $CTDB_OPTIONS
eend $?
}
stop() {
start-stop-daemon --stop --exec /usr/sbin/ctdbd \
--pidfile /var/run/ctdbd.pid
}

59
dev-db/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch
View File

@@ -1,59 +0,0 @@
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400
@@ -158,7 +158,7 @@
# some complications particularly for super in needing to start the server
# that you are currently building. MOD 28-July-2002
-firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
+firebird_basic: firebird_boot basic_targets
firebird_boot: updateBuildNum boot_phase1 boot_phase2
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
--- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400
@@ -138,7 +138,7 @@
AR= ar @AR_OPTIONS@ crsu
LN= @LN_S@
RANLIB= @RANLIB@
-BTYACC=$(ROOT)/extern/btyacc/btyacc
+BTYACC=/usr/bin/btyacc
CC = @CC@
CXX = @CXX@
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400
@@ -18,11 +18,10 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+PROD_FLAGS=$(COMMON_FLAGS)
#DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400
@@ -18,12 +18,11 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+PROD_FLAGS=$(COMMON_FLAGS)
#DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)

34
dev-db/henplus/files/henplus-0.9.7-build.xml.patch
View File

@@ -1,34 +0,0 @@
--- build.xml.orig 2006-10-17 22:25:57.000000000 +0200
+++ build.xml 2006-10-17 22:27:34.000000000 +0200
@@ -21,26 +21,26 @@
<property name="libreadline-java" value="libreadline-java-0.8.0.jar"/>
<path id="compile.classpath">
- <fileset dir="${lib}">
- <include name="${libreadline-java}"/>
- <include name="${commons-cli}"/>
- </fileset>
+ <fileset dir="${lib}" includes="**/*.jar"/>
</path>
<path id="run.classpath">
<path refid="compile.classpath" />
<pathelement path="${classes}" />
</path>
-
+
+ <!--
<taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask">
<classpath>
<pathelement location="${lib}/build/sat-0.7.jar" />
</classpath>
</taskdef>
+
<target name="server">
<ant-server/>
</target>
+ -->
<target name="prepare">
<tstamp>

42
dev-db/henplus/files/henplus.patch
View File

@@ -1,42 +0,0 @@
--- a/bin/henplus 2004-02-02 14:53:28.000000000 +0100
+++ b/bin/henplus 2004-07-23 11:21:11.518166136 +0200
@@ -2,6 +2,7 @@
# $Id$
##
+echo $(dirname $0)
# additional flags you might want to pass to the java interpreter
# like -Dfile.encoding=ISO-8859-1
JAVA_FLAGS=
@@ -13,20 +14,8 @@
JAVA=$JAVA_HOME/bin/java
fi
-##------------------
-THISDIR=`dirname $0`
-HENPLUSDIR=$THISDIR/../share/henplus
-
-# not yet installed ? Then look in the build directory
-if [ ! -d "$HENPLUSDIR" ] ; then
- HENPLUSDIR=$THISDIR/../build
-fi
-
-# location of the readline lib.
-# Modify this, if you installation stores this at a different
-# position.
-LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
-CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
+HENPLUSDIR=$(dirname $(java-config -p henplus))
+CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java)
# you may just throw your own jar files in this dir.
# (like additional JDBC-drivers, that are not in default
@@ -65,7 +54,4 @@
CLASSPATH=$CLASSPATH:$f
fi
done
-
-export CLASSPATH LD_LIBRARY_PATH
-
-exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
+LD_LIBRARY_PATH="$(java-config -i libreadline-java):$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"

18
dev-db/libzdb/files/sqlite_configure.patch
View File

@@ -1,18 +0,0 @@
--- configure.ac_orig 2012-07-14 07:14:19.000000000 +1000
+++ configure.ac 2012-07-23 14:17:38.702411605 +1000
@@ -298,12 +298,11 @@
CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
AC_CHECK_HEADERS([sqlite3.h], [
sqlite="yes"
- if test -r "$with_sqlite/lib/libsqlite3.a"; then
+ AC_CHECK_LIB(sqlite3, main,[
+
DBCPPFLAGS="$DBCPPFLAGS -I$with_sqlite/include"
DBLDFLAGS="$DBLDFLAGS -L$with_sqlite/lib/ -lsqlite3"
- else
- sqlite="no"
- fi
+ ],[sqlite="no"])
], [sqlite="no"])
LDFLAGS=$svd_LDFLAGS
CPPFLAGS=$svd_CPPFLAGS

9
dev-db/mongodb/files/mms-agent.confd
View File

@@ -1,9 +0,0 @@
# Your API key - See: http://mms.10gen.com/settings
API_KEY=""
SECRET_KEY=""
# Seconds between Mongo status checks
#COLLECTION_INTERVAL=56
# Seconds between cloud configuration checks
#CONF_INTERVAL=120

41
dev-db/mongodb/files/mms-agent.initd
View File

@@ -1,41 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
ROOTDIR=/opt/mms-agent
PIDFILE=/var/run/mm-agent.pid
EXEC="/usr/bin/env python agent.py"
LOGFILE=/var/log/mongodb/mms-agent.log
depend() {
need net
use syslog
}
start() {
ebegin "Starting ${SVCNAME}"
checkpath -d -m 0755 -o root:root /var/run/
# Setup API/SECRETY KEYS
sed -i -e "s/^mms_key.*/mms_key = '${API_KEY}'/g" \
-e "s/^secret_key.*/secret_key = '${SECRET_KEY}'/g" ${ROOTDIR}/settings.py &>/dev/null
# Tune the agent
[ -z "${COLLECTION_INTERVAL}" ] || sed -i \
-e "s/^collection_interval.*/collection_interval = ${COLLECTION_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
[ -z "${CONF_INTERVAL}" ] || sed -i \
-e "s/^conf_interval.*/conf_interval = ${CONF_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
--pidfile "${PIDFILE}" --make-pidfile --background \
--user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
eend $?
}
stop() {
ebegin "Requesting ${SVCNAME} to stop"
start-stop-daemon --stop --pidfile "${PIDFILE}"
eend $?
}

31
dev-db/mongodb/files/mms-agent.initd-r1
View File

@@ -1,31 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
ROOTDIR=/opt/mms-agent
PIDFILE=/var/run/mm-agent.pid
EXEC="/usr/bin/env python agent.py"
LOGFILE=/var/log/mongodb/mms-agent.log
depend() {
need net
use syslog
}
start() {
ebegin "Starting ${SVCNAME}"
checkpath -d -m 0755 -o root:root /var/run/
start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
--pidfile "${PIDFILE}" --make-pidfile --background \
--user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
eend $?
}
stop() {
ebegin "Requesting ${SVCNAME} to stop"
start-stop-daemon --stop --pidfile "${PIDFILE}"
eend $?
}

25
dev-db/mongodb/files/mms-agent.initd-r2
View File

@@ -1,25 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
logfile=/var/log/mongodb/mms-agent.log
run_dir=${run_dir:-/run/mongodb}
command="/usr/bin/python2 agent.py &>${logfile}"
command_background="true"
pidfile=${run_dir}/${SVCNAME}.pid
user=${user:-mongodb}
group=${group:-mongodb}
start_stop_daemon_args="--user ${user} --group ${group}"
depend() {
need net
use syslog
}
start_pre() {
checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
cd /opt/mms-agent
}

36
dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
View File

@@ -1,36 +0,0 @@
--- a/SConstruct 2011-11-16 22:11:39.000000000 +0100
+++ b/SConstruct 2011-11-17 16:30:16.144117550 +0100
@@ -688,7 +688,7 @@
env["CXX"] = "distcc " + env["CXX"]
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux:
env.Append( CPPFLAGS=" -Werror " )
@@ -696,7 +696,9 @@
env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
env.Append( LIBS=[] )
@@ -706,12 +708,13 @@
if linux and has_option( "sharedclient" ):
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
+ env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " )
if debugBuild:
env.Append( CPPFLAGS=" -O0 -fstack-protector " );
env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
else:
- env.Append( CPPFLAGS=" -O3 " )
+ env.Append( CXXFLAGS=" -O3 " )
#env.Append( CPPFLAGS=" -fprofile-generate" )
#env.Append( LINKFLAGS=" -fprofile-generate" )
# then:

245
dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch
View File

@@ -1,245 +0,0 @@
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp
--- mongodb-src-r2.0.6/db/db.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/db/db.cpp 2012-07-10 22:27:16.496886220 +0200
@@ -326,7 +326,7 @@
boost::filesystem::path path( dbpath );
for ( boost::filesystem::directory_iterator i( path );
i != boost::filesystem::directory_iterator(); ++i ) {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).leaf().string();
if ( boost::filesystem::is_directory( *i ) &&
fileName.length() && fileName[ 0 ] == '$' )
boost::filesystem::remove_all( *i );
@@ -655,11 +655,6 @@
dbExecCommand = argv[0];
srand(curTimeMicros());
-#if( BOOST_VERSION >= 104500 )
- boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
-#else
- boost::filesystem::path::default_name_check( boost::filesystem::no_check );
-#endif
{
unsigned x = 0x12345678;
@@ -976,7 +971,7 @@
if (params.count("shutdown")){
bool failed = false;
- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 )
failed = true;
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp
--- mongodb-src-r2.0.6/db/dur.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/db/dur.cpp 2012-07-10 21:56:28.866778732 +0200
@@ -692,7 +692,7 @@
bool samePartition = true;
try {
- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string();
+ const string dbpathDir = boost::filesystem::path(dbpath).string();
samePartition = onSamePartition(getJournalDir().string(), dbpathDir);
}
catch(...) {
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp
--- mongodb-src-r2.0.6/db/dur_journal.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp 2012-07-10 22:04:18.583472723 +0200
@@ -169,7 +169,7 @@
for ( boost::filesystem::directory_iterator i( getJournalDir() );
i != boost::filesystem::directory_iterator();
++i ) {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).leaf().string();
if( str::startsWith(fileName, "j._") )
return true;
}
@@ -185,7 +185,7 @@
for ( boost::filesystem::directory_iterator i( getJournalDir() );
i != boost::filesystem::directory_iterator();
++i ) {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).leaf().string();
if( str::startsWith(fileName, "j._") ) {
try {
removeOldJournalFile(*i);
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp
--- mongodb-src-r2.0.6/db/dur_recover.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp 2012-07-10 22:02:18.226799055 +0200
@@ -71,7 +71,7 @@
i != filesystem::directory_iterator();
++i ) {
filesystem::path filepath = *i;
- string fileName = filesystem::path(*i).leaf();
+ string fileName = filesystem::path(*i).leaf().string();
if( str::startsWith(fileName, "j._") ) {
unsigned u = str::toUnsigned( str::after(fileName, '_') );
if( m.count(u) ) {
@@ -84,7 +84,7 @@
if( i != m.begin() && m.count(i->first - 1) == 0 ) {
uasserted(13532,
str::stream() << "unexpected file in journal directory " << dir.string()
- << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
+ << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
}
files.push_back(i->second);
}
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp
--- mongodb-src-r2.0.6/db/instance.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/db/instance.cpp 2012-07-10 22:08:55.213488817 +0200
@@ -645,13 +645,13 @@
i != boost::filesystem::directory_iterator(); ++i ) {
if ( directoryperdb ) {
boost::filesystem::path p = *i;
- string dbName = p.leaf();
+ string dbName = p.leaf().string();
p /= ( dbName + ".ns" );
if ( MMF::exists( p ) )
names.push_back( dbName );
}
else {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).leaf().string();
if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
}
@@ -893,7 +893,7 @@
}
void acquirePathLock(bool doingRepair) {
- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
bool oldFile = false;
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp
--- mongodb-src-r2.0.6/db/pdfile.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp 2012-07-10 22:11:44.103498643 +0200
@@ -1987,7 +1987,7 @@
virtual bool apply( const Path &p ) {
if ( !boost::filesystem::exists( p ) )
return false;
- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) );
return true;
}
virtual const char * op() const {
@@ -2093,7 +2093,7 @@
uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
"backup" : "$tmp" );
BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
- string reservedPathString = reservedPath.native_directory_string();
+ string reservedPathString = reservedPath.string();
bool res;
{
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp
--- mongodb-src-r2.0.6/dbtests/framework.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp 2012-07-10 22:29:20.610226773 +0200
@@ -281,7 +281,7 @@
boost::filesystem::create_directory(p);
}
- string dbpathString = p.native_directory_string();
+ string dbpathString = p.string();
dbpath = dbpathString.c_str();
cmdLine.prealloc = false;
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h
--- mongodb-src-r2.0.6/pch.h 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/pch.h 2012-07-10 21:35:57.133373738 +0200
@@ -79,7 +79,7 @@
//#include <boost/any.hpp>
#include "boost/thread/once.hpp"
//#include <boost/archive/iterators/transform_width.hpp>
-#define BOOST_FILESYSTEM_VERSION 2
+#define BOOST_FILESYSTEM_VERSION 3
#include <boost/filesystem/convenience.hpp>
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/operations.hpp>
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp
--- mongodb-src-r2.0.6/shell/shell_utils.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp 2012-07-10 22:38:58.443593723 +0200
@@ -388,7 +388,7 @@
#endif
}
- argv_.push_back( programPath.native_file_string() );
+ argv_.push_back( programPath.string() );
port_ = -1;
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp
--- mongodb-src-r2.0.6/tools/restore.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/tools/restore.cpp 2012-07-10 22:45:00.046948094 +0200
@@ -131,7 +131,7 @@
log(2) << "drillDown: " << root.string() << endl;
// skip hidden files and directories
- if (root.leaf()[0] == '.' && root.leaf() != ".")
+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".")
return;
if ( is_directory( root ) ) {
@@ -210,7 +210,7 @@
ns += "." + _coll;
}
else {
- string l = root.leaf();
+ string l = root.leaf().string();
l = l.substr( 0 , l.find_last_of( "." ) );
ns += "." + l;
}
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp
--- mongodb-src-r2.0.6/tools/tool.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/tools/tool.cpp 2012-07-10 22:23:53.356874403 +0200
@@ -113,12 +113,6 @@
// we want durability to be disabled.
cmdLine.dur = false;
-#if( BOOST_VERSION >= 104500 )
- boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
-#else
- boost::filesystem::path::default_name_check( boost::filesystem::no_check );
-#endif
-
_name = argv[0];
/* using the same style as db.cpp */
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp
--- mongodb-src-r2.0.6/util/background.cpp 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/util/background.cpp 2012-07-10 21:47:40.420081320 +0200
@@ -89,7 +89,7 @@
if ( msTimeOut ) {
// add msTimeOut millisecond to current time
boost::xtime xt;
- boost::xtime_get( &xt, boost::TIME_UTC );
+ boost::xtime_get( &xt, boost::TIME_UTC_ );
unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano
if ( xt.nsec + ns < 1000000000 ) {
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h
--- mongodb-src-r2.0.6/util/concurrency/mutex.h 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h 2012-07-10 21:45:51.333408307 +0200
@@ -29,7 +29,7 @@
inline boost::xtime incxtimemillis( long long s ) {
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += (int)( s / 1000 );
xt.nsec += (int)(( s % 1000 ) * 1000000);
if ( xt.nsec >= 1000000000 ) {
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h
--- mongodb-src-r2.0.6/util/queue.h 2012-06-04 15:42:54.000000000 +0200
+++ mongodb-src-r2.0.6-patched/util/queue.h 2012-07-10 22:14:00.243506560 +0200
@@ -82,7 +82,7 @@
Timer timer;
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += maxSecondsToWait;
scoped_lock l( _lock );

28
dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch
View File

@@ -1,28 +0,0 @@
--- a/SConstruct 2013-06-26 10:31:56.209089504 +0200
+++ b/SConstruct 2013-06-26 10:33:59.177045991 +0200
@@ -702,7 +702,6 @@
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
env.Append( CCFLAGS=["-fPIC",
"-fno-strict-aliasing",
- "-ggdb",
"-pthread",
"-Wall",
"-Wsign-compare",
@@ -710,14 +709,14 @@
"-Winvalid-pch"] )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux:
- env.Append( CCFLAGS=["-Werror", "-pipe"] )
if not has_option('clang'):
env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
- env.Append( LIBS=[] )
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
#make scons colorgcc friendly
for key in ('HOME', 'TERM'):

35
dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch
View File

@@ -1,35 +0,0 @@
diff --git SConstruct SConstruct
index 3886d1b..81c59a9 100644
--- SConstruct
+++ SConstruct
@@ -811,19 +811,17 @@ if nix:
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
env.Append( CCFLAGS=["-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 or darwin:
- env.Append( CCFLAGS=["-Werror", "-pipe"] )
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
# SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
# startup.
@@ -840,7 +838,7 @@ if nix:
if not darwin:
env.Append( LINKFLAGS=["-rdynamic"] )
- env.Append( LIBS=[] )
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
#make scons colorgcc friendly
for key in ('HOME', 'TERM'):

16
dev-db/mongodb/files/mongos.confd
View File

@@ -1,16 +0,0 @@
# Mongos essentials
MONGOS_EXEC="/usr/bin/mongos"
MONGOS_RUN="/var/run/mongodb"
MONGOS_USER="mongodb"
# Listen to specified IP, comment this to listen to all
MONGOS_IP="127.0.0.1"
# Listen to specified port
MONGOS_PORT="27018"
# 1 to 3 comma separated config servers (mandatory)
MONGOS_CONFIGDB=""
# Set extra options here
MONGOS_OPTIONS=""

50
dev-db/mongodb/files/mongos.initd-r1
View File

@@ -1,50 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
depend() {
use net
}
checkconfig() {
if [ -z "${MONGOS_CONFIGDB}" ]; then
eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
return 1
fi
return 0
}
start() {
checkconfig || return 1
checkpath -d -m 0750 -o "${MONGOS_USER}":mongodb "${MONGOS_RUN}"
# Listen to MONGOS_IP if configured
[ -z "${MONGOS_IP}" ] || MONGOS_OPTIONS="--bind_ip ${MONGOS_IP} ${MONGOS_OPTIONS}"
# Baselayout-1 user should use --chuid instead of --user
local USEROPT="--user"
if [ ! -f /etc/init.d/sysfs ]; then
USEROPT="--chuid"
fi
ebegin "Starting ${SVCNAME}"
start-stop-daemon --background --start --make-pidfile \
--pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
${USEROPT} ${MONGOS_USER:-mongodb} \
--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-- \
--port ${MONGOS_PORT:-27018} \
--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
--configdb ${MONGOS_CONFIGDB} \
${MONGOS_OPTIONS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
eend $?
}

14
dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch
View File

@@ -1,14 +0,0 @@
diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 22:25:35.000000000 +0200
+++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 22:25:57.000000000 +0200
@@ -241,10 +241,6 @@
ADD_SUBDIRECTORY(cppconn)
ADD_SUBDIRECTORY(driver)
ADD_SUBDIRECTORY(examples)
-ADD_SUBDIRECTORY(test)
-ADD_SUBDIRECTORY(test/framework)
-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
-ADD_SUBDIRECTORY(test/unit)
IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
# see also README

85
dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch
View File

@@ -1,85 +0,0 @@
diff -urN mysql-connector-c++-1.1.0.old/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt
--- mysql-connector-c++-1.1.0.old/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
+++ mysql-connector-c++-1.1.0/CMakeLists.txt 2011-07-30 13:16:18.000000000 +0200
@@ -232,7 +232,7 @@
"install_manifest.txt")
SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_DRAFT" )
-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
SET(CPACK_SOURCE_GENERATOR "TGZ")
diff -urN mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt
--- mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
+++ mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200
@@ -55,7 +55,7 @@
SET(MYSQLCPPCONN_INSTALL_HEADERS
build_config.h
- config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
connection.h
datatype.h
driver.h
diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
--- mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
+++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200
@@ -26,6 +26,9 @@
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
@@ -149,20 +152,22 @@
nativeapi/native_statement_wrapper.h
nativeapi/mysql_native_resultset_wrapper.h
nativeapi/native_resultset_wrapper.h
- ../cppconn/warning.h
- ../cppconn/statement.h
- ../cppconn/sqlstring.h
- ../cppconn/resultset_metadata.h
- ../cppconn/resultset.h
- ../cppconn/prepared_statement.h
- ../cppconn/parameter_metadata.h
- ../cppconn/metadata.h
- ../cppconn/exception.h
- ../cppconn/driver.h
- ../cppconn/datatype.h
- ../cppconn/connection.h
- ../cppconn/config.h
- ../cppconn/build_config.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
)
@@ -271,8 +276,8 @@
)
ELSE(WIN32)
INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
)
ENDIF(WIN32)

106
dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch
View File

@@ -1,106 +0,0 @@
--- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400
+++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400
@@ -269,14 +269,14 @@
${CPACK_RESOURCE_FILE_LICENSE}
"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
- DESTINATION "." OPTIONAL)
+ DESTINATION "${INSTALL_DOCS}" OPTIONAL)
SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
"~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
"install_manifest.txt")
SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )
-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$" "./driver/version_info.h$")
+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/version_info.h$")
SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
SET(CPACK_SOURCE_GENERATOR "TGZ")
@@ -303,10 +303,6 @@
ADD_SUBDIRECTORY(cppconn)
ADD_SUBDIRECTORY(driver)
ADD_SUBDIRECTORY(examples)
-ADD_SUBDIRECTORY(test)
-ADD_SUBDIRECTORY(test/framework)
-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
-ADD_SUBDIRECTORY(test/unit)
IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
# see also README
diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt
--- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
+++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200
@@ -55,7 +55,7 @@
SET(MYSQLCPPCONN_INSTALL_HEADERS
build_config.h
- config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
connection.h
datatype.h
driver.h
diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
--- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
+++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200
@@ -26,6 +26,9 @@
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
@@ -149,21 +152,23 @@
nativeapi/native_statement_wrapper.h
nativeapi/mysql_native_resultset_wrapper.h
nativeapi/native_resultset_wrapper.h
- ../cppconn/warning.h
- ../cppconn/statement.h
- ../cppconn/sqlstring.h
- ../cppconn/resultset_metadata.h
- ../cppconn/resultset.h
- ../cppconn/prepared_statement.h
- ../cppconn/parameter_metadata.h
- ../cppconn/metadata.h
- ../cppconn/exception.h
- ../cppconn/driver.h
- ../cppconn/datatype.h
- ../cppconn/variant.h
- ../cppconn/connection.h
- ../cppconn/config.h
- ../cppconn/build_config.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/variant.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
)
diff -aruN a/FindMySQL.cmake b/FindMySQL.cmake
--- a/FindMySQL.cmake 2014-11-19 08:37:11.000000000 -0500
+++ b/FindMySQL.cmake 2015-02-21 21:58:20.264446822 -0500
@@ -462,7 +462,7 @@
endif()
if(NOT MYSQL_CXXFLAGS)
- if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
+ if(MYSQL_CXX_LINKAGE)
_mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
set(MYSQL_CXX_LINKAGE 1)
else()

29
dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch
View File

@@ -1,29 +0,0 @@
Patch taken from opensuse:
https://www.mail-archive.com/opensuse-commit@opensuse.org/msg60296.html
Modified to be conditional on MARIADB_BASE_VERSION
++++++ mysql-workbench-mysql_options4.patch ++++++
diff --git a/plugins/migration/copytable/copytable.cpp
b/plugins/migration/copytable/copytable.cpp
index b273287..77c227b 100644
--- a/plugins/migration/copytable/copytable.cpp
+++ b/plugins/migration/copytable/copytable.cpp
@@ -1633,12 +1633,17 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const
std::string &hostname, int port,
_truncate = false;
mysql_init(&_mysql);
+ /* This is optional has compiled in for MySQL >= 5.6.6
+ * Looks like MariaDB does not support this as supposed,
+ * so disable completly. */
+#ifndef MARIADB_BASE_VERSION
#if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
#if MYSQL_CHECK_VERSION(5,6,6)
mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str());
#endif
#endif
+#endif
// _bulk_insert_record is used to prepare a single record string, the connection
// is needed to escape binary data properly

10
dev-db/mysql-workbench/files/mysql-workbench-6.1.7-wbcopytables.patch
View File

@@ -1,10 +0,0 @@
--- plugins/migration/CMakeLists.txt.~1~ 2014-07-12 08:45:56.808929549 +0200
+++ plugins/migration/CMakeLists.txt 2014-07-12 08:49:26.659049880 +0200
@@ -7,6 +7,7 @@
add_definitions(${ODBC_DEFINITIONS})
+SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
add_executable(wbcopytables
copytable/copytable.cpp
copytable/python_copy_data_source.cpp

35
dev-db/mysql-workbench/files/mysql-workbench-6.2.3-ctemplate.patch
View File

@@ -1,35 +0,0 @@
Fix compilation with ctemplate 2.3 by avoiding long-deprecated method.
Patch by Marcel Pennewiß in https://bugs.gentoo.org/show_bug.cgi?id=533086
Unresolved upstream bug http://bugs.mysql.com/bug.php?id=72585
--- mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
+++ mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
@@ -204,7 +204,7 @@
if (!pre_tpl)
g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str());
else
- pre_tpl->ReloadIfChanged();
+ pre_tpl->ReloadAllIfChanged();
}
if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS))
{
@@ -213,7 +213,7 @@
if (!post_tpl)
g_warning("Failed to open template file: `%s`", post_tpl_path.c_str());
else
- post_tpl->ReloadIfChanged();
+ post_tpl->ReloadAllIfChanged();
}
}
@@ -222,7 +222,7 @@
throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str()));
}
- tpl->ReloadIfChanged();
+ tpl->ReloadAllIfChanged();
std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/"));
BOOST_FOREACH (const Parameters::value_type &param, _parameters)

42
dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
View File

@@ -1,42 +0,0 @@
Patch to make the query results window work with glib 2.42.
https://bugs.gentoo.org/show_bug.cgi?id=536024
http://bugs.mysql.com/bug.php?id=74147
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.cpp
--- frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-03-17 16:42:25 +0000
+++ frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-10-16 10:33:12 +0000
@@ -528,7 +528,6 @@
ListModelWrapper::ListModelWrapper(bec::ListModel* tm, Gtk::TreeView *treeview, const std::string& name)
: Glib::ObjectBase(typeid(ListModelWrapper))
, Glib::Object()
- , Gtk::TreeModel()
, _treeview(treeview)
, _iconview(0)
, _context_menu(0)
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.h
--- frontend/linux/linux_utilities/listmodel_wrapper.h 2013-12-05 13:10:03 +0000
+++ frontend/linux/linux_utilities/listmodel_wrapper.h 2014-10-16 10:33:12 +0000
@@ -232,9 +232,16 @@
//==============================================================================
-class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
- public Gtk::TreeDragDest, public Gtk::TreeDragSource,
- public base::trackable
+#if GLIB_CHECK_VERSION(2, 42, 0)
+class ListModelWrapper : public Gtk::TreeModel, public Glib::Object,
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+ public base::trackable
+#else
+class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+ public base::trackable
+
+#endif
{
friend class ColumnsModel;
protected:

51
dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch
View File

@@ -1,51 +0,0 @@
Last-Update: 2014-10-07
Forwarded: not-needed
From: Alfredo Kojima
Bug-Upstream: http://bugs.mysql.com/bug.php?id=74223
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763971
Description: fix connectivity through SSH tunnel.
=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py'
--- a/plugins/wb.admin/backend/wb_admin_ssh.py
+++ b/plugins/wb.admin/backend/wb_admin_ssh.py
@@ -84,10 +84,14 @@
m = Message()
m.add_byte(chr(MSG_CHANNEL_OPEN))
m.add_string(kind)
m.add_int(chanid)
- m.add_int(self.window_size)
- m.add_int(self.max_packet_size)
+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
+ m.add_int(self.window_size)
+ m.add_int(self.max_packet_size)
+ else:
+ m.add_int(self.default_window_size)
+ m.add_int(self.default_max_packet_size)
if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'):
m.add_string(dest_addr[0])
m.add_int(dest_addr[1])
m.add_string(src_addr[0])
@@ -99,9 +103,12 @@
self._channels.put(chanid, chan)
self.channel_events[chanid] = event = threading.Event()
self.channels_seen[chanid] = True
chan._set_transport(self)
- chan._set_window(self.window_size, self.max_packet_size)
+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
+ chan._set_window(self.window_size, self.max_packet_size)
+ else:
+ chan._set_window(self.default_window_size, self.default_max_packet_size)
finally:
self.lock.release()
self._send_user_message(m)
ts = time.time() + OPEN_CHANNEL_TIMEOUT if (timeout is None) else timeout
@@ -669,8 +676,9 @@
read_timeout = 10
if self.client is not None:
+ chan = None
transport = self.client.get_transport()
try:
spawn_process = False
if 'nohup' in cmd:

26
dev-db/postgis/files/postgis-2.0-ldflags.patch
View File

@@ -1,26 +0,0 @@
diff -Naurw postgis-2.0.2.orig/loader/Makefile.in postgis-2.0.2/loader/Makefile.in
--- postgis-2.0.2.orig/loader/Makefile.in 2012-03-21 21:36:59.000000000 +0000
+++ postgis-2.0.2/loader/Makefile.in 2013-01-29 21:44:12.566318760 +0000
@@ -97,11 +97,11 @@
$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
$(LIBTOOL) --mode=link \
- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
$(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
$(LIBTOOL) --mode=link \
- $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
@@ -109,7 +109,7 @@
$(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
$(LIBTOOL) --mode=link \
$(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
- $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
+ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
installdir:
@mkdir -p $(DESTDIR)$(bindir)

99
dev-db/postgis/files/postgis-2.0-pkgconfig-json.patch
View File

@@ -1,99 +0,0 @@
diff -Naruw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac
--- postgis-2.0.2.orig/configure.ac 2012-05-17 12:10:04.000000000 +0000
+++ postgis-2.0.2/configure.ac 2013-02-11 11:57:06.733323130 +0000
@@ -701,57 +701,14 @@
dnl Detect if json-c installed
dnl ===========================================================================
-HAVE_JSON=no
-AC_SUBST([HAVE_JSON])
-
-AC_ARG_WITH([jsondir],
- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
- [JSONDIR="$withval"], [JSONDIR=])
-
-if test ! "x$JSONDIR" = "x"; then
- dnl Make sure that the directory exists
- if test "x$JSONDIR" = "xyes"; then
- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
- else
- dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json/json.h
- if test ! -e "${JSONDIR}/include/json/json.h" -o \
- ! \( -e "${JSONDIR}/lib/libjson.so" -o \
- -e "${JSONDIR}/lib/libjson.dll" -o \
- -e "${JSONDIR}/lib/libjson.dylib" -o \
- -e "${JSONDIR}/bin/libjson.dll" -o \
- -e "${JSONDIR}/lib/libjson.a" \)
- then
- AC_MSG_ERROR([Cannot find json dev files in "$JSONDIR"])
- fi
- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
-
- dnl Add the include directory to JSON_CPPFLAGS
- JSON_CPPFLAGS="-I$JSONDIR/include"
- JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
- fi
-fi
-
-dnl Check that we can find the json/json.h header file
-CPPFLAGS_SAVE="$CPPFLAGS"
-CPPFLAGS="$JSON_CPPFLAGS"
-AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])
-CPPFLAGS="$CPPFLAGS_SAVE"
-
-dnl Ensure we can link against libjson
-LIBS_SAVE="$LIBS"
-LIBS="$JSON_LDFLAGS"
-AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes], [], [])
-LIBS="$LIBS_SAVE"
-
-if test "$HAVE_JSON" = "yes"; then
+PKG_CHECK_MODULES([JSON], [json],
+ [
+ HAVE_JSON=yes
AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
- if test "x$JSON_LDFLAGS" = "x"; then
- JSON_LDFLAGS="-ljson"
- fi
-fi
+ ],
+ [HAVE_JSON=no])
-AC_SUBST([JSON_CPPFLAGS])
-AC_SUBST([JSON_LDFLAGS])
+AC_SUBST([HAVE_JSON])
dnl ===========================================================================
dnl Detect GTK+2.0 for GUI
@@ -842,10 +799,10 @@
AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
-CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CPPFLAGS $XML2_CPPFLAGS"
+CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CFLAGS $XML2_CPPFLAGS"
dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
-SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS"
+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS"
AC_SUBST([SHLIB_LINK])
dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
diff -Naruw postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c postgis-2.0.2/postgis/lwgeom_in_geojson.c
--- postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c 2012-12-03 16:18:33.000000000 +0000
+++ postgis-2.0.2/postgis/lwgeom_in_geojson.c 2013-02-11 12:09:29.017167709 +0000
@@ -28,8 +28,8 @@
#ifdef HAVE_LIBJSON
#include "lwgeom_export.h"
-#include <json/json.h>
-#include <json/json_object_private.h>
+#include <json.h>
+#include <json_object_private.h>
/* Prototype */
LWGEOM* parse_geojson(json_object *geojson, bool *hasz, int *root_srid);
@@ -556,4 +556,3 @@
PG_RETURN_POINTER(geom);
#endif
}
-

13
dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch
View File

@@ -1,13 +0,0 @@
Index: postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
===================================================================
--- postgresql-9.4-9.4~beta2.orig/src/include/storage/barrier.h
+++ postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
@@ -117,7 +117,7 @@ extern slock_t dummy_spinlock;
* read barrier to cover that case. We might need to add that later.
*/
#define pg_memory_barrier() __asm__ __volatile__ ("mb" : : : "memory")
-#define pg_read_barrier() __asm__ __volatile__ ("rmb" : : : "memory")
+#define pg_read_barrier() __asm__ __volatile__ ("mb" : : : "memory")
#define pg_write_barrier() __asm__ __volatile__ ("wmb" : : : "memory")
#elif defined(__hppa) || defined(__hppa__) /* HP PA-RISC */

22
dev-db/redis/files/redis-2.4.17-shared.patch
View File

@@ -1,22 +0,0 @@
See https://github.com/antirez/redis/pull/137
--- src/Makefile 2011-10-17 10:46:00.000000000 +0200
+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200
@@ -49,7 +49,16 @@
ifeq ($(USE_JEMALLOC),yes)
ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
ALLOC_LINK=$(ALLOC_DEP) -ldl
- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
+ ALLOC_FLAGS=-DUSE_JEMALLOC
+ ifdef JEMALLOC_SHARED
+ ALLOC_DEP=
+ ALLOC_LINK=-ljemalloc
+ ALLOC_FLAGS=-DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include
+ else
+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
+ ALLOC_LINK=$(ALLOC_DEP) -ldl
+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
+ endif
endif
CCOPT= $(CFLAGS) $(ARCH) $(PROF)

22
dev-db/redis/files/redis-2.4.3-shared.patch
View File

@@ -1,22 +0,0 @@
See https://github.com/antirez/redis/pull/137
--- src/Makefile 2011-10-17 10:46:00.000000000 +0200
+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200
@@ -49,7 +49,16 @@
ifeq ($(USE_JEMALLOC),yes)
ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
ALLOC_LINK=$(ALLOC_DEP) -ldl
- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
+ ALLOC_FLAGS=-DUSE_JEMALLOC
+ ifdef JEMALLOC_SHARED
+ ALLOC_DEP=
+ ALLOC_LINK=-ljemalloc
+ ALLOC_FLAGS=-DUSE_JEMALLOC -I/usr/include
+ else
+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
+ ALLOC_LINK=$(ALLOC_DEP) -ldl
+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
+ endif
endif
CCOPT= $(CFLAGS) $(ARCH) $(PROF)

21
dev-db/redis/files/redis-2.4.4-tcmalloc.patch
View File

@@ -1,21 +0,0 @@
https://github.com/antirez/redis/pull/218
diff --git a/src/Makefile b/src/Makefile
index 72edcad..3e43990 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,12 +35,14 @@ else
endif
ifeq ($(USE_TCMALLOC),yes)
+ USE_JEMALLOC=no
ALLOC_DEP=
ALLOC_LINK=-ltcmalloc
ALLOC_FLAGS=-DUSE_TCMALLOC
endif
ifeq ($(USE_TCMALLOC_MINIMAL),yes)
+ USE_JEMALLOC=no
ALLOC_DEP=
ALLOC_LINK=-ltcmalloc_minimal
ALLOC_FLAGS=-DUSE_TCMALLOC

69
dev-db/redis/files/redis-2.6.7-config.patch
View File

@@ -1,69 +0,0 @@
commit 7f05e59a052941fd070be1825d0623a054c66e2d
Author: jbergstroem <bugs@bergstroem.nu>
Date: Tue Oct 30 13:11:23 2012 +1100
Adapt config based on Gentoo defaults
diff --git a/redis.conf b/redis.conf
index 751a3eb..1a36b12 100644
--- a/redis.conf
+++ b/redis.conf
@@ -14,11 +14,11 @@
# By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
+daemonize yes
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+pidfile /var/run/redis/redis.pid
# Accept connections on the specified port, default is 6379.
# If port 0 is specified Redis will not listen on a TCP socket.
@@ -27,7 +27,7 @@ port 6379
# If you want you can bind a single interface, if the bind option is not
# specified all the interfaces will listen for incoming connections.
#
-# bind 127.0.0.1
+bind 127.0.0.1
# Specify the path for the unix socket that will be used to listen for
# incoming connections. There is no default, so Redis will not listen
@@ -50,7 +50,7 @@ loglevel notice
# Specify the log file name. Also 'stdout' can be used to force
# Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
-logfile stdout
+logfile /var/log/redis/redis.log
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
@@ -124,7 +124,7 @@ rdbcompression yes
rdbchecksum yes
# The filename where to dump the DB
-dbfilename dump.rdb
+dbfilename /var/lib/redis/dump.rdb
# The working directory.
#
@@ -134,7 +134,7 @@ dbfilename dump.rdb
# Also the Append Only File will be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
-dir ./
+dir /var/lib/redis/
################################# REPLICATION #################################
@@ -278,7 +278,7 @@ slave-priority 100
# limit for maxmemory so that there is some free RAM on the system for slave
# output buffers (but this is not needed if the policy is 'noeviction').
#
-# maxmemory <bytes>
+maxmemory 67108864
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached? You can select among five behavior:

36
dev-db/redis/files/redis-2.6.7-shared.patch
View File

@@ -1,36 +0,0 @@
commit 6931bf1d81de597b3abc2a36adf081a24c114567
Author: jbergstroem <bugs@bergstroem.nu>
Date: Tue Oct 23 12:26:04 2012 +1100
Build against shared jemalloc
diff --git a/src/Makefile b/src/Makefile
index 358b4cb..41390f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,12 +22,7 @@ STD= -std=c99 -pedantic
WARN= -Wall
OPT= $(OPTIMIZATION)
-# Default allocator
-ifeq ($(uname_S),Linux)
- MALLOC=jemalloc
-else
- MALLOC=libc
-endif
+MALLOC?=jemalloc
# Backwards compatibility for selecting an allocator
ifeq ($(USE_TCMALLOC),yes)
@@ -71,9 +66,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
endif
ifeq ($(MALLOC),jemalloc)
- DEPENDENCY_TARGETS+= jemalloc
- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
+ FINAL_LIBS+= -ljemalloc -ldl
endif
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

57
dev-db/redis/files/redis-2.6.9-tclsh86.patch
View File

@@ -1,57 +0,0 @@
diff --git a/runtest b/runtest
index 0eb384c..fadc283 100755
--- a/runtest
+++ b/runtest
@@ -1,5 +1,5 @@
#!/bin/sh
-TCL=tclsh8.5
+TCL=tclsh
which $TCL
if [ "$?" != "0" ]
then
diff --git a/tests/integration/replication-4.tcl b/tests/integration/replication-4.tcl
index 69fcab3..58a70fa 100644
--- a/tests/integration/replication-4.tcl
+++ b/tests/integration/replication-4.tcl
@@ -1,5 +1,5 @@
proc start_bg_complex_data {host port db ops} {
- exec tclsh8.5 tests/helpers/bg_complex_data.tcl $host $port $db $ops &
+ exec tclsh tests/helpers/bg_complex_data.tcl $host $port $db $ops &
}
proc stop_bg_complex_data {handle} {
diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
index da94b08..30baf6a 100644
--- a/tests/integration/replication.tcl
+++ b/tests/integration/replication.tcl
@@ -78,7 +78,7 @@ start_server {tags {"repl"}} {
}
proc start_write_load {host port seconds} {
- exec tclsh8.5 tests/helpers/gen_write_load.tcl $host $port $seconds &
+ exec tclsh tests/helpers/gen_write_load.tcl $host $port $seconds &
}
proc stop_write_load {handle} {
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index b2e58b4..253e955 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -2,6 +2,8 @@
# This softare is released under the BSD License. See the COPYING file for
# more information.
+package require Tcl 8.5
+
set tcl_precision 17
source tests/support/redis.tcl
source tests/support/server.tcl
@@ -189,7 +191,7 @@ proc test_server_main {} {
set start_port [expr {$::port+100}]
for {set j 0} {$j < $::numclients} {incr j} {
set start_port [find_available_port $start_port]
- set p [exec tclsh8.5 [info script] {*}$::argv \
+ set p [exec tclsh [info script] {*}$::argv \
--client $port --port $start_port &]
lappend ::clients_pids $p
incr start_port 10

59
dev-db/redis/files/redis-2.8.3-config.patch
View File

@@ -1,59 +0,0 @@
commit 66f26c12faaeb8ed85a715d2dfd6a41c978a4bd1
Author: Johan Bergström <bugs@bergstroem.nu>
Date: Mon Nov 25 09:23:10 2013 +1100
Modify config to gentoo defaults
diff --git redis.conf redis.conf
index 2e3239c..6c7ef4a 100644
--- redis.conf
+++ redis.conf
@@ -14,11 +14,11 @@
# By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
+daemonize yes
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+pidfile /run/redis/redis.pid
# Accept connections on the specified port, default is 6379.
# If port 0 is specified Redis will not listen on a TCP socket.
@@ -32,7 +32,7 @@ port 6379
# Examples:
#
# bind 192.168.1.100 10.0.0.1
-# bind 127.0.0.1
+bind 127.0.0.1
# Specify the path for the unix socket that will be used to listen for
# incoming connections. There is no default, so Redis will not listen
@@ -71,7 +71,7 @@ loglevel notice
# Specify the log file name. Also the emptry string can be used to force
# Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+logfile /var/log/redis/redis.log
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
@@ -155,7 +155,7 @@ dbfilename dump.rdb
# The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
-dir ./
+dir /var/lib/redis/
################################# REPLICATION #################################
@@ -365,6 +365,7 @@ slave-priority 100
# output buffers (but this is not needed if the policy is 'noeviction').
#
# maxmemory <bytes>
+maxmemory 67108864
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached. You can select among five behaviors:

23
dev-db/redis/files/redis.initd-2
View File

@@ -1,23 +0,0 @@
#!/sbin/openrc-run
# $Id$
REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
REDIS_USER=${REDIS_USER:-redis}
REDIS_GROUP=${REDIS_GROUP:-redis}
command=/usr/sbin/redis-server
start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
--user ${REDIS_USER} --group ${REDIS_GROUP}"
command_args="${REDIS_OPTS}"
pidfile=${REDIS_PID:-/var/run/redis/redis.pid}
depend() {
use net localmount logger
after keepalived
}
start_pre() {
checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
}

32
dev-db/redis/files/redis.initd-3
View File

@@ -1,32 +0,0 @@
#!/sbin/openrc-run
# $Id$
REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
REDIS_USER=${REDIS_USER:-redis}
REDIS_GROUP=${REDIS_GROUP:-redis}
command=/usr/sbin/redis-server
start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
--user ${REDIS_USER} --group ${REDIS_GROUP}"
command_args="${REDIS_OPTS}"
pidfile=${REDIS_PID:-/run/redis/redis.pid}
depend() {
use net localmount logger
after keepalived
}
start_pre() {
checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop \
--exec ${retries} \
--retry 30 \
--pidfile ${pidfile}
eend
}

29
dev-db/slony1/files/slony1-2.1.1-ldflags.patch
View File

@@ -1,29 +0,0 @@
diff -Naur a/Makefile.global.in b/Makefile.global.in
--- a/Makefile.global.in 2012-01-25 14:13:40.000000000 -0500
+++ b/Makefile.global.in 2012-02-22 06:14:05.240047000 -0500
@@ -80,7 +80,7 @@
subdir=$(slony_subdir)
override CPPFLAGS := -I${pgincludeserverdir} -I${pgincludedir} $(CPPFLAGS)
-LDFLAGS = -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
+override LDFLAGS += -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
ifeq ($(GCC), yes)
CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
diff -Naur a/makefiles/Makefile.linux b/makefiles/Makefile.linux
--- a/makefiles/Makefile.linux 2012-01-25 14:13:40.000000000 -0500
+++ b/makefiles/Makefile.linux 2012-02-22 06:15:45.652523000 -0500
@@ -12,9 +12,9 @@
endif
%.so: %.o
- $(CC) -shared -o $@ $<
+ $(CC) $(LDFLAGS) -shared -o $@ $<
%.o: %.c
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -o $@ $<
-sqlmansect = 7
\ No newline at end of file
+sqlmansect = 7

70
dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch
View File

@@ -1,70 +0,0 @@
CMakeLists.txt | 12 ++----------
tests/CMakeLists.txt | 5 +----
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a76947..a58510b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
-set(ANTLR_DIR libs/antlr-2.7.7)
set(QHEXEDIT_DIR libs/qhexedit)
-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
-add_subdirectory(${ANTLR_DIR})
add_subdirectory(${QHEXEDIT_DIR})
-add_subdirectory(${QCUSTOMPLOT_DIR})
if(USE_QT5)
find_package(Qt5Widgets REQUIRED)
@@ -191,9 +187,7 @@ endif(EXTRAPATH)
include_directories(
"${CMAKE_CURRENT_BINARY_DIR}"
- ${ANTLR_DIR}
${QHEXEDIT_DIR}
- ${QCUSTOMPLOT_DIR}
${ADDITIONAL_INCLUDE_PATHS}
src)
@@ -210,12 +204,10 @@ if(USE_QT5)
qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
set(QT_LIBRARIES "")
endif()
-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
+add_dependencies(${PROJECT_NAME} qhexedit)
link_directories(
- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
+ "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
target_link_libraries(${PROJECT_NAME}
antlr
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 75009dc..6fd7f48 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,9 +7,6 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
-
if(USE_QT5)
find_package(Qt5Widgets REQUIRED)
set(CMAKE_AUTOMOC ON)
@@ -56,7 +53,7 @@ if(NOT USE_QT5)
QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
endif()
-include_directories("${ANTLR_DIR}" ../src)
+include_directories(../src)
add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC})

62
dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
View File

@@ -1,62 +0,0 @@
--- sqlitebrowser-3.6.0/CMakeLists.txt
+++ sqlitebrowser-3.6.0/CMakeLists.txt
@@ -21,14 +21,10 @@
set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
endif()
-set(ANTLR_DIR libs/antlr-2.7.7)
set(QHEXEDIT_DIR libs/qhexedit)
-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
-add_subdirectory(${ANTLR_DIR})
add_subdirectory(${QHEXEDIT_DIR})
-add_subdirectory(${QCUSTOMPLOT_DIR})
add_subdirectory(${QSCINTILLA_DIR})
if(USE_QT5)
@@ -207,9 +201,7 @@
include_directories(
"${CMAKE_CURRENT_BINARY_DIR}"
- ${ANTLR_DIR}
${QHEXEDIT_DIR}
- ${QCUSTOMPLOT_DIR}
${QSCINTILLA_DIR}
${ADDITIONAL_INCLUDE_PATHS}
src)
@@ -227,12 +218,9 @@
qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
set(QT_LIBRARIES "")
endif()
-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
+add_dependencies(${PROJECT_NAME} qhexedit qscintilla2)
link_directories(
- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
target_link_libraries(${PROJECT_NAME}
--- sqlitebrowser-3.6.0/tests/CMakeLists.txt
+++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
@@ -7,9 +7,6 @@
set(CMAKE_BUILD_TYPE "Release")
endif()
-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
-
if(USE_QT5)
find_package(Qt5Widgets REQUIRED)
set(CMAKE_AUTOMOC ON)
@@ -65,7 +62,7 @@
QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
endif()
-include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
+include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})

12
dev-db/tokyocabinet/files/1.4.45.patch
View File

@@ -1,12 +0,0 @@
diff --git a/Makefile.in b/Makefile.in
index 973bf81..e44f0a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,6 @@ install :
cd man && cp -Rf $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
mkdir -p $(DESTDIR)$(PCDIR)
cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
- [ "$$UID" = 0 ] && ldconfig || true
@printf '\n'
@printf '#================================================================\n'
@printf '# Thanks for using Tokyo Cabinet.\n'

12
dev-db/tokyocabinet/files/1.4.46.patch
View File

@@ -1,12 +0,0 @@
diff --git a/Makefile.in b/Makefile.in
index 8846c38..01caa50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,6 @@ install :
cd man && cp -Rf $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
mkdir -p $(DESTDIR)$(PCDIR)
cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
- -[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig 2>/dev/null || true
@printf '\n'
@printf '#================================================================\n'
@printf '# Thanks for using Tokyo Cabinet.\n'

13
dev-db/tokyocabinet/files/remove_docinst.patch
View File

@@ -1,13 +0,0 @@
diff --git a/Makefile.in b/Makefile.in
index 8846c38..29ac11e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,8 +117,6 @@ install :
cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
mkdir -p $(DESTDIR)$(LIBEXECDIR)
cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR)
- mkdir -p $(DESTDIR)$(DATADIR)
- cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
mkdir -p $(DESTDIR)$(MAN1DIR)
cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
mkdir -p $(DESTDIR)$(MAN3DIR)

27
dev-db/unixODBC/files/unixODBC-2.3.0-sqldriverconnect.patch
View File

@@ -1,27 +0,0 @@
http://bugs.gentoo.org/show_bug.cgi?id=358611
--- unixODBC-2.3.0.orig/DriverManager/SQLDriverConnect.c 2011-04-02 21:56:19.889301819 +0400
+++ unixODBC-2.3.0/DriverManager/SQLDriverConnect.c 2011-04-02 21:58:37.129102095 +0400
@@ -639,7 +639,7 @@
{
DMHDBC connection = (DMHDBC)hdbc;
struct con_struct con_struct;
- char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ 128 ];
+ char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ INI_MAX_PROPERTY_VALUE + 1 ];
char lib_name[ INI_MAX_PROPERTY_VALUE + 1 ];
char driver_name[ INI_MAX_PROPERTY_VALUE + 1 ];
SQLRETURN ret_from_connect;
@@ -944,7 +944,13 @@
tsavefile = __get_attribute_value( &con_struct, "SAVEFILE" );
if ( tsavefile )
{
- strcpy( savefile, tsavefile );
+ if ( strlen( tsavefile ) > INI_MAX_PROPERTY_VALUE ) {
+ memcpy( savefile, tsavefile, INI_MAX_PROPERTY_VALUE );
+ savefile[ INI_MAX_PROPERTY_VALUE ] = '\0';
+ }
+ else {
+ strcpy( savefile, tsavefile );
+ }
}
else
{

14
dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in
View File

@@ -1,14 +0,0 @@
# Package Information for pkg-config
prefix=/usr
wxver=@WXVERSION@
includedir=${prefix}/include/wx-${wxver}/
libdir=${prefix}/@LIBDIR@
Name: wxsqlite3-@WXVERSION@
Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets
Version: @VERSION@
#Requires: sqlite3
Libs: -L${libdir} -lwxcode_gtk2u@WXDEBUG@_wxsqlite3-@WXVERSION@
Libs.private: -lpthread
Cflags: -I${includedir}