diff options
Diffstat (limited to 'dev-db/pgpool2/files')
| -rw-r--r-- | dev-db/pgpool2/files/pgpool-configure-memcached.patch | 64 | ||||
| -rw-r--r-- | dev-db/pgpool2/files/pgpool-configure-pam.patch | 25 | ||||
| -rw-r--r-- | dev-db/pgpool2/files/pgpool-configure-pthread.patch | 13 | ||||
| -rw-r--r-- | dev-db/pgpool2/files/pgpool2.initd | 14 |
4 files changed, 108 insertions, 8 deletions
diff --git a/dev-db/pgpool2/files/pgpool-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-configure-memcached.patch new file mode 100644 index 000000000000..7b983dba02e2 --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-configure-memcached.patch @@ -0,0 +1,64 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -338,37 +338,24 @@ + [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])]) + fi + +-AC_ARG_WITH(memcached, +- [ --with-memcached=DIR site header files for libmemcached in DIR], +- [ +- case "$withval" in +- "" | y | ye | yes | n | no) +- AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.]) +- ;; +- *) +- +- MEMCACHED_INCLUDE_DIR="$withval"/include +- MEMCACHED_LIB_DIR="$withval"/lib +- OLD_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR" +- AC_CHECK_HEADERS( +- [libmemcached/memcached.h], +- [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])], +- [AC_MSG_ERROR([header file <libmemcached/memcached.h> is required for memcached support])]) +- CFLAGS=$OLD_CFLAGS +- AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)]) +- MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR" +- MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR" +- MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR" +- ;; +- esac +- ]) ++AC_ARG_WITH([memcached], ++ AS_HELP_STRING([--with-memcached], [Build with memcached support])) + +-CFLAGS="$CFLAGS -fno-strict-aliasing" ++AS_IF([test "x$with_memcached" = "xyes"], [ ++ PKG_CHECK_MODULES([MEMCACHED], [libmemcached]) ++ CFLAGS="$CFLAGS $MEMCACHED_CFLAGS" ++ LIBS="$LIBS $MEMCACHED_LIBS" ++ ++ AC_CHECK_HEADERS( ++ [libmemcached/memcached.h], ++ [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])], ++ [AC_MSG_ERROR([Couldn't find <libmemcached/memcached.h>])]) ++ ++ AC_SEARCH_LIBS(memcached_create, [], [], ++ [AC_MSG_ERROR(libmemcached is not installed)]) ++]) + +-AC_SUBST(MEMCACHED_INCLUDE_OPT) +-AC_SUBST(MEMCACHED_LINK_OPT) +-AC_SUBST(MEMCACHED_RPATH_OPT) ++CFLAGS="$CFLAGS -fno-strict-aliasing" + + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="-L$PGSQL_LIB_DIR" +@@ -380,7 +367,6 @@ + + AC_SUBST(PGSQL_INCLUDE_DIR) + AC_SUBST(PGSQL_LIB_DIR) +-AC_SUBST(MEMCACHED_DIR) + + # --enable(disable)-rpath option + AC_ARG_ENABLE(rpath, diff --git a/dev-db/pgpool2/files/pgpool-configure-pam.patch b/dev-db/pgpool2/files/pgpool-configure-pam.patch new file mode 100644 index 000000000000..3a8e89dde307 --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-configure-pam.patch @@ -0,0 +1,25 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -330,11 +330,13 @@ + +-AC_ARG_WITH(pam, +- [ --with-pam build with PAM support], +- [AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support. (--with-pam)])]) +-if test "$with_pam" = yes ; then +- AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) +- AC_CHECK_HEADERS(security/pam_appl.h, [], +- [AC_CHECK_HEADERS(pam/pam_appl.h, [], +- [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])]) +-fi ++AC_ARG_WITH([pam], AS_HELP_STRING([--with-pam], [Build with PAM support])) ++ ++AS_IF([test "x$with_pam" = "xyes"], [ ++ AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support]) ++ AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) ++ AC_CHECK_HEADERS(security/pam_appl.h, ++ [], ++ [AC_CHECK_HEADERS(pam/pam_appl.h, [], ++ [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])]) ++ ++]) + diff --git a/dev-db/pgpool2/files/pgpool-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-configure-pthread.patch new file mode 100644 index 000000000000..50b18fab6fc4 --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-configure-pthread.patch @@ -0,0 +1,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -3,6 +3,10 @@ + + dnl Checks for programs. + AC_PROG_CC ++AX_PTHREAD ++LIBS="$PTHREAD_LIBS $LIBS" ++CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++CC="$PTHREAD_CC" + + AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects]) + diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd index c9ffb0cf1611..73db4dd8b3c8 100644 --- a/dev-db/pgpool2/files/pgpool2.initd +++ b/dev-db/pgpool2/files/pgpool2.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" @@ -23,24 +23,22 @@ get_config() { PIDFILE="$(get_config pid_file_name)" : ${PIDFILE:='/run/pgpool/pgpool.pid'} -prep() { +start_pre() { # $logdir contains status file(s), not log files. local logdir=$(get_config logdir) local socket_dir=$(get_config socket_dir) local pcp_socket_dir=$(get_config pcp_socket_dir) checkpath -o pgpool:postgres -m 0770 -d $(dirname ${PIDFILE}) || return 1 - checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/run/pgpool'} || return 1 + checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/var/lib/pgpool'} || return 1 checkpath -o pgpool:postgres -m 0660 -f ${LOGFILE} || return 1 - checkpath -o postgres:postgres -m 0770 \ + checkpath -o root:postgres -m 1775 \ -d ${socket_dir:-'/run/postgresql'} || return 1 - checkpath -o postgres:postgres -m 0770 \ - -d ${pcp_socket_dir:-'/run/postgresql'} || return 1 + checkpath -o pgpool:postgres -m 0770 \ + -d ${pcp_socket_dir:-'/run/postgresql/pgpool'} || return 1 } start() { - prep || return 1 - ebegin "Starting pgpool2" start-stop-daemon --start \ |