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

Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/postgresql-base/files: postgresql-8.0-base.patch postgresql-7.3.21-autoconf.patch postgresql-8.1-common.patch postgresql-8.2-base.patch postgresql-8.1-base.patch postgresql-7.4-hppa.patch postgresql-8.2-common.patch postgresql-7.4-base.patch postgresql-8.0-common.patch postgresql-7.3-base.patch postgresql-8.3-base.patch postgresql-7.4-common.patch postgresql-8.3-common.patch postgresql-7.4.19-autoconf.patch postgresql-8.x-relax_ssl_perms.patch
Date: Tue, 15 Apr 2008 09:23:41
Message-Id: E1JlhO4-0006CD-2t@stork.gentoo.org
1 dev-zero 08/04/15 09:23:36
2
3 Added: postgresql-8.0-base.patch
4 postgresql-7.3.21-autoconf.patch
5 postgresql-8.1-common.patch
6 postgresql-8.2-base.patch postgresql-8.1-base.patch
7 postgresql-7.4-hppa.patch
8 postgresql-8.2-common.patch
9 postgresql-7.4-base.patch
10 postgresql-8.0-common.patch
11 postgresql-7.3-base.patch postgresql-8.3-base.patch
12 postgresql-7.4-common.patch
13 postgresql-8.3-common.patch
14 postgresql-7.4.19-autoconf.patch
15 postgresql-8.x-relax_ssl_perms.patch
16 Log:
17 Moved into the tree. Thanks to Michael Krelin (polyonymous).
18 (Portage version: 2.1.5_rc2)
19
20 Revision Changes Path
21 1.1 dev-db/postgresql-base/files/postgresql-8.0-base.patch
22
23 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.0-base.patch?rev=1.1&view=markup
24 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.0-base.patch?rev=1.1&content-type=text/plain
25
26 Index: postgresql-8.0-base.patch
27 ===================================================================
28 === contrib/Makefile
29 ==================================================================
30 --- contrib/Makefile (revision 10)
31 +++ contrib/Makefile (local)
32 @@ -5,41 +5,8 @@
33 include $(top_builddir)/src/Makefile.global
34
35 WANTED_DIRS = \
36 - btree_gist \
37 - chkpass \
38 - cube \
39 - dbase \
40 - dblink \
41 - dbmirror \
42 - dbsize \
43 - earthdistance \
44 - findoidjoins \
45 - fulltextindex \
46 - fuzzystrmatch \
47 - intagg \
48 - intarray \
49 - isbn_issn \
50 - lo \
51 - ltree \
52 - miscutil \
53 - mysql \
54 - noupdate \
55 oid2name \
56 - pg_autovacuum \
57 - pg_dumplo \
58 - pg_trgm \
59 pgbench \
60 - pgcrypto \
61 - pgstattuple \
62 - rtree_gist \
63 - seg \
64 - spi \
65 - string \
66 - tablefunc \
67 - tips \
68 - tsearch \
69 - tsearch2 \
70 - userlock \
71 vacuumlo
72
73 # Missing:
74 === src/Makefile
75 ==================================================================
76 --- src/Makefile (revision 10)
77 +++ src/Makefile (local)
78 @@ -15,15 +15,11 @@
79
80 all install installdirs uninstall dep depend distprep:
81 $(MAKE) -C port $@
82 - $(MAKE) -C timezone $@
83 $(MAKE) -C backend $@
84 - $(MAKE) -C backend/utils/mb/conversion_procs $@
85 $(MAKE) -C include $@
86 $(MAKE) -C interfaces $@
87 $(MAKE) -C bin $@
88 - $(MAKE) -C pl $@
89 $(MAKE) -C makefiles $@
90 - $(MAKE) -C utils $@
91
92 install: install-local
93
94 === src/backend/Makefile
95 ==================================================================
96 --- src/backend/Makefile (revision 10)
97 +++ src/backend/Makefile (local)
98 @@ -34,7 +34,7 @@
99
100 ##########################################################################
101
102 -all: submake-libpgport postgres $(POSTGRES_IMP)
103 +all: someheaders
104
105 ifneq ($(PORTNAME), cygwin)
106 ifneq ($(PORTNAME), win32)
107 @@ -104,8 +104,7 @@
108
109 .PHONY: $(DIRS:%=%-recursive)
110 # Update the commonly used headers before building the subdirectories
111 -$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
112 - $(MAKE) -C $(subst -recursive,,$@) all
113 +someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
114
115
116 $(DLLINIT): $(DLLINIT:%.o=%.c)
117 @@ -151,22 +150,7 @@
118
119 ##########################################################################
120
121 -install: all installdirs install-bin
122 -ifeq ($(PORTNAME), cygwin)
123 -ifeq ($(MAKE_DLL), true)
124 - $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
125 -endif
126 -endif
127 -ifeq ($(PORTNAME), win32)
128 -ifeq ($(MAKE_DLL), true)
129 - $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
130 -endif
131 -endif
132 - $(MAKE) -C catalog install-data
133 - $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
134 - $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
135 - $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
136 - $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample $(DESTDIR)$(datadir)/recovery.conf.sample
137 +install:
138
139 install-bin: postgres $(POSTGRES_IMP) installdirs
140 $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)
141 === src/bin/Makefile
142 ==================================================================
143 --- src/bin/Makefile (revision 10)
144 +++ src/bin/Makefile (local)
145 @@ -13,8 +13,8 @@
146 top_builddir = ../..
147 include $(top_builddir)/src/Makefile.global
148
149 -DIRS := initdb ipcclean pg_ctl pg_dump \
150 - psql scripts pg_config pg_controldata pg_resetxlog
151 +DIRS := pg_dump \
152 + psql scripts pg_config
153 ifeq ($(PORTNAME), win32)
154 DIRS+=pgevent
155 endif
156 === src/include/pg_config_manual.h
157 ==================================================================
158 --- src/include/pg_config_manual.h (revision 10)
159 +++ src/include/pg_config_manual.h (local)
160 @@ -160,7 +160,7 @@
161 * here's where to twiddle it. You can also override this at runtime
162 * with the postmaster's -k switch.
163 */
164 -#define DEFAULT_PGSOCKET_DIR "/tmp"
165 +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
166
167 /*
168 * The random() function is expected to yield values between 0 and
169
170
171
172 1.1 dev-db/postgresql-base/files/postgresql-7.3.21-autoconf.patch
173
174 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.3.21-autoconf.patch?rev=1.1&view=markup
175 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.3.21-autoconf.patch?rev=1.1&content-type=text/plain
176
177 Index: postgresql-7.3.21-autoconf.patch
178 ===================================================================
179 diff --git a/config/programs.m4 b/config/programs.m4
180 index 35d9e2b..c681983 100644
181 --- a/config/programs.m4
182 +++ b/config/programs.m4
183 @@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
184 dnl FIXME: We should probably check for version >=0.10.36.
185 AC_CHECK_PROGS(XGETTEXT, xgettext)
186
187 - # Note: share/locale is always the default, independent of $datadir
188 - localedir='${prefix}/share/locale'
189 - if test x"$prefix" = x"NONE"; then
190 - exp_localedir="$ac_default_prefix/share/locale"
191 - else
192 - exp_localedir="$prefix/share/locale"
193 - fi
194 + # Note: share/locale *WAS* always the default, independent of $datadir
195 + AC_ARG_WITH([locale-dir],
196 + AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
197 + [ localedir="${withval}" ],
198 + [ localedir='${prefix}/share/locale' ]
199 + )
200 + exp_localedir="${localedir}"
201
202 AC_SUBST(localedir)
203 AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
204 diff --git a/configure.in b/configure.in
205 index 07cc529..37fdded 100644
206 --- a/configure.in
207 +++ b/configure.in
208 @@ -19,17 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
209 dnl
210 dnl The GNU folks apparently haven't heard that some people don't use
211 dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
212 -m4_define([info], [doc])
213 -m4_define([infodir], [docdir])
214 AC_INIT([PostgreSQL], [7.3.21], [pgsql-bugs@××××××××××.org])
215 -m4_undefine([infodir])
216 -m4_undefine([info])
217 -AC_SUBST(docdir)
218 -
219 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.59 is required.
220 -Untested combinations of 'autoconf' and PostgreSQL versions are not
221 -recommended. You can remove the check from 'configure.in' but it is then
222 -your responsibility whether the result works or not.])])
223 +
224 AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group])
225 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
226 AC_CONFIG_AUX_DIR(config)
227 @@ -626,7 +617,7 @@ AC_CHECK_LIB(PW, main)
228 AC_CHECK_LIB(resolv, main)
229 AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
230 # QNX:
231 -AC_CHECK_LIB([[unix]], main)
232 +AC_CHECK_LIB([unix], main)
233 AC_SEARCH_LIBS(crypt, crypt)
234 # BeOS:
235 AC_CHECK_LIB(bind, __inet_ntoa)
236
237
238
239 1.1 dev-db/postgresql-base/files/postgresql-8.1-common.patch
240
241 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.1-common.patch?rev=1.1&view=markup
242 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.1-common.patch?rev=1.1&content-type=text/plain
243
244 Index: postgresql-8.1-common.patch
245 ===================================================================
246 diff --git a/config/programs.m4 b/config/programs.m4
247 index 3f87396..9c7fbf0 100644
248 --- a/config/programs.m4
249 +++ b/config/programs.m4
250 @@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
251 dnl FIXME: We should probably check for version >=0.10.36.
252 AC_CHECK_PROGS(XGETTEXT, xgettext)
253
254 - # Note: share/locale is always the default, independent of $datadir
255 - localedir='${prefix}/share/locale'
256 - if test x"$prefix" = x"NONE"; then
257 - exp_localedir="$ac_default_prefix/share/locale"
258 - else
259 - exp_localedir="$prefix/share/locale"
260 - fi
261 + # Note: share/locale *WAS* always the default, independent of $datadir
262 + AC_ARG_WITH([locale-dir],
263 + AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
264 + [ localedir="${withval}" ],
265 + [ localedir='${prefix}/share/locale' ]
266 + )
267 + exp_localedir="${localedir}"
268
269 AC_SUBST(localedir)
270 AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
271 diff --git a/configure.in b/configure.in
272 index d071f00..b203648 100644
273 --- a/configure.in
274 +++ b/configure.in
275 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
276
277 AC_INIT([PostgreSQL], [8.1.11], [pgsql-bugs@××××××××××.org])
278
279 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
280 -Untested combinations of 'autoconf' and PostgreSQL versions are not
281 -recommended. You can remove the check from 'configure.in' but it is then
282 -your responsibility whether the result works or not.])])
283 AC_COPYRIGHT([Copyright (c) 1996-2005, PostgreSQL Global Development Group])
284 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
285 AC_CONFIG_AUX_DIR(config)
286 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
287 index c5731fd..8ec70b4 100644
288 --- a/src/include/storage/s_lock.h
289 +++ b/src/include/storage/s_lock.h
290 @@ -299,6 +299,29 @@ tas(volatile slock_t *lock)
291
292 #endif /* __s390__ || __s390x__ */
293
294 +#if defined(__sh__)
295 +#define HAS_TEST_AND_SET
296 +
297 +typedef unsigned char slock_t;
298 +
299 +#define TAS(lock) tas(lock)
300 +
301 +static __inline__ int
302 +tas(volatile slock_t *lock)
303 +{
304 + register int _res = 1;
305 +
306 + __asm__ __volatile__(
307 + "tas.b @%1\n\t"
308 + "movt %0\n\t"
309 + "xor #1,%0"
310 +: "=z"(_res)
311 +: "r"(lock)
312 +: "t","memory");
313 + return _res;
314 +}
315 +
316 +#endif /* __sh__ */
317
318 #if defined(__sparc__)
319 #define HAS_TEST_AND_SET
320
321
322
323 1.1 dev-db/postgresql-base/files/postgresql-8.2-base.patch
324
325 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.2-base.patch?rev=1.1&view=markup
326 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.2-base.patch?rev=1.1&content-type=text/plain
327
328 Index: postgresql-8.2-base.patch
329 ===================================================================
330 === contrib/Makefile
331 ==================================================================
332 --- contrib/Makefile (revision 10)
333 +++ contrib/Makefile (local)
334 @@ -5,37 +5,10 @@
335 include $(top_builddir)/src/Makefile.global
336
337 WANTED_DIRS = \
338 - adminpack \
339 - btree_gist \
340 - chkpass \
341 - cube \
342 - dblink \
343 - earthdistance \
344 - fuzzystrmatch \
345 - hstore \
346 - intagg \
347 - intarray \
348 - isn \
349 - lo \
350 - ltree \
351 oid2name \
352 - pg_buffercache \
353 - pg_freespacemap \
354 - pg_trgm \
355 pgbench \
356 - pgcrypto \
357 - pgrowlocks \
358 - pgstattuple \
359 - seg \
360 - spi \
361 - tablefunc \
362 - tsearch2 \
363 vacuumlo
364
365 -ifeq ($(with_openssl),yes)
366 -WANTED_DIRS += sslinfo
367 -endif
368 -
369 # Missing:
370 # start-scripts \ (does not have a makefile)
371 # xml2 \ (requires libxml installed)
372 === src/Makefile
373 ==================================================================
374 --- src/Makefile (revision 10)
375 +++ src/Makefile (local)
376 @@ -15,15 +15,11 @@
377
378 all install installdirs uninstall dep depend distprep:
379 $(MAKE) -C port $@
380 - $(MAKE) -C timezone $@
381 $(MAKE) -C backend $@
382 - $(MAKE) -C backend/utils/mb/conversion_procs $@
383 $(MAKE) -C include $@
384 $(MAKE) -C interfaces $@
385 $(MAKE) -C bin $@
386 - $(MAKE) -C pl $@
387 $(MAKE) -C makefiles $@
388 - $(MAKE) -C test/regress $@
389
390 install: install-local
391
392 === src/backend/Makefile
393 ==================================================================
394 --- src/backend/Makefile (revision 10)
395 +++ src/backend/Makefile (local)
396 @@ -33,7 +33,7 @@
397
398 ##########################################################################
399
400 -all: submake-libpgport postgres $(POSTGRES_IMP)
401 +all: someheaders
402
403 ifneq ($(PORTNAME), cygwin)
404 ifneq ($(PORTNAME), win32)
405 @@ -105,8 +105,7 @@
406
407 .PHONY: $(DIRS:%=%-recursive)
408 # Update the commonly used headers before building the subdirectories
409 -$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
410 - $(MAKE) -C $(subst -recursive,,$@) all
411 +someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
412
413
414 # The postgres.o target is needed by the rule in Makefile.global that
415 @@ -153,22 +152,7 @@
416
417 ##########################################################################
418
419 -install: all installdirs install-bin
420 -ifeq ($(PORTNAME), cygwin)
421 -ifeq ($(MAKE_DLL), true)
422 - $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
423 -endif
424 -endif
425 -ifeq ($(PORTNAME), win32)
426 -ifeq ($(MAKE_DLL), true)
427 - $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
428 -endif
429 -endif
430 - $(MAKE) -C catalog install-data
431 - $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
432 - $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
433 - $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
434 - $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
435 +install:
436
437 install-bin: postgres $(POSTGRES_IMP) installdirs
438 $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
439 === src/bin/Makefile
440 ==================================================================
441 --- src/bin/Makefile (revision 10)
442 +++ src/bin/Makefile (local)
443 @@ -13,8 +13,8 @@
444 top_builddir = ../..
445 include $(top_builddir)/src/Makefile.global
446
447 -DIRS := initdb ipcclean pg_ctl pg_dump \
448 - psql scripts pg_config pg_controldata pg_resetxlog
449 +DIRS := pg_dump \
450 + psql scripts pg_config
451 ifeq ($(PORTNAME), win32)
452 DIRS+=pgevent
453 endif
454 === src/include/pg_config_manual.h
455 ==================================================================
456 --- src/include/pg_config_manual.h (revision 10)
457 +++ src/include/pg_config_manual.h (local)
458 @@ -175,7 +175,7 @@
459 * here's where to twiddle it. You can also override this at runtime
460 * with the postmaster's -k switch.
461 */
462 -#define DEFAULT_PGSOCKET_DIR "/tmp"
463 +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
464
465 /*
466 * The random() function is expected to yield values between 0 and
467
468
469
470 1.1 dev-db/postgresql-base/files/postgresql-8.1-base.patch
471
472 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.1-base.patch?rev=1.1&view=markup
473 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.1-base.patch?rev=1.1&content-type=text/plain
474
475 Index: postgresql-8.1-base.patch
476 ===================================================================
477 === contrib/Makefile
478 ==================================================================
479 --- contrib/Makefile (revision 10)
480 +++ contrib/Makefile (local)
481 @@ -5,32 +5,8 @@
482 include $(top_builddir)/src/Makefile.global
483
484 WANTED_DIRS = \
485 - btree_gist \
486 - chkpass \
487 - cube \
488 - dbase \
489 - dblink \
490 - dbmirror \
491 - earthdistance \
492 - fulltextindex \
493 - fuzzystrmatch \
494 - intagg \
495 - intarray \
496 - isbn_issn \
497 - lo \
498 - ltree \
499 oid2name \
500 - pg_buffercache \
501 - pg_trgm \
502 pgbench \
503 - pgcrypto \
504 - pgstattuple \
505 - seg \
506 - spi \
507 - tablefunc \
508 - tips \
509 - tsearch2 \
510 - userlock \
511 vacuumlo
512
513 # Missing:
514 === src/Makefile
515 ==================================================================
516 --- src/Makefile (revision 10)
517 +++ src/Makefile (local)
518 @@ -15,15 +15,11 @@
519
520 all install installdirs uninstall dep depend distprep:
521 $(MAKE) -C port $@
522 - $(MAKE) -C timezone $@
523 $(MAKE) -C backend $@
524 - $(MAKE) -C backend/utils/mb/conversion_procs $@
525 $(MAKE) -C include $@
526 $(MAKE) -C interfaces $@
527 $(MAKE) -C bin $@
528 - $(MAKE) -C pl $@
529 $(MAKE) -C makefiles $@
530 - $(MAKE) -C utils $@
531
532 install: install-local
533
534 === src/backend/Makefile
535 ==================================================================
536 --- src/backend/Makefile (revision 10)
537 +++ src/backend/Makefile (local)
538 @@ -34,7 +34,7 @@
539
540 ##########################################################################
541
542 -all: submake-libpgport postgres $(POSTGRES_IMP)
543 +all: someheaders
544
545 ifneq ($(PORTNAME), cygwin)
546 ifneq ($(PORTNAME), win32)
547 @@ -106,8 +106,7 @@
548
549 .PHONY: $(DIRS:%=%-recursive)
550 # Update the commonly used headers before building the subdirectories
551 -$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
552 - $(MAKE) -C $(subst -recursive,,$@) all
553 +someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
554
555
556 $(DLLINIT): $(DLLINIT:%.o=%.c)
557 @@ -153,22 +152,7 @@
558
559 ##########################################################################
560
561 -install: all installdirs install-bin
562 -ifeq ($(PORTNAME), cygwin)
563 -ifeq ($(MAKE_DLL), true)
564 - $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
565 -endif
566 -endif
567 -ifeq ($(PORTNAME), win32)
568 -ifeq ($(MAKE_DLL), true)
569 - $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
570 -endif
571 -endif
572 - $(MAKE) -C catalog install-data
573 - $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
574 - $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
575 - $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
576 - $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample $(DESTDIR)$(datadir)/recovery.conf.sample
577 +install:
578
579 install-bin: postgres $(POSTGRES_IMP) installdirs
580 $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)
581 === src/bin/Makefile
582 ==================================================================
583 --- src/bin/Makefile (revision 10)
584 +++ src/bin/Makefile (local)
585 @@ -13,8 +13,8 @@
586 top_builddir = ../..
587 include $(top_builddir)/src/Makefile.global
588
589 -DIRS := initdb ipcclean pg_ctl pg_dump \
590 - psql scripts pg_config pg_controldata pg_resetxlog
591 +DIRS := pg_dump \
592 + psql scripts pg_config
593 ifeq ($(PORTNAME), win32)
594 DIRS+=pgevent
595 endif
596 === src/include/pg_config_manual.h
597 ==================================================================
598 --- src/include/pg_config_manual.h (revision 10)
599 +++ src/include/pg_config_manual.h (local)
600 @@ -175,7 +175,7 @@
601 * here's where to twiddle it. You can also override this at runtime
602 * with the postmaster's -k switch.
603 */
604 -#define DEFAULT_PGSOCKET_DIR "/tmp"
605 +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
606
607 /*
608 * The random() function is expected to yield values between 0 and
609
610
611
612 1.1 dev-db/postgresql-base/files/postgresql-7.4-hppa.patch
613
614 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4-hppa.patch?rev=1.1&view=markup
615 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4-hppa.patch?rev=1.1&content-type=text/plain
616
617 Index: postgresql-7.4-hppa.patch
618 ===================================================================
619 diff --git a/src/include/port/linux.h b/src/include/port/linux.h
620 index 159db31..bef4c9e 100644
621 --- a/src/include/port/linux.h
622 +++ b/src/include/port/linux.h
623 @@ -3,6 +3,11 @@ typedef unsigned char slock_t;
624
625 #define HAS_TEST_AND_SET
626
627 +#elif defined(__hppa__)
628 +typedef struct { int sema[4]; } slock_t;
629 +
630 +#define HAS_TEST_AND_SET
631 +
632 #elif defined(__sparc__)
633 typedef unsigned char slock_t;
634
635 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
636 index 578d8cf..ceed34a 100644
637 --- a/src/include/storage/s_lock.h
638 +++ b/src/include/storage/s_lock.h
639 @@ -112,6 +112,33 @@ tas(volatile slock_t *lock)
640
641 #endif /* __i386__ || __x86_64__ */
642
643 +#if defined(__hppa__) || defined(__hppa)
644 +#define TAS(lock) tas(lock)
645 +
646 +#define __ldcw(a) ({ \
647 + unsigned int __ret; \
648 + __asm__ __volatile__("ldcw 0(%2),%0" \
649 + : "=r" (__ret), "=m" (*(a)) : "r" (a)); \
650 + __ret; \
651 +})
652 +
653 +#define __PA_LDCW_ALIGNMENT 16
654 +#define __ldcw_align(a) ({ \
655 + volatile unsigned int __ret = (unsigned int) a; \
656 + if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a) \
657 + __ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT; \
658 + (unsigned int *) __ret; \
659 +})
660 +
661 +static __inline__ int
662 +tas(volatile slock_t *lock)
663 +{
664 + volatile unsigned int *a = __ldcw_align (lock);
665 + return (__ldcw(a) == 0);
666 +}
667 +
668 +#endif /* __hppa__ || __hppa */
669 +
670
671 /* Intel Itanium */
672 #if defined(__ia64__) || defined(__ia64)
673
674
675
676 1.1 dev-db/postgresql-base/files/postgresql-8.2-common.patch
677
678 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.2-common.patch?rev=1.1&view=markup
679 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.2-common.patch?rev=1.1&content-type=text/plain
680
681 Index: postgresql-8.2-common.patch
682 ===================================================================
683 diff --git a/config/programs.m4 b/config/programs.m4
684 index fb9793f..3510942 100644
685 --- a/config/programs.m4
686 +++ b/config/programs.m4
687 @@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
688 dnl FIXME: We should probably check for version >=0.10.36.
689 AC_CHECK_PROGS(XGETTEXT, xgettext)
690
691 - # Note: share/locale is always the default, independent of $datadir
692 - localedir='${prefix}/share/locale'
693 + # Note: share/locale *WAS* always the default, independent of $datadir
694 + AC_ARG_WITH([locale-dir],
695 + AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
696 + [ localedir="${withval}" ],
697 + [ localedir='${prefix}/share/locale' ]
698 + )
699 AC_SUBST(localedir)
700 ])# PGAC_CHECK_GETTEXT
701
702 diff --git a/configure.in b/configure.in
703 index 908a1ae..30dd3bb 100644
704 --- a/configure.in
705 +++ b/configure.in
706 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
707
708 AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs@××××××××××.org])
709
710 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
711 -Untested combinations of 'autoconf' and PostgreSQL versions are not
712 -recommended. You can remove the check from 'configure.in' but it is then
713 -your responsibility whether the result works or not.])])
714 AC_COPYRIGHT([Copyright (c) 1996-2006, PostgreSQL Global Development Group])
715 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
716 AC_CONFIG_AUX_DIR(config)
717 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
718 index 23f4cc9..707c303 100644
719 --- a/src/include/storage/s_lock.h
720 +++ b/src/include/storage/s_lock.h
721 @@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
722
723 #endif /* __s390__ || __s390x__ */
724
725 +#if defined(__sh__)
726 +#define HAS_TEST_AND_SET
727 +
728 +typedef unsigned char slock_t;
729 +
730 +#define TAS(lock) tas(lock)
731 +
732 +static __inline__ int
733 +tas(volatile slock_t *lock)
734 +{
735 + register int _res = 1;
736 +
737 + __asm__ __volatile__(
738 + "tas.b @%1\n\t"
739 + "movt %0\n\t"
740 + "xor #1,%0"
741 +: "=z"(_res)
742 +: "r"(lock)
743 +: "t","memory");
744 + return _res;
745 +}
746 +
747 +#endif /* __sh__ */
748
749 #if defined(__sparc__) /* Sparc */
750 #define HAS_TEST_AND_SET
751 diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
752 index 9f761d4..83b2974 100644
753 --- a/src/makefiles/Makefile.darwin
754 +++ b/src/makefiles/Makefile.darwin
755 @@ -5,7 +5,15 @@ DLSUFFIX = .so
756 CFLAGS_SL =
757
758 ifdef PGXS
759 +ifdef PGXS_IN_SERVER
760 +ifndef PGXS_WITH_SERVER
761 +BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
762 +else
763 +BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
764 +endif
765 +else
766 BE_DLLLIBS= -bundle_loader $(bindir)/postgres
767 +endif
768 else
769 BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
770 endif
771
772
773
774 1.1 dev-db/postgresql-base/files/postgresql-7.4-base.patch
775
776 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4-base.patch?rev=1.1&view=markup
777 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4-base.patch?rev=1.1&content-type=text/plain
778
779 Index: postgresql-7.4-base.patch
780 ===================================================================
781 === contrib/Makefile
782 ==================================================================
783 --- contrib/Makefile (revision 10)
784 +++ contrib/Makefile (local)
785 @@ -5,41 +5,9 @@
786 include $(top_builddir)/src/Makefile.global
787
788 WANTED_DIRS = \
789 - btree_gist \
790 - chkpass \
791 - cube \
792 - dbase \
793 - dblink \
794 - dbmirror \
795 - dbsize \
796 - earthdistance \
797 findoidjoins \
798 - fulltextindex \
799 - fuzzystrmatch \
800 - intagg \
801 - intarray \
802 - isbn_issn \
803 - lo \
804 - ltree \
805 - miscutil \
806 - noupdate \
807 oid2name \
808 - pg_autovacuum \
809 - pg_dumplo \
810 - pg_logger \
811 pgbench \
812 - pgcrypto \
813 - pgstattuple \
814 - rserv \
815 - rtree_gist \
816 - seg \
817 - spi \
818 - string \
819 - tablefunc \
820 - tips \
821 - tsearch \
822 - tsearch2 \
823 - userlock \
824 vacuumlo
825
826 # Missing:
827 === src/Makefile
828 ==================================================================
829 --- src/Makefile (revision 10)
830 +++ src/Makefile (local)
831 @@ -16,11 +16,9 @@
832 all install installdirs uninstall dep depend distprep:
833 $(MAKE) -C port $@
834 $(MAKE) -C backend $@
835 - $(MAKE) -C backend/utils/mb/conversion_procs $@
836 $(MAKE) -C include $@
837 $(MAKE) -C interfaces $@
838 $(MAKE) -C bin $@
839 - $(MAKE) -C pl $@
840
841 install-all-headers:
842 $(MAKE) -C include $@
843 === src/backend/Makefile
844 ==================================================================
845 --- src/backend/Makefile (revision 10)
846 +++ src/backend/Makefile (local)
847 @@ -29,7 +29,7 @@
848
849 ##########################################################################
850
851 -all: submake-libpgport postgres $(POSTGRES_IMP)
852 +all: someheaders
853
854 ifneq ($(PORTNAME), cygwin)
855
856 @@ -78,8 +78,7 @@
857
858 .PHONY: $(DIRS:%=%-recursive)
859 # Update the commonly used headers before building the subdirectories
860 -$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
861 - $(MAKE) -C $(subst -recursive,,$@) all
862 +someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
863
864
865 $(DLLINIT): $(DLLINIT:%.o=%.c)
866 @@ -125,16 +124,7 @@
867
868 ##########################################################################
869
870 -install: all installdirs install-bin
871 -ifeq ($(PORTNAME), cygwin)
872 -ifeq ($(MAKE_DLL), true)
873 - $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
874 -endif
875 -endif
876 - $(MAKE) -C catalog install-data
877 - $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
878 - $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
879 - $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
880 +install:
881
882 install-bin: postgres $(POSTGRES_IMP) installdirs
883 $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)
884 === src/bin/Makefile
885 ==================================================================
886 --- src/bin/Makefile (revision 10)
887 +++ src/bin/Makefile (local)
888 @@ -13,8 +13,8 @@
889 top_builddir = ../..
890 include $(top_builddir)/src/Makefile.global
891
892 -DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
893 - psql scripts pg_config pg_controldata pg_resetxlog \
894 +DIRS := pg_dump \
895 + psql scripts pg_config \
896 pg_encoding
897
898 ifeq ($(with_tcl), yes)
899 === src/include/pg_config_manual.h
900 ==================================================================
901 --- src/include/pg_config_manual.h (revision 10)
902 +++ src/include/pg_config_manual.h (local)
903 @@ -165,7 +165,7 @@
904 * here's where to twiddle it. You can also override this at runtime
905 * with the postmaster's -k switch.
906 */
907 -#define DEFAULT_PGSOCKET_DIR "/tmp"
908 +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
909
910 /*
911 * Defining this will make float4 and float8 operations faster by
912
913
914
915 1.1 dev-db/postgresql-base/files/postgresql-8.0-common.patch
916
917 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.0-common.patch?rev=1.1&view=markup
918 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.0-common.patch?rev=1.1&content-type=text/plain
919
920 Index: postgresql-8.0-common.patch
921 ===================================================================
922 diff --git a/config/programs.m4 b/config/programs.m4
923 index 3f87396..9c7fbf0 100644
924 --- a/config/programs.m4
925 +++ b/config/programs.m4
926 @@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
927 dnl FIXME: We should probably check for version >=0.10.36.
928 AC_CHECK_PROGS(XGETTEXT, xgettext)
929
930 - # Note: share/locale is always the default, independent of $datadir
931 - localedir='${prefix}/share/locale'
932 - if test x"$prefix" = x"NONE"; then
933 - exp_localedir="$ac_default_prefix/share/locale"
934 - else
935 - exp_localedir="$prefix/share/locale"
936 - fi
937 + # Note: share/locale *WAS* always the default, independent of $datadir
938 + AC_ARG_WITH([locale-dir],
939 + AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
940 + [ localedir="${withval}" ],
941 + [ localedir='${prefix}/share/locale' ]
942 + )
943 + exp_localedir="${localedir}"
944
945 AC_SUBST(localedir)
946 AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
947 diff --git a/configure.in b/configure.in
948 index c71b175..674036a 100644
949 --- a/configure.in
950 +++ b/configure.in
951 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
952
953 AC_INIT([PostgreSQL], [8.0.15], [pgsql-bugs@××××××××××.org])
954
955 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.59 is required.
956 -Untested combinations of 'autoconf' and PostgreSQL versions are not
957 -recommended. You can remove the check from 'configure.in' but it is then
958 -your responsibility whether the result works or not.])])
959 AC_COPYRIGHT([Copyright (c) 1996-2005, PostgreSQL Global Development Group])
960 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
961 AC_CONFIG_AUX_DIR(config)
962 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
963 index 0c2dff0..d548d4d 100644
964 --- a/src/include/storage/s_lock.h
965 +++ b/src/include/storage/s_lock.h
966 @@ -239,6 +239,31 @@ tas(volatile slock_t *lock)
967 #endif /* __s390__ || __s390x__ */
968
969
970 +#if defined(__sh__)
971 +#define HAS_TEST_AND_SET
972 +
973 +typedef unsigned char slock_t;
974 +
975 +#define TAS(lock) tas(lock)
976 +
977 +static __inline__ int
978 +tas(volatile slock_t *lock)
979 +{
980 + register int _res = 1;
981 +
982 + __asm__ __volatile__(
983 + "tas.b @%1\n\t"
984 + "movt %0\n\t"
985 + "xor #1,%0"
986 +: "=z"(_res)
987 +: "r"(lock)
988 +: "t","memory");
989 + return _res;
990 +}
991 +
992 +#endif /* __sh__ */
993 +
994 +
995 #if defined(__sparc__)
996 #define HAS_TEST_AND_SET
997
998
999
1000
1001 1.1 dev-db/postgresql-base/files/postgresql-7.3-base.patch
1002
1003 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.3-base.patch?rev=1.1&view=markup
1004 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.3-base.patch?rev=1.1&content-type=text/plain
1005
1006 Index: postgresql-7.3-base.patch
1007 ===================================================================
1008 === contrib/Makefile
1009 ==================================================================
1010 --- contrib/Makefile (revision 12)
1011 +++ contrib/Makefile (local)
1012 @@ -5,40 +5,9 @@
1013 include $(top_builddir)/src/Makefile.global
1014
1015 WANTED_DIRS = \
1016 - array \
1017 - btree_gist \
1018 - chkpass \
1019 - cube \
1020 - dbase \
1021 - dblink \
1022 - dbmirror \
1023 - dbsize \
1024 - earthdistance \
1025 findoidjoins \
1026 - fulltextindex \
1027 - fuzzystrmatch \
1028 - intagg \
1029 - intarray \
1030 - isbn_issn \
1031 - lo \
1032 - ltree \
1033 - miscutil \
1034 - noupdate \
1035 oid2name \
1036 - pg_dumplo \
1037 - pg_logger \
1038 pgbench \
1039 - pgcrypto \
1040 - pgstattuple \
1041 - rserv \
1042 - rtree_gist \
1043 - seg \
1044 - spi \
1045 - string \
1046 - tablefunc \
1047 - tips \
1048 - tsearch \
1049 - userlock \
1050 vacuumlo
1051
1052 # Missing:
1053 === src/Makefile
1054 ==================================================================
1055 --- src/Makefile (revision 12)
1056 +++ src/Makefile (local)
1057 @@ -16,11 +16,9 @@
1058 all install installdirs uninstall dep depend distprep:
1059 $(MAKE) -C port $@
1060 $(MAKE) -C backend $@
1061 - $(MAKE) -C backend/utils/mb/conversion_procs $@
1062 $(MAKE) -C include $@
1063 $(MAKE) -C interfaces $@
1064 $(MAKE) -C bin $@
1065 - $(MAKE) -C pl $@
1066
1067 install-all-headers:
1068 $(MAKE) -C include $@
1069 === src/backend/Makefile
1070 ==================================================================
1071 --- src/backend/Makefile (revision 12)
1072 +++ src/backend/Makefile (local)
1073 @@ -29,7 +29,7 @@
1074
1075 ##########################################################################
1076
1077 -all: submake-libpgport postgres $(POSTGRES_IMP)
1078 +all: someheaders
1079
1080 ifneq ($(PORTNAME), win)
1081
1082 @@ -78,8 +78,7 @@
1083
1084 .PHONY: $(DIRS:%=%-recursive)
1085 # Update the commonly used headers before building the subdirectories
1086 -$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
1087 - $(MAKE) -C $(subst -recursive,,$@) all
1088 +someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
1089
1090
1091 $(DLLINIT): $(DLLINIT:%.o=%.c)
1092 @@ -125,16 +124,7 @@
1093
1094 ##########################################################################
1095
1096 -install: all installdirs install-bin
1097 -ifeq ($(PORTNAME), win)
1098 -ifeq ($(MAKE_DLL), true)
1099 - $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
1100 -endif
1101 -endif
1102 - $(MAKE) -C catalog install-bki
1103 - $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
1104 - $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
1105 - $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
1106 +install:
1107
1108 install-bin: postgres $(POSTGRES_IMP) installdirs
1109 $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)
1110 === src/bin/Makefile
1111 ==================================================================
1112 --- src/bin/Makefile (revision 12)
1113 +++ src/bin/Makefile (local)
1114 @@ -13,8 +13,8 @@
1115 top_builddir = ../..
1116 include $(top_builddir)/src/Makefile.global
1117
1118 -DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
1119 - psql scripts pg_config pg_controldata pg_resetxlog \
1120 +DIRS := pg_dump \
1121 + psql scripts pg_config \
1122 pg_encoding
1123
1124 ifeq ($(with_tcl), yes)
1125 === src/include/pg_config.h.in
1126 ==================================================================
1127 --- src/include/pg_config.h.in (revision 12)
1128 +++ src/include/pg_config.h.in (local)
1129 @@ -244,7 +244,7 @@
1130 * just hate the idea of sockets in /tmp, here's where to twiddle it.
1131 * You can also override this at runtime with the postmaster's -k switch.
1132 */
1133 -#define DEFAULT_PGSOCKET_DIR "/tmp"
1134 +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
1135
1136
1137 /*
1138
1139
1140
1141 1.1 dev-db/postgresql-base/files/postgresql-8.3-base.patch
1142
1143 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.3-base.patch?rev=1.1&view=markup
1144 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.3-base.patch?rev=1.1&content-type=text/plain
1145
1146 Index: postgresql-8.3-base.patch
1147 ===================================================================
1148 === contrib/Makefile
1149 ==================================================================
1150 --- contrib/Makefile (revision 2)
1151 +++ contrib/Makefile (local)
1152 @@ -5,41 +5,10 @@
1153 include $(top_builddir)/src/Makefile.global
1154
1155 WANTED_DIRS = \
1156 - adminpack \
1157 - btree_gist \
1158 - chkpass \
1159 - cube \
1160 - dblink \
1161 - dict_int \
1162 - dict_xsyn \
1163 - earthdistance \
1164 - fuzzystrmatch \
1165 - hstore \
1166 - intagg \
1167 - intarray \
1168 - isn \
1169 - lo \
1170 - ltree \
1171 oid2name \
1172 - pageinspect \
1173 - pg_buffercache \
1174 - pg_freespacemap \
1175 - pg_standby \
1176 - pg_trgm \
1177 pgbench \
1178 - pgcrypto \
1179 - pgrowlocks \
1180 - pgstattuple \
1181 - seg \
1182 - spi \
1183 - tablefunc \
1184 - test_parser \
1185 - tsearch2 \
1186 vacuumlo
1187
1188 -ifeq ($(with_openssl),yes)
1189 -WANTED_DIRS += sslinfo
1190 -endif
1191
1192 ifeq ($(with_ossp_uuid),yes)
1193 WANTED_DIRS += uuid-ossp
1194 === src/Makefile
1195 ==================================================================
1196 --- src/Makefile (revision 2)
1197 +++ src/Makefile (local)
1198 @@ -15,16 +15,11 @@
1199
1200 all install installdirs uninstall distprep:
1201 $(MAKE) -C port $@
1202 - $(MAKE) -C timezone $@
1203 $(MAKE) -C backend $@
1204 - $(MAKE) -C backend/utils/mb/conversion_procs $@
1205 - $(MAKE) -C backend/snowball $@
1206 $(MAKE) -C include $@
1207 $(MAKE) -C interfaces $@
1208 $(MAKE) -C bin $@
1209 - $(MAKE) -C pl $@
1210 $(MAKE) -C makefiles $@
1211 - $(MAKE) -C test/regress $@
1212
1213 install: install-local
1214
1215 === src/backend/Makefile
1216 ==================================================================
1217 --- src/backend/Makefile (revision 2)
1218 +++ src/backend/Makefile (local)
1219 @@ -34,7 +34,7 @@
1220
1221 ##########################################################################
1222
1223 -all: submake-libpgport postgres $(POSTGRES_IMP)
1224 +all: someheaders
1225
1226 ifneq ($(PORTNAME), cygwin)
1227 ifneq ($(PORTNAME), win32)
1228 @@ -107,8 +107,7 @@
1229
1230 .PHONY: $(DIRS:%=%-recursive)
1231 # Update the commonly used headers before building the subdirectories
1232 -$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
1233 - $(MAKE) -C $(subst -recursive,,$@) all
1234 +someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
1235
1236
1237 # The postgres.o target is needed by the rule in Makefile.global that
1238 @@ -155,23 +154,7 @@
1239
1240 ##########################################################################
1241
1242 -install: all installdirs install-bin
1243 -ifeq ($(PORTNAME), cygwin)
1244 -ifeq ($(MAKE_DLL), true)
1245 - $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
1246 -endif
1247 -endif
1248 -ifeq ($(PORTNAME), win32)
1249 -ifeq ($(MAKE_DLL), true)
1250 - $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
1251 -endif
1252 -endif
1253 - $(MAKE) -C catalog install-data
1254 - $(MAKE) -C tsearch install-data
1255 - $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
1256 - $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
1257 - $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
1258 - $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
1259 +install:
1260
1261 install-bin: postgres $(POSTGRES_IMP) installdirs
1262 $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
1263 === src/bin/Makefile
1264 ==================================================================
1265 --- src/bin/Makefile (revision 2)
1266 +++ src/bin/Makefile (local)
1267 @@ -13,8 +13,8 @@
1268 top_builddir = ../..
1269 include $(top_builddir)/src/Makefile.global
1270
1271 -DIRS = initdb ipcclean pg_ctl pg_dump \
1272 - psql scripts pg_config pg_controldata pg_resetxlog
1273 +DIRS = pg_dump \
1274 + psql scripts pg_config
1275 ifeq ($(PORTNAME), win32)
1276 DIRS+=pgevent
1277 endif
1278 === src/include/pg_config_manual.h
1279 ==================================================================
1280 --- src/include/pg_config_manual.h (revision 2)
1281 +++ src/include/pg_config_manual.h (local)
1282 @@ -184,7 +184,7 @@
1283 * here's where to twiddle it. You can also override this at runtime
1284 * with the postmaster's -k switch.
1285 */
1286 -#define DEFAULT_PGSOCKET_DIR "/tmp"
1287 +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
1288
1289 /*
1290 * The random() function is expected to yield values between 0 and
1291
1292
1293
1294 1.1 dev-db/postgresql-base/files/postgresql-7.4-common.patch
1295
1296 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4-common.patch?rev=1.1&view=markup
1297 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4-common.patch?rev=1.1&content-type=text/plain
1298
1299 Index: postgresql-7.4-common.patch
1300 ===================================================================
1301 diff --git a/config/programs.m4 b/config/programs.m4
1302 index fb9793f..3510942 100644
1303 --- a/config/programs.m4
1304 +++ b/config/programs.m4
1305 @@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
1306 dnl FIXME: We should probably check for version >=0.10.36.
1307 AC_CHECK_PROGS(XGETTEXT, xgettext)
1308
1309 - # Note: share/locale is always the default, independent of $datadir
1310 - localedir='${prefix}/share/locale'
1311 + # Note: share/locale *WAS* always the default, independent of $datadir
1312 + AC_ARG_WITH([locale-dir],
1313 + AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
1314 + [ localedir="${withval}" ],
1315 + [ localedir='${prefix}/share/locale' ]
1316 + )
1317 AC_SUBST(localedir)
1318 ])# PGAC_CHECK_GETTEXT
1319
1320 diff --git a/configure.in b/configure.in
1321 index 908a1ae..30dd3bb 100644
1322 --- a/configure.in
1323 +++ b/configure.in
1324 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1325
1326 AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs@××××××××××.org])
1327
1328 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
1329 -Untested combinations of 'autoconf' and PostgreSQL versions are not
1330 -recommended. You can remove the check from 'configure.in' but it is then
1331 -your responsibility whether the result works or not.])])
1332 AC_COPYRIGHT([Copyright (c) 1996-2006, PostgreSQL Global Development Group])
1333 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
1334 AC_CONFIG_AUX_DIR(config)
1335 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
1336 index 23f4cc9..707c303 100644
1337 --- a/src/include/storage/s_lock.h
1338 +++ b/src/include/storage/s_lock.h
1339 @@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
1340
1341 #endif /* __s390__ || __s390x__ */
1342
1343 +#if defined(__sh__)
1344 +#define HAS_TEST_AND_SET
1345 +
1346 +typedef unsigned char slock_t;
1347 +
1348 +#define TAS(lock) tas(lock)
1349 +
1350 +static __inline__ int
1351 +tas(volatile slock_t *lock)
1352 +{
1353 + register int _res = 1;
1354 +
1355 + __asm__ __volatile__(
1356 + "tas.b @%1\n\t"
1357 + "movt %0\n\t"
1358 + "xor #1,%0"
1359 +: "=z"(_res)
1360 +: "r"(lock)
1361 +: "t","memory");
1362 + return _res;
1363 +}
1364 +
1365 +#endif /* __sh__ */
1366
1367 #if defined(__sparc__) /* Sparc */
1368 #define HAS_TEST_AND_SET
1369 diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
1370 index 9f761d4..83b2974 100644
1371 --- a/src/makefiles/Makefile.darwin
1372 +++ b/src/makefiles/Makefile.darwin
1373 @@ -5,7 +5,15 @@ DLSUFFIX = .so
1374 CFLAGS_SL =
1375
1376 ifdef PGXS
1377 +ifdef PGXS_IN_SERVER
1378 +ifndef PGXS_WITH_SERVER
1379 +BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
1380 +else
1381 +BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
1382 +endif
1383 +else
1384 BE_DLLLIBS= -bundle_loader $(bindir)/postgres
1385 +endif
1386 else
1387 BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
1388 endif
1389
1390
1391
1392 1.1 dev-db/postgresql-base/files/postgresql-8.3-common.patch
1393
1394 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.3-common.patch?rev=1.1&view=markup
1395 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.3-common.patch?rev=1.1&content-type=text/plain
1396
1397 Index: postgresql-8.3-common.patch
1398 ===================================================================
1399 diff --git a/config/programs.m4 b/config/programs.m4
1400 index 9434113..d72b35c 100644
1401 --- a/config/programs.m4
1402 +++ b/config/programs.m4
1403 @@ -202,8 +202,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
1404 dnl FIXME: We should probably check for version >=0.10.36.
1405 AC_CHECK_PROGS(XGETTEXT, xgettext)
1406
1407 - # Note: share/locale is always the default, independent of $datadir
1408 - localedir='${prefix}/share/locale'
1409 + # Note: share/locale *WAS* always the default, independent of $datadir
1410 + AC_ARG_WITH([locale-dir],
1411 + AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
1412 + [ localedir="${withval}" ],
1413 + [ localedir='${prefix}/share/locale' ]
1414 + )
1415 AC_SUBST(localedir)
1416 ])# PGAC_CHECK_GETTEXT
1417
1418 diff --git a/configure.in b/configure.in
1419 index 58cc61c..07ffc38 100644
1420 --- a/configure.in
1421 +++ b/configure.in
1422 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1423
1424 AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs@××××××××××.org])
1425
1426 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
1427 -Untested combinations of 'autoconf' and PostgreSQL versions are not
1428 -recommended. You can remove the check from 'configure.in' but it is then
1429 -your responsibility whether the result works or not.])])
1430 AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
1431 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
1432 AC_CONFIG_AUX_DIR(config)
1433 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
1434 index 7d9448f..07799bc 100644
1435 --- a/src/include/storage/s_lock.h
1436 +++ b/src/include/storage/s_lock.h
1437 @@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
1438
1439 #endif /* __s390__ || __s390x__ */
1440
1441 +#if defined(__sh__)
1442 +#define HAS_TEST_AND_SET
1443 +
1444 +typedef unsigned char slock_t;
1445 +
1446 +#define TAS(lock) tas(lock)
1447 +
1448 +static __inline__ int
1449 +tas(volatile slock_t *lock)
1450 +{
1451 + register int _res = 1;
1452 +
1453 + __asm__ __volatile__(
1454 + "tas.b @%1\n\t"
1455 + "movt %0\n\t"
1456 + "xor #1,%0"
1457 +: "=z"(_res)
1458 +: "r"(lock)
1459 +: "t","memory");
1460 + return _res;
1461 +}
1462 +
1463 +#endif /* __sh__ */
1464
1465 #if defined(__sparc__) /* Sparc */
1466 #define HAS_TEST_AND_SET
1467 diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
1468 index 9f761d4..83b2974 100644
1469 --- a/src/makefiles/Makefile.darwin
1470 +++ b/src/makefiles/Makefile.darwin
1471 @@ -5,7 +5,15 @@ DLSUFFIX = .so
1472 CFLAGS_SL =
1473
1474 ifdef PGXS
1475 +ifdef PGXS_IN_SERVER
1476 +ifndef PGXS_WITH_SERVER
1477 +BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
1478 +else
1479 +BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
1480 +endif
1481 +else
1482 BE_DLLLIBS= -bundle_loader $(bindir)/postgres
1483 +endif
1484 else
1485 BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
1486 endif
1487
1488
1489
1490 1.1 dev-db/postgresql-base/files/postgresql-7.4.19-autoconf.patch
1491
1492 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4.19-autoconf.patch?rev=1.1&view=markup
1493 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4.19-autoconf.patch?rev=1.1&content-type=text/plain
1494
1495 Index: postgresql-7.4.19-autoconf.patch
1496 ===================================================================
1497 diff --git a/config/programs.m4 b/config/programs.m4
1498 index ae3b91a..6af24d2 100644
1499 --- a/config/programs.m4
1500 +++ b/config/programs.m4
1501 @@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
1502 dnl FIXME: We should probably check for version >=0.10.36.
1503 AC_CHECK_PROGS(XGETTEXT, xgettext)
1504
1505 - # Note: share/locale is always the default, independent of $datadir
1506 - localedir='${prefix}/share/locale'
1507 - if test x"$prefix" = x"NONE"; then
1508 - exp_localedir="$ac_default_prefix/share/locale"
1509 - else
1510 - exp_localedir="$prefix/share/locale"
1511 - fi
1512 + # Note: share/locale *WAS* always the default, independent of $datadir
1513 + AC_ARG_WITH([locale-dir],
1514 + AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
1515 + [ localedir="${withval}" ],
1516 + [ localedir='${prefix}/share/locale' ]
1517 + )
1518 + exp_localedir="${localedir}"
1519
1520 AC_SUBST(localedir)
1521 AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
1522 diff --git a/configure.in b/configure.in
1523 index f7bdec3..c8b5b7e 100644
1524 --- a/configure.in
1525 +++ b/configure.in
1526 @@ -19,17 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1527 dnl
1528 dnl The GNU folks apparently haven't heard that some people don't use
1529 dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
1530 -m4_define([info], [doc])
1531 -m4_define([infodir], [docdir])
1532 AC_INIT([PostgreSQL], [7.4.19], [pgsql-bugs@××××××××××.org])
1533 -m4_undefine([infodir])
1534 -m4_undefine([info])
1535 -AC_SUBST(docdir)
1536 -
1537 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.59 is required.
1538 -Untested combinations of 'autoconf' and PostgreSQL versions are not
1539 -recommended. You can remove the check from 'configure.in' but it is then
1540 -your responsibility whether the result works or not.])])
1541 +
1542 AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])
1543 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
1544 AC_CONFIG_AUX_DIR(config)
1545
1546
1547
1548 1.1 dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch
1549
1550 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch?rev=1.1&view=markup
1551 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch?rev=1.1&content-type=text/plain
1552
1553 Index: postgresql-8.x-relax_ssl_perms.patch
1554 ===================================================================
1555 diff -ur postgresql-8.0.15.orig/src/backend/libpq/be-secure.c postgresql-8.0.15/src/backend/libpq/be-secure.c
1556 --- postgresql-8.0.15.orig/src/backend/libpq/be-secure.c 2008-02-21 04:06:04.334289203 +0100
1557 +++ postgresql-8.0.15/src/backend/libpq/be-secure.c 2008-02-21 04:08:47.309426324 +0100
1558 @@ -737,8 +737,8 @@
1559 * data directory permission check in postmaster.c)
1560 */
1561 #if !defined(WIN32) && !defined(__CYGWIN__)
1562 - if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IRWXG | S_IRWXO)) ||
1563 - buf.st_uid != geteuid())
1564 + if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IWGRP | S_IRWXO)) ||
1565 + (buf.st_uid != geteuid()) && buf.st_uid != 0)
1566 ereport(FATAL,
1567 (errcode(ERRCODE_CONFIG_FILE_ERROR),
1568 errmsg("unsafe permissions on private key file \"%s\"",
1569
1570
1571
1572 --
1573 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups