From 97967bbbae8f43c98315b079178f1717f130e302 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 19 May 2018 13:06:44 +0100 Subject: gentoo resync : 19.05.2018 --- dev-db/postgresql/Manifest | 3 - .../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 --------------------- 4 files changed, 363 deletions(-) delete mode 100644 dev-db/postgresql/files/postgresql-9.2-no-server.patch delete mode 100644 dev-db/postgresql/files/postgresql.confd-9.2 delete mode 100755 dev-db/postgresql/files/postgresql.init-9.2 (limited to 'dev-db/postgresql') diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest index 7653a9a9577f..5155c5bbe2d5 100644 --- a/dev-db/postgresql/Manifest +++ b/dev-db/postgresql/Manifest @@ -1,14 +1,11 @@ AUX postgresql-10.2-no-server.patch 3317 BLAKE2B 133a9e80c4ad82f8b121d8f2e9907fbc5a94f791f0972e604b1c54aa2bfb71b18e246ac8e65f7b917cbdb19222c78273d3e5ed96a7569bfd796045c4dac9f610 SHA512 6a9f6dbbece2364cbae200cca5c468ae99b78815ee3af6e90d8f637cb75b5755971b0582cedfb6569c0dc79cb6701a29712e3c99feb814fe7575a31e194e9b7a AUX postgresql-10beta2-no-server.patch 3586 BLAKE2B 6d4472d389fd7b36a59c978b37b64535b715ee8d2e9c24b762849e0e6fcb351b03ff6e5a8316bbc4e9ff77b25d9a4dcef74b10c25e520cd0b86392921debcaf8 SHA512 d4be4ed02c62586aa8d2c3452eb4b804783e73d8200d484052bf82bf1b15c503a3328b19792a270912ed7ccc5c63c1f055946e32421547c95f47f1264eb085ee -AUX postgresql-9.2-no-server.patch 4219 BLAKE2B ed7b3794e09d59b78640602a29e9ca8fb3727c0b0b567bf23d900d2a7e2c0736d7a0fc491b8674d724eb01231caf5922d21a69d1c1e63125562ca0bcd576756a SHA512 e657389bd8d34ce3a5daa7f8432158758ee7a05e5a149e5257c88366dbc1b4f571a312f2934cf29ea8e5069ecf9726c9bf0fa5c908ba3e3e850d906d66d5b4a9 AUX postgresql-9.3-no-server.patch 4293 BLAKE2B 3224f3a7a82529ba710ff31ed02418f91cd394cee50c8cad10dbe6aff3260c08bd5958f91812fe16ea4820238bdd1cc4898b36f1dde09a2e54b6e3e94f2c6bfb SHA512 20117afa5a6999c6ae7f2b9adbdcfd2394a56c61d9c5d8c7ab2554a8de869d3aeaa4230a7dc4322fe585591277eb6ae47a594a7e605b811ed2c089d91cad6d4c AUX postgresql-9.4.10-no-server.patch 4356 BLAKE2B 97ca2424a854ac0efd2b5947e0efe183dd2b0171db07be92e4389b639fac707c3cba2957469996481e5d4ad5cac4fa686a193efc774e14ec0ad8f897713a5a19 SHA512 1abfb624b01b925a834c1c4f292246fd676cb7f2241a4e26bf52ce9b8c4dc2e4beeb4eea326c44f758d45034d5f18370280a8b18114bffaba1841e9ddac45174 AUX postgresql-9.5.5-no-server.patch 4498 BLAKE2B eb874ac58ddd3a9c0b6ed97cf6616c5a2480df4cf708fb77496ab5cc459da423eb77986cb99824cf24131918eb4844320cd9353a04d41f696471b4b3c2d59071 SHA512 c961c7f1935b064e402e6c73dc6b087cdbea23d8038ef5e5aa5e625f7f1e87bb8d5986b95bbf9ed7c1abc40eeb89cda3b7aa4571d4a75ad6dd6c6d847de77c7d AUX postgresql-9.6.3-no-server.patch 3555 BLAKE2B 905bdfe6b084d775755cc88f7f11262d6bd04df7b2eb9a8230aef0fbb079d0431c9335b5219f8867cf1ce3cf858c8c0e964208713876ebfe13ae6138f5d4f35a SHA512 c70a4df16d865ceff7474f1a1ccc72d4e82e73a09792edc787a7907aa419985495871d07830390982bc82c82723fe668fb42b0dd239973804532499f39696dfe AUX postgresql-check-db-dir 1013 BLAKE2B 2be45942d0442822113879708c11dfde267938b6e7118bd225f567ca9fdacb11082792eabcb40b8a39cd6017fdedb18100576fea0895dae2dcda83c2d51de34d SHA512 2f34ee0cb6a889500ccfca7621ada6ee1bb06dc146f3c556938152dd3d7c0312266bb4db5f4099838d93ade26e2b8866dfddb3576cb5a737431ea2befd0cec6f -AUX postgresql.confd-9.2 2450 BLAKE2B 267c6c388533d597d90285497fece703a4a5db088811eedd1a9507d400e9a16041211baf4af1f16fefd74cb0b2b83db5f037939da17e73ef04ef313c5701fb90 SHA512 a4aae13cc0312707d77d3164da6f573c78360cf039bd81e8e0dccd19cedf701a227315aded0a412531217398426e357bffffcf9d374614bcb5bfa398c946bf0b AUX postgresql.confd-9.3 2477 BLAKE2B dbe2fea6befdcdfe4a8a65cb68d040996986553be78615115070f14cd966d517b36a09366a431c774df119501fb933caf056abe0c5131e3327484ef557db3d14 SHA512 c928364b2b8a555443db8c1ac2a7336cd5e32ac860f3238a0a791cfcdfdce941837d72dfa44f3f08704d528590f9f3bb479e25b7db9f32cdde76f216819baa9d -AUX postgresql.init-9.2 4911 BLAKE2B 9e679849eb6422df72fabc0e0202e9353fdcbab5f1eb419f5ff49a3e3e05acac127d39a67c5ef66bd57679fc91e0790107dcf60b7da90f9173af11040525ae46 SHA512 bf51e7fbe02344f74a76c250c9804206ec7d3b988f99ad3476d00422ef2eea9c6ead7133a5adb9fb23aa7c0820f450ecab48f0c1a1a12a4e5ef5fe2bef48a0c0 AUX postgresql.init-9.3-r1 4999 BLAKE2B 77e231e5ca62a8b845ee02b1f27f13e12ab2c7577d3385a533bf61f988e6209586b75d3ddbaef71f0141b3bdee458179dea77180008f751bd77d656adc2d44de SHA512 cd181bb6d3ed72f786cd21a5c0c012bac3847adcf9da2e0b78eb212c9515953b2f1a2006faf475bfaa9a8c91371bda34f558f83ae010daa7cd670923526e39a0 AUX postgresql.service-9.2 1666 BLAKE2B d4b81415539db3d78e0f5908185f903b70966ce3a27feed9bdf80eb6a9065ca6bd4b49e4bb822c41548b7efa9de37656378c395a8bd00a7a3daaa52911a2f674 SHA512 8c64b59f1e80096382a7166e1e8f183a5b9cf14c75138c15a39de74b983bfbed2f41cf9b33b2c72c3b9c79130c10104836a3505c96cb18ac1be1297c0fce1af0 AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4b46c3739c3f805072040a26128cb2ad9a25d4a7c9f109a95696d739538d379af6bac53c656f5c41af45b6110de5 SHA512 9e2b04923f6ebec1424c0f276c58a6a0c4933f2de5e2a9776169227729afd06ce5284461be8b6ed70e5aaff2a68b9f96c6893d867d35761c9977f9847ccfe93d 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 a0c33efc63ae..000000000000 --- 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 7753eeae3a89..000000000000 --- 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 b191ca29e97c..000000000000 --- 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 $? -} -- cgit v1.2.3