commit: 632194fcfca757ea3dea0317d5a568297154feda Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu May 17 08:28:51 2018 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Fri May 18 12:33:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632194fc
dev-db/postgresql: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/8449 .../files/postgresql-9.2-no-server.patch | 143 ------------------- dev-db/postgresql/files/postgresql.confd-9.2 | 65 --------- dev-db/postgresql/files/postgresql.init-9.2 | 152 --------------------- 3 files changed, 360 deletions(-) diff --git a/dev-db/postgresql/files/postgresql-9.2-no-server.patch b/dev-db/postgresql/files/postgresql-9.2-no-server.patch deleted file mode 100644 index a0c33efc63a..00000000000 --- a/dev-db/postgresql/files/postgresql-9.2-no-server.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -Naur a/contrib/Makefile b/contrib/Makefile ---- a/contrib/Makefile 2012-05-10 18:35:09.000000000 -0400 -+++ b/contrib/Makefile 2012-05-20 09:33:47.892622992 -0400 -@@ -5,58 +5,10 @@ - include $(top_builddir)/src/Makefile.global - - SUBDIRS = \ -- adminpack \ -- auth_delay \ -- auto_explain \ -- btree_gin \ -- btree_gist \ -- chkpass \ -- citext \ -- cube \ -- dblink \ -- dict_int \ -- dict_xsyn \ -- dummy_seclabel \ -- earthdistance \ -- file_fdw \ -- fuzzystrmatch \ -- hstore \ -- intagg \ -- intarray \ -- isn \ -- lo \ -- ltree \ - oid2name \ -- pageinspect \ -- passwordcheck \ -- pg_archivecleanup \ -- pg_buffercache \ -- pg_freespacemap \ -- pg_standby \ -- pg_stat_statements \ -- pg_test_fsync \ -- pg_test_timing \ -- pg_trgm \ -- pg_upgrade \ -- pg_upgrade_support \ - pgbench \ -- pgcrypto \ -- pgrowlocks \ -- pgstattuple \ -- seg \ -- spi \ -- tablefunc \ -- tcn \ -- test_parser \ -- tsearch2 \ -- unaccent \ - vacuumlo - --ifeq ($(with_openssl),yes) --SUBDIRS += sslinfo --else --ALWAYS_SUBDIRS += sslinfo --endif - - ifeq ($(with_ossp_uuid),yes) - SUBDIRS += uuid-ossp -diff -Naur a/src/backend/Makefile b/src/backend/Makefile ---- a/src/backend/Makefile 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/backend/Makefile 2012-05-20 09:36:24.446654842 -0400 -@@ -45,7 +45,7 @@ - - ########################################################################## - --all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP) -+all: someheaders - - ifneq ($(PORTNAME), cygwin) - ifneq ($(PORTNAME), win32) -@@ -114,7 +114,7 @@ - endif # aix - - # Update the commonly used headers before building the subdirectories --$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h -+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h - - # run this unconditionally to avoid needing to know its dependencies here: - submake-schemapg: -@@ -207,23 +207,7 @@ - - ########################################################################## - --install: all installdirs install-bin --ifeq ($(PORTNAME), cygwin) --ifeq ($(MAKE_DLL), true) -- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' --endif --endif --ifeq ($(PORTNAME), win32) --ifeq ($(MAKE_DLL), true) -- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' --endif --endif -- $(MAKE) -C catalog install-data -- $(MAKE) -C tsearch install-data -- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' -- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' -- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' -- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' -+install: - - install-bin: postgres $(POSTGRES_IMP) installdirs - $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' -diff -Naur a/src/bin/Makefile b/src/bin/Makefile ---- a/src/bin/Makefile 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/bin/Makefile 2012-05-20 09:41:18.489958216 -0400 -@@ -13,8 +13,7 @@ - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --SUBDIRS = initdb pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup -+SUBDIRS = pg_dump psql scripts pg_config - - ifeq ($(PORTNAME), win32) - SUBDIRS += pgevent -diff -Naur a/src/Makefile b/src/Makefile ---- a/src/Makefile 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/Makefile 2012-05-20 09:40:13.532774840 -0400 -@@ -14,17 +14,11 @@ - - SUBDIRS = \ - port \ -- timezone \ - backend \ -- backend/utils/mb/conversion_procs \ -- backend/snowball \ - include \ - interfaces \ -- backend/replication/libpqwalreceiver \ - bin \ -- pl \ -- makefiles \ -- test/regress -+ makefiles - - # There are too many interdependencies between the subdirectories, so - # don't attempt parallel make here. diff --git a/dev-db/postgresql/files/postgresql.confd-9.2 b/dev-db/postgresql/files/postgresql.confd-9.2 deleted file mode 100644 index 7753eeae3a8..00000000000 --- a/dev-db/postgresql/files/postgresql.confd-9.2 +++ /dev/null @@ -1,65 +0,0 @@ -# Directory that contains the unix socket. Created and controlled by -# the related initscript. The directory created will be owned -# root:postgres with mode 1775. -# -# /run/postgresql is the default directory. -PG_SOCKET_DIRECTORY="/run/postgresql" - -# Which port and socket to bind PostgreSQL -PGPORT="5432" - -# How long to wait for server to start in seconds -START_TIMEOUT=10 - -# NICE_QUIT ignores new connections and wait for clients to disconnect from -# server before shutting down. NICE_TIMEOUT in seconds determines how long to -# wait for this to succeed. -NICE_TIMEOUT=60 - -# Forecfully disconnect clients from server and shut down. This is performed -# after NICE_QUIT. Terminated client connections have their open transactions -# rolled back. -# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds. -RUDE_QUIT="YES" -RUDE_TIMEOUT=30 - -# If the server still fails to shutdown, you can force it to quit by setting -# this to YES and a recover-run will execute on the next startup. -# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds. -FORCE_QUIT="NO" -FORCE_TIMEOUT=2 - -# Extra options to run postmaster with, e.g.: -# -N is the maximal number of client connections -# -B is the number of shared buffers and has to be at least 2x the value for -N -# Please read the man-page to postmaster for more options. Many of these -# options can be set directly in the configuration file. -#PGOPTS="-N 512 -B 1024" - -# Pass extra environment variables. If you have to export environment variables -# for the database process, this can be done here. -# Don't forget to escape quotes. -#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\"" - -############################################################################## -# -# The following values should not be arbitrarily changed. -# -# `emerge --config dev-db/postgresql:@SLOT@' uses these values to -# determine where to create the data directory, where to place the -# configuration files, and any additional options to pass to initdb. -# -# The initscript also uses these variables to inform PostgreSQL where to find -# its data directory and configuration files. -# -############################################################################## - -# Location of configuration files -PGDATA="/etc/postgresql-@SLOT@/" - -# Where the data directory is located/to be created -DATA_DIR="/var/lib/postgresql/@SLOT@/data" - -# Additional options to pass to initdb. -# See `man initdb' for available options. -PG_INITDB_OPTS="--encoding=UTF8" diff --git a/dev-db/postgresql/files/postgresql.init-9.2 b/dev-db/postgresql/files/postgresql.init-9.2 deleted file mode 100755 index b191ca29e97..00000000000 --- a/dev-db/postgresql/files/postgresql.init-9.2 +++ /dev/null @@ -1,152 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload promote" - -PG_CTL="/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl" - -description="PostgreSQL @SLOT@ -- the world's most advanced open source database -- -${RC_SERVICE} is a wrapper around pg_ctl with additional administrative checks -and convenience" - -get_config() { - [ -f "${PGDATA%/}/postgresql.conf" ] || return 1 - - eval echo $(sed -e 's:#.*::' "${PGDATA%/}/postgresql.conf" \ - | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }') -} - -depend() { - use net - provide postgresql - - if [ "$(get_config log_destination)" = "syslog" ]; then - use logger - fi -} - -configured_port=$(get_config port) -: ${configured_port:=${PGPORT}} - -checkconfig() { - # Check that DATA_DIR has been set - if [ -z "${DATA_DIR}" ] ; then - eerror "DATA_DIR not set" - eerror "HINT: Perhaps you need to update /etc/conf.d/postgresql-@SLOT@" - return 1 - fi - - # Check that DATA_DIR exists - if [ ! -d "${DATA_DIR}" ] ; then - eerror "Directory not found: ${DATA_DIR}" - eerror "HINT: Ensure that DATA_DIR points to the right path." - eerror "HINT: Or perhaps you need to create the database cluster:" - eerror " emerge --config dev-db/postgresql:@SLOT@" - return 1 - fi - - # Check for the existence of PostgreSQL's config files, and set the - # proper mode and ownership. - # Only three files should be checked as potentially other files - # may be in PGDATA that should not be touched. - local file - for file in postgresql pg_hba pg_ident ; do - file="${PGDATA%/}/${file}.conf" - if [ -f "${file}" ] ; then - checkpath -f -m 0600 -o postgres:postgres "${file}" - else - eerror "${file} not found" - eerror "HINT: mv ${DATA_DIR%/}/*.conf ${PGDATA}" - return 1 - fi - done - - # Set the proper permission for the socket path and create it if - # it doesn't exist. - checkpath -d -m 1775 -o root:postgres "${PG_SOCKET_DIRECTORY}" - if [ -e "${PG_SOCKET_DIRECTORY%/}/.s.PGSQL.${configured_port}" ] ; then - eerror "Socket conflict." - eerror "A server is already listening on:" - eerror " ${PG_SOCKET_DIRECTORY%/}/.s.PGSQL.${configured_port}" - eerror "HINT: Change PGPORT to listen on a different socket." - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting PostgreSQL @SLOT@" - - rm -f "${DATA_DIR%/}/postmaster.pid" - - su - postgres -c \ - "PGPORT=${configured_port} ${PG_EXTRA_ENV} ${PG_CTL} start \ - -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \ - -D ${PGDATA} \ - -o '--data-directory=${DATA_DIR} \ - --unix-socket-directory=${PG_SOCKET_DIRECTORY} \ - ${PGOPTS}'" - - local retval=$? - - if [ $retval -ne 0 ] ; then - eerror "Check the log for a possible explanation of the above error." - eerror "The log may be located at:" - eerror " ${DATA_DIR%/}/postmaster.log" - eerror "Or wherever you configured PostgreSQL @SLOT@ to log." - fi - - eend $retval -} - -stop() { - local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} )) - ebegin "Stopping PostgreSQL @SLOT@ (this can take up to ${seconds} seconds)" - - su - postgres -c \ - "${PG_CTL} stop -t ${NICE_TIMEOUT} -s -D ${DATA_DIR} -m smart" - local retval=$? - - if [ "${RUDE_QUIT}" != "NO" -a ${retval} -ne 0 ] ; then - einfo "Previous attempt failed. Trying RUDE_QUIT." - su - postgres -c \ - "${PG_CTL} stop -t ${RUDE_TIMEOUT} -s -D ${DATA_DIR} -m fast" - retval=$? - fi - - if [ "${FORCE_QUIT}" = "YES" -a ${retval} -ne 0 ] ; then - einfo "Previous step failed. Trying FORCE_QUIT." - ewarn "A recover-run might be executed on next startup." - su - postgres -c \ - "${PG_CTL} stop -t ${FORCE_TIMEOUT} -s -D ${DATA_DIR} -m immediate" - retval=$? - fi - - eend ${retval} -} - -status() { - ebegin "Checking PostgreSQL @SLOT@ status" - su - postgres -c "${PG_CTL} status -D ${DATA_DIR}" - eend $? -} - -description_reload="Simply sends the postgres process a SIGHUP signal, causing - it to reread its configuration files (postgresql.conf, pg_hba.conf, - etc.). This allows changing of configuration-file options that do not - require a complete restart to take effect." -reload() { - ebegin "Reloading PostgreSQL @SLOT@ configuration" - su - postgres -c "${PG_CTL} reload -s -D ${DATA_DIR}" - eend $? -} - -description_promote="If the server is in standby, it is commanded to exit - recovery and begin read-write operations." -promote() { - ebegin "Promoting PostgreSQL @SLOT@" - su - postgres -c "${PG_CTL} promote -s -D ${DATA_DIR}" - eend $? -}
