Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Caleb Tennis (caleb)" <caleb@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/postgresql/files: postgresql.init-8.3 postgresql.conf-8.3 postgresql-8.3.1-gentoo.patch postgresql-8.3.1-regress_su.patch postgresql-8.3.1-sh.patch
Date: Wed, 26 Mar 2008 14:01:28
Message-Id: E1JeWBy-0003lQ-7p@stork.gentoo.org
1 caleb 08/03/26 14:01:26
2
3 Added: postgresql.init-8.3 postgresql.conf-8.3
4 postgresql-8.3.1-gentoo.patch
5 postgresql-8.3.1-regress_su.patch
6 postgresql-8.3.1-sh.patch
7 Log:
8 Version bump, with ebuidls and modifications from 206725
9 (Portage version: 2.1.4.4)
10
11 Revision Changes Path
12 1.1 dev-db/postgresql/files/postgresql.init-8.3
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.3?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.3?rev=1.1&content-type=text/plain
16
17 Index: postgresql.init-8.3
18 ===================================================================
19 #!/sbin/runscript
20 # Copyright 1999-2007 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22 # $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.3,v 1.1 2008/03/26 14:01:25 caleb Exp $
23
24 opts="${opts} reload"
25
26 depend() {
27 use net
28 }
29
30 checkconfig() {
31 if [ ! -d "$PGDATA" ] ; then
32 eerror "Directory not found: $PGDATA"
33 eerror "Please make sure that PGDATA points to the right path."
34 eerror "You can run 'emerge postgresql --config' to setup a new database cluster."
35 return 1
36 fi
37 }
38
39 start() {
40 checkconfig || return 1
41
42 ebegin "Starting PostgreSQL"
43
44 if [ -f "$PGDATA/postmaster.pid" ] ; then
45 rm -f "$PGDATA/postmaster.pid"
46 fi
47
48 start-stop-daemon --start \
49 --pidfile "${PGDATA}/postmaster.pid" \
50 --chuid ${PGUSER}:${PGGROUP} \
51 --exec /usr/bin/postmaster \
52 -- \
53 -D "${PGDATA}" \
54 --silent-mode=true \
55 ${PGOPTS}
56
57 eend $?
58 }
59
60 stop() {
61 ebegin "Stopping PostgreSQL"
62 # Note: we have to do --oknodo here, otherwise it will always fail
63 # when there are open transactions. This bug has been corrected
64 # in baselayout-1.13.0_alpha8.
65 start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
66 --retry -TERM/${WAIT_FOR_DISCONNECT}/-INT/${WAIT_FOR_CLEANUP}/-QUIT --oknodo
67 eend $?
68 }
69
70 reload() {
71 ebegin "Reloading PostgreSQL configuration"
72 start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" --signal HUP --oknodo
73 eend $?
74 }
75
76
77
78
79 1.1 dev-db/postgresql/files/postgresql.conf-8.3
80
81 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql.conf-8.3?rev=1.1&view=markup
82 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql.conf-8.3?rev=1.1&content-type=text/plain
83
84 Index: postgresql.conf-8.3
85 ===================================================================
86 # PostgreSQL's Database Directory
87 PGDATA="/var/lib/postgresql/data"
88
89 # PostgreSQL User
90 PGUSER="postgres"
91
92 # PostgreSQL Group
93 PGGROUP="postgres"
94
95 # Extra options to run postmaster with
96 PGOPTS=""
97
98
99 # SERVER SHUTDOWN:
100 # The server will receive 3 signals in the worst case:
101 # 1. SIGTERM
102 # This signals the server to ignore new connections and to
103 # wait for all clients to end their transactions before shutting down.
104 # Use WAIT_FOR_DISCONNECT to control how much time the clients
105 # should have until the next signal is being sent.
106 # 2. SIGINT
107 # Tell the server to forcefully disconnect all clients.
108 # Terminating a client results in a rollback of the open transactions for this client.
109 # Use WAIT_FOR_CLEANUP to determine how much time the server has
110 # for cleanup. (Set it to "forever" if you want to wait forever.)
111 # 3. SIGQUIT
112 # This will terminate the server immediately and results in a recovery run for the next start.
113
114 # Wait for clients to disconnect (seconds or "forever")
115 WAIT_FOR_DISCONNECT=10
116
117 # Time the server has to clean up (seconds or "forever")
118 WAIT_FOR_CLEANUP=10
119
120 # If you have to export environment variables for the database process,
121 # this can be done here.
122 # Example:
123 # export R_HOME="/usr/lib/R"
124
125
126
127
128 1.1 dev-db/postgresql/files/postgresql-8.3.1-gentoo.patch
129
130 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.3.1-gentoo.patch?rev=1.1&view=markup
131 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.3.1-gentoo.patch?rev=1.1&content-type=text/plain
132
133 Index: postgresql-8.3.1-gentoo.patch
134 ===================================================================
135 --- postgresql-8.3RC1.orig/src/bin/Makefile 2006-03-05 16:58:50.000000000 +0100
136 +++ postgresql-8.3RC1/src/bin/Makefile 2007-03-29 12:12:26.000000000 +0200
137 @@ -14,7 +14,7 @@
138 include $(top_builddir)/src/Makefile.global
139
140 DIRS = initdb ipcclean pg_ctl pg_dump \
141 - psql scripts pg_config pg_controldata pg_resetxlog
142 + psql scripts pg_controldata pg_resetxlog
143 ifeq ($(PORTNAME), win32)
144 DIRS+=pgevent
145 endif
146 --- postgresql-8.3RC1.orig/src/interfaces/Makefile 2004-04-20 02:33:51.000000000 +0200
147 +++ postgresql-8.3RC1/src/interfaces/Makefile 2007-03-29 12:14:01.000000000 +0200
148 @@ -12,7 +12,7 @@
149 top_builddir = ../..
150 include $(top_builddir)/src/Makefile.global
151
152 -DIRS = libpq ecpg
153 +DIRS = ecpg
154
155 ALLDIRS = $(DIRS)
156
157 --- postgresql-8.3RC1.orig/src/Makefile 2006-06-23 01:50:35.000000000 +0200
158 +++ postgresql-8.3RC1/src/Makefile 2007-03-29 12:54:59.000000000 +0200
159 @@ -19,12 +19,10 @@
160 $(MAKE) -C backend $@
161 $(MAKE) -C backend/utils/mb/conversion_procs $@
162 $(MAKE) -C backend/snowball $@
163 - $(MAKE) -C include $@
164 $(MAKE) -C interfaces $@
165 $(MAKE) -C bin $@
166 $(MAKE) -C pl $@
167 $(MAKE) -C makefiles $@
168 - $(MAKE) -C test/regress $@
169
170 install: install-local
171
172 @@ -49,7 +47,6 @@
173 $(MAKE) -C timezone $@
174 $(MAKE) -C backend $@
175 $(MAKE) -C backend/snowball $@
176 - $(MAKE) -C include $@
177 $(MAKE) -C interfaces $@
178 $(MAKE) -C bin $@
179 $(MAKE) -C pl $@
180 @@ -63,12 +60,10 @@
181 -$(MAKE) -C timezone $@
182 -$(MAKE) -C backend $@
183 -$(MAKE) -C backend/snowball $@
184 - -$(MAKE) -C include $@
185 -$(MAKE) -C interfaces $@
186 -$(MAKE) -C bin $@
187 -$(MAKE) -C pl $@
188 -$(MAKE) -C makefiles $@
189 - -$(MAKE) -C test $@
190 -$(MAKE) -C tutorial NO_PGXS=1 $@
191 -$(MAKE) -C test/thread $@
192 rm -f Makefile.port Makefile.global
193
194
195
196
197 1.1 dev-db/postgresql/files/postgresql-8.3.1-regress_su.patch
198
199 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.3.1-regress_su.patch?rev=1.1&view=markup
200 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.3.1-regress_su.patch?rev=1.1&content-type=text/plain
201
202 Index: postgresql-8.3.1-regress_su.patch
203 ===================================================================
204 --- postgresql-8.3RC1.orig/src/test/regress/GNUmakefile 2008-01-20 00:22:49.000000000 +0200
205 +++ postgresql-8.3RC1/src/test/regress/GNUmakefile 2008-01-20 00:26:27.000000000 +0200
206 @@ -141,7 +141,8 @@
207 ##
208
209 check: all
210 - ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
211 + chown portage testtablespace .
212 + su -s /bin/sh portage -c "./pg_regress --psqldir=`pwd`/../../bin/psql --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)"
213
214 installcheck: all
215 ./pg_regress --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule --srcdir=$(abs_srcdir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
216
217
218
219
220 1.1 dev-db/postgresql/files/postgresql-8.3.1-sh.patch
221
222 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.3.1-sh.patch?rev=1.1&view=markup
223 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql/files/postgresql-8.3.1-sh.patch?rev=1.1&content-type=text/plain
224
225 Index: postgresql-8.3.1-sh.patch
226 ===================================================================
227 --- postgresql-8.3RC1.orig/src/include/storage/s_lock.h 2006-06-08 00:24:45.000000000 +0200
228 +++ postgresql-8.3RC1/src/include/storage/s_lock.h 2007-03-29 12:25:56.000000000 +0200
229 @@ -299,6 +299,31 @@
230 #endif /* __s390__ || __s390x__ */
231
232
233 +#if defined(__sh__)
234 +#define HAS_TEST_AND_SET
235 +
236 +typedef unsigned char slock_t;
237 +
238 +#define TAS(lock) tas(lock)
239 +
240 +static __inline__ int
241 +tas(volatile slock_t *lock)
242 +{
243 + register int _res = 1;
244 +
245 + __asm__ __volatile__(
246 + "tas.b @%1\n\t"
247 + "movt %0\n\t"
248 + "xor #1,%0"
249 +: "=z"(_res)
250 +: "r"(lock)
251 +: "t","memory");
252 + return _res;
253 +}
254 +
255 +#endif /* __sh__ */
256 +
257 +
258 #if defined(__sparc__) /* Sparc */
259 #define HAS_TEST_AND_SET
260
261
262
263
264
265 --
266 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups