Architecture specific change in rpms/lldb.git
by githook-noreply@fedoraproject.org
The package rpms/lldb.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/lldb.git/commit/?id=43ce403290681....
Change:
+ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
Thanks.
Full change:
============
commit 43ce403290681e6c7cd0f6e25fb660739149605d
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Thu Aug 9 14:43:32 2018 +0000
Enable ppc64le arch
diff --git a/lldb.spec b/lldb.spec
index b8390ef..ff87a4a 100644
--- a/lldb.spec
+++ b/lldb.spec
@@ -1,13 +1,13 @@
Name: lldb
Version: 6.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Next generation high-performance debugger
License: NCSA
URL: http://lldb.llvm.org/
Source0: http://llvm.org/releases/%{version}/%{name}-%{version}%{?rc_ver:rc%{rc_ve...
-ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
+ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
BuildRequires: cmake
BuildRequires: llvm-devel = %{version}
@@ -115,6 +115,9 @@ rm -f %{buildroot}%{python2_sitearch}/six.*
%{python2_sitearch}/lldb
%changelog
+* Tue Aug 07 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.1-3
+- Enable ppc64le arch
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 9 months
[Report] Packages Restricting Arches
by root
List of packages currently excluding arches (2631)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- LuxRender
ExclusiveArch: x86_64
- OpenTK
ExclusiveArch: %mono_arches
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GPRbuild_arches}
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: x86_64 %{ix86} %{arm}
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- atomic
ExclusiveArch: %{go_arches}
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- banshee
ExclusiveArch: %{mono_arches}
- banshee-community-extensions
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
- bareftp
ExclusiveArch: %{mono_arches}
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64}
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- beignet
ExclusiveArch: x86_64 %{ix86}
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- boo
ExclusiveArch: %{mono_arches}
- buildah
ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x
- bwa
ExclusiveArch: x86_64
- caddy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}
- cadvisor
ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64
- carto
ExclusiveArch: %{nodejs_arches} noarch
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- compat-gcc-296
ExclusiveArch: %{ix86} ia64 ppc
- consul
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- containerd
ExclusiveArch: %{go_arches}
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-api
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-dbus-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-gir-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- derelict
ExclusiveArch: %{ldc_arches}
- direnv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: %ix86 x86_64 aarch64
- docco
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- docker
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-anaconda-addon
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- docker-latest
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- dolphin-emu
ExclusiveArch: x86_64 armv7l aarch64
- douceur
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dustmite
ExclusiveArch: %{ldc_arches}
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc ppc64
- e3
ExclusiveArch: %{ix86} x86_64
- edac-utils
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- edb
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elasticdump
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- embree
ExclusiveArch: x86_64
- embree2
ExclusiveArch: x86_64
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- exciting
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- exercism
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- expresso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fedora-gnat-project-common
ExclusiveArch: noarch %{GNAT_arches}
- fence-virt
ExclusiveArch: i686 x86_64
- fes
ExclusiveArch: x86_64
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluxcapacitor
ExclusiveArch: %{ix86} x86_64 %{arm}
- fpc
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
- freshmaker
ExclusiveArch: %{ix86} x86_64
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fst
ExclusiveArch: i686
- fwts
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64}
- fwupdate
ExclusiveArch: %{efi}
- ga
ExclusiveArch: %{ix86} x86_64
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gela-asis
ExclusiveArch: %GPRbuild_arches
- ghdl
ExclusiveArch: %{GNAT_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-lfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- gl3n
ExclusiveArch: %{ldc_arches}
- glibc32
ExclusiveArch: x86_64 ppc64 s390x
- glusterd2
ExclusiveArch: %{go_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %GPRbuild_arches
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- gnu-smalltalk
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-i18n
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godotenv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gofed
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- golang
ExclusiveArch: %{golang_arches}
- golang-bitbucket-kardianos-osext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-deepin-dbus-factory
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-deepin-go-lib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-10gen-openssl
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- golang-github-AudriusButkevicius-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-go-nat-pmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-pfilter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-BurntSushi-freetype-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-graphics-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-toml-test
ExclusiveArch: %{go_arches}
- golang-github-BurntSushi-xgb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-xgbutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Jeffail-gabs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-goquery
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-purell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-urlesc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-RangelReale-osin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-RangelReale-osincli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-SeanDolphin-bqschema
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-SermoDigital-jose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-Shopify-sarama
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Shopify-toxiproxy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-assert
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-chroma
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-alecthomas-colour
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-kingpin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-repr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-template
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-units
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-andybalholm-cascadia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-armon-go-proxyproto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-asaskevich-govalidator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-auth0-go-jwt-middleware
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-axgle-mahonia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bep-gitmap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bep-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bgentry-go-netrc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bkaradzic-go-lz4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-boombuler-barcode
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-buger-jsonparser
ExclusiveArch: %{go_arches} noarch
- golang-github-calmh-du
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-luhn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ccding-go-stun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cespare-xxhash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chaseadamsio-goorgeous
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cheekybits-is
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-chmduquesne-rollinghash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chrismalek-oktasdk-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-client9-gospell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cockroachdb-cockroach-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codahale-aesnicheck
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codegangsta-negroni
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-etcd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cryptix-wav
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cznic-b
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-fileutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-golex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-internal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lexer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lldb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-mathutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-ql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-sortutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-strutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-zappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-d4l3k-messagediff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-danwakefield-fnmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-cssmin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-siphash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-disintegration-imaging
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-dlclark-regexp2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-docker-libkv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docopt-docopt-go
ExclusiveArch: %{go_arches}
- golang-github-duosecurity-duo_api_golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-edsrzf-mmap-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-eknkc-amber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-endophage-gotuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-color
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-structs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-flynn-go-shlex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fortytw2-leaktest
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsnotify-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsouza-go-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fullsailor-pkcs7
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-git-lfs-wildmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-glacjay-goini
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-errors-errors
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-macaron-inject
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-go-mgo-mgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-tomb-tomb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gobuffalo-envy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gobwas-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gocql-gocql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-cmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-goraft-raft
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-css
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gosexy-gettext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hailocab-go-hostpool
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-hclog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-plugin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-rootcerts
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-howeyc-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-inconshreveable-go-vhost
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-influxdb-influxdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jackpal-gateway
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-prose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-syllables
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jefferai-jsonx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-justinas-alice
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-cpuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-knieriem-markdown
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kyokomi-emoji
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-linuxdeepin-go-x11-client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lpabon-godbc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-markbates-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-colorable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-ansi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-logxi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-michaelklishin-rabbit-hole
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-miekg-mmark
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-milochristiansen-axis2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-lua
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-minio-sha256-simd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-go-testing-interface
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-goamz
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-montanaflynn-stats
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-msteinert-pam
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-muesli-smartcrop
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mvo5-goconfigparser
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mvo5-uboot-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-neurosnap-sentences
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-nfnt-resize
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-noahdesu-go-ceph
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ojii-gettext.go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-opencontainers-specs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-openshift-go-json-rest
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-go-systemd
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-openshift-sdn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-oschwald-geoip2-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-oschwald-maxminddb-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-patrickmn-go-cache
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-paulrosania-go-charset
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-petermattis-goid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pquerna-otp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-prometheus-prometheus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rackspace-gophercloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rakyll-globalconf
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rakyll-pb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-rakyll-statik
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rasky-go-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-remeh-sizedwaitgroup
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-remyoudompheng-bigfft
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-ryanuber-go-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-samuel-go-zookeeper
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-sasha-s-go-deadlock
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-seccomp-libseccomp-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sergi-go-diff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sethgrid-pester
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shiena-ansicolor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shogo82148-go-shuffle
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shurcooL-sanitized_anchor_name
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-skarademir-naturalsort
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skratchdot-open-golang
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skynetservices-skydns
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-assertions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-smartystreets-go-aws-auth
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-goconvey
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spacejam-loghisto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spacemonkeygo-openssl
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x}
- golang-github-spaolacci-murmur3
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-afero
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-fsync
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-nitro
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sstarcher-go-okta
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stathat-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-stevvooe-resumable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-streadway-amqp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stretchr-objx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-syndtr-gocapability
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-goleveldb
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-gosnappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-templexxx-cpufeat
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-xor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tent-http-link-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-thejerf-suture
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tjfoc-gmsm
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tonnerre-golang-pretty
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-urfave-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vaughan0-go-ini
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-vbatts-tar-split
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vishvananda-netlink
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}}
- golang-github-vishvananda-netns
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vitrun-qart
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vjeantet-asn1-ber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vmware-govcloudair
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-wsxiaoys-terminal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonpointer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonreference
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonschema
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xiang90-probing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-xrash-smetrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-smux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-ace
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-gohtml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yvasiyarov-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-gorelic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-newrelic_platform_go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-zillode-notify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gcfg
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-go-decimal-inf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-go-exp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-googlecode-log4go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-sqlite
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-uuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-go-check-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-go-macaroon-macaroon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-retry-v1
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-torproject-pluggable-transports-goptlib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golint
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotags
ExclusiveArch: %{go_arches}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- gsf-sharp
ExclusiveArch: %mono_arches
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- heketi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- hsakmt
ExclusiveArch: x86_64 aarch64
- hub
ExclusiveArch: %{go_arches}
- hugo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- icaro
ExclusiveArch: %{ix86} %{arm} x86_64 noarch
- ignition
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- ikarus
ExclusiveArch: %{ix86}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- insect
ExclusiveArch: %{nodejs_arches} noarch
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- ioport
ExclusiveArch: %{ix86} x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: %{arm} %{ix86} x86_64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iwyu
ExclusiveArch: %{ix86} x86_64
- ixpdimm_sw
ExclusiveArch: x86_64
- jake
ExclusiveArch: %{nodejs_arches} noarch
- jasmine-node
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- josm
ExclusiveArch: %{ix86} x86_64
- julia
ExclusiveArch: %{ix86} x86_64
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kosmtik
ExclusiveArch: %{nodejs_arches} noarch
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- latrace
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- lazarus
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libflatarray
ExclusiveArch: %{ix86} x86_64
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libmfx
ExclusiveArch: %{ix86} x86_64
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- librtas
ExclusiveArch: %{power64}
- libseccomp
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lldb
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- lodash
ExclusiveArch: %{nodejs_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maven-eclipse-plugin
ExclusiveArch: %{ix86} x86_64
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mnemosyne
ExclusiveArch: noarch %{qt5_qtwebengine_arches}
- mocha
ExclusiveArch: %{nodejs_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mongo-tools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- mongodb
ExclusiveArch: %{upstream_arches}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-debugger
ExclusiveArch: %ix86 x86_64
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nacl-arm-binutils
ExclusiveArch: x86_64
- nacl-binutils
ExclusiveArch: x86_64
- nacl-gcc
ExclusiveArch: x86_64
- nacl-newlib
ExclusiveArch: x86_64
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nim
ExclusiveArch: %{nim_arches}
- nini
ExclusiveArch: %{mono_arches}
- node-gyp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-Base64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-abbrev
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-accepts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-acorn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-acorn-dynamic-import
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-acorn-jsx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-add-stream
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-after
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-agent-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-agentkeepalive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ain2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-align-text
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-alter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgcyan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bggreen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgmagenta
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgwhite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgyellow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-black
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-blue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bold
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-cyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-dim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-escapes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-font
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-gray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-green
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-grey
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-hidden
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-inverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-italic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-magenta
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-red
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-reset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-strikethrough
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-styles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-underline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-white
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-wrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-yellow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansicolors
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansidiff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansistyles
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-any-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-any-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-field
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aproba
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-are-we-there-yet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-argparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-argsparser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-exclude
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-union
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-buffer-from-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-differ
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-find
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-find-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-foreach
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-ify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-uniq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-unique
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arraybuffer-dot-slice
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arraybuffer-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arrify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-as-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ascii-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ascli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-asn1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assert-plus
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assertion-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assume
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ast-traverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ast-types
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-astral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-angular-annotate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-pass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-async-arrays
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-limiter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-queue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-some
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asynckit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-atob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-auto-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-autoresolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ava-init
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aws-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws-sign2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws4
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-code-frame
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-messages
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-plugin-syntax-async-functions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-plugin-syntax-async-generators
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-runtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-babylon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-backoff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-balanced-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-option
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-plugins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base32-encode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-arraybuffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64id
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-basic-auth-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-batch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bcrypt
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-bcryptjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-beeper
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-benchmark
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-than-before
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bignumber-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bind-obj-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bindings
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bit-mask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-blob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-block-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bluebird
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-body-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boolbase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-brace-expansion
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-braces
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-breakable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-browser-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-browser-stdout
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buf-compare
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-crc32
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-shims
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffer-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffertools
ExclusiveArch: %{nodejs_arches}
- nodejs-bufferutil
ExclusiveArch: %{nodejs_arches}
- nodejs-builtin-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-builtins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bundle-dependencies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-burrito
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-busboy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-byline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cache-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caching-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-call-delayed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-matcher
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-me-maybe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-callback-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsites
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camel-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caniuse-db
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-capture-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-carrier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caseless
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-center-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-as-promised
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-cheerio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-connect-middleware
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-json-schema
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-oauth2orize-grant
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-spies-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainsaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chalk
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-change-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-char-spinner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-character-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charenc
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-check-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cheerio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-child-process-close
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chmodr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chownr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chroma-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chrono
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ci-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-circular-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjson
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-class-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clean-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clean-yaml-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clear-require
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-spinner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cliui
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-stats
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-closure-compiler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-co-with-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-code-point-at
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-coffee-coverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-collection-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-collections
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-color-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colour
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-columnify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-combined-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commander
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-common-path-prefix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commondir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-commoner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commonmark
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compare-func
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compare-versions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-inherit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compress-commons
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compressible
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compression
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-map
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-config-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-livereload
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-console-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-console-dot-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-console-group
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-consolemd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constant-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constantinople
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-disposition
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-conventional-changelog-angular
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-atom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-core
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-conventional-changelog-ember
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-eslint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-express
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jquery
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jscs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-preset-loader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-filter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-recommended-bump
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-hex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-jar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookiejar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-copy-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-core-assert
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-util-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-couch-login
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coveralls
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-crc
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crc32-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-create-error-class
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cross-spawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cross-spawn-async
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crypt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cryptiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csrf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-select
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-what
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csscomb-core
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cssom
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csurf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-generate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-spectrum
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ctype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-currently-unhandled
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cycle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cyclist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-d
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dargs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dashdash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-data-uri-to-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-date-now
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dateformat
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-death
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-debug-fabulous
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debuglog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-decamelize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decamelize-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decimal-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decompress-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dedent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-eql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deep-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-default-require-extensions
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-default-resolution
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defaults
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defence
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defence-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-properties
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defined
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-degenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-del
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delayed-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-delegates
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delete
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dep-graph
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-depd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deprecated
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-newline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detective
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dezalgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dirty-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-docopt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-doctrine
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dom-serializer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domelementtype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domutils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-prop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dotfile-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dreamopt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dryice
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dtree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-duplexer3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duration
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ebnf-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-echomd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ecstatic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-editor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ee-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-emojione
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-empty-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encodeurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encoding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-end-of-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-entities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-ex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errorhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-abstract
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-to-primitive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es5-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es5-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-iterator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-promisify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-set
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escallmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-html
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-regexp-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escape-string-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escodegen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escope
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower-location-detector
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-fb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-harmony-jscs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espurify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esrecurse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse-fb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estree-walker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esutils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-etag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-event-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-event-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eventemitter2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-eventemitter3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-everything-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-execa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-exit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-brackets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-tilde
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extended-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extsprintf
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eyes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fake
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fancy-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-far
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fast-levenshtein
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fastfall
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-faucet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-faye-websocket
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fd-slicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fg-lodash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-figures
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-file-entry-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-sync-cmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-uri-to-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-filed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filelist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filename-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fileset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fill-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fill-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-finalhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-find-cache-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-find-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-findup-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-first-chunk-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flagged-respawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flat-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-flush-write-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fmix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-dot-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow-redirects
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-for-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-for-in
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-for-own
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-foreach
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-foreground-child
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forever-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-form-data
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-formatio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-formidable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forwarded
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fragment-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-freetree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fresh
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-from2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-dot-notify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-cached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fs-ext
ExclusiveArch: %{nodejs_arches}
- nodejs-fs-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-temp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-vacuum
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-write-stream-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-ignore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-npm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ftp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-function-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-function-loop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gauge
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gaze
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gdal
ExclusiveArch: %{nodejs_arches}
- nodejs-generate-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generate-object-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-pkg-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stdin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-uri
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-getobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gettext-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-dummy-commit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-raw-commits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-remote-origin-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-semver-tags
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-tails
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gitconfiglocal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-username-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-expand
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-parent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-global-modules
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-global-prefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globby
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globule
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glogg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gnode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gonzales-pe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-got
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-readlink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-growl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-angular-templates
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-banner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-cli
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-compare-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-clean
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-concat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-cssmin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-htmlmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-internal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-less
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-requirejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-uglify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-watch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-git-authors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-html-validation
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-init
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-known-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-lib-contrib
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-sed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-simple-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-process
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulp-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulp-ng-classify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulp-util
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gzip-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-handle-thing
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-handlebars
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-har-validator
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-flag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-unicode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-yarn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hash_file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hawk
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-he
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-heap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hex-to-array-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-highlight-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-historic-readline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hoek
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-homedir-polyfill
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hook-std
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hooker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hosted-git-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hsluv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-html-minifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-htmlparser2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-deceiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-errors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-signature
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-https-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-humanize-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-i18n-transform
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i2c
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv-lite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-iferr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ignore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-immutable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-import-local
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-imul
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-imurmurhash
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-indent-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-infinity-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inflight
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-info-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-inherits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherits1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ini
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-init-package-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inline-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-install
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-int64-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-intercept-require
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-interpret
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-into-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-invert-kv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ip
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ipaddr-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-irc-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-irregular-plurals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-accessor-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrayish
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-boolean-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-builtin-module
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-callable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-data-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-date-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-dotfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-equal-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-extendable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-finite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-fullwidth-code-point
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-generator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-module
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-my-json-valid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-negated-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-number
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-number-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-odd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-path-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-in-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-inside
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-plain-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-plain-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-primitive
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-redirect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-registered
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-relative
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-retry-allowed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-subset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-text-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-typedarray
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-unc-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-valid-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-valid-instance
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-windows
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-isexe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-iso8601
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isodate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-coverage
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-hook
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-report
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-source-maps
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-reports
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jade
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-growl-reporter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-reporters
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jest-mock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison-lex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jju
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joose
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-namespace-depended
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-simplerequest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-base64
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-string-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-js-tokens
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-yaml
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jschardet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jscoverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-localizer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-better-errors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-helpfulerror
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stable-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stringify-safe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer-dot-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonselect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jwt-simple
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keep-alive-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-keygrip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keypress
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-kind-of
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-klaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-kuler2gpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-latest-version
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazy-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazystream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lcid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lcov-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-leaflet
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-formbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-hash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leche
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-left-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-levn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lex-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-libpq
ExclusiveArch: %{nodejs_arches}
- nodejs-libxmljs
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-line-numbers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-line-reader
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linkify-it
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-grunt-tasks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-locate-character
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-locate-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lockfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-log-driver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-ok
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-symbols
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lolex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-longest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loophole
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loud-rejection
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lower-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lowercase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ltx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-magic-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-make-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-generator-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makeerror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik
ExclusiveArch: %{nodejs_arches}
- nodejs-mapnik-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik-vector-tile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-markdown
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-markdown-it-testgen
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-matched
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-max-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-maxmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mbtiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-md5
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-hex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-o-matic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mdn-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mdurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-media-typer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoizee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-memwatch-next
ExclusiveArch: %{nodejs_arches}
- nodejs-meow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-merge-descriptors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-merge-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-metascript
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-method-override
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-micromatch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-millstone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mime-db
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mimeparse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mimic-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimalistic-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-minimist-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minipass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minstache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkdirp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkfiletree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-bin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-modify-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-module-not-found-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-moment
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-moment-timezone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb-core
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-monocle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-morgan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-muffin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-multimatch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiparty
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multipipe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-murmur-32
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mustache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mutate-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mute-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mysql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mz
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nan0
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nanomatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nanoseconds
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-native-or-bluebird
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ncp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-needle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-negotiator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nested-error-stacks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-net-browserify-alt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-netmask
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-next-tick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ng-classify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-dot-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-expat
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-node-int64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-print
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-static
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-status-codes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-stringprep
ExclusiveArch: %{nodejs_arches}
- nodejs-node-uuid
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nomnom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-noncharacters
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt-usage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-noptify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-normalize-git-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-package-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-cache-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-install-checks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-package-arg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-run-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-user-validate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npmlog
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-api
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-audit-shrinkwrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nth-check
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-number-is-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-numeral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth2orize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-assign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-dot-entries
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-omit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-pick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-observable-to-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-obuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-okay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-finished
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-headers
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-once
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-onetime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-only-shallow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opal-runtime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opener
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opn
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optionator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-orchestrator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ordered-read-streams
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-os-homedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-locale
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-tmpdir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-osenv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-output-file-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-own-or
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-own-or-env
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-finally
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-locate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pac-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pac-resolver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packet-reader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pad-left
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-paperboy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parallel-transform
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-param-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-github-repo-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parse-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-passwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parsejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseqs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parserlib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parseuri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pascal-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pascalcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-http-bearer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2-client-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-array
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-dirname
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-exists
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-inside
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-key
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pathval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pause
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pause-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pbkdf2-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pedding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pegjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pem
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-connection-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-cursor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-int8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-native
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pgpass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkg-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkginfo
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-platform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-plur
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portfinder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-posix-character-classes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-posix-getopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-bytea
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-date
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-interval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-precond
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-prelude-ls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prepend-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-preserve
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-hrtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pretty-time
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-private
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-process-nextick-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proclaim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promises-aplus-tests
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-prompt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promzard
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-propagate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-propget
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proto-list
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy-addr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxyquire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pruddy-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pseudomap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pubcontrol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pump
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pumpify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-q
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-q-io
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qtdatastream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-queue-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-quick-lru
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qunit-extras
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qunitjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rainbowsocks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-random-bytes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-random-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-randomatic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-range-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-raw-body
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rc
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-re-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-all-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-dir-files
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-installed
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-json-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-tree
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readable-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-readdir-enhanced
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdir-scoped-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdirp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-realize-package-specifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-recast
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rechoir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-redent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reduce-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-regex-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regex-not
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-registry-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-relateurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-remove-trailing-separator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repeat-element
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeat-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeating
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-requestretry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-cs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-require-directory
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-inject
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-main-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-relative
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-uncached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-yaml
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requirejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requires-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-cwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-pkg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-response-time
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resumer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ret
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-retry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reusify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-revalidator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rewire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rfile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rhea
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-right-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rimraf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rndm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rollup
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rollup-plugin-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-commonjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-node-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-pluginutils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ronn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-run-parallel-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-runforcover
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safe-json-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safecb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-samsam
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sauce-tunnel
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sax
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-scmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-secure-random
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seedrandom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-select-hose
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-semver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-send
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sentence-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sentiment
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sequencify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serialize-error
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-static
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-server-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-blocking
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-getter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-set-immediate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-immediate-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-setimmediate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-setprototypeof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sha
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shallow-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-command
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shelljs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-shelljs-nodecli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-format
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-showdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sigmund
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-signal-exit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-silent-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-asyncify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-fmt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-single-line-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon-chai
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sinon-restore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slash
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sliced
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slide
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-smart-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-snake-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture-set
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snockets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sntp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-socket-dot-io-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-socks-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-socks-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sort-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sorted-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-fixtures
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sparkles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-spawn-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spawn-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-correct
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-exceptions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-expression-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-license-ids
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spec
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spec-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-speedometer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sqlite3
ExclusiveArch: %{nodejs_arches}
- nodejs-srs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ssri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-st
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-utils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-static-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-static-favicon
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-statuses
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-std-mocks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-combiner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-consume
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-counter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-pair
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-reduce
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-replace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-shift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-spigot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-streamsearch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamsink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamtest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-repeat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-trim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string-width
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string_decoder
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringmap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-ansi
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-bom-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-color
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-eof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-json-comments
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strong-log-transformer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strscanner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stylus
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-success-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent-proxy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-supertest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supports-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-suspend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-swap-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-symbol-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-mocha-reporter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-out
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-spec
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tapes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-pack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp-write
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tempfile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temporary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-cordovajs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-liferay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-terst
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-test
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-test-exclude
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testdata-w3c-json-form
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testswarm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testutil
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-extensions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-thenify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thenify-all
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-through2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through2-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thunkify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tildify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tilejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive-mapnik
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tiletype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-diff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-stamp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-timed-out
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timekeeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timers-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tiny-lr-fork
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tippex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-title-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tlds
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-absolute-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-object-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-regex-range
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-touch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tough-cookie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tracejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-transformers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-traverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-treeify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tressa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-trim-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim-off-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trivial-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-try-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-try-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tryor
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tsame
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tslib
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tsscmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ttembed-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tunnel-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tv4
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-check
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-type-detect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-name
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-typeahead.js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typedarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uc-dot-micro
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uglify-to-browserify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uid-safe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ultron
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-umask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unc-path-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore-dot-logger
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unicode-length
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unique-filename
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-slug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unpipe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unset-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uri-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-urix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-join
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-parse-lax
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-use
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-user-home
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utfx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-deprecate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utilities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utils-merge
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uuid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vali-date
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-validate-npm-package-license
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-validate-npm-package-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vasync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-verror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vhost
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vinyl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vlq
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vow-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vows
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-w3cjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walkdir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walker
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ware
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-warning-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-watchit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-watershed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wbuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wcwidth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-websocket-driver
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-when
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-whet-dot-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-which
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-win-spawn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-window-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-winston
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-with
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wolfy87-eventemitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-woothee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wordwrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrap-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wrap-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrappy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-write-file-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ws
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xdg-basedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xml2js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmldom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlhttprequest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlhttprequest-ssl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xregexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-xtend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-y18n
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yallist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yapool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yargs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yargs-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yarn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yauzl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yeast
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zip-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zipfile
ExclusiveArch: %{nodejs_arches}
- nodejs-zlib-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zlibjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: %{ix86} x86_64
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64
- nwchem
ExclusiveArch: x86_64 %{ix86}
- obfs4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-kvm-hook
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-register-machine
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- ocitools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- odcs
ExclusiveArch: %{ix86} x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-powerd
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- onedrive
ExclusiveArch: %{ldc_arches}
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: %{ix86} x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openmx
ExclusiveArch: x86_64 %{ix86}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openssl-ibmca
ExclusiveArch: s390 s390x
- openvswitch
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- paflib
ExclusiveArch: ppc %{power64}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdfmod
ExclusiveArch: %mono_arches
- peripety
ExclusiveArch: %{rust_arches}
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: i686 x86_64 ia64 aarch64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plv8
ExclusiveArch: %v8_arches
- pocl
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- podman
ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- publican-jboss
ExclusiveArch: i686 x86_64
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- python-afl
ExclusiveArch: %{ix86} x86_64
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: %{openblas_arches}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- reg
ExclusiveArch: x86_64
- renderdoc
ExclusiveArch: %{ix86} x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rkt
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- rocm-runtime
ExclusiveArch: x86_64 aarch64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-antidote
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-backtrace-sys
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitflags0.9
ExclusiveArch: %{rust_arches}
- rust-brev
ExclusiveArch: %{rust_arches}
- rust-bufstream
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes0.3
ExclusiveArch: %{rust_arches}
- rust-c_vec
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-cargo
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-chan
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-coco
ExclusiveArch: %{rust_arches}
- rust-config
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-crates-io
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-csv
ExclusiveArch: %{rust_arches}
- rust-csv-core
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-deque
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-encoding_rs_io
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fake_clock
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flame
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-fuse
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-async-runtime
ExclusiveArch: %{rust_arches}
- rust-futures-channel
ExclusiveArch: %{rust_arches}
- rust-futures-core
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-futures-executor
ExclusiveArch: %{rust_arches}
- rust-futures-io
ExclusiveArch: %{rust_arches}
- rust-futures-macro-async
ExclusiveArch: %{rust_arches}
- rust-futures-macro-await
ExclusiveArch: %{rust_arches}
- rust-futures-sink
ExclusiveArch: %{rust_arches}
- rust-futures-stable
ExclusiveArch: %{rust_arches}
- rust-futures-timer
ExclusiveArch: %{rust_arches}
- rust-futures-util
ExclusiveArch: %{rust_arches}
- rust-futures0.1
ExclusiveArch: %{rust_arches}
- rust-gcsf
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-git2-curl
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-google-drive3-fork
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-rs-lgpl-docs
ExclusiveArch: %{rust_arches}
- rust-gtk-source-sys
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-h2
ExclusiveArch: %{rust_arches}
- rust-hamcrest
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-hyper-native-tls
ExclusiveArch: %{rust_arches}
- rust-hyper-tls
ExclusiveArch: %{rust_arches}
- rust-hyper0.10
ExclusiveArch: %{rust_arches}
- rust-id_tree
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy-init
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libmount
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lru_time_cache
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-metadeps
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-mime-sniffer
ExclusiveArch: %{rust_arches}
- rust-mime0.2
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-extras
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-native-tls
ExclusiveArch: %{rust_arches}
- rust-native-tls0.1
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-nom3
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches} noarch
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-pangocairo
ExclusiveArch: %{rust_arches}
- rust-pangocairo-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-peg
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-proc-macro2-0.3
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-quote0.3
ExclusiveArch: %{rust_arches}
- rust-quote0.5
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rand0.4
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rust-ini
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde0.8
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_json0.8
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slab0.3
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-snowflake
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-sourceview
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-string
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-syn0.11
ExclusiveArch: %{rust_arches}
- rust-syn0.13
ExclusiveArch: %{rust_arches}
- rust-synom
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-synstructure0.6
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-take_mut
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread-scoped
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-codec
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-current-thread
ExclusiveArch: %{rust_arches}
- rust-tokio-executor
ExclusiveArch: %{rust_arches}
- rust-tokio-fs
ExclusiveArch: %{rust_arches}
- rust-tokio-io
ExclusiveArch: %{rust_arches}
- rust-tokio-mockstream
ExclusiveArch: %{rust_arches}
- rust-tokio-process
ExclusiveArch: %{rust_arches}
- rust-tokio-proto
ExclusiveArch: %{rust_arches}
- rust-tokio-reactor
ExclusiveArch: %{rust_arches}
- rust-tokio-service
ExclusiveArch: %{rust_arches}
- rust-tokio-signal
ExclusiveArch: %{rust_arches}
- rust-tokio-tcp
ExclusiveArch: %{rust_arches}
- rust-tokio-threadpool
ExclusiveArch: %{rust_arches}
- rust-tokio-timer
ExclusiveArch: %{rust_arches}
- rust-tokio-udp
ExclusiveArch: %{rust_arches}
- rust-toml
ExclusiveArch: %{rust_arches}
- rust-traitobject
ExclusiveArch: %{rust_arches}
- rust-try-lock
ExclusiveArch: %{rust_arches}
- rust-typeable
ExclusiveArch: %{rust_arches}
- rust-typed-arena
ExclusiveArch: %{rust_arches}
- rust-ucd-util
ExclusiveArch: %{rust_arches}
- rust-unicase
ExclusiveArch: %{rust_arches}
- rust-unicase1
ExclusiveArch: %{rust_arches}
- rust-unicode-bidi
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-segmentation
ExclusiveArch: %{rust_arches}
- rust-unicode-width
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-unindent
ExclusiveArch: %{rust_arches}
- rust-unix_socket
ExclusiveArch: %{rust_arches}
- rust-unreachable
ExclusiveArch: %{rust_arches}
- rust-unsafe-any
ExclusiveArch: %{rust_arches}
- rust-untrusted
ExclusiveArch: %{rust_arches}
- rust-url
ExclusiveArch: %{rust_arches}
- rust-users
ExclusiveArch: %{rust_arches}
- rust-utf8-ranges
ExclusiveArch: %{rust_arches}
- rust-uuid
ExclusiveArch: %{rust_arches}
- rust-varlink
ExclusiveArch: %{rust_arches}
- rust-varlink-cli
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-varlink_stdinterfaces
ExclusiveArch: %{rust_arches}
- rust-vec_map
ExclusiveArch: %{rust_arches}
- rust-version-sync
ExclusiveArch: %{rust_arches}
- rust-version_check
ExclusiveArch: %{rust_arches}
- rust-void
ExclusiveArch: %{rust_arches}
- rust-wait-timeout
ExclusiveArch: %{rust_arches}
- rust-walkdir
ExclusiveArch: %{rust_arches}
- rust-want
ExclusiveArch: %{rust_arches}
- rust-which
ExclusiveArch: %{rust_arches}
- rust-xattr
ExclusiveArch: %{rust_arches}
- rust-xdg
ExclusiveArch: %{rust_arches}
- rust-xz2
ExclusiveArch: %{rust_arches}
- rust-yaml-rust
ExclusiveArch: %{rust_arches}
- rust-yaml-rust0.3
ExclusiveArch: %{rust_arches}
- rust-yubibomb
ExclusiveArch: %{rust_arches}
- rust-yup-oauth2
ExclusiveArch: %{rust_arches}
- rust-zoneinfo_compiled
ExclusiveArch: %{rust_arches}
- s390utils
ExclusiveArch: s390 s390x
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- sagemath
ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- seabios
ExclusiveArch: x86_64
- seamonkey
ExclusiveArch: %{ix86} x86_64
- servicelog
ExclusiveArch: ppc %{power64}
- sgabios
ExclusiveArch: %{ix86} x86_64
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- smuxi
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- source-to-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spring
ExclusiveArch: %{ix86} x86_64
- springlobby
ExclusiveArch: %{ix86} x86_64
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supermin
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64
- syncthing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64
- tboot
ExclusiveArch: %{ix86} x86_64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- thunderbird-enigmail
ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch
- tilix
ExclusiveArch: %{ldc_arches}
- tmux-top
ExclusiveArch: %{go_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- ugene
ExclusiveArch: %{ix86} x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- uglify-js1
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- v8
ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{valgrind_arches}
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vdsm
ExclusiveArch: x86_64 %{power64} aarch64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- virtualplanet
ExclusiveArch: %{fpc_arches}
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit-sharp
ExclusiveArch: %mono_arches
- webkit2-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} %{arm}
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wiredtiger
ExclusiveArch: x86_64 aarch64 ppc64le
- wraplinux
ExclusiveArch: %{ix86} x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86info
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-geode
ExclusiveArch: %{ix86}
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64 ia64
- xorg-x11-drv-omap
ExclusiveArch: %{arm}
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-opentegra
ExclusiveArch: %{arm}
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xsupplicant
ExclusiveArch: %{ix86} x86_64 ppc %{power64}
- ycssmin
ExclusiveArch: %{nodejs_arches} noarch
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
5 years, 9 months
Architecture specific change in rpms/postgresql.git
by githook-noreply@fedoraproject.org
The package rpms/postgresql.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=b410c14...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=2f4174b...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=a8e2f35...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=ab668a0...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=6f2c3a9...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=88e98c3...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=973e21f...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=a4660cb...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=18a2a1a...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=d6c16ca...
https://src.fedoraproject.org/cgit/rpms/postgresql.git/commit/?id=8f9b712....
Change:
+%ifarch s390 s390x
+%ifarch sparc64
-%ifarch sparc64 alpha s390x s390
+%ifarch s390
-%ifarch alpha
+%ifarch %{power64}
+%ifarch alpha
+%ifarch alpha
+%ifarch sparc64 alpha
+%ifarch s390
+%ifarch sparc64 alpha s390x s390
Thanks.
Full change:
============
commit 51abe650bc3def25ce8a8e9fd0daaf1e6cbe96b7
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Aug 8 11:39:52 2018 +0200
rebase: update to 10.5
Per release notes:
https://www.postgresql.org/docs/10/static/release-10-5.html
Version: 10.5-1
diff --git a/.gitignore b/.gitignore
index 3211305..7fc7909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-10.4.tar.bz2
-/postgresql-10.4.tar.bz2.sha256
-/postgresql-9.6.9.tar.bz2
-/postgresql-9.6.9.tar.bz2.sha256
+/postgresql-10.5.tar.bz2
+/postgresql-10.5.tar.bz2.sha256
+/postgresql-9.6.10.tar.bz2
+/postgresql-9.6.10.tar.bz2.sha256
/postgresql-setup-8.2.tar.gz
-/postgresql-10.4-US.pdf
+/postgresql-10.5-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 6995680..b1c2455 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,8 +58,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
-Version: 10.4
-Release: 8%{?dist}
+Version: 10.5
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -71,7 +71,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.6.9
+%global prevversion 9.6.10
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
%global precise_version %{?epoch:%epoch:}%version-%release
@@ -1198,6 +1198,10 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Wed Aug 08 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.5-1
+- update to 10.5 per release notes:
+ https://www.postgresql.org/docs/10/static/release-10-5.html
+
* Thu Aug 02 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-8
- new postgresql-setup, the %%postgresql_tests* macros now start
the build-time server on random port number
diff --git a/sources b/sources
index aef8b24..6286039 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-10.4.tar.bz2) = b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b3e898b7f5990fd78499c8c68dcb3aa9bde7821d71b5882d8856131384e899f8055d89d51cdfdbc9e663
-SHA512 (postgresql-10.4.tar.bz2.sha256) = d2fa47777c7a40909c016e4fcbc69840d93c6d7d82023440d9f77006bfce8917e61cfe119dd77b243b29f63c852abf179d62137b5cbaa010dc30258537a92181
-SHA512 (postgresql-9.6.9.tar.bz2) = 3ce2a8f3a017d9c0bd0f1b475a9ee02bcb6a4119b0d436757911f444f49f5024bb1a1be07ce16a79e71af77799de1bf952b32279b4566bae075f23a50b8545c6
-SHA512 (postgresql-9.6.9.tar.bz2.sha256) = f86879c0d92b8439706c35d9c2b5de7283695e89387207144d041f34976fa490011d66c22b90633d3619ffcb7d2f3228fae07acd05a2315ea9e7f4834b115dac
+SHA512 (postgresql-10.5.tar.bz2) = 1bad30ae88beca66f7e8b99b82e7f02aac1e9230b328e6e5a762a704cdd9dc767d924f5a66c68c93586badfef91b7ff336120a567ce970eaa58bb44c662ad48c
+SHA512 (postgresql-10.5.tar.bz2.sha256) = f4b2bf3c6454905caf4bd5a9a53dec33e7ac6c7593e6464bf75bcd12b185bc1c54f925a088122d8819840a17bbda84e8b42c311a639d7457090ace74725971f9
+SHA512 (postgresql-9.6.10.tar.bz2) = 960a32c86466f9d5f5491ef163f5c4a99cb5de7312d13371e2223b1d156e31eb2a23ed478e6654bcbb7bd19db9470aaf63473ff661c11c60971b92af5e9daf82
+SHA512 (postgresql-9.6.10.tar.bz2.sha256) = 1dbdcf7e26128a721cb309624c1f8c368f5e3c65c15ed08aaf93c27819d2e36ba43f3c5a4ce893a079a95f7579c7dbb27b17a90c0cdf98fb9a470d7ebf3ad001
SHA512 (postgresql-setup-8.2.tar.gz) = b21ec508e207074ae1f5259479415f99301ae58a766d476a16fec620b7778ef6e5d32fa1d2cc0060cbfc5eee328a9495182500a8f2f8573ef20c359c290d8430
-SHA512 (postgresql-10.4-US.pdf) = 88c73097ad8dee843b3a1ae36613f5df87344ce5c1f8c9f40cd14f48081421cd27970c4e6c738291f7129a772779860b8065a52956d1ff0fa3e82038ab1b381f
+SHA512 (postgresql-10.5-US.pdf) = 2605f575be109be9327ac4cc2615354e1a30daf03176888d97e928dbc43613ee45f8e47aed40a623f7b3db5a063c2c44cb3ce1616b5ac20315f611987890fbfa
commit ff6bdd20bf189391a664e793cdb3c74fbce7c15f
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Aug 2 09:14:03 2018 +0200
setup: new version
start test PG servers on random port number
Version: 10.4-8
diff --git a/.gitignore b/.gitignore
index 96093e5..3211305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
/postgresql-10.4.tar.bz2.sha256
/postgresql-9.6.9.tar.bz2
/postgresql-9.6.9.tar.bz2.sha256
-/postgresql-setup-8.1.tar.gz
+/postgresql-setup-8.2.tar.gz
/postgresql-10.4-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index eea3cd8..6995680 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.4
-Release: 7%{?dist}
+Release: 8%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -76,7 +76,7 @@ Url: http://www.postgresql.org/
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
%global precise_version %{?epoch:%epoch:}%version-%release
-%global setup_version 8.1
+%global setup_version 8.2
%global service_name postgresql.service
Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t...
@@ -1198,6 +1198,10 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Thu Aug 02 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-8
+- new postgresql-setup, the %%postgresql_tests* macros now start
+ the build-time server on random port number
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 477e06e..aef8b24 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-10.4.tar.bz2) = b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b
SHA512 (postgresql-10.4.tar.bz2.sha256) = d2fa47777c7a40909c016e4fcbc69840d93c6d7d82023440d9f77006bfce8917e61cfe119dd77b243b29f63c852abf179d62137b5cbaa010dc30258537a92181
SHA512 (postgresql-9.6.9.tar.bz2) = 3ce2a8f3a017d9c0bd0f1b475a9ee02bcb6a4119b0d436757911f444f49f5024bb1a1be07ce16a79e71af77799de1bf952b32279b4566bae075f23a50b8545c6
SHA512 (postgresql-9.6.9.tar.bz2.sha256) = f86879c0d92b8439706c35d9c2b5de7283695e89387207144d041f34976fa490011d66c22b90633d3619ffcb7d2f3228fae07acd05a2315ea9e7f4834b115dac
-SHA512 (postgresql-setup-8.1.tar.gz) = c0505e81ab2b8cb6644403a0b1ceac18876ed811099717e730a4a6946c1832a8ef9e384d2051370551f764ed2efcc9da347590c3fa833034e9c595f43e1d8f48
+SHA512 (postgresql-setup-8.2.tar.gz) = b21ec508e207074ae1f5259479415f99301ae58a766d476a16fec620b7778ef6e5d32fa1d2cc0060cbfc5eee328a9495182500a8f2f8573ef20c359c290d8430
SHA512 (postgresql-10.4-US.pdf) = 88c73097ad8dee843b3a1ae36613f5df87344ce5c1f8c9f40cd14f48081421cd27970c4e6c738291f7129a772779860b8065a52956d1ff0fa3e82038ab1b381f
commit e4f9b1fa147010dd224349a19837f25c9d2cc2a7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 22:46:03 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/postgresql.spec b/postgresql.spec
index e2756bd..eea3cd8 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.4
-Release: 6%{?dist}
+Release: 7%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1198,6 +1198,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Thu Jul 12 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-6
- drop ppc64 patch, gcc is already fixed (rhbz#1544349)
- move pg_config*.mo files into devel subpackage
commit f1d6398874ff28c16811aba48370d22750246dc5
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jul 12 16:12:51 2018 +0200
move pg_config*.mo files to *-devel
This complements 4034635788132a15909723ed0cb8905a69c2b3cd commit.
THANKS: Jun Aruga
Version: 10.4-6
diff --git a/postgresql.spec b/postgresql.spec
index 79f2c00..e2756bd 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -815,14 +815,14 @@ find_lang_bins ()
cat "$binary"-%{majorversion}.lang >>$lstfile
done
}
-find_lang_bins devel.lst ecpg
+find_lang_bins devel.lst ecpg pg_config
find_lang_bins libs.lst ecpglib6 libpq5
find_lang_bins server.lst \
initdb pg_basebackup pg_controldata pg_ctl pg_resetwal pg_rewind plpgsql postgres
find_lang_bins contrib.lst \
pg_archivecleanup pg_test_fsync pg_test_timing pg_waldump
find_lang_bins main.lst \
- pg_config pg_dump pg_upgrade pgscripts psql
+ pg_dump pg_upgrade pgscripts psql
%if %plperl
find_lang_bins plperl.lst plperl
%endif
@@ -1200,6 +1200,7 @@ make -C postgresql-setup-%{setup_version} check
%changelog
* Thu Jul 12 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-6
- drop ppc64 patch, gcc is already fixed (rhbz#1544349)
+- move pg_config*.mo files into devel subpackage
* Mon Jul 09 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-5
- re-enable -O3 for 64bit PPC boxes
commit be2d41d2fcd7a2c0306c7d9fc8840551a73dc601
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jul 12 14:36:07 2018 +0200
Drop hack for ppc64* gcc optimization bug
Related: rhbz#1544349
Version: 10.4-6
diff --git a/postgresql-ppc64-gcc-workaround.patch b/postgresql-ppc64-gcc-workaround.patch
deleted file mode 100644
index 3b68932..0000000
--- a/postgresql-ppc64-gcc-workaround.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This is to workaround GCC optimization bug (rhbz#1544349) on PPC64* boxes.
-
-diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
-index 2c636ad..833014b 100644
---- a/contrib/btree_gist/btree_utils_var.c
-+++ b/contrib/btree_gist/btree_utils_var.c
-@@ -230,6 +230,10 @@ gbt_var_node_truncate(const GBT_VARKEY *node, int32 cpf_length, const gbtree_vin
- }
-
-
-+#if defined(__ppc64__) || defined(__powerpc64__)
-+#pragma GCC push_options
-+#pragma GCC optimize ("no-tree-slp-vectorize")
-+#endif
-
- void
- gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
-@@ -278,6 +282,9 @@ gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
- }
- }
-
-+#if defined(__ppc64__) || defined(__powerpc64__)
-+#pragma GCC pop_options
-+#endif
-
- GISTENTRY *
- gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo)
diff --git a/postgresql.spec b/postgresql.spec
index 8d881df..79f2c00 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.4
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -105,7 +105,6 @@ Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-ppc64-gcc-workaround.patch
BuildRequires: gcc
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -382,7 +381,6 @@ benchmarks.
%patch2 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1200,6 +1198,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Thu Jul 12 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-6
+- drop ppc64 patch, gcc is already fixed (rhbz#1544349)
+
* Mon Jul 09 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-5
- re-enable -O3 for 64bit PPC boxes
- explicitly set PYTHON=python2, /bin/python doesn't exist fc29+
commit db5a549f53dc3413e7871cf386d9e484beab9d9c
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Jul 9 09:41:40 2018 +0200
FTBFS: 'python' is not on $PATH on F29+
Version: 10.4-5
diff --git a/postgresql.spec b/postgresql.spec
index 967f692..8d881df 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -505,7 +505,7 @@ make distclean
%endif # %%plpython3
-unset PYTHON
+PYTHON=/usr/bin/python2
# Normal (python2) build begins here
%configure $common_configure_options \
@@ -513,6 +513,8 @@ unset PYTHON
--with-python
%endif
+unset PYTHON
+
make %{?_smp_mflags} world
# Have to hack makefile to put correct path into tutorial scripts
@@ -596,6 +598,7 @@ upgrade_configure ()
# its ideas about installation paths.
# The -fno-aggressive-loop-optimizations is hack for #993532
+ PYTHON="${PYTHON-/usr/bin/python2}" \
CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" ./configure \
--build=%{_build} \
--host=%{_host} \
@@ -634,7 +637,7 @@ upgrade_configure ()
make %{?_smp_mflags} all
make -C contrib %{?_smp_mflags} all
popd
-%endif
+%endif # %%upgrade
%install
@@ -1199,6 +1202,7 @@ make -C postgresql-setup-%{setup_version} check
%changelog
* Mon Jul 09 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-5
- re-enable -O3 for 64bit PPC boxes
+- explicitly set PYTHON=python2, /bin/python doesn't exist fc29+
* Tue Jul 03 2018 Petr Pisar <ppisar(a)redhat.com> - 10.4-4
- Perl 5.28 rebuild
commit 07daa8e53a9f1ef70452b639c06171b1d59b9904
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Jul 9 08:57:53 2018 +0200
Re-enable -O3 compilation for PPC 64bit boxes
Related: rhbz#1544349
Version: 10.4-5
diff --git a/postgresql-ppc64-gcc-workaround.patch b/postgresql-ppc64-gcc-workaround.patch
new file mode 100644
index 0000000..3b68932
--- /dev/null
+++ b/postgresql-ppc64-gcc-workaround.patch
@@ -0,0 +1,27 @@
+This is to workaround GCC optimization bug (rhbz#1544349) on PPC64* boxes.
+
+diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
+index 2c636ad..833014b 100644
+--- a/contrib/btree_gist/btree_utils_var.c
++++ b/contrib/btree_gist/btree_utils_var.c
+@@ -230,6 +230,10 @@ gbt_var_node_truncate(const GBT_VARKEY *node, int32 cpf_length, const gbtree_vin
+ }
+
+
++#if defined(__ppc64__) || defined(__powerpc64__)
++#pragma GCC push_options
++#pragma GCC optimize ("no-tree-slp-vectorize")
++#endif
+
+ void
+ gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
+@@ -278,6 +282,9 @@ gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
+ }
+ }
+
++#if defined(__ppc64__) || defined(__powerpc64__)
++#pragma GCC pop_options
++#endif
+
+ GISTENTRY *
+ gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo)
diff --git a/postgresql.spec b/postgresql.spec
index b687e97..967f692 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.4
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -105,6 +105,7 @@ Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+Patch7: postgresql-ppc64-gcc-workaround.patch
BuildRequires: gcc
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -381,6 +382,7 @@ benchmarks.
%patch2 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -426,7 +428,7 @@ cd ..
CFLAGS="${CFLAGS:-%optflags}"
%ifarch %{power64}
# See the bug #1051075, ppc64 should benefit from -O3
-# CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100`
+CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100`
%endif
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
@@ -1195,6 +1197,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Mon Jul 09 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-5
+- re-enable -O3 for 64bit PPC boxes
+
* Tue Jul 03 2018 Petr Pisar <ppisar(a)redhat.com> - 10.4-4
- Perl 5.28 rebuild
commit 12b384bfd848bdd82e1cd8bd9bbc40c30a366ae6
Author: Petr Psa <ppisar(a)redhat.com>
Date: Tue Jul 3 13:00:30 2018 +0200
Perl 5.28 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 945fe0e..b687e97 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1195,6 +1195,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Tue Jul 03 2018 Petr Pisar <ppisar(a)redhat.com> - 10.4-4
+- Perl 5.28 rebuild
+
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 10.4-3
- Perl 5.28 rebuild
commit 82e5aaaf8dde0ced4988913a1bfb9002280a917a
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Wed Jun 27 20:51:20 2018 +0200
Perl 5.28 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index fdee086..945fe0e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1195,6 +1195,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Wed Jun 27 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 10.4-3
+- Perl 5.28 rebuild
+
* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 10.4-2
- Rebuilt for Python 3.7
commit d18c574660cfc048f687682d06055cd8bfd296ff
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Jun 19 10:49:49 2018 +0200
Rebuilt for Python 3.7
diff --git a/postgresql.spec b/postgresql.spec
index 2d0f0ea..fdee086 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1195,6 +1195,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 10.4-2
+- Rebuilt for Python 3.7
+
* Wed May 09 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-1
- update to 10.4 per release notes:
https://www.postgresql.org/docs/10/static/release-10-4.html
commit b707571b4fe8389f99731c0ffada8f1cabc40524
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed May 9 22:32:45 2018 +0200
rebase: update to 10.4
Per release notes:
https://www.postgresql.org/docs/10/static/release-10-4.html
Version: 10.4-1
diff --git a/.gitignore b/.gitignore
index 6510841..96093e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-10.3.tar.bz2
-/postgresql-10.3.tar.bz2.sha256
-/postgresql-9.6.8.tar.bz2
-/postgresql-9.6.8.tar.bz2.sha256
+/postgresql-10.4.tar.bz2
+/postgresql-10.4.tar.bz2.sha256
+/postgresql-9.6.9.tar.bz2
+/postgresql-9.6.9.tar.bz2.sha256
/postgresql-setup-8.1.tar.gz
-/postgresql-10.3-US.pdf
+/postgresql-10.4-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 5a699c6..2d0f0ea 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,8 +58,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
-Version: 10.3
-Release: 5%{?dist}
+Version: 10.4
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -71,7 +71,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.6.8
+%global prevversion 9.6.9
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
%global precise_version %{?epoch:%epoch:}%version-%release
@@ -1195,6 +1195,10 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Wed May 09 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.4-1
+- update to 10.4 per release notes:
+ https://www.postgresql.org/docs/10/static/release-10-4.html
+
* Thu Apr 26 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-5
- pltcl: drop tcl-pltcl dependency (rhbz#1571181)
diff --git a/sources b/sources
index ddd7ded..477e06e 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-10.3.tar.bz2) = 05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a29638970bf28ebf5bd1f877e8dcd9986d88f5c5e5379e74fe79ce83e20d2babba
-SHA512 (postgresql-10.3.tar.bz2.sha256) = f73a336b70910dde9fd092ad00bff0c3e9c0a724d5dc9f2aee5e6e2b2dbc434da00fed6c8008b922b49a7f54764408846b0ff0bf0b0b2c5492c9bbc002509a04
-SHA512 (postgresql-9.6.8.tar.bz2) = 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
-SHA512 (postgresql-9.6.8.tar.bz2.sha256) = 612d4a3d213db959a59d10bb26ff1654f988430688ae98d88d2585e9d66e914b15dd7853fa960e5e34f2ce4899120489a7417f7dd7af0d3af49b2bb026b3e3e2
+SHA512 (postgresql-10.4.tar.bz2) = b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b3e898b7f5990fd78499c8c68dcb3aa9bde7821d71b5882d8856131384e899f8055d89d51cdfdbc9e663
+SHA512 (postgresql-10.4.tar.bz2.sha256) = d2fa47777c7a40909c016e4fcbc69840d93c6d7d82023440d9f77006bfce8917e61cfe119dd77b243b29f63c852abf179d62137b5cbaa010dc30258537a92181
+SHA512 (postgresql-9.6.9.tar.bz2) = 3ce2a8f3a017d9c0bd0f1b475a9ee02bcb6a4119b0d436757911f444f49f5024bb1a1be07ce16a79e71af77799de1bf952b32279b4566bae075f23a50b8545c6
+SHA512 (postgresql-9.6.9.tar.bz2.sha256) = f86879c0d92b8439706c35d9c2b5de7283695e89387207144d041f34976fa490011d66c22b90633d3619ffcb7d2f3228fae07acd05a2315ea9e7f4834b115dac
SHA512 (postgresql-setup-8.1.tar.gz) = c0505e81ab2b8cb6644403a0b1ceac18876ed811099717e730a4a6946c1832a8ef9e384d2051370551f764ed2efcc9da347590c3fa833034e9c595f43e1d8f48
-SHA512 (postgresql-10.3-US.pdf) = d94b1eeafc6b20e1fefa01b2376f9a81a7597896a18ee355ef03d6a339930ef3412c286334b4ed9b947faa980f2afc163e4063f369e888b3a7220ab562b40693
+SHA512 (postgresql-10.4-US.pdf) = 88c73097ad8dee843b3a1ae36613f5df87344ce5c1f8c9f40cd14f48081421cd27970c4e6c738291f7129a772779860b8065a52956d1ff0fa3e82038ab1b381f
commit c8ac4491b67cc5840cb55d3e06a56e64eb7fecad
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Apr 26 17:09:31 2018 +0200
pltcl: drop tcl-pgtcl dep
This reverts 58e1c1f5adc1a064becb45f295b05a3dfa10fc78.
I discussed with Jozef that it's OK, that dep shouldn't be needed.
Version: 10.3-5
diff --git a/postgresql.spec b/postgresql.spec
index fdc4f8b..5a699c6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.3
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -352,7 +352,6 @@ Install this if you want to write database functions in Python 3.
Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %precise_version
-Requires: tcl-pgtcl
%description pltcl
The postgresql-pltcl package contains the PL/Tcl procedural language,
@@ -1196,6 +1195,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Thu Apr 26 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-5
+- pltcl: drop tcl-pltcl dependency (rhbz#1571181)
+
* Thu Apr 19 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-4
- upgrade: package plpython*.so modules
commit cc5d65f927214966cd01cb11d91eb11ba21cffca
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Apr 19 14:27:45 2018 +0200
upgrade: package plpython*.so
Version: 10.3-4
diff --git a/postgresql.spec b/postgresql.spec
index 5b9e472..fdc4f8b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.3
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -581,8 +581,7 @@ test "$test_failure" -eq 0
# The upgrade build can be pretty stripped-down, but make sure that
# any options that affect on-disk file layout match the previous
- # major release! Also, note we intentionally do not use %%configure
- # here, because we *don't* want its ideas about installation paths.
+ # major release!
# The set of built server modules here should ideally create superset
# of modules we used to ship in %%prevversion (in the installation
@@ -590,6 +589,11 @@ test "$test_failure" -eq 0
# subpackages. This increases chances that the upgrade from
# %%prevversion will work smoothly.
+upgrade_configure ()
+{
+ # Note we intentionally do not use %%configure here, because we *don't* want
+ # its ideas about installation paths.
+
# The -fno-aggressive-loop-optimizations is hack for #993532
CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" ./configure \
--build=%{_build} \
@@ -600,10 +604,31 @@ test "$test_failure" -eq 0
--enable-debug \
--enable-cassert \
%endif
+%if %plperl
--with-perl \
+%endif
+%if %pltcl
--with-tcl \
+%endif
--with-tclconfig=%_libdir \
- --with-system-tzdata=/usr/share/zoneinfo
+ --with-system-tzdata=/usr/share/zoneinfo \
+ "$@"
+}
+
+%if %plpython3
+ export PYTHON=/usr/bin/python3
+ upgrade_configure --with-python
+ make %{?_smp_mflags} -C src/pl/plpython all
+ # save aside the only one file which we are interested here
+ cp src/pl/plpython/plpython3.so ./
+ unset PYTHON
+ make distclean
+%endif
+
+ upgrade_configure \
+%if %plpython
+ --with-python
+%endif
make %{?_smp_mflags} all
make -C contrib %{?_smp_mflags} all
@@ -685,6 +710,10 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_pro
pushd postgresql-%{prevversion}
make DESTDIR=$RPM_BUILD_ROOT install
make -C contrib DESTDIR=$RPM_BUILD_ROOT install
+%if %plpython3
+ install -m 755 plpython3.so \
+ $RPM_BUILD_ROOT/%_libdir/pgsql/postgresql-%prevmajorversion/lib
+%endif
popd
# remove stuff we don't actually need for upgrade purposes
@@ -1167,6 +1196,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Thu Apr 19 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-4
+- upgrade: package plpython*.so modules
+
* Mon Apr 16 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-3
- upgrade: package plperl.so and pltcl.so
- upgrade: package contrib modules
commit 1942c8b9d5e520cb3d73c190a022fdc1d821deb1
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Apr 16 13:29:07 2018 +0200
upgrade: don't package libpq.so & friends
Version: 10.3-3
diff --git a/postgresql.spec b/postgresql.spec
index d765a12..5b9e472 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -709,7 +709,12 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_pro
rm -rf share/doc
rm -rf share/man
rm -rf share/tsearch_data
- rm -rf lib/*.a
+ rm lib/*.a
+ # Drop libpq. This might need some tweaks once there's
+ # soname bump between %%prevversion and %%version.
+ rm lib/libpq.so*
+ # Drop libraries.
+ rm lib/lib{ecpg,ecpg_compat,pgtypes}.so*
rm share/*.bki
rm share/*description
rm share/*.sample
@@ -1165,6 +1170,7 @@ make -C postgresql-setup-%{setup_version} check
* Mon Apr 16 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-3
- upgrade: package plperl.so and pltcl.so
- upgrade: package contrib modules
+- upgrade: drop dynamic libraries
* Fri Apr 13 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-2
- define %%precise_version helper macro
commit bf6f0859a8a5e13a427a56545c0c0fd20d1db9a9
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Apr 16 12:10:51 2018 +0200
upgrade: package contrib modules
Version: 10.3-3
diff --git a/postgresql.spec b/postgresql.spec
index cf7fb60..d765a12 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -606,7 +606,7 @@ test "$test_failure" -eq 0
--with-system-tzdata=/usr/share/zoneinfo
make %{?_smp_mflags} all
-
+ make -C contrib %{?_smp_mflags} all
popd
%endif
@@ -684,6 +684,7 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_pro
%if %upgrade
pushd postgresql-%{prevversion}
make DESTDIR=$RPM_BUILD_ROOT install
+ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
popd
# remove stuff we don't actually need for upgrade purposes
@@ -1163,6 +1164,7 @@ make -C postgresql-setup-%{setup_version} check
%changelog
* Mon Apr 16 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-3
- upgrade: package plperl.so and pltcl.so
+- upgrade: package contrib modules
* Fri Apr 13 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-2
- define %%precise_version helper macro
commit 3e9c3b569f31e60866c43e64fe9bf07ba4b44d91
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Apr 16 12:01:34 2018 +0200
upgrade: package pltcl.so and plperl.so
Version: 10.3-3
diff --git a/postgresql.spec b/postgresql.spec
index 73e201a..cf7fb60 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.3
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -584,6 +584,12 @@ test "$test_failure" -eq 0
# major release! Also, note we intentionally do not use %%configure
# here, because we *don't* want its ideas about installation paths.
+ # The set of built server modules here should ideally create superset
+ # of modules we used to ship in %%prevversion (in the installation
+ # the user will upgrade from), including *-contrib or *-pl*
+ # subpackages. This increases chances that the upgrade from
+ # %%prevversion will work smoothly.
+
# The -fno-aggressive-loop-optimizations is hack for #993532
CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" ./configure \
--build=%{_build} \
@@ -594,6 +600,9 @@ test "$test_failure" -eq 0
--enable-debug \
--enable-cassert \
%endif
+ --with-perl \
+ --with-tcl \
+ --with-tclconfig=%_libdir \
--with-system-tzdata=/usr/share/zoneinfo
make %{?_smp_mflags} all
@@ -705,6 +714,8 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_pro
rm share/*.sample
rm share/*.sql
rm share/*.txt
+ rm share/extension/*.sql
+ rm share/extension/*.control
popd
cat <<EOF > $RPM_BUILD_ROOT%macrosdir/macros.%name-upgrade
%%postgresql_upgrade_prefix %prev_prefix
@@ -1150,6 +1161,9 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Mon Apr 16 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-3
+- upgrade: package plperl.so and pltcl.so
+
* Fri Apr 13 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-2
- define %%precise_version helper macro
- drop explicit libpq.so provide from *-libs
commit 8ac102b47e28846302a5f76fb9505c1d2a966e24
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Apr 13 15:03:09 2018 +0200
spec: make it a bit more airy
Version: 10.3-2
diff --git a/postgresql.spec b/postgresql.spec
index fa907e6..73e201a 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -191,7 +191,7 @@ Requires(post): glibc
Requires(postun): glibc
%description libs
-The postgresql-libs package provides the essential shared libraries for any
+The postgresql-libs package provides the essential shared libraries for any
PostgreSQL client program or interface. You will need to install this package
to use any other PostgreSQL package or any clients that need to connect to a
PostgreSQL server.
@@ -290,6 +290,7 @@ The postgresql-upgrade package contains the pg_upgrade utility and supporting
files needed for upgrading a PostgreSQL database from the previous major
version of PostgreSQL.
+
%package upgrade-devel
Summary: Support for build of extensions required for upgrade process
Group: Development/Libraries
@@ -318,6 +319,7 @@ which is an extension to the PostgreSQL database server.
Install this if you want to write database functions in Perl.
%endif
+
%if %plpython
%package plpython
Summary: The Python2 procedural language for PostgreSQL
@@ -331,6 +333,7 @@ which is an extension to the PostgreSQL database server.
Install this if you want to write database functions in Python 2.
%endif
+
%if %plpython3
%package plpython3
Summary: The Python3 procedural language for PostgreSQL
@@ -343,6 +346,7 @@ which is an extension to the PostgreSQL database server.
Install this if you want to write database functions in Python 3.
%endif
+
%if %pltcl
%package pltcl
Summary: The Tcl procedural language for PostgreSQL
@@ -356,6 +360,7 @@ which is an extension to the PostgreSQL database server.
Install this if you want to write database functions in Tcl.
%endif
+
%if %test
%package test
Summary: The test suite distributed with PostgreSQL
@@ -369,6 +374,7 @@ PostgreSQL database management system, including regression tests and
benchmarks.
%endif
+
%prep
( cd %_sourcedir; sha256sum -c %{SOURCE16}; sha256sum -c %{SOURCE17} )
%setup -q -a 12
@@ -391,8 +397,8 @@ tar xfj %{SOURCE3}
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
find . -type f -name .gitignore | xargs rm
-%build
+%build
# fail quickly and obviously if user tries to build as root
%if %runselftest
if [ x"`id -u`" = x0 ]; then
@@ -595,6 +601,7 @@ test "$test_failure" -eq 0
popd
%endif
+
%install
cd postgresql-setup-%{setup_version}
make install DESTDIR=$RPM_BUILD_ROOT
@@ -614,7 +621,6 @@ description "Upgrade data from system PostgreSQL version (PostgreSQL %{prevm
redhat_sockets_hack no
EOF
-
make DESTDIR=$RPM_BUILD_ROOT install-world
%if %plpython3
@@ -712,7 +718,7 @@ EOF
# Makefiles, however.
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test
cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
- # pg_regress binary should be only in one subpackage,
+ # pg_regress binary should be only in one subpackage,
# there will be a symlink from -test to -devel
rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
ln -sf ../../pgxs/src/test/regress/pg_regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
@@ -784,8 +790,10 @@ find_lang_bins pltcl.lst pltcl
%endif
%endif
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%pre server
/usr/sbin/groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
@@ -812,8 +820,8 @@ make -C postgresql-setup-%{setup_version} check
%clean
-# FILES section.
+# FILES sections.
%files -f main.lst
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
%doc COPYRIGHT README HISTORY doc/bug.template
@@ -846,11 +854,13 @@ make -C postgresql-setup-%{setup_version} check
%{_mandir}/man1/vacuumdb.*
%{_mandir}/man7/*
+
%files docs
%doc *-US.pdf
%doc doc/html
%{_libdir}/pgsql/tutorial/
+
%files contrib -f contrib.lst
%doc contrib/spi/*.example
%{_bindir}/oid2name
@@ -983,6 +993,7 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/pgxml.so
%endif
+
%files libs -f libs.lst
%doc COPYRIGHT
%dir %{_libdir}/pgsql
@@ -991,6 +1002,7 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/libpgtypes.so.*
%{_libdir}/libpq.so.*
+
%files server -f server.lst
%{_bindir}/initdb
%{_bindir}/pg_basebackup
@@ -1074,14 +1086,15 @@ make -C postgresql-setup-%{setup_version} check
%files test-rpm-macros
-%{macrosdir}/macros.%name-test
%{_datadir}/postgresql-setup/postgresql_pkg_tests.sh
+%{macrosdir}/macros.%name-test
%files static
%{_libdir}/libpgcommon.a
%{_libdir}/libpgport.a
+
%if %upgrade
%files upgrade
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin
@@ -1091,6 +1104,7 @@ make -C postgresql-setup-%{setup_version} check
%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/share
+
%files upgrade-devel
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/include
@@ -1099,18 +1113,21 @@ make -C postgresql-setup-%{setup_version} check
%{macrosdir}/macros.%name-upgrade
%endif
+
%if %plperl
%files plperl -f plperl.lst
%{_datadir}/pgsql/extension/plperl*
%{_libdir}/pgsql/plperl.so
%endif
+
%if %pltcl
%files pltcl -f pltcl.lst
%{_datadir}/pgsql/extension/pltcl*
%{_libdir}/pgsql/pltcl.so
%endif
+
%if %plpython
%files plpython -f plpython.lst
%{_datadir}/pgsql/extension/plpython2*
@@ -1118,17 +1135,20 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/plpython2.so
%endif
+
%if %plpython3
%files plpython3 -f plpython3.lst
%{_datadir}/pgsql/extension/plpython3*
%{_libdir}/pgsql/plpython3.so
%endif
+
%if %test
%files test
%attr(-,postgres,postgres) %{_libdir}/pgsql/test
%endif
+
%changelog
* Fri Apr 13 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-2
- define %%precise_version helper macro
@@ -1418,8 +1438,8 @@ make -C postgresql-setup-%{setup_version} check
http://www.postgresql.org/docs/9.3/static/release-9-3-4.html
* Thu Mar 13 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.3-2
-- Fix WAL replay of locking an updated tuple
- kudos to Alvaro Herrera
+- Fix WAL replay of locking an updated tuple
+ kudos to Alvaro Herrera
* Thu Feb 20 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.3-1
- update to 9.3.3 minor version per release notes:
@@ -2209,5 +2229,5 @@ Resolves: #161470
- Default to compiling libpq and ECPG as fully thread-safe
- 7.4 Origin. See previous spec files for previous history. Adapted
-- from Red Hat and PGDG's 7.3.4 RPM, directly descended from
+- from Red Hat and PGDG's 7.3.4 RPM, directly descended from
- postgresql-7.3.4-2 as shipped in Fedora Core 1.
commit 50065a22770c54458d17a5509ce5ca9514e9bee2
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Apr 13 14:54:48 2018 +0200
postgresql-test-rpm-macros subpackage
We used to provide the functionality under postgresql-devel
subpackage, but that one has already too much purposes (we build
against that both client tools and server modules, using that for
tests is too much).
Newly, the postgresql-server package is automatically added as
transitive dependency, so the typical fix for dependant packages
would be:
- BuildRequires: postgresql-devel
- BuildRequires: postgresql-server
+ BuildRequires: postgresql-test-rpm-macros
(when the package doesn't need header files from postgresql-devel)
Version: 10.3-2
diff --git a/postgresql.spec b/postgresql.spec
index c9f97e9..fa907e6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -259,6 +259,15 @@ Embedded C Postgres preprocessor. You need to install this package if you want
to develop applications which will interact with a PostgreSQL server.
+%package test-rpm-macros
+Summary: Convenience RPM macros for build-time testing against PostgreSQL server
+Requires: %{name}-server = %precise_version
+
+%description test-rpm-macros
+This package is meant to be added as BuildRequires: dependency of other packages
+that want to run build-time testsuite against running PostgreSQL server.
+
+
%package static
Summary: Statically linked PostgreSQL libraries
Requires: %{name}-devel%{?_isa} = %precise_version
@@ -1011,7 +1020,6 @@ make -C postgresql-setup-%{setup_version} check
%{_datadir}/pgsql/tsearch_data/
%dir %{_datadir}/postgresql-setup
%{_datadir}/postgresql-setup/library.sh
-%{_datadir}/postgresql-setup/postgresql_pkg_tests.sh
%{_libdir}/pgsql/*_and_*.so
%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/euc2004_sjis2004.so
@@ -1064,6 +1072,12 @@ make -C postgresql-setup-%{setup_version} check
%{_mandir}/man3/SPI_*
%{macrosdir}/macros.%name
+
+%files test-rpm-macros
+%{macrosdir}/macros.%name-test
+%{_datadir}/postgresql-setup/postgresql_pkg_tests.sh
+
+
%files static
%{_libdir}/libpgcommon.a
%{_libdir}/libpgport.a
@@ -1120,6 +1134,7 @@ make -C postgresql-setup-%{setup_version} check
- define %%precise_version helper macro
- drop explicit libpq.so provide from *-libs
- update postgresql-setup tarball
+- add postgresql-test-rpm-macros package
* Thu Mar 01 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-1
- update to 10.3 per release notes:
commit fa3717b8d23c90f16a7349fd3acc648771412c7d
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Apr 13 14:48:03 2018 +0200
setup: new upstream release
Version: 10.3-2
diff --git a/.gitignore b/.gitignore
index 5df967c..6510841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
/postgresql-10.3.tar.bz2.sha256
/postgresql-9.6.8.tar.bz2
/postgresql-9.6.8.tar.bz2.sha256
-/postgresql-setup-8.0.tar.gz
+/postgresql-setup-8.1.tar.gz
/postgresql-10.3-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 2f253dc..c9f97e9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -76,7 +76,7 @@ Url: http://www.postgresql.org/
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
%global precise_version %{?epoch:%epoch:}%version-%release
-%global setup_version 8.0
+%global setup_version 8.1
%global service_name postgresql.service
Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t...
@@ -1119,6 +1119,7 @@ make -C postgresql-setup-%{setup_version} check
* Fri Apr 13 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-2
- define %%precise_version helper macro
- drop explicit libpq.so provide from *-libs
+- update postgresql-setup tarball
* Thu Mar 01 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-1
- update to 10.3 per release notes:
diff --git a/sources b/sources
index 2cccdd0..ddd7ded 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-10.3.tar.bz2) = 05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea67
SHA512 (postgresql-10.3.tar.bz2.sha256) = f73a336b70910dde9fd092ad00bff0c3e9c0a724d5dc9f2aee5e6e2b2dbc434da00fed6c8008b922b49a7f54764408846b0ff0bf0b0b2c5492c9bbc002509a04
SHA512 (postgresql-9.6.8.tar.bz2) = 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
SHA512 (postgresql-9.6.8.tar.bz2.sha256) = 612d4a3d213db959a59d10bb26ff1654f988430688ae98d88d2585e9d66e914b15dd7853fa960e5e34f2ce4899120489a7417f7dd7af0d3af49b2bb026b3e3e2
-SHA512 (postgresql-setup-8.0.tar.gz) = 306b05b5aa3c2ad4419b1a9584d5ca9b1dc2e8f80bf2602e4f76cd23671a6cbd84a34bbf139db17ac917e5cddd12c3fa5d6fce50f80132443233bcd15964932a
+SHA512 (postgresql-setup-8.1.tar.gz) = c0505e81ab2b8cb6644403a0b1ceac18876ed811099717e730a4a6946c1832a8ef9e384d2051370551f764ed2efcc9da347590c3fa833034e9c595f43e1d8f48
SHA512 (postgresql-10.3-US.pdf) = d94b1eeafc6b20e1fefa01b2376f9a81a7597896a18ee355ef03d6a339930ef3412c286334b4ed9b947faa980f2afc163e4063f369e888b3a7220ab562b40693
commit 5b5042670f0c5c36dad6c2c8a90dbe7ff3cc54ab
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Apr 13 14:46:24 2018 +0200
define %precise_version
Version: 10.3-2
diff --git a/postgresql.spec b/postgresql.spec
index bfbc197..2f253dc 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -74,6 +74,7 @@ Url: http://www.postgresql.org/
%global prevversion 9.6.8
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
+%global precise_version %{?epoch:%epoch:}%version-%release
%global setup_version 8.0
@@ -167,7 +168,7 @@ BuildRequires: libselinux-devel
%endif
# main package requires -libs subpackage
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %precise_version
# https://bugzilla.redhat.com/1464368
%global __provides_exclude_from %{_libdir}/pgsql
@@ -185,7 +186,6 @@ postgresql-server sub-package.
%package libs
Summary: The shared libraries required for any PostgreSQL clients
Group: Applications/Databases
-Provides: libpq.so = %{version}-%{release}
# for /sbin/ldconfig
Requires(post): glibc
Requires(postun): glibc
@@ -200,8 +200,8 @@ PostgreSQL server.
%package server
Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %precise_version
+Requires: %{name}-libs%{?_isa} = %precise_version
Requires(pre): /usr/sbin/useradd
# We require this to be present for %%{_prefix}/lib/tmpfiles.d
Requires: systemd
@@ -225,9 +225,9 @@ and maintain PostgreSQL databases.
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %precise_version
# Just for more intuitive documentation installation
-Provides: %{name}-doc = %{version}-%{release}
+Provides: %{name}-doc = %precise_version
%description docs
The postgresql-docs package contains some additional documentation for
@@ -238,8 +238,8 @@ and source files for the PostgreSQL tutorial.
%package contrib
Summary: Extension modules distributed with PostgreSQL
Group: Applications/Databases
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %precise_version
+Requires: %{name}-libs%{?_isa} = %precise_version
%description contrib
The postgresql-contrib package contains various extension modules that are
@@ -249,7 +249,7 @@ included in the PostgreSQL distribution.
%package devel
Summary: PostgreSQL development header files and libraries
Group: Development/Libraries
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %precise_version
%description devel
The postgresql-devel package contains the header files and libraries
@@ -261,7 +261,7 @@ to develop applications which will interact with a PostgreSQL server.
%package static
Summary: Statically linked PostgreSQL libraries
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %precise_version
%description static
Statically linked PostgreSQL libraries that do not have dynamically linked
@@ -272,8 +272,8 @@ counterparts.
%package upgrade
Summary: Support for upgrading from the previous major release of PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %precise_version
+Requires: %{name}-libs%{?_isa} = %precise_version
Provides: bundled(postgresql-libs) = %prevversion
%description upgrade
@@ -284,7 +284,7 @@ version of PostgreSQL.
%package upgrade-devel
Summary: Support for build of extensions required for upgrade process
Group: Development/Libraries
-Requires: %{name}-upgrade%{?_isa} = %{version}-%{release}
+Requires: %{name}-upgrade%{?_isa} = %precise_version
%description upgrade-devel
The postgresql-devel package contains the header files and libraries
@@ -297,7 +297,7 @@ process.
%package plperl
Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %precise_version
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%if %runselftest
BuildRequires: perl(Data::Dumper)
@@ -313,8 +313,8 @@ Install this if you want to write database functions in Perl.
%package plpython
Summary: The Python2 procedural language for PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
-Provides: %{name}-plpython2 = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %precise_version
+Provides: %{name}-plpython2 = %precise_version
%description plpython
The postgresql-plpython package contains the PL/Python procedural language,
@@ -326,7 +326,7 @@ Install this if you want to write database functions in Python 2.
%package plpython3
Summary: The Python3 procedural language for PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %precise_version
%description plpython3
The postgresql-plpython3 package contains the PL/Python3 procedural language,
@@ -338,7 +338,7 @@ Install this if you want to write database functions in Python 3.
%package pltcl
Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %precise_version
Requires: tcl-pgtcl
%description pltcl
@@ -351,8 +351,8 @@ Install this if you want to write database functions in Tcl.
%package test
Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %precise_version
+Requires: %{name}-devel%{?_isa} = %precise_version
%description test
The postgresql-test package contains files needed for various tests for the
@@ -1116,6 +1116,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Fri Apr 13 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-2
+- define %%precise_version helper macro
+- drop explicit libpq.so provide from *-libs
+
* Thu Mar 01 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-1
- update to 10.3 per release notes:
https://www.postgresql.org/docs/10/static/release-10-3.html
commit d1c05385d105d2b248088758af4c3cd1215149ff
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Mar 1 18:04:31 2018 +0100
Drop -O3 for ppc* to work-around FTBFS with gcc 8.0
Related: rhbz#1544349
Version: 10.3-1
diff --git a/postgresql.spec b/postgresql.spec
index 01bf85a..bfbc197 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -412,7 +412,7 @@ cd ..
CFLAGS="${CFLAGS:-%optflags}"
%ifarch %{power64}
# See the bug #1051075, ppc64 should benefit from -O3
-CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100`
+# CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100`
%endif
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
commit 0948580a641b84eaad518e5c4b8e4f94f456a078
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Mar 1 13:53:45 2018 +0100
spec: add gcc to BuildRequires
Per https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequire
Version: 10.3-1
diff --git a/postgresql.spec b/postgresql.spec
index f07bd9a..01bf85a 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -105,6 +105,7 @@ Patch2: postgresql-logging.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+BuildRequires: gcc
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
%if 0%{?fedora} || 0%{?rhel} > 7
commit 7e0314402af8308b0e18e71f363ab3b52b1c4e2f
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Mar 1 13:02:42 2018 +0100
rebase: update to 10.3
Per release notes:
https://www.postgresql.org/docs/10/static/release-10-3.html
Version: 10.3-1
diff --git a/.gitignore b/.gitignore
index 82d1b99..5df967c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-10.2.tar.bz2
-/postgresql-10.2.tar.bz2.sha256
-/postgresql-9.6.7.tar.bz2
-/postgresql-9.6.7.tar.bz2.sha256
+/postgresql-10.3.tar.bz2
+/postgresql-10.3.tar.bz2.sha256
+/postgresql-9.6.8.tar.bz2
+/postgresql-9.6.8.tar.bz2.sha256
/postgresql-setup-8.0.tar.gz
-/postgresql-10.2-US.pdf
+/postgresql-10.3-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 2ffc171..f07bd9a 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
-Version: 10.2
+Version: 10.3
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -71,7 +71,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.6.7
+%global prevversion 9.6.8
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
@@ -1115,6 +1115,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Thu Mar 01 2018 Pavel Raiskup <praiskup(a)redhat.com> - 10.3-1
+- update to 10.3 per release notes:
+ https://www.postgresql.org/docs/10/static/release-10-3.html
+
* Thu Feb 08 2018 Petr Kubat <pkubat(a)redhat.com> - 10.2-1
- update to 10.2 per release notes:
https://www.postgresql.org/docs/10/static/release-10-2.html
diff --git a/sources b/sources
index 3c625b5..2cccdd0 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-10.2.tar.bz2) = bac61644c12c31e2dce97ec0134902a2a7141e922619015425961b963961b21210ca840f59ba585d3d75c7e34cb640f2ebeaa2b25c4a866db68f5e73a8f8a448
-SHA512 (postgresql-10.2.tar.bz2.sha256) = 048808e884918474a6f1c1fb75a9eeea3a69ede87ecec9aba614a605b4b49f2cd53c2c7e416fe3e073a8fccfc516cd70140c8a635ddb0cc03c96e2ae59a084f4
-SHA512 (postgresql-9.6.7.tar.bz2) = 6a66cdd5b74ea6dc95628b89bb7663555370be56b3e938f635950628ad5d77443ac8f40c747be1fc1cfc19ca8b0a27f41e52fe4db83a43c7a7bab9bb076c7844
-SHA512 (postgresql-9.6.7.tar.bz2.sha256) = c1cdf41a4e88c9b41a3ae30c81403f6c625a3e047ef4a5ccfec7a238a88923dd6b0dac358db44acd16c8bf938bed2bc26e42b342180dfd75485b17a14baa5cb6
+SHA512 (postgresql-10.3.tar.bz2) = 05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a29638970bf28ebf5bd1f877e8dcd9986d88f5c5e5379e74fe79ce83e20d2babba
+SHA512 (postgresql-10.3.tar.bz2.sha256) = f73a336b70910dde9fd092ad00bff0c3e9c0a724d5dc9f2aee5e6e2b2dbc434da00fed6c8008b922b49a7f54764408846b0ff0bf0b0b2c5492c9bbc002509a04
+SHA512 (postgresql-9.6.8.tar.bz2) = 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
+SHA512 (postgresql-9.6.8.tar.bz2.sha256) = 612d4a3d213db959a59d10bb26ff1654f988430688ae98d88d2585e9d66e914b15dd7853fa960e5e34f2ce4899120489a7417f7dd7af0d3af49b2bb026b3e3e2
SHA512 (postgresql-setup-8.0.tar.gz) = 306b05b5aa3c2ad4419b1a9584d5ca9b1dc2e8f80bf2602e4f76cd23671a6cbd84a34bbf139db17ac917e5cddd12c3fa5d6fce50f80132443233bcd15964932a
-SHA512 (postgresql-10.2-US.pdf) = 4fcf200d5298f55c2361daa7c469f43e0bb07b71e22299e328475c99c989e29a06930a1bf7ebf2d07615e4c515a4d446421311e2fdc04703924b816a49ba0311
+SHA512 (postgresql-10.3-US.pdf) = d94b1eeafc6b20e1fefa01b2376f9a81a7597896a18ee355ef03d6a339930ef3412c286334b4ed9b947faa980f2afc163e4063f369e888b3a7220ab562b40693
commit 82b3e4e96d40bb58fbba43aa58a67984d3f2cdf2
Author: Petr Kubat <pkubat(a)redhat.com>
Date: Thu Feb 8 10:35:53 2018 +0100
rebase: update to 10.2
Per release notes:
https://www.postgresql.org/docs/10/static/release-10-2.html
Version: 10.2-1
diff --git a/.gitignore b/.gitignore
index bd285e2..82d1b99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-10.1.tar.bz2
-/postgresql-10.1.tar.bz2.sha256
-/postgresql-9.6.6.tar.bz2
-/postgresql-9.6.6.tar.bz2.sha256
+/postgresql-10.2.tar.bz2
+/postgresql-10.2.tar.bz2.sha256
+/postgresql-9.6.7.tar.bz2
+/postgresql-9.6.7.tar.bz2.sha256
/postgresql-setup-8.0.tar.gz
-/postgresql-10.1-US.pdf
+/postgresql-10.2-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 8edc625..2ffc171 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,8 +58,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
-Version: 10.1
-Release: 5%{?dist}
+Version: 10.2
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -71,7 +71,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.6.6
+%global prevversion 9.6.7
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
@@ -1115,6 +1115,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Thu Feb 08 2018 Petr Kubat <pkubat(a)redhat.com> - 10.2-1
+- update to 10.2 per release notes:
+ https://www.postgresql.org/docs/10/static/release-10-2.html
+
* Sat Jan 20 2018 Bjrn Esser <besser82(a)fedoraproject.org> - 10.1-5
- Rebuilt for switch to libxcrypt
diff --git a/sources b/sources
index 20e11ea..3c625b5 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-10.1.tar.bz2) = 06050d353aa43f32e0de0199d833d8a4652aff893b718b1c40ed31837838f73fe4d977ac0f2164ab97b3eeff4aae3409f440601740898a893877d96bc0ed1882
-SHA512 (postgresql-10.1.tar.bz2.sha256) = 7f9d35825e81598841bd01d44ae9e3af9814c1af60c5fd8292a326f8ff7006975e1a19f9777c994151c61b4c0ec9d8f0214ceae8e3f41239b706c212ffe6df62
-SHA512 (postgresql-9.6.6.tar.bz2) = ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
-SHA512 (postgresql-9.6.6.tar.bz2.sha256) = 8ab0aadd03923bf7888f6de055432f7a0bca0c4d3287d38490ae542d87d22e5753b62f1fc30474e9d875b0317a94266bbda5ad4b2cf2dada2b2c480cd9a05772
+SHA512 (postgresql-10.2.tar.bz2) = bac61644c12c31e2dce97ec0134902a2a7141e922619015425961b963961b21210ca840f59ba585d3d75c7e34cb640f2ebeaa2b25c4a866db68f5e73a8f8a448
+SHA512 (postgresql-10.2.tar.bz2.sha256) = 048808e884918474a6f1c1fb75a9eeea3a69ede87ecec9aba614a605b4b49f2cd53c2c7e416fe3e073a8fccfc516cd70140c8a635ddb0cc03c96e2ae59a084f4
+SHA512 (postgresql-9.6.7.tar.bz2) = 6a66cdd5b74ea6dc95628b89bb7663555370be56b3e938f635950628ad5d77443ac8f40c747be1fc1cfc19ca8b0a27f41e52fe4db83a43c7a7bab9bb076c7844
+SHA512 (postgresql-9.6.7.tar.bz2.sha256) = c1cdf41a4e88c9b41a3ae30c81403f6c625a3e047ef4a5ccfec7a238a88923dd6b0dac358db44acd16c8bf938bed2bc26e42b342180dfd75485b17a14baa5cb6
SHA512 (postgresql-setup-8.0.tar.gz) = 306b05b5aa3c2ad4419b1a9584d5ca9b1dc2e8f80bf2602e4f76cd23671a6cbd84a34bbf139db17ac917e5cddd12c3fa5d6fce50f80132443233bcd15964932a
-SHA512 (postgresql-10.1-US.pdf) = 8bbd10fc2e3704af0a82f9c4c0aa483109ff606bd784e923831ac7be8ff833245fe3036129a74cc5e01ec2a89f6519f625aa18ff27132a9c314b3db51fcddb5b
+SHA512 (postgresql-10.2-US.pdf) = 4fcf200d5298f55c2361daa7c469f43e0bb07b71e22299e328475c99c989e29a06930a1bf7ebf2d07615e4c515a4d446421311e2fdc04703924b816a49ba0311
commit 0df80d97f373d12ca54065a73b7320b2bd44c489
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Sat Jan 20 23:07:35 2018 +0100
Rebuilt for switch to libxcrypt
diff --git a/postgresql.spec b/postgresql.spec
index be02915..8edc625 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.1
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1115,6 +1115,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Sat Jan 20 2018 Bjrn Esser <besser82(a)fedoraproject.org> - 10.1-5
+- Rebuilt for switch to libxcrypt
+
* Tue Dec 19 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-4
- configure with --with-systemd (rhbz#1414314)
- disable startup timeout of PostgreSQL service (rhbz#1525477)
commit a820a9eff8311b74bfafcd3a3392bab6dbe9ced7
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Dec 19 15:55:16 2017 +0100
spec: cleanup %if-fork for obsoleted fedora versions
diff --git a/postgresql.spec b/postgresql.spec
index 78b2f97..be02915 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -34,11 +34,7 @@
%{!?test:%global test 1}
%{!?upgrade:%global upgrade 1}
%{!?plpython:%global plpython 1}
-%if 0%{?fedora} > 12
%{!?plpython3:%global plpython3 1}
-%else
-%{!?plpython3:%global plpython3 0}
-%endif
%{!?pltcl:%global pltcl 1}
%{!?plperl:%global plperl 1}
%{!?ssl:%global ssl 1}
commit 5dec06f6e58f6a0758e8fae85c3321ea9226225e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Dec 19 10:50:35 2017 +0100
service: use sd_notify and disable timeout
Resolves: rhbz#1414314, rhbz#1525477
Version: 10.1-4
diff --git a/.gitignore b/.gitignore
index b906101..bd285e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
/postgresql-10.1.tar.bz2.sha256
/postgresql-9.6.6.tar.bz2
/postgresql-9.6.6.tar.bz2.sha256
-/postgresql-setup-7.0.tar.gz
+/postgresql-setup-8.0.tar.gz
/postgresql-10.1-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 7c9f907..78b2f97 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.1
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -79,7 +79,7 @@ Url: http://www.postgresql.org/
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
-%global setup_version 7.0
+%global setup_version 8.0
%global service_name postgresql.service
Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t...
@@ -115,7 +115,7 @@ BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: perl-generators
%endif
BuildRequires: readline-devel zlib-devel
-BuildRequires: systemd util-linux
+BuildRequires: systemd systemd-devel util-linux
BuildRequires: multilib-rpm-config
# postgresql-setup build requires
@@ -469,6 +469,7 @@ common_configure_options='
%endif
--with-system-tzdata=%_datadir/zoneinfo
--datadir=%_datadir/pgsql
+ --with-systemd
'
%if %plpython3
@@ -1024,7 +1025,6 @@ make -C postgresql-setup-%{setup_version} check
%dir %{_libexecdir}/initscripts/legacy-actions/postgresql
%{_libexecdir}/initscripts/legacy-actions/postgresql/*
%{_libexecdir}/postgresql-check-db-dir
-%{_libexecdir}/postgresql-ctl
%dir %{_sysconfdir}/postgresql-setup
%dir %{_sysconfdir}/postgresql-setup/upgrade
%config %{_sysconfdir}/postgresql-setup/upgrade/*.conf
@@ -1119,6 +1119,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Tue Dec 19 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-4
+- configure with --with-systemd (rhbz#1414314)
+- disable startup timeout of PostgreSQL service (rhbz#1525477)
+
* Wed Dec 13 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-3
- unify %%configure options for python2/python3 configure
- drop --with-krb5 option, not supported since PostgreSQL 9.4
diff --git a/sources b/sources
index 657ef45..20e11ea 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-10.1.tar.bz2) = 06050d353aa43f32e0de0199d833d8a4652aff893b718
SHA512 (postgresql-10.1.tar.bz2.sha256) = 7f9d35825e81598841bd01d44ae9e3af9814c1af60c5fd8292a326f8ff7006975e1a19f9777c994151c61b4c0ec9d8f0214ceae8e3f41239b706c212ffe6df62
SHA512 (postgresql-9.6.6.tar.bz2) = ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
SHA512 (postgresql-9.6.6.tar.bz2.sha256) = 8ab0aadd03923bf7888f6de055432f7a0bca0c4d3287d38490ae542d87d22e5753b62f1fc30474e9d875b0317a94266bbda5ad4b2cf2dada2b2c480cd9a05772
-SHA512 (postgresql-setup-7.0.tar.gz) = aabdfa55e7d9f274aab0a98735e60e12169265927da6242072f8bb3b4ae6d729a6c7318e15e0dc38662d999429a6f98c1dc0a5e1b4809ebdba8645298f362bcc
+SHA512 (postgresql-setup-8.0.tar.gz) = 306b05b5aa3c2ad4419b1a9584d5ca9b1dc2e8f80bf2602e4f76cd23671a6cbd84a34bbf139db17ac917e5cddd12c3fa5d6fce50f80132443233bcd15964932a
SHA512 (postgresql-10.1-US.pdf) = 8bbd10fc2e3704af0a82f9c4c0aa483109ff606bd784e923831ac7be8ff833245fe3036129a74cc5e01ec2a89f6519f625aa18ff27132a9c314b3db51fcddb5b
commit ead24cd1551a6a5e4480cc4ea05844a1c38457ad
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Dec 13 14:14:50 2017 +0100
spec: provides/requires s/python/python2/
Version: 10.1-3
diff --git a/postgresql.spec b/postgresql.spec
index 647e2c7..7c9f907 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -122,7 +122,7 @@ BuildRequires: multilib-rpm-config
BuildRequires: m4 elinks docbook-utils help2man
%if %plpython
-BuildRequires: python-devel
+BuildRequires: python2-devel
%endif
%if %plpython3
@@ -317,6 +317,7 @@ Install this if you want to write database functions in Perl.
Summary: The Python2 procedural language for PostgreSQL
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Provides: %{name}-plpython2 = %{version}-%{release}
%description plpython
The postgresql-plpython package contains the PL/Python procedural language,
@@ -1121,6 +1122,7 @@ make -C postgresql-setup-%{setup_version} check
* Wed Dec 13 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-3
- unify %%configure options for python2/python3 configure
- drop --with-krb5 option, not supported since PostgreSQL 9.4
+- python packaging - requires/provides s/python/python2/
* Tue Nov 14 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-2
- postgresql-setup v7.0
commit 55a65cc10168a164d044e045f4c5ed3bb4652e4a
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Dec 13 12:19:25 2017 +0100
spec: drop unsupported --with-krb5
Version: 10.1-3
diff --git a/postgresql.spec b/postgresql.spec
index e0dcaa1..647e2c7 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -448,7 +448,6 @@ common_configure_options='
--with-pam
%endif
%if %kerberos
- --with-krb5
--with-gssapi
%endif
%if %uuid
@@ -1121,6 +1120,7 @@ make -C postgresql-setup-%{setup_version} check
%changelog
* Wed Dec 13 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-3
- unify %%configure options for python2/python3 configure
+- drop --with-krb5 option, not supported since PostgreSQL 9.4
* Tue Nov 14 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-2
- postgresql-setup v7.0
commit 5fbaf23499fa60ad03f53dc8df051f435f312ddc
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Dec 13 11:57:29 2017 +0100
spec: python{2,3} %configure opts on one place
Version: 10.1-3
diff --git a/postgresql.spec b/postgresql.spec
index 9997f09..e0dcaa1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -425,57 +425,59 @@ export CFLAGS
# distclean and do it again for the "normal" build. Note that the installed
# Makefile.global will reflect the python 2 build, which seems appropriate
# since that's still considered the default plpython version.
-%if %plpython3
-
-export PYTHON=/usr/bin/python3
-
-# These configure options must match main build
-%configure --disable-rpath \
+common_configure_options='
+ --disable-rpath
%if %beta
- --enable-debug \
- --enable-cassert \
+ --enable-debug
+ --enable-cassert
%endif
%if %plperl
- --with-perl \
+ --with-perl
%endif
%if %pltcl
- --with-tcl \
- --with-tclconfig=%{_libdir} \
-%endif
-%if %plpython3
- --with-python \
+ --with-tcl
+ --with-tclconfig=%_libdir
%endif
%if %ldap
- --with-ldap \
+ --with-ldap
%endif
%if %ssl
- --with-openssl \
+ --with-openssl
%endif
%if %pam
- --with-pam \
+ --with-pam
%endif
%if %kerberos
- --with-krb5 \
- --with-gssapi \
+ --with-krb5
+ --with-gssapi
%endif
%if %uuid
- --with-ossp-uuid \
+ --with-ossp-uuid
%endif
%if %xml
- --with-libxml \
- --with-libxslt \
+ --with-libxml
+ --with-libxslt
%endif
%if %nls
- --enable-nls \
+ --enable-nls
%endif
%if %sdt
- --enable-dtrace \
+ --enable-dtrace
%endif
%if %selinux
- --with-selinux \
+ --with-selinux
%endif
- --with-system-tzdata=%{_datadir}/zoneinfo \
- --datadir=%{_datadir}/pgsql
+ --with-system-tzdata=%_datadir/zoneinfo
+ --datadir=%_datadir/pgsql
+'
+
+%if %plpython3
+
+export PYTHON=/usr/bin/python3
+
+# These configure options must match main build
+%configure $common_configure_options \
+ --with-python
# Fortunately we don't need to build much except plpython itself.
make %{?_smp_mflags} -C src/pl/plpython all
@@ -487,58 +489,15 @@ cp src/Makefile.global src/Makefile.global.python3
make distclean
-%endif
+%endif # %%plpython3
unset PYTHON
-# Normal (not python3) build begins here
-
-%configure --disable-rpath \
-%if %beta
- --enable-debug \
- --enable-cassert \
-%endif
-%if %plperl
- --with-perl \
-%endif
-%if %pltcl
- --with-tcl \
- --with-tclconfig=%{_libdir} \
-%endif
+# Normal (python2) build begins here
+%configure $common_configure_options \
%if %plpython
- --with-python \
-%endif
-%if %ldap
- --with-ldap \
-%endif
-%if %ssl
- --with-openssl \
-%endif
-%if %pam
- --with-pam \
-%endif
-%if %kerberos
- --with-krb5 \
- --with-gssapi \
-%endif
-%if %uuid
- --with-ossp-uuid \
+ --with-python
%endif
-%if %xml
- --with-libxml \
- --with-libxslt \
-%endif
-%if %nls
- --enable-nls \
-%endif
-%if %sdt
- --enable-dtrace \
-%endif
-%if %selinux
- --with-selinux \
-%endif
- --with-system-tzdata=%_datadir/zoneinfo \
- --datadir=%_datadir/pgsql
make %{?_smp_mflags} world
@@ -1160,6 +1119,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Wed Dec 13 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-3
+- unify %%configure options for python2/python3 configure
+
* Tue Nov 14 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-2
- postgresql-setup v7.0
commit 0a81447ee3889c89f9d9a10e6a641863734f4124
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Nov 14 15:10:10 2017 +0100
postgresql-setup: update to version 7.0
Version: 10.1-2
diff --git a/.gitignore b/.gitignore
index 7b83145..b906101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
/postgresql-10.1.tar.bz2.sha256
/postgresql-9.6.6.tar.bz2
/postgresql-9.6.6.tar.bz2.sha256
-/postgresql-setup-6.0.tar.gz
+/postgresql-setup-7.0.tar.gz
/postgresql-10.1-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 244bfcc..9997f09 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -79,7 +79,7 @@ Url: http://www.postgresql.org/
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
-%global setup_version 6.0
+%global setup_version 7.0
%global service_name postgresql.service
Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t...
@@ -630,7 +630,6 @@ test "$test_failure" -eq 0
%endif
%install
-
cd postgresql-setup-%{setup_version}
make install DESTDIR=$RPM_BUILD_ROOT
cd ..
@@ -1161,6 +1160,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Tue Nov 14 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-2
+- postgresql-setup v7.0
+
* Wed Nov 08 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-1
- update to 10.1 per release notes:
https://www.postgresql.org/docs/10/static/release-10-1.html
diff --git a/sources b/sources
index 0ed9e54..657ef45 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-10.1.tar.bz2) = 06050d353aa43f32e0de0199d833d8a4652aff893b718
SHA512 (postgresql-10.1.tar.bz2.sha256) = 7f9d35825e81598841bd01d44ae9e3af9814c1af60c5fd8292a326f8ff7006975e1a19f9777c994151c61b4c0ec9d8f0214ceae8e3f41239b706c212ffe6df62
SHA512 (postgresql-9.6.6.tar.bz2) = ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
SHA512 (postgresql-9.6.6.tar.bz2.sha256) = 8ab0aadd03923bf7888f6de055432f7a0bca0c4d3287d38490ae542d87d22e5753b62f1fc30474e9d875b0317a94266bbda5ad4b2cf2dada2b2c480cd9a05772
-SHA512 (postgresql-setup-6.0.tar.gz) = 4fa02b35d3b2d1d79193fd3a6af02532b5a6736dbae23cad485492acd4eb0c5f25159f36eb445a63eac0097ec4c52f57c58b0960fa012577c24daac5a032b243
+SHA512 (postgresql-setup-7.0.tar.gz) = aabdfa55e7d9f274aab0a98735e60e12169265927da6242072f8bb3b4ae6d729a6c7318e15e0dc38662d999429a6f98c1dc0a5e1b4809ebdba8645298f362bcc
SHA512 (postgresql-10.1-US.pdf) = 8bbd10fc2e3704af0a82f9c4c0aa483109ff606bd784e923831ac7be8ff833245fe3036129a74cc5e01ec2a89f6519f625aa18ff27132a9c314b3db51fcddb5b
commit 971c8f8aa3d712bb8fa2493883ac24b7981ce8fe
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Nov 8 07:10:17 2017 +0100
rebase: security update to 10.1
Per release notes:
https://www.postgresql.org/docs/10/static/release-10-1.html
Version: 10.1-1
diff --git a/.gitignore b/.gitignore
index 52617e2..7b83145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-10.0.tar.bz2
-/postgresql-10.0.tar.bz2.sha256
-/postgresql-9.6.5.tar.bz2
-/postgresql-9.6.5.tar.bz2.sha256
+/postgresql-10.1.tar.bz2
+/postgresql-10.1.tar.bz2.sha256
+/postgresql-9.6.6.tar.bz2
+/postgresql-9.6.6.tar.bz2.sha256
/postgresql-setup-6.0.tar.gz
-/postgresql-10.0-US.pdf
+/postgresql-10.1-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 7c305c7..244bfcc 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -62,8 +62,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
-Version: 10.0
-Release: 4%{?dist}
+Version: 10.1
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -75,7 +75,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.6.5
+%global prevversion 9.6.6
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
@@ -1161,6 +1161,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Wed Nov 08 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.1-1
+- update to 10.1 per release notes:
+ https://www.postgresql.org/docs/10/static/release-10-1.html
+
* Mon Nov 06 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-4
- rebase to new postgresql-setup 6.0 version, to fix CVE-2017-15097
diff --git a/sources b/sources
index 2bb8f23..0ed9e54 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-10.0.tar.bz2) = 88295af13db77a85a604c925aa627d383fdac62c1185119bba87753ce4167a13aed0f055a7a1329b3051f8757c6ba7529baed00a564ef0cfbee685720f282678
-SHA512 (postgresql-10.0.tar.bz2.sha256) = 69b10891bf6b99d3f0b05e17ac58d6148fdc73f59008fdfe7baab238515b5961b638afed3f0a3c4fd4786479bd53d16f413d8f22cd9c5d9a0f5df829aedbc04f
-SHA512 (postgresql-9.6.5.tar.bz2) = ad35c27ea55b18005ea61b49d6994718df86519b3f99addd0ecb17ece1f1c34764eb5194f8961c45cfa75703d810baf54433f8538cfd43a70bd908e1e5878df9
-SHA512 (postgresql-9.6.5.tar.bz2.sha256) = 8cfe5bfb00689ae30b6a3ddbccb8c74c0be244e2317ffa33dc89e56838d8b06a81a59cef0a204fff4f8ef23f7cffd7579b96b2d9207a5efb069e2160c2381a05
+SHA512 (postgresql-10.1.tar.bz2) = 06050d353aa43f32e0de0199d833d8a4652aff893b718b1c40ed31837838f73fe4d977ac0f2164ab97b3eeff4aae3409f440601740898a893877d96bc0ed1882
+SHA512 (postgresql-10.1.tar.bz2.sha256) = 7f9d35825e81598841bd01d44ae9e3af9814c1af60c5fd8292a326f8ff7006975e1a19f9777c994151c61b4c0ec9d8f0214ceae8e3f41239b706c212ffe6df62
+SHA512 (postgresql-9.6.6.tar.bz2) = ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
+SHA512 (postgresql-9.6.6.tar.bz2.sha256) = 8ab0aadd03923bf7888f6de055432f7a0bca0c4d3287d38490ae542d87d22e5753b62f1fc30474e9d875b0317a94266bbda5ad4b2cf2dada2b2c480cd9a05772
SHA512 (postgresql-setup-6.0.tar.gz) = 4fa02b35d3b2d1d79193fd3a6af02532b5a6736dbae23cad485492acd4eb0c5f25159f36eb445a63eac0097ec4c52f57c58b0960fa012577c24daac5a032b243
-SHA512 (postgresql-10.0-US.pdf) = 16991add93157fd846ba4be5d290ab8f37a94097ea285898080f5dca302fd0ae65a521eccf22a3a9ce44902aefdd7019de945cc532ebecb009bfbc18b1b2f72e
+SHA512 (postgresql-10.1-US.pdf) = 8bbd10fc2e3704af0a82f9c4c0aa483109ff606bd784e923831ac7be8ff833245fe3036129a74cc5e01ec2a89f6519f625aa18ff27132a9c314b3db51fcddb5b
commit 6f2e35359f2dedfa302ab91d3096366de13f2eb3
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Nov 8 07:01:14 2017 +0100
postgresql-setup: fix CVE-2017-15097
Fixed by updating the postgresql-setup tarball.
Resolves: CVE-2017-15097
Version: 10.0-4
diff --git a/.gitignore b/.gitignore
index 5db7ae7..52617e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
/postgresql-10.0.tar.bz2.sha256
/postgresql-9.6.5.tar.bz2
/postgresql-9.6.5.tar.bz2.sha256
-/postgresql-setup-5.1.tar.gz
+/postgresql-setup-6.0.tar.gz
/postgresql-10.0-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 56eb289..7c305c7 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.0
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -79,7 +79,7 @@ Url: http://www.postgresql.org/
%global prevmajorversion 9.6
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
-%global setup_version 5.1
+%global setup_version 6.0
%global service_name postgresql.service
Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t...
@@ -1078,8 +1078,10 @@ make -C postgresql-setup-%{setup_version} check
%{_mandir}/man1/pg_resetwal.*
%{_mandir}/man1/pg_rewind.*
%{_mandir}/man1/postgres.*
+%{_mandir}/man1/postgresql-new-systemd-unit.*
%{_mandir}/man1/postgresql-setup.*
%{_mandir}/man1/postmaster.*
+%{_sbindir}/postgresql-new-systemd-unit
%{_tmpfilesdir}/postgresql.conf
%{_unitdir}/*postgresql*.service
%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql
@@ -1159,6 +1161,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Mon Nov 06 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-4
+- rebase to new postgresql-setup 6.0 version, to fix CVE-2017-15097
+
* Thu Oct 12 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-3
- confess that we bundle setup scripts and previous version of ourseleves
- provide %%postgresql_upgrade_prefix macro
diff --git a/sources b/sources
index 73f17ba..2bb8f23 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-10.0.tar.bz2) = 88295af13db77a85a604c925aa627d383fdac62c11851
SHA512 (postgresql-10.0.tar.bz2.sha256) = 69b10891bf6b99d3f0b05e17ac58d6148fdc73f59008fdfe7baab238515b5961b638afed3f0a3c4fd4786479bd53d16f413d8f22cd9c5d9a0f5df829aedbc04f
SHA512 (postgresql-9.6.5.tar.bz2) = ad35c27ea55b18005ea61b49d6994718df86519b3f99addd0ecb17ece1f1c34764eb5194f8961c45cfa75703d810baf54433f8538cfd43a70bd908e1e5878df9
SHA512 (postgresql-9.6.5.tar.bz2.sha256) = 8cfe5bfb00689ae30b6a3ddbccb8c74c0be244e2317ffa33dc89e56838d8b06a81a59cef0a204fff4f8ef23f7cffd7579b96b2d9207a5efb069e2160c2381a05
-SHA512 (postgresql-setup-5.1.tar.gz) = f901c2f5f0b60a51a46fce1abf3a9854b97d1f1337a4659d73d3e2930518a35eef94de400d259f2a799652ac6acef9575b9d474cc929641f2659aed195254981
+SHA512 (postgresql-setup-6.0.tar.gz) = 4fa02b35d3b2d1d79193fd3a6af02532b5a6736dbae23cad485492acd4eb0c5f25159f36eb445a63eac0097ec4c52f57c58b0960fa012577c24daac5a032b243
SHA512 (postgresql-10.0-US.pdf) = 16991add93157fd846ba4be5d290ab8f37a94097ea285898080f5dca302fd0ae65a521eccf22a3a9ce44902aefdd7019de945cc532ebecb009bfbc18b1b2f72e
commit 07894e0da4b994092abd0084fba982e075ccf3f3
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Oct 12 12:48:14 2017 +0200
upgrade: provide %postgresql_upgrade_prefix macro
Related: rhbz#1475177
Version: 10.0-3
diff --git a/postgresql.spec b/postgresql.spec
index 021b7cd..56eb289 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -77,6 +77,7 @@ Url: http://www.postgresql.org/
# but update when bugs affecting pg_dump output are fixed.
%global prevversion 9.6.5
%global prevmajorversion 9.6
+%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
%global setup_version 5.1
@@ -615,7 +616,7 @@ test "$test_failure" -eq 0
CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" ./configure \
--build=%{_build} \
--host=%{_host} \
- --prefix=%{_libdir}/pgsql/postgresql-%{prevmajorversion} \
+ --prefix=%prev_prefix \
--disable-rpath \
%if %beta
--enable-debug \
@@ -734,6 +735,9 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_pro
rm share/*.sql
rm share/*.txt
popd
+ cat <<EOF > $RPM_BUILD_ROOT%macrosdir/macros.%name-upgrade
+%%postgresql_upgrade_prefix %prev_prefix
+EOF
%endif
@@ -1101,7 +1105,7 @@ make -C postgresql-setup-%{setup_version} check
%{_mandir}/man1/ecpg.*
%{_mandir}/man1/pg_config.*
%{_mandir}/man3/SPI_*
-%{macrosdir}/*
+%{macrosdir}/macros.%name
%files static
%{_libdir}/libpgcommon.a
@@ -1121,6 +1125,7 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/include
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs
+%{macrosdir}/macros.%name-upgrade
%endif
%if %plperl
@@ -1156,6 +1161,7 @@ make -C postgresql-setup-%{setup_version} check
%changelog
* Thu Oct 12 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-3
- confess that we bundle setup scripts and previous version of ourseleves
+- provide %%postgresql_upgrade_prefix macro
* Mon Oct 09 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-2
- stricter separation of files in upgrade/upgrade-devel
commit 4a3d2412bced22f79c9ab1749b251b5caef52403
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Oct 12 11:14:20 2017 +0200
bundling: confess postgresql-setup and prevversion bundles
Version: 10.0-3
diff --git a/postgresql.spec b/postgresql.spec
index 5c74ab1..021b7cd 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -215,6 +215,7 @@ Requires: systemd
# This will automatically guard against incompatible server & plugin
# installation (#1008939, #1007840)
Provides: %{name}-server(:MODULE_COMPAT_%{majorversion})
+Provides: bundled(postgresql-setup) = %setup_version
%description server
PostgreSQL is an advanced Object-Relational database management system (DBMS).
@@ -275,6 +276,7 @@ Summary: Support for upgrading from the previous major release of PostgreSQL
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Provides: bundled(postgresql-libs) = %prevversion
%description upgrade
The postgresql-upgrade package contains the pg_upgrade utility and supporting
@@ -1152,6 +1154,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Thu Oct 12 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-3
+- confess that we bundle setup scripts and previous version of ourseleves
+
* Mon Oct 09 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-2
- stricter separation of files in upgrade/upgrade-devel
commit 83fb3d530ab5507e053b6aa9a1e06f5f47d1b0a3
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Oct 9 08:46:02 2017 +0200
upgrade-devel: stricter separation from 'postgresql-upgrade'
Related: rhbz#1475177
Version: 10.0-2
diff --git a/postgresql.spec b/postgresql.spec
index 59884be..5c74ab1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -718,12 +718,14 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_pro
rm bin/pg_dump
rm bin/pg_dumpall
rm bin/pg_restore
+ rm bin/pgbench
rm bin/psql
rm bin/reindexdb
rm bin/vacuumdb
rm -rf share/doc
rm -rf share/man
rm -rf share/tsearch_data
+ rm -rf lib/*.a
rm share/*.bki
rm share/*description
rm share/*.sample
@@ -1105,17 +1107,18 @@ make -C postgresql-setup-%{setup_version} check
%if %upgrade
%files upgrade
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin
+%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib
+%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs
+%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/share
%files upgrade-devel
%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}/include/*
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/dict_snowball.so
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/libecpg*
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/libpg*
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/libpq*
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs/*
-%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/plpgsql.so
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/include
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs
%endif
%if %plperl
@@ -1149,6 +1152,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Mon Oct 09 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-2
+- stricter separation of files in upgrade/upgrade-devel
+
* Mon Oct 09 2017 Jozef Mlich <jmlich(a)redhat.com> - 10.0-2
- support for upgrade with extenstions
i.e the postgresql-upgrade-devel subpackage was added (rhbz#1475177)
commit 710aefbd49ae71fd394447d8743a221966c7c86f
Author: Jozef Mlch <jmlich(a)redhat.com>
Date: Mon Oct 9 08:02:03 2017 +0200
upgrade-devel: support for upgrade with extenstions
Related: rhbz#1475177
Version: 10.0-2
diff --git a/postgresql.spec b/postgresql.spec
index 2e0e928..59884be 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 10
Version: 10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -280,6 +280,16 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
The postgresql-upgrade package contains the pg_upgrade utility and supporting
files needed for upgrading a PostgreSQL database from the previous major
version of PostgreSQL.
+
+%package upgrade-devel
+Summary: Support for build of extensions required for upgrade process
+Group: Development/Libraries
+Requires: %{name}-upgrade%{?_isa} = %{version}-%{release}
+
+%description upgrade-devel
+The postgresql-devel package contains the header files and libraries
+needed to compile C or C++ applications which are necessary in upgrade
+process.
%endif
@@ -705,20 +715,12 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_pro
rm bin/ecpg
rm bin/initdb
rm bin/pg_basebackup
- rm bin/pg_config
rm bin/pg_dump
rm bin/pg_dumpall
rm bin/pg_restore
rm bin/psql
rm bin/reindexdb
rm bin/vacuumdb
- rm -rf include
- rm lib/dict_snowball.so
- rm lib/libecpg*
- rm lib/libpg*
- rm lib/libpq*
- rm -rf lib/pgxs
- rm lib/plpgsql.so
rm -rf share/doc
rm -rf share/man
rm -rf share/tsearch_data
@@ -1104,6 +1106,16 @@ make -C postgresql-setup-%{setup_version} check
%if %upgrade
%files upgrade
%{_libdir}/pgsql/postgresql-%{prevmajorversion}
+
+%files upgrade-devel
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/include/*
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/dict_snowball.so
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/libecpg*
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/libpg*
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/libpq*
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs/*
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/plpgsql.so
%endif
%if %plperl
@@ -1137,6 +1149,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Mon Oct 09 2017 Jozef Mlich <jmlich(a)redhat.com> - 10.0-2
+- support for upgrade with extenstions
+ i.e the postgresql-upgrade-devel subpackage was added (rhbz#1475177)
+
* Fri Oct 06 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-1
- update to 10.0 per release notes:
https://www.postgresql.org/docs/10/static/release-10.html
commit d3a91d27a0c3c44f41b8e86341b8f281c23571b8
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Oct 6 20:27:44 2017 +0200
rebase: update to 10.0
Per release notes:
https://www.postgresql.org/docs/10/static/release-10.html
Version: 10.0-1
diff --git a/.gitignore b/.gitignore
index 25a4967..5db7ae7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-9.5.9.tar.bz2
-/postgresql-9.5.9.tar.bz2.sha256
+/postgresql-10.0.tar.bz2
+/postgresql-10.0.tar.bz2.sha256
/postgresql-9.6.5.tar.bz2
/postgresql-9.6.5.tar.bz2.sha256
/postgresql-setup-5.1.tar.gz
-/postgresql-9.6.5-US.pdf
+/postgresql-10.0-US.pdf
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
index a051014..76ff7b8 100644
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@@ -13,9 +13,9 @@ diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample
# into log files. Required to be on for
# csvlogs.
# (change requires restart)
-@@ -287,11 +287,11 @@
+@@ -355,11 +355,11 @@
# These are only used if logging_collector is on:
- #log_directory = 'pg_log' # directory where log files are written,
+ #log_directory = 'log' # directory where log files are written,
# can be absolute or relative to PGDATA
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern,
+log_filename = 'postgresql-%a.log' # log file name pattern,
@@ -27,7 +27,7 @@ diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
-@@ -299,9 +299,9 @@
+@@ -367,9 +367,9 @@
# or size-driven rotation. Default is
# off, meaning append to existing files
# in all cases.
diff --git a/postgresql.spec b/postgresql.spec
index 06560fe..2e0e928 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -61,9 +61,9 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.6
-Version: 9.6.5
-Release: 2%{?dist}
+%global majorversion 10
+Version: 10.0
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -75,8 +75,8 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.5.9
-%global prevmajorversion 9.5
+%global prevversion 9.6.5
+%global prevmajorversion 9.6
%global setup_version 5.1
@@ -770,6 +770,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plpython2.so
cp /dev/null main.lst
cp /dev/null libs.lst
cp /dev/null server.lst
+cp /dev/null contrib.lst
cp /dev/null devel.lst
cp /dev/null plperl.lst
cp /dev/null pltcl.lst
@@ -777,53 +778,35 @@ cp /dev/null plpython.lst
cp /dev/null plpython3.lst
%if %nls
-%find_lang ecpg-%{majorversion}
-cat ecpg-%{majorversion}.lang >>devel.lst
-%find_lang ecpglib6-%{majorversion}
-cat ecpglib6-%{majorversion}.lang >>libs.lst
-%find_lang initdb-%{majorversion}
-cat initdb-%{majorversion}.lang >>server.lst
-%find_lang libpq5-%{majorversion}
-cat libpq5-%{majorversion}.lang >>libs.lst
-%find_lang pg_basebackup-%{majorversion}
-cat pg_basebackup-%{majorversion}.lang >>server.lst
-%find_lang pg_controldata-%{majorversion}
-cat pg_controldata-%{majorversion}.lang >>server.lst
-%find_lang pg_ctl-%{majorversion}
-cat pg_ctl-%{majorversion}.lang >>server.lst
-%find_lang pg_config-%{majorversion}
-cat pg_config-%{majorversion}.lang >>main.lst
-%find_lang pg_dump-%{majorversion}
-cat pg_dump-%{majorversion}.lang >>main.lst
-%find_lang pg_resetxlog-%{majorversion}
-cat pg_resetxlog-%{majorversion}.lang >>server.lst
-%find_lang pg_rewind-%{majorversion}
-cat pg_rewind-%{majorversion}.lang >>server.lst
-%find_lang pgscripts-%{majorversion}
-cat pgscripts-%{majorversion}.lang >>main.lst
+find_lang_bins ()
+{
+ lstfile=$1 ; shift
+ for binary; do
+ %find_lang "$binary"-%{majorversion}
+ cat "$binary"-%{majorversion}.lang >>$lstfile
+ done
+}
+find_lang_bins devel.lst ecpg
+find_lang_bins libs.lst ecpglib6 libpq5
+find_lang_bins server.lst \
+ initdb pg_basebackup pg_controldata pg_ctl pg_resetwal pg_rewind plpgsql postgres
+find_lang_bins contrib.lst \
+ pg_archivecleanup pg_test_fsync pg_test_timing pg_waldump
+find_lang_bins main.lst \
+ pg_config pg_dump pg_upgrade pgscripts psql
%if %plperl
-%find_lang plperl-%{majorversion}
-cat plperl-%{majorversion}.lang >>plperl.lst
+find_lang_bins plperl.lst plperl
%endif
-%find_lang plpgsql-%{majorversion}
-cat plpgsql-%{majorversion}.lang >>server.lst
%if %plpython
-%find_lang plpython-%{majorversion}
-cat plpython-%{majorversion}.lang >>plpython.lst
+find_lang_bins plpython.lst plpython
%endif
%if %plpython3
# plpython3 shares message files with plpython
-%find_lang plpython-%{majorversion}
-cat plpython-%{majorversion}.lang >>plpython3.lst
+find_lang_bins plpython3.lst plpython
%endif
%if %pltcl
-%find_lang pltcl-%{majorversion}
-cat pltcl-%{majorversion}.lang >>pltcl.lst
+find_lang_bins pltcl.lst pltcl
%endif
-%find_lang postgres-%{majorversion}
-cat postgres-%{majorversion}.lang >>server.lst
-%find_lang psql-%{majorversion}
-cat psql-%{majorversion}.lang >>main.lst
%endif
%post libs -p /sbin/ldconfig
@@ -862,10 +845,8 @@ make -C postgresql-setup-%{setup_version} check
%doc README.rpm-dist
%{_bindir}/clusterdb
%{_bindir}/createdb
-%{_bindir}/createlang
%{_bindir}/createuser
%{_bindir}/dropdb
-%{_bindir}/droplang
%{_bindir}/dropuser
%{_bindir}/pg_dump
%{_bindir}/pg_dumpall
@@ -877,10 +858,8 @@ make -C postgresql-setup-%{setup_version} check
%{_bindir}/vacuumdb
%{_mandir}/man1/clusterdb.*
%{_mandir}/man1/createdb.*
-%{_mandir}/man1/createlang.*
%{_mandir}/man1/createuser.*
%{_mandir}/man1/dropdb.*
-%{_mandir}/man1/droplang.*
%{_mandir}/man1/dropuser.*
%{_mandir}/man1/pg_dump.*
%{_mandir}/man1/pg_dumpall.*
@@ -897,17 +876,18 @@ make -C postgresql-setup-%{setup_version} check
%doc doc/html
%{_libdir}/pgsql/tutorial/
-%files contrib
+%files contrib -f contrib.lst
%doc contrib/spi/*.example
%{_bindir}/oid2name
%{_bindir}/pg_archivecleanup
%{_bindir}/pg_standby
%{_bindir}/pg_test_fsync
%{_bindir}/pg_test_timing
-%{_bindir}/pg_xlogdump
+%{_bindir}/pg_waldump
%{_bindir}/pgbench
%{_bindir}/vacuumlo
%{_datadir}/pgsql/extension/adminpack*
+%{_datadir}/pgsql/extension/amcheck*
%{_datadir}/pgsql/extension/autoinc*
%{_datadir}/pgsql/extension/bloom*
%{_datadir}/pgsql/extension/btree_gin*
@@ -945,12 +925,12 @@ make -C postgresql-setup-%{setup_version} check
%{_datadir}/pgsql/extension/tablefunc*
%{_datadir}/pgsql/extension/tcn*
%{_datadir}/pgsql/extension/timetravel*
-%{_datadir}/pgsql/extension/tsearch2*
%{_datadir}/pgsql/extension/tsm_system_rows*
%{_datadir}/pgsql/extension/tsm_system_time*
%{_datadir}/pgsql/extension/unaccent*
%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/adminpack.so
+%{_libdir}/pgsql/amcheck.so
%{_libdir}/pgsql/auth_delay.so
%{_libdir}/pgsql/auto_explain.so
%{_libdir}/pgsql/autoinc.so
@@ -998,7 +978,6 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/tcn.so
%{_libdir}/pgsql/test_decoding.so
%{_libdir}/pgsql/timetravel.so
-%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/tsm_system_rows.so
%{_libdir}/pgsql/tsm_system_time.so
%{_libdir}/pgsql/unaccent.so
@@ -1008,7 +987,7 @@ make -C postgresql-setup-%{setup_version} check
%{_mandir}/man1/pg_standby.*
%{_mandir}/man1/pg_test_fsync.*
%{_mandir}/man1/pg_test_timing.*
-%{_mandir}/man1/pg_xlogdump.*
+%{_mandir}/man1/pg_waldump.*
%{_mandir}/man1/pgbench.*
%{_mandir}/man1/vacuumlo.*
%{_mandir}/man3/dblink*
@@ -1042,9 +1021,9 @@ make -C postgresql-setup-%{setup_version} check
%{_bindir}/pg_basebackup
%{_bindir}/pg_controldata
%{_bindir}/pg_ctl
-%{_bindir}/pg_receivexlog
+%{_bindir}/pg_receivewal
%{_bindir}/pg_recvlogical
-%{_bindir}/pg_resetxlog
+%{_bindir}/pg_resetwal
%{_bindir}/pg_rewind
%{_bindir}/postgres
%{_bindir}/postgresql-setup
@@ -1072,6 +1051,7 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/euc2004_sjis2004.so
%{_libdir}/pgsql/libpqwalreceiver.so
%{_libdir}/pgsql/pg_prewarm.so
+%{_libdir}/pgsql/pgoutput.so
%{_libdir}/pgsql/plpgsql.so
%dir %{_libexecdir}/initscripts/legacy-actions/postgresql
%{_libexecdir}/initscripts/legacy-actions/postgresql/*
@@ -1084,8 +1064,8 @@ make -C postgresql-setup-%{setup_version} check
%{_mandir}/man1/pg_basebackup.*
%{_mandir}/man1/pg_controldata.*
%{_mandir}/man1/pg_ctl.*
-%{_mandir}/man1/pg_receivexlog.*
-%{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/pg_receivewal.*
+%{_mandir}/man1/pg_resetwal.*
%{_mandir}/man1/pg_rewind.*
%{_mandir}/man1/postgres.*
%{_mandir}/man1/postgresql-setup.*
@@ -1134,11 +1114,7 @@ make -C postgresql-setup-%{setup_version} check
%if %pltcl
%files pltcl -f pltcl.lst
-%{_bindir}/pltcl_delmod
-%{_bindir}/pltcl_listmod
-%{_bindir}/pltcl_loadmod
%{_datadir}/pgsql/extension/pltcl*
-%{_datadir}/pgsql/unknown.pltcl
%{_libdir}/pgsql/pltcl.so
%endif
@@ -1161,6 +1137,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Fri Oct 06 2017 Pavel Raiskup <praiskup(a)redhat.com> - 10.0-1
+- update to 10.0 per release notes:
+ https://www.postgresql.org/docs/10/static/release-10.html
+
* Tue Sep 05 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.5-2
- move %%_libdir/pgsql into *-libs subpackage
diff --git a/sources b/sources
index 6ec0ca8..73f17ba 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-9.5.9.tar.bz2) = 2c6a887b80a4b1d1da18282f443419db2279d8fe61821aa6ed1e9af6d28dda41959981ccede2456bd8835dccd16a80fd485ebc0a1bdc9459996a5d27d7781c55
-SHA512 (postgresql-9.5.9.tar.bz2.sha256) = 2e41c8a4e4a702c621cde35adc9b3496a67190597673e3c725f4c03313dce22691896aae13813039dfbe46d9e131216bcd657210823a55840ddad110fc0d8cc7
+SHA512 (postgresql-10.0.tar.bz2) = 88295af13db77a85a604c925aa627d383fdac62c1185119bba87753ce4167a13aed0f055a7a1329b3051f8757c6ba7529baed00a564ef0cfbee685720f282678
+SHA512 (postgresql-10.0.tar.bz2.sha256) = 69b10891bf6b99d3f0b05e17ac58d6148fdc73f59008fdfe7baab238515b5961b638afed3f0a3c4fd4786479bd53d16f413d8f22cd9c5d9a0f5df829aedbc04f
SHA512 (postgresql-9.6.5.tar.bz2) = ad35c27ea55b18005ea61b49d6994718df86519b3f99addd0ecb17ece1f1c34764eb5194f8961c45cfa75703d810baf54433f8538cfd43a70bd908e1e5878df9
SHA512 (postgresql-9.6.5.tar.bz2.sha256) = 8cfe5bfb00689ae30b6a3ddbccb8c74c0be244e2317ffa33dc89e56838d8b06a81a59cef0a204fff4f8ef23f7cffd7579b96b2d9207a5efb069e2160c2381a05
SHA512 (postgresql-setup-5.1.tar.gz) = f901c2f5f0b60a51a46fce1abf3a9854b97d1f1337a4659d73d3e2930518a35eef94de400d259f2a799652ac6acef9575b9d474cc929641f2659aed195254981
-SHA512 (postgresql-9.6.5-US.pdf) = 1f9243275239d99a593690a0a04b3b61c36394993e6e9d55b585750e89e4e80391aa9fdeff8d7a5bbc93c0c8bca5989a46e382f531bbc2905866c093afedf6b9
+SHA512 (postgresql-10.0-US.pdf) = 16991add93157fd846ba4be5d290ab8f37a94097ea285898080f5dca302fd0ae65a521eccf22a3a9ce44902aefdd7019de945cc532ebecb009bfbc18b1b2f72e
commit e1715bb6aa49921bdc77324f85c11269347d3d5a
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Sep 5 16:04:03 2017 +0200
libs: own the %{_libdir}/pgsql directory
This directory logically belongs to postgresql-libs; but
originally this request was triggered by rhbz#1478831
where we observed that there is leftover directory after
postgresql-devel removal.
Resolves: rhbz#1478831
Version: 9.6.5-2
diff --git a/postgresql.spec b/postgresql.spec
index e1f9b4e..06560fe 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -875,7 +875,6 @@ make -C postgresql-setup-%{setup_version} check
%{_bindir}/psql
%{_bindir}/reindexdb
%{_bindir}/vacuumdb
-%dir %{_libdir}/pgsql
%{_mandir}/man1/clusterdb.*
%{_mandir}/man1/createdb.*
%{_mandir}/man1/createlang.*
@@ -1032,6 +1031,7 @@ make -C postgresql-setup-%{setup_version} check
%files libs -f libs.lst
%doc COPYRIGHT
+%dir %{_libdir}/pgsql
%{_libdir}/libecpg.so.*
%{_libdir}/libecpg_compat.so.*
%{_libdir}/libpgtypes.so.*
@@ -1161,6 +1161,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Tue Sep 05 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.5-2
+- move %%_libdir/pgsql into *-libs subpackage
+
* Tue Aug 29 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.5-1
- update to 9.6.5 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-5.html
commit 1fa73e0a7b04e79c7ba7c4fddeee422d27634884
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Aug 29 16:11:11 2017 +0200
sources: upstream disabled the ftp:// download option
Version: 9.6.5-1
diff --git a/postgresql.spec b/postgresql.spec
index 1e3a914..e1f9b4e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,12 +81,12 @@ Url: http://www.postgresql.org/
%global setup_version 5.1
%global service_name postgresql.service
-Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t...
# The PDF file is generated by generate-pdf.sh, which see for comments
Source1: postgresql-%{version}-US.pdf
# generate-pdf.sh is not used during RPM build, but include for documentation
Source2: generate-pdf.sh
-Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
+Source3: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevve...
Source4: Makefile.regress
Source9: postgresql.tmpfiles.d
Source10: postgresql.pam
@@ -99,8 +99,8 @@ Source12: https://github.com/devexp-db/postgresql-setup/releases/download/v%{set
# Those here are just to enforce packagers check that the tarball was downloaded
# correctly. Also, this allows us check that packagers-only tarballs do not
# differ with publicly released ones.
-Source16: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
-Source17: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
+Source16: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t...
+Source17: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevve...
# Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch
commit d93550a71bc2b1e0ecde24c15415d9c0dfb39b2e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Aug 29 10:37:21 2017 +0200
rebase: update to 9.6.5
Per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-5.html
Version: 9.6.5-1
diff --git a/.gitignore b/.gitignore
index 355dc71..25a4967 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,6 @@
-/postgresql-9.5.7.tar.bz2
-/postgresql-9.5.7.tar.bz2.sha256
-/postgresql-9.6.3.tar.bz2
-/postgresql-9.6.3.tar.bz2.sha256
+/postgresql-9.5.9.tar.bz2
+/postgresql-9.5.9.tar.bz2.sha256
+/postgresql-9.6.5.tar.bz2
+/postgresql-9.6.5.tar.bz2.sha256
/postgresql-setup-5.1.tar.gz
-/postgresql-9.6.3-US.pdf
-/postgresql-9.5.8.tar.bz2
-/postgresql-9.5.8.tar.bz2.sha256
-/postgresql-9.6.4.tar.bz2
-/postgresql-9.6.4.tar.bz2.sha256
-/postgresql-9.6.4-US.pdf
+/postgresql-9.6.5-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 185155b..1e3a914 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -62,7 +62,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
-Version: 9.6.4
+Version: 9.6.5
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -75,7 +75,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.5.8
+%global prevversion 9.5.9
%global prevmajorversion 9.5
%global setup_version 5.1
@@ -1161,6 +1161,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Tue Aug 29 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.5-1
+- update to 9.6.5 per release notes:
+ https://www.postgresql.org/docs/9.6/static/release-9-6-5.html
+
* Tue Aug 08 2017 Petr Kubat <pkubat(a)redhat.com> - 9.6.4-1
- update to 9.6.4 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-4.html
diff --git a/sources b/sources
index 3589c85..6ec0ca8 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
+SHA512 (postgresql-9.5.9.tar.bz2) = 2c6a887b80a4b1d1da18282f443419db2279d8fe61821aa6ed1e9af6d28dda41959981ccede2456bd8835dccd16a80fd485ebc0a1bdc9459996a5d27d7781c55
+SHA512 (postgresql-9.5.9.tar.bz2.sha256) = 2e41c8a4e4a702c621cde35adc9b3496a67190597673e3c725f4c03313dce22691896aae13813039dfbe46d9e131216bcd657210823a55840ddad110fc0d8cc7
+SHA512 (postgresql-9.6.5.tar.bz2) = ad35c27ea55b18005ea61b49d6994718df86519b3f99addd0ecb17ece1f1c34764eb5194f8961c45cfa75703d810baf54433f8538cfd43a70bd908e1e5878df9
+SHA512 (postgresql-9.6.5.tar.bz2.sha256) = 8cfe5bfb00689ae30b6a3ddbccb8c74c0be244e2317ffa33dc89e56838d8b06a81a59cef0a204fff4f8ef23f7cffd7579b96b2d9207a5efb069e2160c2381a05
SHA512 (postgresql-setup-5.1.tar.gz) = f901c2f5f0b60a51a46fce1abf3a9854b97d1f1337a4659d73d3e2930518a35eef94de400d259f2a799652ac6acef9575b9d474cc929641f2659aed195254981
-SHA512 (postgresql-9.5.8.tar.bz2) = 4a11f0a16df460391c8250122ca8bf1ab76e49672a8c003ed09718bb4ce2aa57757e7aaec6e41b53d0d1ada293172b974761606647fcc8b4fce8807490b6ef10
-SHA512 (postgresql-9.5.8.tar.bz2.sha256) = a4a5f492a7327969da8ab5e95eb05bb8b0734e35aa4218c2fc54bad90424da6e391dcb8945fe32ece223e0a6ef1d2f7b2f3ac0eb50351d84bcd551b58a409392
-SHA512 (postgresql-9.6.4.tar.bz2) = b0527efacce6efc09340b68c8c56483cd884676e01cb6bfb4f9ce63226a394bdb0bcf3d832f84e4dff5ceecf09ef4cf93e9fbd0ac453ec85efb11ac50a7dff39
-SHA512 (postgresql-9.6.4.tar.bz2.sha256) = 83dd32c734f46cff5789b9353156857d3e836f9d84726444d9cf3e48082e666a56db32e1a218a640e668c905ed2152a40d809c5f24f6238e37e67ef0e03a2b37
-SHA512 (postgresql-9.6.4-US.pdf) = 862ab7af00f457c80ab81c4c5291bf2c9d5fd1aea0d059cfaf693c5aaa722a9390b66a4a337c9d4ed7e271693d83f22ff57842475bdccfda2d9387ef512e77d0
+SHA512 (postgresql-9.6.5-US.pdf) = 1f9243275239d99a593690a0a04b3b61c36394993e6e9d55b585750e89e4e80391aa9fdeff8d7a5bbc93c0c8bca5989a46e382f531bbc2905866c093afedf6b9
commit 698585a43d1d0af7e0c4351749eb2a1bdf51be1e
Author: Petr Kubat <pkubat(a)redhat.com>
Date: Tue Aug 8 11:38:29 2017 +0200
rebase: update to 9.6.4
Per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-4.html
Resolves: #1480284
Version: 9.6.4-1
diff --git a/.gitignore b/.gitignore
index 8832003..355dc71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
/postgresql-9.6.3.tar.bz2.sha256
/postgresql-setup-5.1.tar.gz
/postgresql-9.6.3-US.pdf
+/postgresql-9.5.8.tar.bz2
+/postgresql-9.5.8.tar.bz2.sha256
+/postgresql-9.6.4.tar.bz2
+/postgresql-9.6.4.tar.bz2.sha256
+/postgresql-9.6.4-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index ec5f7e0..185155b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -62,8 +62,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
-Version: 9.6.3
-Release: 9%{?dist}
+Version: 9.6.4
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -75,7 +75,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.5.7
+%global prevversion 9.5.8
%global prevmajorversion 9.5
%global setup_version 5.1
@@ -107,7 +107,6 @@ Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: hstore-plperl-data-dumper.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -357,7 +356,6 @@ benchmarks.
%patch2 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1163,6 +1161,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Tue Aug 08 2017 Petr Kubat <pkubat(a)redhat.com> - 9.6.4-1
+- update to 9.6.4 per release notes:
+ https://www.postgresql.org/docs/9.6/static/release-9-6-4.html
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.6.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index fd12b15..3589c85 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-9.5.7.tar.bz2) = 0f879a8d7587739aa9a696d60f909f819d567c67dff7c730d5e856639ed78ebc35beeb3cdaf782573d7e62c7056560a934f64cf11ccac6e309f58bb82d1ca78f
-SHA512 (postgresql-9.5.7.tar.bz2.sha256) = 60ac2b6bbfb40303b3fe30ce3685c637bcd89382ced722572d34e4248639e159c300c5bd28c4b094f54b1c72c7f2421f0d9db2cc06efc2e5814d4932e3c2d5e0
-SHA512 (postgresql-9.6.3.tar.bz2) = 97141972e154e6b0e756ee6a4e20f26e82022a9fd4c56305314a3a5567a79ece638e4ac3d513b46138737ae6bd27a098f30013a94767db151181aac9c01290a1
-SHA512 (postgresql-9.6.3.tar.bz2.sha256) = caf9fc6f76d7e27fa647b386bd3ad36311d86d97c9664d163f43b62ddeda60b605b594335d01bc8cfdec0a8c344a77920900b577dd8c5f82d6a48cc9693eb5a8
SHA512 (postgresql-setup-5.1.tar.gz) = f901c2f5f0b60a51a46fce1abf3a9854b97d1f1337a4659d73d3e2930518a35eef94de400d259f2a799652ac6acef9575b9d474cc929641f2659aed195254981
-SHA512 (postgresql-9.6.3-US.pdf) = d80d23c1093d406c475299d7f9bdc48e2d60ff8b61ac2db546a13683bc686a5ca10acdc7de7dc6a1f43f461da8d3966817bd0343e4bf3a94ee176df025236a7e
+SHA512 (postgresql-9.5.8.tar.bz2) = 4a11f0a16df460391c8250122ca8bf1ab76e49672a8c003ed09718bb4ce2aa57757e7aaec6e41b53d0d1ada293172b974761606647fcc8b4fce8807490b6ef10
+SHA512 (postgresql-9.5.8.tar.bz2.sha256) = a4a5f492a7327969da8ab5e95eb05bb8b0734e35aa4218c2fc54bad90424da6e391dcb8945fe32ece223e0a6ef1d2f7b2f3ac0eb50351d84bcd551b58a409392
+SHA512 (postgresql-9.6.4.tar.bz2) = b0527efacce6efc09340b68c8c56483cd884676e01cb6bfb4f9ce63226a394bdb0bcf3d832f84e4dff5ceecf09ef4cf93e9fbd0ac453ec85efb11ac50a7dff39
+SHA512 (postgresql-9.6.4.tar.bz2.sha256) = 83dd32c734f46cff5789b9353156857d3e836f9d84726444d9cf3e48082e666a56db32e1a218a640e668c905ed2152a40d809c5f24f6238e37e67ef0e03a2b37
+SHA512 (postgresql-9.6.4-US.pdf) = 862ab7af00f457c80ab81c4c5291bf2c9d5fd1aea0d059cfaf693c5aaa722a9390b66a4a337c9d4ed7e271693d83f22ff57842475bdccfda2d9387ef512e77d0
commit c719c5ea1ed3abad887a14f87a57d3fce99f5705
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 06:18:09 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 17f5916..ec5f7e0 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 8%{?dist}
+Release: 9%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1163,6 +1163,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.6.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.6.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit e244775c563dd2f635df24340317da7a3a0776b5
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 08:57:18 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 7b3d6f9..17f5916 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 7%{?dist}
+Release: 8%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1163,6 +1163,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.6.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Mon Jul 24 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-7
- drop perl rpath patch; libperl.so* is now in %%_libdir (rhbz#1474417)
commit c27dd8df9e16709906a82364bf0935cf309055fe
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Jul 24 16:50:24 2017 +0200
plperl: drop postgresql-perl-rpath.patch
Perl now provides valid libperl.so in %_libdir so there's not need
to play with rpath anymore.
Resolves: rhbz#1474417
Version: 9.6.3-7
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
deleted file mode 100644
index 59c199b..0000000
--- a/postgresql-perl-rpath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-We configure Postgres with --disable-rpath because for the most part we
-want to leave it to ldconfig to determine where libraries are. However,
-for some reason the Perl package puts libperl.so in a nonstandard place
-and doesn't add that place to the ldconfig search path. I think this
-is a Perl packaging bug, myself, but apparently it's not going to change.
-So work around it by adding an rpath spec to plperl.so (only).
-Per bug #162198.
-
-
-diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile
---- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/pl/plperl/GNUmakefile 2012-08-17 11:15:09.457116708 -0400
-@@ -43,6 +43,9 @@
-
- SHLIB_LINK = $(perl_embed_ldflags)
-
-+# Force rpath to be used even though we disable it everywhere else
-+SHLIB_LINK += $(rpath)
-+
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl --load-extension=plperlu
- REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
- # if Perl can support two interpreters in one backend,
diff --git a/postgresql.spec b/postgresql.spec
index fef0889..7b3d6f9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 6%{?dist}
+Release: 7%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -105,7 +105,6 @@ Source17: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevv
# Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
-Patch3: postgresql-perl-rpath.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
Patch7: hstore-plperl-data-dumper.patch
@@ -356,7 +355,6 @@ benchmarks.
%setup -q -a 12
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@@ -1165,6 +1163,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Mon Jul 24 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-7
+- drop perl rpath patch; libperl.so* is now in %%_libdir (rhbz#1474417)
+
* Mon Jun 26 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-6
- don't provide libpqwalreceiver.so() soname
commit 7c1110c04126d5ff0deca81ade9c602eb92995c9
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Jun 26 12:09:11 2017 +0200
spec: better provides-exclude fix based on rh-postgresql96
Version: 9.6.3-6
diff --git a/postgresql.spec b/postgresql.spec
index d349fb6..fef0889 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -174,8 +174,7 @@ BuildRequires: libselinux-devel
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# https://bugzilla.redhat.com/1464368
-%filter_provides_in %{_libdir}/pgsql
-%filter_setup
+%global __provides_exclude_from %{_libdir}/pgsql
%description
PostgreSQL is an advanced Object-Relational database management system (DBMS).
@@ -1166,7 +1165,7 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
-* Fri Jun 23 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-6
+* Mon Jun 26 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-6
- don't provide libpqwalreceiver.so() soname
* Wed Jun 21 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-5
commit 25dea2dcb85a270b3cde90fd2204aad08e0e3f65
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Jun 23 11:24:54 2017 +0200
spec: avoid providing libpqwalreceiver.so plugin as soname
Related: rhbz#1464368
Version: 9.6.3-6
diff --git a/postgresql.spec b/postgresql.spec
index 2dc88de..d349fb6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -173,6 +173,10 @@ BuildRequires: libselinux-devel
# main package requires -libs subpackage
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# https://bugzilla.redhat.com/1464368
+%filter_provides_in %{_libdir}/pgsql
+%filter_setup
+
%description
PostgreSQL is an advanced Object-Relational database management system (DBMS).
The base postgresql package contains the client programs that you'll need to
@@ -1162,6 +1166,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Fri Jun 23 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-6
+- don't provide libpqwalreceiver.so() soname
+
* Wed Jun 21 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-5
- drop the __os_install_post redefinition hack
commit 36a141a4c0bd2488ea4476d76dc8d256e38182c9
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Jun 21 08:44:04 2017 +0200
spec: drop the old %beta hack about %__os_install_post
This always was broken and the %__os_install_post macro was
redefined also for non-beta builds; that's because
%{?x:%global y z} defines %y even when %x is zero.
If we really wanted this %beta/%post hack, it would have to look
similarly to:
%{lua:if rpm.expand("%beta") ~= "0" then rpm.define('...') end}
On the other hand, I'm not sure that this is actually needed
nowadays so I'm removing it completely. Please let us know if you
happen to need the %__os_install_post redefinition.
Originally added by commit 9636c11b0d6049d23.
Version: 9.6.3-5
diff --git a/postgresql.spec b/postgresql.spec
index d94f0a0..2dc88de 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -30,7 +30,6 @@
# always get built.
%{!?beta:%global beta 0}
-%{?beta:%global __os_install_post /usr/lib/rpm/brp-compress}
%{!?test:%global test 1}
%{!?upgrade:%global upgrade 1}
@@ -64,7 +63,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1163,6 +1162,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Wed Jun 21 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-5
+- drop the __os_install_post redefinition hack
+
* Mon Jun 12 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-4
- drop -DLINUX_OOM_SCORE_ADJ=0 define from CFLAGS (rhbz#1110969, rhbz#1436554)
commit 235453b2331e3c572552d3c45177c6ade858ffbb
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Jun 12 13:26:05 2017 +0200
spec: drop -DLINUX_OOM_SCORE_ADJ=0 from CFLAGS
Related: rhbz#1110969, rhbz#1436554
Version: 9.6.3-4
diff --git a/postgresql.spec b/postgresql.spec
index 5d4d133..d94f0a0 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -407,9 +407,6 @@ CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100`
%endif
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# Add LINUX_OOM_SCORE_ADJ=0 to ensure child processes reset postmaster's oom_score_adj
-# (this define will be useless in Postgres 9.5 and later)
-CFLAGS="$CFLAGS -DLINUX_OOM_SCORE_ADJ=0"
export CFLAGS
# plpython requires separate configure/build runs to build against python 2
@@ -1166,6 +1163,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Mon Jun 12 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-4
+- drop -DLINUX_OOM_SCORE_ADJ=0 define from CFLAGS (rhbz#1110969, rhbz#1436554)
+
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.6.3-3
- Perl 5.26 rebuild
commit 19739cf1a6ff5ef6f17a1ae1c8f2ef726cba251d
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sun Jun 4 15:07:09 2017 +0200
Perl 5.26 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index efe1cc4..5d4d133 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1166,6 +1166,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.6.3-3
+- Perl 5.26 rebuild
+
* Mon May 22 2017 Petr Kubat <pkubat(a)redhat.com> - 9.6.3-2
- fix indentation issues in hstore_plperlu test-case (rhbz#1453111)
commit 5b2a26a63d4f706634bdf66ffa97ae5f77bc941b
Author: Petr Kubat <pkubat(a)redhat.com>
Date: Mon May 22 11:29:27 2017 +0200
fix indentation issues in hstore_plperlu test-case
Resolves: rhbz#1453111
Version: 9.6.3-2
diff --git a/hstore-plperl-data-dumper.patch b/hstore-plperl-data-dumper.patch
new file mode 100644
index 0000000..dfc2f23
--- /dev/null
+++ b/hstore-plperl-data-dumper.patch
@@ -0,0 +1,192 @@
+From 69db3b0cfccc0687dfbdf56afcfb2f8e536053c6 Mon Sep 17 00:00:00 2001
+From: Andrew Dunstan <andrew(a)dunslane.net>
+Date: Sun, 14 May 2017 01:10:18 -0400
+Subject: [PATCH] Suppress indentation from Data::Dumper in regression tests
+
+Ultra-modern versions of the perl Data::Dumper module have apparently
+changed how they indent output. Instead of trying to keep up we choose
+to tell it to supporess all indentation in the hstore_plperl regression
+tests.
+
+Backpatch to 9.5 where this feature was introduced.
+---
+ contrib/hstore_plperl/expected/hstore_plperlu.out | 44 ++++++-----------------
+ contrib/hstore_plperl/sql/hstore_plperlu.sql | 6 ++++
+ 2 files changed, 17 insertions(+), 33 deletions(-)
+
+diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out
+index b09fb78..d719d29 100644
+--- a/contrib/hstore_plperl/expected/hstore_plperlu.out
++++ b/contrib/hstore_plperl/expected/hstore_plperlu.out
+@@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1('aa=>bb, cc=>NULL'::hstore);
+-INFO: $VAR1 = {
+- 'aa' => 'bb',
+- 'cc' => undef
+- };
+-
++INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
+ test1
+ -------
+ 2
+@@ -39,12 +36,12 @@ LANGUAGE plperlu
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1none('aa=>bb, cc=>NULL'::hstore);
+ INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
+-
+ test1none
+ -----------
+ 0
+@@ -56,15 +53,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1list('aa=>bb, cc=>NULL'::hstore);
+-INFO: $VAR1 = {
+- 'aa' => 'bb',
+- 'cc' => undef
+- };
+-
++INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
+ test1list
+ -----------
+ 2
+@@ -77,18 +71,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
+-INFO: $VAR1 = {
+- 'aa' => 'bb',
+- 'cc' => undef
+- };
+-$VAR2 = {
+- 'dd' => 'ee'
+- };
+-
++INFO: $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
+ test1arr
+ ----------
+ 2
+@@ -101,6 +89,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+
+ $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+@@ -111,13 +100,8 @@ $rv = spi_exec_prepared($plan, {}, $val);
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+ $$;
+ SELECT test3();
+-INFO: $VAR1 = {
+- 'aa' => 'bb',
+- 'cc' => undef
+- };
+-
++INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
+ INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
+-
+ test3
+ -------
+
+@@ -138,6 +122,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_TD->{new}));
+ if ($_TD->{new}{a} == 1) {
+ $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+@@ -147,14 +132,7 @@ return "MODIFY";
+ $$;
+ CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
+ UPDATE test1 SET a = a;
+-INFO: $VAR1 = {
+- 'a' => '1',
+- 'b' => {
+- 'aa' => 'bb',
+- 'cc' => undef
+- }
+- };
+-
++INFO: $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
+ SELECT * FROM test1;
+ a | b
+ ---+---------------------------------
+diff --git a/contrib/hstore_plperl/sql/hstore_plperlu.sql b/contrib/hstore_plperl/sql/hstore_plperlu.sql
+index 8d8508c..c714b35 100644
+--- a/contrib/hstore_plperl/sql/hstore_plperlu.sql
++++ b/contrib/hstore_plperl/sql/hstore_plperlu.sql
+@@ -15,6 +15,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -26,6 +27,7 @@ LANGUAGE plperlu
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -38,6 +40,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -52,6 +55,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -66,6 +70,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+
+ $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+@@ -90,6 +95,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_TD->{new}));
+ if ($_TD->{new}{a} == 1) {
+ $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+--
+2.1.4
diff --git a/postgresql.spec b/postgresql.spec
index 0f1463e..efe1cc4 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -109,6 +109,7 @@ Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+Patch7: hstore-plperl-data-dumper.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -356,6 +357,7 @@ benchmarks.
%patch3 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1164,6 +1166,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Mon May 22 2017 Petr Kubat <pkubat(a)redhat.com> - 9.6.3-2
+- fix indentation issues in hstore_plperlu test-case (rhbz#1453111)
+
* Thu May 11 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-1
- update to 9.6.3 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-3.html
commit 4aa087fae383b55f2a5c74ec3295d9f2aadcab44
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu May 11 12:34:04 2017 +0200
rebase: update to 9.6.3
Per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-3.html
Version: 9.6.3-1
diff --git a/.gitignore b/.gitignore
index d8f49a3..8832003 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-9.5.6.tar.bz2
-/postgresql-9.5.6.tar.bz2.sha256
-/postgresql-9.6.2.tar.bz2
-/postgresql-9.6.2.tar.bz2.sha256
+/postgresql-9.5.7.tar.bz2
+/postgresql-9.5.7.tar.bz2.sha256
+/postgresql-9.6.3.tar.bz2
+/postgresql-9.6.3.tar.bz2.sha256
/postgresql-setup-5.1.tar.gz
-/postgresql-9.6.2-US.pdf
+/postgresql-9.6.3-US.pdf
diff --git a/generate-pdf.sh b/generate-pdf.sh
index a268981..e0ed008 100755
--- a/generate-pdf.sh
+++ b/generate-pdf.sh
@@ -18,7 +18,10 @@ set -e
# Pass package version (e.g., 9.1.2) as argument
VERSION=$1
+test -z "$VERSION" && VERSION=`awk '/^Version:/ { print $2; }' postgresql.spec`
+
TARGETFILE=postgresql-$VERSION-US.pdf
+test -f "$TARGETFILE" && echo "$TARGETFILE exists" && exit 1
echo Building $TARGETFILE ...
diff --git a/generate-sources-and-gitignore.sh b/generate-sources-and-gitignore.sh
index be4939b..51b2fc8 100755
--- a/generate-sources-and-gitignore.sh
+++ b/generate-sources-and-gitignore.sh
@@ -8,6 +8,6 @@ while read line
do
base=`basename "$line"`
echo " * handling $base"
- md5sum "$base" >> sources
+ sha512sum --tag "$base" >> sources
echo "/$base" >> .gitignore
done
diff --git a/postgresql-timezonetz-2017-tests.patch b/postgresql-timezonetz-2017-tests.patch
deleted file mode 100644
index 69ff264..0000000
--- a/postgresql-timezonetz-2017-tests.patch
+++ /dev/null
@@ -1,751 +0,0 @@
-From d8ec6b9c8c265c2f29b1c0e0e4205895baaa326d Mon Sep 17 00:00:00 2001
-From: Tom Lane <tgl(a)sss.pgh.pa.us>
-Date: Thu, 9 Mar 2017 17:20:11 -0500
-Subject: [PATCH] Fix timestamptz regression test to still work with latest
- IANA zone data.
-
-The IANA timezone crew continues to chip away at their project of removing
-timezone abbreviations that have no real-world currency from their
-database. The tzdata2017a update removes all such abbreviations for
-South American zones, as well as much of the Pacific. This breaks some
-test cases in timestamptz.sql that were expecting America/Santiago and
-America/Caracas to have non-numeric abbreviations.
-
-The test cases involving America/Santiago seem to have selected that
-zone more or less at random, so just replace it with America/New_York,
-which is of similar longitude. The cases involving America/Caracas are
-harder since they were chosen to test a time-varying zone abbreviation
-around a point where it changed meaning in the backwards direction.
-Fortunately, Europe/Moscow has a similar case in 2014, and the MSK/MSD
-abbreviations are well enough attested that IANA seems unlikely to
-decide to remove them from the database in future.
-
-With these changes, this regression test should pass when using any IANA
-zone database from 2015 or later. One could wish that there were a few
-years more daylight on how out-of-date your zone database can be ... but
-really the --with-system-tzdata option is only meant for use on platforms
-where the zone database is kept up-to-date pretty faithfully, so I do not
-think this is a big objection.
-
-Discussion: https://postgr.es/m/6749.1489087470@sss.pgh.pa.us
----
- src/test/regress/expected/timestamptz.out | 324 ++++++++++--------------------
- src/test/regress/sql/timestamptz.sql | 103 ++++------
- 2 files changed, 148 insertions(+), 279 deletions(-)
-
-diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
-index 51d4d21..3319247 100644
---- a/src/test/regress/expected/timestamptz.out
-+++ b/src/test/regress/expected/timestamptz.out
-@@ -1773,24 +1773,24 @@ SELECT * FROM TIMESTAMPTZ_TST ORDER BY a;
- --Cleanup
- DROP TABLE TIMESTAMPTZ_TST;
- -- test timestamptz constructors
--set TimeZone to 'America/Santiago';
-+set TimeZone to 'America/New_York';
- -- numeric timezone
- SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33);
- make_timestamptz
- ---------------------------------
-- Sun Jul 15 08:15:55.33 1973 CLT
-+ Sun Jul 15 08:15:55.33 1973 EDT
- (1 row)
-
- SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33, '+2');
- make_timestamptz
- ---------------------------------
-- Sun Jul 15 02:15:55.33 1973 CLT
-+ Sun Jul 15 02:15:55.33 1973 EDT
- (1 row)
-
- SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33, '-2');
- make_timestamptz
- ---------------------------------
-- Sun Jul 15 06:15:55.33 1973 CLT
-+ Sun Jul 15 06:15:55.33 1973 EDT
- (1 row)
-
- WITH tzs (tz) AS (VALUES
-@@ -1799,23 +1799,23 @@ WITH tzs (tz) AS (VALUES
- ('+10:00:1'), ('+10:00:01'),
- ('+10:00:10'))
- SELECT make_timestamptz(2010, 2, 27, 3, 45, 00, tz), tz FROM tzs;
-- make_timestamptz | tz
---------------------------------+-----------
-- Fri Feb 26 23:45:00 2010 CLST | +1
-- Fri Feb 26 23:45:00 2010 CLST | +1:
-- Fri Feb 26 23:45:00 2010 CLST | +1:0
-- Fri Feb 26 23:45:00 2010 CLST | +100
-- Fri Feb 26 23:45:00 2010 CLST | +1:00
-- Fri Feb 26 23:45:00 2010 CLST | +01:00
-- Fri Feb 26 14:45:00 2010 CLST | +10
-- Fri Feb 26 14:45:00 2010 CLST | +1000
-- Fri Feb 26 14:45:00 2010 CLST | +10:
-- Fri Feb 26 14:45:00 2010 CLST | +10:0
-- Fri Feb 26 14:45:00 2010 CLST | +10:00
-- Fri Feb 26 14:45:00 2010 CLST | +10:00:
-- Fri Feb 26 14:44:59 2010 CLST | +10:00:1
-- Fri Feb 26 14:44:59 2010 CLST | +10:00:01
-- Fri Feb 26 14:44:50 2010 CLST | +10:00:10
-+ make_timestamptz | tz
-+------------------------------+-----------
-+ Fri Feb 26 21:45:00 2010 EST | +1
-+ Fri Feb 26 21:45:00 2010 EST | +1:
-+ Fri Feb 26 21:45:00 2010 EST | +1:0
-+ Fri Feb 26 21:45:00 2010 EST | +100
-+ Fri Feb 26 21:45:00 2010 EST | +1:00
-+ Fri Feb 26 21:45:00 2010 EST | +01:00
-+ Fri Feb 26 12:45:00 2010 EST | +10
-+ Fri Feb 26 12:45:00 2010 EST | +1000
-+ Fri Feb 26 12:45:00 2010 EST | +10:
-+ Fri Feb 26 12:45:00 2010 EST | +10:0
-+ Fri Feb 26 12:45:00 2010 EST | +10:00
-+ Fri Feb 26 12:45:00 2010 EST | +10:00:
-+ Fri Feb 26 12:44:59 2010 EST | +10:00:1
-+ Fri Feb 26 12:44:59 2010 EST | +10:00:01
-+ Fri Feb 26 12:44:50 2010 EST | +10:00:10
- (15 rows)
-
- -- these should fail
-@@ -1861,30 +1861,29 @@ SELECT make_timestamptz(1881, 12, 10, 0, 0, 0, 'Europe/Paris') AT TIME ZONE 'UTC
- SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
- ERROR: time zone "Nehwon/Lankhmar" not recognized
- -- abbreviations
--SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLST');
-- make_timestamptz
---------------------------------
-- Wed Dec 10 10:10:10 2008 CLST
-+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
-+ make_timestamptz
-+------------------------------
-+ Wed Dec 10 10:10:10 2008 EST
- (1 row)
-
--SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLT');
-- make_timestamptz
---------------------------------
-- Wed Dec 10 11:10:10 2008 CLST
-+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
-+ make_timestamptz
-+------------------------------
-+ Wed Dec 10 09:10:10 2008 EST
- (1 row)
-
- SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
-- make_timestamptz
---------------------------------
-- Wed Dec 10 15:10:10 2014 CLST
-+ make_timestamptz
-+------------------------------
-+ Wed Dec 10 13:10:10 2014 EST
- (1 row)
-
- RESET TimeZone;
- --
- -- Test behavior with a dynamic (time-varying) timezone abbreviation.
- -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)
---- moved forwards in Mar 2011 and that VET (America/Caracas standard time)
---- moved backwards in Dec 2007.
-+-- moved forwards in Mar 2011 and backwards again in Oct 2014.
- --
- SET TimeZone to 'UTC';
- SELECT '2011-03-27 00:00:00 Europe/Moscow'::timestamptz;
-@@ -1995,100 +1994,64 @@ SELECT '2011-03-27 04:00:00 MSK'::timestamptz;
- Sun Mar 27 00:00:00 2011 UTC
- (1 row)
-
--SELECT '2007-12-09 02:00:00 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 00:00:00 Europe/Moscow'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 06:00:00 2007 UTC
-+ Sat Oct 25 20:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:29:59 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 00:59:59 Europe/Moscow'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 06:29:59 2007 UTC
-+ Sat Oct 25 20:59:59 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:30:00 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 01:00:00 Europe/Moscow'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 07:00:00 2007 UTC
-+ Sat Oct 25 22:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:30:01 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 01:00:01 Europe/Moscow'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 07:00:01 2007 UTC
-+ Sat Oct 25 22:00:01 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:59:59 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 02:00:00 Europe/Moscow'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 07:29:59 2007 UTC
-+ Sat Oct 25 23:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 03:00:00 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 00:00:00 MSK'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 07:30:00 2007 UTC
-+ Sat Oct 25 20:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 03:00:01 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 00:59:59 MSK'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 07:30:01 2007 UTC
-+ Sat Oct 25 20:59:59 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 04:00:00 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 01:00:00 MSK'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 08:30:00 2007 UTC
-+ Sat Oct 25 22:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:00:00 VET'::timestamptz;
-+SELECT '2014-10-26 01:00:01 MSK'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 06:00:00 2007 UTC
-+ Sat Oct 25 22:00:01 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:29:59 VET'::timestamptz;
-+SELECT '2014-10-26 02:00:00 MSK'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 06:29:59 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 02:30:00 VET'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 07:00:00 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 02:30:01 VET'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 07:00:01 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 02:59:59 VET'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 07:29:59 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 03:00:00 VET'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 07:30:00 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 03:00:01 VET'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 07:30:01 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 04:00:00 VET'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 08:30:00 2007 UTC
-+ Sat Oct 25 23:00:00 2014 UTC
- (1 row)
-
- SELECT '2011-03-27 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
-@@ -2199,112 +2162,76 @@ SELECT '2011-03-27 04:00:00'::timestamp AT TIME ZONE 'MSK';
- Sun Mar 27 00:00:00 2011 UTC
- (1 row)
-
--SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
- timezone
- ------------------------------
-- Sun Dec 09 06:00:00 2007 UTC
-+ Sat Oct 25 20:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'Europe/Moscow';
- timezone
- ------------------------------
-- Sun Dec 09 06:29:59 2007 UTC
-+ Sat Oct 25 20:59:59 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
- timezone
- ------------------------------
-- Sun Dec 09 07:00:00 2007 UTC
-+ Sat Oct 25 22:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'Europe/Moscow';
- timezone
- ------------------------------
-- Sun Dec 09 07:00:01 2007 UTC
-+ Sat Oct 25 22:00:01 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
- timezone
- ------------------------------
-- Sun Dec 09 07:29:59 2007 UTC
-+ Sat Oct 25 23:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'MSK';
- timezone
- ------------------------------
-- Sun Dec 09 07:30:00 2007 UTC
-+ Sat Oct 25 20:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'MSK';
- timezone
- ------------------------------
-- Sun Dec 09 07:30:01 2007 UTC
-+ Sat Oct 25 20:59:59 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'MSK';
- timezone
- ------------------------------
-- Sun Dec 09 08:30:00 2007 UTC
-+ Sat Oct 25 22:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'VET';
-+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'MSK';
- timezone
- ------------------------------
-- Sun Dec 09 06:00:00 2007 UTC
-+ Sat Oct 25 22:00:01 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'VET';
-+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'MSK';
- timezone
- ------------------------------
-- Sun Dec 09 06:29:59 2007 UTC
-+ Sat Oct 25 23:00:00 2014 UTC
- (1 row)
-
--SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'VET';
-- timezone
--------------------------------
-- Sun Dec 09 07:00:00 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'VET';
-- timezone
--------------------------------
-- Sun Dec 09 07:00:01 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'VET';
-- timezone
--------------------------------
-- Sun Dec 09 07:29:59 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'VET';
-- timezone
--------------------------------
-- Sun Dec 09 07:30:00 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'VET';
-- timezone
--------------------------------
-- Sun Dec 09 07:30:01 2007 UTC
--(1 row)
--
--SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'VET';
-- timezone
--------------------------------
-- Sun Dec 09 08:30:00 2007 UTC
--(1 row)
--
--SELECT make_timestamptz(2007, 12, 9, 2, 0, 0, 'VET');
-+SELECT make_timestamptz(2014, 10, 26, 0, 0, 0, 'MSK');
- make_timestamptz
- ------------------------------
-- Sun Dec 09 06:00:00 2007 UTC
-+ Sat Oct 25 20:00:00 2014 UTC
- (1 row)
-
--SELECT make_timestamptz(2007, 12, 9, 3, 0, 0, 'VET');
-+SELECT make_timestamptz(2014, 10, 26, 1, 0, 0, 'MSK');
- make_timestamptz
- ------------------------------
-- Sun Dec 09 07:30:00 2007 UTC
-+ Sat Oct 25 22:00:00 2014 UTC
- (1 row)
-
- SELECT to_timestamp( 0); -- 1970-01-01 00:00:00+00
-@@ -2391,47 +2318,34 @@ SELECT '2011-03-27 00:00:00 UTC'::timestamptz;
- Sun Mar 27 04:00:00 2011 MSK
- (1 row)
-
--SET TimeZone to 'America/Caracas';
--SELECT '2007-12-09 06:00:00 UTC'::timestamptz;
-+SELECT '2014-10-25 21:00:00 UTC'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 02:00:00 2007 VET
-+ Sun Oct 26 01:00:00 2014 MSK
- (1 row)
-
--SELECT '2007-12-09 06:30:00 UTC'::timestamptz;
-+SELECT '2014-10-25 21:59:59 UTC'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 02:30:00 2007 VET
-+ Sun Oct 26 01:59:59 2014 MSK
- (1 row)
-
--SELECT '2007-12-09 06:59:59 UTC'::timestamptz;
-+SELECT '2014-10-25 22:00:00 UTC'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 02:59:59 2007 VET
-+ Sun Oct 26 01:00:00 2014 MSK
- (1 row)
-
--SELECT '2007-12-09 07:00:00 UTC'::timestamptz;
-+SELECT '2014-10-25 22:00:01 UTC'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 02:30:00 2007 VET
-+ Sun Oct 26 01:00:01 2014 MSK
- (1 row)
-
--SELECT '2007-12-09 07:00:01 UTC'::timestamptz;
-+SELECT '2014-10-25 23:00:00 UTC'::timestamptz;
- timestamptz
- ------------------------------
-- Sun Dec 09 02:30:01 2007 VET
--(1 row)
--
--SELECT '2007-12-09 07:29:59 UTC'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 02:59:59 2007 VET
--(1 row)
--
--SELECT '2007-12-09 07:30:00 UTC'::timestamptz;
-- timestamptz
--------------------------------
-- Sun Dec 09 03:00:00 2007 VET
-+ Sun Oct 26 02:00:00 2014 MSK
- (1 row)
-
- RESET TimeZone;
-@@ -2477,46 +2391,34 @@ SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- Sun Mar 27 04:00:00 2011
- (1 row)
-
--SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- timezone
- --------------------------
-- Sun Dec 09 02:00:00 2007
-+ Sun Oct 26 01:00:00 2014
- (1 row)
-
--SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- timezone
- --------------------------
-- Sun Dec 09 02:30:00 2007
-+ Sun Oct 26 01:59:59 2014
- (1 row)
-
--SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- timezone
- --------------------------
-- Sun Dec 09 02:59:59 2007
-+ Sun Oct 26 01:00:00 2014
- (1 row)
-
--SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- timezone
- --------------------------
-- Sun Dec 09 02:30:00 2007
-+ Sun Oct 26 01:00:01 2014
- (1 row)
-
--SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- timezone
- --------------------------
-- Sun Dec 09 02:30:01 2007
--(1 row)
--
--SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-- timezone
----------------------------
-- Sun Dec 09 02:59:59 2007
--(1 row)
--
--SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-- timezone
----------------------------
-- Sun Dec 09 03:00:00 2007
-+ Sun Oct 26 02:00:00 2014
- (1 row)
-
- SELECT '2011-03-26 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
-@@ -2561,46 +2463,34 @@ SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
- Sun Mar 27 04:00:00 2011
- (1 row)
-
--SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
-+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
- timezone
- --------------------------
-- Sun Dec 09 02:00:00 2007
-+ Sun Oct 26 01:00:00 2014
- (1 row)
-
--SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
-+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
- timezone
- --------------------------
-- Sun Dec 09 02:30:00 2007
-+ Sun Oct 26 01:59:59 2014
- (1 row)
-
--SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'VET';
-+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
- timezone
- --------------------------
-- Sun Dec 09 02:59:59 2007
-+ Sun Oct 26 01:00:00 2014
- (1 row)
-
--SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
-+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
- timezone
- --------------------------
-- Sun Dec 09 02:30:00 2007
-+ Sun Oct 26 01:00:01 2014
- (1 row)
-
--SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'VET';
-+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
- timezone
- --------------------------
-- Sun Dec 09 02:30:01 2007
--(1 row)
--
--SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'VET';
-- timezone
----------------------------
-- Sun Dec 09 02:59:59 2007
--(1 row)
--
--SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
-- timezone
----------------------------
-- Sun Dec 09 03:00:00 2007
-+ Sun Oct 26 02:00:00 2014
- (1 row)
-
- --
-diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
-index ab86622..4e37071 100644
---- a/src/test/regress/sql/timestamptz.sql
-+++ b/src/test/regress/sql/timestamptz.sql
-@@ -280,7 +280,7 @@ SELECT * FROM TIMESTAMPTZ_TST ORDER BY a;
- DROP TABLE TIMESTAMPTZ_TST;
-
- -- test timestamptz constructors
--set TimeZone to 'America/Santiago';
-+set TimeZone to 'America/New_York';
-
- -- numeric timezone
- SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33);
-@@ -309,8 +309,8 @@ SELECT make_timestamptz(1881, 12, 10, 0, 0, 0, 'Europe/Paris') AT TIME ZONE 'UTC
- SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
-
- -- abbreviations
--SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLST');
--SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLT');
-+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
-+SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
- SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
-
- RESET TimeZone;
-@@ -318,8 +318,7 @@ RESET TimeZone;
- --
- -- Test behavior with a dynamic (time-varying) timezone abbreviation.
- -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)
---- moved forwards in Mar 2011 and that VET (America/Caracas standard time)
---- moved backwards in Dec 2007.
-+-- moved forwards in Mar 2011 and backwards again in Oct 2014.
- --
-
- SET TimeZone to 'UTC';
-@@ -344,23 +343,17 @@ SELECT '2011-03-27 03:00:00 MSK'::timestamptz;
- SELECT '2011-03-27 03:00:01 MSK'::timestamptz;
- SELECT '2011-03-27 04:00:00 MSK'::timestamptz;
-
--SELECT '2007-12-09 02:00:00 America/Caracas'::timestamptz;
--SELECT '2007-12-09 02:29:59 America/Caracas'::timestamptz;
--SELECT '2007-12-09 02:30:00 America/Caracas'::timestamptz;
--SELECT '2007-12-09 02:30:01 America/Caracas'::timestamptz;
--SELECT '2007-12-09 02:59:59 America/Caracas'::timestamptz;
--SELECT '2007-12-09 03:00:00 America/Caracas'::timestamptz;
--SELECT '2007-12-09 03:00:01 America/Caracas'::timestamptz;
--SELECT '2007-12-09 04:00:00 America/Caracas'::timestamptz;
-+SELECT '2014-10-26 00:00:00 Europe/Moscow'::timestamptz;
-+SELECT '2014-10-26 00:59:59 Europe/Moscow'::timestamptz;
-+SELECT '2014-10-26 01:00:00 Europe/Moscow'::timestamptz;
-+SELECT '2014-10-26 01:00:01 Europe/Moscow'::timestamptz;
-+SELECT '2014-10-26 02:00:00 Europe/Moscow'::timestamptz;
-
--SELECT '2007-12-09 02:00:00 VET'::timestamptz;
--SELECT '2007-12-09 02:29:59 VET'::timestamptz;
--SELECT '2007-12-09 02:30:00 VET'::timestamptz;
--SELECT '2007-12-09 02:30:01 VET'::timestamptz;
--SELECT '2007-12-09 02:59:59 VET'::timestamptz;
--SELECT '2007-12-09 03:00:00 VET'::timestamptz;
--SELECT '2007-12-09 03:00:01 VET'::timestamptz;
--SELECT '2007-12-09 04:00:00 VET'::timestamptz;
-+SELECT '2014-10-26 00:00:00 MSK'::timestamptz;
-+SELECT '2014-10-26 00:59:59 MSK'::timestamptz;
-+SELECT '2014-10-26 01:00:00 MSK'::timestamptz;
-+SELECT '2014-10-26 01:00:01 MSK'::timestamptz;
-+SELECT '2014-10-26 02:00:00 MSK'::timestamptz;
-
- SELECT '2011-03-27 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
- SELECT '2011-03-27 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
-@@ -382,26 +375,20 @@ SELECT '2011-03-27 03:00:00'::timestamp AT TIME ZONE 'MSK';
- SELECT '2011-03-27 03:00:01'::timestamp AT TIME ZONE 'MSK';
- SELECT '2011-03-27 04:00:00'::timestamp AT TIME ZONE 'MSK';
-
--SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
-
--SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'VET';
--SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'VET';
--SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'VET';
--SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'VET';
--SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'VET';
--SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'VET';
--SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'VET';
--SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'VET';
-+SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'MSK';
-+SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'MSK';
-+SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'MSK';
-+SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'MSK';
-+SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'MSK';
-
--SELECT make_timestamptz(2007, 12, 9, 2, 0, 0, 'VET');
--SELECT make_timestamptz(2007, 12, 9, 3, 0, 0, 'VET');
-+SELECT make_timestamptz(2014, 10, 26, 0, 0, 0, 'MSK');
-+SELECT make_timestamptz(2014, 10, 26, 1, 0, 0, 'MSK');
-
- SELECT to_timestamp( 0); -- 1970-01-01 00:00:00+00
- SELECT to_timestamp( 946684800); -- 2000-01-01 00:00:00+00
-@@ -425,15 +412,11 @@ SELECT '2011-03-26 23:00:01 UTC'::timestamptz;
- SELECT '2011-03-26 23:59:59 UTC'::timestamptz;
- SELECT '2011-03-27 00:00:00 UTC'::timestamptz;
-
--SET TimeZone to 'America/Caracas';
--
--SELECT '2007-12-09 06:00:00 UTC'::timestamptz;
--SELECT '2007-12-09 06:30:00 UTC'::timestamptz;
--SELECT '2007-12-09 06:59:59 UTC'::timestamptz;
--SELECT '2007-12-09 07:00:00 UTC'::timestamptz;
--SELECT '2007-12-09 07:00:01 UTC'::timestamptz;
--SELECT '2007-12-09 07:29:59 UTC'::timestamptz;
--SELECT '2007-12-09 07:30:00 UTC'::timestamptz;
-+SELECT '2014-10-25 21:00:00 UTC'::timestamptz;
-+SELECT '2014-10-25 21:59:59 UTC'::timestamptz;
-+SELECT '2014-10-25 22:00:00 UTC'::timestamptz;
-+SELECT '2014-10-25 22:00:01 UTC'::timestamptz;
-+SELECT '2014-10-25 23:00:00 UTC'::timestamptz;
-
- RESET TimeZone;
-
-@@ -445,13 +428,11 @@ SELECT '2011-03-26 23:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- SELECT '2011-03-26 23:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
- SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
-
--SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
--SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
-+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
-+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
-
- SELECT '2011-03-26 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
- SELECT '2011-03-26 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
-@@ -461,13 +442,11 @@ SELECT '2011-03-26 23:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
- SELECT '2011-03-26 23:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
- SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
-
--SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
--SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
--SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'VET';
--SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
--SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'VET';
--SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'VET';
--SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
-+SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
-+SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
-+SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
-+SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
-+SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
-
- --
- -- Test that the pg_timezone_names and pg_timezone_abbrevs views are
---
-2.9.3
-
diff --git a/postgresql.spec b/postgresql.spec
index 009c2ca..0f1463e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,8 +63,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
-Version: 9.6.2
-Release: 4%{?dist}
+Version: 9.6.3
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -76,7 +76,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.5.6
+%global prevversion 9.5.7
%global prevmajorversion 9.5
%global setup_version 5.1
@@ -109,7 +109,6 @@ Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-timezonetz-2017-tests.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -357,7 +356,6 @@ benchmarks.
%patch3 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1166,6 +1164,10 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Thu May 11 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.3-1
+- update to 9.6.3 per release notes:
+ https://www.postgresql.org/docs/9.6/static/release-9-6-3.html
+
* Mon Apr 24 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-4
- rebase to postgresql-setup 5.1
diff --git a/sources b/sources
index 146b1c3..fd12b15 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-9.5.6.tar.bz2) = fabaeb2d4841ca2f2fd7b0f9c90368debc91f569ade5ad4dc9250c27d790a97ed58a670319f0fe59404fce7e986e8dafb1408edbe6fc149531bdb230b1b913fe
-SHA512 (postgresql-9.5.6.tar.bz2.sha256) = 6c8581fe42bb74ec095e244dc84c55e0c3e8be9be6402d98d3794218e94543475025ee5624c566753bcfef498eccdb5947b671b12083d1194af3e6833df46f2f
-SHA512 (postgresql-9.6.2.tar.bz2) = 7c9d61a591408e29d7dc70d6b28ecdf06edf7f8fbf4e014e60a1e4f841fd5734c74a820094f6153e10ef633d48ea73f2a85194f6d2cd519a8f7087a261e9e02b
-SHA512 (postgresql-9.6.2.tar.bz2.sha256) = 52941dbc83235f4dc96797a91d7bf26772139cc33dcaca4fdbc6a7cbe1ec0a0ccdbe4048a146238c9d3614a229518e6b58862c031167ef58bcd278217014841a
+SHA512 (postgresql-9.5.7.tar.bz2) = 0f879a8d7587739aa9a696d60f909f819d567c67dff7c730d5e856639ed78ebc35beeb3cdaf782573d7e62c7056560a934f64cf11ccac6e309f58bb82d1ca78f
+SHA512 (postgresql-9.5.7.tar.bz2.sha256) = 60ac2b6bbfb40303b3fe30ce3685c637bcd89382ced722572d34e4248639e159c300c5bd28c4b094f54b1c72c7f2421f0d9db2cc06efc2e5814d4932e3c2d5e0
+SHA512 (postgresql-9.6.3.tar.bz2) = 97141972e154e6b0e756ee6a4e20f26e82022a9fd4c56305314a3a5567a79ece638e4ac3d513b46138737ae6bd27a098f30013a94767db151181aac9c01290a1
+SHA512 (postgresql-9.6.3.tar.bz2.sha256) = caf9fc6f76d7e27fa647b386bd3ad36311d86d97c9664d163f43b62ddeda60b605b594335d01bc8cfdec0a8c344a77920900b577dd8c5f82d6a48cc9693eb5a8
SHA512 (postgresql-setup-5.1.tar.gz) = f901c2f5f0b60a51a46fce1abf3a9854b97d1f1337a4659d73d3e2930518a35eef94de400d259f2a799652ac6acef9575b9d474cc929641f2659aed195254981
-SHA512 (postgresql-9.6.2-US.pdf) = 913e2166bd9013a2640c255a523d475eca98ecd7986cc4451ad60b839f9aa0c556761908a0e98dcaf84cd0afdf011e05b18f9528929dfe7a621c474f07f36cd1
+SHA512 (postgresql-9.6.3-US.pdf) = d80d23c1093d406c475299d7f9bdc48e2d60ff8b61ac2db546a13683bc686a5ca10acdc7de7dc6a1f43f461da8d3966817bd0343e4bf3a94ee176df025236a7e
commit cb6e898698d507fe237fed12d5c2d374f2d1bd55
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Apr 24 13:21:30 2017 +0200
setup: new upstream release
Version: 9.6.2-4
diff --git a/.gitignore b/.gitignore
index da04230..d8f49a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
/postgresql-9.5.6.tar.bz2.sha256
/postgresql-9.6.2.tar.bz2
/postgresql-9.6.2.tar.bz2.sha256
-/postgresql-setup-5.0.tar.gz
+/postgresql-setup-5.1.tar.gz
/postgresql-9.6.2-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 590931d..009c2ca 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -79,7 +79,7 @@ Url: http://www.postgresql.org/
%global prevversion 9.5.6
%global prevmajorversion 9.5
-%global setup_version 5.0
+%global setup_version 5.1
%global service_name postgresql.service
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -391,9 +391,6 @@ cd postgresql-setup-%{setup_version}
%configure \
pgdocdir=%{_pkgdocdir} \
- systemdunitsdir=%{_prefix}/lib/systemd/system \
- systemduserunitsdir=%{_sysconfdir}/systemd/system \
- systemdlegacyscriptsdir=%{_libexecdir}/initscripts/legacy-actions \
PGVERSION=%{version} \
PGMAJORVERSION=%{majorversion} \
NAME_DEFAULT_PREV_SERVICE=postgresql
@@ -1169,6 +1166,9 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
+* Mon Apr 24 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-4
+- rebase to postgresql-setup 5.1
+
* Mon Apr 10 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-3
- spring cleanup
diff --git a/sources b/sources
index 5678b6b..146b1c3 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-9.5.6.tar.bz2) = fabaeb2d4841ca2f2fd7b0f9c90368debc91f569ade5
SHA512 (postgresql-9.5.6.tar.bz2.sha256) = 6c8581fe42bb74ec095e244dc84c55e0c3e8be9be6402d98d3794218e94543475025ee5624c566753bcfef498eccdb5947b671b12083d1194af3e6833df46f2f
SHA512 (postgresql-9.6.2.tar.bz2) = 7c9d61a591408e29d7dc70d6b28ecdf06edf7f8fbf4e014e60a1e4f841fd5734c74a820094f6153e10ef633d48ea73f2a85194f6d2cd519a8f7087a261e9e02b
SHA512 (postgresql-9.6.2.tar.bz2.sha256) = 52941dbc83235f4dc96797a91d7bf26772139cc33dcaca4fdbc6a7cbe1ec0a0ccdbe4048a146238c9d3614a229518e6b58862c031167ef58bcd278217014841a
-SHA512 (postgresql-setup-5.0.tar.gz) = 0cda4242c3fd856d120e4533e34358252ed1d9dbced1435c4997fbfa600e5132462ca6cc2782ed3959a09374317424463196c24ebe5b1e10e7ac80e09b6ebfbf
+SHA512 (postgresql-setup-5.1.tar.gz) = f901c2f5f0b60a51a46fce1abf3a9854b97d1f1337a4659d73d3e2930518a35eef94de400d259f2a799652ac6acef9575b9d474cc929641f2659aed195254981
SHA512 (postgresql-9.6.2-US.pdf) = 913e2166bd9013a2640c255a523d475eca98ecd7986cc4451ad60b839f9aa0c556761908a0e98dcaf84cd0afdf011e05b18f9528929dfe7a621c474f07f36cd1
commit 56b78dd0570bf48bf44742781f2645ae765b4649
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Apr 10 13:18:58 2017 +0200
spec: spring cleanup #2 (systemd obsoleted constructs)
Resolves: rhbz#1440729
Version: 9.6.2-3
diff --git a/postgresql.spec b/postgresql.spec
index 56cbcaf..590931d 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -72,9 +72,6 @@ License: PostgreSQL
Group: Applications/Databases
Url: http://www.postgresql.org/
-# This number must be NVR-greater than any PG version shipped in F15:
-%global first_systemd_version 0:9.0.99
-
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
@@ -120,7 +117,7 @@ BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: perl-generators
%endif
BuildRequires: readline-devel zlib-devel
-BuildRequires: systemd-units util-linux
+BuildRequires: systemd util-linux
BuildRequires: multilib-rpm-config
# postgresql-setup build requires
@@ -209,16 +206,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
# We require this to be present for %%{_prefix}/lib/tmpfiles.d
-Requires: systemd-units
+Requires: systemd
# Make sure it's there when scriptlets run, too
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-# This is actually needed for the %%triggerun script but Requires(triggerun)
-# is not valid. We can use post because this particular %%triggerun script
-# should fire just after this package is installed.
-Requires(post): systemd-sysv
-Requires(post): chkconfig
+%{?systemd_requires}
# Packages which provide postgresql plugins should build-require
# postgresql-devel and require
# postgresql-server(:MODULE_COMPAT_%%{postgresql_major}).
@@ -853,47 +843,15 @@ cat psql-%{majorversion}.lang >>main.lst
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
%post server
-%if 0%{?systemd_post:1}
%systemd_post %service_name
-%else
-if [ $1 -eq 1 ]; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%endif
-# Run this when upgrading from SysV initscript to native systemd unit
-%triggerun server -- postgresql-server < %{first_systemd_version}
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply postgresql
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save postgresql >/dev/null 2>&1 || :
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del postgresql >/dev/null 2>&1 || :
-/bin/systemctl try-restart %service_name >/dev/null 2>&1 || :
%preun server
-%if 0%{?systemd_preun:1}
%systemd_preun %service_name
-%else
-if [ $1 -eq 0 ]; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable %service_name >/dev/null 2>&1 || :
- /bin/systemctl stop %service_name >/dev/null 2>&1 || :
-fi
-%endif
+
%postun server
-%if 0%{?systemd_postun_with_restart:1}
%systemd_postun_with_restart %service_name
-%else
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart %service_name >/dev/null 2>&1 || :
-fi
-%endif
%check
@@ -1211,7 +1169,7 @@ make -C postgresql-setup-%{setup_version} check
%endif
%changelog
-* Fri Apr 07 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-3
+* Mon Apr 10 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-3
- spring cleanup
* Mon Mar 27 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-2
commit 19af2059f27c8fb211bd62654b9f6ee4a7e51eba
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Apr 7 14:19:52 2017 +0200
spec: spring cleaning
- %_pkgdocdir definition, not needed now
- define %service_name == postgresql.service
- remove duplicate help2man br
- don't try to install perl-generators on RHEL
- add BR Data::Dumper for perl testsuite
- use %_localstatedir for several /var occurrences
- use %_datadir instead of hard-wiring it
- don't install *.o tutorial files (rhbz#1187514)
- use mv instead of cp for rhbz#1250006 work-around
- run 'make check' for postgresql-setup tarball
Resolves: rhbz#1440729
Version: 9.6.2-3
diff --git a/postgresql.spec b/postgresql.spec
index 6783ec7..56cbcaf 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -57,9 +57,6 @@
# Turn that off to ensure such files don't get included in RPMs.
%global _default_patch_flags --no-backup-if-mismatch
-# _pkgdocdir is defined in fc20+, remove once f19 is dead
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Addition...
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@@ -67,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -87,6 +84,7 @@ Url: http://www.postgresql.org/
%global setup_version 5.0
+%global service_name postgresql.service
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
Source1: postgresql-%{version}-US.pdf
@@ -98,8 +96,8 @@ Source9: postgresql.tmpfiles.d
Source10: postgresql.pam
Source11: postgresql-bashprofile
-# Temporary location of postgresql-setup. Development git:
-# http://fedorapeople.org/cgit/praiskup/public_git/postgresql-setup.git/
+
+# git: https://github.com/devexp-db/postgresql-setup
Source12: https://github.com/devexp-db/postgresql-setup/releases/download/v%{setup_...
# Those here are just to enforce packagers check that the tarball was downloaded
@@ -116,9 +114,11 @@ Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
Patch7: postgresql-timezonetz-2017-tests.patch
-BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: perl-generators
+%endif
BuildRequires: readline-devel zlib-devel
BuildRequires: systemd-units util-linux
BuildRequires: multilib-rpm-config
@@ -299,6 +299,9 @@ Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%if %runselftest
+BuildRequires: perl(Data::Dumper)
+%endif
%description plperl
The postgresql-plperl package contains the PL/Perl procedural language,
@@ -539,8 +542,8 @@ unset PYTHON
%if %selinux
--with-selinux \
%endif
- --with-system-tzdata=/usr/share/zoneinfo \
- --datadir=/usr/share/pgsql
+ --with-system-tzdata=%_datadir/zoneinfo \
+ --datadir=%_datadir/pgsql
make %{?_smp_mflags} world
@@ -549,6 +552,9 @@ sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/t
make %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all
rm -f src/tutorial/GNUmakefile
+# The object files shouldn't be copied to rpm bz#1187514
+rm -f src/tutorial/*.o
+
# run_testsuite WHERE
# -------------------
# Run 'make check' in WHERE path. When that command fails, return the logs
@@ -636,7 +642,7 @@ cd ..
# For some reason, having '%%doc %%{_pkgdocdir}/README.rpm-dist' in %%files
# causes FTBFS (at least on RHEL6), see rhbz#1250006.
-cp $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
+mv $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
id postgresql
@@ -685,21 +691,20 @@ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
%endif
# Create the directory for sockets.
-install -d -m 755 $RPM_BUILD_ROOT/var/run/postgresql
+install -d -m 755 $RPM_BUILD_ROOT%{?_localstatedir}/run/postgresql
# ... and make a tmpfiles script to recreate it at reboot.
mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
-install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
+install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/data
# backups of data go here...
-install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
+install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/backups
# postgres' .bash_profile
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
-
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/.bash_profile
%if %upgrade
pushd postgresql-%{prevversion}
@@ -849,7 +854,7 @@ cat psql-%{majorversion}.lang >>main.lst
%post server
%if 0%{?systemd_post:1}
-%systemd_post postgresql.service
+%systemd_post %service_name
%else
if [ $1 -eq 1 ]; then
# Initial installation
@@ -866,30 +871,37 @@ fi
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del postgresql >/dev/null 2>&1 || :
-/bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
+/bin/systemctl try-restart %service_name >/dev/null 2>&1 || :
%preun server
%if 0%{?systemd_preun:1}
-%systemd_preun postgresql.service
+%systemd_preun %service_name
%else
if [ $1 -eq 0 ]; then
# Package removal, not upgrade
- /bin/systemctl --no-reload disable postgresql.service >/dev/null 2>&1 || :
- /bin/systemctl stop postgresql.service >/dev/null 2>&1 || :
+ /bin/systemctl --no-reload disable %service_name >/dev/null 2>&1 || :
+ /bin/systemctl stop %service_name >/dev/null 2>&1 || :
fi
%endif
%postun server
%if 0%{?systemd_postun_with_restart:1}
-%systemd_postun_with_restart postgresql.service
+%systemd_postun_with_restart %service_name
%else
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ]; then
# Package upgrade, not uninstall
- /bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
+ /bin/systemctl try-restart %service_name >/dev/null 2>&1 || :
fi
%endif
+
+%check
+%if %runselftest
+make -C postgresql-setup-%{setup_version} check
+%endif
+
+
%clean
# FILES section.
@@ -1129,17 +1141,17 @@ fi
%{_mandir}/man1/postgresql-setup.*
%{_mandir}/man1/postmaster.*
%{_tmpfilesdir}/postgresql.conf
-%{_unitdir}/postgresql.service
-%{_unitdir}/postgresql@.service
-%attr(700,postgres,postgres) %dir /var/lib/pgsql
-%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
-%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
-%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
-%attr(755,postgres,postgres) %dir /var/run/postgresql
+%{_unitdir}/*postgresql*.service
+%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql
+%attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile
+%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/backups
+%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/data
+%attr(755,postgres,postgres) %dir %{?_localstatedir}/run/postgresql
%if %pam
%config(noreplace) /etc/pam.d/postgresql
%endif
+
%files devel -f devel.lst
%{_bindir}/ecpg
%{_bindir}/pg_config
@@ -1199,6 +1211,9 @@ fi
%endif
%changelog
+* Fri Apr 07 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-3
+- spring cleanup
+
* Mon Mar 27 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-2
- rebuild for rhbz#1436006
commit 55a2b11e5dca2d5e52063cdfe94fbee276d7d61e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Mar 27 08:56:23 2017 +0200
bump: rebuild for rhbz#1436006
Version: 9.6.2-2
Resolves: rhbz#1436006
diff --git a/postgresql.spec b/postgresql.spec
index 6c29d67..6783ec7 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1199,6 +1199,9 @@ fi
%endif
%changelog
+* Mon Mar 27 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-2
+- rebuild for rhbz#1436006
+
* Wed Feb 22 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-1
- update to 9.6.2 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-2.html
commit 0c1f8cf381c7474314d9305ef7856e082659f889
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Mar 13 10:56:08 2017 +0100
tests: fix testsuites for tzdata2017a
Version: 9.6.2-1
diff --git a/postgresql-timezonetz-2017-tests.patch b/postgresql-timezonetz-2017-tests.patch
new file mode 100644
index 0000000..69ff264
--- /dev/null
+++ b/postgresql-timezonetz-2017-tests.patch
@@ -0,0 +1,751 @@
+From d8ec6b9c8c265c2f29b1c0e0e4205895baaa326d Mon Sep 17 00:00:00 2001
+From: Tom Lane <tgl(a)sss.pgh.pa.us>
+Date: Thu, 9 Mar 2017 17:20:11 -0500
+Subject: [PATCH] Fix timestamptz regression test to still work with latest
+ IANA zone data.
+
+The IANA timezone crew continues to chip away at their project of removing
+timezone abbreviations that have no real-world currency from their
+database. The tzdata2017a update removes all such abbreviations for
+South American zones, as well as much of the Pacific. This breaks some
+test cases in timestamptz.sql that were expecting America/Santiago and
+America/Caracas to have non-numeric abbreviations.
+
+The test cases involving America/Santiago seem to have selected that
+zone more or less at random, so just replace it with America/New_York,
+which is of similar longitude. The cases involving America/Caracas are
+harder since they were chosen to test a time-varying zone abbreviation
+around a point where it changed meaning in the backwards direction.
+Fortunately, Europe/Moscow has a similar case in 2014, and the MSK/MSD
+abbreviations are well enough attested that IANA seems unlikely to
+decide to remove them from the database in future.
+
+With these changes, this regression test should pass when using any IANA
+zone database from 2015 or later. One could wish that there were a few
+years more daylight on how out-of-date your zone database can be ... but
+really the --with-system-tzdata option is only meant for use on platforms
+where the zone database is kept up-to-date pretty faithfully, so I do not
+think this is a big objection.
+
+Discussion: https://postgr.es/m/6749.1489087470@sss.pgh.pa.us
+---
+ src/test/regress/expected/timestamptz.out | 324 ++++++++++--------------------
+ src/test/regress/sql/timestamptz.sql | 103 ++++------
+ 2 files changed, 148 insertions(+), 279 deletions(-)
+
+diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
+index 51d4d21..3319247 100644
+--- a/src/test/regress/expected/timestamptz.out
++++ b/src/test/regress/expected/timestamptz.out
+@@ -1773,24 +1773,24 @@ SELECT * FROM TIMESTAMPTZ_TST ORDER BY a;
+ --Cleanup
+ DROP TABLE TIMESTAMPTZ_TST;
+ -- test timestamptz constructors
+-set TimeZone to 'America/Santiago';
++set TimeZone to 'America/New_York';
+ -- numeric timezone
+ SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33);
+ make_timestamptz
+ ---------------------------------
+- Sun Jul 15 08:15:55.33 1973 CLT
++ Sun Jul 15 08:15:55.33 1973 EDT
+ (1 row)
+
+ SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33, '+2');
+ make_timestamptz
+ ---------------------------------
+- Sun Jul 15 02:15:55.33 1973 CLT
++ Sun Jul 15 02:15:55.33 1973 EDT
+ (1 row)
+
+ SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33, '-2');
+ make_timestamptz
+ ---------------------------------
+- Sun Jul 15 06:15:55.33 1973 CLT
++ Sun Jul 15 06:15:55.33 1973 EDT
+ (1 row)
+
+ WITH tzs (tz) AS (VALUES
+@@ -1799,23 +1799,23 @@ WITH tzs (tz) AS (VALUES
+ ('+10:00:1'), ('+10:00:01'),
+ ('+10:00:10'))
+ SELECT make_timestamptz(2010, 2, 27, 3, 45, 00, tz), tz FROM tzs;
+- make_timestamptz | tz
+--------------------------------+-----------
+- Fri Feb 26 23:45:00 2010 CLST | +1
+- Fri Feb 26 23:45:00 2010 CLST | +1:
+- Fri Feb 26 23:45:00 2010 CLST | +1:0
+- Fri Feb 26 23:45:00 2010 CLST | +100
+- Fri Feb 26 23:45:00 2010 CLST | +1:00
+- Fri Feb 26 23:45:00 2010 CLST | +01:00
+- Fri Feb 26 14:45:00 2010 CLST | +10
+- Fri Feb 26 14:45:00 2010 CLST | +1000
+- Fri Feb 26 14:45:00 2010 CLST | +10:
+- Fri Feb 26 14:45:00 2010 CLST | +10:0
+- Fri Feb 26 14:45:00 2010 CLST | +10:00
+- Fri Feb 26 14:45:00 2010 CLST | +10:00:
+- Fri Feb 26 14:44:59 2010 CLST | +10:00:1
+- Fri Feb 26 14:44:59 2010 CLST | +10:00:01
+- Fri Feb 26 14:44:50 2010 CLST | +10:00:10
++ make_timestamptz | tz
++------------------------------+-----------
++ Fri Feb 26 21:45:00 2010 EST | +1
++ Fri Feb 26 21:45:00 2010 EST | +1:
++ Fri Feb 26 21:45:00 2010 EST | +1:0
++ Fri Feb 26 21:45:00 2010 EST | +100
++ Fri Feb 26 21:45:00 2010 EST | +1:00
++ Fri Feb 26 21:45:00 2010 EST | +01:00
++ Fri Feb 26 12:45:00 2010 EST | +10
++ Fri Feb 26 12:45:00 2010 EST | +1000
++ Fri Feb 26 12:45:00 2010 EST | +10:
++ Fri Feb 26 12:45:00 2010 EST | +10:0
++ Fri Feb 26 12:45:00 2010 EST | +10:00
++ Fri Feb 26 12:45:00 2010 EST | +10:00:
++ Fri Feb 26 12:44:59 2010 EST | +10:00:1
++ Fri Feb 26 12:44:59 2010 EST | +10:00:01
++ Fri Feb 26 12:44:50 2010 EST | +10:00:10
+ (15 rows)
+
+ -- these should fail
+@@ -1861,30 +1861,29 @@ SELECT make_timestamptz(1881, 12, 10, 0, 0, 0, 'Europe/Paris') AT TIME ZONE 'UTC
+ SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
+ ERROR: time zone "Nehwon/Lankhmar" not recognized
+ -- abbreviations
+-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLST');
+- make_timestamptz
+--------------------------------
+- Wed Dec 10 10:10:10 2008 CLST
++SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
++ make_timestamptz
++------------------------------
++ Wed Dec 10 10:10:10 2008 EST
+ (1 row)
+
+-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLT');
+- make_timestamptz
+--------------------------------
+- Wed Dec 10 11:10:10 2008 CLST
++SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
++ make_timestamptz
++------------------------------
++ Wed Dec 10 09:10:10 2008 EST
+ (1 row)
+
+ SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
+- make_timestamptz
+--------------------------------
+- Wed Dec 10 15:10:10 2014 CLST
++ make_timestamptz
++------------------------------
++ Wed Dec 10 13:10:10 2014 EST
+ (1 row)
+
+ RESET TimeZone;
+ --
+ -- Test behavior with a dynamic (time-varying) timezone abbreviation.
+ -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)
+--- moved forwards in Mar 2011 and that VET (America/Caracas standard time)
+--- moved backwards in Dec 2007.
++-- moved forwards in Mar 2011 and backwards again in Oct 2014.
+ --
+ SET TimeZone to 'UTC';
+ SELECT '2011-03-27 00:00:00 Europe/Moscow'::timestamptz;
+@@ -1995,100 +1994,64 @@ SELECT '2011-03-27 04:00:00 MSK'::timestamptz;
+ Sun Mar 27 00:00:00 2011 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:00:00 America/Caracas'::timestamptz;
++SELECT '2014-10-26 00:00:00 Europe/Moscow'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 06:00:00 2007 UTC
++ Sat Oct 25 20:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:29:59 America/Caracas'::timestamptz;
++SELECT '2014-10-26 00:59:59 Europe/Moscow'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 06:29:59 2007 UTC
++ Sat Oct 25 20:59:59 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:30:00 America/Caracas'::timestamptz;
++SELECT '2014-10-26 01:00:00 Europe/Moscow'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 07:00:00 2007 UTC
++ Sat Oct 25 22:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:30:01 America/Caracas'::timestamptz;
++SELECT '2014-10-26 01:00:01 Europe/Moscow'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 07:00:01 2007 UTC
++ Sat Oct 25 22:00:01 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:59:59 America/Caracas'::timestamptz;
++SELECT '2014-10-26 02:00:00 Europe/Moscow'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 07:29:59 2007 UTC
++ Sat Oct 25 23:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 03:00:00 America/Caracas'::timestamptz;
++SELECT '2014-10-26 00:00:00 MSK'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 07:30:00 2007 UTC
++ Sat Oct 25 20:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 03:00:01 America/Caracas'::timestamptz;
++SELECT '2014-10-26 00:59:59 MSK'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 07:30:01 2007 UTC
++ Sat Oct 25 20:59:59 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 04:00:00 America/Caracas'::timestamptz;
++SELECT '2014-10-26 01:00:00 MSK'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 08:30:00 2007 UTC
++ Sat Oct 25 22:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:00:00 VET'::timestamptz;
++SELECT '2014-10-26 01:00:01 MSK'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 06:00:00 2007 UTC
++ Sat Oct 25 22:00:01 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:29:59 VET'::timestamptz;
++SELECT '2014-10-26 02:00:00 MSK'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 06:29:59 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 02:30:00 VET'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 07:00:00 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 02:30:01 VET'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 07:00:01 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 02:59:59 VET'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 07:29:59 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 03:00:00 VET'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 07:30:00 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 03:00:01 VET'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 07:30:01 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 04:00:00 VET'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 08:30:00 2007 UTC
++ Sat Oct 25 23:00:00 2014 UTC
+ (1 row)
+
+ SELECT '2011-03-27 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+@@ -2199,112 +2162,76 @@ SELECT '2011-03-27 04:00:00'::timestamp AT TIME ZONE 'MSK';
+ Sun Mar 27 00:00:00 2011 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+ timezone
+ ------------------------------
+- Sun Dec 09 06:00:00 2007 UTC
++ Sat Oct 25 20:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'Europe/Moscow';
+ timezone
+ ------------------------------
+- Sun Dec 09 06:29:59 2007 UTC
++ Sat Oct 25 20:59:59 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+ timezone
+ ------------------------------
+- Sun Dec 09 07:00:00 2007 UTC
++ Sat Oct 25 22:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'Europe/Moscow';
+ timezone
+ ------------------------------
+- Sun Dec 09 07:00:01 2007 UTC
++ Sat Oct 25 22:00:01 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+ timezone
+ ------------------------------
+- Sun Dec 09 07:29:59 2007 UTC
++ Sat Oct 25 23:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'MSK';
+ timezone
+ ------------------------------
+- Sun Dec 09 07:30:00 2007 UTC
++ Sat Oct 25 20:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'MSK';
+ timezone
+ ------------------------------
+- Sun Dec 09 07:30:01 2007 UTC
++ Sat Oct 25 20:59:59 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'MSK';
+ timezone
+ ------------------------------
+- Sun Dec 09 08:30:00 2007 UTC
++ Sat Oct 25 22:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'VET';
++SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'MSK';
+ timezone
+ ------------------------------
+- Sun Dec 09 06:00:00 2007 UTC
++ Sat Oct 25 22:00:01 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'VET';
++SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'MSK';
+ timezone
+ ------------------------------
+- Sun Dec 09 06:29:59 2007 UTC
++ Sat Oct 25 23:00:00 2014 UTC
+ (1 row)
+
+-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'VET';
+- timezone
+-------------------------------
+- Sun Dec 09 07:00:00 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'VET';
+- timezone
+-------------------------------
+- Sun Dec 09 07:00:01 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'VET';
+- timezone
+-------------------------------
+- Sun Dec 09 07:29:59 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'VET';
+- timezone
+-------------------------------
+- Sun Dec 09 07:30:00 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'VET';
+- timezone
+-------------------------------
+- Sun Dec 09 07:30:01 2007 UTC
+-(1 row)
+-
+-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'VET';
+- timezone
+-------------------------------
+- Sun Dec 09 08:30:00 2007 UTC
+-(1 row)
+-
+-SELECT make_timestamptz(2007, 12, 9, 2, 0, 0, 'VET');
++SELECT make_timestamptz(2014, 10, 26, 0, 0, 0, 'MSK');
+ make_timestamptz
+ ------------------------------
+- Sun Dec 09 06:00:00 2007 UTC
++ Sat Oct 25 20:00:00 2014 UTC
+ (1 row)
+
+-SELECT make_timestamptz(2007, 12, 9, 3, 0, 0, 'VET');
++SELECT make_timestamptz(2014, 10, 26, 1, 0, 0, 'MSK');
+ make_timestamptz
+ ------------------------------
+- Sun Dec 09 07:30:00 2007 UTC
++ Sat Oct 25 22:00:00 2014 UTC
+ (1 row)
+
+ SELECT to_timestamp( 0); -- 1970-01-01 00:00:00+00
+@@ -2391,47 +2318,34 @@ SELECT '2011-03-27 00:00:00 UTC'::timestamptz;
+ Sun Mar 27 04:00:00 2011 MSK
+ (1 row)
+
+-SET TimeZone to 'America/Caracas';
+-SELECT '2007-12-09 06:00:00 UTC'::timestamptz;
++SELECT '2014-10-25 21:00:00 UTC'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 02:00:00 2007 VET
++ Sun Oct 26 01:00:00 2014 MSK
+ (1 row)
+
+-SELECT '2007-12-09 06:30:00 UTC'::timestamptz;
++SELECT '2014-10-25 21:59:59 UTC'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 02:30:00 2007 VET
++ Sun Oct 26 01:59:59 2014 MSK
+ (1 row)
+
+-SELECT '2007-12-09 06:59:59 UTC'::timestamptz;
++SELECT '2014-10-25 22:00:00 UTC'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 02:59:59 2007 VET
++ Sun Oct 26 01:00:00 2014 MSK
+ (1 row)
+
+-SELECT '2007-12-09 07:00:00 UTC'::timestamptz;
++SELECT '2014-10-25 22:00:01 UTC'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 02:30:00 2007 VET
++ Sun Oct 26 01:00:01 2014 MSK
+ (1 row)
+
+-SELECT '2007-12-09 07:00:01 UTC'::timestamptz;
++SELECT '2014-10-25 23:00:00 UTC'::timestamptz;
+ timestamptz
+ ------------------------------
+- Sun Dec 09 02:30:01 2007 VET
+-(1 row)
+-
+-SELECT '2007-12-09 07:29:59 UTC'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 02:59:59 2007 VET
+-(1 row)
+-
+-SELECT '2007-12-09 07:30:00 UTC'::timestamptz;
+- timestamptz
+-------------------------------
+- Sun Dec 09 03:00:00 2007 VET
++ Sun Oct 26 02:00:00 2014 MSK
+ (1 row)
+
+ RESET TimeZone;
+@@ -2477,46 +2391,34 @@ SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ Sun Mar 27 04:00:00 2011
+ (1 row)
+
+-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ timezone
+ --------------------------
+- Sun Dec 09 02:00:00 2007
++ Sun Oct 26 01:00:00 2014
+ (1 row)
+
+-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ timezone
+ --------------------------
+- Sun Dec 09 02:30:00 2007
++ Sun Oct 26 01:59:59 2014
+ (1 row)
+
+-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ timezone
+ --------------------------
+- Sun Dec 09 02:59:59 2007
++ Sun Oct 26 01:00:00 2014
+ (1 row)
+
+-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ timezone
+ --------------------------
+- Sun Dec 09 02:30:00 2007
++ Sun Oct 26 01:00:01 2014
+ (1 row)
+
+-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ timezone
+ --------------------------
+- Sun Dec 09 02:30:01 2007
+-(1 row)
+-
+-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+- timezone
+---------------------------
+- Sun Dec 09 02:59:59 2007
+-(1 row)
+-
+-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+- timezone
+---------------------------
+- Sun Dec 09 03:00:00 2007
++ Sun Oct 26 02:00:00 2014
+ (1 row)
+
+ SELECT '2011-03-26 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+@@ -2561,46 +2463,34 @@ SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+ Sun Mar 27 04:00:00 2011
+ (1 row)
+
+-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
++SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+ timezone
+ --------------------------
+- Sun Dec 09 02:00:00 2007
++ Sun Oct 26 01:00:00 2014
+ (1 row)
+
+-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
++SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
+ timezone
+ --------------------------
+- Sun Dec 09 02:30:00 2007
++ Sun Oct 26 01:59:59 2014
+ (1 row)
+
+-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'VET';
++SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+ timezone
+ --------------------------
+- Sun Dec 09 02:59:59 2007
++ Sun Oct 26 01:00:00 2014
+ (1 row)
+
+-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
++SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
+ timezone
+ --------------------------
+- Sun Dec 09 02:30:00 2007
++ Sun Oct 26 01:00:01 2014
+ (1 row)
+
+-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'VET';
++SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+ timezone
+ --------------------------
+- Sun Dec 09 02:30:01 2007
+-(1 row)
+-
+-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'VET';
+- timezone
+---------------------------
+- Sun Dec 09 02:59:59 2007
+-(1 row)
+-
+-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
+- timezone
+---------------------------
+- Sun Dec 09 03:00:00 2007
++ Sun Oct 26 02:00:00 2014
+ (1 row)
+
+ --
+diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
+index ab86622..4e37071 100644
+--- a/src/test/regress/sql/timestamptz.sql
++++ b/src/test/regress/sql/timestamptz.sql
+@@ -280,7 +280,7 @@ SELECT * FROM TIMESTAMPTZ_TST ORDER BY a;
+ DROP TABLE TIMESTAMPTZ_TST;
+
+ -- test timestamptz constructors
+-set TimeZone to 'America/Santiago';
++set TimeZone to 'America/New_York';
+
+ -- numeric timezone
+ SELECT make_timestamptz(1973, 07, 15, 08, 15, 55.33);
+@@ -309,8 +309,8 @@ SELECT make_timestamptz(1881, 12, 10, 0, 0, 0, 'Europe/Paris') AT TIME ZONE 'UTC
+ SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
+
+ -- abbreviations
+-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLST');
+-SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'CLT');
++SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
++SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
+ SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
+
+ RESET TimeZone;
+@@ -318,8 +318,7 @@ RESET TimeZone;
+ --
+ -- Test behavior with a dynamic (time-varying) timezone abbreviation.
+ -- These tests rely on the knowledge that MSK (Europe/Moscow standard time)
+--- moved forwards in Mar 2011 and that VET (America/Caracas standard time)
+--- moved backwards in Dec 2007.
++-- moved forwards in Mar 2011 and backwards again in Oct 2014.
+ --
+
+ SET TimeZone to 'UTC';
+@@ -344,23 +343,17 @@ SELECT '2011-03-27 03:00:00 MSK'::timestamptz;
+ SELECT '2011-03-27 03:00:01 MSK'::timestamptz;
+ SELECT '2011-03-27 04:00:00 MSK'::timestamptz;
+
+-SELECT '2007-12-09 02:00:00 America/Caracas'::timestamptz;
+-SELECT '2007-12-09 02:29:59 America/Caracas'::timestamptz;
+-SELECT '2007-12-09 02:30:00 America/Caracas'::timestamptz;
+-SELECT '2007-12-09 02:30:01 America/Caracas'::timestamptz;
+-SELECT '2007-12-09 02:59:59 America/Caracas'::timestamptz;
+-SELECT '2007-12-09 03:00:00 America/Caracas'::timestamptz;
+-SELECT '2007-12-09 03:00:01 America/Caracas'::timestamptz;
+-SELECT '2007-12-09 04:00:00 America/Caracas'::timestamptz;
++SELECT '2014-10-26 00:00:00 Europe/Moscow'::timestamptz;
++SELECT '2014-10-26 00:59:59 Europe/Moscow'::timestamptz;
++SELECT '2014-10-26 01:00:00 Europe/Moscow'::timestamptz;
++SELECT '2014-10-26 01:00:01 Europe/Moscow'::timestamptz;
++SELECT '2014-10-26 02:00:00 Europe/Moscow'::timestamptz;
+
+-SELECT '2007-12-09 02:00:00 VET'::timestamptz;
+-SELECT '2007-12-09 02:29:59 VET'::timestamptz;
+-SELECT '2007-12-09 02:30:00 VET'::timestamptz;
+-SELECT '2007-12-09 02:30:01 VET'::timestamptz;
+-SELECT '2007-12-09 02:59:59 VET'::timestamptz;
+-SELECT '2007-12-09 03:00:00 VET'::timestamptz;
+-SELECT '2007-12-09 03:00:01 VET'::timestamptz;
+-SELECT '2007-12-09 04:00:00 VET'::timestamptz;
++SELECT '2014-10-26 00:00:00 MSK'::timestamptz;
++SELECT '2014-10-26 00:59:59 MSK'::timestamptz;
++SELECT '2014-10-26 01:00:00 MSK'::timestamptz;
++SELECT '2014-10-26 01:00:01 MSK'::timestamptz;
++SELECT '2014-10-26 02:00:00 MSK'::timestamptz;
+
+ SELECT '2011-03-27 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+ SELECT '2011-03-27 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+@@ -382,26 +375,20 @@ SELECT '2011-03-27 03:00:00'::timestamp AT TIME ZONE 'MSK';
+ SELECT '2011-03-27 03:00:01'::timestamp AT TIME ZONE 'MSK';
+ SELECT '2011-03-27 04:00:00'::timestamp AT TIME ZONE 'MSK';
+
+-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'Europe/Moscow';
+
+-SELECT '2007-12-09 02:00:00'::timestamp AT TIME ZONE 'VET';
+-SELECT '2007-12-09 02:29:59'::timestamp AT TIME ZONE 'VET';
+-SELECT '2007-12-09 02:30:00'::timestamp AT TIME ZONE 'VET';
+-SELECT '2007-12-09 02:30:01'::timestamp AT TIME ZONE 'VET';
+-SELECT '2007-12-09 02:59:59'::timestamp AT TIME ZONE 'VET';
+-SELECT '2007-12-09 03:00:00'::timestamp AT TIME ZONE 'VET';
+-SELECT '2007-12-09 03:00:01'::timestamp AT TIME ZONE 'VET';
+-SELECT '2007-12-09 04:00:00'::timestamp AT TIME ZONE 'VET';
++SELECT '2014-10-26 00:00:00'::timestamp AT TIME ZONE 'MSK';
++SELECT '2014-10-26 00:59:59'::timestamp AT TIME ZONE 'MSK';
++SELECT '2014-10-26 01:00:00'::timestamp AT TIME ZONE 'MSK';
++SELECT '2014-10-26 01:00:01'::timestamp AT TIME ZONE 'MSK';
++SELECT '2014-10-26 02:00:00'::timestamp AT TIME ZONE 'MSK';
+
+-SELECT make_timestamptz(2007, 12, 9, 2, 0, 0, 'VET');
+-SELECT make_timestamptz(2007, 12, 9, 3, 0, 0, 'VET');
++SELECT make_timestamptz(2014, 10, 26, 0, 0, 0, 'MSK');
++SELECT make_timestamptz(2014, 10, 26, 1, 0, 0, 'MSK');
+
+ SELECT to_timestamp( 0); -- 1970-01-01 00:00:00+00
+ SELECT to_timestamp( 946684800); -- 2000-01-01 00:00:00+00
+@@ -425,15 +412,11 @@ SELECT '2011-03-26 23:00:01 UTC'::timestamptz;
+ SELECT '2011-03-26 23:59:59 UTC'::timestamptz;
+ SELECT '2011-03-27 00:00:00 UTC'::timestamptz;
+
+-SET TimeZone to 'America/Caracas';
+-
+-SELECT '2007-12-09 06:00:00 UTC'::timestamptz;
+-SELECT '2007-12-09 06:30:00 UTC'::timestamptz;
+-SELECT '2007-12-09 06:59:59 UTC'::timestamptz;
+-SELECT '2007-12-09 07:00:00 UTC'::timestamptz;
+-SELECT '2007-12-09 07:00:01 UTC'::timestamptz;
+-SELECT '2007-12-09 07:29:59 UTC'::timestamptz;
+-SELECT '2007-12-09 07:30:00 UTC'::timestamptz;
++SELECT '2014-10-25 21:00:00 UTC'::timestamptz;
++SELECT '2014-10-25 21:59:59 UTC'::timestamptz;
++SELECT '2014-10-25 22:00:00 UTC'::timestamptz;
++SELECT '2014-10-25 22:00:01 UTC'::timestamptz;
++SELECT '2014-10-25 23:00:00 UTC'::timestamptz;
+
+ RESET TimeZone;
+
+@@ -445,13 +428,11 @@ SELECT '2011-03-26 23:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ SELECT '2011-03-26 23:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+ SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+
+-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
+-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'America/Caracas';
++SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
++SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'Europe/Moscow';
+
+ SELECT '2011-03-26 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+ SELECT '2011-03-26 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+@@ -461,13 +442,11 @@ SELECT '2011-03-26 23:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
+ SELECT '2011-03-26 23:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
+ SELECT '2011-03-27 00:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+
+-SELECT '2007-12-09 06:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
+-SELECT '2007-12-09 06:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
+-SELECT '2007-12-09 06:59:59 UTC'::timestamptz AT TIME ZONE 'VET';
+-SELECT '2007-12-09 07:00:00 UTC'::timestamptz AT TIME ZONE 'VET';
+-SELECT '2007-12-09 07:00:01 UTC'::timestamptz AT TIME ZONE 'VET';
+-SELECT '2007-12-09 07:29:59 UTC'::timestamptz AT TIME ZONE 'VET';
+-SELECT '2007-12-09 07:30:00 UTC'::timestamptz AT TIME ZONE 'VET';
++SELECT '2014-10-25 21:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
++SELECT '2014-10-25 21:59:59 UTC'::timestamptz AT TIME ZONE 'MSK';
++SELECT '2014-10-25 22:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
++SELECT '2014-10-25 22:00:01 UTC'::timestamptz AT TIME ZONE 'MSK';
++SELECT '2014-10-25 23:00:00 UTC'::timestamptz AT TIME ZONE 'MSK';
+
+ --
+ -- Test that the pg_timezone_names and pg_timezone_abbrevs views are
+--
+2.9.3
+
diff --git a/postgresql.spec b/postgresql.spec
index 4030610..6c29d67 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -114,6 +114,7 @@ Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+Patch7: postgresql-timezonetz-2017-tests.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -363,6 +364,7 @@ benchmarks.
%patch3 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
commit 86f722968284aa8ee7cb47c1d94c2fe58579a725
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Feb 22 10:01:46 2017 +0100
static: drop mistakenly added libpgfeutils.a
Version: 9.6.2-1
diff --git a/postgresql.spec b/postgresql.spec
index ebab676..4030610 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -767,7 +767,7 @@ mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
# remove files not to be packaged
-rm $RPM_BUILD_ROOT%{_libdir}/{libecpg,libpq,libecpg_compat,libpgtypes}.a
+rm $RPM_BUILD_ROOT%{_libdir}/lib{ecpg,pq,ecpg_compat,pgfeutils,pgtypes}.a
%if !%plperl
rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so
@@ -1155,7 +1155,6 @@ fi
%files static
%{_libdir}/libpgcommon.a
-%{_libdir}/libpgfeutils.a
%{_libdir}/libpgport.a
%if %upgrade
@@ -1198,9 +1197,10 @@ fi
%endif
%changelog
-* Tue Feb 07 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-1
+* Wed Feb 22 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-1
- update to 9.6.2 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-2.html
+- remove mistakenly isntalled libpgfeutils.a
* Thu Jan 12 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 9.6.1-3
- Rebuild for readline 7.x
commit f200f72f3de6df7738fbfb5156c2fda53c26e077
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Feb 7 10:58:49 2017 +0100
rebase: update to 9.6.2
Per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-2.html
Version: 9.6.2-1
diff --git a/.gitignore b/.gitignore
index 5a9ef99..da04230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-9.5.5.tar.bz2
-/postgresql-9.5.5.tar.bz2.sha256
-/postgresql-9.6.1.tar.bz2
-/postgresql-9.6.1.tar.bz2.sha256
+/postgresql-9.5.6.tar.bz2
+/postgresql-9.5.6.tar.bz2.sha256
+/postgresql-9.6.2.tar.bz2
+/postgresql-9.6.2.tar.bz2.sha256
/postgresql-setup-5.0.tar.gz
-/postgresql-9.6.1-US.pdf
+/postgresql-9.6.2-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 8ab5737..ebab676 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
-Version: 9.6.1
-Release: 3%{?dist}
+Version: 9.6.2
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.5.5
+%global prevversion 9.5.6
%global prevmajorversion 9.5
%global setup_version 5.0
@@ -1198,6 +1198,10 @@ fi
%endif
%changelog
+* Tue Feb 07 2017 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.2-1
+- update to 9.6.2 per release notes:
+ https://www.postgresql.org/docs/9.6/static/release-9-6-2.html
+
* Thu Jan 12 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 9.6.1-3
- Rebuild for readline 7.x
diff --git a/sources b/sources
index ee64c36..5678b6b 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-e75b182d250ad1fcdd71b280f146db4c postgresql-9.5.5.tar.bz2
-919c6b9a41577daa851984cfdf432dc3 postgresql-9.5.5.tar.bz2.sha256
-92ae6d7cdf18e648b3c22d0aa015565d postgresql-9.6.1.tar.bz2
-792708f2c6648abbe4172057374be15f postgresql-9.6.1.tar.bz2.sha256
-155acd3ada68b20f4ee0fa918ef0e912 postgresql-setup-5.0.tar.gz
-c2059344535bf765b41ca9ad952744bb postgresql-9.6.1-US.pdf
+SHA512 (postgresql-9.5.6.tar.bz2) = fabaeb2d4841ca2f2fd7b0f9c90368debc91f569ade5ad4dc9250c27d790a97ed58a670319f0fe59404fce7e986e8dafb1408edbe6fc149531bdb230b1b913fe
+SHA512 (postgresql-9.5.6.tar.bz2.sha256) = 6c8581fe42bb74ec095e244dc84c55e0c3e8be9be6402d98d3794218e94543475025ee5624c566753bcfef498eccdb5947b671b12083d1194af3e6833df46f2f
+SHA512 (postgresql-9.6.2.tar.bz2) = 7c9d61a591408e29d7dc70d6b28ecdf06edf7f8fbf4e014e60a1e4f841fd5734c74a820094f6153e10ef633d48ea73f2a85194f6d2cd519a8f7087a261e9e02b
+SHA512 (postgresql-9.6.2.tar.bz2.sha256) = 52941dbc83235f4dc96797a91d7bf26772139cc33dcaca4fdbc6a7cbe1ec0a0ccdbe4048a146238c9d3614a229518e6b58862c031167ef58bcd278217014841a
+SHA512 (postgresql-setup-5.0.tar.gz) = 0cda4242c3fd856d120e4533e34358252ed1d9dbced1435c4997fbfa600e5132462ca6cc2782ed3959a09374317424463196c24ebe5b1e10e7ac80e09b6ebfbf
+SHA512 (postgresql-9.6.2-US.pdf) = 913e2166bd9013a2640c255a523d475eca98ecd7986cc4451ad60b839f9aa0c556761908a0e98dcaf84cd0afdf011e05b18f9528929dfe7a621c474f07f36cd1
commit 069ea47da5c009ec3b75b81a0aef27a5ff82ca7a
Author: Igor Gnatenko <ignatenko(a)redhat.com>
Date: Thu Jan 12 17:30:37 2017 +0100
Rebuild for readline 7.x
Signed-off-by: Igor Gnatenko <ignatenko(a)redhat.com>
diff --git a/postgresql.spec b/postgresql.spec
index 3a4f909..8ab5737 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1198,6 +1198,9 @@ fi
%endif
%changelog
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 9.6.1-3
+- Rebuild for readline 7.x
+
* Mon Dec 19 2016 Miro Hronok <mhroncok(a)redhat.com> - 9.6.1-2
- Rebuild for Python 3.6
commit 61feab0edf0880151e44d388400caea6522067cf
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Mon Dec 19 18:20:36 2016 +0100
Rebuild for Python 3.6
diff --git a/postgresql.spec b/postgresql.spec
index 0145152..3a4f909 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
Version: 9.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1198,6 +1198,9 @@ fi
%endif
%changelog
+* Mon Dec 19 2016 Miro Hronok <mhroncok(a)redhat.com> - 9.6.1-2
+- Rebuild for Python 3.6
+
* Wed Oct 26 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.1-1
- update to 9.6.1 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-1.html
commit 06a51ffa8aa13f3136745d2cf009340fd3b5c30e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Oct 26 09:54:31 2016 +0200
gitignore: add up2date items
And fix related script.
Version: 9.6.1-1
diff --git a/.gitignore b/.gitignore
index c2d17c3..5a9ef99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
+/postgresql-9.5.5.tar.bz2
+/postgresql-9.5.5.tar.bz2.sha256
+/postgresql-9.6.1.tar.bz2
+/postgresql-9.6.1.tar.bz2.sha256
/postgresql-setup-5.0.tar.gz
-/postgresql-9.5.4.tar.bz2
-/postgresql-9.5.4.tar.bz2.sha256
-/postgresql-9.6.0-US.pdf
-/postgresql-9.6.0.tar.bz2
-/postgresql-9.6.0.tar.bz2.sha256
+/postgresql-9.6.1-US.pdf
diff --git a/gen_sources.sh b/gen_sources.sh
deleted file mode 100755
index fffa3cb..0000000
--- a/gen_sources.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh -x
-
-set -e
-spectool -S *.spec | cut -d' ' -f2 \
- | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \
-while read line
-do
- base=`basename "$line"`
- md5sum "$base"
-done
diff --git a/generate-sources-and-gitignore.sh b/generate-sources-and-gitignore.sh
new file mode 100755
index 0000000..be4939b
--- /dev/null
+++ b/generate-sources-and-gitignore.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+rm sources .gitignore
+set -e
+spectool -S *.spec | cut -d' ' -f2 \
+ | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \
+while read line
+do
+ base=`basename "$line"`
+ echo " * handling $base"
+ md5sum "$base" >> sources
+ echo "/$base" >> .gitignore
+done
commit b0108e47252b101807ad582b30ddc05723180571
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Oct 26 08:35:28 2016 +0200
build: remove config.{guess,sub} hacks
These issues are now automatically solved by %configure.
Version: 9.6.1-1
diff --git a/postgresql.spec b/postgresql.spec
index 5fc2d38..0145152 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -367,19 +367,10 @@ benchmarks.
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
-# add ppc64p7 support (https://fedoraproject.org/wiki/Features/Power7Subarch)
-# hopefully need for this will go away next time upstream updates config.sub
-sed -i -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" config/config.sub
-
cp -p %{SOURCE1} .
%if %upgrade
tar xfj %{SOURCE3}
-# make sure older version is up-to-date on config.guess/config.sub;
-# not always necessary, but PG 9.2 knows about aarch64 while 9.1 doesn't
-# (and also see the ppc64p7 hack above)
-cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
-cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
# apply once SOURCE3 is extracted
%endif
@@ -1212,6 +1203,7 @@ fi
https://www.postgresql.org/docs/9.6/static/release-9-6-1.html
- add gen_sources.sh script
- remove plpython build hack, fixed upstream
+- remove aarch64 and ppc64p7 hacks, fixed by the %%configure call
* Tue Oct 04 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.0-1
- rebase the postgresql-setup tarball
commit ba2a35679a5835de833724c460a289d3c29d1d43
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Oct 26 08:29:39 2016 +0200
build: remove plpython build hack
(fixed upstream: 7107d58ec5a3c45967e77525809612a5f89b97f3)
Version: 9.6.1-1
diff --git a/postgresql.spec b/postgresql.spec
index cae0ba8..5fc2d38 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -487,9 +487,6 @@ export PYTHON=/usr/bin/python3
--datadir=%{_datadir}/pgsql
# Fortunately we don't need to build much except plpython itself.
-# TODO: remove the headers hack once this is resolved:
-# https://www.postgresql.org/message-id/1925924.izSMJEZO3x@unused-4-107.brq...
-make %{?_smp_mflags} submake-generated-headers
make %{?_smp_mflags} -C src/pl/plpython all
# save built form in a directory that "make distclean" won't touch
cp -a src/pl/plpython src/pl/plpython3
@@ -1214,6 +1211,7 @@ fi
- update to 9.6.1 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-1.html
- add gen_sources.sh script
+- remove plpython build hack, fixed upstream
* Tue Oct 04 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.0-1
- rebase the postgresql-setup tarball
commit 30648b934df8451c40abb1173ce8fc5202a5fb89
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Oct 26 08:26:15 2016 +0200
rebase: update to 9.6.1
Per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6-1.html
Version: 9.6.1-1
diff --git a/gen_sources.sh b/gen_sources.sh
new file mode 100755
index 0000000..fffa3cb
--- /dev/null
+++ b/gen_sources.sh
@@ -0,0 +1,10 @@
+#! /bin/sh -x
+
+set -e
+spectool -S *.spec | cut -d' ' -f2 \
+ | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \
+while read line
+do
+ base=`basename "$line"`
+ md5sum "$base"
+done
diff --git a/postgresql.spec b/postgresql.spec
index 01fc1a6..cae0ba8 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,7 +66,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.6
-Version: 9.6.0
+Version: 9.6.1
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.5.4
+%global prevversion 9.5.5
%global prevmajorversion 9.5
%global setup_version 5.0
@@ -1210,6 +1210,11 @@ fi
%endif
%changelog
+* Wed Oct 26 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.1-1
+- update to 9.6.1 per release notes:
+ https://www.postgresql.org/docs/9.6/static/release-9-6-1.html
+- add gen_sources.sh script
+
* Tue Oct 04 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.0-1
- rebase the postgresql-setup tarball
diff --git a/sources b/sources
index b1a0dc1..ee64c36 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
+e75b182d250ad1fcdd71b280f146db4c postgresql-9.5.5.tar.bz2
+919c6b9a41577daa851984cfdf432dc3 postgresql-9.5.5.tar.bz2.sha256
+92ae6d7cdf18e648b3c22d0aa015565d postgresql-9.6.1.tar.bz2
+792708f2c6648abbe4172057374be15f postgresql-9.6.1.tar.bz2.sha256
155acd3ada68b20f4ee0fa918ef0e912 postgresql-setup-5.0.tar.gz
-ad36fcf624748b8ed67783ad04529f43 postgresql-9.5.4.tar.bz2
-791291e31348bf4619048a8b06e2231d postgresql-9.5.4.tar.bz2.sha256
-3e0ebaec6809351b3ed66bf8fb39d0db postgresql-9.6.0-US.pdf
-c5af6ebb790ab877e1d2e56e19cebb29 postgresql-9.6.0.tar.bz2
-fd544734288a6769ec122176ba1e0cc2 postgresql-9.6.0.tar.bz2.sha256
+c2059344535bf765b41ca9ad952744bb postgresql-9.6.1-US.pdf
commit bb1db959b3b923585727eb66311c5c13a2557da6
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Oct 4 12:39:42 2016 +0200
setup: rebase to 5.0
- macros are now automatically generated
- there are convenient macros for testing other
packages against postgresql-server
Resolves: rhbz#1368477, rhbz#1368480
Version: 9.6.0-1
diff --git a/.gitignore b/.gitignore
index dc02112..c2d17c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/postgresql-setup-4.0.tar.gz
+/postgresql-setup-5.0.tar.gz
/postgresql-9.5.4.tar.bz2
/postgresql-9.5.4.tar.bz2.sha256
/postgresql-9.6.0-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index c781c53..01fc1a6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -85,7 +85,7 @@ Url: http://www.postgresql.org/
%global prevversion 9.5.4
%global prevmajorversion 9.5
-%global setup_version 4.0
+%global setup_version 5.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -100,7 +100,7 @@ Source11: postgresql-bashprofile
# Temporary location of postgresql-setup. Development git:
# http://fedorapeople.org/cgit/praiskup/public_git/postgresql-setup.git/
-Source12: http://praiskup.fedorapeople.org/proj/postgresql-setup/postgresql-setup-%...
+Source12: https://github.com/devexp-db/postgresql-setup/releases/download/v%{setup_...
# Those here are just to enforce packagers check that the tarball was downloaded
# correctly. Also, this allows us check that packagers-only tarballs do not
@@ -675,10 +675,6 @@ make DESTDIR=$RPM_BUILD_ROOT install-world
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/contrib
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
-echo "%%%{name}_major %{majorversion}" > macros.%{name}
-install -D -m 644 macros.%{name} \
- $RPM_BUILD_ROOT%{macrosdir}/macros.%{name}
-
# multilib header hack; some headers are installed in two places!
for header in \
%{_includedir}/pg_config.h \
@@ -1118,6 +1114,7 @@ fi
%{_datadir}/pgsql/tsearch_data/
%dir %{_datadir}/postgresql-setup
%{_datadir}/postgresql-setup/library.sh
+%{_datadir}/postgresql-setup/postgresql_pkg_tests.sh
%{_libdir}/pgsql/*_and_*.so
%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/euc2004_sjis2004.so
@@ -1213,6 +1210,9 @@ fi
%endif
%changelog
+* Tue Oct 04 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.0-1
+- rebase the postgresql-setup tarball
+
* Fri Sep 30 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.0-1
- update to 9.6.0 per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6.html
diff --git a/sources b/sources
index 79cf092..b1a0dc1 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
+155acd3ada68b20f4ee0fa918ef0e912 postgresql-setup-5.0.tar.gz
ad36fcf624748b8ed67783ad04529f43 postgresql-9.5.4.tar.bz2
791291e31348bf4619048a8b06e2231d postgresql-9.5.4.tar.bz2.sha256
3e0ebaec6809351b3ed66bf8fb39d0db postgresql-9.6.0-US.pdf
commit 041e748b024dbcb47fb4ecd6618950d73e0b9b34
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Sun Oct 2 14:17:32 2016 +0200
typoe: remove leftover in comment
Version: 9.6.0-1
diff --git a/postgresql.spec b/postgresql.spec
index 5e34a19..c781c53 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -564,7 +564,6 @@ rm -f src/tutorial/GNUmakefile
# Run 'make check' in WHERE path. When that command fails, return the logs
# given by PostgreSQL build system and set 'test_failure=1'. This function
# never exits directly nor stops rpmbuild where `set -e` is enabled.
-# all tests if possible).
run_testsuite()
{
make -k -C "$1" MAX_CONNECTIONS=5 check && return 0 || test_failure=1
commit 23f9d768a9d0fab605b30018a08786ec3f59c73c
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Sat Oct 1 09:13:33 2016 +0200
upload proper checksum
Version: 9.6.0-1
diff --git a/.gitignore b/.gitignore
index 227bbe2..dc02112 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
/postgresql-9.5.4.tar.bz2.sha256
/postgresql-9.6.0-US.pdf
/postgresql-9.6.0.tar.bz2
-/postgresql-9.6.0.tar.gz.sha256
+/postgresql-9.6.0.tar.bz2.sha256
diff --git a/sources b/sources
index efe22a4..79cf092 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ ad36fcf624748b8ed67783ad04529f43 postgresql-9.5.4.tar.bz2
791291e31348bf4619048a8b06e2231d postgresql-9.5.4.tar.bz2.sha256
3e0ebaec6809351b3ed66bf8fb39d0db postgresql-9.6.0-US.pdf
c5af6ebb790ab877e1d2e56e19cebb29 postgresql-9.6.0.tar.bz2
-daaf3118bac57c3a9e15c1beffd1d404 postgresql-9.6.0.tar.gz.sha256
+fd544734288a6769ec122176ba1e0cc2 postgresql-9.6.0.tar.bz2.sha256
commit c02b42b8e8ddfc638a355e5f00a73aad47a709d1
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Sep 30 14:55:58 2016 +0200
build: fix plpython's makefile inconsistency
Version: 9.6.0-1
diff --git a/postgresql.spec b/postgresql.spec
index edbaa63..5e34a19 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -486,20 +486,13 @@ export PYTHON=/usr/bin/python3
--with-system-tzdata=%{_datadir}/zoneinfo \
--datadir=%{_datadir}/pgsql
-# Fortunately we don't need to build much except plpython itself
-cd src/backend
-make submake-errcodes
-cd ../..
-# This line somehow fixes build under 9.6
-# originaly it contained this error:
-# ../../../src/include/storage/lwlock.h:129:33: fatal error: storage/lwlocknames.h: No such file or directory
-make %{?_smp_mflags}
-cd src/pl/plpython
-make %{?_smp_mflags} all
-cd ..
+# Fortunately we don't need to build much except plpython itself.
+# TODO: remove the headers hack once this is resolved:
+# https://www.postgresql.org/message-id/1925924.izSMJEZO3x@unused-4-107.brq...
+make %{?_smp_mflags} submake-generated-headers
+make %{?_smp_mflags} -C src/pl/plpython all
# save built form in a directory that "make distclean" won't touch
-cp -a plpython plpython3
-cd ../..
+cp -a src/pl/plpython src/pl/plpython3
# must also save this version of Makefile.global for later
cp src/Makefile.global src/Makefile.global.python3
commit 08014984d395d8e47ad3de5a3bc4c39860dc6431
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Sep 30 12:09:43 2016 +0200
run_testsuite: don't fail immediately
Version: 9.6.0-1
diff --git a/postgresql.spec b/postgresql.spec
index 4975fcf..edbaa63 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -566,23 +566,19 @@ sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/t
make %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all
rm -f src/tutorial/GNUmakefile
-test_failure=0
-
# run_testsuite WHERE
# -------------------
# Run 'make check' in WHERE path. When that command fails, return the logs
-# given by PostgreSQL build system and set 'test_failure=1'.
-
+# given by PostgreSQL build system and set 'test_failure=1'. This function
+# never exits directly nor stops rpmbuild where `set -e` is enabled.
+# all tests if possible).
run_testsuite()
{
- make -C "$1" MAX_CONNECTIONS=5 check && return 0
-
- test_failure=1
-
+ make -k -C "$1" MAX_CONNECTIONS=5 check && return 0 || test_failure=1
(
set +x
echo "=== trying to find all regression.diffs files in build directory ==="
- find -name 'regression.diffs' | \
+ find "$1" -name 'regression.diffs' | \
while read line; do
echo "=== make failure: $line ==="
cat "$line"
@@ -590,6 +586,8 @@ run_testsuite()
)
}
+test_failure=0
+
%if %runselftest
run_testsuite "src/test/regress"
make clean -C "src/test/regress"
commit 97dfdfe4b9d60ebb4af0fa610f6c3152cdaf706f
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Sep 30 14:42:57 2016 +0200
rebase: new upstream major release
Per release notes:
https://www.postgresql.org/docs/9.6/static/release-9-6.html
Merged changes from https://github.com/devexp-db/postgresql-latest
- removal of obsoleted patch, we can set port in postgresql.conf
- install new files
- hack for plpython build
Version: 9.6.0-1
diff --git a/.gitignore b/.gitignore
index 8a6980e..227bbe2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,6 @@
/postgresql-setup-4.0.tar.gz
-/postgresql-9.5.3-US.pdf
-/postgresql-9.5.4-US.pdf
-/postgresql-9.5.3.tar.bz2
-/postgresql-9.5.3.tar.bz2.sha256
-/postgresql-9.4.8.tar.bz2
-/postgresql-9.4.8.tar.bz2.sha256
-/postgresql-9.4.9.tar.bz2
-/postgresql-9.4.9.tar.bz2.sha256
/postgresql-9.5.4.tar.bz2
/postgresql-9.5.4.tar.bz2.sha256
+/postgresql-9.6.0-US.pdf
+/postgresql-9.6.0.tar.bz2
+/postgresql-9.6.0.tar.gz.sha256
diff --git a/postgresql-config-comment.patch b/postgresql-config-comment.patch
deleted file mode 100644
index 03f9cbe..0000000
--- a/postgresql-config-comment.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Add note warning users that Postgres' port number is forced in the service
-file, mainly because it's traditional in Red Hat installations to set it
-there rather than in postgresql.conf. (There are minor usability benefits
-to doing it this way though, for example that the postmaster's port number
-is visible in "ps" as part of its command line.)
-
-
-diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-23 18:06:49.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample 2012-09-01 21:57:55.498629897 -0400
-@@ -61,6 +61,8 @@
- # defaults to 'localhost'; use '*' for all
- # (change requires restart)
- #port = 5432 # (change requires restart)
-+# Note: In RHEL/Fedora installations, you can't set the port number here;
-+# adjust it in the service file instead.
- #max_connections = 100 # (change requires restart)
- #superuser_reserved_connections = 3 # (change requires restart)
- #unix_socket_directories = '/tmp' # comma-separated list of directories
diff --git a/postgresql.spec b/postgresql.spec
index eaaca84..4975fcf 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -65,8 +65,8 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.5
-Version: 9.5.4
+%global majorversion 9.6
+Version: 9.6.0
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -82,8 +82,8 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.4.9
-%global prevmajorversion 9.4
+%global prevversion 9.5.4
+%global prevmajorversion 9.5
%global setup_version 4.0
@@ -112,7 +112,6 @@ Source17: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevv
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
-Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
@@ -362,7 +361,6 @@ benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -492,6 +490,10 @@ export PYTHON=/usr/bin/python3
cd src/backend
make submake-errcodes
cd ../..
+# This line somehow fixes build under 9.6
+# originaly it contained this error:
+# ../../../src/include/storage/lwlock.h:129:33: fatal error: storage/lwlocknames.h: No such file or directory
+make %{?_smp_mflags}
cd src/pl/plpython
make %{?_smp_mflags} all
cd ..
@@ -970,6 +972,7 @@ fi
%{_bindir}/vacuumlo
%{_datadir}/pgsql/extension/adminpack*
%{_datadir}/pgsql/extension/autoinc*
+%{_datadir}/pgsql/extension/bloom*
%{_datadir}/pgsql/extension/btree_gin*
%{_datadir}/pgsql/extension/btree_gist*
%{_datadir}/pgsql/extension/chkpass*
@@ -995,6 +998,7 @@ fi
%{_datadir}/pgsql/extension/pg_prewarm*
%{_datadir}/pgsql/extension/pg_stat_statements*
%{_datadir}/pgsql/extension/pg_trgm*
+%{_datadir}/pgsql/extension/pg_visibility*
%{_datadir}/pgsql/extension/pgcrypto*
%{_datadir}/pgsql/extension/pgrowlocks*
%{_datadir}/pgsql/extension/pgstattuple*
@@ -1013,6 +1017,7 @@ fi
%{_libdir}/pgsql/auth_delay.so
%{_libdir}/pgsql/auto_explain.so
%{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/bloom.so
%{_libdir}/pgsql/btree_gin.so
%{_libdir}/pgsql/btree_gist.so
%{_libdir}/pgsql/chkpass.so
@@ -1045,6 +1050,7 @@ fi
%{_libdir}/pgsql/pg_freespacemap.so
%{_libdir}/pgsql/pg_stat_statements.so
%{_libdir}/pgsql/pg_trgm.so
+%{_libdir}/pgsql/pg_visibility.so
%{_libdir}/pgsql/pgcrypto.so
%{_libdir}/pgsql/pgrowlocks.so
%{_libdir}/pgsql/pgstattuple.so
@@ -1174,6 +1180,7 @@ fi
%files static
%{_libdir}/libpgcommon.a
+%{_libdir}/libpgfeutils.a
%{_libdir}/libpgport.a
%if %upgrade
@@ -1216,6 +1223,10 @@ fi
%endif
%changelog
+* Fri Sep 30 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.6.0-1
+- update to 9.6.0 per release notes:
+ https://www.postgresql.org/docs/9.6/static/release-9-6.html
+
* Fri Aug 12 2016 Petr Kubat <pkubat(a)redhat.com> - 9.5.4-1
- update to 9.5.4 per release notes:
http://www.postgresql.org/docs/9.5/static/release-9-5-4.html
diff --git a/sources b/sources
index 45a729b..efe22a4 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
ad36fcf624748b8ed67783ad04529f43 postgresql-9.5.4.tar.bz2
-cb2960fb4022d57f9d7cf421a592a7c0 postgresql-9.4.9.tar.bz2
-c0cc4410822bf69f6939361fc33cfb15 postgresql-9.4.9.tar.bz2.sha256
791291e31348bf4619048a8b06e2231d postgresql-9.5.4.tar.bz2.sha256
-6bf9dc43855903b6bef6c515643b5c8b postgresql-9.5.4-US.pdf
+3e0ebaec6809351b3ed66bf8fb39d0db postgresql-9.6.0-US.pdf
+c5af6ebb790ab877e1d2e56e19cebb29 postgresql-9.6.0.tar.bz2
+daaf3118bac57c3a9e15c1beffd1d404 postgresql-9.6.0.tar.gz.sha256
commit 5239ac0d0fc6bb40598d4ab938b23a3a0b91954a
Author: Petr Kubat <pkubat(a)redhat.com>
Date: Fri Aug 12 07:48:18 2016 +0200
rebase: minor version update
Per upstream release notes:
http://www.postgresql.org/docs/9.5/static/release-9-5-4.html
Version: 9.5.4-1
diff --git a/.gitignore b/.gitignore
index e714c0d..8a6980e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
/postgresql-setup-4.0.tar.gz
/postgresql-9.5.3-US.pdf
+/postgresql-9.5.4-US.pdf
/postgresql-9.5.3.tar.bz2
/postgresql-9.5.3.tar.bz2.sha256
/postgresql-9.4.8.tar.bz2
/postgresql-9.4.8.tar.bz2.sha256
+/postgresql-9.4.9.tar.bz2
+/postgresql-9.4.9.tar.bz2.sha256
+/postgresql-9.5.4.tar.bz2
+/postgresql-9.5.4.tar.bz2.sha256
diff --git a/postgresql-config-comment.patch b/postgresql-config-comment.patch
index 9df0221..03f9cbe 100644
--- a/postgresql-config-comment.patch
+++ b/postgresql-config-comment.patch
@@ -15,5 +15,5 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample
+# Note: In RHEL/Fedora installations, you can't set the port number here;
+# adjust it in the service file instead.
#max_connections = 100 # (change requires restart)
- # Note: Increasing max_connections costs ~400 bytes of shared memory per
- # connection slot, plus lock space (see max_locks_per_transaction).
+ #superuser_reserved_connections = 3 # (change requires restart)
+ #unix_socket_directories = '/tmp' # comma-separated list of directories
diff --git a/postgresql.spec b/postgresql.spec
index 127cd4b..eaaca84 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
-Version: 9.5.3
-Release: 3%{?dist}
+Version: 9.5.4
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.4.8
+%global prevversion 9.4.9
%global prevmajorversion 9.4
%global setup_version 4.0
@@ -1216,6 +1216,10 @@ fi
%endif
%changelog
+* Fri Aug 12 2016 Petr Kubat <pkubat(a)redhat.com> - 9.5.4-1
+- update to 9.5.4 per release notes:
+ http://www.postgresql.org/docs/9.5/static/release-9-5-4.html
+
* Mon Jun 20 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.3-3
- use multilib-rpm-config package for multilib hacks
diff --git a/sources b/sources
index 9d7fcde..45a729b 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
-912e5647ec81e2c09f0fced3fa9d4393 postgresql-9.5.3-US.pdf
-3f0c388566c688c82b01a0edf1e6b7a0 postgresql-9.5.3.tar.bz2
-2d884ba5e218a3904651755f5e6a5fcc postgresql-9.5.3.tar.bz2.sha256
-a1a2e8014b2b4c49fc58fe2e2fe83681 postgresql-9.4.8.tar.bz2
-4497d4530be084b651df00f21d067b3b postgresql-9.4.8.tar.bz2.sha256
+ad36fcf624748b8ed67783ad04529f43 postgresql-9.5.4.tar.bz2
+cb2960fb4022d57f9d7cf421a592a7c0 postgresql-9.4.9.tar.bz2
+c0cc4410822bf69f6939361fc33cfb15 postgresql-9.4.9.tar.bz2.sha256
+791291e31348bf4619048a8b06e2231d postgresql-9.5.4.tar.bz2.sha256
+6bf9dc43855903b6bef6c515643b5c8b postgresql-9.5.4-US.pdf
commit 34e9d01899c28dd70a572987b2c67ed374cc8c5c
Author: Petr Psa <ppisar(a)redhat.com>
Date: Fri Jun 24 09:25:25 2016 +0200
Mandatory Perl build-requires added <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl>
diff --git a/postgresql.spec b/postgresql.spec
index 56c01ff..127cd4b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -118,6 +118,7 @@ Patch6: postgresql-man.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
+BuildRequires: perl-generators
BuildRequires: readline-devel zlib-devel
BuildRequires: systemd-units util-linux
BuildRequires: multilib-rpm-config
commit a3f63f1f95f7a77c4036bd692f7c0a04afe8c7bc
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jun 21 12:03:59 2016 +0200
packaging: depend on multilib-rpm-config
.. to correctly install architecture-dependant header files.
Related: rhbz#1286193
Version: 9.5.3-3
diff --git a/multilib-fix b/multilib-fix
deleted file mode 100755
index ff39117..0000000
--- a/multilib-fix
+++ /dev/null
@@ -1,170 +0,0 @@
-#! /bin/sh
-
-# Replace the multilib-unclean header file with multilib-clean stub, while the
-# original file is moved to unique architecture-specific location.
-#
-# The solution is taken from Fedora PostgreSQL RPM package.
-#
-# Pavel Raiskup <praiskup(a)redhat.com>
-#
-# This file is to be moved into redhat-rpm-config (or something like this).
-
-progname=$(basename "$0")
-
-opt_arch=$(uname -i)
-# See rhbz#1242873 for more info.
-test "$opt_arch" = ppc64p7 && opt_arch=ppc64
-
-opt_destdir=
-opt_basename=
-opt_buildroot=$(pwd)
-opt_verbose=:
-opt_additional_suffix=
-
-# TODO: we could pretty easily implement other then 'cpp-header' stubs, if the
-# target file type allows some kind of "transparent" file inclusion. For
-# example shell scripts might use '. "${opt_destdir}/${opt_basename}_x86_64.sh'.
-print_stub ()
-{
-cat <<EOF
-/*
- * Kluge to support multilib installation of both 32- and 64-bit RPMS:
- * we need to arrange that header files that appear in both RPMs are
- * identical. Hence, this file is architecture-independent and calls
- * in an arch-dependent file that will appear in just one RPM.
- *
- * To avoid breaking arches not explicitly supported by Red Hat, we
- * use this indirection file *only* on known multilib arches.
- *
- * Note: this may well fail if user tries to use gcc's -I- option.
- * But that option is deprecated anyway.
- */
-#if defined(__x86_64__)
-#include "${opt_basename}${opt_additional_suffix}_x86_64.h"
-#elif defined(__i386__)
-#include "${opt_basename}${opt_additional_suffix}_i386.h"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#include "${opt_basename}${opt_additional_suffix}_ppc64.h"
-#elif defined(__ppc__) || defined(__powerpc__)
-#include "${opt_basename}${opt_additional_suffix}_ppc.h"
-#elif defined(__s390x__)
-#include "${opt_basename}${opt_additional_suffix}_s390x.h"
-#elif defined(__s390__)
-#include "${opt_basename}${opt_additional_suffix}_s390.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "${opt_basename}${opt_additional_suffix}_sparc64.h"
-#elif defined(__sparc__)
-#include "${opt_basename}${opt_additional_suffix}_sparc.h"
-#endif
-EOF
-}
-
-print_help ()
-{
- _h_exit=false
- test -n "$1" && _h_exit=:
-
- cat <<EOF
-Usage: $progname [OPTIONS]
-
-Replace the multilib-unclean header file with multilib-clean stub, while the
-original file is moved to unique architecture-specific location. This should be
-absolutely safe operation (effects of '#include <HEADER.h>' are unchanged.
-
-To allow us to do incompatible changes in this script, packagers should use this
-script only through %ml_fix_c_header wrapping macro.
-
---destdir absolute path name where the old header file is stored, e.g.
- /some/pat
---basename when you deal with '/some/path/test.h', specify 'test'
---buildroot prefix (directory where we play with installed files, usually
- after 'make install DESTDIR=buildroot')
---additional-suffix we usually move 'test.h' to 'test_\$ARCH.h'. However
- this file could already exit. With this option the multilib
- file will be named 'test_\$ARCH\$SUFFIX.h'
---verbose print some useful information
---help show this help
-EOF
-
- $_h_exit && exit "$1"
-}
-
-verbose ()
-{
- $opt_verbose && echo "INFO: $progname: $*"
-}
-
-die ()
-{
- echo >&2 " # $*"
- print_help 1
-}
-
-error ()
-{
- error_occurred=:
- echo >&2 " ! $*"
-}
-
-error_occurred=false
-
-while test $# -gt 0
-do
- _opt=$1 ; shift
- case $_opt in
- --destdir)
- opt_destdir=$1 ; shift || die "$_opt requires argument"
- ;;
- --basename)
- opt_basename=$1 ; shift || die "$_opt require argument"
- ;;
- --buildroot)
- opt_buildroot=$1 ; shift || die "$_opt require argument"
- ;;
- --arch)
- opt_arch=$1 ; shift || die "$_opt require argument"
- ;;
- --additional-suffix)
- opt_additional_suffix=$1 ; shift || die "$_opt require argument"
- ;;
- --help)
- print_help 0
- ;;
- *)
- error "unexpected '$_opt' program argument"
- ;;
- esac
-done
-$error_occurred && print_help 1
-
-for i in arch buildroot destdir basename
-do
- eval "test -z \"\$opt_$i\"" && error "--$i needs to be set"
-done
-$error_occurred && print_help 1
-
-original_file="$opt_buildroot$opt_destdir/$opt_basename".h
-multilib_file="$opt_buildroot$opt_destdir/$opt_basename${opt_additional_suffix}_$opt_arch".h
-
-test -f "$original_file" || die "can't find '$original_file'"
-
-case $opt_arch in
- # we only apply this to known Red Hat multilib arches, per bug #177564
- i386|x86_64|ppc|ppc64|s390|s390x|sparc|sparc64)
- ;;
- *)
- verbose "we don't need multilib haeder hack for '$opt_arch' architecture (no-op)"
- exit 0
- ;;
-esac
-
-verbose "moving: '$original_file' to '$multilib_file'"
-
-mv "$original_file" "$multilib_file" || exit 1
-if print_stub > "$original_file" && chmod 644 "$original_file"; then
- :
-else
- die "can't write into '$original_file'"
-fi
-
-:
diff --git a/postgresql.spec b/postgresql.spec
index ce49dc2..56c01ff 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
Version: 9.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -94,7 +94,6 @@ Source1: postgresql-%{version}-US.pdf
Source2: generate-pdf.sh
Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
Source4: Makefile.regress
-Source5: multilib-fix
Source9: postgresql.tmpfiles.d
Source10: postgresql.pam
Source11: postgresql-bashprofile
@@ -121,6 +120,7 @@ BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
BuildRequires: systemd-units util-linux
+BuildRequires: multilib-rpm-config
# postgresql-setup build requires
BuildRequires: m4 elinks docbook-utils help2man
@@ -687,12 +687,14 @@ install -D -m 644 macros.%{name} \
$RPM_BUILD_ROOT%{macrosdir}/macros.%{name}
# multilib header hack; some headers are installed in two places!
-%global ml_fix_c_header %{SOURCE5} --buildroot "$RPM_BUILD_ROOT"
-for header in pg_config pg_config_ext ecpg_config; do
-%ml_fix_c_header --destdir "%{_includedir}" --basename "$header"
-done
-for header in pg_config pg_config_ext; do
-%ml_fix_c_header --destdir "%{_includedir}/pgsql/server" --basename "$header"
+for header in \
+ %{_includedir}/pg_config.h \
+ %{_includedir}/pg_config_ext.h \
+ %{_includedir}/ecpg_config.h \
+ %{_includedir}/pgsql/server/pg_config.h \
+ %{_includedir}/pgsql/server/pg_config_ext.h
+do
+%multilib_fix_c_header --file "$header"
done
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
@@ -1213,6 +1215,9 @@ fi
%endif
%changelog
+* Mon Jun 20 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.3-3
+- use multilib-rpm-config package for multilib hacks
+
* Sun May 15 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.5.3-2
- Perl 5.24 rebuild
commit b5308137b94e5c002e138dcc88980eaec6720d11
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sun May 15 05:16:43 2016 +0200
Perl 5.24 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index ac61dd0..ce49dc2 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
Version: 9.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1213,6 +1213,9 @@ fi
%endif
%changelog
+* Sun May 15 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.5.3-2
+- Perl 5.24 rebuild
+
* Thu May 12 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.3-1
- update to 9.5.3 per release notes:
http://www.postgresql.org/docs/9.5/static/release-9-5-3.html
commit f164285e536bba4bb71fb2354d306ea72729213c
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu May 12 10:36:48 2016 +0200
rebase: minor version update
Per upstream release notes:
http://www.postgresql.org/docs/9.5/static/release-9-5-3.html
Version: 9.5.3-1
diff --git a/.gitignore b/.gitignore
index 7dd8ac4..e714c0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/postgresql-setup-4.0.tar.gz
-/postgresql-9.5.2-US.pdf
-/postgresql-9.5.2.tar.bz2
-/postgresql-9.5.2.tar.bz2.sha256
-/postgresql-9.4.7.tar.bz2
-/postgresql-9.4.7.tar.bz2.sha256
+/postgresql-9.5.3-US.pdf
+/postgresql-9.5.3.tar.bz2
+/postgresql-9.5.3.tar.bz2.sha256
+/postgresql-9.4.8.tar.bz2
+/postgresql-9.4.8.tar.bz2.sha256
diff --git a/postgresql.spec b/postgresql.spec
index 20a57b9..ac61dd0 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
-Version: 9.5.2
-Release: 2%{?dist}
+Version: 9.5.3
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.4.7
+%global prevversion 9.4.8
%global prevmajorversion 9.4
%global setup_version 4.0
@@ -1213,6 +1213,10 @@ fi
%endif
%changelog
+* Thu May 12 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.3-1
+- update to 9.5.3 per release notes:
+ http://www.postgresql.org/docs/9.5/static/release-9-5-3.html
+
* Mon May 09 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.2-2
- fix the test subpackage, pg_regress now uses --bindir
diff --git a/sources b/sources
index a2543a7..9d7fcde 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
-727c3c89d558cd9c10ef473efafcdc0f postgresql-9.5.2-US.pdf
-c3f829b50f0351208debc79af3c946f9 postgresql-9.5.2.tar.bz2
-c11baa0f3f059eeb4bb46435461bb93d postgresql-9.5.2.tar.bz2.sha256
-8bf119bbac1bbb566397d606861695a9 postgresql-9.4.7.tar.bz2
-12256026fbda590af5a22e58b14283d1 postgresql-9.4.7.tar.bz2.sha256
+912e5647ec81e2c09f0fced3fa9d4393 postgresql-9.5.3-US.pdf
+3f0c388566c688c82b01a0edf1e6b7a0 postgresql-9.5.3.tar.bz2
+2d884ba5e218a3904651755f5e6a5fcc postgresql-9.5.3.tar.bz2.sha256
+a1a2e8014b2b4c49fc58fe2e2fe83681 postgresql-9.4.8.tar.bz2
+4497d4530be084b651df00f21d067b3b postgresql-9.4.8.tar.bz2.sha256
commit 269d2b7daf7a9e05e13e7bd0e50faae25180b119
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon May 9 16:18:06 2016 +0200
test: pg_regress changed options
Use --bindir instead of --psqldir against PostgreSQL 9.5+.
Related: rhbz#1334276
Version: 9.5.2-2
diff --git a/Makefile.regress b/Makefile.regress
index 43c7ba4..925877c 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -21,7 +21,7 @@ REGRESS_OPTS += --dlpath=.
pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
-pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --psqldir='/usr/bin' $(pg_regress_locale_flags)
+pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --bindir=@bindir@ $(pg_regress_locale_flags)
# Test input and expected files. These are created by pg_regress itself, so we
# don't have a rule to create them. We do need rules to clean them however.
diff --git a/postgresql.spec b/postgresql.spec
index 994fdd8..20a57b9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
Version: 9.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -777,7 +777,9 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
rm -f GNUmakefile Makefile *.o
chmod 0755 pg_regress regress.so
popd
- cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
+ sed 's|@bindir@|%{_bindir}|g' \
+ < %{SOURCE4} \
+ > $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
%endif
@@ -1211,6 +1213,9 @@ fi
%endif
%changelog
+* Mon May 09 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.2-2
+- fix the test subpackage, pg_regress now uses --bindir
+
* Sun Apr 03 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.2-1
- update to 9.5.2 per release notes
http://www.postgresql.org/docs/9.5/static/release-9-5-2.html
commit c14bb2cdd168d20af4f5cb167fb5949808402661
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Sun Apr 3 21:33:12 2016 +0200
packaging: own the datadir/postgresql-setup directory
Version: 9.5.2-1
Resolves: 1321918
diff --git a/postgresql.spec b/postgresql.spec
index 5de202c..994fdd8 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1115,6 +1115,7 @@ fi
%{_datadir}/pgsql/system_views.sql
%{_datadir}/pgsql/timezonesets/
%{_datadir}/pgsql/tsearch_data/
+%dir %{_datadir}/postgresql-setup
%{_datadir}/postgresql-setup/library.sh
%{_libdir}/pgsql/*_and_*.so
%{_libdir}/pgsql/dict_snowball.so
commit b6b08dffec8bfef4c76d01736c1fe35e6122a58e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Sun Apr 3 21:30:28 2016 +0200
rebase: minor version update
Per upstream release notes:
http://www.postgresql.org/docs/9.5/static/release-9-5-2.html
Version: 9.5.2-1
diff --git a/.gitignore b/.gitignore
index f5167a3..7dd8ac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/postgresql-setup-4.0.tar.gz
-/postgresql-9.4.6.tar.bz2
-/postgresql-9.4.6.tar.bz2.sha256
-/postgresql-9.5.1.tar.bz2
-/postgresql-9.5.1.tar.bz2.sha256
-/postgresql-9.5.1-US.pdf
+/postgresql-9.5.2-US.pdf
+/postgresql-9.5.2.tar.bz2
+/postgresql-9.5.2.tar.bz2.sha256
+/postgresql-9.4.7.tar.bz2
+/postgresql-9.4.7.tar.bz2.sha256
diff --git a/postgresql.spec b/postgresql.spec
index bc9a3db..5de202c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
-Version: 9.5.1
-Release: 2%{?dist}
+Version: 9.5.2
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.4.6
+%global prevversion 9.4.7
%global prevmajorversion 9.4
%global setup_version 4.0
@@ -1210,6 +1210,10 @@ fi
%endif
%changelog
+* Sun Apr 03 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.2-1
+- update to 9.5.2 per release notes
+ http://www.postgresql.org/docs/9.5/static/release-9-5-2.html
+
* Fri Feb 26 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.1-2
- package static libraries without dynamic counterparts (rhbz#784281)
diff --git a/sources b/sources
index a6c9d6f..a2543a7 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
-0371b9d4fb995062c040ea5c3c1c971e postgresql-9.4.6.tar.bz2
-1b25a4cf5028e7b1b46055da582ac9e7 postgresql-9.4.6.tar.bz2.sha256
-11e037afaa4bd0c90bb3c3d955e2b401 postgresql-9.5.1.tar.bz2
-a910686f08fce302e39556c8a3042145 postgresql-9.5.1.tar.bz2.sha256
-1b1779c4b7b3d5d83e5afbf8ff4f487a postgresql-9.5.1-US.pdf
+727c3c89d558cd9c10ef473efafcdc0f postgresql-9.5.2-US.pdf
+c3f829b50f0351208debc79af3c946f9 postgresql-9.5.2.tar.bz2
+c11baa0f3f059eeb4bb46435461bb93d postgresql-9.5.2.tar.bz2.sha256
+8bf119bbac1bbb566397d606861695a9 postgresql-9.4.7.tar.bz2
+12256026fbda590af5a22e58b14283d1 postgresql-9.4.7.tar.bz2.sha256
commit f01c700fce13ccb877c94f17835377b725c5f4c7
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Feb 26 08:19:43 2016 +0100
static: add static libraries missed by packagers
Put those libraries into separate sub-package to make sure that
people build-require concrete subpackage (not devel subpackage),
and we can easily track them.
Resolves: rhbz#784281
Version: 9.5.1-2
diff --git a/postgresql.spec b/postgresql.spec
index bbb90a1..bc9a3db 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
Version: 9.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -269,6 +269,15 @@ Embedded C Postgres preprocessor. You need to install this package if you want
to develop applications which will interact with a PostgreSQL server.
+%package static
+Summary: Statically linked PostgreSQL libraries
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description static
+Statically linked PostgreSQL libraries that do not have dynamically linked
+counterparts.
+
+
%if %upgrade
%package upgrade
Summary: Support for upgrading from the previous major release of PostgreSQL
@@ -777,7 +786,7 @@ mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
# remove files not to be packaged
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/{libecpg,libpq,libecpg_compat,libpgtypes}.a
%if !%plperl
rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so
@@ -1157,6 +1166,10 @@ fi
%{_mandir}/man3/SPI_*
%{macrosdir}/*
+%files static
+%{_libdir}/libpgcommon.a
+%{_libdir}/libpgport.a
+
%if %upgrade
%files upgrade
%{_libdir}/pgsql/postgresql-%{prevmajorversion}
@@ -1197,6 +1210,9 @@ fi
%endif
%changelog
+* Fri Feb 26 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.1-2
+- package static libraries without dynamic counterparts (rhbz#784281)
+
* Tue Feb 09 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.1-1
- update to 9.5.1 per release notes
http://www.postgresql.org/docs/9.5/static/release-9-5-1.html
commit 89f36b76f765e4923b7d27eb39c02d6876af3c87
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Feb 9 15:19:16 2016 +0100
rebase: minor version update
Per upstream release notes:
http://www.postgresql.org/docs/9.5/static/release-9-5-1.html
Version: 9.5.1-1
diff --git a/.gitignore b/.gitignore
index 4827197..f5167a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/postgresql-setup-4.0.tar.gz
-/postgresql-9.4.5.tar.bz2
-/postgresql-9.4.5.tar.bz2.sha256
-/postgresql-9.5.0.tar.bz2
-/postgresql-9.5.0.tar.bz2.sha256
-/postgresql-9.5.0-US.pdf
+/postgresql-9.4.6.tar.bz2
+/postgresql-9.4.6.tar.bz2.sha256
+/postgresql-9.5.1.tar.bz2
+/postgresql-9.5.1.tar.bz2.sha256
+/postgresql-9.5.1-US.pdf
diff --git a/postgresql-python3.5-tests.patch b/postgresql-python3.5-tests.patch
deleted file mode 100644
index 5b50b5a..0000000
--- a/postgresql-python3.5-tests.patch
+++ /dev/null
@@ -1,610 +0,0 @@
-From 8e76ccde28901f96678f21a2487af3b6a433ee35 Mon Sep 17 00:00:00 2001
-From: Peter Eisentraut <peter_e(a)gmx.net>
-Date: Wed, 3 Jun 2015 19:52:08 -0400
-Subject: [PATCH] PL/Python: Make tests pass with Python 3.5
-
-The error message wording for AttributeError has changed in Python 3.5.
-For the plpython_error test, add a new expected file. In the
-plpython_subtransaction test, we didn't really care what the exception
-is, only that it is something coming from Python. So use a generic
-exception instead, which has a message that doesn't vary across
-versions.
----
- src/pl/plpython/expected/README | 1 +
- src/pl/plpython/expected/plpython_error_5.out | 428 +++++++++++++++++++++
- .../plpython/expected/plpython_subtransaction.out | 12 +-
- .../expected/plpython_subtransaction_0.out | 8 +-
- .../expected/plpython_subtransaction_5.out | 8 +-
- src/pl/plpython/sql/plpython_subtransaction.sql | 4 +-
- 6 files changed, 445 insertions(+), 16 deletions(-)
- create mode 100644 src/pl/plpython/expected/plpython_error_5.out
-
-diff --git a/src/pl/plpython/expected/README b/src/pl/plpython/expected/README
-index 5bf9366..b890563 100644
---- a/src/pl/plpython/expected/README
-+++ b/src/pl/plpython/expected/README
-@@ -1,6 +1,7 @@
- Guide to alternative expected files:
-
- plpython_error_0.out Python 2.4 and older
-+plpython_error_5.out Python 3.5 and newer
-
- plpython_unicode.out server encoding != SQL_ASCII
- plpython_unicode_3.out server encoding == SQL_ASCII
-diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
-new file mode 100644
-index 0000000..fcd944c
---- /dev/null
-+++ b/src/pl/plpython/expected/plpython_error_5.out
-@@ -0,0 +1,428 @@
-+-- test error handling, i forgot to restore Warn_restart in
-+-- the trigger handler once. the errors and subsequent core dump were
-+-- interesting.
-+/* Flat out Python syntax error
-+ */
-+CREATE FUNCTION python_syntax_error() RETURNS text
-+ AS
-+'.syntaxerror'
-+ LANGUAGE plpython3u;
-+ERROR: could not compile PL/Python function "python_syntax_error"
-+DETAIL: SyntaxError: invalid syntax (<string>, line 2)
-+/* With check_function_bodies = false the function should get defined
-+ * and the error reported when called
-+ */
-+SET check_function_bodies = false;
-+CREATE FUNCTION python_syntax_error() RETURNS text
-+ AS
-+'.syntaxerror'
-+ LANGUAGE plpython3u;
-+SELECT python_syntax_error();
-+ERROR: could not compile PL/Python function "python_syntax_error"
-+DETAIL: SyntaxError: invalid syntax (<string>, line 2)
-+/* Run the function twice to check if the hashtable entry gets cleaned up */
-+SELECT python_syntax_error();
-+ERROR: could not compile PL/Python function "python_syntax_error"
-+DETAIL: SyntaxError: invalid syntax (<string>, line 2)
-+RESET check_function_bodies;
-+/* Flat out syntax error
-+ */
-+CREATE FUNCTION sql_syntax_error() RETURNS text
-+ AS
-+'plpy.execute("syntax error")'
-+ LANGUAGE plpython3u;
-+SELECT sql_syntax_error();
-+ERROR: spiexceptions.SyntaxError: syntax error at or near "syntax"
-+LINE 1: syntax error
-+ ^
-+QUERY: syntax error
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "sql_syntax_error", line 1, in <module>
-+ plpy.execute("syntax error")
-+PL/Python function "sql_syntax_error"
-+/* check the handling of uncaught python exceptions
-+ */
-+CREATE FUNCTION exception_index_invalid(text) RETURNS text
-+ AS
-+'return args[1]'
-+ LANGUAGE plpython3u;
-+SELECT exception_index_invalid('test');
-+ERROR: IndexError: list index out of range
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "exception_index_invalid", line 1, in <module>
-+ return args[1]
-+PL/Python function "exception_index_invalid"
-+/* check handling of nested exceptions
-+ */
-+CREATE FUNCTION exception_index_invalid_nested() RETURNS text
-+ AS
-+'rv = plpy.execute("SELECT test5(''foo'')")
-+return rv[0]'
-+ LANGUAGE plpython3u;
-+SELECT exception_index_invalid_nested();
-+ERROR: spiexceptions.UndefinedFunction: function test5(unknown) does not exist
-+LINE 1: SELECT test5('foo')
-+ ^
-+HINT: No function matches the given name and argument types. You might need to add explicit type casts.
-+QUERY: SELECT test5('foo')
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "exception_index_invalid_nested", line 1, in <module>
-+ rv = plpy.execute("SELECT test5('foo')")
-+PL/Python function "exception_index_invalid_nested"
-+/* a typo
-+ */
-+CREATE FUNCTION invalid_type_uncaught(a text) RETURNS text
-+ AS
-+'if "plan" not in SD:
-+ q = "SELECT fname FROM users WHERE lname = $1"
-+ SD["plan"] = plpy.prepare(q, [ "test" ])
-+rv = plpy.execute(SD["plan"], [ a ])
-+if len(rv):
-+ return rv[0]["fname"]
-+return None
-+'
-+ LANGUAGE plpython3u;
-+SELECT invalid_type_uncaught('rick');
-+ERROR: spiexceptions.UndefinedObject: type "test" does not exist
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "invalid_type_uncaught", line 3, in <module>
-+ SD["plan"] = plpy.prepare(q, [ "test" ])
-+PL/Python function "invalid_type_uncaught"
-+/* for what it's worth catch the exception generated by
-+ * the typo, and return None
-+ */
-+CREATE FUNCTION invalid_type_caught(a text) RETURNS text
-+ AS
-+'if "plan" not in SD:
-+ q = "SELECT fname FROM users WHERE lname = $1"
-+ try:
-+ SD["plan"] = plpy.prepare(q, [ "test" ])
-+ except plpy.SPIError as ex:
-+ plpy.notice(str(ex))
-+ return None
-+rv = plpy.execute(SD["plan"], [ a ])
-+if len(rv):
-+ return rv[0]["fname"]
-+return None
-+'
-+ LANGUAGE plpython3u;
-+SELECT invalid_type_caught('rick');
-+NOTICE: type "test" does not exist
-+CONTEXT: PL/Python function "invalid_type_caught"
-+ invalid_type_caught
-+---------------------
-+
-+(1 row)
-+
-+/* for what it's worth catch the exception generated by
-+ * the typo, and reraise it as a plain error
-+ */
-+CREATE FUNCTION invalid_type_reraised(a text) RETURNS text
-+ AS
-+'if "plan" not in SD:
-+ q = "SELECT fname FROM users WHERE lname = $1"
-+ try:
-+ SD["plan"] = plpy.prepare(q, [ "test" ])
-+ except plpy.SPIError as ex:
-+ plpy.error(str(ex))
-+rv = plpy.execute(SD["plan"], [ a ])
-+if len(rv):
-+ return rv[0]["fname"]
-+return None
-+'
-+ LANGUAGE plpython3u;
-+SELECT invalid_type_reraised('rick');
-+ERROR: plpy.Error: type "test" does not exist
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "invalid_type_reraised", line 6, in <module>
-+ plpy.error(str(ex))
-+PL/Python function "invalid_type_reraised"
-+/* no typo no messing about
-+ */
-+CREATE FUNCTION valid_type(a text) RETURNS text
-+ AS
-+'if "plan" not in SD:
-+ SD["plan"] = plpy.prepare("SELECT fname FROM users WHERE lname = $1", [ "text" ])
-+rv = plpy.execute(SD["plan"], [ a ])
-+if len(rv):
-+ return rv[0]["fname"]
-+return None
-+'
-+ LANGUAGE plpython3u;
-+SELECT valid_type('rick');
-+ valid_type
-+------------
-+
-+(1 row)
-+
-+/* error in nested functions to get a traceback
-+*/
-+CREATE FUNCTION nested_error() RETURNS text
-+ AS
-+'def fun1():
-+ plpy.error("boom")
-+
-+def fun2():
-+ fun1()
-+
-+def fun3():
-+ fun2()
-+
-+fun3()
-+return "not reached"
-+'
-+ LANGUAGE plpython3u;
-+SELECT nested_error();
-+ERROR: plpy.Error: boom
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "nested_error", line 10, in <module>
-+ fun3()
-+ PL/Python function "nested_error", line 8, in fun3
-+ fun2()
-+ PL/Python function "nested_error", line 5, in fun2
-+ fun1()
-+ PL/Python function "nested_error", line 2, in fun1
-+ plpy.error("boom")
-+PL/Python function "nested_error"
-+/* raising plpy.Error is just like calling plpy.error
-+*/
-+CREATE FUNCTION nested_error_raise() RETURNS text
-+ AS
-+'def fun1():
-+ raise plpy.Error("boom")
-+
-+def fun2():
-+ fun1()
-+
-+def fun3():
-+ fun2()
-+
-+fun3()
-+return "not reached"
-+'
-+ LANGUAGE plpython3u;
-+SELECT nested_error_raise();
-+ERROR: plpy.Error: boom
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "nested_error_raise", line 10, in <module>
-+ fun3()
-+ PL/Python function "nested_error_raise", line 8, in fun3
-+ fun2()
-+ PL/Python function "nested_error_raise", line 5, in fun2
-+ fun1()
-+ PL/Python function "nested_error_raise", line 2, in fun1
-+ raise plpy.Error("boom")
-+PL/Python function "nested_error_raise"
-+/* using plpy.warning should not produce a traceback
-+*/
-+CREATE FUNCTION nested_warning() RETURNS text
-+ AS
-+'def fun1():
-+ plpy.warning("boom")
-+
-+def fun2():
-+ fun1()
-+
-+def fun3():
-+ fun2()
-+
-+fun3()
-+return "you''ve been warned"
-+'
-+ LANGUAGE plpython3u;
-+SELECT nested_warning();
-+WARNING: boom
-+CONTEXT: PL/Python function "nested_warning"
-+ nested_warning
-+--------------------
-+ you've been warned
-+(1 row)
-+
-+/* AttributeError at toplevel used to give segfaults with the traceback
-+*/
-+CREATE FUNCTION toplevel_attribute_error() RETURNS void AS
-+$$
-+plpy.nonexistent
-+$$ LANGUAGE plpython3u;
-+SELECT toplevel_attribute_error();
-+ERROR: AttributeError: module 'plpy' has no attribute 'nonexistent'
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "toplevel_attribute_error", line 2, in <module>
-+ plpy.nonexistent
-+PL/Python function "toplevel_attribute_error"
-+/* Calling PL/Python functions from SQL and vice versa should not lose context.
-+ */
-+CREATE OR REPLACE FUNCTION python_traceback() RETURNS void AS $$
-+def first():
-+ second()
-+
-+def second():
-+ third()
-+
-+def third():
-+ plpy.execute("select sql_error()")
-+
-+first()
-+$$ LANGUAGE plpython3u;
-+CREATE OR REPLACE FUNCTION sql_error() RETURNS void AS $$
-+begin
-+ select 1/0;
-+end
-+$$ LANGUAGE plpgsql;
-+CREATE OR REPLACE FUNCTION python_from_sql_error() RETURNS void AS $$
-+begin
-+ select python_traceback();
-+end
-+$$ LANGUAGE plpgsql;
-+CREATE OR REPLACE FUNCTION sql_from_python_error() RETURNS void AS $$
-+plpy.execute("select sql_error()")
-+$$ LANGUAGE plpython3u;
-+SELECT python_traceback();
-+ERROR: spiexceptions.DivisionByZero: division by zero
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "python_traceback", line 11, in <module>
-+ first()
-+ PL/Python function "python_traceback", line 3, in first
-+ second()
-+ PL/Python function "python_traceback", line 6, in second
-+ third()
-+ PL/Python function "python_traceback", line 9, in third
-+ plpy.execute("select sql_error()")
-+PL/Python function "python_traceback"
-+SELECT sql_error();
-+ERROR: division by zero
-+CONTEXT: SQL statement "select 1/0"
-+PL/pgSQL function sql_error() line 3 at SQL statement
-+SELECT python_from_sql_error();
-+ERROR: spiexceptions.DivisionByZero: division by zero
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "python_traceback", line 11, in <module>
-+ first()
-+ PL/Python function "python_traceback", line 3, in first
-+ second()
-+ PL/Python function "python_traceback", line 6, in second
-+ third()
-+ PL/Python function "python_traceback", line 9, in third
-+ plpy.execute("select sql_error()")
-+PL/Python function "python_traceback"
-+SQL statement "select python_traceback()"
-+PL/pgSQL function python_from_sql_error() line 3 at SQL statement
-+SELECT sql_from_python_error();
-+ERROR: spiexceptions.DivisionByZero: division by zero
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "sql_from_python_error", line 2, in <module>
-+ plpy.execute("select sql_error()")
-+PL/Python function "sql_from_python_error"
-+/* check catching specific types of exceptions
-+ */
-+CREATE TABLE specific (
-+ i integer PRIMARY KEY
-+);
-+CREATE FUNCTION specific_exception(i integer) RETURNS void AS
-+$$
-+from plpy import spiexceptions
-+try:
-+ plpy.execute("insert into specific values (%s)" % (i or "NULL"));
-+except spiexceptions.NotNullViolation as e:
-+ plpy.notice("Violated the NOT NULL constraint, sqlstate %s" % e.sqlstate)
-+except spiexceptions.UniqueViolation as e:
-+ plpy.notice("Violated the UNIQUE constraint, sqlstate %s" % e.sqlstate)
-+$$ LANGUAGE plpython3u;
-+SELECT specific_exception(2);
-+ specific_exception
-+--------------------
-+
-+(1 row)
-+
-+SELECT specific_exception(NULL);
-+NOTICE: Violated the NOT NULL constraint, sqlstate 23502
-+CONTEXT: PL/Python function "specific_exception"
-+ specific_exception
-+--------------------
-+
-+(1 row)
-+
-+SELECT specific_exception(2);
-+NOTICE: Violated the UNIQUE constraint, sqlstate 23505
-+CONTEXT: PL/Python function "specific_exception"
-+ specific_exception
-+--------------------
-+
-+(1 row)
-+
-+/* SPI errors in PL/Python functions should preserve the SQLSTATE value
-+ */
-+CREATE FUNCTION python_unique_violation() RETURNS void AS $$
-+plpy.execute("insert into specific values (1)")
-+plpy.execute("insert into specific values (1)")
-+$$ LANGUAGE plpython3u;
-+CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
-+begin
-+ begin
-+ perform python_unique_violation();
-+ exception when unique_violation then
-+ return 'ok';
-+ end;
-+ return 'not reached';
-+end;
-+$$ language plpgsql;
-+SELECT catch_python_unique_violation();
-+ catch_python_unique_violation
-+-------------------------------
-+ ok
-+(1 row)
-+
-+/* manually starting subtransactions - a bad idea
-+ */
-+CREATE FUNCTION manual_subxact() RETURNS void AS $$
-+plpy.execute("savepoint save")
-+plpy.execute("create table foo(x integer)")
-+plpy.execute("rollback to save")
-+$$ LANGUAGE plpython3u;
-+SELECT manual_subxact();
-+ERROR: plpy.SPIError: SPI_execute failed: SPI_ERROR_TRANSACTION
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "manual_subxact", line 2, in <module>
-+ plpy.execute("savepoint save")
-+PL/Python function "manual_subxact"
-+/* same for prepared plans
-+ */
-+CREATE FUNCTION manual_subxact_prepared() RETURNS void AS $$
-+save = plpy.prepare("savepoint save")
-+rollback = plpy.prepare("rollback to save")
-+plpy.execute(save)
-+plpy.execute("create table foo(x integer)")
-+plpy.execute(rollback)
-+$$ LANGUAGE plpython3u;
-+SELECT manual_subxact_prepared();
-+ERROR: plpy.SPIError: SPI_execute_plan failed: SPI_ERROR_TRANSACTION
-+CONTEXT: Traceback (most recent call last):
-+ PL/Python function "manual_subxact_prepared", line 4, in <module>
-+ plpy.execute(save)
-+PL/Python function "manual_subxact_prepared"
-+/* raising plpy.spiexception.* from python code should preserve sqlstate
-+ */
-+CREATE FUNCTION plpy_raise_spiexception() RETURNS void AS $$
-+raise plpy.spiexceptions.DivisionByZero()
-+$$ LANGUAGE plpython3u;
-+DO $$
-+BEGIN
-+ SELECT plpy_raise_spiexception();
-+EXCEPTION WHEN division_by_zero THEN
-+ -- NOOP
-+END
-+$$ LANGUAGE plpgsql;
-+/* setting a custom sqlstate should be handled
-+ */
-+CREATE FUNCTION plpy_raise_spiexception_override() RETURNS void AS $$
-+exc = plpy.spiexceptions.DivisionByZero()
-+exc.sqlstate = 'SILLY'
-+raise exc
-+$$ LANGUAGE plpython3u;
-+DO $$
-+BEGIN
-+ SELECT plpy_raise_spiexception_override();
-+EXCEPTION WHEN SQLSTATE 'SILLY' THEN
-+ -- NOOP
-+END
-+$$ LANGUAGE plpgsql;
-diff --git a/src/pl/plpython/expected/plpython_subtransaction.out b/src/pl/plpython/expected/plpython_subtransaction.out
-index ced4682..c7bf6cc 100644
---- a/src/pl/plpython/expected/plpython_subtransaction.out
-+++ b/src/pl/plpython/expected/plpython_subtransaction.out
-@@ -19,7 +19,7 @@ try:
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- except:
- exc = False
- subxact.__exit__(*sys.exc_info())
-@@ -58,10 +58,10 @@ SELECT * FROM subtransaction_tbl;
-
- TRUNCATE subtransaction_tbl;
- SELECT subtransaction_test('Python');
--ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
-+ERROR: Exception: Python exception
- CONTEXT: Traceback (most recent call last):
- PL/Python function "subtransaction_test", line 13, in <module>
-- plpy.attribute_error
-+ raise Exception("Python exception")
- PL/Python function "subtransaction_test"
- SELECT * FROM subtransaction_tbl;
- i
-@@ -78,7 +78,7 @@ with plpy.subtransaction():
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- $$ LANGUAGE plpythonu;
- SELECT subtransaction_ctx_test();
- subtransaction_ctx_test
-@@ -110,10 +110,10 @@ SELECT * FROM subtransaction_tbl;
-
- TRUNCATE subtransaction_tbl;
- SELECT subtransaction_ctx_test('Python');
--ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
-+ERROR: Exception: Python exception
- CONTEXT: Traceback (most recent call last):
- PL/Python function "subtransaction_ctx_test", line 8, in <module>
-- plpy.attribute_error
-+ raise Exception("Python exception")
- PL/Python function "subtransaction_ctx_test"
- SELECT * FROM subtransaction_tbl;
- i
-diff --git a/src/pl/plpython/expected/plpython_subtransaction_0.out b/src/pl/plpython/expected/plpython_subtransaction_0.out
-index 6f4be55..73bd724 100644
---- a/src/pl/plpython/expected/plpython_subtransaction_0.out
-+++ b/src/pl/plpython/expected/plpython_subtransaction_0.out
-@@ -19,7 +19,7 @@ try:
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- except:
- exc = False
- subxact.__exit__(*sys.exc_info())
-@@ -58,10 +58,10 @@ SELECT * FROM subtransaction_tbl;
-
- TRUNCATE subtransaction_tbl;
- SELECT subtransaction_test('Python');
--ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
-+ERROR: Exception: Python exception
- CONTEXT: Traceback (most recent call last):
- PL/Python function "subtransaction_test", line 13, in <module>
-- plpy.attribute_error
-+ raise Exception("Python exception")
- PL/Python function "subtransaction_test"
- SELECT * FROM subtransaction_tbl;
- i
-@@ -78,7 +78,7 @@ with plpy.subtransaction():
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- $$ LANGUAGE plpythonu;
- ERROR: could not compile PL/Python function "subtransaction_ctx_test"
- DETAIL: SyntaxError: invalid syntax (line 3)
-diff --git a/src/pl/plpython/expected/plpython_subtransaction_5.out b/src/pl/plpython/expected/plpython_subtransaction_5.out
-index 4ca1835..d177620 100644
---- a/src/pl/plpython/expected/plpython_subtransaction_5.out
-+++ b/src/pl/plpython/expected/plpython_subtransaction_5.out
-@@ -19,7 +19,7 @@ try:
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- except:
- exc = False
- subxact.__exit__(*sys.exc_info())
-@@ -58,10 +58,10 @@ SELECT * FROM subtransaction_tbl;
-
- TRUNCATE subtransaction_tbl;
- SELECT subtransaction_test('Python');
--ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
-+ERROR: Exception: Python exception
- CONTEXT: Traceback (most recent call last):
- PL/Python function "subtransaction_test", line 13, in <module>
-- plpy.attribute_error
-+ raise Exception("Python exception")
- PL/Python function "subtransaction_test"
- SELECT * FROM subtransaction_tbl;
- i
-@@ -78,7 +78,7 @@ with plpy.subtransaction():
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- $$ LANGUAGE plpythonu;
- ERROR: could not compile PL/Python function "subtransaction_ctx_test"
- DETAIL: SyntaxError: invalid syntax (<string>, line 3)
-diff --git a/src/pl/plpython/sql/plpython_subtransaction.sql b/src/pl/plpython/sql/plpython_subtransaction.sql
-index 9ad6377..3c188e3 100644
---- a/src/pl/plpython/sql/plpython_subtransaction.sql
-+++ b/src/pl/plpython/sql/plpython_subtransaction.sql
-@@ -23,7 +23,7 @@ try:
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- except:
- exc = False
- subxact.__exit__(*sys.exc_info())
-@@ -53,7 +53,7 @@ with plpy.subtransaction():
- if what_error == "SPI":
- plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
- elif what_error == "Python":
-- plpy.attribute_error
-+ raise Exception("Python exception")
- $$ LANGUAGE plpythonu;
-
- SELECT subtransaction_ctx_test();
---
-2.5.0
-
diff --git a/postgresql.spec b/postgresql.spec
index 5445311..bbb90a1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
-Version: 9.5.0
-Release: 2%{?dist}
+Version: 9.5.1
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.4.5
+%global prevversion 9.4.6
%global prevmajorversion 9.4
%global setup_version 4.0
@@ -116,7 +116,6 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-python3.5-tests.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -356,7 +355,6 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1199,6 +1197,10 @@ fi
%endif
%changelog
+* Tue Feb 09 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.1-1
+- update to 9.5.1 per release notes
+ http://www.postgresql.org/docs/9.5/static/release-9-5-1.html
+
* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index 6009c7c..a6c9d6f 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
-8b2e3472a8dc786649b4d02d02e039a0 postgresql-9.4.5.tar.bz2
-8d83dbba546035e37e84c8c9fa31e426 postgresql-9.4.5.tar.bz2.sha256
-e58fffe9359e311ead94490a06b7147c postgresql-9.5.0.tar.bz2
-809ed037611f29a3d74507cbb9e1870c postgresql-9.5.0.tar.bz2.sha256
-d05afa73c47b95421fa5d84938e9d2fc postgresql-9.5.0-US.pdf
+0371b9d4fb995062c040ea5c3c1c971e postgresql-9.4.6.tar.bz2
+1b25a4cf5028e7b1b46055da582ac9e7 postgresql-9.4.6.tar.bz2.sha256
+11e037afaa4bd0c90bb3c3d955e2b401 postgresql-9.5.1.tar.bz2
+a910686f08fce302e39556c8a3042145 postgresql-9.5.1.tar.bz2.sha256
+1b1779c4b7b3d5d83e5afbf8ff4f487a postgresql-9.5.1-US.pdf
commit c12fcd368d1b5ae3be98242aa0904938db7c52e5
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Feb 4 18:22:43 2016 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index caf69a4..5445311 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.5
Version: 9.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1199,6 +1199,9 @@ fi
%endif
%changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Wed Jan 06 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.0-1
- update to 9.5.0 per release notes
http://www.postgresql.org/docs/9.5/static/release-9-5.html
commit 98d83f0a9b78e05b117fde9f102812cbacc3ade0
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 7 16:38:26 2016 +0100
sources: remove obsolete tarball
Version: 9.5.0-1
diff --git a/sources b/sources
index dab400b..6009c7c 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,6 @@
-dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz
+3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
8b2e3472a8dc786649b4d02d02e039a0 postgresql-9.4.5.tar.bz2
8d83dbba546035e37e84c8c9fa31e426 postgresql-9.4.5.tar.bz2.sha256
e58fffe9359e311ead94490a06b7147c postgresql-9.5.0.tar.bz2
809ed037611f29a3d74507cbb9e1870c postgresql-9.5.0.tar.bz2.sha256
d05afa73c47b95421fa5d84938e9d2fc postgresql-9.5.0-US.pdf
-3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
commit 04a9ae75cffcaab6dff8bc281da4b0d8974e36e1
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 7 00:14:58 2016 +0100
postgresql-setup: reflect pg_upgrade movement
The pg_upgrade binary was moved from postgresql-upgrade package
into postgresql package.
Version: 9.5.0-1
diff --git a/.gitignore b/.gitignore
index 8e57172..4827197 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/postgresql-setup-3.5.tar.gz
+/postgresql-setup-4.0.tar.gz
/postgresql-9.4.5.tar.bz2
/postgresql-9.4.5.tar.bz2.sha256
/postgresql-9.5.0.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index eb64338..caf69a4 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -85,7 +85,7 @@ Url: http://www.postgresql.org/
%global prevversion 9.4.5
%global prevmajorversion 9.4
-%global setup_version 3.5
+%global setup_version 4.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -652,6 +652,7 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<E
id postgresql
major %{prevmajorversion}
data_default %{_localstatedir}/pgsql/data
+package postgresql-upgrade
engine %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin
description "Upgrade data from system PostgreSQL version (PostgreSQL %{prevmajorversion})"
redhat_sockets_hack no
@@ -1201,6 +1202,7 @@ fi
* Wed Jan 06 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.0-1
- update to 9.5.0 per release notes
http://www.postgresql.org/docs/9.5/static/release-9-5.html
+- update postgresql-setup to v4.0 to reflect new packaging style
* Wed Dec 16 2015 Pavel Kajaba <pkajaba(a)redhat.com> - 9.4.5-5
- fixed problem with xml2 test (rhbz#1286692)
diff --git a/sources b/sources
index d7d3132..dab400b 100644
--- a/sources
+++ b/sources
@@ -4,4 +4,4 @@ dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz
e58fffe9359e311ead94490a06b7147c postgresql-9.5.0.tar.bz2
809ed037611f29a3d74507cbb9e1870c postgresql-9.5.0.tar.bz2.sha256
d05afa73c47b95421fa5d84938e9d2fc postgresql-9.5.0-US.pdf
-dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz
+3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz
commit 2427b5ec805162c50a924c4ac8cea4acc94f840f
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Jan 6 18:28:17 2016 +0100
rebase: major release update
Per release notes:
http://www.postgresql.org/docs/9.5/static/release-9-5.html
Version: 9.5.0-1
diff --git a/.gitignore b/.gitignore
index 3c64661..8e57172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-setup-3.4.tar.gz
-/postgresql-9.3.10.tar.bz2
-/postgresql-9.3.10.tar.bz2.sha256
+/postgresql-setup-3.5.tar.gz
/postgresql-9.4.5.tar.bz2
/postgresql-9.4.5.tar.bz2.sha256
-/postgresql-9.4.5-US.pdf
+/postgresql-9.5.0.tar.bz2
+/postgresql-9.5.0.tar.bz2.sha256
+/postgresql-9.5.0-US.pdf
diff --git a/postgresql-fix-xml2.patch b/postgresql-fix-xml2.patch
deleted file mode 100644
index 6b97017..0000000
--- a/postgresql-fix-xml2.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
-index 9b7b393..72f0be3 100644
---- a/src/test/regress/expected/xml.out
-+++ b/src/test/regress/expected/xml.out
-@@ -9,8 +9,6 @@ ERROR: invalid XML content
- LINE 1: INSERT INTO xmltest VALUES (3, '<wrong');
- ^
- DETAIL: line 1: Couldn't find end of Start Tag wrong line 1
--<wrong
-- ^
- SELECT * FROM xmltest;
- id | data
- ----+--------------------
-@@ -63,8 +61,6 @@ ERROR: invalid XML content
- LINE 1: SELECT xmlconcat('bad', '<syntax');
- ^
- DETAIL: line 1: Couldn't find end of Start Tag syntax line 1
--<syntax
-- ^
- SELECT xmlconcat('<foo/>', NULL, '<?xml version="1.1" standalone="no"?><bar/>');
- xmlconcat
- --------------
-@@ -212,16 +208,12 @@ DETAIL: line 1: xmlParseEntityRef: no name
- <invalidentity>&</invalidentity>
- ^
- line 1: chunk is not well balanced
--<invalidentity>&</invalidentity>
-- ^
- SELECT xmlparse(content '<undefinedentity>&idontexist;</undefinedentity>');
- ERROR: invalid XML content
- DETAIL: line 1: Entity 'idontexist' not defined
- <undefinedentity>&idontexist;</undefinedentity>
- ^
- line 1: chunk is not well balanced
--<undefinedentity>&idontexist;</undefinedentity>
-- ^
- SELECT xmlparse(content '<invalidns xmlns=''<''/>');
- xmlparse
- ---------------------------
-@@ -240,11 +232,7 @@ DETAIL: line 1: Entity 'idontexist' not defined
- <twoerrors>&idontexist;</unbalanced>
- ^
- line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
--<twoerrors>&idontexist;</unbalanced>
-- ^
- line 1: chunk is not well balanced
--<twoerrors>&idontexist;</unbalanced>
-- ^
- SELECT xmlparse(content '<nosuchprefix:tag/>');
- xmlparse
- ---------------------
-@@ -268,16 +256,12 @@ DETAIL: line 1: xmlParseEntityRef: no name
- <invalidentity>&</abc>
- ^
- line 1: Opening and ending tag mismatch: invalidentity line 1 and abc
--<invalidentity>&</abc>
-- ^
- SELECT xmlparse(document '<undefinedentity>&idontexist;</abc>');
- ERROR: invalid XML document
- DETAIL: line 1: Entity 'idontexist' not defined
- <undefinedentity>&idontexist;</abc>
- ^
- line 1: Opening and ending tag mismatch: undefinedentity line 1 and abc
--<undefinedentity>&idontexist;</abc>
-- ^
- SELECT xmlparse(document '<invalidns xmlns=''<''/>');
- xmlparse
- ---------------------------
-@@ -296,8 +280,6 @@ DETAIL: line 1: Entity 'idontexist' not defined
- <twoerrors>&idontexist;</unbalanced>
- ^
- line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
--<twoerrors>&idontexist;</unbalanced>
-- ^
- SELECT xmlparse(document '<nosuchprefix:tag/>');
- xmlparse
- ---------------------
diff --git a/postgresql-perl-5.22-test-fail.patch b/postgresql-perl-5.22-test-fail.patch
deleted file mode 100644
index 345c16d..0000000
--- a/postgresql-perl-5.22-test-fail.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream report:
-http://www.postgresql.org/message-id/flat/55739876.5010403@gmx.net
-
-diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
-index c447fa2..0932fde 100644
---- a/src/pl/plperl/expected/plperl_elog.out
-+++ b/src/pl/plperl/expected/plperl_elog.out
-@@ -36,8 +36,8 @@ create or replace function uses_global() returns text language plperl as $$
- return 'uses_global worked';
-
- $$;
--ERROR: Global symbol "$global" requires explicit package name at line 3.
--Global symbol "$other_global" requires explicit package name at line 4.
-+ERROR: Global symbol "$global" requires explicit package name (did you forget to declare "my $global"?) at line 3.
-+Global symbol "$other_global" requires explicit package name (did you forget to declare "my $other_global"?) at line 4.
- CONTEXT: compilation of PL/Perl function "uses_global"
- select uses_global();
- ERROR: function uses_global() does not exist
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 4fecc90..8e3b193 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -13,10 +13,10 @@ to be updated. (Of course, a user who dislikes this behavior can still
override it via postgresql.conf.)
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
-index 2b6527f..8e178d4 100644
+index 9481f2d..75532c7 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
-@@ -2971,7 +2971,7 @@ static struct config_string ConfigureNamesString[] =
+@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
},
&Unix_socket_directories,
#ifdef HAVE_UNIX_SOCKETS
@@ -26,10 +26,10 @@ index 2b6527f..8e178d4 100644
"",
#endif
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
-index abf1586..8c01d48 100644
+index feeff9e..3e3d784 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
-@@ -1204,7 +1204,7 @@ setup_config(void)
+@@ -1234,7 +1234,7 @@ setup_config(void)
#ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -39,10 +39,10 @@ index abf1586..8c01d48 100644
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
-index 24c5069..aeec705 100644
+index e278fa0..9ee15d4 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
-@@ -144,7 +144,7 @@
+@@ -169,7 +169,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
*/
@@ -50,4 +50,4 @@ index 24c5069..aeec705 100644
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
/*
- * The random() function is expected to yield values between 0 and
+ * This is the default event source for Windows event log.
diff --git a/postgresql.spec b/postgresql.spec
index bf9116b..eb64338 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -65,9 +65,9 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.4
-Version: 9.4.5
-Release: 5%{?dist}
+%global majorversion 9.5
+Version: 9.5.0
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,10 +82,10 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.3.10
-%global prevmajorversion 9.3
+%global prevversion 9.4.5
+%global prevmajorversion 9.4
-%global setup_version 3.4
+%global setup_version 3.5
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -116,9 +116,7 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-perl-5.22-test-fail.patch
-Patch8: postgresql-python3.5-tests.patch
-Patch9: postgresql-fix-xml2.patch
+Patch7: postgresql-python3.5-tests.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -359,8 +357,6 @@ benchmarks.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -783,10 +779,13 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
# remove files not to be packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-%if !%upgrade
-rm -f $RPM_BUILD_ROOT%{_bindir}/pg_upgrade
-rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/pg_upgrade_support.so
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pg_upgrade.*
+
+%if !%plperl
+rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so
+%endif
+
+%if !%plpython
+rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plpython2.so
%endif
# initialize file lists
@@ -820,6 +819,8 @@ cat pg_config-%{majorversion}.lang >>main.lst
cat pg_dump-%{majorversion}.lang >>main.lst
%find_lang pg_resetxlog-%{majorversion}
cat pg_resetxlog-%{majorversion}.lang >>server.lst
+%find_lang pg_rewind-%{majorversion}
+cat pg_rewind-%{majorversion}.lang >>server.lst
%find_lang pgscripts-%{majorversion}
cat pgscripts-%{majorversion}.lang >>main.lst
%if %plperl
@@ -917,6 +918,7 @@ fi
%{_bindir}/pg_dumpall
%{_bindir}/pg_isready
%{_bindir}/pg_restore
+%{_bindir}/pg_upgrade
%{_bindir}/psql
%{_bindir}/reindexdb
%{_bindir}/vacuumdb
@@ -932,6 +934,7 @@ fi
%{_mandir}/man1/pg_dumpall.*
%{_mandir}/man1/pg_isready.*
%{_mandir}/man1/pg_restore.*
+%{_mandir}/man1/pg_upgrade.*
%{_mandir}/man1/psql.*
%{_mandir}/man1/reindexdb.*
%{_mandir}/man1/vacuumdb.*
@@ -987,12 +990,11 @@ fi
%{_datadir}/pgsql/extension/seg*
%{_datadir}/pgsql/extension/tablefunc*
%{_datadir}/pgsql/extension/tcn*
-%{_datadir}/pgsql/extension/test_parser*
-%{_datadir}/pgsql/extension/test_shm_mq*
%{_datadir}/pgsql/extension/timetravel*
%{_datadir}/pgsql/extension/tsearch2*
+%{_datadir}/pgsql/extension/tsm_system_rows*
+%{_datadir}/pgsql/extension/tsm_system_time*
%{_datadir}/pgsql/extension/unaccent*
-%{_datadir}/pgsql/extension/worker_spi*
%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/adminpack.so
%{_libdir}/pgsql/auth_delay.so
@@ -1006,15 +1008,23 @@ fi
%{_libdir}/pgsql/dblink.so
%{_libdir}/pgsql/dict_int.so
%{_libdir}/pgsql/dict_xsyn.so
-%{_libdir}/pgsql/dummy_seclabel.so
%{_libdir}/pgsql/earthdistance.so
%{_libdir}/pgsql/file_fdw.so
%{_libdir}/pgsql/fuzzystrmatch.so
%{_libdir}/pgsql/hstore.so
+%if %plperl
+%{_libdir}/pgsql/hstore_plperl.so
+%endif
+%if %plpython
+%{_libdir}/pgsql/hstore_plpython2.so
+%endif
%{_libdir}/pgsql/insert_username.so
%{_libdir}/pgsql/isn.so
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
+%if %plpython
+%{_libdir}/pgsql/ltree_plpython2.so
+%endif
%{_libdir}/pgsql/moddatetime.so
%{_libdir}/pgsql/pageinspect.so
%{_libdir}/pgsql/passwordcheck.so
@@ -1031,12 +1041,11 @@ fi
%{_libdir}/pgsql/tablefunc.so
%{_libdir}/pgsql/tcn.so
%{_libdir}/pgsql/test_decoding.so
-%{_libdir}/pgsql/test_parser.so
-%{_libdir}/pgsql/test_shm_mq.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
+%{_libdir}/pgsql/tsm_system_rows.so
+%{_libdir}/pgsql/tsm_system_time.so
%{_libdir}/pgsql/unaccent.so
-%{_libdir}/pgsql/worker_spi.so
%{_mandir}/man1/oid2name.*
%{_mandir}/man1/pg_archivecleanup.*
%{_mandir}/man1/pg_recvlogical.*
@@ -1079,6 +1088,7 @@ fi
%{_bindir}/pg_receivexlog
%{_bindir}/pg_recvlogical
%{_bindir}/pg_resetxlog
+%{_bindir}/pg_rewind
%{_bindir}/postgres
%{_bindir}/postgresql-setup
%{_bindir}/postmaster
@@ -1117,6 +1127,7 @@ fi
%{_mandir}/man1/pg_ctl.*
%{_mandir}/man1/pg_receivexlog.*
%{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/pg_rewind.*
%{_mandir}/man1/postgres.*
%{_mandir}/man1/postgresql-setup.*
%{_mandir}/man1/postmaster.*
@@ -1149,10 +1160,7 @@ fi
%if %upgrade
%files upgrade
-%{_bindir}/pg_upgrade
-%{_libdir}/pgsql/pg_upgrade_support.so
%{_libdir}/pgsql/postgresql-%{prevmajorversion}
-%{_mandir}/man1/pg_upgrade.*
%endif
%if %plperl
@@ -1190,7 +1198,11 @@ fi
%endif
%changelog
-* Thu Dec 16 2015 Pavel Kajaba <pkajaba(a)redhat.com> - 9.4.5-5
+* Wed Jan 06 2016 Pavel Raiskup <praiskup(a)redhat.com> - 9.5.0-1
+- update to 9.5.0 per release notes
+ http://www.postgresql.org/docs/9.5/static/release-9-5.html
+
+* Wed Dec 16 2015 Pavel Kajaba <pkajaba(a)redhat.com> - 9.4.5-5
- fixed problem with xml2 test (rhbz#1286692)
* Thu Dec 3 2015 Pavel Kajaba <pkajaba(a)redhat.com> - 9.4.5-4
diff --git a/sources b/sources
index bd51589..d7d3132 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,7 @@
-1b04cb359940bcc21ca4512c67e83290 postgresql-setup-3.4.tar.gz
-ec2365548d08f69c8023eddd4f2d1a28 postgresql-9.3.10.tar.bz2
-4097024cab41374aac237bb11293ca36 postgresql-9.3.10.tar.bz2.sha256
+dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz
8b2e3472a8dc786649b4d02d02e039a0 postgresql-9.4.5.tar.bz2
8d83dbba546035e37e84c8c9fa31e426 postgresql-9.4.5.tar.bz2.sha256
-59316c39552a081955cc50cfadad24e0 postgresql-9.4.5-US.pdf
+e58fffe9359e311ead94490a06b7147c postgresql-9.5.0.tar.bz2
+809ed037611f29a3d74507cbb9e1870c postgresql-9.5.0.tar.bz2.sha256
+d05afa73c47b95421fa5d84938e9d2fc postgresql-9.5.0-US.pdf
+dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz
commit 10326645ae50f5ecaab4767daecaec2138d543ab
Author: Pavel Kajaba <pkajaba(a)redhat.com>
Date: Wed Dec 16 12:56:26 2015 +0100
fix FTBFS caused by update of libxml2
Resolves: rhbz:#1286692
Version: 9.4.5-5
diff --git a/postgresql-fix-xml2.patch b/postgresql-fix-xml2.patch
new file mode 100644
index 0000000..6b97017
--- /dev/null
+++ b/postgresql-fix-xml2.patch
@@ -0,0 +1,77 @@
+diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
+index 9b7b393..72f0be3 100644
+--- a/src/test/regress/expected/xml.out
++++ b/src/test/regress/expected/xml.out
+@@ -9,8 +9,6 @@ ERROR: invalid XML content
+ LINE 1: INSERT INTO xmltest VALUES (3, '<wrong');
+ ^
+ DETAIL: line 1: Couldn't find end of Start Tag wrong line 1
+-<wrong
+- ^
+ SELECT * FROM xmltest;
+ id | data
+ ----+--------------------
+@@ -63,8 +61,6 @@ ERROR: invalid XML content
+ LINE 1: SELECT xmlconcat('bad', '<syntax');
+ ^
+ DETAIL: line 1: Couldn't find end of Start Tag syntax line 1
+-<syntax
+- ^
+ SELECT xmlconcat('<foo/>', NULL, '<?xml version="1.1" standalone="no"?><bar/>');
+ xmlconcat
+ --------------
+@@ -212,16 +208,12 @@ DETAIL: line 1: xmlParseEntityRef: no name
+ <invalidentity>&</invalidentity>
+ ^
+ line 1: chunk is not well balanced
+-<invalidentity>&</invalidentity>
+- ^
+ SELECT xmlparse(content '<undefinedentity>&idontexist;</undefinedentity>');
+ ERROR: invalid XML content
+ DETAIL: line 1: Entity 'idontexist' not defined
+ <undefinedentity>&idontexist;</undefinedentity>
+ ^
+ line 1: chunk is not well balanced
+-<undefinedentity>&idontexist;</undefinedentity>
+- ^
+ SELECT xmlparse(content '<invalidns xmlns=''<''/>');
+ xmlparse
+ ---------------------------
+@@ -240,11 +232,7 @@ DETAIL: line 1: Entity 'idontexist' not defined
+ <twoerrors>&idontexist;</unbalanced>
+ ^
+ line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
+-<twoerrors>&idontexist;</unbalanced>
+- ^
+ line 1: chunk is not well balanced
+-<twoerrors>&idontexist;</unbalanced>
+- ^
+ SELECT xmlparse(content '<nosuchprefix:tag/>');
+ xmlparse
+ ---------------------
+@@ -268,16 +256,12 @@ DETAIL: line 1: xmlParseEntityRef: no name
+ <invalidentity>&</abc>
+ ^
+ line 1: Opening and ending tag mismatch: invalidentity line 1 and abc
+-<invalidentity>&</abc>
+- ^
+ SELECT xmlparse(document '<undefinedentity>&idontexist;</abc>');
+ ERROR: invalid XML document
+ DETAIL: line 1: Entity 'idontexist' not defined
+ <undefinedentity>&idontexist;</abc>
+ ^
+ line 1: Opening and ending tag mismatch: undefinedentity line 1 and abc
+-<undefinedentity>&idontexist;</abc>
+- ^
+ SELECT xmlparse(document '<invalidns xmlns=''<''/>');
+ xmlparse
+ ---------------------------
+@@ -296,8 +280,6 @@ DETAIL: line 1: Entity 'idontexist' not defined
+ <twoerrors>&idontexist;</unbalanced>
+ ^
+ line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
+-<twoerrors>&idontexist;</unbalanced>
+- ^
+ SELECT xmlparse(document '<nosuchprefix:tag/>');
+ xmlparse
+ ---------------------
diff --git a/postgresql.spec b/postgresql.spec
index e22df4e..bf9116b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.5
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -118,6 +118,7 @@ Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
Patch7: postgresql-perl-5.22-test-fail.patch
Patch8: postgresql-python3.5-tests.patch
+Patch9: postgresql-fix-xml2.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -359,6 +360,7 @@ benchmarks.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1188,6 +1190,9 @@ fi
%endif
%changelog
+* Thu Dec 16 2015 Pavel Kajaba <pkajaba(a)redhat.com> - 9.4.5-5
+- fixed problem with xml2 test (rhbz#1286692)
+
* Thu Dec 3 2015 Pavel Kajaba <pkajaba(a)redhat.com> - 9.4.5-4
- fixed short-circuit build
commit bda5fb847989b8a809853685d8f0fd720b3a716f
Author: Pavel Kajaba <pkajaba(a)redhat.com>
Date: Thu Dec 3 13:17:34 2015 +0100
Added empty clean section to fix short-circuit
Version: 9.4.5-4
diff --git a/postgresql.spec b/postgresql.spec
index 440281b..e22df4e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -896,6 +896,8 @@ if [ $1 -ge 1 ]; then
fi
%endif
+%clean
+
# FILES section.
%files -f main.lst
@@ -1186,6 +1188,9 @@ fi
%endif
%changelog
+* Thu Dec 3 2015 Pavel Kajaba <pkajaba(a)redhat.com> - 9.4.5-4
+- fixed short-circuit build
+
* Thu Nov 12 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-3
- fix testsuite failure with new Python 3.5 (rhbz#1280404)
commit c7e64e17fcbbbb1fe85a9e33c94061ad2f585de4
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Nov 12 11:18:25 2015 +0100
tests: fix FTBFS with new Python 3.5
Resolves: rhbz#1280404
Version: 9.4.5-3
diff --git a/postgresql-python3.5-tests.patch b/postgresql-python3.5-tests.patch
new file mode 100644
index 0000000..5b50b5a
--- /dev/null
+++ b/postgresql-python3.5-tests.patch
@@ -0,0 +1,610 @@
+From 8e76ccde28901f96678f21a2487af3b6a433ee35 Mon Sep 17 00:00:00 2001
+From: Peter Eisentraut <peter_e(a)gmx.net>
+Date: Wed, 3 Jun 2015 19:52:08 -0400
+Subject: [PATCH] PL/Python: Make tests pass with Python 3.5
+
+The error message wording for AttributeError has changed in Python 3.5.
+For the plpython_error test, add a new expected file. In the
+plpython_subtransaction test, we didn't really care what the exception
+is, only that it is something coming from Python. So use a generic
+exception instead, which has a message that doesn't vary across
+versions.
+---
+ src/pl/plpython/expected/README | 1 +
+ src/pl/plpython/expected/plpython_error_5.out | 428 +++++++++++++++++++++
+ .../plpython/expected/plpython_subtransaction.out | 12 +-
+ .../expected/plpython_subtransaction_0.out | 8 +-
+ .../expected/plpython_subtransaction_5.out | 8 +-
+ src/pl/plpython/sql/plpython_subtransaction.sql | 4 +-
+ 6 files changed, 445 insertions(+), 16 deletions(-)
+ create mode 100644 src/pl/plpython/expected/plpython_error_5.out
+
+diff --git a/src/pl/plpython/expected/README b/src/pl/plpython/expected/README
+index 5bf9366..b890563 100644
+--- a/src/pl/plpython/expected/README
++++ b/src/pl/plpython/expected/README
+@@ -1,6 +1,7 @@
+ Guide to alternative expected files:
+
+ plpython_error_0.out Python 2.4 and older
++plpython_error_5.out Python 3.5 and newer
+
+ plpython_unicode.out server encoding != SQL_ASCII
+ plpython_unicode_3.out server encoding == SQL_ASCII
+diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
+new file mode 100644
+index 0000000..fcd944c
+--- /dev/null
++++ b/src/pl/plpython/expected/plpython_error_5.out
+@@ -0,0 +1,428 @@
++-- test error handling, i forgot to restore Warn_restart in
++-- the trigger handler once. the errors and subsequent core dump were
++-- interesting.
++/* Flat out Python syntax error
++ */
++CREATE FUNCTION python_syntax_error() RETURNS text
++ AS
++'.syntaxerror'
++ LANGUAGE plpython3u;
++ERROR: could not compile PL/Python function "python_syntax_error"
++DETAIL: SyntaxError: invalid syntax (<string>, line 2)
++/* With check_function_bodies = false the function should get defined
++ * and the error reported when called
++ */
++SET check_function_bodies = false;
++CREATE FUNCTION python_syntax_error() RETURNS text
++ AS
++'.syntaxerror'
++ LANGUAGE plpython3u;
++SELECT python_syntax_error();
++ERROR: could not compile PL/Python function "python_syntax_error"
++DETAIL: SyntaxError: invalid syntax (<string>, line 2)
++/* Run the function twice to check if the hashtable entry gets cleaned up */
++SELECT python_syntax_error();
++ERROR: could not compile PL/Python function "python_syntax_error"
++DETAIL: SyntaxError: invalid syntax (<string>, line 2)
++RESET check_function_bodies;
++/* Flat out syntax error
++ */
++CREATE FUNCTION sql_syntax_error() RETURNS text
++ AS
++'plpy.execute("syntax error")'
++ LANGUAGE plpython3u;
++SELECT sql_syntax_error();
++ERROR: spiexceptions.SyntaxError: syntax error at or near "syntax"
++LINE 1: syntax error
++ ^
++QUERY: syntax error
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "sql_syntax_error", line 1, in <module>
++ plpy.execute("syntax error")
++PL/Python function "sql_syntax_error"
++/* check the handling of uncaught python exceptions
++ */
++CREATE FUNCTION exception_index_invalid(text) RETURNS text
++ AS
++'return args[1]'
++ LANGUAGE plpython3u;
++SELECT exception_index_invalid('test');
++ERROR: IndexError: list index out of range
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "exception_index_invalid", line 1, in <module>
++ return args[1]
++PL/Python function "exception_index_invalid"
++/* check handling of nested exceptions
++ */
++CREATE FUNCTION exception_index_invalid_nested() RETURNS text
++ AS
++'rv = plpy.execute("SELECT test5(''foo'')")
++return rv[0]'
++ LANGUAGE plpython3u;
++SELECT exception_index_invalid_nested();
++ERROR: spiexceptions.UndefinedFunction: function test5(unknown) does not exist
++LINE 1: SELECT test5('foo')
++ ^
++HINT: No function matches the given name and argument types. You might need to add explicit type casts.
++QUERY: SELECT test5('foo')
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "exception_index_invalid_nested", line 1, in <module>
++ rv = plpy.execute("SELECT test5('foo')")
++PL/Python function "exception_index_invalid_nested"
++/* a typo
++ */
++CREATE FUNCTION invalid_type_uncaught(a text) RETURNS text
++ AS
++'if "plan" not in SD:
++ q = "SELECT fname FROM users WHERE lname = $1"
++ SD["plan"] = plpy.prepare(q, [ "test" ])
++rv = plpy.execute(SD["plan"], [ a ])
++if len(rv):
++ return rv[0]["fname"]
++return None
++'
++ LANGUAGE plpython3u;
++SELECT invalid_type_uncaught('rick');
++ERROR: spiexceptions.UndefinedObject: type "test" does not exist
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "invalid_type_uncaught", line 3, in <module>
++ SD["plan"] = plpy.prepare(q, [ "test" ])
++PL/Python function "invalid_type_uncaught"
++/* for what it's worth catch the exception generated by
++ * the typo, and return None
++ */
++CREATE FUNCTION invalid_type_caught(a text) RETURNS text
++ AS
++'if "plan" not in SD:
++ q = "SELECT fname FROM users WHERE lname = $1"
++ try:
++ SD["plan"] = plpy.prepare(q, [ "test" ])
++ except plpy.SPIError as ex:
++ plpy.notice(str(ex))
++ return None
++rv = plpy.execute(SD["plan"], [ a ])
++if len(rv):
++ return rv[0]["fname"]
++return None
++'
++ LANGUAGE plpython3u;
++SELECT invalid_type_caught('rick');
++NOTICE: type "test" does not exist
++CONTEXT: PL/Python function "invalid_type_caught"
++ invalid_type_caught
++---------------------
++
++(1 row)
++
++/* for what it's worth catch the exception generated by
++ * the typo, and reraise it as a plain error
++ */
++CREATE FUNCTION invalid_type_reraised(a text) RETURNS text
++ AS
++'if "plan" not in SD:
++ q = "SELECT fname FROM users WHERE lname = $1"
++ try:
++ SD["plan"] = plpy.prepare(q, [ "test" ])
++ except plpy.SPIError as ex:
++ plpy.error(str(ex))
++rv = plpy.execute(SD["plan"], [ a ])
++if len(rv):
++ return rv[0]["fname"]
++return None
++'
++ LANGUAGE plpython3u;
++SELECT invalid_type_reraised('rick');
++ERROR: plpy.Error: type "test" does not exist
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "invalid_type_reraised", line 6, in <module>
++ plpy.error(str(ex))
++PL/Python function "invalid_type_reraised"
++/* no typo no messing about
++ */
++CREATE FUNCTION valid_type(a text) RETURNS text
++ AS
++'if "plan" not in SD:
++ SD["plan"] = plpy.prepare("SELECT fname FROM users WHERE lname = $1", [ "text" ])
++rv = plpy.execute(SD["plan"], [ a ])
++if len(rv):
++ return rv[0]["fname"]
++return None
++'
++ LANGUAGE plpython3u;
++SELECT valid_type('rick');
++ valid_type
++------------
++
++(1 row)
++
++/* error in nested functions to get a traceback
++*/
++CREATE FUNCTION nested_error() RETURNS text
++ AS
++'def fun1():
++ plpy.error("boom")
++
++def fun2():
++ fun1()
++
++def fun3():
++ fun2()
++
++fun3()
++return "not reached"
++'
++ LANGUAGE plpython3u;
++SELECT nested_error();
++ERROR: plpy.Error: boom
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "nested_error", line 10, in <module>
++ fun3()
++ PL/Python function "nested_error", line 8, in fun3
++ fun2()
++ PL/Python function "nested_error", line 5, in fun2
++ fun1()
++ PL/Python function "nested_error", line 2, in fun1
++ plpy.error("boom")
++PL/Python function "nested_error"
++/* raising plpy.Error is just like calling plpy.error
++*/
++CREATE FUNCTION nested_error_raise() RETURNS text
++ AS
++'def fun1():
++ raise plpy.Error("boom")
++
++def fun2():
++ fun1()
++
++def fun3():
++ fun2()
++
++fun3()
++return "not reached"
++'
++ LANGUAGE plpython3u;
++SELECT nested_error_raise();
++ERROR: plpy.Error: boom
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "nested_error_raise", line 10, in <module>
++ fun3()
++ PL/Python function "nested_error_raise", line 8, in fun3
++ fun2()
++ PL/Python function "nested_error_raise", line 5, in fun2
++ fun1()
++ PL/Python function "nested_error_raise", line 2, in fun1
++ raise plpy.Error("boom")
++PL/Python function "nested_error_raise"
++/* using plpy.warning should not produce a traceback
++*/
++CREATE FUNCTION nested_warning() RETURNS text
++ AS
++'def fun1():
++ plpy.warning("boom")
++
++def fun2():
++ fun1()
++
++def fun3():
++ fun2()
++
++fun3()
++return "you''ve been warned"
++'
++ LANGUAGE plpython3u;
++SELECT nested_warning();
++WARNING: boom
++CONTEXT: PL/Python function "nested_warning"
++ nested_warning
++--------------------
++ you've been warned
++(1 row)
++
++/* AttributeError at toplevel used to give segfaults with the traceback
++*/
++CREATE FUNCTION toplevel_attribute_error() RETURNS void AS
++$$
++plpy.nonexistent
++$$ LANGUAGE plpython3u;
++SELECT toplevel_attribute_error();
++ERROR: AttributeError: module 'plpy' has no attribute 'nonexistent'
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "toplevel_attribute_error", line 2, in <module>
++ plpy.nonexistent
++PL/Python function "toplevel_attribute_error"
++/* Calling PL/Python functions from SQL and vice versa should not lose context.
++ */
++CREATE OR REPLACE FUNCTION python_traceback() RETURNS void AS $$
++def first():
++ second()
++
++def second():
++ third()
++
++def third():
++ plpy.execute("select sql_error()")
++
++first()
++$$ LANGUAGE plpython3u;
++CREATE OR REPLACE FUNCTION sql_error() RETURNS void AS $$
++begin
++ select 1/0;
++end
++$$ LANGUAGE plpgsql;
++CREATE OR REPLACE FUNCTION python_from_sql_error() RETURNS void AS $$
++begin
++ select python_traceback();
++end
++$$ LANGUAGE plpgsql;
++CREATE OR REPLACE FUNCTION sql_from_python_error() RETURNS void AS $$
++plpy.execute("select sql_error()")
++$$ LANGUAGE plpython3u;
++SELECT python_traceback();
++ERROR: spiexceptions.DivisionByZero: division by zero
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "python_traceback", line 11, in <module>
++ first()
++ PL/Python function "python_traceback", line 3, in first
++ second()
++ PL/Python function "python_traceback", line 6, in second
++ third()
++ PL/Python function "python_traceback", line 9, in third
++ plpy.execute("select sql_error()")
++PL/Python function "python_traceback"
++SELECT sql_error();
++ERROR: division by zero
++CONTEXT: SQL statement "select 1/0"
++PL/pgSQL function sql_error() line 3 at SQL statement
++SELECT python_from_sql_error();
++ERROR: spiexceptions.DivisionByZero: division by zero
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "python_traceback", line 11, in <module>
++ first()
++ PL/Python function "python_traceback", line 3, in first
++ second()
++ PL/Python function "python_traceback", line 6, in second
++ third()
++ PL/Python function "python_traceback", line 9, in third
++ plpy.execute("select sql_error()")
++PL/Python function "python_traceback"
++SQL statement "select python_traceback()"
++PL/pgSQL function python_from_sql_error() line 3 at SQL statement
++SELECT sql_from_python_error();
++ERROR: spiexceptions.DivisionByZero: division by zero
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "sql_from_python_error", line 2, in <module>
++ plpy.execute("select sql_error()")
++PL/Python function "sql_from_python_error"
++/* check catching specific types of exceptions
++ */
++CREATE TABLE specific (
++ i integer PRIMARY KEY
++);
++CREATE FUNCTION specific_exception(i integer) RETURNS void AS
++$$
++from plpy import spiexceptions
++try:
++ plpy.execute("insert into specific values (%s)" % (i or "NULL"));
++except spiexceptions.NotNullViolation as e:
++ plpy.notice("Violated the NOT NULL constraint, sqlstate %s" % e.sqlstate)
++except spiexceptions.UniqueViolation as e:
++ plpy.notice("Violated the UNIQUE constraint, sqlstate %s" % e.sqlstate)
++$$ LANGUAGE plpython3u;
++SELECT specific_exception(2);
++ specific_exception
++--------------------
++
++(1 row)
++
++SELECT specific_exception(NULL);
++NOTICE: Violated the NOT NULL constraint, sqlstate 23502
++CONTEXT: PL/Python function "specific_exception"
++ specific_exception
++--------------------
++
++(1 row)
++
++SELECT specific_exception(2);
++NOTICE: Violated the UNIQUE constraint, sqlstate 23505
++CONTEXT: PL/Python function "specific_exception"
++ specific_exception
++--------------------
++
++(1 row)
++
++/* SPI errors in PL/Python functions should preserve the SQLSTATE value
++ */
++CREATE FUNCTION python_unique_violation() RETURNS void AS $$
++plpy.execute("insert into specific values (1)")
++plpy.execute("insert into specific values (1)")
++$$ LANGUAGE plpython3u;
++CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
++begin
++ begin
++ perform python_unique_violation();
++ exception when unique_violation then
++ return 'ok';
++ end;
++ return 'not reached';
++end;
++$$ language plpgsql;
++SELECT catch_python_unique_violation();
++ catch_python_unique_violation
++-------------------------------
++ ok
++(1 row)
++
++/* manually starting subtransactions - a bad idea
++ */
++CREATE FUNCTION manual_subxact() RETURNS void AS $$
++plpy.execute("savepoint save")
++plpy.execute("create table foo(x integer)")
++plpy.execute("rollback to save")
++$$ LANGUAGE plpython3u;
++SELECT manual_subxact();
++ERROR: plpy.SPIError: SPI_execute failed: SPI_ERROR_TRANSACTION
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "manual_subxact", line 2, in <module>
++ plpy.execute("savepoint save")
++PL/Python function "manual_subxact"
++/* same for prepared plans
++ */
++CREATE FUNCTION manual_subxact_prepared() RETURNS void AS $$
++save = plpy.prepare("savepoint save")
++rollback = plpy.prepare("rollback to save")
++plpy.execute(save)
++plpy.execute("create table foo(x integer)")
++plpy.execute(rollback)
++$$ LANGUAGE plpython3u;
++SELECT manual_subxact_prepared();
++ERROR: plpy.SPIError: SPI_execute_plan failed: SPI_ERROR_TRANSACTION
++CONTEXT: Traceback (most recent call last):
++ PL/Python function "manual_subxact_prepared", line 4, in <module>
++ plpy.execute(save)
++PL/Python function "manual_subxact_prepared"
++/* raising plpy.spiexception.* from python code should preserve sqlstate
++ */
++CREATE FUNCTION plpy_raise_spiexception() RETURNS void AS $$
++raise plpy.spiexceptions.DivisionByZero()
++$$ LANGUAGE plpython3u;
++DO $$
++BEGIN
++ SELECT plpy_raise_spiexception();
++EXCEPTION WHEN division_by_zero THEN
++ -- NOOP
++END
++$$ LANGUAGE plpgsql;
++/* setting a custom sqlstate should be handled
++ */
++CREATE FUNCTION plpy_raise_spiexception_override() RETURNS void AS $$
++exc = plpy.spiexceptions.DivisionByZero()
++exc.sqlstate = 'SILLY'
++raise exc
++$$ LANGUAGE plpython3u;
++DO $$
++BEGIN
++ SELECT plpy_raise_spiexception_override();
++EXCEPTION WHEN SQLSTATE 'SILLY' THEN
++ -- NOOP
++END
++$$ LANGUAGE plpgsql;
+diff --git a/src/pl/plpython/expected/plpython_subtransaction.out b/src/pl/plpython/expected/plpython_subtransaction.out
+index ced4682..c7bf6cc 100644
+--- a/src/pl/plpython/expected/plpython_subtransaction.out
++++ b/src/pl/plpython/expected/plpython_subtransaction.out
+@@ -19,7 +19,7 @@ try:
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ except:
+ exc = False
+ subxact.__exit__(*sys.exc_info())
+@@ -58,10 +58,10 @@ SELECT * FROM subtransaction_tbl;
+
+ TRUNCATE subtransaction_tbl;
+ SELECT subtransaction_test('Python');
+-ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
++ERROR: Exception: Python exception
+ CONTEXT: Traceback (most recent call last):
+ PL/Python function "subtransaction_test", line 13, in <module>
+- plpy.attribute_error
++ raise Exception("Python exception")
+ PL/Python function "subtransaction_test"
+ SELECT * FROM subtransaction_tbl;
+ i
+@@ -78,7 +78,7 @@ with plpy.subtransaction():
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ $$ LANGUAGE plpythonu;
+ SELECT subtransaction_ctx_test();
+ subtransaction_ctx_test
+@@ -110,10 +110,10 @@ SELECT * FROM subtransaction_tbl;
+
+ TRUNCATE subtransaction_tbl;
+ SELECT subtransaction_ctx_test('Python');
+-ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
++ERROR: Exception: Python exception
+ CONTEXT: Traceback (most recent call last):
+ PL/Python function "subtransaction_ctx_test", line 8, in <module>
+- plpy.attribute_error
++ raise Exception("Python exception")
+ PL/Python function "subtransaction_ctx_test"
+ SELECT * FROM subtransaction_tbl;
+ i
+diff --git a/src/pl/plpython/expected/plpython_subtransaction_0.out b/src/pl/plpython/expected/plpython_subtransaction_0.out
+index 6f4be55..73bd724 100644
+--- a/src/pl/plpython/expected/plpython_subtransaction_0.out
++++ b/src/pl/plpython/expected/plpython_subtransaction_0.out
+@@ -19,7 +19,7 @@ try:
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ except:
+ exc = False
+ subxact.__exit__(*sys.exc_info())
+@@ -58,10 +58,10 @@ SELECT * FROM subtransaction_tbl;
+
+ TRUNCATE subtransaction_tbl;
+ SELECT subtransaction_test('Python');
+-ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
++ERROR: Exception: Python exception
+ CONTEXT: Traceback (most recent call last):
+ PL/Python function "subtransaction_test", line 13, in <module>
+- plpy.attribute_error
++ raise Exception("Python exception")
+ PL/Python function "subtransaction_test"
+ SELECT * FROM subtransaction_tbl;
+ i
+@@ -78,7 +78,7 @@ with plpy.subtransaction():
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ $$ LANGUAGE plpythonu;
+ ERROR: could not compile PL/Python function "subtransaction_ctx_test"
+ DETAIL: SyntaxError: invalid syntax (line 3)
+diff --git a/src/pl/plpython/expected/plpython_subtransaction_5.out b/src/pl/plpython/expected/plpython_subtransaction_5.out
+index 4ca1835..d177620 100644
+--- a/src/pl/plpython/expected/plpython_subtransaction_5.out
++++ b/src/pl/plpython/expected/plpython_subtransaction_5.out
+@@ -19,7 +19,7 @@ try:
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ except:
+ exc = False
+ subxact.__exit__(*sys.exc_info())
+@@ -58,10 +58,10 @@ SELECT * FROM subtransaction_tbl;
+
+ TRUNCATE subtransaction_tbl;
+ SELECT subtransaction_test('Python');
+-ERROR: AttributeError: 'module' object has no attribute 'attribute_error'
++ERROR: Exception: Python exception
+ CONTEXT: Traceback (most recent call last):
+ PL/Python function "subtransaction_test", line 13, in <module>
+- plpy.attribute_error
++ raise Exception("Python exception")
+ PL/Python function "subtransaction_test"
+ SELECT * FROM subtransaction_tbl;
+ i
+@@ -78,7 +78,7 @@ with plpy.subtransaction():
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ $$ LANGUAGE plpythonu;
+ ERROR: could not compile PL/Python function "subtransaction_ctx_test"
+ DETAIL: SyntaxError: invalid syntax (<string>, line 3)
+diff --git a/src/pl/plpython/sql/plpython_subtransaction.sql b/src/pl/plpython/sql/plpython_subtransaction.sql
+index 9ad6377..3c188e3 100644
+--- a/src/pl/plpython/sql/plpython_subtransaction.sql
++++ b/src/pl/plpython/sql/plpython_subtransaction.sql
+@@ -23,7 +23,7 @@ try:
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ except:
+ exc = False
+ subxact.__exit__(*sys.exc_info())
+@@ -53,7 +53,7 @@ with plpy.subtransaction():
+ if what_error == "SPI":
+ plpy.execute("INSERT INTO subtransaction_tbl VALUES ('oops')")
+ elif what_error == "Python":
+- plpy.attribute_error
++ raise Exception("Python exception")
+ $$ LANGUAGE plpythonu;
+
+ SELECT subtransaction_ctx_test();
+--
+2.5.0
+
diff --git a/postgresql.spec b/postgresql.spec
index 870994b..440281b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -117,6 +117,7 @@ Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
Patch7: postgresql-perl-5.22-test-fail.patch
+Patch8: postgresql-python3.5-tests.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -357,6 +358,7 @@ benchmarks.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1184,6 +1186,9 @@ fi
%endif
%changelog
+* Thu Nov 12 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-3
+- fix testsuite failure with new Python 3.5 (rhbz#1280404)
+
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.4.5-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
commit 74667b2a3213a41e9b8cd5553060c41e4ceb3170
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Tue Nov 10 14:53:03 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
diff --git a/postgresql.spec b/postgresql.spec
index 3035007..870994b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1184,6 +1184,9 @@ fi
%endif
%changelog
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.4.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
* Fri Oct 16 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-2
- devel package should not require the main package (rhbz#1272219)
- multilib fix, more general solution (rhbz#1190346)
commit 3e879ef32a1695c2456958aeeccb7792c54d5c18
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Oct 16 15:56:14 2015 +0200
initscripts: do not track 'service' scripts in git
Those are already installed from postgressql-setup.tar.
Version: 9.4.5-2
diff --git a/initdb.sh b/initdb.sh
deleted file mode 100755
index c238574..0000000
--- a/initdb.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# Legacy action script for "service postgresql initdb"
-
-# Find the name of the service
-SERVICE_NAME=$(basename $(dirname "$0"))
-if [ x"$SERVICE_NAME" = x. ]
-then
- SERVICE_NAME=postgresql
-fi
-
-echo Hint: the preferred way to do this is now '"postgresql-setup initdb"' >&2
-
-/usr/bin/postgresql-setup initdb "$SERVICE_NAME"
-
-exit $?
diff --git a/upgrade.sh b/upgrade.sh
deleted file mode 100755
index c542494..0000000
--- a/upgrade.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# Legacy action script for "service postgresql upgrade"
-
-# Find the name of the service
-SERVICE_NAME=$(basename $(dirname "$0"))
-if [ x"$SERVICE_NAME" = x. ]
-then
- SERVICE_NAME=postgresql
-fi
-
-echo Hint: the preferred way to do this is now '"postgresql-setup upgrade"' >&2
-
-/usr/bin/postgresql-setup upgrade "$SERVICE_NAME"
-
-exit $?
commit 8a02c7123100b28a679821405fdff08b36904eeb
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Oct 16 11:35:07 2015 +0200
multilib: fix devel subpackage
Remove the templates and add sufficiently general script to
generate the header stub file. I'll try to propose this to
redhat-rpm-config package inclusion.
Resolves: rhbz#1190346
Version: 9.4.5-2
diff --git a/ecpg_config.h b/ecpg_config.h
deleted file mode 100644
index 6fecfcb..0000000
--- a/ecpg_config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Kluge to support multilib installation of both 32- and 64-bit RPMS:
- * we need to arrange that header files that appear in both RPMs are
- * identical. Hence, this file is architecture-independent and calls
- * in an arch-dependent file that will appear in just one RPM.
- *
- * To avoid breaking arches not explicitly supported by Red Hat, we
- * use this indirection file *only* on known multilib arches.
- *
- * Note: this may well fail if user tries to use gcc's -I- option.
- * But that option is deprecated anyway.
- */
-#if defined(__x86_64__)
-#include "ecpg_config_x86_64.h"
-#elif defined(__i386__)
-#include "ecpg_config_i386.h"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#include "ecpg_config_ppc64.h"
-#elif defined(__ppc__) || defined(__powerpc__)
-#include "ecpg_config_ppc.h"
-#elif defined(__s390x__)
-#include "ecpg_config_s390x.h"
-#elif defined(__s390__)
-#include "ecpg_config_s390.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "ecpg_config_sparc64.h"
-#elif defined(__sparc__)
-#include "ecpg_config_sparc.h"
-#endif
diff --git a/multilib-fix b/multilib-fix
new file mode 100755
index 0000000..ff39117
--- /dev/null
+++ b/multilib-fix
@@ -0,0 +1,170 @@
+#! /bin/sh
+
+# Replace the multilib-unclean header file with multilib-clean stub, while the
+# original file is moved to unique architecture-specific location.
+#
+# The solution is taken from Fedora PostgreSQL RPM package.
+#
+# Pavel Raiskup <praiskup(a)redhat.com>
+#
+# This file is to be moved into redhat-rpm-config (or something like this).
+
+progname=$(basename "$0")
+
+opt_arch=$(uname -i)
+# See rhbz#1242873 for more info.
+test "$opt_arch" = ppc64p7 && opt_arch=ppc64
+
+opt_destdir=
+opt_basename=
+opt_buildroot=$(pwd)
+opt_verbose=:
+opt_additional_suffix=
+
+# TODO: we could pretty easily implement other then 'cpp-header' stubs, if the
+# target file type allows some kind of "transparent" file inclusion. For
+# example shell scripts might use '. "${opt_destdir}/${opt_basename}_x86_64.sh'.
+print_stub ()
+{
+cat <<EOF
+/*
+ * Kluge to support multilib installation of both 32- and 64-bit RPMS:
+ * we need to arrange that header files that appear in both RPMs are
+ * identical. Hence, this file is architecture-independent and calls
+ * in an arch-dependent file that will appear in just one RPM.
+ *
+ * To avoid breaking arches not explicitly supported by Red Hat, we
+ * use this indirection file *only* on known multilib arches.
+ *
+ * Note: this may well fail if user tries to use gcc's -I- option.
+ * But that option is deprecated anyway.
+ */
+#if defined(__x86_64__)
+#include "${opt_basename}${opt_additional_suffix}_x86_64.h"
+#elif defined(__i386__)
+#include "${opt_basename}${opt_additional_suffix}_i386.h"
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#include "${opt_basename}${opt_additional_suffix}_ppc64.h"
+#elif defined(__ppc__) || defined(__powerpc__)
+#include "${opt_basename}${opt_additional_suffix}_ppc.h"
+#elif defined(__s390x__)
+#include "${opt_basename}${opt_additional_suffix}_s390x.h"
+#elif defined(__s390__)
+#include "${opt_basename}${opt_additional_suffix}_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "${opt_basename}${opt_additional_suffix}_sparc64.h"
+#elif defined(__sparc__)
+#include "${opt_basename}${opt_additional_suffix}_sparc.h"
+#endif
+EOF
+}
+
+print_help ()
+{
+ _h_exit=false
+ test -n "$1" && _h_exit=:
+
+ cat <<EOF
+Usage: $progname [OPTIONS]
+
+Replace the multilib-unclean header file with multilib-clean stub, while the
+original file is moved to unique architecture-specific location. This should be
+absolutely safe operation (effects of '#include <HEADER.h>' are unchanged.
+
+To allow us to do incompatible changes in this script, packagers should use this
+script only through %ml_fix_c_header wrapping macro.
+
+--destdir absolute path name where the old header file is stored, e.g.
+ /some/pat
+--basename when you deal with '/some/path/test.h', specify 'test'
+--buildroot prefix (directory where we play with installed files, usually
+ after 'make install DESTDIR=buildroot')
+--additional-suffix we usually move 'test.h' to 'test_\$ARCH.h'. However
+ this file could already exit. With this option the multilib
+ file will be named 'test_\$ARCH\$SUFFIX.h'
+--verbose print some useful information
+--help show this help
+EOF
+
+ $_h_exit && exit "$1"
+}
+
+verbose ()
+{
+ $opt_verbose && echo "INFO: $progname: $*"
+}
+
+die ()
+{
+ echo >&2 " # $*"
+ print_help 1
+}
+
+error ()
+{
+ error_occurred=:
+ echo >&2 " ! $*"
+}
+
+error_occurred=false
+
+while test $# -gt 0
+do
+ _opt=$1 ; shift
+ case $_opt in
+ --destdir)
+ opt_destdir=$1 ; shift || die "$_opt requires argument"
+ ;;
+ --basename)
+ opt_basename=$1 ; shift || die "$_opt require argument"
+ ;;
+ --buildroot)
+ opt_buildroot=$1 ; shift || die "$_opt require argument"
+ ;;
+ --arch)
+ opt_arch=$1 ; shift || die "$_opt require argument"
+ ;;
+ --additional-suffix)
+ opt_additional_suffix=$1 ; shift || die "$_opt require argument"
+ ;;
+ --help)
+ print_help 0
+ ;;
+ *)
+ error "unexpected '$_opt' program argument"
+ ;;
+ esac
+done
+$error_occurred && print_help 1
+
+for i in arch buildroot destdir basename
+do
+ eval "test -z \"\$opt_$i\"" && error "--$i needs to be set"
+done
+$error_occurred && print_help 1
+
+original_file="$opt_buildroot$opt_destdir/$opt_basename".h
+multilib_file="$opt_buildroot$opt_destdir/$opt_basename${opt_additional_suffix}_$opt_arch".h
+
+test -f "$original_file" || die "can't find '$original_file'"
+
+case $opt_arch in
+ # we only apply this to known Red Hat multilib arches, per bug #177564
+ i386|x86_64|ppc|ppc64|s390|s390x|sparc|sparc64)
+ ;;
+ *)
+ verbose "we don't need multilib haeder hack for '$opt_arch' architecture (no-op)"
+ exit 0
+ ;;
+esac
+
+verbose "moving: '$original_file' to '$multilib_file'"
+
+mv "$original_file" "$multilib_file" || exit 1
+if print_stub > "$original_file" && chmod 644 "$original_file"; then
+ :
+else
+ die "can't write into '$original_file'"
+fi
+
+:
diff --git a/pg_config.h b/pg_config.h
deleted file mode 100644
index 97ef2ba..0000000
--- a/pg_config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Kluge to support multilib installation of both 32- and 64-bit RPMS:
- * we need to arrange that header files that appear in both RPMs are
- * identical. Hence, this file is architecture-independent and calls
- * in an arch-dependent file that will appear in just one RPM.
- *
- * To avoid breaking arches not explicitly supported by Red Hat, we
- * use this indirection file *only* on known multilib arches.
- *
- * Note: this may well fail if user tries to use gcc's -I- option.
- * But that option is deprecated anyway.
- */
-#if defined(__x86_64__)
-#include "pg_config_x86_64.h"
-#elif defined(__i386__)
-#include "pg_config_i386.h"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#include "pg_config_ppc64.h"
-#elif defined(__ppc__) || defined(__powerpc__)
-#include "pg_config_ppc.h"
-#elif defined(__s390x__)
-#include "pg_config_s390x.h"
-#elif defined(__s390__)
-#include "pg_config_s390.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "pg_config_sparc64.h"
-#elif defined(__sparc__)
-#include "pg_config_sparc.h"
-#endif
diff --git a/postgresql.spec b/postgresql.spec
index da7e785..3035007 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -94,8 +94,7 @@ Source1: postgresql-%{version}-US.pdf
Source2: generate-pdf.sh
Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
Source4: Makefile.regress
-Source5: pg_config.h
-Source6: ecpg_config.h
+Source5: multilib-fix
Source9: postgresql.tmpfiles.d
Source10: postgresql.pam
Source11: postgresql-bashprofile
@@ -679,22 +678,14 @@ echo "%%%{name}_major %{majorversion}" > macros.%{name}
install -D -m 644 macros.%{name} \
$RPM_BUILD_ROOT%{macrosdir}/macros.%{name}
-# multilib header hack; note pg_config.h is installed in two places!
-# we only apply this to known Red Hat multilib arches, per bug #177564
-build_arch=`uname -i`
-test "$build_arch" = ppc64p7 && build_arch=ppc64
-case "$build_arch" in
- i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
- mv $RPM_BUILD_ROOT%{_includedir}/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pg_config_"$build_arch".h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/
- mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config_"$build_arch".h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/pgsql/server/
- mv $RPM_BUILD_ROOT%{_includedir}/ecpg_config.h $RPM_BUILD_ROOT%{_includedir}/ecpg_config_"$build_arch".h
- install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_includedir}/
- ;;
- *)
- ;;
-esac
+# multilib header hack; some headers are installed in two places!
+%global ml_fix_c_header %{SOURCE5} --buildroot "$RPM_BUILD_ROOT"
+for header in pg_config pg_config_ext ecpg_config; do
+%ml_fix_c_header --destdir "%{_includedir}" --basename "$header"
+done
+for header in pg_config pg_config_ext; do
+%ml_fix_c_header --destdir "%{_includedir}/pgsql/server" --basename "$header"
+done
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp -p src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
@@ -1195,6 +1186,7 @@ fi
%changelog
* Fri Oct 16 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-2
- devel package should not require the main package (rhbz#1272219)
+- multilib fix, more general solution (rhbz#1190346)
* Tue Oct 06 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-1
- update to 9.4.5 per release notes
commit 4034635788132a15909723ed0cb8905a69c2b3cd
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Oct 16 10:05:24 2015 +0200
devel: stop requiring 'postgresql' package
Resolves: rhbz#1272219
Version: 9.4.5-2
diff --git a/postgresql.spec b/postgresql.spec
index dfa8f3f..da7e785 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -261,7 +261,6 @@ included in the PostgreSQL distribution.
%package devel
Summary: PostgreSQL development header files and libraries
Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
@@ -917,7 +916,6 @@ fi
%{_bindir}/dropdb
%{_bindir}/droplang
%{_bindir}/dropuser
-%{_bindir}/pg_config
%{_bindir}/pg_dump
%{_bindir}/pg_dumpall
%{_bindir}/pg_isready
@@ -933,7 +931,6 @@ fi
%{_mandir}/man1/dropdb.*
%{_mandir}/man1/droplang.*
%{_mandir}/man1/dropuser.*
-%{_mandir}/man1/pg_config.*
%{_mandir}/man1/pg_dump.*
%{_mandir}/man1/pg_dumpall.*
%{_mandir}/man1/pg_isready.*
@@ -1140,6 +1137,7 @@ fi
%files devel -f devel.lst
%{_bindir}/ecpg
+%{_bindir}/pg_config
%{_includedir}/*
%{_libdir}/libecpg.so
%{_libdir}/libecpg_compat.so
@@ -1148,6 +1146,7 @@ fi
%{_libdir}/pgsql/pgxs/
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man1/ecpg.*
+%{_mandir}/man1/pg_config.*
%{_mandir}/man3/SPI_*
%{macrosdir}/*
@@ -1194,6 +1193,9 @@ fi
%endif
%changelog
+* Fri Oct 16 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-2
+- devel package should not require the main package (rhbz#1272219)
+
* Tue Oct 06 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-1
- update to 9.4.5 per release notes
http://www.postgresql.org/docs/9.4/static/release-9-4-5.html
commit 5cf6330f38969072488dcd4bd7324d746c885473
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Oct 6 15:23:21 2015 +0200
rebase: minor release update
Per release notes:
http://www.postgresql.org/docs/9.4/static/release-9-4-5.html
Version: 9.4.5-1
diff --git a/.gitignore b/.gitignore
index b135bfb..3c64661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/postgresql-setup-3.4.tar.gz
-/postgresql-9.3.9.tar.bz2
-/postgresql-9.3.9.tar.bz2.sha256
-/postgresql-9.4.4.tar.bz2
-/postgresql-9.4.4.tar.bz2.sha256
-/postgresql-9.4.4-US.pdf
+/postgresql-9.3.10.tar.bz2
+/postgresql-9.3.10.tar.bz2.sha256
+/postgresql-9.4.5.tar.bz2
+/postgresql-9.4.5.tar.bz2.sha256
+/postgresql-9.4.5-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 2aecc04..dfa8f3f 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
-Version: 9.4.4
-Release: 6%{?dist}
+Version: 9.4.5
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.3.9
+%global prevversion 9.3.10
%global prevmajorversion 9.3
%global setup_version 3.4
@@ -1194,6 +1194,10 @@ fi
%endif
%changelog
+* Tue Oct 06 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.5-1
+- update to 9.4.5 per release notes
+ http://www.postgresql.org/docs/9.4/static/release-9-4-5.html
+
* Fri Sep 25 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-6
- postgresql-setup rebase to 3.4 (rhbz#1265319, rhbz#1247477)
diff --git a/sources b/sources
index a681b30..bd51589 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
1b04cb359940bcc21ca4512c67e83290 postgresql-setup-3.4.tar.gz
-41cd45d8f9d32c900ff5dafb5946d31f postgresql-9.3.9.tar.bz2
-ed0fab6010385125b11758ace4d4c08f postgresql-9.3.9.tar.bz2.sha256
-1fe952c44ed26d7e6a335cf991a9c1c6 postgresql-9.4.4.tar.bz2
-e722b142f3520609443fe77665481076 postgresql-9.4.4.tar.bz2.sha256
-665f27795673fb0d73184e44d7604b23 postgresql-9.4.4-US.pdf
+ec2365548d08f69c8023eddd4f2d1a28 postgresql-9.3.10.tar.bz2
+4097024cab41374aac237bb11293ca36 postgresql-9.3.10.tar.bz2.sha256
+8b2e3472a8dc786649b4d02d02e039a0 postgresql-9.4.5.tar.bz2
+8d83dbba546035e37e84c8c9fa31e426 postgresql-9.4.5.tar.bz2.sha256
+59316c39552a081955cc50cfadad24e0 postgresql-9.4.5-US.pdf
commit b66f190455bc107029a053a736d45912854f1729
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Sep 25 13:54:46 2015 +0200
postgresql-setup: rebase to 3.4
Resolves: rhbz#1265319, rhbz#1247477
Version: 9.4.4-6
diff --git a/.gitignore b/.gitignore
index 46d4c11..b135bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/postgresql-setup-3.3.tar.gz
+/postgresql-setup-3.4.tar.gz
/postgresql-9.3.9.tar.bz2
/postgresql-9.3.9.tar.bz2.sha256
/postgresql-9.4.4.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 8db5673..2aecc04 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -85,7 +85,7 @@ Url: http://www.postgresql.org/
%global prevversion 9.3.9
%global prevmajorversion 9.3
-%global setup_version 3.3
+%global setup_version 3.4
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -122,7 +122,7 @@ Patch7: postgresql-perl-5.22-test-fail.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
-BuildRequires: systemd-units
+BuildRequires: systemd-units util-linux
# postgresql-setup build requires
BuildRequires: m4 elinks docbook-utils help2man
@@ -1194,6 +1194,9 @@ fi
%endif
%changelog
+* Fri Sep 25 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-6
+- postgresql-setup rebase to 3.4 (rhbz#1265319, rhbz#1247477)
+
* Thu Sep 17 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-5
- enable hardening (safe for kernel 4.1+) (see rhbz#952946 comment #24)
diff --git a/sources b/sources
index 3c534dc..a681b30 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-4333e467db490f5721452640d2bf9cd2 postgresql-setup-3.3.tar.gz
+1b04cb359940bcc21ca4512c67e83290 postgresql-setup-3.4.tar.gz
41cd45d8f9d32c900ff5dafb5946d31f postgresql-9.3.9.tar.bz2
ed0fab6010385125b11758ace4d4c08f postgresql-9.3.9.tar.bz2.sha256
1fe952c44ed26d7e6a335cf991a9c1c6 postgresql-9.4.4.tar.bz2
commit 72ca6afc2a7d6584808e3167a438b0df744b26cb
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Sep 17 11:13:36 2015 +0200
build: enable hardened build
https://bugzilla.redhat.com/show_bug.cgi?id=952946#c25
Resolves: rhbz#947022
Version: 9.4.4-5
diff --git a/postgresql.spec b/postgresql.spec
index 942cbb1..8db5673 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,10 +53,6 @@
%{!?selinux:%global selinux 1}
%{!?runselftest:%global runselftest 1}
-# do not fail on 32-bit architectures with globally enabled hardening, see the
-# FESCO ticket #1384 and rhbz#947022 for more info.
-%undefine _hardened_build
-
# By default, patch(1) creates backup files when chunks apply with offsets.
# Turn that off to ensure such files don't get included in RPMs.
%global _default_patch_flags --no-backup-if-mismatch
@@ -71,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1198,6 +1194,9 @@ fi
%endif
%changelog
+* Thu Sep 17 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-5
+- enable hardening (safe for kernel 4.1+) (see rhbz#952946 comment #24)
+
* Tue Aug 04 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-4
- install README.rpm-dist properly (rhbz#1249708)
commit a037a895022d3fd8957508d1c53bb6f37fe7e1c9
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Aug 4 12:50:04 2015 +0200
spec: install README.rpm-dist properly
Resolves: rhbz#1249708
Version: 9.4.4-4
diff --git a/postgresql.spec b/postgresql.spec
index ff18031..942cbb1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -71,7 +71,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -650,11 +650,8 @@ cd postgresql-setup-%{setup_version}
make install DESTDIR=$RPM_BUILD_ROOT
cd ..
-# For some reson, specifying %doc %{_pkgdocdir}/README.rpm-dist in %files does
-# not work (at least on RHEL6) and rpmbuild fails with (it may be known issue
-# but I was unable to debug properly yet):
-# error: create archive failed on file
-# /builddir/.../...-9.4.1/README.rpm-dist: cpio: Bad magic
+# For some reason, having '%%doc %%{_pkgdocdir}/README.rpm-dist' in %%files
+# causes FTBFS (at least on RHEL6), see rhbz#1250006.
cp $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
@@ -916,6 +913,7 @@ fi
%files -f main.lst
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
%doc COPYRIGHT README HISTORY doc/bug.template
+%doc README.rpm-dist
%{_bindir}/clusterdb
%{_bindir}/createdb
%{_bindir}/createlang
@@ -1200,6 +1198,9 @@ fi
%endif
%changelog
+* Tue Aug 04 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-4
+- install README.rpm-dist properly (rhbz#1249708)
+
* Tue Jul 14 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-3
- revert/fix part of e6acde1a9 commit related to multilib hack (rhbz#1242873)
commit 31524fb5ac54226b47340e5d82606561fe69f100
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jul 14 13:40:51 2015 +0200
multilib: fix wrong arch classification
This partly reverts e6acde1a9 commit where is no clear
justification why the change was actually done. Because the
pg_config.h was not ready for ppc64p7 and aarch64 -- it was clear
breakage. In 1242873 discussion, it appeared that ppc64p7 needs
special handling as it is compatible/equivalent with ppc64.
Resolves: rhbz#1242873
Version: 9.4.4-3
diff --git a/postgresql.spec b/postgresql.spec
index 7734d49..ff18031 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -71,7 +71,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -689,13 +689,15 @@ install -D -m 644 macros.%{name} \
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
-case `uname -i` in
- i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 | aarch64 )
- mv $RPM_BUILD_ROOT%{_includedir}/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pg_config_`uname -i`.h
+build_arch=`uname -i`
+test "$build_arch" = ppc64p7 && build_arch=ppc64
+case "$build_arch" in
+ i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
+ mv $RPM_BUILD_ROOT%{_includedir}/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pg_config_"$build_arch".h
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/
- mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config_`uname -i`.h
+ mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config_"$build_arch".h
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/pgsql/server/
- mv $RPM_BUILD_ROOT%{_includedir}/ecpg_config.h $RPM_BUILD_ROOT%{_includedir}/ecpg_config_`uname -i`.h
+ mv $RPM_BUILD_ROOT%{_includedir}/ecpg_config.h $RPM_BUILD_ROOT%{_includedir}/ecpg_config_"$build_arch".h
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_includedir}/
;;
*)
@@ -1198,6 +1200,9 @@ fi
%endif
%changelog
+* Tue Jul 14 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-3
+- revert/fix part of e6acde1a9 commit related to multilib hack (rhbz#1242873)
+
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 9e3e9192dcb98b67398dbc63012fc34a5af461a4
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jun 18 15:41:44 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 527c0d5..7734d49 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -71,7 +71,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1198,6 +1198,9 @@ fi
%endif
%changelog
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Mon Jun 15 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-1
- fix for Perl 5.22 rebase (rhbz#1231279)
commit 71849163567e19f0f30d419586875511f022ac63
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Jun 15 09:36:54 2015 +0200
tests: fix failure for Perl 5.22
Resolves: rhbz#1231279
Version: 9.4.4-1
diff --git a/postgresql-perl-5.22-test-fail.patch b/postgresql-perl-5.22-test-fail.patch
new file mode 100644
index 0000000..345c16d
--- /dev/null
+++ b/postgresql-perl-5.22-test-fail.patch
@@ -0,0 +1,18 @@
+Upstream report:
+http://www.postgresql.org/message-id/flat/55739876.5010403@gmx.net
+
+diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
+index c447fa2..0932fde 100644
+--- a/src/pl/plperl/expected/plperl_elog.out
++++ b/src/pl/plperl/expected/plperl_elog.out
+@@ -36,8 +36,8 @@ create or replace function uses_global() returns text language plperl as $$
+ return 'uses_global worked';
+
+ $$;
+-ERROR: Global symbol "$global" requires explicit package name at line 3.
+-Global symbol "$other_global" requires explicit package name at line 4.
++ERROR: Global symbol "$global" requires explicit package name (did you forget to declare "my $global"?) at line 3.
++Global symbol "$other_global" requires explicit package name (did you forget to declare "my $other_global"?) at line 4.
+ CONTEXT: compilation of PL/Perl function "uses_global"
+ select uses_global();
+ ERROR: function uses_global() does not exist
diff --git a/postgresql.spec b/postgresql.spec
index cbd46d6..527c0d5 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -121,6 +121,7 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+Patch7: postgresql-perl-5.22-test-fail.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -361,6 +362,7 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1196,6 +1198,9 @@ fi
%endif
%changelog
+* Mon Jun 15 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-1
+- fix for Perl 5.22 rebase (rhbz#1231279)
+
* Thu Jun 11 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-1
- update to 9.4.4 per release notes
http://www.postgresql.org/docs/9.4/static/release-9-4-4.html
commit 295849a9b5f45f5151c317d7019065555f21ba82
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jun 11 15:04:17 2015 +0200
rebase: minor release update
Per release notes:
http://www.postgresql.org/docs/9.4/static/release-9-4-4.html
Version: 9.4.4-1
diff --git a/.gitignore b/.gitignore
index 1b4cfde..46d4c11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/postgresql-setup-3.3.tar.gz
-/postgresql-9.3.8.tar.bz2
-/postgresql-9.3.8.tar.bz2.sha256
-/postgresql-9.4.3.tar.bz2
-/postgresql-9.4.3.tar.bz2.sha256
-/postgresql-9.4.3-US.pdf
+/postgresql-9.3.9.tar.bz2
+/postgresql-9.3.9.tar.bz2.sha256
+/postgresql-9.4.4.tar.bz2
+/postgresql-9.4.4.tar.bz2.sha256
+/postgresql-9.4.4-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index a2bc799..cbd46d6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -70,8 +70,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
-Version: 9.4.3
-Release: 2%{?dist}
+Version: 9.4.4
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -86,7 +86,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.3.8
+%global prevversion 9.3.9
%global prevmajorversion 9.3
%global setup_version 3.3
@@ -1196,6 +1196,10 @@ fi
%endif
%changelog
+* Thu Jun 11 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.4-1
+- update to 9.4.4 per release notes
+ http://www.postgresql.org/docs/9.4/static/release-9-4-4.html
+
* Sat Jun 06 2015 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.4.3-2
- Perl 5.22 rebuild
diff --git a/sources b/sources
index 69ec941..3c534dc 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
4333e467db490f5721452640d2bf9cd2 postgresql-setup-3.3.tar.gz
-a12d0aa39a6c238c938ed0158bf0f21a postgresql-9.3.8.tar.bz2
-0ab49ab68c4feacee9af109a2185e717 postgresql-9.3.8.tar.bz2.sha256
-05217e0921b51fb886e9e50875776bf1 postgresql-9.4.3.tar.bz2
-a39d989a86479f71242e2b82739d37b5 postgresql-9.4.3.tar.bz2.sha256
-8b8198dbbe975990dd50892ddbc25bb1 postgresql-9.4.3-US.pdf
+41cd45d8f9d32c900ff5dafb5946d31f postgresql-9.3.9.tar.bz2
+ed0fab6010385125b11758ace4d4c08f postgresql-9.3.9.tar.bz2.sha256
+1fe952c44ed26d7e6a335cf991a9c1c6 postgresql-9.4.4.tar.bz2
+e722b142f3520609443fe77665481076 postgresql-9.4.4.tar.bz2.sha256
+665f27795673fb0d73184e44d7604b23 postgresql-9.4.4-US.pdf
commit 0729cbe4352a8296ae2cf7dae079ba5f5ea3e90c
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Sat Jun 6 18:24:03 2015 +0200
Perl 5.22 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 2c3da2a..a2bc799 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -71,7 +71,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1196,6 +1196,9 @@ fi
%endif
%changelog
+* Sat Jun 06 2015 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.4.3-2
+- Perl 5.22 rebuild
+
* Wed Jun 03 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.3-1
- update to 9.4.3 per release notes
http://www.postgresql.org/docs/9.4/static/release-9-4-3.html
commit 68a237cd75eef206770c4216ddd235f47e25e458
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Wed Jun 3 10:36:46 2015 +0200
rebase: minor release update
Per release notes:
http://www.postgresql.org/docs/9.4/static/release-9-4-3.html
Version: 9.4.3-1
diff --git a/.gitignore b/.gitignore
index 70a8382..1b4cfde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/postgresql-setup-3.3.tar.gz
-/postgresql-9.3.7.tar.bz2
-/postgresql-9.3.7.tar.bz2.sha256
-/postgresql-9.4.2.tar.bz2
-/postgresql-9.4.2.tar.bz2.sha256
-/postgresql-9.4.2-US.pdf
+/postgresql-9.3.8.tar.bz2
+/postgresql-9.3.8.tar.bz2.sha256
+/postgresql-9.4.3.tar.bz2
+/postgresql-9.4.3.tar.bz2.sha256
+/postgresql-9.4.3-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 50ff969..2c3da2a 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -70,7 +70,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
-Version: 9.4.2
+Version: 9.4.3
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -86,7 +86,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.3.7
+%global prevversion 9.3.8
%global prevmajorversion 9.3
%global setup_version 3.3
@@ -1196,6 +1196,10 @@ fi
%endif
%changelog
+* Wed Jun 03 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.3-1
+- update to 9.4.3 per release notes
+ http://www.postgresql.org/docs/9.4/static/release-9-4-3.html
+
* Thu May 21 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.2-1
- update to 9.4.2 per release notes
http://www.postgresql.org/docs/9.4/static/release-9-4-2.html
diff --git a/sources b/sources
index 73b3c99..69ec941 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
4333e467db490f5721452640d2bf9cd2 postgresql-setup-3.3.tar.gz
-662c0d7f0ec5ffcb1a9af5c83f41d0a2 postgresql-9.3.7.tar.bz2
-2dd3a08d74ab97b019b8965318ea10d1 postgresql-9.3.7.tar.bz2.sha256
-b6369156607a4fd88f21af6fec0f30b9 postgresql-9.4.2.tar.bz2
-30cbd22e3c4bc5cd9218f78915d3c1e4 postgresql-9.4.2.tar.bz2.sha256
-f44d105db0bf6a658c14ba83a3dbee43 postgresql-9.4.2-US.pdf
+a12d0aa39a6c238c938ed0158bf0f21a postgresql-9.3.8.tar.bz2
+0ab49ab68c4feacee9af109a2185e717 postgresql-9.3.8.tar.bz2.sha256
+05217e0921b51fb886e9e50875776bf1 postgresql-9.4.3.tar.bz2
+a39d989a86479f71242e2b82739d37b5 postgresql-9.4.3.tar.bz2.sha256
+8b8198dbbe975990dd50892ddbc25bb1 postgresql-9.4.3-US.pdf
commit e66ec66d19e4c66c72a8d22a612497df08b3dba5
Author: Jozef Mlch <jmlich(a)redhat.com>
Date: Fri May 22 01:05:44 2015 +0200
rebase: minor release update
Per release notes:
http://www.postgresql.org/docs/9.4/static/release-9-4-2.html
Version: 9.4.2-1
diff --git a/.gitignore b/.gitignore
index 3be6bf4..70a8382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/postgresql-setup-3.3.tar.gz
-/postgresql-9.4.1.tar.bz2
-/postgresql-9.4.1.tar.bz2.sha256
-/postgresql-9.4.1-US.pdf
-/postgresql-9.3.6.tar.bz2
-/postgresql-9.3.6.tar.bz2.sha256
+/postgresql-9.3.7.tar.bz2
+/postgresql-9.3.7.tar.bz2.sha256
+/postgresql-9.4.2.tar.bz2
+/postgresql-9.4.2.tar.bz2.sha256
+/postgresql-9.4.2-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index aa7e6ab..50ff969 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -70,8 +70,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
-Version: 9.4.1
-Release: 4%{?dist}
+Version: 9.4.2
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -86,7 +86,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.3.6
+%global prevversion 9.3.7
%global prevmajorversion 9.3
%global setup_version 3.3
@@ -1196,6 +1196,10 @@ fi
%endif
%changelog
+* Thu May 21 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.2-1
+- update to 9.4.2 per release notes
+ http://www.postgresql.org/docs/9.4/static/release-9-4-2.html
+
* Thu May 21 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.1-4
- make the %%check phase more verbose for FAIL cases
- don't FTBFS on f23+ where hardening is on by default
diff --git a/sources b/sources
index fdd7173..73b3c99 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
4333e467db490f5721452640d2bf9cd2 postgresql-setup-3.3.tar.gz
-2cf30f50099ff1109d0aa517408f8eff postgresql-9.4.1.tar.bz2
-5da9a8b75e0a18841f561049b1e670bd postgresql-9.4.1.tar.bz2.sha256
-940a0ef3c49e19678e59a9a6b6ee143e postgresql-9.4.1-US.pdf
-0212b03f2835fdd33126a2e70996be8e postgresql-9.3.6.tar.bz2
-c1165aaee36fed892b2bcc154999e9a8 postgresql-9.3.6.tar.bz2.sha256
+662c0d7f0ec5ffcb1a9af5c83f41d0a2 postgresql-9.3.7.tar.bz2
+2dd3a08d74ab97b019b8965318ea10d1 postgresql-9.3.7.tar.bz2.sha256
+b6369156607a4fd88f21af6fec0f30b9 postgresql-9.4.2.tar.bz2
+30cbd22e3c4bc5cd9218f78915d3c1e4 postgresql-9.4.2.tar.bz2.sha256
+f44d105db0bf6a658c14ba83a3dbee43 postgresql-9.4.2-US.pdf
commit 3c624ca2d86a800e575ca8fc4fb4b963cc30ad5d
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri May 22 00:04:38 2015 +0200
build: disable hardening
Version: 9.4.1-4
diff --git a/postgresql.spec b/postgresql.spec
index 04faf7f..aa7e6ab 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,6 +53,10 @@
%{!?selinux:%global selinux 1}
%{!?runselftest:%global runselftest 1}
+# do not fail on 32-bit architectures with globally enabled hardening, see the
+# FESCO ticket #1384 and rhbz#947022 for more info.
+%undefine _hardened_build
+
# By default, patch(1) creates backup files when chunks apply with offsets.
# Turn that off to ensure such files don't get included in RPMs.
%global _default_patch_flags --no-backup-if-mismatch
@@ -1194,6 +1198,7 @@ fi
%changelog
* Thu May 21 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.1-4
- make the %%check phase more verbose for FAIL cases
+- don't FTBFS on f23+ where hardening is on by default
* Wed Mar 25 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.1-3
- update to postgresql-setup 3.3
commit 3120db36c465fa3f51f755e099de1994f6542e17
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu May 21 23:57:49 2015 +0200
check: be more verbose if something failed
Version: 9.4.1-4
diff --git a/postgresql.spec b/postgresql.spec
index b32e8f6..04faf7f 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -571,7 +571,8 @@ run_testsuite()
(
set +x
- find "$1" -name 'regression.diffs' | \
+ echo "=== trying to find all regression.diffs files in build directory ==="
+ find -name 'regression.diffs' | \
while read line; do
echo "=== make failure: $line ==="
cat "$line"
@@ -1191,6 +1192,9 @@ fi
%endif
%changelog
+* Thu May 21 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.1-4
+- make the %%check phase more verbose for FAIL cases
+
* Wed Mar 25 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.1-3
- update to postgresql-setup 3.3
commit e6acde1a903c7360ec92d8fd61021888144212f7
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Mar 26 09:44:50 2015 +0100
Using rpm macros instead of hard wired paths; Adding aarch64, ppc64p7
diff --git a/postgresql.spec b/postgresql.spec
index 759838d..b32e8f6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -683,13 +683,13 @@ install -D -m 644 macros.%{name} \
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in
- i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
- mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
- mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
- mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
- install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/usr/include/
+ i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 | aarch64 )
+ mv $RPM_BUILD_ROOT%{_includedir}/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pg_config_`uname -i`.h
+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/
+ mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config.h $RPM_BUILD_ROOT%{_includedir}/pgsql/server/pg_config_`uname -i`.h
+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/pgsql/server/
+ mv $RPM_BUILD_ROOT%{_includedir}/ecpg_config.h $RPM_BUILD_ROOT%{_includedir}/ecpg_config_`uname -i`.h
+ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_includedir}/
;;
*)
;;
commit 08eb70537031837fa9ac2e25cf116548506a324e
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Mar 26 09:43:26 2015 +0100
Update of postgresql-setup to 3.3
diff --git a/.gitignore b/.gitignore
index 3783e65..3be6bf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/postgresql-setup-2.0.tar.gz
+/postgresql-setup-3.3.tar.gz
/postgresql-9.4.1.tar.bz2
/postgresql-9.4.1.tar.bz2.sha256
/postgresql-9.4.1-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index c86d25a..759838d 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -85,7 +85,7 @@ Url: http://www.postgresql.org/
%global prevversion 9.3.6
%global prevmajorversion 9.3
-%global setup_version 2.0
+%global setup_version 3.3
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -123,6 +123,9 @@ BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
BuildRequires: systemd-units
+# postgresql-setup build requires
+BuildRequires: m4 elinks docbook-utils help2man
+
%if %plpython
BuildRequires: python-devel
%endif
@@ -394,18 +397,14 @@ find . -type f -name .gitignore | xargs rm
cd postgresql-setup-%{setup_version}
-export POSTGRES_BIN=%{_bindir}/postgres \
- PG_CTL_BIN=%{_bindir}/pg_ctl \
- PGVERSION=%{version} \
- PGMAJORVERSION=%{majorversion} \
- PGENGINE=%{_bindir} \
- PREVMAJORVERSION=%{prevmajorversion} \
- PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin \
- README_DIST=%{_pkgdocdir}/README.rpm-dist \
- PKGCONFIG_DIR=%{_sysconfdir}/postgresql
%configure \
- --docdir=%{_pkgdocdir}
-
+ pgdocdir=%{_pkgdocdir} \
+ systemdunitsdir=%{_prefix}/lib/systemd/system \
+ systemduserunitsdir=%{_sysconfdir}/systemd/system \
+ systemdlegacyscriptsdir=%{_libexecdir}/initscripts/legacy-actions \
+ PGVERSION=%{version} \
+ PGMAJORVERSION=%{majorversion} \
+ NAME_DEFAULT_PREV_SERVICE=postgresql
make %{?_smp_mflags}
cd ..
@@ -644,6 +643,23 @@ cd postgresql-setup-%{setup_version}
make install DESTDIR=$RPM_BUILD_ROOT
cd ..
+# For some reson, specifying %doc %{_pkgdocdir}/README.rpm-dist in %files does
+# not work (at least on RHEL6) and rpmbuild fails with (it may be known issue
+# but I was unable to debug properly yet):
+# error: create archive failed on file
+# /builddir/.../...-9.4.1/README.rpm-dist: cpio: Bad magic
+cp $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./
+
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<EOF
+id postgresql
+major %{prevmajorversion}
+data_default %{_localstatedir}/pgsql/data
+engine %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin
+description "Upgrade data from system PostgreSQL version (PostgreSQL %{prevmajorversion})"
+redhat_sockets_hack no
+EOF
+
+
make DESTDIR=$RPM_BUILD_ROOT install-world
%if %plpython3
@@ -1084,6 +1100,7 @@ fi
%{_datadir}/pgsql/system_views.sql
%{_datadir}/pgsql/timezonesets/
%{_datadir}/pgsql/tsearch_data/
+%{_datadir}/postgresql-setup/library.sh
%{_libdir}/pgsql/*_and_*.so
%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/euc2004_sjis2004.so
@@ -1094,6 +1111,9 @@ fi
%{_libexecdir}/initscripts/legacy-actions/postgresql/*
%{_libexecdir}/postgresql-check-db-dir
%{_libexecdir}/postgresql-ctl
+%dir %{_sysconfdir}/postgresql-setup
+%dir %{_sysconfdir}/postgresql-setup/upgrade
+%config %{_sysconfdir}/postgresql-setup/upgrade/*.conf
%{_mandir}/man1/initdb.*
%{_mandir}/man1/pg_basebackup.*
%{_mandir}/man1/pg_controldata.*
@@ -1171,6 +1191,9 @@ fi
%endif
%changelog
+* Wed Mar 25 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.1-3
+- update to postgresql-setup 3.3
+
* Thu Mar 19 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.1-2
- Adding tcl-pgtcl into Requires of -tcl subpackage
diff --git a/sources b/sources
index 9839844..fdd7173 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-8323008e726a84d76c3153ed68357576 postgresql-setup-2.0.tar.gz
+4333e467db490f5721452640d2bf9cd2 postgresql-setup-3.3.tar.gz
2cf30f50099ff1109d0aa517408f8eff postgresql-9.4.1.tar.bz2
5da9a8b75e0a18841f561049b1e670bd postgresql-9.4.1.tar.bz2.sha256
940a0ef3c49e19678e59a9a6b6ee143e postgresql-9.4.1-US.pdf
commit 58e1c1f5adc1a064becb45f295b05a3dfa10fc78
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Mar 19 16:55:44 2015 +0100
Adding tcl-pgtcl into Requires of -tcl subpackage
diff --git a/postgresql.spec b/postgresql.spec
index 5498d85..c86d25a 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -324,6 +324,7 @@ Install this if you want to write database functions in Python 3.
Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Requires: tcl-pgtcl
%description pltcl
The postgresql-pltcl package contains the PL/Tcl procedural language,
@@ -1170,6 +1171,9 @@ fi
%endif
%changelog
+* Thu Mar 19 2015 Jozef Mlich <jmlich(a)redhat.com> - 9.4.1-2
+- Adding tcl-pgtcl into Requires of -tcl subpackage
+
* Wed Feb 04 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.1-1
- update to 9.4.1 per release notes
http://www.postgresql.org/docs/9.4/static/release-9-4-1.html
commit ab286396f62217bb207a487a1c0aada1bb5eaaa4
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Feb 4 08:44:53 2015 +0100
rebase: minor release update
Per release notes:
http://www.postgresql.org/docs/9.4/static/release-9-4-1.html
Version: 9.4.1-1
diff --git a/.gitignore b/.gitignore
index 393b256..3783e65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,6 @@
-/postgresql-9.3.5.tar.bz2
-/postgresql-9.3.5.tar.bz2.sha256
-/postgresql-9.2.9.tar.bz2
-/postgresql-9.2.9.tar.bz2.sha256
-/postgresql-9.3.5-US.pdf
-/postgresql-setup-1.0.0.tar.gz
-/postgresql-9.3.5.tar.bz2
-/postgresql-9.3.5.tar.bz2.sha256
-/postgresql-9.4.0.tar.bz2
-/postgresql-9.4.0.tar.bz2.sha256
-/postgresql-9.4.0-US.pdf
/postgresql-setup-2.0.tar.gz
+/postgresql-9.4.1.tar.bz2
+/postgresql-9.4.1.tar.bz2.sha256
+/postgresql-9.4.1-US.pdf
+/postgresql-9.3.6.tar.bz2
+/postgresql-9.3.6.tar.bz2.sha256
diff --git a/postgresql.spec b/postgresql.spec
index 4d6fb6b..5498d85 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
-Version: 9.4.0
-Release: 2%{?dist}
+Version: 9.4.1
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.3.5
+%global prevversion 9.3.6
%global prevmajorversion 9.3
%global setup_version 2.0
@@ -1170,6 +1170,10 @@ fi
%endif
%changelog
+* Wed Feb 04 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.1-1
+- update to 9.4.1 per release notes
+ http://www.postgresql.org/docs/9.4/static/release-9-4-1.html
+
* Tue Feb 03 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.0-2
- sort file lists alphabetically
diff --git a/sources b/sources
index 6fee261..9839844 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-5059857c7d7e6ad83b6d55893a121b59 postgresql-9.3.5.tar.bz2
-60b858fb6c7e06bf05a9c5f4dc5a8932 postgresql-9.3.5.tar.bz2.sha256
-8cd6e33e1f8d4d2362c8c08bd0e8802b postgresql-9.4.0.tar.bz2
-79cca88e8a3932bfacda97253d893502 postgresql-9.4.0.tar.bz2.sha256
-c0d073b2c9d0ba587ba6f6634210ff5c postgresql-9.4.0-US.pdf
8323008e726a84d76c3153ed68357576 postgresql-setup-2.0.tar.gz
+2cf30f50099ff1109d0aa517408f8eff postgresql-9.4.1.tar.bz2
+5da9a8b75e0a18841f561049b1e670bd postgresql-9.4.1.tar.bz2.sha256
+940a0ef3c49e19678e59a9a6b6ee143e postgresql-9.4.1-US.pdf
+0212b03f2835fdd33126a2e70996be8e postgresql-9.3.6.tar.bz2
+c1165aaee36fed892b2bcc154999e9a8 postgresql-9.3.6.tar.bz2.sha256
commit 3ca08a72e802d5e15c1accc8987cc1eacaf06f0a
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Feb 4 07:32:08 2015 +0100
spec: sort %files lists (LANG=C sort)
Also substitute some hardwired paths with predefined macros.
Simplify tests a bit.
Version: 9.4.0-2
diff --git a/postgresql.spec b/postgresql.spec
index 8f5ee4e..4d6fb6b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.4
Version: 9.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -905,6 +905,7 @@ fi
%{_bindir}/psql
%{_bindir}/reindexdb
%{_bindir}/vacuumdb
+%dir %{_libdir}/pgsql
%{_mandir}/man1/clusterdb.*
%{_mandir}/man1/createdb.*
%{_mandir}/man1/createlang.*
@@ -921,14 +922,22 @@ fi
%{_mandir}/man1/reindexdb.*
%{_mandir}/man1/vacuumdb.*
%{_mandir}/man7/*
-%dir %{_libdir}/pgsql
%files docs
%doc *-US.pdf
-%{_libdir}/pgsql/tutorial/
%doc doc/html
+%{_libdir}/pgsql/tutorial/
%files contrib
+%doc contrib/spi/*.example
+%{_bindir}/oid2name
+%{_bindir}/pg_archivecleanup
+%{_bindir}/pg_standby
+%{_bindir}/pg_test_fsync
+%{_bindir}/pg_test_timing
+%{_bindir}/pg_xlogdump
+%{_bindir}/pgbench
+%{_bindir}/vacuumlo
%{_datadir}/pgsql/extension/adminpack*
%{_datadir}/pgsql/extension/autoinc*
%{_datadir}/pgsql/extension/btree_gin*
@@ -952,13 +961,13 @@ fi
%{_datadir}/pgsql/extension/moddatetime*
%{_datadir}/pgsql/extension/pageinspect*
%{_datadir}/pgsql/extension/pg_buffercache*
-%{_datadir}/pgsql/extension/pgcrypto*
%{_datadir}/pgsql/extension/pg_freespacemap*
%{_datadir}/pgsql/extension/pg_prewarm*
-%{_datadir}/pgsql/extension/pgrowlocks*
%{_datadir}/pgsql/extension/pg_stat_statements*
-%{_datadir}/pgsql/extension/pgstattuple*
%{_datadir}/pgsql/extension/pg_trgm*
+%{_datadir}/pgsql/extension/pgcrypto*
+%{_datadir}/pgsql/extension/pgrowlocks*
+%{_datadir}/pgsql/extension/pgstattuple*
%{_datadir}/pgsql/extension/postgres_fdw*
%{_datadir}/pgsql/extension/refint*
%{_datadir}/pgsql/extension/seg*
@@ -970,6 +979,7 @@ fi
%{_datadir}/pgsql/extension/tsearch2*
%{_datadir}/pgsql/extension/unaccent*
%{_datadir}/pgsql/extension/worker_spi*
+%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/adminpack.so
%{_libdir}/pgsql/auth_delay.so
%{_libdir}/pgsql/auto_explain.so
@@ -988,7 +998,6 @@ fi
%{_libdir}/pgsql/fuzzystrmatch.so
%{_libdir}/pgsql/hstore.so
%{_libdir}/pgsql/insert_username.so
-%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/isn.so
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
@@ -996,12 +1005,12 @@ fi
%{_libdir}/pgsql/pageinspect.so
%{_libdir}/pgsql/passwordcheck.so
%{_libdir}/pgsql/pg_buffercache.so
-%{_libdir}/pgsql/pgcrypto.so
%{_libdir}/pgsql/pg_freespacemap.so
-%{_libdir}/pgsql/pgrowlocks.so
%{_libdir}/pgsql/pg_stat_statements.so
-%{_libdir}/pgsql/pgstattuple.so
%{_libdir}/pgsql/pg_trgm.so
+%{_libdir}/pgsql/pgcrypto.so
+%{_libdir}/pgsql/pgrowlocks.so
+%{_libdir}/pgsql/pgstattuple.so
%{_libdir}/pgsql/postgres_fdw.so
%{_libdir}/pgsql/refint.so
%{_libdir}/pgsql/seg.so
@@ -1014,6 +1023,16 @@ fi
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/unaccent.so
%{_libdir}/pgsql/worker_spi.so
+%{_mandir}/man1/oid2name.*
+%{_mandir}/man1/pg_archivecleanup.*
+%{_mandir}/man1/pg_recvlogical.*
+%{_mandir}/man1/pg_standby.*
+%{_mandir}/man1/pg_test_fsync.*
+%{_mandir}/man1/pg_test_timing.*
+%{_mandir}/man1/pg_xlogdump.*
+%{_mandir}/man1/pgbench.*
+%{_mandir}/man1/vacuumlo.*
+%{_mandir}/man3/dblink*
%if %selinux
%{_datadir}/pgsql/contrib/sepgsql.sql
%{_libdir}/pgsql/sepgsql.so
@@ -1030,41 +1049,15 @@ fi
%{_datadir}/pgsql/extension/xml2*
%{_libdir}/pgsql/pgxml.so
%endif
-%{_bindir}/oid2name
-%{_bindir}/pg_archivecleanup
-%{_bindir}/pg_standby
-%{_bindir}/pg_test_fsync
-%{_bindir}/pg_test_timing
-%{_bindir}/pg_xlogdump
-%{_bindir}/pgbench
-%{_bindir}/vacuumlo
-%{_mandir}/man1/oid2name.*
-%{_mandir}/man1/pg_archivecleanup.*
-%{_mandir}/man1/pgbench.*
-%{_mandir}/man1/pg_recvlogical.*
-%{_mandir}/man1/pg_standby.*
-%{_mandir}/man1/pg_test_fsync.*
-%{_mandir}/man1/pg_test_timing.*
-%{_mandir}/man1/pg_xlogdump.*
-%{_mandir}/man1/vacuumlo.*
-%{_mandir}/man3/dblink*
-%doc contrib/spi/*.example
%files libs -f libs.lst
%doc COPYRIGHT
-%{_libdir}/libpq.so.*
%{_libdir}/libecpg.so.*
-%{_libdir}/libpgtypes.so.*
%{_libdir}/libecpg_compat.so.*
+%{_libdir}/libpgtypes.so.*
+%{_libdir}/libpq.so.*
%files server -f server.lst
-%{_unitdir}/postgresql.service
-%{_unitdir}/postgresql@.service
-%dir /usr/libexec/initscripts/legacy-actions/postgresql
-/usr/libexec/initscripts/legacy-actions/postgresql/*
-%if %pam
-%config(noreplace) /etc/pam.d/postgresql
-%endif
%{_bindir}/initdb
%{_bindir}/pg_basebackup
%{_bindir}/pg_controldata
@@ -1075,52 +1068,59 @@ fi
%{_bindir}/postgres
%{_bindir}/postgresql-setup
%{_bindir}/postmaster
-%{_mandir}/man1/initdb.*
-%{_mandir}/man1/pg_basebackup.*
-%{_mandir}/man1/pg_controldata.*
-%{_mandir}/man1/pg_ctl.*
-%{_mandir}/man1/pg_receivexlog.*
-%{_mandir}/man1/pg_resetxlog.*
-%{_mandir}/man1/postgres.*
-%{_mandir}/man1/postgresql-setup.*
-%{_mandir}/man1/postmaster.*
+%dir %{_datadir}/pgsql
+%{_datadir}/pgsql/*.sample
+%dir %{_datadir}/pgsql/contrib
+%{_datadir}/pgsql/conversion_create.sql
+%dir %{_datadir}/pgsql/extension
+%{_datadir}/pgsql/extension/plpgsql*
+%{_datadir}/pgsql/information_schema.sql
%{_datadir}/pgsql/postgres.bki
%{_datadir}/pgsql/postgres.description
%{_datadir}/pgsql/postgres.shdescription
+%{_datadir}/pgsql/snowball_create.sql
+%{_datadir}/pgsql/sql_features.txt
%{_datadir}/pgsql/system_views.sql
-%{_datadir}/pgsql/*.sample
%{_datadir}/pgsql/timezonesets/
%{_datadir}/pgsql/tsearch_data/
+%{_libdir}/pgsql/*_and_*.so
%{_libdir}/pgsql/dict_snowball.so
+%{_libdir}/pgsql/euc2004_sjis2004.so
+%{_libdir}/pgsql/libpqwalreceiver.so
%{_libdir}/pgsql/pg_prewarm.so
%{_libdir}/pgsql/plpgsql.so
-%dir %{_datadir}/pgsql
-%dir %{_datadir}/pgsql/contrib
-%dir %{_datadir}/pgsql/extension
-%{_datadir}/pgsql/extension/plpgsql*
+%dir %{_libexecdir}/initscripts/legacy-actions/postgresql
+%{_libexecdir}/initscripts/legacy-actions/postgresql/*
+%{_libexecdir}/postgresql-check-db-dir
+%{_libexecdir}/postgresql-ctl
+%{_mandir}/man1/initdb.*
+%{_mandir}/man1/pg_basebackup.*
+%{_mandir}/man1/pg_controldata.*
+%{_mandir}/man1/pg_ctl.*
+%{_mandir}/man1/pg_receivexlog.*
+%{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/postgres.*
+%{_mandir}/man1/postgresql-setup.*
+%{_mandir}/man1/postmaster.*
%{_tmpfilesdir}/postgresql.conf
-%attr(755,postgres,postgres) %dir /var/run/postgresql
+%{_unitdir}/postgresql.service
+%{_unitdir}/postgresql@.service
%attr(700,postgres,postgres) %dir /var/lib/pgsql
-%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
-%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
-%{_libdir}/pgsql/libpqwalreceiver.so
-%{_libdir}/pgsql/*_and_*.so
-%{_libdir}/pgsql/euc2004_sjis2004.so
-%{_datadir}/pgsql/conversion_create.sql
-%{_datadir}/pgsql/information_schema.sql
-%{_datadir}/pgsql/snowball_create.sql
-%{_datadir}/pgsql/sql_features.txt
-%{_libexecdir}/postgresql-ctl
-%{_libexecdir}/postgresql-check-db-dir
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
+%attr(755,postgres,postgres) %dir /var/run/postgresql
+%if %pam
+%config(noreplace) /etc/pam.d/postgresql
+%endif
%files devel -f devel.lst
-/usr/include/*
%{_bindir}/ecpg
-%{_libdir}/libpq.so
+%{_includedir}/*
%{_libdir}/libecpg.so
%{_libdir}/libecpg_compat.so
%{_libdir}/libpgtypes.so
+%{_libdir}/libpq.so
%{_libdir}/pgsql/pgxs/
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man1/ecpg.*
@@ -1143,18 +1143,18 @@ fi
%if %pltcl
%files pltcl -f pltcl.lst
-%{_datadir}/pgsql/extension/pltcl*
-%{_libdir}/pgsql/pltcl.so
%{_bindir}/pltcl_delmod
%{_bindir}/pltcl_listmod
%{_bindir}/pltcl_loadmod
+%{_datadir}/pgsql/extension/pltcl*
%{_datadir}/pgsql/unknown.pltcl
+%{_libdir}/pgsql/pltcl.so
%endif
%if %plpython
%files plpython -f plpython.lst
-%{_datadir}/pgsql/extension/plpythonu*
%{_datadir}/pgsql/extension/plpython2*
+%{_datadir}/pgsql/extension/plpythonu*
%{_libdir}/pgsql/plpython2.so
%endif
@@ -1166,12 +1166,13 @@ fi
%if %test
%files test
-%defattr(-,postgres,postgres)
-%attr(-,postgres,postgres) %{_libdir}/pgsql/test/*
-%attr(-,postgres,postgres) %dir %{_libdir}/pgsql/test
+%attr(-,postgres,postgres) %{_libdir}/pgsql/test
%endif
%changelog
+* Tue Feb 03 2015 Pavel Raiskup <praiskup(a)redhat.com> - 9.4.0-2
+- sort file lists alphabetically
+
* Tue Dec 23 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.4.0-1
- update to 9.4.0 per release notes
http://www.postgresql.org/docs/9.4/static/index.html
commit fd57b146564f3b15148c15aecb0db54d8b211773
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Tue Dec 23 13:14:18 2014 +0100
update to 9.4.0 per release notes
http://www.postgresql.org/docs/9.4/static/index.html
diff --git a/.gitignore b/.gitignore
index 29f1b53..393b256 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,9 @@
/postgresql-9.2.9.tar.bz2.sha256
/postgresql-9.3.5-US.pdf
/postgresql-setup-1.0.0.tar.gz
+/postgresql-9.3.5.tar.bz2
+/postgresql-9.3.5.tar.bz2.sha256
+/postgresql-9.4.0.tar.bz2
+/postgresql-9.4.0.tar.bz2.sha256
+/postgresql-9.4.0-US.pdf
+/postgresql-setup-2.0.tar.gz
diff --git a/postgresql-man.patch b/postgresql-man.patch
index 94a34c6..8d3afe3 100644
--- a/postgresql-man.patch
+++ b/postgresql-man.patch
@@ -3,12 +3,10 @@ PostgreSQL ecpg/initdb manual page fixes
This was generated based on automatic Red Hat manual page scan (private
RHBZ#948933).
-### ecpg ###
-
-diff -up postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken postgresql-9.2.4/doc/src/sgml/man1/ecpg.1
---- postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken 2013-06-05 10:54:39.610443837 +0200
-+++ postgresql-9.2.4/doc/src/sgml/man1/ecpg.1 2013-06-05 10:59:24.115997253 +0200
-@@ -81,6 +81,11 @@ INFORMIX_SE\&.
+diff -up ./doc/src/sgml/man1/ecpg.1.man948933 ./doc/src/sgml/man1/ecpg.1
+--- ./doc/src/sgml/man1/ecpg.1.man948933 2014-12-16 02:13:15.000000000 +0100
++++ ./doc/src/sgml/man1/ecpg.1 2014-12-23 11:26:37.883644047 +0100
+@@ -80,6 +80,11 @@ INFORMIX_SE\&.
Define a C preprocessor symbol\&.
.RE
.PP
@@ -20,7 +18,7 @@ diff -up postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken postgresql-9.2.4/doc/s
\fB\-i\fR
.RS 4
Parse system include files as well\&.
-@@ -129,6 +134,11 @@ Allow question mark as placeholder for c
+@@ -128,6 +133,11 @@ Allow question mark as placeholder for c
.RE
.RE
.PP
@@ -32,21 +30,20 @@ diff -up postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken postgresql-9.2.4/doc/s
\fB\-t\fR
.RS 4
Turn on autocommit of transactions\&. In this mode, each SQL command is automatically committed unless it is inside an explicit transaction block\&. In the default mode, commands are committed only when
-
-### initdb ###
-
-diff -up postgresql-9.2.4/doc/src/sgml/man1/initdb.1.broken postgresql-9.2.4/doc/src/sgml/man1/initdb.1
---- postgresql-9.2.4/doc/src/sgml/man1/initdb.1.broken 2013-06-06 10:26:48.405835762 +0200
-+++ postgresql-9.2.4/doc/src/sgml/man1/initdb.1 2013-06-06 10:29:46.084209958 +0200
-@@ -227,6 +227,11 @@ determines that an error prevented it fr
+diff -up ./doc/src/sgml/man1/initdb.1.man948933 ./doc/src/sgml/man1/initdb.1
+--- ./doc/src/sgml/man1/initdb.1.man948933 2014-12-16 02:13:21.000000000 +0100
++++ ./doc/src/sgml/man1/initdb.1 2014-12-23 11:26:37.883644047 +0100
+@@ -281,6 +281,13 @@ determines that an error prevented it fr
.PP
Other options:
.PP
-+\fB\-s\fR, \fB\-\-show\fR
++\fB\-s\fR
++.br
++\fB\-\-show\fR
+.RS 4
+Print the internal settings, then exit\&.
+.RE
+.PP
- \fB\-V\fR, \fB\-\-version\fR
- .RS 4
- Print the
+ \fB\-V\fR
+ .br
+ \fB\-\-version\fR
diff --git a/postgresql-upgrade-locale-spelling-2.patch b/postgresql-upgrade-locale-spelling-2.patch
deleted file mode 100644
index 0e863b6..0000000
--- a/postgresql-upgrade-locale-spelling-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cd3e0071b8c9e082f5fe903a019d4e474be98e57 Mon Sep 17 00:00:00 2001
-From: Tom Lane <tgl(a)sss.pgh.pa.us>
-Date: Fri, 31 Jan 2014 02:03:30 -0500
-Subject: [PATCH] Allow unrecognized encoding names in locales, as long as
- they're the same.
-
-The buildfarm says commit 58274728fb8e087049df67c0eee903d9743fdeda doesn't
-work so well on Windows. This is because the encoding part of Windows
-locale names can be just a code page number, eg "1252", which we don't
-consider to be a valid encoding name. Add a check to accept encoding
-parts that are case-insensitively string equal; this at least ensures
-that the new code doesn't reject any cases that the old code allowed.
----
- contrib/pg_upgrade/check.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
-index 58c2d16..faeaff5 100644
---- a/contrib/pg_upgrade/check.c
-+++ b/contrib/pg_upgrade/check.c
-@@ -447,8 +447,14 @@ equivalent_locale(const char *loca, const char *locb)
- if (!chara || !charb)
- return (pg_strcasecmp(loca, locb) == 0);
-
-- /* Compare the encoding parts. */
-- if (!equivalent_encoding(chara + 1, charb + 1))
-+ /*
-+ * Compare the encoding parts. Windows tends to use code page numbers for
-+ * the encoding part, which equivalent_encoding() won't like, so accept if
-+ * the strings are case-insensitive equal; otherwise use
-+ * equivalent_encoding() to compare.
-+ */
-+ if (pg_strcasecmp(chara + 1, charb + 1) != 0 &&
-+ !equivalent_encoding(chara + 1, charb + 1))
- return false;
-
- /*
---
-1.9.3
-
diff --git a/postgresql-upgrade-locale-spelling.patch b/postgresql-upgrade-locale-spelling.patch
deleted file mode 100644
index 239240b..0000000
--- a/postgresql-upgrade-locale-spelling.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 58274728fb8e087049df67c0eee903d9743fdeda Mon Sep 17 00:00:00 2001
-From: Tom Lane <tgl(a)sss.pgh.pa.us>
-Date: Thu, 30 Jan 2014 19:07:06 -0500
-Subject: [PATCH] Be forgiving of variant spellings of locale names in
- pg_upgrade.
-
-Even though the server tries to canonicalize stored locale names, the
-platform often doesn't cooperate, so it's entirely possible that one DB
-thinks its locale is, say, "en_US.UTF-8" while the other has "en_US.utf8".
-Rather than failing, we should try to allow this where it's clearly OK.
-
-There is already pretty robust encoding lookup in encnames.c, so make
-use of that to compare the encoding parts of the names. The locale
-identifier parts are just compared case-insensitively, which we were
-already doing. The major problem known to exist in the field is variant
-encoding-name spellings, so hopefully this will be Good Enough. If not,
-we can try being even laxer.
-
-Pavel Raiskup, reviewed by Rushabh Lathia
----
- contrib/pg_upgrade/check.c | 66 +++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 63 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
-index 794d22c..58c2d16 100644
---- a/contrib/pg_upgrade/check.c
-+++ b/contrib/pg_upgrade/check.c
-@@ -9,6 +9,7 @@
-
- #include "postgres_fe.h"
-
-+#include "mb/pg_wchar.h"
- #include "pg_upgrade.h"
-
-
-@@ -16,6 +17,8 @@ static void set_locale_and_encoding(ClusterInfo *cluster);
- static void check_new_cluster_is_empty(void);
- static void check_locale_and_encoding(ControlData *oldctrl,
- ControlData *newctrl);
-+static bool equivalent_locale(const char *loca, const char *locb);
-+static bool equivalent_encoding(const char *chara, const char *charb);
- static void check_is_super_user(ClusterInfo *cluster);
- static void check_for_prepared_transactions(ClusterInfo *cluster);
- static void check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster);
-@@ -412,21 +415,78 @@ check_locale_and_encoding(ControlData *oldctrl,
- * They also often use inconsistent hyphenation, which we cannot fix, e.g.
- * UTF-8 vs. UTF8, so at least we display the mismatching values.
- */
-- if (pg_strcasecmp(oldctrl->lc_collate, newctrl->lc_collate) != 0)
-+ if (!equivalent_locale(oldctrl->lc_collate, newctrl->lc_collate))
- pg_log(PG_FATAL,
- "lc_collate cluster values do not match: old \"%s\", new \"%s\"\n",
- oldctrl->lc_collate, newctrl->lc_collate);
-- if (pg_strcasecmp(oldctrl->lc_ctype, newctrl->lc_ctype) != 0)
-+ if (!equivalent_locale(oldctrl->lc_ctype, newctrl->lc_ctype))
- pg_log(PG_FATAL,
- "lc_ctype cluster values do not match: old \"%s\", new \"%s\"\n",
- oldctrl->lc_ctype, newctrl->lc_ctype);
-- if (pg_strcasecmp(oldctrl->encoding, newctrl->encoding) != 0)
-+ if (!equivalent_encoding(oldctrl->encoding, newctrl->encoding))
- pg_log(PG_FATAL,
- "encoding cluster values do not match: old \"%s\", new \"%s\"\n",
- oldctrl->encoding, newctrl->encoding);
- }
-
-
-+/*
-+ * equivalent_locale()
-+ *
-+ * Best effort locale-name comparison. Return false if we are not 100% sure
-+ * the locales are equivalent.
-+ */
-+static bool
-+equivalent_locale(const char *loca, const char *locb)
-+{
-+ const char *chara = strrchr(loca, '.');
-+ const char *charb = strrchr(locb, '.');
-+ int lencmp;
-+
-+ /* If they don't both contain an encoding part, just do strcasecmp(). */
-+ if (!chara || !charb)
-+ return (pg_strcasecmp(loca, locb) == 0);
-+
-+ /* Compare the encoding parts. */
-+ if (!equivalent_encoding(chara + 1, charb + 1))
-+ return false;
-+
-+ /*
-+ * OK, compare the locale identifiers (e.g. en_US part of en_US.utf8).
-+ *
-+ * It's tempting to ignore non-alphanumeric chars here, but for now it's
-+ * not clear that that's necessary; just do case-insensitive comparison.
-+ */
-+ lencmp = chara - loca;
-+ if (lencmp != charb - locb)
-+ return false;
-+
-+ return (pg_strncasecmp(loca, locb, lencmp) == 0);
-+}
-+
-+/*
-+ * equivalent_encoding()
-+ *
-+ * Best effort encoding-name comparison. Return true only if the encodings
-+ * are valid server-side encodings and known equivalent.
-+ *
-+ * Because the lookup in pg_valid_server_encoding() does case folding and
-+ * ignores non-alphanumeric characters, this will recognize many popular
-+ * variant spellings as equivalent, eg "utf8" and "UTF-8" will match.
-+ */
-+static bool
-+equivalent_encoding(const char *chara, const char *charb)
-+{
-+ int enca = pg_valid_server_encoding(chara);
-+ int encb = pg_valid_server_encoding(charb);
-+
-+ if (enca < 0 || encb < 0)
-+ return false;
-+
-+ return (enca == encb);
-+}
-+
-+
- static void
- check_new_cluster_is_empty(void)
- {
---
-1.9.3
-
diff --git a/postgresql.spec b/postgresql.spec
index 8bee70d..8f5ee4e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -65,9 +65,9 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.3
-Version: 9.3.5
-Release: 8%{?dist}
+%global majorversion 9.4
+Version: 9.4.0
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,10 +82,10 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.2.9
-%global prevmajorversion 9.2
+%global prevversion 9.3.5
+%global prevmajorversion 9.3
-%global setup_version 1.0.0
+%global setup_version 2.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -96,8 +96,6 @@ Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevve
Source4: Makefile.regress
Source5: pg_config.h
Source6: ecpg_config.h
-Source7: initdb.sh
-Source8: upgrade.sh
Source9: postgresql.tmpfiles.d
Source10: postgresql.pam
Source11: postgresql-bashprofile
@@ -119,8 +117,6 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-upgrade-locale-spelling.patch
-Patch8: postgresql-upgrade-locale-spelling-2.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -357,8 +353,6 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -407,8 +401,10 @@ export POSTGRES_BIN=%{_bindir}/postgres \
PREVMAJORVERSION=%{prevmajorversion} \
PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin \
README_DIST=%{_pkgdocdir}/README.rpm-dist \
- PKGCONFIG_DIR=%{_sysconfdir}/postgresql
-%configure
+ PKGCONFIG_DIR=%{_sysconfdir}/postgresql
+%configure \
+ --docdir=%{_pkgdocdir}
+
make %{?_smp_mflags}
cd ..
@@ -685,10 +681,6 @@ esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp -p src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
-install -d $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql
-install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/initdb
-install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/upgrade
-
%if %pam
install -d $RPM_BUILD_ROOT/etc/pam.d
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
@@ -960,26 +952,28 @@ fi
%{_datadir}/pgsql/extension/moddatetime*
%{_datadir}/pgsql/extension/pageinspect*
%{_datadir}/pgsql/extension/pg_buffercache*
-%{_datadir}/pgsql/extension/pg_freespacemap*
-%{_datadir}/pgsql/extension/pg_stat_statements*
-%{_datadir}/pgsql/extension/pg_trgm*
%{_datadir}/pgsql/extension/pgcrypto*
+%{_datadir}/pgsql/extension/pg_freespacemap*
+%{_datadir}/pgsql/extension/pg_prewarm*
%{_datadir}/pgsql/extension/pgrowlocks*
+%{_datadir}/pgsql/extension/pg_stat_statements*
%{_datadir}/pgsql/extension/pgstattuple*
+%{_datadir}/pgsql/extension/pg_trgm*
%{_datadir}/pgsql/extension/postgres_fdw*
%{_datadir}/pgsql/extension/refint*
%{_datadir}/pgsql/extension/seg*
%{_datadir}/pgsql/extension/tablefunc*
%{_datadir}/pgsql/extension/tcn*
%{_datadir}/pgsql/extension/test_parser*
+%{_datadir}/pgsql/extension/test_shm_mq*
%{_datadir}/pgsql/extension/timetravel*
%{_datadir}/pgsql/extension/tsearch2*
%{_datadir}/pgsql/extension/unaccent*
-%{_libdir}/pgsql/_int.so
+%{_datadir}/pgsql/extension/worker_spi*
%{_libdir}/pgsql/adminpack.so
%{_libdir}/pgsql/auth_delay.so
-%{_libdir}/pgsql/autoinc.so
%{_libdir}/pgsql/auto_explain.so
+%{_libdir}/pgsql/autoinc.so
%{_libdir}/pgsql/btree_gin.so
%{_libdir}/pgsql/btree_gist.so
%{_libdir}/pgsql/chkpass.so
@@ -994,6 +988,7 @@ fi
%{_libdir}/pgsql/fuzzystrmatch.so
%{_libdir}/pgsql/hstore.so
%{_libdir}/pgsql/insert_username.so
+%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/isn.so
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
@@ -1001,18 +996,20 @@ fi
%{_libdir}/pgsql/pageinspect.so
%{_libdir}/pgsql/passwordcheck.so
%{_libdir}/pgsql/pg_buffercache.so
-%{_libdir}/pgsql/pg_freespacemap.so
-%{_libdir}/pgsql/pg_stat_statements.so
-%{_libdir}/pgsql/pg_trgm.so
%{_libdir}/pgsql/pgcrypto.so
+%{_libdir}/pgsql/pg_freespacemap.so
%{_libdir}/pgsql/pgrowlocks.so
+%{_libdir}/pgsql/pg_stat_statements.so
%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/pg_trgm.so
%{_libdir}/pgsql/postgres_fdw.so
%{_libdir}/pgsql/refint.so
%{_libdir}/pgsql/seg.so
%{_libdir}/pgsql/tablefunc.so
%{_libdir}/pgsql/tcn.so
+%{_libdir}/pgsql/test_decoding.so
%{_libdir}/pgsql/test_parser.so
+%{_libdir}/pgsql/test_shm_mq.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/unaccent.so
@@ -1043,11 +1040,12 @@ fi
%{_bindir}/vacuumlo
%{_mandir}/man1/oid2name.*
%{_mandir}/man1/pg_archivecleanup.*
+%{_mandir}/man1/pgbench.*
+%{_mandir}/man1/pg_recvlogical.*
%{_mandir}/man1/pg_standby.*
%{_mandir}/man1/pg_test_fsync.*
%{_mandir}/man1/pg_test_timing.*
-%{_mandir}/man1/pg_xlogdump.1.gz
-%{_mandir}/man1/pgbench.*
+%{_mandir}/man1/pg_xlogdump.*
%{_mandir}/man1/vacuumlo.*
%{_mandir}/man3/dblink*
%doc contrib/spi/*.example
@@ -1072,10 +1070,11 @@ fi
%{_bindir}/pg_controldata
%{_bindir}/pg_ctl
%{_bindir}/pg_receivexlog
+%{_bindir}/pg_recvlogical
%{_bindir}/pg_resetxlog
%{_bindir}/postgres
-%{_bindir}/postmaster
%{_bindir}/postgresql-setup
+%{_bindir}/postmaster
%{_mandir}/man1/initdb.*
%{_mandir}/man1/pg_basebackup.*
%{_mandir}/man1/pg_controldata.*
@@ -1093,6 +1092,7 @@ fi
%{_datadir}/pgsql/timezonesets/
%{_datadir}/pgsql/tsearch_data/
%{_libdir}/pgsql/dict_snowball.so
+%{_libdir}/pgsql/pg_prewarm.so
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
%dir %{_datadir}/pgsql/contrib
@@ -1172,6 +1172,10 @@ fi
%endif
%changelog
+* Tue Dec 23 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.4.0-1
+- update to 9.4.0 per release notes
+ http://www.postgresql.org/docs/9.4/static/index.html
+
* Mon Nov 24 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-8
- print regression.diffs contents to stdout (#1118392)
diff --git a/sources b/sources
index c4d5161..6fee261 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
5059857c7d7e6ad83b6d55893a121b59 postgresql-9.3.5.tar.bz2
60b858fb6c7e06bf05a9c5f4dc5a8932 postgresql-9.3.5.tar.bz2.sha256
-38b0937c86d537d5044c599273066cfc postgresql-9.2.9.tar.bz2
-08b4a99710e25d7004d058997cdb1ebc postgresql-9.2.9.tar.bz2.sha256
-5d8361190dd064a655b21f112daa91ec postgresql-9.3.5-US.pdf
-2e601b008c98b991c38a8d7443b13e76 postgresql-setup-1.0.0.tar.gz
+8cd6e33e1f8d4d2362c8c08bd0e8802b postgresql-9.4.0.tar.bz2
+79cca88e8a3932bfacda97253d893502 postgresql-9.4.0.tar.bz2.sha256
+c0d073b2c9d0ba587ba6f6634210ff5c postgresql-9.4.0-US.pdf
+8323008e726a84d76c3153ed68357576 postgresql-setup-2.0.tar.gz
commit 1ade253201c75a2966216d0786ed9b72d6d754cb
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Nov 24 14:48:51 2014 +0100
testsuite: put contents of regression.diffs to stdout
.. to help users who face issues like rhbz#1118392.
Also, testsuite consists of several 'make check' runs. From now,
continue with checking if some of 'make check' runs failed; just
to be sure we have complete test results. Make the test failed
once all testing is done.
Resolves: #1118392
Version: 9.3.5-8
diff --git a/postgresql.spec b/postgresql.spec
index aa33ac9..8bee70d 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,7 +1,7 @@
# This is the PostgreSQL Global Development Group Official RPMset spec file,
# or a derivative thereof.
# Copyright 2003-2009 Lamar Owen <lowen(a)pari.edu> <lamar.owen(a)wgcr.org>
-# and others listed.
+# and others listed. ** vi: ts=4 sw=4 noexpandtab nosmarttab
# Major Contributors:
# ---------------
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.5
-Release: 7%{?dist}
+Release: 8%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -560,15 +560,33 @@ sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/t
make %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all
rm -f src/tutorial/GNUmakefile
+test_failure=0
+
+# run_testsuite WHERE
+# -------------------
+# Run 'make check' in WHERE path. When that command fails, return the logs
+# given by PostgreSQL build system and set 'test_failure=1'.
+
+run_testsuite()
+{
+ make -C "$1" MAX_CONNECTIONS=5 check && return 0
+
+ test_failure=1
+
+ (
+ set +x
+ find "$1" -name 'regression.diffs' | \
+ while read line; do
+ echo "=== make failure: $line ==="
+ cat "$line"
+ done
+ )
+}
+
%if %runselftest
- pushd src/test/regress
- make all
- make MAX_CONNECTIONS=5 check
- make clean
- popd
- pushd src/pl
- make MAX_CONNECTIONS=5 check
- popd
+ run_testsuite "src/test/regress"
+ make clean -C "src/test/regress"
+ run_testsuite "src/pl"
%if %plpython3
# must install Makefile.global that selects python3
mv src/Makefile.global src/Makefile.global.save
@@ -579,24 +597,23 @@ rm -f src/tutorial/GNUmakefile
# since that is the subdirectory src/pl/Makefile knows about
mv src/pl/plpython src/pl/plpython2
mv src/pl/plpython3 src/pl/plpython
- pushd src/pl/plpython
- make MAX_CONNECTIONS=5 check
- popd
+
+ run_testsuite "src/pl/plpython"
+
# and clean up our mess
mv src/pl/plpython src/pl/plpython3
mv src/pl/plpython2 src/pl/plpython
mv -f src/Makefile.global.save src/Makefile.global
%endif
- pushd contrib
- make MAX_CONNECTIONS=5 check
- popd
+ run_testsuite "contrib"
%endif
-# undo the "make clean" above
+# "assert(ALL_TESTS_OK)"
+test "$test_failure" -eq 0
+
%if %test
- pushd src/test/regress
- make all
- popd
+ # undo the "make clean" above
+ make all -C src/test/regress
%endif
%if %upgrade
@@ -1155,6 +1172,9 @@ fi
%endif
%changelog
+* Mon Nov 24 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-8
+- print regression.diffs contents to stdout (#1118392)
+
* Mon Oct 20 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-7
- be forgiving of variant spellings of locale names in pg_upgrade (#1007802)
commit 7fcd42641db5670f1d9622ec6fb6a121e2d984f2
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Oct 20 11:47:13 2014 +0200
upgrade: be more benevolent in locale comparison
In F20+, we should be OK for upgrades where locale changed like
from en_US.utf8 to en_US.UTF-8.
Resolves: #1007802
Version: 9.3.5-7
diff --git a/postgresql-upgrade-locale-spelling-2.patch b/postgresql-upgrade-locale-spelling-2.patch
new file mode 100644
index 0000000..0e863b6
--- /dev/null
+++ b/postgresql-upgrade-locale-spelling-2.patch
@@ -0,0 +1,40 @@
+From cd3e0071b8c9e082f5fe903a019d4e474be98e57 Mon Sep 17 00:00:00 2001
+From: Tom Lane <tgl(a)sss.pgh.pa.us>
+Date: Fri, 31 Jan 2014 02:03:30 -0500
+Subject: [PATCH] Allow unrecognized encoding names in locales, as long as
+ they're the same.
+
+The buildfarm says commit 58274728fb8e087049df67c0eee903d9743fdeda doesn't
+work so well on Windows. This is because the encoding part of Windows
+locale names can be just a code page number, eg "1252", which we don't
+consider to be a valid encoding name. Add a check to accept encoding
+parts that are case-insensitively string equal; this at least ensures
+that the new code doesn't reject any cases that the old code allowed.
+---
+ contrib/pg_upgrade/check.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
+index 58c2d16..faeaff5 100644
+--- a/contrib/pg_upgrade/check.c
++++ b/contrib/pg_upgrade/check.c
+@@ -447,8 +447,14 @@ equivalent_locale(const char *loca, const char *locb)
+ if (!chara || !charb)
+ return (pg_strcasecmp(loca, locb) == 0);
+
+- /* Compare the encoding parts. */
+- if (!equivalent_encoding(chara + 1, charb + 1))
++ /*
++ * Compare the encoding parts. Windows tends to use code page numbers for
++ * the encoding part, which equivalent_encoding() won't like, so accept if
++ * the strings are case-insensitive equal; otherwise use
++ * equivalent_encoding() to compare.
++ */
++ if (pg_strcasecmp(chara + 1, charb + 1) != 0 &&
++ !equivalent_encoding(chara + 1, charb + 1))
+ return false;
+
+ /*
+--
+1.9.3
+
diff --git a/postgresql-upgrade-locale-spelling.patch b/postgresql-upgrade-locale-spelling.patch
new file mode 100644
index 0000000..239240b
--- /dev/null
+++ b/postgresql-upgrade-locale-spelling.patch
@@ -0,0 +1,129 @@
+From 58274728fb8e087049df67c0eee903d9743fdeda Mon Sep 17 00:00:00 2001
+From: Tom Lane <tgl(a)sss.pgh.pa.us>
+Date: Thu, 30 Jan 2014 19:07:06 -0500
+Subject: [PATCH] Be forgiving of variant spellings of locale names in
+ pg_upgrade.
+
+Even though the server tries to canonicalize stored locale names, the
+platform often doesn't cooperate, so it's entirely possible that one DB
+thinks its locale is, say, "en_US.UTF-8" while the other has "en_US.utf8".
+Rather than failing, we should try to allow this where it's clearly OK.
+
+There is already pretty robust encoding lookup in encnames.c, so make
+use of that to compare the encoding parts of the names. The locale
+identifier parts are just compared case-insensitively, which we were
+already doing. The major problem known to exist in the field is variant
+encoding-name spellings, so hopefully this will be Good Enough. If not,
+we can try being even laxer.
+
+Pavel Raiskup, reviewed by Rushabh Lathia
+---
+ contrib/pg_upgrade/check.c | 66 +++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 63 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
+index 794d22c..58c2d16 100644
+--- a/contrib/pg_upgrade/check.c
++++ b/contrib/pg_upgrade/check.c
+@@ -9,6 +9,7 @@
+
+ #include "postgres_fe.h"
+
++#include "mb/pg_wchar.h"
+ #include "pg_upgrade.h"
+
+
+@@ -16,6 +17,8 @@ static void set_locale_and_encoding(ClusterInfo *cluster);
+ static void check_new_cluster_is_empty(void);
+ static void check_locale_and_encoding(ControlData *oldctrl,
+ ControlData *newctrl);
++static bool equivalent_locale(const char *loca, const char *locb);
++static bool equivalent_encoding(const char *chara, const char *charb);
+ static void check_is_super_user(ClusterInfo *cluster);
+ static void check_for_prepared_transactions(ClusterInfo *cluster);
+ static void check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster);
+@@ -412,21 +415,78 @@ check_locale_and_encoding(ControlData *oldctrl,
+ * They also often use inconsistent hyphenation, which we cannot fix, e.g.
+ * UTF-8 vs. UTF8, so at least we display the mismatching values.
+ */
+- if (pg_strcasecmp(oldctrl->lc_collate, newctrl->lc_collate) != 0)
++ if (!equivalent_locale(oldctrl->lc_collate, newctrl->lc_collate))
+ pg_log(PG_FATAL,
+ "lc_collate cluster values do not match: old \"%s\", new \"%s\"\n",
+ oldctrl->lc_collate, newctrl->lc_collate);
+- if (pg_strcasecmp(oldctrl->lc_ctype, newctrl->lc_ctype) != 0)
++ if (!equivalent_locale(oldctrl->lc_ctype, newctrl->lc_ctype))
+ pg_log(PG_FATAL,
+ "lc_ctype cluster values do not match: old \"%s\", new \"%s\"\n",
+ oldctrl->lc_ctype, newctrl->lc_ctype);
+- if (pg_strcasecmp(oldctrl->encoding, newctrl->encoding) != 0)
++ if (!equivalent_encoding(oldctrl->encoding, newctrl->encoding))
+ pg_log(PG_FATAL,
+ "encoding cluster values do not match: old \"%s\", new \"%s\"\n",
+ oldctrl->encoding, newctrl->encoding);
+ }
+
+
++/*
++ * equivalent_locale()
++ *
++ * Best effort locale-name comparison. Return false if we are not 100% sure
++ * the locales are equivalent.
++ */
++static bool
++equivalent_locale(const char *loca, const char *locb)
++{
++ const char *chara = strrchr(loca, '.');
++ const char *charb = strrchr(locb, '.');
++ int lencmp;
++
++ /* If they don't both contain an encoding part, just do strcasecmp(). */
++ if (!chara || !charb)
++ return (pg_strcasecmp(loca, locb) == 0);
++
++ /* Compare the encoding parts. */
++ if (!equivalent_encoding(chara + 1, charb + 1))
++ return false;
++
++ /*
++ * OK, compare the locale identifiers (e.g. en_US part of en_US.utf8).
++ *
++ * It's tempting to ignore non-alphanumeric chars here, but for now it's
++ * not clear that that's necessary; just do case-insensitive comparison.
++ */
++ lencmp = chara - loca;
++ if (lencmp != charb - locb)
++ return false;
++
++ return (pg_strncasecmp(loca, locb, lencmp) == 0);
++}
++
++/*
++ * equivalent_encoding()
++ *
++ * Best effort encoding-name comparison. Return true only if the encodings
++ * are valid server-side encodings and known equivalent.
++ *
++ * Because the lookup in pg_valid_server_encoding() does case folding and
++ * ignores non-alphanumeric characters, this will recognize many popular
++ * variant spellings as equivalent, eg "utf8" and "UTF-8" will match.
++ */
++static bool
++equivalent_encoding(const char *chara, const char *charb)
++{
++ int enca = pg_valid_server_encoding(chara);
++ int encb = pg_valid_server_encoding(charb);
++
++ if (enca < 0 || encb < 0)
++ return false;
++
++ return (enca == encb);
++}
++
++
+ static void
+ check_new_cluster_is_empty(void)
+ {
+--
+1.9.3
+
diff --git a/postgresql.spec b/postgresql.spec
index e0634e8..aa33ac9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.5
-Release: 6%{?dist}
+Release: 7%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -119,6 +119,8 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+Patch7: postgresql-upgrade-locale-spelling.patch
+Patch8: postgresql-upgrade-locale-spelling-2.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -355,6 +357,8 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
+%patch8 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1151,6 +1155,9 @@ fi
%endif
%changelog
+* Mon Oct 20 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-7
+- be forgiving of variant spellings of locale names in pg_upgrade (#1007802)
+
* Sun Sep 21 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-6
- postgresql-setup & relatives are now in separate tarball
commit c88f76d54084da5652d97f960b14e097f41c9be5
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Jul 2 18:14:06 2014 +0200
postgresql-setup is now in separate tarball
.. together with other scripts and files. This should make the
development and testing of those files easier. Also packaging
should benefit from this change.
Version: 9.3.5-6
Resolves: #1145129
diff --git a/.gitignore b/.gitignore
index 1d2f5e5..29f1b53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/postgresql-9.2.9.tar.bz2
/postgresql-9.2.9.tar.bz2.sha256
/postgresql-9.3.5-US.pdf
+/postgresql-setup-1.0.0.tar.gz
diff --git a/README.rpm-dist b/README.rpm-dist
deleted file mode 100644
index b582354..0000000
--- a/README.rpm-dist
+++ /dev/null
@@ -1,357 +0,0 @@
-README.rpm-dist
------------------------------------------------------------------------------
-Version 9.3, for the PostgreSQL 9.3 RPM set.
-Devrim Gndz <devrim(a)gunduz.org>
------------------------------------------------------------------------------
-
-Contents:
- 1.) Introduction and QuickStart
- 2.) Upgrading an installation
- 3.) PostgreSQL RPM packages and rationale
- 4.) Starting multiple postmasters
- 5.) Regression Testing
- 6.) Starting postmaster automatically on startup
- 7.) Grand Unified Configuration(GUC) File
- 8.) Logging set up
- 9.) Rebuilding from the source RPM
-10.) Contrib files
-11.) Further Information Resource
-
-INTRODUCTION
------------------------------------------------------------------------------
-This document exists to explain the layout of the RPMs for PostgreSQL, to
-describe various RPM specifics, and to document special features found
-in the RPMset.
-
-This document is written to be applicable to version 9.3 of PostgreSQL,
-which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 9.3 are not documented here.
-
-This document is intended for use only with the RPMs supplied in Red Hat
-Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
-RPMs available directly from the upstream PostgreSQL project. Those are
-slightly different.
-
-QUICKSTART (note that this requires postgresql-server installed)
------------------------------------------------------------------------------
-For a fresh installation, you will need to initialize the cluster first. Run:
-
- postgresql-setup initdb
-
-as root, and it will prepare a new database cluster for you. Then you will
-need to start PostgreSQL. Again as root, run:
-
- systemctl start postgresql.service
-
-This command will start a postmaster that willl listen on localhost and Unix
-socket 5432 only. Edit /var/lib/pgsql/data/postgresql.conf and pg_hba.conf
-if you want to allow remote access -- see the section on Grand Unified
-Configuration.
-
-You will probably also want to do
-
- systemctl enable postgresql.service
-
-so that the postmaster is automatically started during future reboots.
-
-The file /var/lib/pgsql/.bash_profile is packaged to help with the
-setting of environment variables. You may edit this file, and it won't be
-overwritten during an upgrade. However, enhancements and bugfixes may
-be added to this file, so be sure to check .bash_profile.rpmnew after
-upgrading.
-
-The user 'postgres' is created during installation of the server subpackage.
-This user by default is UID and GID 26. The user has the default shell set to
-bash, and the home directory set to /var/lib/pgsql. This user also has no
-default password, so the only way to become this user is to su to it from root.
-If you want to be able to su to it from a non-root account or log in directly
-as 'postgres' you will need to set a password using passwd.
-
-UPGRADING AN INSTALLATION
------------------------------------------------------------------------------
-For a minor-version upgrade (such as 9.3.1 to 9.3.2), just install the
-new RPMs; there's usually nothing more to it than that. Upgrading
-across a major release of PostgreSQL (for example, from 9.2.x to 9.3.x)
-requires more effort.
-
-If you are upgrading across more than one major release of PostgreSQL
-(for example, from 8.3.x to 9.0.x), you will need to follow the "traditional"
-dump and reload process to bring your data into the new version. That is:
-*before* upgrading, run pg_dumpall to extract all your data into a SQL file.
-Shut down the old postmaster, upgrade to the new version RPMs, initdb,
-and run the dump file through psql to restore your data.
-
-In some major releases, the RPMs also support in-place upgrade from the
-immediately previous major release. Currently, you can upgrade in-place
-from 9.2.x to 9.3.x. This is much faster than a dump and reload.
-To do an in-place upgrade:
-* shut down the old postmaster ("systemctl stop postgresql.service")
-* optionally make a backup of /var/lib/pgsql/data/ (recommended!)
-* install the new version's RPMs (install all the ones you had before,
- plus postgresql-upgrade)
-* as root, run "postgresql-setup upgrade"
-* update the configuration files /var/lib/pgsql/data/*.conf with any
- customizations you had before (your old configuration files are in
- /var/lib/pgsql/data-old/)
-* as root, run "systemctl start postgresql.service"
-* the postgresql-upgrade RPM can be removed after the update is complete,
- as can /var/lib/pgsql/data-old/
-
-NOTE: The in-place upgrade process is new and relatively poorly tested,
-so if your data is critical it's a really good idea to make a tarball
-backup of /var/lib/pgsql/data/ before running the upgrade. This will
-let you get back to where you were in case of disaster.
-
-POSTGRESQL RPM PACKAGES AND RATIONALE.
------------------------------------------------------------------------------
-PostgreSQL is split up into multiple packages so that users can 'pick and
-choose' what pieces are needed, and what dependencies are required.
-
-The RPMset is packaged in the following subpackages:
-
-postgresql: Key client programs and basic documentation
-postgresql-libs: Client shared libraries
-postgresql-server: Server executables and data files
-postgresql-devel: Development libraries and include files
-postgresql-test: The regression tests and associated files
-postgresql-upgrade: Support files for upgrading from previous major version
-postgresql-docs: Full documentation in HTML and PDF, the tutorial files
-postgresql-contrib: Add-on loadable modules and programs
-postgresql-plperl: PL/Perl procedural language
-postgresql-plpython: PL/Python procedural language (for Python 2)
-postgresql-plpython3: PL/Python procedural language (for Python 3)
-postgresql-pltcl: PL/Tcl procedural language
-
-You have to install postgresql and postgresql-libs to do anything.
-postgresql-server is needed unless you only plan to use the clients to work
-with a remote PostgreSQL server. The others are optional.
-
-Note that there are no postgresql-perl, postgresql-jdbc, postgresql-odbc,
-postgresql-python, postgresql-tcl, or postgresql-tk subpackages any longer.
-Those programs have been split off into separate source distributions.
-They are still available, but in some cases not under those RPM names.
-
-RPM FILE LOCATIONS.
------------------------------------------------------------------------------
-To be in compliance with the Linux FHS, the PostgreSQL RPMs install files in
-a manner not consistent with most of the PostgreSQL documentation. According
-to the standard PostgreSQL documentation, PostgreSQL is installed under the
-directory /usr/local/pgsql, with executables, source, and data existing in
-various subdirectories.
-
-Different distributions have different ideas of some of these file locations.
-In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
-/usr/share/doc, /usr/share/doc/packages, or some other similar path.
-
-However, the Red Hat / CentOS / Fedora RPM's install the files like
-this:
-
-Executables: /usr/bin
-Libraries: /usr/lib (or /usr/lib64 on 64-bit machines)
-Documentation: /usr/share/doc/postgresql/html
-PDF documentation: /usr/share/doc/postgresql-docs
-Contrib documentation: /usr/share/doc/postgresql-contrib
-Source: not installed
-Data: /var/lib/pgsql/data
-Backup area: /var/lib/pgsql/backups
-Templates: /usr/share/pgsql
-Procedural Languages: /usr/lib/pgsql or /usr/lib64/pgsql
-Development Headers: /usr/include/pgsql
-Other shared data: /usr/share/pgsql
-Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
- or /usr/lib64/pgsql/test/regress
-
-While it may seem gratuitous to place these files in different locations, the
-FHS requires it -- distributions should not ever touch /usr/local. It may
-also seem like more work to keep track of where everything is -- but, that's
-the beauty of RPM -- you don't have to keep track of the files, RPM does it
-for you.
-
-These RPMs are designed to be LSB-compliant -- if you find this not to be the
-case, please let us know by way of the pgsql-pkg-yum(a)postgresql.org
-mailing list.
-
-MULTIPLE POSTMASTERS
--------------------------------------------------------------------------------
-The postgresql-server RPM contains a systemd "unit" file, postgresql.service,
-that is used to start the PostgreSQL postmaster. If you need to run multiple
-postmasters on one machine, you can create additional unit files derived
-from this one.
-
-As an example, let us create a secondary postmaster called, creatively enough,
-'secondary'. Here are the steps:
-1.) Create a file named /etc/systemd/system/secondary.service.
- (Note that user-created unit files must go into /etc not /lib!)
- Put these lines in it:
- .include /lib/systemd/system/postgresql.service
- [Service]
- Environment=PGPORT=nnnn
- Environment=PGDATA=/path/to/data/directory
- Replace "nnnn" and "/path/to/data/directory" with appropriate
- settings that don't conflict with any other postmaster.
-2.) As root, do "/bin/systemctl daemon-reload" to ensure systemd has
- noticed your updates to the service file.
-3.) Create the target PGDATA directory, making sure that its parent
- directories have appropriate ownership and permissions.
-4.) Initdb the target PGDATA with 'postgresql-setup initdb secondary'.
-5.) Edit postgresql.conf in the target PGDATA to change settings as needed.
-6.) Start the new postmaster with 'systemctl start secondary.service'.
- You will probably also want to do 'systemctl enable secondary.service'
- so that the new postmaster is automatically started in future reboots.
-
-When doing a major-version upgrade of a secondary postmaster, add the
-service name to the postgresql-setup command, for example 'postgresql-setup
-upgrade secondary'. This will let postgresql-setup find the correct data
-directory from the service file.
-
-If you are running SELinux in enforcing mode (which is highly recommended,
-particularly for network-exposed services like PostgreSQL) you will need to
-adjust SELinux policy to allow the postmaster to use non-default PGPORT or
-PGDATA settings. To allow use of a non-default port, say 5433, do this
-as root:
- semanage port -a -t postgresql_port_t -p tcp 5433
-To allow use of a non-default data directory, say /special/pgdata, do:
- semanage fcontext -a -t postgresql_db_t "/special/pgdata(/.*)?"
-If you already created the directory, follow that with:
- restorecon -R /special/pgdata
-These settings are persistent across reboots. For more information
-see "man semanage".
-
-REGRESSION TESTING
--------------------------------------------------------------------------------
-If you install the postgresql-test RPM then you can run the PostgreSQL
-regression tests. These tests stress your database installation and produce
-results that give you assurances that the installation is complete, and that
-your database machine is up to the task.
-
-To run the regression tests under the RPM installation, make sure that the
-postmaster has been started (if not, su to root and do "systemctl start
-postgresql.service"), su to postgres, cd to /usr/lib/pgsql/test/regress
-(or /usr/lib64/pgsql/test/regress on a 64-bit machine),
-and execute "make check".
-This command will start the regression tests and will both show the
-results to the screen and store the results in the file regress.out.
-
-If any tests fail, see the file regression.diffs in that directory for details,
-and read the "Regression Tests" section of the PostgreSQL documentation to
-find out whether the differences are actually significant. If you need help
-interpreting the results, contact the pgsql-general list at
-postgresql.org.
-
-After testing, run "make clean" to remove the files generated by the test
-script. Then you can remove the postgresql-test RPM, if you wish.
-
-STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
--------------------------------------------------------------------------------
-Fedora / Red Hat / CentOS use the systemd package to manage server startup.
-A systemd unit file for PostgreSQL is provided in the server package, as
-/lib/systemd/system/postgresql.service. To start the postmaster manually,
-as root run
- systemctl start postgresql.service
-To shut the postmaster down,
- systemctl stop postgresql.service
-These two commands only change the postmaster's current status. If you
-want the postmaster to be started automatically during future system startups,
-run
- systemctl enable postgresql.service
-To undo that again,
- systemctl disable postgresql.service
-See "man systemctl" for other possible subcommands.
-
-GRAND UNIFIED CONFIGURATION (GUC) FILE
--------------------------------------------------------------------------------
-The PostgreSQL server has many tunable parameters -- the file
-/var/lib/pgsql/data/postgresql.conf is the master configuration file for the
-whole system.
-
-The RPM ships with a mostly-default file -- you will need to tune the
-parameters for your installation. In particular, you might want to allow
-nonlocal TCP/IP socket connections -- in order to allow these, you will need
-to edit the postgresql.conf file. The line in question contains the string
-'listen_addresses' -- you need to both uncomment the line and set the value
-to '*' to get the postmaster to accept nonlocal connections. You'll also need
-to adjust pg_hba.conf appropriately.
-
-LOGGING SET UP
--------------------------------------------------------------------------------
-By default, the postmaster's stderr log is directed into files placed in a
-pg_log subdirectory of the data directory (ie, /var/lib/pgsql/data/pg_log).
-The out-of-the-box configuration rotates among seven files, one for each
-day of the week. You can adjust this by changing postgresql.conf settings.
-
-REBUILDING FROM SOURCE RPM
--------------------------------------------------------------------------------
-If your distribution is not supported by the binary RPMs from PostgreSQL.org,
-you will need to rebuild from the source RPM.
-
-If you have not previously rebuilt any RPMs, set up the required environment:
-make a work directory, say ~/rpmwork, then cd into it and do
- mkdir BUILD BUILDROOT RPMS SOURCES SPECS SRPMS
-Then make a file ~/.rpmmacros containing
- %_topdir <full path to work directory here>
-
-Download the postgresql .src.rpm for the release you want and place it in
-the SRPMS subdirectory, then cd there and execute
- rpmbuild --rebuild postgresql-nnn.src.rpm
-The results will appear under the RPMS subdirectory.
-
-You will have to have a full development environment to rebuild the RPM set.
-If rpmbuild complains of lack of certain packages, install them and try
-again. In some cases, you can disable features to avoid needing some
-development packages, as detailed next.
-
-This release of the RPMset includes the ability to conditionally build
-sets of packages. The parameters, their defaults, and the meanings are:
-
-beta 0 #build with cassert and do not strip the binaries
-runselftest 1 #do "make check" during the build
-test 1 #build the postgresql-test package
-upgrade 1 #build the postgresql-upgrade package
-plpython 1 #build the PL/Python procedural language package
-plpython3 1 #build the PL/Python3 procedural language package
-pltcl 1 #build the PL/Tcl procedural language package
-plperl 1 #build the PL/Perl procedural language package
-ssl 1 #build with OpenSSL support
-kerberos 1 #build with Kerberos 5 support
-ldap 1 #build with LDAP support
-nls 1 #build with national language support
-pam 1 #build with PAM support
-sdt 1 #build with SystemTap support
-xml 1 #build with XML support
-pgfts 1 #build with --enable-thread-safety
-selinux 1 #build contrib/selinux
-uuid 1 #build contrib/uuid-ossp
-
-To use these defines, invoke a rebuild like this:
-rpmbuild --rebuild --define 'plpython 0' --define 'pltcl 0' \
- --define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
- postgresql-9.2.0-1.src.rpm
-This line would disable the plpython, pltcl, and test subpackages, disable
-the regression test run during build, and disable kerberos support.
-
-You might need to disable runselftest if there is an installed version of
-PostgreSQL that is a different major version from what you are trying to
-build. The self test tends to pick up the installed libpq.so shared library
-in place of the one being built :-(, so if that isn't compatible the test will
-fail. Also, you can't use runselftest when doing the build as root.
-
-More of these conditionals will be added in the future.
-
-CONTRIB FILES
--------------------------------------------------------------------------------
-The contents of the contrib tree are packaged into the -contrib subpackage
-and are processed with make and make install. There is documentation in
-/usr/share/doc/postgresql-contrib for these modules. Most of the
-modules are in /usr/lib/pgsql (or /usr/lib64/pgsql) for loadable
-modules, and binaries are in /usr/bin. In the future these files may be
-split out, depending upon function and dependencies.
-
-MORE INFORMATION
--------------------------------------------------------------------------------
-You can get more information at http://www.postgresql.org and
-http://yum.postgresql.org
-
-Please help make this packaging better -- let us know if you find problems, or
-better ways of doing things. You can reach us by e-mail at
-pgsql-pkg-yum(a)postgresql.org
--------------------------------------------------------------------------------
diff --git a/postgresql-check-db-dir b/postgresql-check-db-dir
deleted file mode 100644
index 4266c7a..0000000
--- a/postgresql-check-db-dir
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# This script verifies that the postgresql data directory has been correctly
-# initialized. We do not want to automatically initdb it, because that has
-# a risk of catastrophic failure (ie, overwriting a valuable database) in
-# corner cases, such as a remotely mounted database on a volume that's a
-# bit slow to mount. But we can at least emit a message advising newbies
-# what to do.
-
-PGDATA="$1"
-
-if [ -z "$PGDATA" ]
-then
- echo "Usage: $0 database-path"
- exit 1
-fi
-
-# PGVERSION is the full package version, e.g., 9.1.2
-# Note: the specfile inserts the correct value during package build
-PGVERSION=xxxx
-# PGMAJORVERSION is major version, e.g., 9.1 (this should match PG_VERSION)
-PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-# Note: the specfile inserts the correct value during package build
-PREVMAJORVERSION=xxxx
-# PGDOCDIR is the directory containing the package's documentation
-# Note: the specfile inserts the correct value during package build
-PGDOCDIR=xxxx
-
-# Check for the PGDATA structure
-if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
-then
- # Check version of existing PGDATA
- if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
- then
- : A-OK
- elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
- then
- echo $"An old version of the database format was found."
- echo $"Use \"postgresql-setup upgrade\" to upgrade to version $PGMAJORVERSION."
- echo $"See $PGDOCDIR/README.rpm-dist for more information."
- exit 1
- else
- echo $"An old version of the database format was found."
- echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION."
- echo $"See $PGDOCDIR/README.rpm-dist for more information."
- exit 1
- fi
-else
- # No existing PGDATA! Warn the user to initdb it.
- echo $"\"$PGDATA\" is missing or empty."
- echo $"Use \"postgresql-setup initdb\" to initialize the database cluster."
- echo $"See $PGDOCDIR/README.rpm-dist for more information."
- exit 1
-fi
-
-exit 0
diff --git a/postgresql-setup b/postgresql-setup
deleted file mode 100755
index 7ce7b9f..0000000
--- a/postgresql-setup
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/bin/bash
-#
-# postgresql-setup - Initialization and upgrade operations for PostgreSQL
-
-test -z "$PATH" && export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-test x"$PGSETUP_DEBUG" != x && set -x
-
-# PGVERSION is the full package version, e.g., 9.0.2
-# Note: the specfile inserts the correct value during package build
-PGVERSION=xxxx
-
-# PGMAJORVERSION is the major version, e.g. 9.0
-PGMAJORVERSION=xxxx
-
-# PGENGINE is the directory containing the postmaster executable
-PGENGINE=xxxx
-
-# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-PREVMAJORVERSION=xxxx
-
-# PREVPGENGINE is the directory containing the previous postmaster executable
-PREVPGENGINE=xxxx
-
-# Absorb configuration settings from the specified systemd service file,
-# or the default "postgresql" service if not specified
-SERVICE_NAME="$2"
-if [ x"$SERVICE_NAME" = x ]; then
- SERVICE_NAME=postgresql
-fi
-
-# Pathname of the RPM distribution README
-README_RPM_DIST=xxxx
-
-USAGE_STRING=$"
-Usage: $0 {initdb|upgrade} [SERVICE_NAME]
-
-Script is aimed to help sysadmin with basic database cluster administration.
-
-The SERVICE_NAME is used for selection of proper unit configuration file; For
-more info and howto/when use this script please look at the docu file
-$README_RPM_DIST. The 'postgresql'
-string is used when no SERVICE_NAME is explicitly passed.
-
-Available operation mode:
- initdb Create a new PostgreSQL database cluster. This is usually the
- first action you perform after PostgreSQL server installation.
- upgrade Upgrade PostgreSQL database cluster to be usable with new
- server. Use this if you upgraded your PostgreSQL server to
- newer major version (currently from $PREVMAJORVERSION \
-to $PGMAJORVERSION).
-
-Environment:
- PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
- subsequent call of \`initdb\` binary (see man
- initdb(1)). This variable is used also during
- 'upgrade' mode because the new cluster is actually
- re-initialized from the old one.
- PGSETUP_PGUPGRADE_OPTIONS Options in this variable are passed next to the
- subsequent call of \`pg_upgrade\`. For more info
- about possible options please look at man
- pg_upgrade(1).
- PGSETUP_DEBUG Set to '1' if you want to see debugging output."
-
-# note that these options are useful at least for help2man processing
-case "$1" in
- --version)
- echo "postgresql-setup $PGVERSION"
- exit 0
- ;;
- --help|--usage)
- echo "$USAGE_STRING"
- exit 0
- ;;
-esac
-
-# this parsing technique fails for PGDATA pathnames containing spaces,
-# but there's not much I can do about it given systemctl's output format...
-PGDATA=`systemctl show -p Environment "${SERVICE_NAME}.service" |
- sed 's/^Environment=//' | tr ' ' '\n' |
- sed -n 's/^PGDATA=//p' | tail -n 1`
-if [ x"$PGDATA" = x ]; then
- echo "failed to find PGDATA setting in ${SERVICE_NAME}.service"
- exit 1
-fi
-
-PGPORT=`systemctl show -p Environment "${SERVICE_NAME}.service" |
- sed 's/^Environment=//' | tr ' ' '\n' |
- sed -n 's/^PGPORT=//p' | tail -n 1`
-if [ x"$PGPORT" = x ]; then
- echo "failed to find PGPORT setting in ${SERVICE_NAME}.service"
- exit 1
-fi
-
-# Log file for initdb
-PGLOG=/var/lib/pgsql/initdb.log
-
-# Log file for pg_upgrade
-PGUPLOG=/var/lib/pgsql/pgupgrade.log
-
-export PGDATA
-export PGPORT
-
-# For SELinux we need to use 'runuser' not 'su'
-if command -v runuser &>/dev/null; then
- SU=runuser
-else
- SU=su
-fi
-
-script_result=0
-
-# code shared between initdb and upgrade actions
-perform_initdb(){
- if [ ! -e "$PGDATA" ]; then
- mkdir "$PGDATA" || return 1
- chown postgres:postgres "$PGDATA"
- chmod go-rwx "$PGDATA"
- fi
- # Clean up SELinux tagging for PGDATA
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
-
- # Create the initdb log file if needed
- if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]; then
- touch "$PGLOG" || return 1
- chown postgres:postgres "$PGLOG"
- chmod go-rwx "$PGLOG"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
- fi
-
- # Initialize the database
- initdbcmd="$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'"
- initdbcmd+=" $PGSETUP_INITDB_OPTIONS"
-
- $SU -l postgres -c "$initdbcmd" >> "$PGLOG" 2>&1 < /dev/null
-
- # Create directory for postmaster log files
- mkdir "$PGDATA/pg_log"
- chown postgres:postgres "$PGDATA/pg_log"
- chmod go-rwx "$PGDATA/pg_log"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA/pg_log"
-
- if [ -f "$PGDATA/PG_VERSION" ]; then
- return 0
- fi
- return 1
-}
-
-initdb(){
- if [ -f "$PGDATA/PG_VERSION" ]; then
- echo $"Data directory is not empty!"
- echo
- script_result=1
- else
- echo -n $"Initializing database ... "
- if perform_initdb; then
- echo $"OK"
- else
- echo $"failed, see $PGLOG"
- script_result=1
- fi
- echo
- fi
-}
-
-upgrade(){
- # must see previous version in PG_VERSION
- if [ ! -f "$PGDATA/PG_VERSION" -o \
- x`cat "$PGDATA/PG_VERSION"` != x"$PREVMAJORVERSION" ]
- then
- echo
- echo $"Cannot upgrade because the database in $PGDATA is not of"
- echo $"compatible previous version $PREVMAJORVERSION."
- echo
- exit 1
- fi
- if [ ! -x "$PGENGINE/pg_upgrade" ]; then
- echo
- echo $"Please install the postgresql-upgrade RPM."
- echo
- exit 5
- fi
-
- # Set up log file for pg_upgrade
- rm -f "$PGUPLOG"
- touch "$PGUPLOG" || exit 1
- chown postgres:postgres "$PGUPLOG"
- chmod go-rwx "$PGUPLOG"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGUPLOG"
-
- # Move old DB to PGDATAOLD
- PGDATAOLD="${PGDATA}-old"
- rm -rf "$PGDATAOLD"
- mv "$PGDATA" "$PGDATAOLD" || exit 1
-
- # Create configuration file for upgrade process
- HBA_CONF_BACKUP="$PGDATAOLD/pg_hba.conf.postgresql-setup.`date +%s`"
- HBA_CONF_BACKUP_EXISTS=0
-
- if [ ! -f $HBA_CONF_BACKUP ]; then
- mv "$PGDATAOLD/pg_hba.conf" "$HBA_CONF_BACKUP"
- HBA_CONF_BACKUP_EXISTS=1
-
- # For fluent upgrade 'postgres' user should be able to connect
- # to any database without password. Temporarily, no other type
- # of connection is needed.
- echo "local all postgres ident" > "$PGDATAOLD/pg_hba.conf"
- fi
-
- echo -n $"Upgrading database: "
-
- # Create empty new-format database
- if perform_initdb; then
- # Do the upgrade
- $SU -l postgres -c "$PGENGINE/pg_upgrade \
- '--old-bindir=$PREVPGENGINE' \
- '--new-bindir=$PGENGINE' \
- '--old-datadir=$PGDATAOLD' \
- '--new-datadir=$PGDATA' \
- --link \
- '--old-port=$PGPORT' '--new-port=$PGPORT' \
- --user=postgres \
- $PGSETUP_PGUPGRADE_OPTIONS" \
- >> "$PGUPLOG" 2>&1 < /dev/null
- if [ $? -ne 0 ]; then
- # pg_upgrade failed
- script_result=1
- fi
- else
- # initdb failed
- script_result=1
- fi
-
- # Move back the backed-up pg_hba.conf regardless of the script_result.
- if [ x$HBA_CONF_BACKUP_EXISTS = x1 ]; then
- mv -f "$HBA_CONF_BACKUP" "$PGDATAOLD/pg_hba.conf"
- fi
-
- if [ $script_result -eq 0 ]; then
- echo $"OK"
- echo
- echo $"The configuration files were replaced by default configuration."
- echo $"The previous configuration and data are stored in folder"
- echo $PGDATAOLD.
- else
- # Clean up after failure
- rm -rf "$PGDATA"
- mv "$PGDATAOLD" "$PGDATA"
- echo $"failed"
- fi
- echo
- echo $"See $PGUPLOG for details."
-}
-
-# See how we were called.
-case "$1" in
- initdb)
- initdb
- ;;
- upgrade)
- upgrade
- ;;
- *)
- echo >&2 "$USAGE_STRING"
- exit 2
-esac
-
-exit $script_result
diff --git a/postgresql.service b/postgresql.service
deleted file mode 100644
index f390308..0000000
--- a/postgresql.service
+++ /dev/null
@@ -1,63 +0,0 @@
-# It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades. If you want to customize, the
-# best way is to create a file "/etc/systemd/system/postgresql.service",
-# containing
-# .include /lib/systemd/system/postgresql.service
-# ...make your changes here...
-# For more info about custom unit files, see
-# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_a...
-
-# For example, if you want to change the server's port number to 5433,
-# create a file named "/etc/systemd/system/postgresql.service" containing:
-# .include /lib/systemd/system/postgresql.service
-# [Service]
-# Environment=PGPORT=5433
-# This will override the setting appearing below.
-
-# Note: changing PGPORT or PGDATA will typically require adjusting SELinux
-# configuration as well; see /usr/share/doc/postgresql/README.rpm-dist.
-
-# Note: do not use a PGDATA pathname containing spaces, or you will
-# break postgresql-setup.
-
-# Note: in F-17 and beyond, /usr/lib/... is recommended in the .include line
-# though /lib/... will still work.
-
-[Unit]
-Description=PostgreSQL database server
-After=network.target
-
-[Service]
-Type=forking
-
-User=postgres
-Group=postgres
-
-# Port number for server to listen on
-Environment=PGPORT=5432
-
-# Location of database directory
-Environment=PGDATA=/var/lib/pgsql/data
-
-# Where to send early-startup messages from the server (before the logging
-# options of postgresql.conf take effect)
-# This is normally controlled by the global default set by systemd
-# StandardOutput=syslog
-
-# Disable OOM kill on the postmaster
-OOMScoreAdjust=-1000
-# ... but allow it still to be effective for child processes
-# (note that these settings are ignored by Postgres releases before 9.5)
-Environment=PG_OOM_ADJUST_FILE=/proc/self/oom_score_adj
-Environment=PG_OOM_ADJUST_VALUE=0
-
-ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGDATA}
-ExecStart=/usr/bin/pg_ctl start -D ${PGDATA} -s -o "-p ${PGPORT}" -w -t 300
-ExecStop=/usr/bin/pg_ctl stop -D ${PGDATA} -s -m fast
-ExecReload=/usr/bin/pg_ctl reload -D ${PGDATA} -s
-
-# Give a reasonable amount of time for the server to start up/shut down
-TimeoutSec=300
-
-[Install]
-WantedBy=multi-user.target
diff --git a/postgresql.spec b/postgresql.spec
index e658f44..e0634e8 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.5
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -85,24 +85,26 @@ Url: http://www.postgresql.org/
%global prevversion 9.2.9
%global prevmajorversion 9.2
+%global setup_version 1.0.0
+
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
Source1: postgresql-%{version}-US.pdf
# generate-pdf.sh is not used during RPM build, but include for documentation
Source2: generate-pdf.sh
Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
-Source4: postgresql-check-db-dir
-Source5: Makefile.regress
-Source6: pg_config.h
-Source7: ecpg_config.h
-Source8: README.rpm-dist
-Source9: postgresql-setup
-Source10: postgresql.service
-Source11: initdb.sh
-Source12: upgrade.sh
-Source13: postgresql.tmpfiles.d
-Source14: postgresql.pam
-Source15: postgresql-bashprofile
+Source4: Makefile.regress
+Source5: pg_config.h
+Source6: ecpg_config.h
+Source7: initdb.sh
+Source8: upgrade.sh
+Source9: postgresql.tmpfiles.d
+Source10: postgresql.pam
+Source11: postgresql-bashprofile
+
+# Temporary location of postgresql-setup. Development git:
+# http://fedorapeople.org/cgit/praiskup/public_git/postgresql-setup.git/
+Source12: http://praiskup.fedorapeople.org/proj/postgresql-setup/postgresql-setup-%...
# Those here are just to enforce packagers check that the tarball was downloaded
# correctly. Also, this allows us check that packagers-only tarballs do not
@@ -346,7 +348,7 @@ benchmarks.
%prep
( cd %_sourcedir; sha256sum -c %{SOURCE16}; sha256sum -c %{SOURCE17} )
-%setup -q
+%setup -q -a 12
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -377,25 +379,6 @@ cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
find . -type f -name .gitignore | xargs rm
-# prep the setup script, including insertion of some values it needs
-sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
- -e 's|^PGMAJORVERSION=.*$|PGMAJORVERSION=%{majorversion}|' \
- -e 's|^PGENGINE=.*$|PGENGINE=%{_bindir}|' \
- -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
- -e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
- -e 's|^README_RPM_DIST=.*$|README_RPM_DIST=%{_pkgdocdir}/%(basename %{SOURCE8})|' \
- <%{SOURCE9} >postgresql-setup
-touch -r %{SOURCE9} postgresql-setup
-chmod +x postgresql-setup
-help2man -N -m "Postgresql RPM-dist manual" ./postgresql-setup -o postgresql-setup.1
-
-# prep the startup check script, including insertion of some values it needs
-sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
- -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
- -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_pkgdocdir}|' \
- <%{SOURCE4} >postgresql-check-db-dir
-touch -r %{SOURCE4} postgresql-check-db-dir
-
%build
# fail quickly and obviously if user tries to build as root
@@ -408,6 +391,24 @@ touch -r %{SOURCE4} postgresql-check-db-dir
fi
%endif
+# Building postgresql-setup
+
+cd postgresql-setup-%{setup_version}
+
+export POSTGRES_BIN=%{_bindir}/postgres \
+ PG_CTL_BIN=%{_bindir}/pg_ctl \
+ PGVERSION=%{version} \
+ PGMAJORVERSION=%{majorversion} \
+ PGENGINE=%{_bindir} \
+ PREVMAJORVERSION=%{prevmajorversion} \
+ PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin \
+ README_DIST=%{_pkgdocdir}/README.rpm-dist \
+ PKGCONFIG_DIR=%{_sysconfdir}/postgresql
+%configure
+
+make %{?_smp_mflags}
+cd ..
+
# Fiddling with CFLAGS.
CFLAGS="${CFLAGS:-%optflags}"
@@ -621,6 +622,10 @@ rm -f src/tutorial/GNUmakefile
%install
+cd postgresql-setup-%{setup_version}
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
make DESTDIR=$RPM_BUILD_ROOT install-world
%if %plpython3
@@ -646,11 +651,11 @@ install -D -m 644 macros.%{name} \
case `uname -i` in
i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
- install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/usr/include/
+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
- install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
- install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
+ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/usr/include/
;;
*)
;;
@@ -659,21 +664,13 @@ esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp -p src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
-install -m 755 postgresql-setup $RPM_BUILD_ROOT%{_bindir}/postgresql-setup
-install -p -m 644 postgresql-setup.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-check-db-dir
-
-install -d $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/postgresql.service
-
install -d $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/initdb
-install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/upgrade
+install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/initdb
+install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/upgrade
%if %pam
install -d $RPM_BUILD_ROOT/etc/pam.d
-install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
%endif
# Create the directory for sockets.
@@ -681,7 +678,7 @@ install -d -m 755 $RPM_BUILD_ROOT/var/run/postgresql
# ... and make a tmpfiles script to recreate it at reboot.
mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
-install -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
+install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
@@ -690,7 +687,7 @@ install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
# postgres' .bash_profile
-install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
%if %upgrade
@@ -750,12 +747,10 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
rm -f GNUmakefile Makefile *.o
chmod 0755 pg_regress regress.so
popd
- cp %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
+ cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
%endif
-# Fix some more documentation
-cp %{SOURCE8} README.rpm-dist
rm -rf doc/html # HACK! allow 'rpmbuild -bi --short-circuit'
mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
@@ -882,7 +877,6 @@ fi
%files -f main.lst
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
%doc COPYRIGHT README HISTORY doc/bug.template
-%doc README.rpm-dist
%{_bindir}/clusterdb
%{_bindir}/createdb
%{_bindir}/createlang
@@ -1046,6 +1040,7 @@ fi
%files server -f server.lst
%{_unitdir}/postgresql.service
+%{_unitdir}/postgresql@.service
%dir /usr/libexec/initscripts/legacy-actions/postgresql
/usr/libexec/initscripts/legacy-actions/postgresql/*
%if %pam
@@ -1060,7 +1055,6 @@ fi
%{_bindir}/postgres
%{_bindir}/postmaster
%{_bindir}/postgresql-setup
-%{_bindir}/postgresql-check-db-dir
%{_mandir}/man1/initdb.*
%{_mandir}/man1/pg_basebackup.*
%{_mandir}/man1/pg_controldata.*
@@ -1096,6 +1090,8 @@ fi
%{_datadir}/pgsql/information_schema.sql
%{_datadir}/pgsql/snowball_create.sql
%{_datadir}/pgsql/sql_features.txt
+%{_libexecdir}/postgresql-ctl
+%{_libexecdir}/postgresql-check-db-dir
%files devel -f devel.lst
/usr/include/*
@@ -1155,6 +1151,9 @@ fi
%endif
%changelog
+* Sun Sep 21 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-6
+- postgresql-setup & relatives are now in separate tarball
+
* Wed Aug 27 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.3.5-5
- Perl 5.20 rebuild
diff --git a/sources b/sources
index 56c0066..c4d5161 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@
38b0937c86d537d5044c599273066cfc postgresql-9.2.9.tar.bz2
08b4a99710e25d7004d058997cdb1ebc postgresql-9.2.9.tar.bz2.sha256
5d8361190dd064a655b21f112daa91ec postgresql-9.3.5-US.pdf
+2e601b008c98b991c38a8d7443b13e76 postgresql-setup-1.0.0.tar.gz
commit 721530b8e42c68c576eb444c71dcaed6df48e982
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Wed Aug 27 17:46:57 2014 +0200
Perl 5.20 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 7d55318..e658f44 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.5
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1155,6 +1155,9 @@ fi
%endif
%changelog
+* Wed Aug 27 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 9.3.5-5
+- Perl 5.20 rebuild
+
* Thu Aug 21 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-4
- install macros.postgresql, not postgresql.macros
commit ebf59e42fa96831d28f98c62bf64d9d57111888b
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Aug 21 15:32:39 2014 +0200
rpm-macros: install macros.%{name}, not %{name}.macros
The %{name}.macros file is not loaded by rpm. Spotted by jmlich
through regular dependency checker in Fedora & postgresql-ip4r
package.
Version: 9.3.5-4
diff --git a/postgresql.spec b/postgresql.spec
index 58a7945..7d55318 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.5
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -639,7 +639,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
echo "%%%{name}_major %{majorversion}" > macros.%{name}
install -D -m 644 macros.%{name} \
- $RPM_BUILD_ROOT%{macrosdir}/%{name}.macros
+ $RPM_BUILD_ROOT%{macrosdir}/macros.%{name}
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
@@ -1155,6 +1155,9 @@ fi
%endif
%changelog
+* Thu Aug 21 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-4
+- install macros.postgresql, not postgresql.macros
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit 09271080e29044b92985cb438ed1c7625ebae7a5
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Sun Aug 17 19:40:36 2014 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 297c4db..58a7945 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1155,6 +1155,9 @@ fi
%endif
%changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.3.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Thu Jul 24 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-2
- fix the prevversion sum link and comment a little
commit c9a55bd785f74e3cf6af4fb72a1a74db0e2e8927
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jul 24 13:44:01 2014 +0200
spec: fix prevversion checksum link
Version: 9.3.5-2
diff --git a/postgresql.spec b/postgresql.spec
index c40ecab..297c4db 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -104,8 +104,11 @@ Source13: postgresql.tmpfiles.d
Source14: postgresql.pam
Source15: postgresql-bashprofile
+# Those here are just to enforce packagers check that the tarball was downloaded
+# correctly. Also, this allows us check that packagers-only tarballs do not
+# differ with publicly released ones.
Source16: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
-Source17: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{prevversion}...
+Source17: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
# Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch
@@ -1152,6 +1155,9 @@ fi
%endif
%changelog
+* Thu Jul 24 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-2
+- fix the prevversion sum link and comment a little
+
* Tue Jul 22 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-1
- update to 9.3.5 per release notes
http://www.postgresql.org/docs/9.3/static/release-9-3-5.html
commit 0e0465561c44a144259ebded3ad88607b7e712f2
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jul 22 09:20:05 2014 +0200
rebase: minor release update
Per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-5.html
Version: 9.3.5-1
diff --git a/.gitignore b/.gitignore
index 0250a8f..1d2f5e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
-/postgresql-9.3.4-US.pdf
-/postgresql-9.3.4.tar.bz2
-/postgresql-9.2.8.tar.bz2
+/postgresql-9.3.5.tar.bz2
+/postgresql-9.3.5.tar.bz2.sha256
+/postgresql-9.2.9.tar.bz2
+/postgresql-9.2.9.tar.bz2.sha256
+/postgresql-9.3.5-US.pdf
diff --git a/postgresql-python34.patch b/postgresql-python34.patch
deleted file mode 100644
index b9f3302..0000000
--- a/postgresql-python34.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-The error message for undefined names *inside functions* (not for undefined
-names on global level) has changed in Python 3.4 compared to 3.3.
-
-Particularly error string "NameError: global name 'nonsense' is not defined"
-has become "ERROR: NameError: name 'nonsense' is not defined" in Python 3.4.
-
-This patch also raises an exception, but the exceptin message is the same
-across Python versions.
-
-diff -up postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out.python34 postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out
---- postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out.python34 2014-05-23 15:42:50.462783074 +0200
-+++ postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out 2014-05-23 16:09:28.501654085 +0200
-@@ -4,9 +4,9 @@ CONTEXT: PL/Python anonymous code block
- DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
- NOTICE: This is plpython2u.
- CONTEXT: PL/Python anonymous code block
--DO $$ nonsense $$ LANGUAGE plpythonu;
--ERROR: NameError: global name 'nonsense' is not defined
-+DO $$ raise Exception("Sample error") $$ LANGUAGE plpythonu;
-+ERROR: Exception: Sample error
- CONTEXT: Traceback (most recent call last):
- PL/Python anonymous code block, line 1, in <module>
-- nonsense
-+ raise Exception("Sample error")
- PL/Python anonymous code block
-diff -up postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql.python34 postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql
---- postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql.python34 2014-05-23 15:42:24.240756276 +0200
-+++ postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql 2014-05-23 16:10:31.363475875 +0200
-@@ -2,4 +2,4 @@ DO $$ plpy.notice("This is plpythonu.")
-
- DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
-
--DO $$ nonsense $$ LANGUAGE plpythonu;
-+DO $$ raise Exception("Sample error") $$ LANGUAGE plpythonu;
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 3a7eddf..4fecc90 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -12,29 +12,11 @@ server package update, without requiring any existing postgresql.conf
to be updated. (Of course, a user who dislikes this behavior can still
override it via postgresql.conf.)
-
-diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
-index 30bc527..4e8f6a4 100644
---- a/contrib/pg_upgrade/test.sh
-+++ b/contrib/pg_upgrade/test.sh
-@@ -107,6 +107,12 @@ done
- EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
- export EXTRA_REGRESS_OPTS
-
-+# we want the Unix sockets in $temp_root
-+PGHOST=$temp_root
-+export PGHOST
-+
-+POSTMASTER_OPTS="$POSTMASTER_OPTS -c unix_socket_directories='$PGHOST'"
-+
- # enable echo so the user can see what is being executed
- set -x
-
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
-index a055231..20b8c87 100644
+index 2b6527f..8e178d4 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
-@@ -2929,7 +2929,7 @@ static struct config_string ConfigureNamesString[] =
+@@ -2971,7 +2971,7 @@ static struct config_string ConfigureNamesString[] =
},
&Unix_socket_directories,
#ifdef HAVE_UNIX_SOCKETS
@@ -44,10 +26,10 @@ index a055231..20b8c87 100644
"",
#endif
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
-index 5fc7291..d871341 100644
+index abf1586..8c01d48 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
-@@ -1203,7 +1203,7 @@ setup_config(void)
+@@ -1204,7 +1204,7 @@ setup_config(void)
#ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -57,7 +39,7 @@ index 5fc7291..d871341 100644
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
-index 02bcd92..8aaf58b 100644
+index 24c5069..aeec705 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -144,7 +144,7 @@
@@ -69,25 +51,3 @@ index 02bcd92..8aaf58b 100644
/*
* The random() function is expected to yield values between 0 and
-diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
-index b632326..943165c 100644
---- a/src/test/regress/pg_regress.c
-+++ b/src/test/regress/pg_regress.c
-@@ -772,7 +772,7 @@ initialize_environment(void)
- if (hostname != NULL)
- doputenv("PGHOST", hostname);
- else
-- unsetenv("PGHOST");
-+ doputenv("PGHOST", "/tmp");
- unsetenv("PGHOSTADDR");
- if (port != -1)
- {
-@@ -2249,7 +2249,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
- */
- header(_("starting postmaster"));
- snprintf(buf, sizeof(buf),
-- SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
-+ SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" -c \"unix_socket_directories=/tmp\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
- bindir, temp_install,
- debug ? " -d 5" : "",
- hostname ? hostname : "",
diff --git a/postgresql.spec b/postgresql.spec
index 28d55af..c40ecab 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -66,8 +66,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
-Version: 9.3.4
-Release: 8%{?dist}
+Version: 9.3.5
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -82,7 +82,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.2.8
+%global prevversion 9.2.9
%global prevmajorversion 9.2
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -104,6 +104,9 @@ Source13: postgresql.tmpfiles.d
Source14: postgresql.pam
Source15: postgresql-bashprofile
+Source16: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+Source17: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{prevversion}...
+
# Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
@@ -111,7 +114,6 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-python34.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -340,14 +342,14 @@ benchmarks.
%endif
%prep
-%setup -q
+( cd %_sourcedir; sha256sum -c %{SOURCE16}; sha256sum -c %{SOURCE17} )
+%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1150,6 +1152,10 @@ fi
%endif
%changelog
+* Tue Jul 22 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.5-1
+- update to 9.3.5 per release notes
+ http://www.postgresql.org/docs/9.3/static/release-9-3-5.html
+
* Fri Jul 18 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-8
- provide postgresql-doc for postgresql-docs package (#1086420)
- move html documentation to *-docs subpackage (#1086420)
diff --git a/sources b/sources
index 4b21ddd..56c0066 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
-48bd3cff27b4fada760771688f1cecee postgresql-9.3.4-US.pdf
-d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2
-c5c65a9b45ee53ead0b659be21ca1b97 postgresql-9.2.8.tar.bz2
+5059857c7d7e6ad83b6d55893a121b59 postgresql-9.3.5.tar.bz2
+60b858fb6c7e06bf05a9c5f4dc5a8932 postgresql-9.3.5.tar.bz2.sha256
+38b0937c86d537d5044c599273066cfc postgresql-9.2.9.tar.bz2
+08b4a99710e25d7004d058997cdb1ebc postgresql-9.2.9.tar.bz2.sha256
+5d8361190dd064a655b21f112daa91ec postgresql-9.3.5-US.pdf
commit 4f1d2a08337f371e7d81436b18c33611289ad5e4
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jul 3 16:24:41 2014 +0200
devel: guard against incompabtible plugin installation
Each package having some *.so plugin for postgresql-server should
be rebuilt against each major version bump of PostgreSQL. Using
this statements in F21+
BuildRequires: postgresql-devel
Require: postgresql-server(:MODULE_COMPAT_%{postgresql_major})
then automatically blocks installation of postgresql-server and
incompatible plugin at the same time and thus indirectly forces
plugin maintainers to rebuild their packages against newer server.
File macros.postgresql now starts providing correct
%{postgresql_major} macro.
Resolves: #1008939
Version: 9.3.4-8
diff --git a/postgresql.spec b/postgresql.spec
index f8449da..28d55af 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,6 +60,9 @@
# _pkgdocdir is defined in fc20+, remove once f19 is dead
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Addition...
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
@@ -208,6 +211,12 @@ Requires(postun): systemd-units
# should fire just after this package is installed.
Requires(post): systemd-sysv
Requires(post): chkconfig
+# Packages which provide postgresql plugins should build-require
+# postgresql-devel and require
+# postgresql-server(:MODULE_COMPAT_%%{postgresql_major}).
+# This will automatically guard against incompatible server & plugin
+# installation (#1008939, #1007840)
+Provides: %{name}-server(:MODULE_COMPAT_%{majorversion})
%description server
PostgreSQL is an advanced Object-Relational database management system (DBMS).
@@ -623,6 +632,10 @@ make DESTDIR=$RPM_BUILD_ROOT install-world
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/contrib
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
+echo "%%%{name}_major %{majorversion}" > macros.%{name}
+install -D -m 644 macros.%{name} \
+ $RPM_BUILD_ROOT%{macrosdir}/%{name}.macros
+
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in
@@ -1090,6 +1103,7 @@ fi
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man1/ecpg.*
%{_mandir}/man3/SPI_*
+%{macrosdir}/*
%if %upgrade
%files upgrade
@@ -1136,9 +1150,11 @@ fi
%endif
%changelog
-* Wed Jun 25 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-8
+* Fri Jul 18 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-8
- provide postgresql-doc for postgresql-docs package (#1086420)
- move html documentation to *-docs subpackage (#1086420)
+- provide postgresql-server(:MODULE_COMPAT_%%{postgresql_major}) to guard
+ against incompatible plugin installation (#1008939)
* Thu Jun 19 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-7
- OOM handling compatible with 9.5+, by Tom Lane (#1110969)
commit bf770dd7e12585193cf510b6a8dfe2d7119c7479
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Jun 25 16:51:05 2014 +0200
spec: move big html documentation from base to *-docs package
Resolves: #1086420
Version: 9.3.4-8
diff --git a/README.rpm-dist b/README.rpm-dist
index e628f83..b582354 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -109,13 +109,13 @@ choose' what pieces are needed, and what dependencies are required.
The RPMset is packaged in the following subpackages:
-postgresql: Key client programs and documentation
+postgresql: Key client programs and basic documentation
postgresql-libs: Client shared libraries
postgresql-server: Server executables and data files
postgresql-devel: Development libraries and include files
postgresql-test: The regression tests and associated files
postgresql-upgrade: Support files for upgrading from previous major version
-postgresql-docs: Extra documentation, such as the tutorial files
+postgresql-docs: Full documentation in HTML and PDF, the tutorial files
postgresql-contrib: Add-on loadable modules and programs
postgresql-plperl: PL/Perl procedural language
postgresql-plpython: PL/Python procedural language (for Python 2)
diff --git a/postgresql.spec b/postgresql.spec
index cdbfb7e..f8449da 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -865,7 +865,6 @@ fi
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
%doc COPYRIGHT README HISTORY doc/bug.template
%doc README.rpm-dist
-%doc doc/html
%{_bindir}/clusterdb
%{_bindir}/createdb
%{_bindir}/createlang
@@ -902,6 +901,7 @@ fi
%files docs
%doc *-US.pdf
%{_libdir}/pgsql/tutorial/
+%doc doc/html
%files contrib
%{_datadir}/pgsql/extension/adminpack*
@@ -1138,6 +1138,7 @@ fi
%changelog
* Wed Jun 25 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-8
- provide postgresql-doc for postgresql-docs package (#1086420)
+- move html documentation to *-docs subpackage (#1086420)
* Thu Jun 19 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-7
- OOM handling compatible with 9.5+, by Tom Lane (#1110969)
commit a4d772f81cdb517e02bb736df5728dfe97b26e07
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Jun 25 16:48:39 2014 +0200
spec: provide postgresql-doc by postgresql-docs
Related: #1086420
Version: 9.3.4-8
diff --git a/postgresql.spec b/postgresql.spec
index 4c46edc..cdbfb7e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 7%{?dist}
+Release: 8%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -220,6 +220,8 @@ and maintain PostgreSQL databases.
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
Requires: %{name}%{?_isa} = %{version}-%{release}
+# Just for more intuitive documentation installation
+Provides: %{name}-doc = %{version}-%{release}
%description docs
The postgresql-docs package contains some additional documentation for
@@ -1134,6 +1136,9 @@ fi
%endif
%changelog
+* Wed Jun 25 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-8
+- provide postgresql-doc for postgresql-docs package (#1086420)
+
* Thu Jun 19 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-7
- OOM handling compatible with 9.5+, by Tom Lane (#1110969)
commit 49f074f1918a614a7fd1ce8fd7ce3e1234a85e9d
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jun 19 18:31:18 2014 +0200
service: OOM handling set compatibly with 9.5+
Thanks Tom.
Resolves: #1110969
Version: 9.3.4-7
diff --git a/postgresql.service b/postgresql.service
index aa63e1a..f390308 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -46,6 +46,10 @@ Environment=PGDATA=/var/lib/pgsql/data
# Disable OOM kill on the postmaster
OOMScoreAdjust=-1000
+# ... but allow it still to be effective for child processes
+# (note that these settings are ignored by Postgres releases before 9.5)
+Environment=PG_OOM_ADJUST_FILE=/proc/self/oom_score_adj
+Environment=PG_OOM_ADJUST_VALUE=0
ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGDATA}
ExecStart=/usr/bin/pg_ctl start -D ${PGDATA} -s -o "-p ${PGPORT}" -w -t 300
diff --git a/postgresql.spec b/postgresql.spec
index 1db55b8..4c46edc 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 6%{?dist}
+Release: 7%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -402,6 +402,7 @@ CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100`
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
# Add LINUX_OOM_SCORE_ADJ=0 to ensure child processes reset postmaster's oom_score_adj
+# (this define will be useless in Postgres 9.5 and later)
CFLAGS="$CFLAGS -DLINUX_OOM_SCORE_ADJ=0"
export CFLAGS
@@ -1133,6 +1134,9 @@ fi
%endif
%changelog
+* Thu Jun 19 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-7
+- OOM handling compatible with 9.5+, by Tom Lane (#1110969)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.3.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit abb534ae56a59e293208e224fd4f670f4fde38c0
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 11:53:55 2014 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 23f1f62..1db55b8 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1133,6 +1133,9 @@ fi
%endif
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.3.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Mon May 26 2014 Honza Horak <hhorak(a)redhat.com> - 9.3.4-5
- Rebuild for Python 3.4
commit 729866cc368023e41eac0961256b1b15a204a75b
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon May 26 08:42:49 2014 +0200
Rebuild for Python 3.4
diff --git a/postgresql.spec b/postgresql.spec
index 9a1147f..23f1f62 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1133,6 +1133,9 @@ fi
%endif
%changelog
+* Mon May 26 2014 Honza Horak <hhorak(a)redhat.com> - 9.3.4-5
+- Rebuild for Python 3.4
+
* Fri May 23 2014 Honza Horak <hhorak(a)redhat.com> - 9.3.4-4
- Change plpython_do test a bit so it is universal for all python versions
commit 832a5a0ffdb90adf9eb6fe03412d100192d34828
Author: Honza Horak <hhorak(a)redhat.com>
Date: Fri May 23 16:53:07 2014 +0200
Change plpython_do test a bit so it is universal for all python versions
diff --git a/postgresql-python34.patch b/postgresql-python34.patch
new file mode 100644
index 0000000..b9f3302
--- /dev/null
+++ b/postgresql-python34.patch
@@ -0,0 +1,34 @@
+The error message for undefined names *inside functions* (not for undefined
+names on global level) has changed in Python 3.4 compared to 3.3.
+
+Particularly error string "NameError: global name 'nonsense' is not defined"
+has become "ERROR: NameError: name 'nonsense' is not defined" in Python 3.4.
+
+This patch also raises an exception, but the exceptin message is the same
+across Python versions.
+
+diff -up postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out.python34 postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out
+--- postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out.python34 2014-05-23 15:42:50.462783074 +0200
++++ postgresql-9.3.4/src/pl/plpython/expected/plpython_do.out 2014-05-23 16:09:28.501654085 +0200
+@@ -4,9 +4,9 @@ CONTEXT: PL/Python anonymous code block
+ DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
+ NOTICE: This is plpython2u.
+ CONTEXT: PL/Python anonymous code block
+-DO $$ nonsense $$ LANGUAGE plpythonu;
+-ERROR: NameError: global name 'nonsense' is not defined
++DO $$ raise Exception("Sample error") $$ LANGUAGE plpythonu;
++ERROR: Exception: Sample error
+ CONTEXT: Traceback (most recent call last):
+ PL/Python anonymous code block, line 1, in <module>
+- nonsense
++ raise Exception("Sample error")
+ PL/Python anonymous code block
+diff -up postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql.python34 postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql
+--- postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql.python34 2014-05-23 15:42:24.240756276 +0200
++++ postgresql-9.3.4/src/pl/plpython/sql/plpython_do.sql 2014-05-23 16:10:31.363475875 +0200
+@@ -2,4 +2,4 @@ DO $$ plpy.notice("This is plpythonu.")
+
+ DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
+
+-DO $$ nonsense $$ LANGUAGE plpythonu;
++DO $$ raise Exception("Sample error") $$ LANGUAGE plpythonu;
diff --git a/postgresql.spec b/postgresql.spec
index ce3b2b2..9a1147f 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -108,6 +108,7 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+Patch7: postgresql-python34.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -335,6 +336,7 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1131,6 +1133,9 @@ fi
%endif
%changelog
+* Fri May 23 2014 Honza Horak <hhorak(a)redhat.com> - 9.3.4-4
+- Change plpython_do test a bit so it is universal for all python versions
+
* Wed May 21 2014 Jaroslav karvada <jskarvad(a)redhat.com> - 9.3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
commit b57df46f2d198027f94f571a26d8fb2b482cd2af
Author: Jaroslav karvada <jskarvad(a)redhat.com>
Date: Wed May 21 12:31:43 2014 +0200
- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
diff --git a/postgresql.spec b/postgresql.spec
index 8c18fc5..ce3b2b2 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1131,6 +1131,9 @@ fi
%endif
%changelog
+* Wed May 21 2014 Jaroslav karvada <jskarvad(a)redhat.com> - 9.3.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+
* Wed May 14 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-2
- set basic $PATH when it is empty or unset, (#1097317)
commit 533a1efbb605600e2d64d38d3c2419113bdd3b84
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed May 14 13:33:10 2014 +0200
postgresql-setup: work even if $PATH is unset or empty
.. by setting $PATH to default value. Also check for command
existence by 'command' built-in instead of checking for file
existence.
Version: 9.3.4-2
Resolves: #1097317
diff --git a/postgresql-setup b/postgresql-setup
index acf07f7..7ce7b9f 100755
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -2,6 +2,8 @@
#
# postgresql-setup - Initialization and upgrade operations for PostgreSQL
+test -z "$PATH" && export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+
test x"$PGSETUP_DEBUG" != x && set -x
# PGVERSION is the full package version, e.g., 9.0.2
@@ -100,7 +102,7 @@ export PGDATA
export PGPORT
# For SELinux we need to use 'runuser' not 'su'
-if [ -x /sbin/runuser ]; then
+if command -v runuser &>/dev/null; then
SU=runuser
else
SU=su
diff --git a/postgresql.spec b/postgresql.spec
index c8b30d6..8c18fc5 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1131,6 +1131,9 @@ fi
%endif
%changelog
+* Wed May 14 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-2
+- set basic $PATH when it is empty or unset, (#1097317)
+
* Thu Mar 20 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.4-1
- update to 9.3.4 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-4.html
commit d7e5562ac1ceada99724411fb3d7106a839d0743
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Apr 23 14:41:51 2014 +0200
gitignore: trimmed
Version: 9.3.4-1 (spec untouched)
diff --git a/.gitignore b/.gitignore
index 9843fe2..0250a8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,3 @@
-/postgresql-9.2.4.tar.bz2
-/postgresql-9.3.0-US.pdf
-/postgresql-9.3.0.tar.bz2
-/postgresql-9.3.1-US.pdf
-/postgresql-9.3.1.tar.bz2
-/postgresql-9.2.5.tar.bz2
-/postgresql-9.3.2.tar.bz2
-/postgresql-9.3.2-US.pdf
-/postgresql-9.2.6.tar.bz2
-/postgresql-9.3.3.tar.bz2
-/postgresql-9.3.3-US.pdf
-/postgresql-9.2.7.tar.bz2
/postgresql-9.3.4-US.pdf
/postgresql-9.3.4.tar.bz2
/postgresql-9.2.8.tar.bz2
commit 365123c53c55affabba8bcbf362e36d3d4c9b420
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Mar 20 17:18:11 2014 +0100
update to 9.3.4 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-4.html
diff --git a/.gitignore b/.gitignore
index e4470d7..9843fe2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@
/postgresql-9.3.3.tar.bz2
/postgresql-9.3.3-US.pdf
/postgresql-9.2.7.tar.bz2
+/postgresql-9.3.4-US.pdf
+/postgresql-9.3.4.tar.bz2
+/postgresql-9.2.8.tar.bz2
diff --git a/postgresql-wal-replay-of-locking-an-updated-tuple.patch b/postgresql-wal-replay-of-locking-an-updated-tuple.patch
deleted file mode 100644
index 592507c..0000000
--- a/postgresql-wal-replay-of-locking-an-updated-tuple.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 9a57858f1103b89a5674f0d50c5fe1f756411df6
-Author: Alvaro Herrera <alvherre(a)alvh.no-ip.org>
-Date: Thu Feb 27 11:13:39 2014 -0300
-
- Fix WAL replay of locking an updated tuple
-
- We were resetting the tuple's HEAP_HOT_UPDATED flag as well as t_ctid on
- WAL replay of a tuple-lock operation, which is incorrect when the tuple
- is already updated.
-
- Back-patch to 9.3. The clearing of both header elements was there
- previously, but since no update could be present on a tuple that was
- being locked, it was harmless.
-
- Bug reported by Peter Geoghegan and Greg Stark in
- CAM3SWZTMQiCi5PV5OWHb+bYkUcnCk=O67w0cSswPvV7XfUcU5g(a)mail.gmail.com and
- CAM-w4HPTOeMT4KP0OJK+mGgzgcTOtLRTvFZyvD0O4aH-7dxo3Q(a)mail.gmail.com
- respectively; diagnosis by Andres Freund.
-
-diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
-index 33fc5a7..d94980b 100644
---- a/src/backend/access/heap/heapam.c
-+++ b/src/backend/access/heap/heapam.c
-@@ -7721,11 +7721,19 @@ heap_xlog_lock(XLogRecPtr lsn, XLogRecord *record)
-
- fix_infomask_from_infobits(xlrec->infobits_set, &htup->t_infomask,
- &htup->t_infomask2);
-- HeapTupleHeaderClearHotUpdated(htup);
-+
-+ /*
-+ * Clear relevant update flags, but only if the modified infomask says
-+ * there's no update.
-+ */
-+ if (HEAP_XMAX_IS_LOCKED_ONLY(htup->t_infomask))
-+ {
-+ HeapTupleHeaderClearHotUpdated(htup);
-+ /* Make sure there is no forward chain link in t_ctid */
-+ htup->t_ctid = xlrec->target.tid;
-+ }
- HeapTupleHeaderSetXmax(htup, xlrec->locking_xid);
- HeapTupleHeaderSetCmax(htup, FirstCommandId, false);
-- /* Make sure there is no forward chain link in t_ctid */
-- htup->t_ctid = xlrec->target.tid;
- PageSetLSN(page, lsn);
- MarkBufferDirty(buffer);
- UnlockReleaseBuffer(buffer);
diff --git a/postgresql.spec b/postgresql.spec
index 6cf64db..c8b30d6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,8 +63,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
-Version: 9.3.3
-Release: 2%{?dist}
+Version: 9.3.4
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -79,7 +79,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.2.7
+%global prevversion 9.2.8
%global prevmajorversion 9.2
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -108,7 +108,6 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-wal-replay-of-locking-an-updated-tuple.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -336,7 +335,6 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1133,6 +1131,10 @@ fi
%endif
%changelog
+* Thu Mar 20 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.4-1
+- update to 9.3.4 minor version per release notes:
+ http://www.postgresql.org/docs/9.3/static/release-9-3-4.html
+
* Thu Mar 13 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.3-2
- Fix WAL replay of locking an updated tuple
kudos to Alvaro Herrera
diff --git a/sources b/sources
index 44f43f1..4b21ddd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-0247b0a24e76a3f20cc50c06d0aa2412 postgresql-9.3.3.tar.bz2
-517e6f0f71ead14673093212089680d9 postgresql-9.3.3-US.pdf
-610354e939d3b6d8d1a620504bc25fb2 postgresql-9.2.7.tar.bz2
+48bd3cff27b4fada760771688f1cecee postgresql-9.3.4-US.pdf
+d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2
+c5c65a9b45ee53ead0b659be21ca1b97 postgresql-9.2.8.tar.bz2
commit a21b7d531414db225da7016ae34949fb26435c7f
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Mar 13 13:50:06 2014 +0100
- Fix WAL replay of locking an updated tuple
kudos to Alvaro Herrera
See http://www.postgresql.org/message-id/CA+Tgmob8vfzYrLToqYr7uJ2moW3Gnv8rZpP...
diff --git a/postgresql-wal-replay-of-locking-an-updated-tuple.patch b/postgresql-wal-replay-of-locking-an-updated-tuple.patch
new file mode 100644
index 0000000..592507c
--- /dev/null
+++ b/postgresql-wal-replay-of-locking-an-updated-tuple.patch
@@ -0,0 +1,46 @@
+commit 9a57858f1103b89a5674f0d50c5fe1f756411df6
+Author: Alvaro Herrera <alvherre(a)alvh.no-ip.org>
+Date: Thu Feb 27 11:13:39 2014 -0300
+
+ Fix WAL replay of locking an updated tuple
+
+ We were resetting the tuple's HEAP_HOT_UPDATED flag as well as t_ctid on
+ WAL replay of a tuple-lock operation, which is incorrect when the tuple
+ is already updated.
+
+ Back-patch to 9.3. The clearing of both header elements was there
+ previously, but since no update could be present on a tuple that was
+ being locked, it was harmless.
+
+ Bug reported by Peter Geoghegan and Greg Stark in
+ CAM3SWZTMQiCi5PV5OWHb+bYkUcnCk=O67w0cSswPvV7XfUcU5g(a)mail.gmail.com and
+ CAM-w4HPTOeMT4KP0OJK+mGgzgcTOtLRTvFZyvD0O4aH-7dxo3Q(a)mail.gmail.com
+ respectively; diagnosis by Andres Freund.
+
+diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
+index 33fc5a7..d94980b 100644
+--- a/src/backend/access/heap/heapam.c
++++ b/src/backend/access/heap/heapam.c
+@@ -7721,11 +7721,19 @@ heap_xlog_lock(XLogRecPtr lsn, XLogRecord *record)
+
+ fix_infomask_from_infobits(xlrec->infobits_set, &htup->t_infomask,
+ &htup->t_infomask2);
+- HeapTupleHeaderClearHotUpdated(htup);
++
++ /*
++ * Clear relevant update flags, but only if the modified infomask says
++ * there's no update.
++ */
++ if (HEAP_XMAX_IS_LOCKED_ONLY(htup->t_infomask))
++ {
++ HeapTupleHeaderClearHotUpdated(htup);
++ /* Make sure there is no forward chain link in t_ctid */
++ htup->t_ctid = xlrec->target.tid;
++ }
+ HeapTupleHeaderSetXmax(htup, xlrec->locking_xid);
+ HeapTupleHeaderSetCmax(htup, FirstCommandId, false);
+- /* Make sure there is no forward chain link in t_ctid */
+- htup->t_ctid = xlrec->target.tid;
+ PageSetLSN(page, lsn);
+ MarkBufferDirty(buffer);
+ UnlockReleaseBuffer(buffer);
diff --git a/postgresql.spec b/postgresql.spec
index d0c7829..6cf64db 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -108,6 +108,7 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
+Patch7: postgresql-wal-replay-of-locking-an-updated-tuple.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -335,6 +336,7 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1131,6 +1133,10 @@ fi
%endif
%changelog
+* Thu Mar 13 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.3-2
+- Fix WAL replay of locking an updated tuple
+ kudos to Alvaro Herrera
+
* Thu Feb 20 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.3-1
- update to 9.3.3 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-3.html
commit a2f501b795470a4a7fc42c17fd32b1583f885525
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Feb 20 15:58:24 2014 +0100
update to 9.3.3 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-3.html
diff --git a/.gitignore b/.gitignore
index 34f4e76..e4470d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@
/postgresql-9.3.2.tar.bz2
/postgresql-9.3.2-US.pdf
/postgresql-9.2.6.tar.bz2
+/postgresql-9.3.3.tar.bz2
+/postgresql-9.3.3-US.pdf
+/postgresql-9.2.7.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 82292a1..d0c7829 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,8 +63,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
-Version: 9.3.2
-Release: 7%{?dist}
+Version: 9.3.3
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -79,7 +79,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.2.6
+%global prevversion 9.2.7
%global prevmajorversion 9.2
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -1131,6 +1131,10 @@ fi
%endif
%changelog
+* Thu Feb 20 2014 Jozef Mlich <jmlich(a)redhat.com> - 9.3.3-1
+- update to 9.3.3 minor version per release notes:
+ http://www.postgresql.org/docs/9.3/static/release-9-3-3.html
+
* Thu Jan 23 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-7
- postgresql-setup: typos
diff --git a/sources b/sources
index 7c5bb74..44f43f1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-8c905155e3e9f9367b4299a9acb41d2a postgresql-9.3.2.tar.bz2
-8f7d6baa6abedfef6d926da4fa3e4a2c postgresql-9.3.2-US.pdf
-3e68c0c7468c56f73060a88a377dbde8 postgresql-9.2.6.tar.bz2
+0247b0a24e76a3f20cc50c06d0aa2412 postgresql-9.3.3.tar.bz2
+517e6f0f71ead14673093212089680d9 postgresql-9.3.3-US.pdf
+610354e939d3b6d8d1a620504bc25fb2 postgresql-9.2.7.tar.bz2
commit 6d2de0b6b6baa2b2b33bb33ee648f4fe13894d81
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 23 10:56:07 2014 +0100
postgresql-setup: typos
Version: 9.3.2-7
diff --git a/postgresql-setup b/postgresql-setup
index b30550a..acf07f7 100755
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -8,16 +8,16 @@ test x"$PGSETUP_DEBUG" != x && set -x
# Note: the specfile inserts the correct value during package build
PGVERSION=xxxx
+# PGMAJORVERSION is the major version, e.g. 9.0
+PGMAJORVERSION=xxxx
+
# PGENGINE is the directory containing the postmaster executable
-# Note: the specfile inserts the correct value during package build
PGENGINE=xxxx
# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-# Note: the specfile inserts the correct value during package build
PREVMAJORVERSION=xxxx
# PREVPGENGINE is the directory containing the previous postmaster executable
-# Note: the specfile inserts the correct value during package build
PREVPGENGINE=xxxx
# Absorb configuration settings from the specified systemd service file,
@@ -44,8 +44,9 @@ Available operation mode:
initdb Create a new PostgreSQL database cluster. This is usually the
first action you perform after PostgreSQL server installation.
upgrade Upgrade PostgreSQL database cluster to be usable with new
- server. Use this if upgraded to newer PostgreSQL major version,
- e.g. from 9.1 to 9.2.
+ server. Use this if you upgraded your PostgreSQL server to
+ newer major version (currently from $PREVMAJORVERSION \
+to $PGMAJORVERSION).
Environment:
PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
@@ -236,7 +237,7 @@ upgrade(){
if [ $script_result -eq 0 ]; then
echo $"OK"
echo
- echo $"The configuration files was replaced by default configuration."
+ echo $"The configuration files were replaced by default configuration."
echo $"The previous configuration and data are stored in folder"
echo $PGDATAOLD.
else
diff --git a/postgresql.spec b/postgresql.spec
index 8d894a3..82292a1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -361,6 +361,7 @@ find . -type f -name .gitignore | xargs rm
# prep the setup script, including insertion of some values it needs
sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
+ -e 's|^PGMAJORVERSION=.*$|PGMAJORVERSION=%{majorversion}|' \
-e 's|^PGENGINE=.*$|PGENGINE=%{_bindir}|' \
-e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
-e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
@@ -1130,6 +1131,9 @@ fi
%endif
%changelog
+* Thu Jan 23 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-7
+- postgresql-setup: typos
+
* Tue Jan 21 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-6
- add PGSETUP_PGUPGRADE_OPTIONS env var for postgresql-setup
commit a43ac073bc5b173679ac555ac2421d45ae7b1c13
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jan 21 15:41:35 2014 +0100
postgresql-setup: add PGSETUP_PGUPGRADE_OPTIONS
This allows user to use something like
PGSETUP_PGUPGRADE_OPTIONS="-o '-B 5MB'" to work-around badly set
kernel.shmax value.
Version: 9.3.2-6
diff --git a/postgresql-setup b/postgresql-setup
old mode 100644
new mode 100755
index 8a56028..b30550a
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -48,12 +48,16 @@ Available operation mode:
e.g. from 9.1 to 9.2.
Environment:
- PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
- subsequent call of \`initdb\` binary (see man
- initdb(1)). This variable is used also during
- 'upgrade' mode because the new cluster is actually
- re-initialized from the old one.
- PGSETUP_DEBUG Set to '1' if you want to see debugging output."
+ PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
+ subsequent call of \`initdb\` binary (see man
+ initdb(1)). This variable is used also during
+ 'upgrade' mode because the new cluster is actually
+ re-initialized from the old one.
+ PGSETUP_PGUPGRADE_OPTIONS Options in this variable are passed next to the
+ subsequent call of \`pg_upgrade\`. For more info
+ about possible options please look at man
+ pg_upgrade(1).
+ PGSETUP_DEBUG Set to '1' if you want to see debugging output."
# note that these options are useful at least for help2man processing
case "$1" in
@@ -212,7 +216,9 @@ upgrade(){
'--new-datadir=$PGDATA' \
--link \
'--old-port=$PGPORT' '--new-port=$PGPORT' \
- --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
+ --user=postgres \
+ $PGSETUP_PGUPGRADE_OPTIONS" \
+ >> "$PGUPLOG" 2>&1 < /dev/null
if [ $? -ne 0 ]; then
# pg_upgrade failed
script_result=1
diff --git a/postgresql.spec b/postgresql.spec
index 9eac6ce..8d894a3 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.2
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1130,6 +1130,9 @@ fi
%endif
%changelog
+* Tue Jan 21 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-6
+- add PGSETUP_PGUPGRADE_OPTIONS env var for postgresql-setup
+
* Mon Jan 20 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-5
- fix the postgresql-setup --version option
commit 7df4c0e471c87a55c5e7b3d14404f11fb41a1427
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Jan 20 14:11:11 2014 +0100
postgresql-setup: handle --version option earlier
This generated the manual page badly before as the output of
--version option depended on system's postgresql.service (not
available at a build time). So handle options rather at the
beginning of the script.
Version: 9.3.2-5
diff --git a/postgresql-setup b/postgresql-setup
index 80e2483..8a56028 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -55,6 +55,18 @@ Environment:
re-initialized from the old one.
PGSETUP_DEBUG Set to '1' if you want to see debugging output."
+# note that these options are useful at least for help2man processing
+case "$1" in
+ --version)
+ echo "postgresql-setup $PGVERSION"
+ exit 0
+ ;;
+ --help|--usage)
+ echo "$USAGE_STRING"
+ exit 0
+ ;;
+esac
+
# this parsing technique fails for PGDATA pathnames containing spaces,
# but there's not much I can do about it given systemctl's output format...
PGDATA=`systemctl show -p Environment "${SERVICE_NAME}.service" |
@@ -239,12 +251,8 @@ case "$1" in
upgrade)
upgrade
;;
- --version)
- # note that this output is at least useful for help2man processing
- echo "postgresql-setup $PGVERSION"
- ;;
*)
- echo "$USAGE_STRING"
+ echo >&2 "$USAGE_STRING"
exit 2
esac
diff --git a/postgresql.spec b/postgresql.spec
index 586b472..9eac6ce 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1130,6 +1130,9 @@ fi
%endif
%changelog
+* Mon Jan 20 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-5
+- fix the postgresql-setup --version option
+
* Mon Jan 20 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-4
- postgresql-setup(upgrade): don't stop old server when it can not be started
- postgresql-setup(initdb, upgrade): add $PGSETUP_INITDB_OPTIONS
commit ca2964b709a7132089a66bacab11d9bd3203eee3
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 9 20:16:54 2014 +0100
docu: document postgresql-setup in --help a little
Also automatically generate manual page from the help output.
Version: 9.3.2-4
diff --git a/postgresql-setup b/postgresql-setup
index ca70b4d..80e2483 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -2,6 +2,8 @@
#
# postgresql-setup - Initialization and upgrade operations for PostgreSQL
+test x"$PGSETUP_DEBUG" != x && set -x
+
# PGVERSION is the full package version, e.g., 9.0.2
# Note: the specfile inserts the correct value during package build
PGVERSION=xxxx
@@ -25,6 +27,34 @@ if [ x"$SERVICE_NAME" = x ]; then
SERVICE_NAME=postgresql
fi
+# Pathname of the RPM distribution README
+README_RPM_DIST=xxxx
+
+USAGE_STRING=$"
+Usage: $0 {initdb|upgrade} [SERVICE_NAME]
+
+Script is aimed to help sysadmin with basic database cluster administration.
+
+The SERVICE_NAME is used for selection of proper unit configuration file; For
+more info and howto/when use this script please look at the docu file
+$README_RPM_DIST. The 'postgresql'
+string is used when no SERVICE_NAME is explicitly passed.
+
+Available operation mode:
+ initdb Create a new PostgreSQL database cluster. This is usually the
+ first action you perform after PostgreSQL server installation.
+ upgrade Upgrade PostgreSQL database cluster to be usable with new
+ server. Use this if upgraded to newer PostgreSQL major version,
+ e.g. from 9.1 to 9.2.
+
+Environment:
+ PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
+ subsequent call of \`initdb\` binary (see man
+ initdb(1)). This variable is used also during
+ 'upgrade' mode because the new cluster is actually
+ re-initialized from the old one.
+ PGSETUP_DEBUG Set to '1' if you want to see debugging output."
+
# this parsing technique fails for PGDATA pathnames containing spaces,
# but there's not much I can do about it given systemctl's output format...
PGDATA=`systemctl show -p Environment "${SERVICE_NAME}.service" |
@@ -209,8 +239,12 @@ case "$1" in
upgrade)
upgrade
;;
+ --version)
+ # note that this output is at least useful for help2man processing
+ echo "postgresql-setup $PGVERSION"
+ ;;
*)
- echo $"Usage: $0 {initdb|upgrade} [ service_name ]"
+ echo "$USAGE_STRING"
exit 2
esac
diff --git a/postgresql.spec b/postgresql.spec
index 6f4c83c..586b472 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -109,7 +109,7 @@ Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
BuildRequires: systemd-units
@@ -367,6 +367,8 @@ sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
-e 's|^README_RPM_DIST=.*$|README_RPM_DIST=%{_pkgdocdir}/%(basename %{SOURCE8})|' \
<%{SOURCE9} >postgresql-setup
touch -r %{SOURCE9} postgresql-setup
+chmod +x postgresql-setup
+help2man -N -m "Postgresql RPM-dist manual" ./postgresql-setup -o postgresql-setup.1
# prep the startup check script, including insertion of some values it needs
sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
@@ -634,6 +636,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp -p src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
install -m 755 postgresql-setup $RPM_BUILD_ROOT%{_bindir}/postgresql-setup
+install -p -m 644 postgresql-setup.1 $RPM_BUILD_ROOT%{_mandir}/man1
install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-check-db-dir
@@ -1041,6 +1044,7 @@ fi
%{_mandir}/man1/pg_receivexlog.*
%{_mandir}/man1/pg_resetxlog.*
%{_mandir}/man1/postgres.*
+%{_mandir}/man1/postgresql-setup.*
%{_mandir}/man1/postmaster.*
%{_datadir}/pgsql/postgres.bki
%{_datadir}/pgsql/postgres.description
@@ -1126,11 +1130,12 @@ fi
%endif
%changelog
-* Mon Jan 13 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-4
+* Mon Jan 20 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-4
- postgresql-setup(upgrade): don't stop old server when it can not be started
- postgresql-setup(initdb, upgrade): add $PGSETUP_INITDB_OPTIONS
- postgresql-setup: do not pretend 'sh' compatibility
- move script generation to proper place
+- postgresql-setup: document a little and genrate manual page
* Fri Jan 10 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-3
- build with -O3 on ppc64 (private #1051075)
commit 44cd816532a7bb51f9bd957793b851f5a593ea6c
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 9 19:05:15 2014 +0100
spec: move script generation to proper place
Generate postgresql-setup and postgresql-check-db-dir in %prep
rather then in %install. It is (a) better place and (b) it speeds
up its testing ('rpmbuild -bp *.spec' is able to generate them).
Version: 9.3.2-4
diff --git a/postgresql.spec b/postgresql.spec
index e1e21e7..6f4c83c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -359,6 +359,22 @@ cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
find . -type f -name .gitignore | xargs rm
+# prep the setup script, including insertion of some values it needs
+sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
+ -e 's|^PGENGINE=.*$|PGENGINE=%{_bindir}|' \
+ -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
+ -e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
+ -e 's|^README_RPM_DIST=.*$|README_RPM_DIST=%{_pkgdocdir}/%(basename %{SOURCE8})|' \
+ <%{SOURCE9} >postgresql-setup
+touch -r %{SOURCE9} postgresql-setup
+
+# prep the startup check script, including insertion of some values it needs
+sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
+ -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
+ -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_pkgdocdir}|' \
+ <%{SOURCE4} >postgresql-check-db-dir
+touch -r %{SOURCE4} postgresql-check-db-dir
+
%build
# fail quickly and obviously if user tries to build as root
@@ -617,21 +633,8 @@ esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp -p src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
-# prep the setup script, including insertion of some values it needs
-sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
- -e 's|^PGENGINE=.*$|PGENGINE=%{_bindir}|' \
- -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
- -e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
- <%{SOURCE9} >postgresql-setup
-touch -r %{SOURCE9} postgresql-setup
install -m 755 postgresql-setup $RPM_BUILD_ROOT%{_bindir}/postgresql-setup
-# prep the startup check script, including insertion of some values it needs
-sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
- -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
- -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_pkgdocdir}|' \
- <%{SOURCE4} >postgresql-check-db-dir
-touch -r %{SOURCE4} postgresql-check-db-dir
install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-check-db-dir
install -d $RPM_BUILD_ROOT%{_unitdir}
@@ -1127,6 +1130,7 @@ fi
- postgresql-setup(upgrade): don't stop old server when it can not be started
- postgresql-setup(initdb, upgrade): add $PGSETUP_INITDB_OPTIONS
- postgresql-setup: do not pretend 'sh' compatibility
+- move script generation to proper place
* Fri Jan 10 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-3
- build with -O3 on ppc64 (private #1051075)
commit 8e4018558102e61070e99b489ff36bc6d985a06e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 9 14:06:25 2014 +0100
postgresql-setup: do not pretend 'sh' compatibility
At least the way the script is prepared for translation is adopted
from bash.
Version: 9.3.2-4
diff --git a/postgresql-setup b/postgresql-setup
index 1348e1c..ca70b4d 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# postgresql-setup - Initialization and upgrade operations for PostgreSQL
diff --git a/postgresql.spec b/postgresql.spec
index 370411c..e1e21e7 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1126,6 +1126,7 @@ fi
* Mon Jan 13 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-4
- postgresql-setup(upgrade): don't stop old server when it can not be started
- postgresql-setup(initdb, upgrade): add $PGSETUP_INITDB_OPTIONS
+- postgresql-setup: do not pretend 'sh' compatibility
* Fri Jan 10 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-3
- build with -O3 on ppc64 (private #1051075)
commit 2f213ebd1d3b8120b0d132902a5064ef2d1548a4
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 9 09:45:02 2014 +0100
postgresql-setup: add $PGSETUP_INITDB_OPTIONS
Users may now specify by this variable parameters passed to initdb
run. See `man initdb(1)`. This may help if user gets stacked
with bug #1007802.
Related: #1007802
Version: 9.3.2-4
diff --git a/postgresql-setup b/postgresql-setup
index 8fd509b..1348e1c 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -80,8 +80,10 @@ perform_initdb(){
fi
# Initialize the database
- $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" \
- >> "$PGLOG" 2>&1 < /dev/null
+ initdbcmd="$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'"
+ initdbcmd+=" $PGSETUP_INITDB_OPTIONS"
+
+ $SU -l postgres -c "$initdbcmd" >> "$PGLOG" 2>&1 < /dev/null
# Create directory for postmaster log files
mkdir "$PGDATA/pg_log"
diff --git a/postgresql.spec b/postgresql.spec
index 39db8b5..370411c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1125,6 +1125,7 @@ fi
%changelog
* Mon Jan 13 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-4
- postgresql-setup(upgrade): don't stop old server when it can not be started
+- postgresql-setup(initdb, upgrade): add $PGSETUP_INITDB_OPTIONS
* Fri Jan 10 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-3
- build with -O3 on ppc64 (private #1051075)
commit 083dd21498234c22a9b7f9265a7596f272541270
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jan 9 09:42:46 2014 +0100
postgresql-setup: do not stop server when it can't be started
Version: 9.3.2-4
diff --git a/postgresql-setup b/postgresql-setup
index 7135dab..8fd509b 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -130,10 +130,6 @@ upgrade(){
exit 5
fi
- # Make sure service is stopped
- # Using service here makes it work both with systemd and other init systems
- service "$SERVICE_NAME" stop
-
# Set up log file for pg_upgrade
rm -f "$PGUPLOG"
touch "$PGUPLOG" || exit 1
diff --git a/postgresql.spec b/postgresql.spec
index 240eb4e..39db8b5 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1123,6 +1123,9 @@ fi
%endif
%changelog
+* Mon Jan 13 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-4
+- postgresql-setup(upgrade): don't stop old server when it can not be started
+
* Fri Jan 10 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-3
- build with -O3 on ppc64 (private #1051075)
commit 88e98c33022f0c19476cf6f6ba57a245b4508755
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Jan 10 09:17:52 2014 +0100
spec: build with -O3 on ppc64
Resolves: #1051075 (private)
Version: 9.3.2-3
diff --git a/postgresql.spec b/postgresql.spec
index f2190c1..240eb4e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -371,17 +371,18 @@ find . -type f -name .gitignore | xargs rm
fi
%endif
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
+# Fiddling with CFLAGS.
+CFLAGS="${CFLAGS:-%optflags}"
+%ifarch %{power64}
+# See the bug #1051075, ppc64 should benefit from -O3
+CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100`
+%endif
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
# Add LINUX_OOM_SCORE_ADJ=0 to ensure child processes reset postmaster's oom_score_adj
CFLAGS="$CFLAGS -DLINUX_OOM_SCORE_ADJ=0"
-# let's try removing this kluge, it may just be a workaround for bz#520916
-# # use -O1 on sparc64 and alpha
-# %%ifarch sparc64 alpha
-# CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
-# %%endif
+export CFLAGS
# plpython requires separate configure/build runs to build against python 2
# versus python 3. Our strategy is to do the python 3 run first, then make
@@ -1122,6 +1123,9 @@ fi
%endif
%changelog
+* Fri Jan 10 2014 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-3
+- build with -O3 on ppc64 (private #1051075)
+
* Fri Dec 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-2
- lint the postgresql-setup script
commit 4c6bd5df12cf55fcfdf7bbfc5b3d47ed9be14f28
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Dec 13 09:36:08 2013 +0100
postgresql-setup: lint
Rather use the --ignore-space-change when showing differences.
Version: 9.3.2-2
diff --git a/postgresql-setup b/postgresql-setup
index 7400890..7135dab 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -1,16 +1,19 @@
#!/bin/sh
#
-# postgresql-setup Initialization and upgrade operations for PostgreSQL
+# postgresql-setup - Initialization and upgrade operations for PostgreSQL
# PGVERSION is the full package version, e.g., 9.0.2
# Note: the specfile inserts the correct value during package build
PGVERSION=xxxx
+
# PGENGINE is the directory containing the postmaster executable
# Note: the specfile inserts the correct value during package build
PGENGINE=xxxx
+
# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
# Note: the specfile inserts the correct value during package build
PREVMAJORVERSION=xxxx
+
# PREVPGENGINE is the directory containing the previous postmaster executable
# Note: the specfile inserts the correct value during package build
PREVPGENGINE=xxxx
@@ -18,29 +21,24 @@ PREVPGENGINE=xxxx
# Absorb configuration settings from the specified systemd service file,
# or the default "postgresql" service if not specified
SERVICE_NAME="$2"
-if [ x"$SERVICE_NAME" = x ]
-then
+if [ x"$SERVICE_NAME" = x ]; then
SERVICE_NAME=postgresql
fi
# this parsing technique fails for PGDATA pathnames containing spaces,
# but there's not much I can do about it given systemctl's output format...
PGDATA=`systemctl show -p Environment "${SERVICE_NAME}.service" |
- sed 's/^Environment=//' | tr ' ' '\n' |
- sed -n 's/^PGDATA=//p' | tail -n 1`
-
-if [ x"$PGDATA" = x ]
-then
+ sed 's/^Environment=//' | tr ' ' '\n' |
+ sed -n 's/^PGDATA=//p' | tail -n 1`
+if [ x"$PGDATA" = x ]; then
echo "failed to find PGDATA setting in ${SERVICE_NAME}.service"
exit 1
fi
PGPORT=`systemctl show -p Environment "${SERVICE_NAME}.service" |
- sed 's/^Environment=//' | tr ' ' '\n' |
- sed -n 's/^PGPORT=//p' | tail -n 1`
-
-if [ x"$PGPORT" = x ]
-then
+ sed 's/^Environment=//' | tr ' ' '\n' |
+ sed -n 's/^PGPORT=//p' | tail -n 1`
+if [ x"$PGPORT" = x ]; then
echo "failed to find PGPORT setting in ${SERVICE_NAME}.service"
exit 1
fi
@@ -55,8 +53,7 @@ export PGDATA
export PGPORT
# For SELinux we need to use 'runuser' not 'su'
-if [ -x /sbin/runuser ]
-then
+if [ -x /sbin/runuser ]; then
SU=runuser
else
SU=su
@@ -66,75 +63,71 @@ script_result=0
# code shared between initdb and upgrade actions
perform_initdb(){
- if [ ! -e "$PGDATA" ]
- then
- mkdir "$PGDATA" || return 1
- chown postgres:postgres "$PGDATA"
- chmod go-rwx "$PGDATA"
- fi
- # Clean up SELinux tagging for PGDATA
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
-
- # Create the initdb log file if needed
- if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
- then
- touch "$PGLOG" || return 1
- chown postgres:postgres "$PGLOG"
- chmod go-rwx "$PGLOG"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
- fi
-
- # Initialize the database
- $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
-
- # Create directory for postmaster log files
- mkdir "$PGDATA/pg_log"
- chown postgres:postgres "$PGDATA/pg_log"
- chmod go-rwx "$PGDATA/pg_log"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA/pg_log"
-
- if [ -f "$PGDATA/PG_VERSION" ]
- then
- return 0
- fi
- return 1
+ if [ ! -e "$PGDATA" ]; then
+ mkdir "$PGDATA" || return 1
+ chown postgres:postgres "$PGDATA"
+ chmod go-rwx "$PGDATA"
+ fi
+ # Clean up SELinux tagging for PGDATA
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+
+ # Create the initdb log file if needed
+ if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]; then
+ touch "$PGLOG" || return 1
+ chown postgres:postgres "$PGLOG"
+ chmod go-rwx "$PGLOG"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
+ fi
+
+ # Initialize the database
+ $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" \
+ >> "$PGLOG" 2>&1 < /dev/null
+
+ # Create directory for postmaster log files
+ mkdir "$PGDATA/pg_log"
+ chown postgres:postgres "$PGDATA/pg_log"
+ chmod go-rwx "$PGDATA/pg_log"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA/pg_log"
+
+ if [ -f "$PGDATA/PG_VERSION" ]; then
+ return 0
+ fi
+ return 1
}
initdb(){
- if [ -f "$PGDATA/PG_VERSION" ]
- then
- echo $"Data directory is not empty!"
- echo
- script_result=1
+ if [ -f "$PGDATA/PG_VERSION" ]; then
+ echo $"Data directory is not empty!"
+ echo
+ script_result=1
else
- echo -n $"Initializing database ... "
- if perform_initdb
- then
- echo $"OK"
- else
- echo $"failed, see $PGLOG"
- script_result=1
- fi
- echo
+ echo -n $"Initializing database ... "
+ if perform_initdb; then
+ echo $"OK"
+ else
+ echo $"failed, see $PGLOG"
+ script_result=1
+ fi
+ echo
fi
}
upgrade(){
# must see previous version in PG_VERSION
if [ ! -f "$PGDATA/PG_VERSION" -o \
- x`cat "$PGDATA/PG_VERSION"` != x"$PREVMAJORVERSION" ]
+ x`cat "$PGDATA/PG_VERSION"` != x"$PREVMAJORVERSION" ]
then
- echo
- echo $"Cannot upgrade because database is not of version $PREVMAJORVERSION."
- echo
- exit 1
+ echo
+ echo $"Cannot upgrade because the database in $PGDATA is not of"
+ echo $"compatible previous version $PREVMAJORVERSION."
+ echo
+ exit 1
fi
- if [ ! -x "$PGENGINE/pg_upgrade" ]
- then
- echo
- echo $"Please install the postgresql-upgrade RPM."
- echo
- exit 5
+ if [ ! -x "$PGENGINE/pg_upgrade" ]; then
+ echo
+ echo $"Please install the postgresql-upgrade RPM."
+ echo
+ exit 5
fi
# Make sure service is stopped
@@ -164,51 +157,47 @@ upgrade(){
# For fluent upgrade 'postgres' user should be able to connect
# to any database without password. Temporarily, no other type
# of connection is needed.
- /usr/bin/echo -e "local all postgres ident" > "$PGDATAOLD/pg_hba.conf"
+ echo "local all postgres ident" > "$PGDATAOLD/pg_hba.conf"
fi
echo -n $"Upgrading database: "
# Create empty new-format database
- if perform_initdb
- then
- # Do the upgrade
- $SU -l postgres -c "$PGENGINE/pg_upgrade \
- '--old-bindir=$PREVPGENGINE' \
- '--new-bindir=$PGENGINE' \
- '--old-datadir=$PGDATAOLD' \
- '--new-datadir=$PGDATA' \
- --link \
- '--old-port=$PGPORT' '--new-port=$PGPORT' \
- --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
- if [ $? -ne 0 ]
- then
- # pg_upgrade failed
- script_result=1
- fi
+ if perform_initdb; then
+ # Do the upgrade
+ $SU -l postgres -c "$PGENGINE/pg_upgrade \
+ '--old-bindir=$PREVPGENGINE' \
+ '--new-bindir=$PGENGINE' \
+ '--old-datadir=$PGDATAOLD' \
+ '--new-datadir=$PGDATA' \
+ --link \
+ '--old-port=$PGPORT' '--new-port=$PGPORT' \
+ --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
+ if [ $? -ne 0 ]; then
+ # pg_upgrade failed
+ script_result=1
+ fi
else
- # initdb failed
- script_result=1
+ # initdb failed
+ script_result=1
fi
+ # Move back the backed-up pg_hba.conf regardless of the script_result.
if [ x$HBA_CONF_BACKUP_EXISTS = x1 ]; then
mv -f "$HBA_CONF_BACKUP" "$PGDATAOLD/pg_hba.conf"
fi
-
- if [ $script_result -eq 0 ]
- then
+ if [ $script_result -eq 0 ]; then
echo $"OK"
echo
echo $"The configuration files was replaced by default configuration."
echo $"The previous configuration and data are stored in folder"
echo $PGDATAOLD.
else
- # Clean up after failure
- rm -rf "$PGDATA"
- mv "$PGDATAOLD" "$PGDATA"
-
- echo $"failed"
+ # Clean up after failure
+ rm -rf "$PGDATA"
+ mv "$PGDATAOLD" "$PGDATA"
+ echo $"failed"
fi
echo
echo $"See $PGUPLOG for details."
@@ -216,15 +205,15 @@ upgrade(){
# See how we were called.
case "$1" in
- initdb)
- initdb
- ;;
- upgrade)
- upgrade
- ;;
- *)
- echo $"Usage: $0 {initdb|upgrade} [ service_name ]"
- exit 2
+ initdb)
+ initdb
+ ;;
+ upgrade)
+ upgrade
+ ;;
+ *)
+ echo $"Usage: $0 {initdb|upgrade} [ service_name ]"
+ exit 2
esac
exit $script_result
diff --git a/postgresql.spec b/postgresql.spec
index cbc387e..f2190c1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1122,6 +1122,9 @@ fi
%endif
%changelog
+* Fri Dec 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.2-2
+- lint the postgresql-setup script
+
* Thu Dec 12 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.2-2
- don't fail if user has badly configure 'postgres' user access (#1040364)
commit 85e0b076bcefa1b6374677925e03773cd4721aa2
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Fri Dec 13 09:12:08 2013 +0100
postgresql-setup: ignore misconfigure pg_hba.conf when upgrading
Resolves: #1040364
Version: 9.3.2-2
diff --git a/postgresql-setup b/postgresql-setup
index a755e11..7400890 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -153,6 +153,20 @@ upgrade(){
rm -rf "$PGDATAOLD"
mv "$PGDATA" "$PGDATAOLD" || exit 1
+ # Create configuration file for upgrade process
+ HBA_CONF_BACKUP="$PGDATAOLD/pg_hba.conf.postgresql-setup.`date +%s`"
+ HBA_CONF_BACKUP_EXISTS=0
+
+ if [ ! -f $HBA_CONF_BACKUP ]; then
+ mv "$PGDATAOLD/pg_hba.conf" "$HBA_CONF_BACKUP"
+ HBA_CONF_BACKUP_EXISTS=1
+
+ # For fluent upgrade 'postgres' user should be able to connect
+ # to any database without password. Temporarily, no other type
+ # of connection is needed.
+ /usr/bin/echo -e "local all postgres ident" > "$PGDATAOLD/pg_hba.conf"
+ fi
+
echo -n $"Upgrading database: "
# Create empty new-format database
@@ -177,9 +191,18 @@ upgrade(){
script_result=1
fi
+ if [ x$HBA_CONF_BACKUP_EXISTS = x1 ]; then
+ mv -f "$HBA_CONF_BACKUP" "$PGDATAOLD/pg_hba.conf"
+ fi
+
+
if [ $script_result -eq 0 ]
then
- echo $"OK"
+ echo $"OK"
+ echo
+ echo $"The configuration files was replaced by default configuration."
+ echo $"The previous configuration and data are stored in folder"
+ echo $PGDATAOLD.
else
# Clean up after failure
rm -rf "$PGDATA"
diff --git a/postgresql.spec b/postgresql.spec
index 5f51f94..cbc387e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1122,6 +1122,9 @@ fi
%endif
%changelog
+* Thu Dec 12 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.2-2
+- don't fail if user has badly configure 'postgres' user access (#1040364)
+
* Thu Dec 05 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.2-1
- update to 9.3.2 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-2.html
commit 3355515a991098f1dc46060b06aa7ad5b9297810
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Dec 5 16:32:09 2013 +0100
update to 9.3.2 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-2.html
diff --git a/.gitignore b/.gitignore
index 9289b41..34f4e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
/postgresql-9.3.1-US.pdf
/postgresql-9.3.1.tar.bz2
/postgresql-9.2.5.tar.bz2
+/postgresql-9.3.2.tar.bz2
+/postgresql-9.3.2-US.pdf
+/postgresql-9.2.6.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 74d1ec0..5f51f94 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,14 +53,18 @@
%{!?selinux:%global selinux 1}
%{!?runselftest:%global runselftest 1}
+# By default, patch(1) creates backup files when chunks apply with offsets.
+# Turn that off to ensure such files don't get included in RPMs.
+%global _default_patch_flags --no-backup-if-mismatch
+
# _pkgdocdir is defined in fc20+, remove once f19 is dead
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
-Version: 9.3.1
-Release: 2%{?dist}
+Version: 9.3.2
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -75,7 +79,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.2.5
+%global prevversion 9.2.6
%global prevmajorversion 9.2
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -1118,6 +1122,10 @@ fi
%endif
%changelog
+* Thu Dec 05 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.2-1
+- update to 9.3.2 minor version per release notes:
+ http://www.postgresql.org/docs/9.3/static/release-9-3-2.html
+
* Thu Oct 17 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.1-2
- the prevversion (see package upgrade process) is updated
from 9.2.4 to 9.2.5
diff --git a/sources b/sources
index c304873..7c5bb74 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-4c12a9570d84bcc4fb41e8270c287f05 postgresql-9.3.1-US.pdf
-c003d871f712d4d3895956b028a96e74 postgresql-9.3.1.tar.bz2
-e8438e0ed5e6371741be7697886e7340 postgresql-9.2.5.tar.bz2
+8c905155e3e9f9367b4299a9acb41d2a postgresql-9.3.2.tar.bz2
+8f7d6baa6abedfef6d926da4fa3e4a2c postgresql-9.3.2-US.pdf
+3e68c0c7468c56f73060a88a377dbde8 postgresql-9.2.6.tar.bz2
commit 64b49cf833cb32b064f44c737c5ff586a2775f85
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 17 10:41:33 2013 +0200
postgresql-aarch64-atomic-upgrade.patch is not used
diff --git a/postgresql-aarch64-atomic-upgrade.patch b/postgresql-aarch64-atomic-upgrade.patch
deleted file mode 100644
index 7bb5b0e..0000000
--- a/postgresql-aarch64-atomic-upgrade.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Add support for atomic operations TAS/S_UNLOCK in aarch64
-
-This was already added to upstream 9.3.0+ version but we need to add this into
-pre-upgrade postgresql version (until we are not upgrading also from 9.3.0+).
-
-~> upstream (612ecf311b)
-~> #970661
-
-diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index d4a783f..29124b1 100644
---- a/src/include/storage/s_lock.h
-+++ b/src/include/storage/s_lock.h
-@@ -335,6 +335,29 @@ tas(volatile slock_t *lock)
- #endif /* __arm__ */
-
-
-+/*
-+ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
-+ */
-+#if defined(__aarch64__) || defined(__aarch64)
-+#ifdef HAVE_GCC_INT_ATOMICS
-+#define HAS_TEST_AND_SET
-+
-+#define TAS(lock) tas(lock)
-+
-+typedef int slock_t;
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+ return __sync_lock_test_and_set(lock, 1);
-+}
-+
-+#define S_UNLOCK(lock) __sync_lock_release(lock)
-+
-+#endif /* HAVE_GCC_INT_ATOMICS */
-+#endif /* __aarch64__ */
-+
-+
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
- #if defined(__s390__) || defined(__s390x__)
- #define HAS_TEST_AND_SET
commit 4b81ad4d16c773dc18117aef4e418b371241a04b
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 17 10:29:33 2013 +0200
the prevversion (see package upgrade process) is updated
from 9.2.4 to 9.2.5
diff --git a/.gitignore b/.gitignore
index cd24afc..9289b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/postgresql-9.3.0.tar.bz2
/postgresql-9.3.1-US.pdf
/postgresql-9.3.1.tar.bz2
+/postgresql-9.2.5.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 9be9b8c..74d1ec0 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -75,7 +75,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.2.4
+%global prevversion 9.2.5
%global prevmajorversion 9.2
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -104,7 +104,6 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch100: postgresql-aarch64-atomic-upgrade.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -351,7 +350,6 @@ cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
# apply once SOURCE3 is extracted
-%patch100 -d postgresql-%{prevversion} -p1
%endif
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
@@ -1120,6 +1118,10 @@ fi
%endif
%changelog
+* Thu Oct 17 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.1-2
+- the prevversion (see package upgrade process) is updated
+ from 9.2.4 to 9.2.5
+
* Thu Oct 10 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.1-1
- update to 9.3.1 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
diff --git a/sources b/sources
index 5a39b49..c304873 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-6ee5bb53b97da7c6ad9cb0825d3300dd postgresql-9.2.4.tar.bz2
4c12a9570d84bcc4fb41e8270c287f05 postgresql-9.3.1-US.pdf
c003d871f712d4d3895956b028a96e74 postgresql-9.3.1.tar.bz2
+e8438e0ed5e6371741be7697886e7340 postgresql-9.2.5.tar.bz2
commit e8483239a8c49bf5cac86edb94f4fb9281ff1b3e
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 10 17:51:24 2013 +0200
rebase to 9.3.1, see http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
diff --git a/.gitignore b/.gitignore
index 1ded8d0..cd24afc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/postgresql-9.2.4.tar.bz2
/postgresql-9.3.0-US.pdf
/postgresql-9.3.0.tar.bz2
+/postgresql-9.3.1-US.pdf
+/postgresql-9.3.1.tar.bz2
diff --git a/sources b/sources
index 89277b0..5a39b49 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
6ee5bb53b97da7c6ad9cb0825d3300dd postgresql-9.2.4.tar.bz2
-3d148088eed8b394705ae8df13b6d389 postgresql-9.3.0-US.pdf
-09aee56f3a15ce4a7ea32044fb845b53 postgresql-9.3.0.tar.bz2
+4c12a9570d84bcc4fb41e8270c287f05 postgresql-9.3.1-US.pdf
+c003d871f712d4d3895956b028a96e74 postgresql-9.3.1.tar.bz2
commit 1586e09e95d2c916a1963d1979bd9e0ccbf444bc
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 10 17:50:43 2013 +0200
rebase to 9.3.1, see http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
commit 3ee71ef8ba8f30eaa78032981198f38c582f5da2
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 10 17:50:25 2013 +0200
rebase to 9.3.1, see http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
commit 2de7c2ec9d66a232f788431c03cfa615027b9a82
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 10 17:48:19 2013 +0200
rebase to 9.3.1, see http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
commit 8eaff123923ee85631da4cf73405a13c85b8eb80
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 10 17:46:49 2013 +0200
rebase to 9.3.1, see http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
commit 592d0dee381a8262cea134ed98c7794777f059cb
Author: Jozef Mlich <jmlich(a)redhat.com>
Date: Thu Oct 10 17:45:08 2013 +0200
rebase to 9.3.1, see http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
diff --git a/postgresql.spec b/postgresql.spec
index 868581d..9be9b8c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,7 +59,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
-Version: 9.3.0
+Version: 9.3.1
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -1120,6 +1120,10 @@ fi
%endif
%changelog
+* Thu Oct 10 2013 Jozef Mlich <jmlich(a)redhat.com> - 9.3.1-1
+- update to 9.3.1 minor version per release notes:
+ http://www.postgresql.org/docs/9.3/static/release-9-3-1.html
+
* Tue Sep 10 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.0-1
- update to 9.3 major version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3.html
commit 24c5bf3138db46ca4c998ed42c6a7de74938b255
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Sep 10 16:01:09 2013 +0200
rebase: upgrade to version 9.3.0
Version: 9.3.0-1
diff --git a/.gitignore b/.gitignore
index 46823fd..1ded8d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
/postgresql-9.2.4.tar.bz2
-/postgresql-9.2.4-US.pdf
-/postgresql-9.1.9.tar.bz2
+/postgresql-9.3.0-US.pdf
+/postgresql-9.3.0.tar.bz2
diff --git a/README.rpm-dist b/README.rpm-dist
index 2d7482b..e628f83 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,6 +1,6 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 9.2, for the PostgreSQL 9.2 RPM set.
+Version 9.3, for the PostgreSQL 9.3 RPM set.
Devrim Gndz <devrim(a)gunduz.org>
-----------------------------------------------------------------------------
@@ -23,9 +23,9 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 9.2 of PostgreSQL,
+This document is written to be applicable to version 9.3 of PostgreSQL,
which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 9.2 are not documented here.
+point, versions prior to 9.3 are not documented here.
This document is intended for use only with the RPMs supplied in Red Hat
Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
@@ -69,9 +69,9 @@ as 'postgres' you will need to set a password using passwd.
UPGRADING AN INSTALLATION
-----------------------------------------------------------------------------
-For a minor-version upgrade (such as 9.2.1 to 9.2.2), just install the
+For a minor-version upgrade (such as 9.3.1 to 9.3.2), just install the
new RPMs; there's usually nothing more to it than that. Upgrading
-across a major release of PostgreSQL (for example, from 9.1.x to 9.2.x)
+across a major release of PostgreSQL (for example, from 9.2.x to 9.3.x)
requires more effort.
If you are upgrading across more than one major release of PostgreSQL
@@ -83,7 +83,7 @@ and run the dump file through psql to restore your data.
In some major releases, the RPMs also support in-place upgrade from the
immediately previous major release. Currently, you can upgrade in-place
-from 9.1.x to 9.2.x. This is much faster than a dump and reload.
+from 9.2.x to 9.3.x. This is much faster than a dump and reload.
To do an in-place upgrade:
* shut down the old postmaster ("systemctl stop postgresql.service")
* optionally make a backup of /var/lib/pgsql/data/ (recommended!)
@@ -148,8 +148,9 @@ this:
Executables: /usr/bin
Libraries: /usr/lib (or /usr/lib64 on 64-bit machines)
-Documentation: /usr/share/doc/postgresql-docs-x.y.z/html
-Contrib documentation: /usr/share/doc/postgresql-contrib-x.y.z
+Documentation: /usr/share/doc/postgresql/html
+PDF documentation: /usr/share/doc/postgresql-docs
+Contrib documentation: /usr/share/doc/postgresql-contrib
Source: not installed
Data: /var/lib/pgsql/data
Backup area: /var/lib/pgsql/backups
@@ -167,7 +168,7 @@ the beauty of RPM -- you don't have to keep track of the files, RPM does it
for you.
These RPMs are designed to be LSB-compliant -- if you find this not to be the
-case, please let us know by way of the pgsqlrpms-hackers(a)pgfoundry.org
+case, please let us know by way of the pgsql-pkg-yum(a)postgresql.org
mailing list.
MULTIPLE POSTMASTERS
@@ -340,7 +341,7 @@ CONTRIB FILES
-------------------------------------------------------------------------------
The contents of the contrib tree are packaged into the -contrib subpackage
and are processed with make and make install. There is documentation in
-/usr/share/doc/postgresql-contrib-VERSION for these modules. Most of the
+/usr/share/doc/postgresql-contrib for these modules. Most of the
modules are in /usr/lib/pgsql (or /usr/lib64/pgsql) for loadable
modules, and binaries are in /usr/bin. In the future these files may be
split out, depending upon function and dependencies.
@@ -348,9 +349,9 @@ split out, depending upon function and dependencies.
MORE INFORMATION
-------------------------------------------------------------------------------
You can get more information at http://www.postgresql.org and
-http://yum.pgsqlrpms.org
+http://yum.postgresql.org
Please help make this packaging better -- let us know if you find problems, or
better ways of doing things. You can reach us by e-mail at
-pgsqlrpms-hackers(a)pgfoundry.org
+pgsql-pkg-yum(a)postgresql.org
-------------------------------------------------------------------------------
diff --git a/generate-pdf.sh b/generate-pdf.sh
index 1365bb4..a268981 100755
--- a/generate-pdf.sh
+++ b/generate-pdf.sh
@@ -32,7 +32,7 @@ cd postgresql-$VERSION
# Apply any patches that affect the PDF documentation
-patch -p1 < ../postgresql-multi-sockets.patch
+# patch -p1 < ../xxx.patch
# Configure ...
diff --git a/postgresql-9.2.4-aarch64-atomic-upgrade.patch b/postgresql-9.2.4-aarch64-atomic-upgrade.patch
deleted file mode 100644
index 2b8c82e..0000000
--- a/postgresql-9.2.4-aarch64-atomic-upgrade.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/postgresql-9.1.9/src/include/storage/s_lock.h b/postgresql-9.1.9/src/include/storage/s_lock.h
-index 987fb9c..1ba718c 100644
---- a/postgresql-9.1.9/src/include/storage/s_lock.h
-+++ b/postgresql-9.1.9/src/include/storage/s_lock.h
-@@ -296,6 +296,29 @@ tas(volatile slock_t *lock)
- #endif /* __arm__ */
-
-
-+/*
-+ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
-+ */
-+#if defined(__aarch64__) || defined(__aarch64)
-+#ifdef HAVE_GCC_INT_ATOMICS
-+#define HAS_TEST_AND_SET
-+
-+#define TAS(lock) tas(lock)
-+
-+typedef int slock_t;
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+ return __sync_lock_test_and_set(lock, 1);
-+}
-+
-+#define S_UNLOCK(lock) __sync_lock_release(lock)
-+
-+#endif /* HAVE_GCC_INT_ATOMICS */
-+#endif /* __aarch64__ */
-+
-+
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
- #if defined(__s390__) || defined(__s390x__)
- #define HAS_TEST_AND_SET
diff --git a/postgresql-9.2.4-aarch64-atomic.patch b/postgresql-9.2.4-aarch64-atomic.patch
deleted file mode 100644
index 7a297ce..0000000
--- a/postgresql-9.2.4-aarch64-atomic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index d4a783f..29124b1 100644
---- a/src/include/storage/s_lock.h
-+++ b/src/include/storage/s_lock.h
-@@ -335,6 +335,29 @@ tas(volatile slock_t *lock)
- #endif /* __arm__ */
-
-
-+/*
-+ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
-+ */
-+#if defined(__aarch64__) || defined(__aarch64)
-+#ifdef HAVE_GCC_INT_ATOMICS
-+#define HAS_TEST_AND_SET
-+
-+#define TAS(lock) tas(lock)
-+
-+typedef int slock_t;
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+ return __sync_lock_test_and_set(lock, 1);
-+}
-+
-+#define S_UNLOCK(lock) __sync_lock_release(lock)
-+
-+#endif /* HAVE_GCC_INT_ATOMICS */
-+#endif /* __aarch64__ */
-+
-+
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
- #if defined(__s390__) || defined(__s390x__)
- #define HAS_TEST_AND_SET
diff --git a/postgresql-9.2.4-perl-5.18.patch b/postgresql-9.2.4-perl-5.18.patch
deleted file mode 100644
index dae9b60..0000000
--- a/postgresql-9.2.4-perl-5.18.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit 035a5e1e8c346efe25df6be4627b5f24cc3736b1
-Author: Tom Lane <tgl(a)sss.pgh.pa.us>
-AuthorDate: Mon Jun 3 14:19:26 2013 -0400
-Commit: Tom Lane <tgl(a)sss.pgh.pa.us>
-CommitDate: Mon Jun 3 14:19:26 2013 -0400
-
- Add semicolons to eval'd strings to hide a minor Perl behavioral change.
-
- "eval q{foo}" used to complain that the error was on line 2 of the eval'd
- string, because eval internally tacked on "\n;" so that the end of the
- erroneous command was indeed on line 2. But as of Perl 5.18 it more
- sanely says that the error is on line 1. To avoid Perl-version-dependent
- regression test results, use "eval q{foo;}" instead in the two places
- where this matters. Per buildfarm.
-
- Since people might try to use newer Perl versions with older PG releases,
- back-patch as far as 9.0 where these test cases were added.
-
-diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
-index 29c1d11..d23a302 100644
---- a/src/pl/plperl/expected/plperl.out
-+++ b/src/pl/plperl/expected/plperl.out
-@@ -626,8 +626,8 @@ DO $$ open my $fh, "</nonesuch"; $$ LANGUAGE plperl;
- ERROR: 'open' trapped by operation mask at line 1.
- CONTEXT: PL/Perl anonymous code block
- -- check that eval is allowed and eval'd restricted ops are caught
--DO $$ eval q{chdir '.'}; warn "Caught: $@"; $$ LANGUAGE plperl;
--WARNING: Caught: 'chdir' trapped by operation mask at line 2.
-+DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
-+WARNING: Caught: 'chdir' trapped by operation mask at line 1.
- CONTEXT: PL/Perl anonymous code block
- -- check that compiling do (dofile opcode) is allowed
- -- but that executing it for a file not already loaded (via require) dies
-diff --git a/src/pl/plperl/expected/plperl_init.out b/src/pl/plperl/expected/plperl_init.out
-index a21ea0b..133828e 100644
---- a/src/pl/plperl/expected/plperl_init.out
-+++ b/src/pl/plperl/expected/plperl_init.out
-@@ -1,14 +1,14 @@
- -- test plperl.on_plperl_init errors are fatal
- -- This test tests setting on_plperl_init after loading plperl
- LOAD 'plperl';
--SET SESSION plperl.on_plperl_init = ' system("/nonesuch") ';
-+SET SESSION plperl.on_plperl_init = ' system("/nonesuch"); ';
- SHOW plperl.on_plperl_init;
-- plperl.on_plperl_init
-------------------------
-- system("/nonesuch")
-+ plperl.on_plperl_init
-+------------------------
-+ system("/nonesuch");
- (1 row)
-
- DO $$ warn 42 $$ language plperl;
--ERROR: 'system' trapped by operation mask at line 2.
-+ERROR: 'system' trapped by operation mask at line 1.
- CONTEXT: while executing plperl.on_plperl_init
- PL/Perl anonymous code block
-diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql
-index ad36161..dc6b169 100644
---- a/src/pl/plperl/sql/plperl.sql
-+++ b/src/pl/plperl/sql/plperl.sql
-@@ -405,7 +405,7 @@ DO $$ qx("/nonesuch"); $$ LANGUAGE plperl;
- DO $$ open my $fh, "</nonesuch"; $$ LANGUAGE plperl;
-
- -- check that eval is allowed and eval'd restricted ops are caught
--DO $$ eval q{chdir '.'}; warn "Caught: $@"; $$ LANGUAGE plperl;
-+DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
-
- -- check that compiling do (dofile opcode) is allowed
- -- but that executing it for a file not already loaded (via require) dies
-diff --git a/src/pl/plperl/sql/plperl_init.sql b/src/pl/plperl/sql/plperl_init.sql
-index d60268d..4ebf3f8 100644
---- a/src/pl/plperl/sql/plperl_init.sql
-+++ b/src/pl/plperl/sql/plperl_init.sql
-@@ -3,7 +3,7 @@
- -- This test tests setting on_plperl_init after loading plperl
- LOAD 'plperl';
-
--SET SESSION plperl.on_plperl_init = ' system("/nonesuch") ';
-+SET SESSION plperl.on_plperl_init = ' system("/nonesuch"); ';
-
- SHOW plperl.on_plperl_init;
-
diff --git a/postgresql-9.2.4-upgrade-and-perm-problems.patch b/postgresql-9.2.4-upgrade-and-perm-problems.patch
deleted file mode 100644
index 4cdcc77..0000000
--- a/postgresql-9.2.4-upgrade-and-perm-problems.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
-index c5ecb84..a519a9e 100644
---- a/contrib/pg_upgrade/server.c
-+++ b/contrib/pg_upgrade/server.c
-@@ -166,7 +166,6 @@ static void
- stop_postmaster_atexit(void)
- {
- stop_postmaster(true);
--
- }
-
-
-@@ -235,7 +234,23 @@ start_postmaster(ClusterInfo *cluster)
- false,
- "%s", cmd);
-
-- /* Check to see if we can connect to the server; if not, report it. */
-+ /*
-+ * We set this here to make sure atexit() shuts down the server,
-+ * but only if we started the server successfully. We do it
-+ * before checking for connectivity in case the server started but
-+ * there is a connectivity failure. If pg_ctl did not return success,
-+ * we will exit below.
-+ */
-+ if (pg_ctl_return)
-+ os_info.running_cluster = cluster;
-+
-+ /*
-+ * pg_ctl -w might have failed because the server couldn't be started,
-+ * or there might have been a connection problem in _checking_ if the
-+ * server has started. Therefore, even if pg_ctl failed, we continue
-+ * and test for connectivity in case we get a connection reason for the
-+ * failure.
-+ */
- if ((conn = get_db_conn(cluster, "template1")) == NULL ||
- PQstatus(conn) != CONNECTION_OK)
- {
-@@ -249,12 +264,13 @@ start_postmaster(ClusterInfo *cluster)
- }
- PQfinish(conn);
-
-- /* If the connection didn't fail, fail now */
-+ /*
-+ * If pg_ctl failed, and the connection didn't fail, fail now. This
-+ * could happen if the server was already running.
-+ */
- if (!pg_ctl_return)
- pg_log(PG_FATAL, "pg_ctl failed to start the %s server, or connection failed\n",
- CLUSTER_NAME(cluster));
--
-- os_info.running_cluster = cluster;
- }
-
-
diff --git a/postgresql-aarch64-atomic-upgrade.patch b/postgresql-aarch64-atomic-upgrade.patch
new file mode 100644
index 0000000..7bb5b0e
--- /dev/null
+++ b/postgresql-aarch64-atomic-upgrade.patch
@@ -0,0 +1,42 @@
+Add support for atomic operations TAS/S_UNLOCK in aarch64
+
+This was already added to upstream 9.3.0+ version but we need to add this into
+pre-upgrade postgresql version (until we are not upgrading also from 9.3.0+).
+
+~> upstream (612ecf311b)
+~> #970661
+
+diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
+index d4a783f..29124b1 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -335,6 +335,29 @@ tas(volatile slock_t *lock)
+ #endif /* __arm__ */
+
+
++/*
++ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
++ */
++#if defined(__aarch64__) || defined(__aarch64)
++#ifdef HAVE_GCC_INT_ATOMICS
++#define HAS_TEST_AND_SET
++
++#define TAS(lock) tas(lock)
++
++typedef int slock_t;
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++ return __sync_lock_test_and_set(lock, 1);
++}
++
++#define S_UNLOCK(lock) __sync_lock_release(lock)
++
++#endif /* HAVE_GCC_INT_ATOMICS */
++#endif /* __aarch64__ */
++
++
+ /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
+ #if defined(__s390__) || defined(__s390x__)
+ #define HAS_TEST_AND_SET
diff --git a/postgresql-man.patch b/postgresql-man.patch
index de989f5..94a34c6 100644
--- a/postgresql-man.patch
+++ b/postgresql-man.patch
@@ -1,4 +1,7 @@
-# PostgreSQL manual page completion
+PostgreSQL ecpg/initdb manual page fixes
+
+This was generated based on automatic Red Hat manual page scan (private
+RHBZ#948933).
### ecpg ###
@@ -11,7 +14,7 @@ diff -up postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken postgresql-9.2.4/doc/s
.PP
+\fB\-h \fR
+.RS 4
-+Parse a header file, this option includes otion \fB\-c\fR\&.
++Parse a header file, this option includes option \fB\-c\fR\&.
+.RE
+.PP
\fB\-i\fR
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
deleted file mode 100644
index 366bf28..0000000
--- a/postgresql-multi-sockets.patch
+++ /dev/null
@@ -1,1218 +0,0 @@
-Back-port of upstream 9.3 patch to support multiple sockets
-(upstream git commits c9b0cbe98bd783e24a8c4d8d8ac472a494b81292 and
-d2286a98ef3fb88bafb57381b4c20b8b878827f1, plus updates of derived
-documentation files).
-
-Note the patch also touches html-stamp and man-stamp in doc/src/sgml/;
-this is to keep the makefiles from trying to rebuild the derived doc
-files. We don't want that to happen because the BuildRequires for the
-package don't include the necessary documentation tools. Those diff
-hunks *must be at the end* so that those files are newer than the
-master doc files.
-
-
-diff -Naur postgresql-9.2.3.orig/contrib/pg_upgrade/server.c postgresql-9.2.3/contrib/pg_upgrade/server.c
---- postgresql-9.2.3.orig/contrib/pg_upgrade/server.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/contrib/pg_upgrade/server.c 2013-02-06 19:57:37.124796707 -0500
-@@ -197,7 +197,8 @@
- snprintf(socket_string + strlen(socket_string),
- sizeof(socket_string) - strlen(socket_string),
- " -c %s='%s'",
-- (GET_MAJOR_VERSION(cluster->major_version) < 903) ?
-+ /* assume 9.1 build will not have unix_socket_directories patch */
-+ (GET_MAJOR_VERSION(cluster->major_version) < 902) ?
- "unix_socket_directory" : "unix_socket_directories",
- cluster->sockdir);
- #endif
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.3/doc/src/sgml/client-auth.sgml
---- postgresql-9.2.3.orig/doc/src/sgml/client-auth.sgml 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/client-auth.sgml 2013-02-06 19:57:37.125796568 -0500
-@@ -838,7 +838,7 @@
- <varname>unix_socket_permissions</varname> (and possibly
- <varname>unix_socket_group</varname>) configuration parameters as
- described in <xref linkend="runtime-config-connection">. Or you
-- could set the <varname>unix_socket_directory</varname>
-+ could set the <varname>unix_socket_directories</varname>
- configuration parameter to place the socket file in a suitably
- restricted directory.
- </para>
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/config.sgml postgresql-9.2.3/doc/src/sgml/config.sgml
---- postgresql-9.2.3.orig/doc/src/sgml/config.sgml 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/config.sgml 2013-02-06 19:57:37.128796163 -0500
-@@ -453,17 +453,24 @@
- </listitem>
- </varlistentry>
-
-- <varlistentry id="guc-unix-socket-directory" xreflabel="unix_socket_directory">
-- <term><varname>unix_socket_directory</varname> (<type>string</type>)</term>
-+ <varlistentry id="guc-unix-socket-directories" xreflabel="unix_socket_directories">
-+ <term><varname>unix_socket_directories</varname> (<type>string</type>)</term>
- <indexterm>
-- <primary><varname>unix_socket_directory</> configuration parameter</primary>
-+ <primary><varname>unix_socket_directories</> configuration parameter</primary>
- </indexterm>
- <listitem>
- <para>
-- Specifies the directory of the Unix-domain socket on which the
-- server is to listen for
-- connections from client applications. The default is normally
-- <filename>/tmp</filename>, but can be changed at build time.
-+ Specifies the directory of the Unix-domain socket(s) on which the
-+ server is to listen for connections from client applications.
-+ Multiple sockets can be created by listing multiple directories
-+ separated by commas. Whitespace between entries is
-+ ignored; surround a directory name with double quotes if you need
-+ to include whitespace or commas in the name.
-+ An empty value
-+ specifies not listening on any Unix-domain sockets, in which case
-+ only TCP/IP sockets can be used to connect to the server.
-+ The default value is normally
-+ <filename>/tmp</filename>, but that can be changed at build time.
- This parameter can only be set at server start.
- </para>
-
-@@ -472,8 +479,8 @@
- <literal>.s.PGSQL.<replaceable>nnnn</></literal> where
- <replaceable>nnnn</> is the server's port number, an ordinary file
- named <literal>.s.PGSQL.<replaceable>nnnn</>.lock</literal> will be
-- created in the <varname>unix_socket_directory</> directory. Neither
-- file should ever be removed manually.
-+ created in each of the <varname>unix_socket_directories</> directories.
-+ Neither file should ever be removed manually.
- </para>
-
- <para>
-@@ -490,8 +497,8 @@
- </indexterm>
- <listitem>
- <para>
-- Sets the owning group of the Unix-domain socket. (The owning
-- user of the socket is always the user that starts the
-+ Sets the owning group of the Unix-domain socket(s). (The owning
-+ user of the sockets is always the user that starts the
- server.) In combination with the parameter
- <varname>unix_socket_permissions</varname> this can be used as
- an additional access control mechanism for Unix-domain connections.
-@@ -514,7 +521,7 @@
- </indexterm>
- <listitem>
- <para>
-- Sets the access permissions of the Unix-domain socket. Unix-domain
-+ Sets the access permissions of the Unix-domain socket(s). Unix-domain
- sockets use the usual Unix file system permission set.
- The parameter value is expected to be a numeric mode
- specified in the format accepted by the
-@@ -6621,7 +6628,7 @@
- </row>
- <row>
- <entry><option>-k <replaceable>x</replaceable></option></entry>
-- <entry><literal>unix_socket_directory = <replaceable>x</replaceable></></entry>
-+ <entry><literal>unix_socket_directories = <replaceable>x</replaceable></></entry>
- </row>
- <row>
- <entry><option>-l</option></entry>
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2.3/doc/src/sgml/html/app-postgres.html
---- postgresql-9.2.3.orig/doc/src/sgml/html/app-postgres.html 2013-02-04 16:35:38.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html/app-postgres.html 2013-02-06 19:57:37.129796032 -0500
-@@ -574,11 +574,19 @@
- CLASS="COMMAND"
- >postgres</TT
- > is to listen for
-- connections from client applications. The default is normally
-+ connections from client applications. The value can also be a
-+ comma-separated list of directories. An empty value
-+ specifies not listening on any Unix-domain sockets, in which case
-+ only TCP/IP sockets can be used to connect to the server.
-+ The default value is normally
- <TT
- CLASS="FILENAME"
- >/tmp</TT
-->, but can be changed at build time.
-+>, but that can be changed at build time.
-+ Specifying this option is equivalent to setting the <A
-+HREF="runtime-config-connection.html#GUC-UNIX-SOCKET-DIRECTORIES"
-+>unix_socket_directories</A
-+> configuration parameter.
- </P
- ></DD
- ><DT
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2.3/doc/src/sgml/html/auth-methods.html
---- postgresql-9.2.3.orig/doc/src/sgml/html/auth-methods.html 2013-02-04 16:35:20.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html/auth-methods.html 2013-02-06 19:57:37.129796032 -0500
-@@ -161,7 +161,7 @@
- >. Or you
- could set the <TT
- CLASS="VARNAME"
-->unix_socket_directory</TT
-+>unix_socket_directories</TT
- >
- configuration parameter to place the socket file in a suitably
- restricted directory.
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/bookindex.html postgresql-9.2.3/doc/src/sgml/html/bookindex.html
---- postgresql-9.2.3.orig/doc/src/sgml/html/bookindex.html 2013-02-04 16:36:12.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html/bookindex.html 2013-02-06 19:57:37.133795530 -0500
-@@ -17243,7 +17243,7 @@
- ></DL
- ></DD
- ><DT
-->unix_socket_directory configuration parameter,
-+>unix_socket_directories configuration parameter,
- <A
- HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
- >Connection Settings</A
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2.3/doc/src/sgml/html/preventing-server-spoofing.html
---- postgresql-9.2.3.orig/doc/src/sgml/html/preventing-server-spoofing.html 2013-02-04 16:35:19.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html/preventing-server-spoofing.html 2013-02-06 19:57:37.134795410 -0500
-@@ -115,8 +115,8 @@
- >local</TT
- >
- connections is to use a Unix domain socket directory (<A
--HREF="runtime-config-connection.html#GUC-UNIX-SOCKET-DIRECTORY"
-->unix_socket_directory</A
-+HREF="runtime-config-connection.html#GUC-UNIX-SOCKET-DIRECTORIES"
-+>unix_socket_directories</A
- >) that has write permission only
- for a trusted local user. This prevents a malicious user from creating
- their own socket file in that directory. If you are concerned that
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2.3/doc/src/sgml/html/runtime-config-connection.html
---- postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-connection.html 2013-02-04 16:35:19.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html/runtime-config-connection.html 2013-02-06 19:57:37.135795292 -0500
-@@ -274,24 +274,31 @@
- ></DD
- ><DT
- ><A
--NAME="GUC-UNIX-SOCKET-DIRECTORY"
-+NAME="GUC-UNIX-SOCKET-DIRECTORIES"
- ></A
- ><TT
- CLASS="VARNAME"
-->unix_socket_directory</TT
-+>unix_socket_directories</TT
- > (<TT
- CLASS="TYPE"
- >string</TT
- >)</DT
- ><DD
- ><P
--> Specifies the directory of the Unix-domain socket on which the
-- server is to listen for
-- connections from client applications. The default is normally
-+> Specifies the directory of the Unix-domain socket(s) on which the
-+ server is to listen for connections from client applications.
-+ Multiple sockets can be created by listing multiple directories
-+ separated by commas. Whitespace between entries is
-+ ignored; surround a directory name with double quotes if you need
-+ to include whitespace or commas in the name.
-+ An empty value
-+ specifies not listening on any Unix-domain sockets, in which case
-+ only TCP/IP sockets can be used to connect to the server.
-+ The default value is normally
- <TT
- CLASS="FILENAME"
- >/tmp</TT
-->, but can be changed at build time.
-+>, but that can be changed at build time.
- This parameter can only be set at server start.
- </P
- ><P
-@@ -320,11 +327,11 @@
- ></TT
- >.lock</TT
- > will be
-- created in the <TT
-+ created in each of the <TT
- CLASS="VARNAME"
-->unix_socket_directory</TT
--> directory. Neither
-- file should ever be removed manually.
-+>unix_socket_directories</TT
-+> directories.
-+ Neither file should ever be removed manually.
- </P
- ><P
- > This parameter is irrelevant on Windows, which does not have
-@@ -344,8 +351,8 @@
- >)</DT
- ><DD
- ><P
--> Sets the owning group of the Unix-domain socket. (The owning
-- user of the socket is always the user that starts the
-+> Sets the owning group of the Unix-domain socket(s). (The owning
-+ user of the sockets is always the user that starts the
- server.) In combination with the parameter
- <TT
- CLASS="VARNAME"
-@@ -374,7 +381,7 @@
- >)</DT
- ><DD
- ><P
--> Sets the access permissions of the Unix-domain socket. Unix-domain
-+> Sets the access permissions of the Unix-domain socket(s). Unix-domain
- sockets use the usual Unix file system permission set.
- The parameter value is expected to be a numeric mode
- specified in the format accepted by the
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2.3/doc/src/sgml/html/runtime-config-short.html
---- postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-short.html 2013-02-04 16:35:20.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html/runtime-config-short.html 2013-02-06 19:57:37.135795292 -0500
-@@ -330,7 +330,7 @@
- ><TD
- ><TT
- CLASS="LITERAL"
-->unix_socket_directory = <TT
-+>unix_socket_directories = <TT
- CLASS="REPLACEABLE"
- ><I
- >x</I
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.3/doc/src/sgml/man1/postgres.1
---- postgresql-9.2.3.orig/doc/src/sgml/man1/postgres.1 2013-02-04 16:37:11.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/man1/postgres.1 2013-02-06 19:57:37.136795176 -0500
-@@ -195,8 +195,10 @@
- .RS 4
- Specifies the directory of the Unix\-domain socket on which
- \fBpostgres\fR
--is to listen for connections from client applications\&. The default is normally
--/tmp, but can be changed at build time\&.
-+is to listen for connections from client applications\&. The value can also be a comma\-separated list of directories\&. An empty value specifies not listening on any Unix\-domain sockets, in which case only TCP/IP sockets can be used to connect to the server\&. The default value is normally
-+/tmp, but that can be changed at build time\&. Specifying this option is equivalent to setting the
-+unix_socket_directories
-+configuration parameter\&.
- .RE
- .PP
- \fB\-l\fR
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2.3/doc/src/sgml/ref/postgres-ref.sgml
---- postgresql-9.2.3.orig/doc/src/sgml/ref/postgres-ref.sgml 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/ref/postgres-ref.sgml 2013-02-06 19:57:37.136795176 -0500
-@@ -254,8 +254,14 @@
- <para>
- Specifies the directory of the Unix-domain socket on which
- <command>postgres</command> is to listen for
-- connections from client applications. The default is normally
-- <filename>/tmp</filename>, but can be changed at build time.
-+ connections from client applications. The value can also be a
-+ comma-separated list of directories. An empty value
-+ specifies not listening on any Unix-domain sockets, in which case
-+ only TCP/IP sockets can be used to connect to the server.
-+ The default value is normally
-+ <filename>/tmp</filename>, but that can be changed at build time.
-+ Specifying this option is equivalent to setting the <xref
-+ linkend="guc-unix-socket-directories"> configuration parameter.
- </para>
- </listitem>
- </varlistentry>
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml postgresql-9.2.3/doc/src/sgml/runtime.sgml
---- postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/runtime.sgml 2013-02-06 19:57:37.137795062 -0500
-@@ -1798,7 +1798,7 @@
- <para>
- The simplest way to prevent spoofing for <literal>local</>
- connections is to use a Unix domain socket directory (<xref
-- linkend="guc-unix-socket-directory">) that has write permission only
-+ linkend="guc-unix-socket-directories">) that has write permission only
- for a trusted local user. This prevents a malicious user from creating
- their own socket file in that directory. If you are concerned that
- some applications might still reference <filename>/tmp</> for the
-diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src/backend/libpq/pqcomm.c
---- postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/libpq/pqcomm.c 2013-02-06 19:57:37.138794950 -0500
-@@ -42,7 +42,7 @@
- * StreamServerPort - Open postmaster's server port
- * StreamConnection - Create new connection with client
- * StreamClose - Close a client/backend connection
-- * TouchSocketFile - Protect socket file against /tmp cleaners
-+ * TouchSocketFiles - Protect socket files against /tmp cleaners
- * pq_init - initialize libpq at backend startup
- * pq_comm_reset - reset libpq during error recovery
- * pq_close - shutdown libpq at backend exit
-@@ -103,8 +103,8 @@
- char *Unix_socket_group;
-
-
--/* Where the Unix socket file is */
--static char sock_path[MAXPGPATH];
-+/* Where the Unix socket files are (list of palloc'd strings) */
-+static List *sock_paths = NIL;
-
-
- /*
-@@ -140,8 +140,8 @@
- static void pq_set_nonblocking(bool nonblocking);
-
- #ifdef HAVE_UNIX_SOCKETS
--static int Lock_AF_UNIX(unsigned short portNumber, char *unixSocketName);
--static int Setup_AF_UNIX(void);
-+static int Lock_AF_UNIX(char *unixSocketDir, char *unixSocketPath);
-+static int Setup_AF_UNIX(char *sock_path);
- #endif /* HAVE_UNIX_SOCKETS */
-
-
-@@ -234,29 +234,43 @@
-
- /* StreamDoUnlink()
- * Shutdown routine for backend connection
-- * If a Unix socket is used for communication, explicitly close it.
-+ * If any Unix sockets are used for communication, explicitly close them.
- */
- #ifdef HAVE_UNIX_SOCKETS
- static void
- StreamDoUnlink(int code, Datum arg)
- {
-- Assert(sock_path[0]);
-- unlink(sock_path);
-+ ListCell *l;
-+
-+ /* Loop through all created sockets... */
-+ foreach(l, sock_paths)
-+ {
-+ char *sock_path = (char *) lfirst(l);
-+
-+ unlink(sock_path);
-+ }
-+ /* Since we're about to exit, no need to reclaim storage */
-+ sock_paths = NIL;
- }
- #endif /* HAVE_UNIX_SOCKETS */
-
- /*
- * StreamServerPort -- open a "listening" port to accept connections.
- *
-- * Successfully opened sockets are added to the ListenSocket[] array,
-- * at the first position that isn't PGINVALID_SOCKET.
-+ * family should be AF_UNIX or AF_UNSPEC; portNumber is the port number.
-+ * For AF_UNIX ports, hostName should be NULL and unixSocketDir must be
-+ * specified. For TCP ports, hostName is either NULL for all interfaces or
-+ * the interface to listen on, and unixSocketDir is ignored (can be NULL).
-+ *
-+ * Successfully opened sockets are added to the ListenSocket[] array (of
-+ * length MaxListen), at the first position that isn't PGINVALID_SOCKET.
- *
- * RETURNS: STATUS_OK or STATUS_ERROR
- */
-
- int
- StreamServerPort(int family, char *hostName, unsigned short portNumber,
-- char *unixSocketName,
-+ char *unixSocketDir,
- pgsocket ListenSocket[], int MaxListen)
- {
- pgsocket fd;
-@@ -273,6 +287,9 @@
- int listen_index = 0;
- int added = 0;
-
-+#ifdef HAVE_UNIX_SOCKETS
-+ char unixSocketPath[MAXPGPATH];
-+#endif
- #if !defined(WIN32) || defined(IPV6_V6ONLY)
- int one = 1;
- #endif
-@@ -286,10 +303,22 @@
- #ifdef HAVE_UNIX_SOCKETS
- if (family == AF_UNIX)
- {
-- /* Lock_AF_UNIX will also fill in sock_path. */
-- if (Lock_AF_UNIX(portNumber, unixSocketName) != STATUS_OK)
-+ /*
-+ * Create unixSocketPath from portNumber and unixSocketDir and lock
-+ * that file path
-+ */
-+ UNIXSOCK_PATH(unixSocketPath, portNumber, unixSocketDir);
-+ if (strlen(unixSocketPath) >= UNIXSOCK_PATH_BUFLEN)
-+ {
-+ ereport(LOG,
-+ (errmsg("Unix-domain socket path \"%s\" is too long (maximum %d bytes)",
-+ unixSocketPath,
-+ (int) (UNIXSOCK_PATH_BUFLEN - 1))));
-+ return STATUS_ERROR;
-+ }
-+ if (Lock_AF_UNIX(unixSocketDir, unixSocketPath) != STATUS_OK)
- return STATUS_ERROR;
-- service = sock_path;
-+ service = unixSocketPath;
- }
- else
- #endif /* HAVE_UNIX_SOCKETS */
-@@ -432,7 +461,7 @@
- (IS_AF_UNIX(addr->ai_family)) ?
- errhint("Is another postmaster already running on port %d?"
- " If not, remove socket file \"%s\" and retry.",
-- (int) portNumber, sock_path) :
-+ (int) portNumber, service) :
- errhint("Is another postmaster already running on port %d?"
- " If not, wait a few seconds and retry.",
- (int) portNumber)));
-@@ -443,7 +472,7 @@
- #ifdef HAVE_UNIX_SOCKETS
- if (addr->ai_family == AF_UNIX)
- {
-- if (Setup_AF_UNIX() != STATUS_OK)
-+ if (Setup_AF_UNIX(service) != STATUS_OK)
- {
- closesocket(fd);
- break;
-@@ -490,18 +519,8 @@
- * Lock_AF_UNIX -- configure unix socket file path
- */
- static int
--Lock_AF_UNIX(unsigned short portNumber, char *unixSocketName)
-+Lock_AF_UNIX(char *unixSocketDir, char *unixSocketPath)
- {
-- UNIXSOCK_PATH(sock_path, portNumber, unixSocketName);
-- if (strlen(sock_path) >= UNIXSOCK_PATH_BUFLEN)
-- {
-- ereport(LOG,
-- (errmsg("Unix-domain socket path \"%s\" is too long (maximum %d bytes)",
-- sock_path,
-- (int) (UNIXSOCK_PATH_BUFLEN - 1))));
-- return STATUS_ERROR;
-- }
--
- /*
- * Grab an interlock file associated with the socket file.
- *
-@@ -510,13 +529,23 @@
- * more portable, and second, it lets us remove any pre-existing socket
- * file without race conditions.
- */
-- CreateSocketLockFile(sock_path, true);
-+ CreateSocketLockFile(unixSocketPath, true, unixSocketDir);
-
- /*
- * Once we have the interlock, we can safely delete any pre-existing
- * socket file to avoid failure at bind() time.
- */
-- unlink(sock_path);
-+ unlink(unixSocketPath);
-+
-+ /*
-+ * Arrange to unlink the socket file(s) at proc_exit. If this is the
-+ * first one, set up the on_proc_exit function to do it; then add this
-+ * socket file to the list of files to unlink.
-+ */
-+ if (sock_paths == NIL)
-+ on_proc_exit(StreamDoUnlink, 0);
-+
-+ sock_paths = lappend(sock_paths, pstrdup(unixSocketPath));
-
- return STATUS_OK;
- }
-@@ -526,11 +555,8 @@
- * Setup_AF_UNIX -- configure unix socket permissions
- */
- static int
--Setup_AF_UNIX(void)
-+Setup_AF_UNIX(char *sock_path)
- {
-- /* Arrange to unlink the socket file at exit */
-- on_proc_exit(StreamDoUnlink, 0);
--
- /*
- * Fix socket ownership/permission if requested. Note we must do this
- * before we listen() to avoid a window where unwanted connections could
-@@ -712,20 +738,24 @@
- }
-
- /*
-- * TouchSocketFile -- mark socket file as recently accessed
-+ * TouchSocketFiles -- mark socket files as recently accessed
- *
- * This routine should be called every so often to ensure that the socket
-- * file has a recent mod date (ordinary operations on sockets usually won't
-- * change the mod date). That saves it from being removed by
-+ * files have a recent mod date (ordinary operations on sockets usually won't
-+ * change the mod date). That saves them from being removed by
- * overenthusiastic /tmp-directory-cleaner daemons. (Another reason we should
- * never have put the socket file in /tmp...)
- */
- void
--TouchSocketFile(void)
-+TouchSocketFiles(void)
- {
-- /* Do nothing if we did not create a socket... */
-- if (sock_path[0] != '\0')
-+ ListCell *l;
-+
-+ /* Loop through all created sockets... */
-+ foreach(l, sock_paths)
- {
-+ char *sock_path = (char *) lfirst(l);
-+
- /*
- * utime() is POSIX standard, utimes() is a common alternative. If we
- * have neither, there's no way to affect the mod or access time of
-diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-9.2.3/src/backend/postmaster/postmaster.c
---- postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/postmaster/postmaster.c 2013-02-06 19:57:37.139794840 -0500
-@@ -156,7 +156,9 @@
-
- /* The socket number we are listening for connections on */
- int PostPortNumber;
--char *UnixSocketDir;
-+/* The directory names for Unix socket(s) */
-+char *Unix_socket_directories;
-+/* The TCP listen address(es) */
- char *ListenAddresses;
-
- /*
-@@ -608,7 +610,7 @@
- break;
-
- case 'k':
-- SetConfigOption("unix_socket_directory", optarg, PGC_POSTMASTER, PGC_S_ARGV);
-+ SetConfigOption("unix_socket_directories", optarg, PGC_POSTMASTER, PGC_S_ARGV);
- break;
-
- case 'l':
-@@ -852,7 +854,7 @@
- /* Need a modifiable copy of ListenAddresses */
- rawstring = pstrdup(ListenAddresses);
-
-- /* Parse string into list of identifiers */
-+ /* Parse string into list of hostnames */
- if (!SplitIdentifierString(rawstring, ',', &elemlist))
- {
- /* syntax error in list */
-@@ -868,12 +870,12 @@
- if (strcmp(curhost, "*") == 0)
- status = StreamServerPort(AF_UNSPEC, NULL,
- (unsigned short) PostPortNumber,
-- UnixSocketDir,
-+ NULL,
- ListenSocket, MAXLISTEN);
- else
- status = StreamServerPort(AF_UNSPEC, curhost,
- (unsigned short) PostPortNumber,
-- UnixSocketDir,
-+ NULL,
- ListenSocket, MAXLISTEN);
-
- if (status == STATUS_OK)
-@@ -892,7 +894,7 @@
- curhost)));
- }
-
-- if (!success && list_length(elemlist))
-+ if (!success && elemlist != NIL)
- ereport(FATAL,
- (errmsg("could not create any TCP/IP sockets")));
-
-@@ -939,13 +941,54 @@
- #endif
-
- #ifdef HAVE_UNIX_SOCKETS
-- status = StreamServerPort(AF_UNIX, NULL,
-- (unsigned short) PostPortNumber,
-- UnixSocketDir,
-- ListenSocket, MAXLISTEN);
-- if (status != STATUS_OK)
-- ereport(WARNING,
-- (errmsg("could not create Unix-domain socket")));
-+ if (Unix_socket_directories)
-+ {
-+ char *rawstring;
-+ List *elemlist;
-+ ListCell *l;
-+ int success = 0;
-+
-+ /* Need a modifiable copy of Unix_socket_directories */
-+ rawstring = pstrdup(Unix_socket_directories);
-+
-+ /* Parse string into list of directories */
-+ if (!SplitDirectoriesString(rawstring, ',', &elemlist))
-+ {
-+ /* syntax error in list */
-+ ereport(FATAL,
-+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-+ errmsg("invalid list syntax for \"unix_socket_directories\"")));
-+ }
-+
-+ foreach(l, elemlist)
-+ {
-+ char *socketdir = (char *) lfirst(l);
-+
-+ status = StreamServerPort(AF_UNIX, NULL,
-+ (unsigned short) PostPortNumber,
-+ socketdir,
-+ ListenSocket, MAXLISTEN);
-+
-+ if (status == STATUS_OK)
-+ {
-+ success++;
-+ /* record the first successful Unix socket in lockfile */
-+ if (success == 1)
-+ AddToDataDirLockFile(LOCK_FILE_LINE_SOCKET_DIR, socketdir);
-+ }
-+ else
-+ ereport(WARNING,
-+ (errmsg("could not create Unix-domain socket in directory \"%s\"",
-+ socketdir)));
-+ }
-+
-+ if (!success && elemlist != NIL)
-+ ereport(FATAL,
-+ (errmsg("could not create any Unix-domain sockets")));
-+
-+ list_free_deep(elemlist);
-+ pfree(rawstring);
-+ }
- #endif
-
- /*
-@@ -1435,15 +1478,15 @@
- }
-
- /*
-- * Touch the socket and lock file every 58 minutes, to ensure that
-+ * Touch Unix socket and lock files every 58 minutes, to ensure that
- * they are not removed by overzealous /tmp-cleaning tasks. We assume
- * no one runs cleaners with cutoff times of less than an hour ...
- */
- now = time(NULL);
- if (now - last_touch_time >= 58 * SECS_PER_MINUTE)
- {
-- TouchSocketFile();
-- TouchSocketLockFile();
-+ TouchSocketFiles();
-+ TouchSocketLockFiles();
- last_touch_time = now;
- }
- }
-diff -Naur postgresql-9.2.3.orig/src/backend/tcop/postgres.c postgresql-9.2.3/src/backend/tcop/postgres.c
---- postgresql-9.2.3.orig/src/backend/tcop/postgres.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/tcop/postgres.c 2013-02-06 19:57:37.140794732 -0500
-@@ -3333,7 +3333,7 @@
- break;
-
- case 'k':
-- SetConfigOption("unix_socket_directory", optarg, ctx, gucsource);
-+ SetConfigOption("unix_socket_directories", optarg, ctx, gucsource);
- break;
-
- case 'l':
-diff -Naur postgresql-9.2.3.orig/src/backend/utils/adt/varlena.c postgresql-9.2.3/src/backend/utils/adt/varlena.c
---- postgresql-9.2.3.orig/src/backend/utils/adt/varlena.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/adt/varlena.c 2013-02-06 19:57:37.141794626 -0500
-@@ -2446,6 +2446,119 @@
- }
-
-
-+/*
-+ * SplitDirectoriesString --- parse a string containing directory names
-+ *
-+ * This is similar to SplitIdentifierString, except that the parsing
-+ * rules are meant to handle pathnames instead of identifiers: there is
-+ * no downcasing, embedded spaces are allowed, the max length is MAXPGPATH-1,
-+ * and we apply canonicalize_path() to each extracted string. Because of the
-+ * last, the returned strings are separately palloc'd rather than being
-+ * pointers into rawstring --- but we still scribble on rawstring.
-+ *
-+ * Inputs:
-+ * rawstring: the input string; must be modifiable!
-+ * separator: the separator punctuation expected between directories
-+ * (typically ',' or ';'). Whitespace may also appear around
-+ * directories.
-+ * Outputs:
-+ * namelist: filled with a palloc'd list of directory names.
-+ * Caller should list_free_deep() this even on error return.
-+ *
-+ * Returns TRUE if okay, FALSE if there is a syntax error in the string.
-+ *
-+ * Note that an empty string is considered okay here.
-+ */
-+bool
-+SplitDirectoriesString(char *rawstring, char separator,
-+ List **namelist)
-+{
-+ char *nextp = rawstring;
-+ bool done = false;
-+
-+ *namelist = NIL;
-+
-+ while (isspace((unsigned char) *nextp))
-+ nextp++; /* skip leading whitespace */
-+
-+ if (*nextp == '\0')
-+ return true; /* allow empty string */
-+
-+ /* At the top of the loop, we are at start of a new directory. */
-+ do
-+ {
-+ char *curname;
-+ char *endp;
-+
-+ if (*nextp == '\"')
-+ {
-+ /* Quoted name --- collapse quote-quote pairs */
-+ curname = nextp + 1;
-+ for (;;)
-+ {
-+ endp = strchr(nextp + 1, '\"');
-+ if (endp == NULL)
-+ return false; /* mismatched quotes */
-+ if (endp[1] != '\"')
-+ break; /* found end of quoted name */
-+ /* Collapse adjacent quotes into one quote, and look again */
-+ memmove(endp, endp + 1, strlen(endp));
-+ nextp = endp;
-+ }
-+ /* endp now points at the terminating quote */
-+ nextp = endp + 1;
-+ }
-+ else
-+ {
-+ /* Unquoted name --- extends to separator or end of string */
-+ curname = endp = nextp;
-+ while (*nextp && *nextp != separator)
-+ {
-+ /* trailing whitespace should not be included in name */
-+ if (!isspace((unsigned char) *nextp))
-+ endp = nextp + 1;
-+ nextp++;
-+ }
-+ if (curname == endp)
-+ return false; /* empty unquoted name not allowed */
-+ }
-+
-+ while (isspace((unsigned char) *nextp))
-+ nextp++; /* skip trailing whitespace */
-+
-+ if (*nextp == separator)
-+ {
-+ nextp++;
-+ while (isspace((unsigned char) *nextp))
-+ nextp++; /* skip leading whitespace for next */
-+ /* we expect another name, so done remains false */
-+ }
-+ else if (*nextp == '\0')
-+ done = true;
-+ else
-+ return false; /* invalid syntax */
-+
-+ /* Now safe to overwrite separator with a null */
-+ *endp = '\0';
-+
-+ /* Truncate path if it's overlength */
-+ if (strlen(curname) >= MAXPGPATH)
-+ curname[MAXPGPATH - 1] = '\0';
-+
-+ /*
-+ * Finished isolating current name --- add it to list
-+ */
-+ curname = pstrdup(curname);
-+ canonicalize_path(curname);
-+ *namelist = lappend(*namelist, curname);
-+
-+ /* Loop back if we didn't reach end of string */
-+ } while (!done);
-+
-+ return true;
-+}
-+
-+
- /*****************************************************************************
- * Comparison Functions used for bytea
- *
-diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.2.3/src/backend/utils/init/miscinit.c
---- postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/init/miscinit.c 2013-02-06 20:03:33.247073549 -0500
-@@ -49,8 +49,8 @@
-
- ProcessingMode Mode = InitProcessing;
-
--/* Note: we rely on this to initialize as zeroes */
--static char socketLockFile[MAXPGPATH];
-+/* List of lock files to be removed at proc exit */
-+static List *lock_files = NIL;
-
-
- /* ----------------------------------------------------------------
-@@ -640,32 +640,35 @@
- */
-
- /*
-- * proc_exit callback to remove a lockfile.
-+ * proc_exit callback to remove lockfiles.
- */
- static void
--UnlinkLockFile(int status, Datum filename)
-+UnlinkLockFiles(int status, Datum arg)
- {
-- char *fname = (char *) DatumGetPointer(filename);
-+ ListCell *l;
-
-- if (fname != NULL)
-+ foreach(l, lock_files)
- {
-- if (unlink(fname) != 0)
-- {
-- /* Should we complain if the unlink fails? */
-- }
-- free(fname);
-+ char *curfile = (char *) lfirst(l);
-+
-+ unlink(curfile);
-+ /* Should we complain if the unlink fails? */
- }
-+ /* Since we're about to exit, no need to reclaim storage */
-+ lock_files = NIL;
- }
-
- /*
- * Create a lockfile.
- *
-- * filename is the name of the lockfile to create.
-+ * filename is the path name of the lockfile to create.
- * amPostmaster is used to determine how to encode the output PID.
-+ * socketDir is the Unix socket directory path to include (possibly empty).
- * isDDLock and refName are used to determine what error message to produce.
- */
- static void
- CreateLockFile(const char *filename, bool amPostmaster,
-+ const char *socketDir,
- bool isDDLock, const char *refName)
- {
- int fd;
-@@ -891,12 +894,7 @@
- DataDir,
- (long) MyStartTime,
- PostPortNumber,
--#ifdef HAVE_UNIX_SOCKETS
-- (*UnixSocketDir != '\0') ? UnixSocketDir : DEFAULT_PGSOCKET_DIR
--#else
-- ""
--#endif
-- );
-+ socketDir);
-
- /*
- * In a standalone backend, the next line (LOCK_FILE_LINE_LISTEN_ADDR)
-@@ -941,9 +939,14 @@
- }
-
- /*
-- * Arrange for automatic removal of lockfile at proc_exit.
-+ * Arrange to unlink the lock file(s) at proc_exit. If this is the
-+ * first one, set up the on_proc_exit function to do it; then add this
-+ * lock file to the list of files to unlink.
- */
-- on_proc_exit(UnlinkLockFile, PointerGetDatum(strdup(filename)));
-+ if (lock_files == NIL)
-+ on_proc_exit(UnlinkLockFiles, 0);
-+
-+ lock_files = lappend(lock_files, pstrdup(filename));
- }
-
- /*
-@@ -952,41 +955,50 @@
- * When this is called, we must have already switched the working
- * directory to DataDir, so we can just use a relative path. This
- * helps ensure that we are locking the directory we should be.
-+ *
-+ * Note that the socket directory path line is initially written as empty.
-+ * postmaster.c will rewrite it upon creating the first Unix socket.
- */
- void
- CreateDataDirLockFile(bool amPostmaster)
- {
-- CreateLockFile(DIRECTORY_LOCK_FILE, amPostmaster, true, DataDir);
-+ CreateLockFile(DIRECTORY_LOCK_FILE, amPostmaster, "", true, DataDir);
- }
-
- /*
- * Create a lockfile for the specified Unix socket file.
- */
- void
--CreateSocketLockFile(const char *socketfile, bool amPostmaster)
-+CreateSocketLockFile(const char *socketfile, bool amPostmaster,
-+ const char *socketDir)
- {
- char lockfile[MAXPGPATH];
-
- snprintf(lockfile, sizeof(lockfile), "%s.lock", socketfile);
-- CreateLockFile(lockfile, amPostmaster, false, socketfile);
-- /* Save name of lockfile for TouchSocketLockFile */
-- strcpy(socketLockFile, lockfile);
-+ CreateLockFile(lockfile, amPostmaster, socketDir, false, socketfile);
- }
-
- /*
-- * TouchSocketLockFile -- mark socket lock file as recently accessed
-+ * TouchSocketLockFiles -- mark socket lock files as recently accessed
- *
-- * This routine should be called every so often to ensure that the lock file
-- * has a recent mod or access date. That saves it
-+ * This routine should be called every so often to ensure that the socket
-+ * lock files have a recent mod or access date. That saves them
- * from being removed by overenthusiastic /tmp-directory-cleaner daemons.
- * (Another reason we should never have put the socket file in /tmp...)
- */
- void
--TouchSocketLockFile(void)
-+TouchSocketLockFiles(void)
- {
-- /* Do nothing if we did not create a socket... */
-- if (socketLockFile[0] != '\0')
-+ ListCell *l;
-+
-+ foreach(l, lock_files)
- {
-+ char *socketLockFile = (char *) lfirst(l);
-+
-+ /* No need to touch the data directory lock file, we trust */
-+ if (strcmp(socketLockFile, DIRECTORY_LOCK_FILE) == 0)
-+ continue;
-+
- /*
- * utime() is POSIX standard, utimes() is a common alternative; if we
- * have neither, fall back to actually reading the file (which only
-@@ -1018,8 +1030,10 @@
- * Add (or replace) a line in the data directory lock file.
- * The given string should not include a trailing newline.
- *
-- * Caution: this erases all following lines. In current usage that is OK
-- * because lines are added in order. We could improve it if needed.
-+ * Note: because we don't truncate the file, if we were to rewrite a line
-+ * with less data than it had before, there would be garbage after the last
-+ * line. We don't ever actually do that, so not worth adding another kernel
-+ * call to cover the possibility.
- */
- void
- AddToDataDirLockFile(int target_line, const char *str)
-@@ -1027,8 +1041,10 @@
- int fd;
- int len;
- int lineno;
-- char *ptr;
-- char buffer[BLCKSZ];
-+ char *srcptr;
-+ char *destptr;
-+ char srcbuffer[BLCKSZ];
-+ char destbuffer[BLCKSZ];
-
- fd = open(DIRECTORY_LOCK_FILE, O_RDWR | PG_BINARY, 0);
- if (fd < 0)
-@@ -1039,7 +1055,7 @@
- DIRECTORY_LOCK_FILE)));
- return;
- }
-- len = read(fd, buffer, sizeof(buffer) - 1);
-+ len = read(fd, srcbuffer, sizeof(srcbuffer) - 1);
- if (len < 0)
- {
- ereport(LOG,
-@@ -1049,37 +1065,51 @@
- close(fd);
- return;
- }
-- buffer[len] = '\0';
-+ srcbuffer[len] = '\0';
-
- /*
-- * Skip over lines we are not supposed to rewrite.
-+ * Advance over lines we are not supposed to rewrite, then copy them
-+ * to destbuffer.
- */
-- ptr = buffer;
-+ srcptr = srcbuffer;
- for (lineno = 1; lineno < target_line; lineno++)
- {
-- if ((ptr = strchr(ptr, '\n')) == NULL)
-+ if ((srcptr = strchr(srcptr, '\n')) == NULL)
- {
- elog(LOG, "incomplete data in \"%s\": found only %d newlines while trying to add line %d",
- DIRECTORY_LOCK_FILE, lineno - 1, target_line);
- close(fd);
- return;
- }
-- ptr++;
-+ srcptr++;
- }
-+ memcpy(destbuffer, srcbuffer, srcptr - srcbuffer);
-+ destptr = destbuffer + (srcptr - srcbuffer);
-
- /*
- * Write or rewrite the target line.
- */
-- snprintf(ptr, buffer + sizeof(buffer) - ptr, "%s\n", str);
-+ snprintf(destptr, destbuffer + sizeof(destbuffer) - destptr, "%s\n", str);
-+ destptr += strlen(destptr);
-+
-+ /*
-+ * If there are more lines in the old file, append them to destbuffer.
-+ */
-+ if ((srcptr = strchr(srcptr, '\n')) != NULL)
-+ {
-+ srcptr++;
-+ snprintf(destptr, destbuffer + sizeof(destbuffer) - destptr, "%s",
-+ srcptr);
-+ }
-
- /*
- * And rewrite the data. Since we write in a single kernel call, this
- * update should appear atomic to onlookers.
- */
-- len = strlen(buffer);
-+ len = strlen(destbuffer);
- errno = 0;
- if (lseek(fd, (off_t) 0, SEEK_SET) != 0 ||
-- (int) write(fd, buffer, len) != len)
-+ (int) write(fd, destbuffer, len) != len)
- {
- /* if write didn't set errno, assume problem is no disk space */
- if (errno == 0)
-diff -Naur postgresql-9.2.3.orig/src/backend/utils/misc/guc.c postgresql-9.2.3/src/backend/utils/misc/guc.c
---- postgresql-9.2.3.orig/src/backend/utils/misc/guc.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/misc/guc.c 2013-02-06 19:57:37.144794320 -0500
-@@ -2894,14 +2894,18 @@
- },
-
- {
-- {"unix_socket_directory", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
-- gettext_noop("Sets the directory where the Unix-domain socket will be created."),
-+ {"unix_socket_directories", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
-+ gettext_noop("Sets the directories where Unix-domain sockets will be created."),
- NULL,
- GUC_SUPERUSER_ONLY
- },
-- &UnixSocketDir,
-+ &Unix_socket_directories,
-+#ifdef HAVE_UNIX_SOCKETS
-+ DEFAULT_PGSOCKET_DIR,
-+#else
- "",
-- check_canonical_path, NULL, NULL
-+#endif
-+ NULL, NULL, NULL
- },
-
- {
-diff -Naur postgresql-9.2.3.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2.3/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.2.3.orig/src/backend/utils/misc/postgresql.conf.sample 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/backend/utils/misc/postgresql.conf.sample 2013-02-06 19:57:37.145794222 -0500
-@@ -65,7 +65,8 @@
- # Note: Increasing max_connections costs ~400 bytes of shared memory per
- # connection slot, plus lock space (see max_locks_per_transaction).
- #superuser_reserved_connections = 3 # (change requires restart)
--#unix_socket_directory = '' # (change requires restart)
-+#unix_socket_directories = '/tmp' # comma-separated list of directories
-+ # (change requires restart)
- #unix_socket_group = '' # (change requires restart)
- #unix_socket_permissions = 0777 # begin with 0 to use octal notation
- # (change requires restart)
-diff -Naur postgresql-9.2.3.orig/src/bin/initdb/initdb.c postgresql-9.2.3/src/bin/initdb/initdb.c
---- postgresql-9.2.3.orig/src/bin/initdb/initdb.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/bin/initdb/initdb.c 2013-02-06 19:57:37.146794124 -0500
-@@ -983,7 +983,7 @@
- setup_config(void)
- {
- char **conflines;
-- char repltok[TZ_STRLEN_MAX + 100];
-+ char repltok[MAXPGPATH];
- char path[MAXPGPATH];
- const char *default_timezone;
-
-@@ -1005,6 +1005,15 @@
- n_buffers * (BLCKSZ / 1024));
- conflines = replace_token(conflines, "#shared_buffers = 32MB", repltok);
-
-+#ifdef HAVE_UNIX_SOCKETS
-+ snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
-+ DEFAULT_PGSOCKET_DIR);
-+#else
-+ snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
-+#endif
-+ conflines = replace_token(conflines, "#unix_socket_directories = '/tmp'",
-+ repltok);
-+
- #if DEF_PGPORT != 5432
- snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
- conflines = replace_token(conflines, "#port = 5432", repltok);
-diff -Naur postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c 2013-02-06 19:57:37.147794028 -0500
-@@ -559,7 +559,7 @@
- hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
-
- /*
-- * While unix_socket_directory can accept relative
-+ * While unix_socket_directories can accept relative
- * directories, libpq's host parameter must have a
- * leading slash to indicate a socket directory. So,
- * ignore sockdir if it's relative, and try to use TCP
-diff -Naur postgresql-9.2.3.orig/src/include/libpq/libpq.h postgresql-9.2.3/src/include/libpq/libpq.h
---- postgresql-9.2.3.orig/src/include/libpq/libpq.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/libpq/libpq.h 2013-02-06 19:57:37.147794028 -0500
-@@ -44,12 +44,12 @@
- /*
- * prototypes for functions in pqcomm.c
- */
--extern int StreamServerPort(int family, char *hostName,
-- unsigned short portNumber, char *unixSocketName, pgsocket ListenSocket[],
-- int MaxListen);
-+extern int StreamServerPort(int family, char *hostName,
-+ unsigned short portNumber, char *unixSocketDir,
-+ pgsocket ListenSocket[], int MaxListen);
- extern int StreamConnection(pgsocket server_fd, Port *port);
- extern void StreamClose(pgsocket sock);
--extern void TouchSocketFile(void);
-+extern void TouchSocketFiles(void);
- extern void pq_init(void);
- extern void pq_comm_reset(void);
- extern int pq_getbytes(char *s, size_t len);
-diff -Naur postgresql-9.2.3.orig/src/include/miscadmin.h postgresql-9.2.3/src/include/miscadmin.h
---- postgresql-9.2.3.orig/src/include/miscadmin.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/miscadmin.h 2013-02-06 19:57:37.148793934 -0500
-@@ -411,7 +411,7 @@
- * 2 data directory path
- * 3 postmaster start timestamp (time_t representation)
- * 4 port number
-- * 5 socket directory path (empty on Windows)
-+ * 5 first Unix socket directory path (empty if none)
- * 6 first listen_address (IP address or "*"; empty if no TCP port)
- * 7 shared memory key (not present on Windows)
- *
-@@ -429,8 +429,9 @@
- #define LOCK_FILE_LINE_SHMEM_KEY 7
-
- extern void CreateDataDirLockFile(bool amPostmaster);
--extern void CreateSocketLockFile(const char *socketfile, bool amPostmaster);
--extern void TouchSocketLockFile(void);
-+extern void CreateSocketLockFile(const char *socketfile, bool amPostmaster,
-+ const char *socketDir);
-+extern void TouchSocketLockFiles(void);
- extern void AddToDataDirLockFile(int target_line, const char *str);
- extern void ValidatePgVersion(const char *path);
- extern void process_shared_preload_libraries(void);
-diff -Naur postgresql-9.2.3.orig/src/include/postmaster/postmaster.h postgresql-9.2.3/src/include/postmaster/postmaster.h
---- postgresql-9.2.3.orig/src/include/postmaster/postmaster.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/postmaster/postmaster.h 2013-02-06 19:57:37.148793934 -0500
-@@ -19,7 +19,7 @@
- extern int PostPortNumber;
- extern int Unix_socket_permissions;
- extern char *Unix_socket_group;
--extern char *UnixSocketDir;
-+extern char *Unix_socket_directories;
- extern char *ListenAddresses;
- extern bool ClientAuthInProgress;
- extern int PreAuthDelay;
-diff -Naur postgresql-9.2.3.orig/src/include/utils/builtins.h postgresql-9.2.3/src/include/utils/builtins.h
---- postgresql-9.2.3.orig/src/include/utils/builtins.h 2013-02-04 16:28:13.000000000 -0500
-+++ postgresql-9.2.3/src/include/utils/builtins.h 2013-02-06 19:57:37.149793843 -0500
-@@ -754,6 +754,8 @@
- extern List *textToQualifiedNameList(text *textval);
- extern bool SplitIdentifierString(char *rawstring, char separator,
- List **namelist);
-+extern bool SplitDirectoriesString(char *rawstring, char separator,
-+ List **namelist);
- extern Datum replace_text(PG_FUNCTION_ARGS);
- extern text *replace_text_regexp(text *src_text, void *regexp,
- text *replace_text, bool glob);
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html-stamp postgresql-9.2.3/doc/src/sgml/html-stamp
---- postgresql-9.2.3.orig/doc/src/sgml/html-stamp 2013-02-04 16:36:12.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/html-stamp 2013-02-06 19:57:37.149793843 -0500
-@@ -0,0 +1 @@
-+hack
-diff -Naur postgresql-9.2.3.orig/doc/src/sgml/man-stamp postgresql-9.2.3/doc/src/sgml/man-stamp
---- postgresql-9.2.3.orig/doc/src/sgml/man-stamp 2013-02-04 16:37:18.000000000 -0500
-+++ postgresql-9.2.3/doc/src/sgml/man-stamp 2013-02-06 19:57:37.149793843 -0500
-@@ -0,0 +1 @@
-+hack
diff --git a/postgresql-python3.patch b/postgresql-python3.patch
deleted file mode 100644
index f67383f..0000000
--- a/postgresql-python3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-This won't be needed in 9.2.1 and later.
-
-
-commit 770556d6c69c4edf219d4ace2e4fb29a1f2c35df
-Author: Tom Lane <tgl(a)sss.pgh.pa.us>
-Date: Sat Sep 8 17:39:02 2012 -0400
-
- Adjust PL/Python regression tests some more for Python 3.3.
-
- Commit 2cfb1c6f77734db81b6e74bcae630f93b94f69be fixed some issues caused
- by Python 3.3 choosing to iterate through dict entries in a different order
- than before. But here's another one: the test cases adjusted here made two
- bad entries in a dict and expected the one complained of would always be
- the same.
-
- Possibly this should be back-patched further than 9.2, but there seems
- little point unless the earlier fix is too.
-
-diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out
-index 4c46b2b..25060b0 100644
---- a/src/pl/plpython/expected/plpython_trigger.out
-+++ b/src/pl/plpython/expected/plpython_trigger.out
-@@ -476,7 +476,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test;
- -- TD keys not corresponding to row columns
- CREATE FUNCTION stupid7() RETURNS trigger
- AS $$
-- TD["new"] = {'a': 'foo', 'b': 'bar'}
-+ TD["new"] = {'v': 'foo', 'a': 'bar'}
- return "MODIFY";
- $$ LANGUAGE plpythonu;
- CREATE TRIGGER stupid_trigger7
-@@ -490,7 +490,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test;
- -- Unicode variant
- CREATE FUNCTION stupid7u() RETURNS trigger
- AS $$
-- TD["new"] = {u'a': 'foo', u'b': 'bar'}
-+ TD["new"] = {u'v': 'foo', u'a': 'bar'}
- return "MODIFY"
- $$ LANGUAGE plpythonu;
- CREATE TRIGGER stupid_trigger7
-diff --git a/src/pl/plpython/sql/plpython_trigger.sql b/src/pl/plpython/sql/plpython_trigger.sql
-index 2a4859f..9727f44 100644
---- a/src/pl/plpython/sql/plpython_trigger.sql
-+++ b/src/pl/plpython/sql/plpython_trigger.sql
-@@ -253,7 +253,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test;
-
- CREATE FUNCTION stupid7() RETURNS trigger
- AS $$
-- TD["new"] = {'a': 'foo', 'b': 'bar'}
-+ TD["new"] = {'v': 'foo', 'a': 'bar'}
- return "MODIFY";
- $$ LANGUAGE plpythonu;
-
-@@ -270,7 +270,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test;
-
- CREATE FUNCTION stupid7u() RETURNS trigger
- AS $$
-- TD["new"] = {u'a': 'foo', u'b': 'bar'}
-+ TD["new"] = {u'v': 'foo', u'a': 'bar'}
- return "MODIFY"
- $$ LANGUAGE plpythonu;
-
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 22b8a0c..3a7eddf 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -12,16 +12,14 @@ server package update, without requiring any existing postgresql.conf
to be updated. (Of course, a user who dislikes this behavior can still
override it via postgresql.conf.)
-This patch must be applied after postgresql-multi-sockets.patch, at
-least until 9.3 when that will be part of the upstream package.
-
-diff -Naur postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.2/contrib/pg_upgrade/test.sh
---- postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh 2013-01-03 17:33:45.581567466 -0500
-+++ postgresql-9.2.2/contrib/pg_upgrade/test.sh 2013-01-03 17:40:22.923364917 -0500
-@@ -78,6 +78,12 @@
- rm -rf "$logdir"
- mkdir "$logdir"
+diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
+index 30bc527..4e8f6a4 100644
+--- a/contrib/pg_upgrade/test.sh
++++ b/contrib/pg_upgrade/test.sh
+@@ -107,6 +107,12 @@ done
+ EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
+ export EXTRA_REGRESS_OPTS
+# we want the Unix sockets in $temp_root
+PGHOST=$temp_root
@@ -32,10 +30,11 @@ diff -Naur postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.2/
# enable echo so the user can see what is being executed
set -x
-diff -Naur postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c postgresql-9.2.2/src/backend/utils/misc/guc.c
---- postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c 2013-01-03 17:37:56.632977951 -0500
-+++ postgresql-9.2.2/src/backend/utils/misc/guc.c 2013-01-03 17:38:30.183271588 -0500
-@@ -2901,7 +2901,7 @@
+diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
+index a055231..20b8c87 100644
+--- a/src/backend/utils/misc/guc.c
++++ b/src/backend/utils/misc/guc.c
+@@ -2929,7 +2929,7 @@ static struct config_string ConfigureNamesString[] =
},
&Unix_socket_directories,
#ifdef HAVE_UNIX_SOCKETS
@@ -44,10 +43,11 @@ diff -Naur postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c postgresql-9.2.
#else
"",
#endif
-diff -Naur postgresql-9.2.2.sockets/src/bin/initdb/initdb.c postgresql-9.2.2/src/bin/initdb/initdb.c
---- postgresql-9.2.2.sockets/src/bin/initdb/initdb.c 2013-01-03 17:37:56.633977974 -0500
-+++ postgresql-9.2.2/src/bin/initdb/initdb.c 2013-01-03 17:38:30.185271611 -0500
-@@ -1007,7 +1007,7 @@
+diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
+index 5fc7291..d871341 100644
+--- a/src/bin/initdb/initdb.c
++++ b/src/bin/initdb/initdb.c
+@@ -1203,7 +1203,7 @@ setup_config(void)
#ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -56,9 +56,10 @@ diff -Naur postgresql-9.2.2.sockets/src/bin/initdb/initdb.c postgresql-9.2.2/src
#else
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif
-diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.2.2/src/include/pg_config_manual.h
---- postgresql-9.2.2.sockets/src/include/pg_config_manual.h 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/include/pg_config_manual.h 2013-01-03 17:38:30.185271611 -0500
+diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+index 02bcd92..8aaf58b 100644
+--- a/src/include/pg_config_manual.h
++++ b/src/include/pg_config_manual.h
@@ -144,7 +144,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
@@ -68,10 +69,11 @@ diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.
/*
* The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.2.2.sockets/src/test/regress/pg_regress.c postgresql-9.2.2/src/test/regress/pg_regress.c
---- postgresql-9.2.2.sockets/src/test/regress/pg_regress.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/test/regress/pg_regress.c 2013-01-03 17:38:30.186271622 -0500
-@@ -772,7 +772,7 @@
+diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
+index b632326..943165c 100644
+--- a/src/test/regress/pg_regress.c
++++ b/src/test/regress/pg_regress.c
+@@ -772,7 +772,7 @@ initialize_environment(void)
if (hostname != NULL)
doputenv("PGHOST", hostname);
else
@@ -80,7 +82,7 @@ diff -Naur postgresql-9.2.2.sockets/src/test/regress/pg_regress.c postgresql-9.2
unsetenv("PGHOSTADDR");
if (port != -1)
{
-@@ -2246,7 +2246,7 @@
+@@ -2249,7 +2249,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
*/
header(_("starting postmaster"));
snprintf(buf, sizeof(buf),
diff --git a/postgresql.service b/postgresql.service
index 4a55a66..aa63e1a 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -15,7 +15,7 @@
# This will override the setting appearing below.
# Note: changing PGPORT or PGDATA will typically require adjusting SELinux
-# configuration as well; see /usr/share/doc/postgresql-*/README.rpm-dist.
+# configuration as well; see /usr/share/doc/postgresql/README.rpm-dist.
# Note: do not use a PGDATA pathname containing spaces, or you will
# break postgresql-setup.
diff --git a/postgresql.spec b/postgresql.spec
index c74b933..868581d 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,9 +58,9 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.2
-Version: 9.2.4
-Release: 11%{?dist}
+%global majorversion 9.3
+Version: 9.3.0
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -75,8 +75,8 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.1.9
-%global prevmajorversion 9.1
+%global prevversion 9.2.4
+%global prevmajorversion 9.2
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -102,29 +102,9 @@ Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
-Patch5: postgresql-multi-sockets.patch
-Patch6: postgresql-var-run-socket.patch
-
-# Comments for these patches are in the patch files.
-Patch8: postgresql-man.patch
-
-# Build even with Perl 5.18+
-# ~> upstream (035a5e1e8c34)
-Patch9: postgresql-9.2.4-perl-5.18.patch
-
-# Add support for atomic operations TAS/S_UNLOCK in aarch64.
-# ~> upstream (612ecf311b)
-# ~> #970661
-Patch10: postgresql-9.2.4-aarch64-atomic.patch
-Patch11: postgresql-9.2.4-aarch64-atomic-upgrade.patch
-
-# When user complicates access of 'postgres' user to the database, the
-# pg_upgrade can left the old server running - and re-run of pg_upgrade thus
-# does not help. This patch stops the server in described scenario properly.
-# ~> not yet upstream, patch by Bruce Momjian:
-# ~> http://www.postgresql.org/message-id/20130812193347.GD12510@momjian.us
-# ~> #896161
-Patch12: postgresql-9.2.4-upgrade-and-perm-problems.patch
+Patch5: postgresql-var-run-socket.patch
+Patch6: postgresql-man.patch
+Patch100: postgresql-aarch64-atomic-upgrade.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -352,10 +332,6 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch12 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -374,9 +350,8 @@ tar xfj %{SOURCE3}
cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
-pushd postgresql-%{prevversion}
-%patch11 -p2
-popd
+# apply once SOURCE3 is extracted
+%patch100 -d postgresql-%{prevversion} -p1
%endif
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
@@ -886,6 +861,7 @@ fi
%{_bindir}/pg_config
%{_bindir}/pg_dump
%{_bindir}/pg_dumpall
+%{_bindir}/pg_isready
%{_bindir}/pg_restore
%{_bindir}/psql
%{_bindir}/reindexdb
@@ -900,6 +876,7 @@ fi
%{_mandir}/man1/pg_config.*
%{_mandir}/man1/pg_dump.*
%{_mandir}/man1/pg_dumpall.*
+%{_mandir}/man1/pg_isready.*
%{_mandir}/man1/pg_restore.*
%{_mandir}/man1/psql.*
%{_mandir}/man1/reindexdb.*
@@ -941,6 +918,7 @@ fi
%{_datadir}/pgsql/extension/pgcrypto*
%{_datadir}/pgsql/extension/pgrowlocks*
%{_datadir}/pgsql/extension/pgstattuple*
+%{_datadir}/pgsql/extension/postgres_fdw*
%{_datadir}/pgsql/extension/refint*
%{_datadir}/pgsql/extension/seg*
%{_datadir}/pgsql/extension/tablefunc*
@@ -976,11 +954,12 @@ fi
%{_libdir}/pgsql/passwordcheck.so
%{_libdir}/pgsql/pg_buffercache.so
%{_libdir}/pgsql/pg_freespacemap.so
+%{_libdir}/pgsql/pg_stat_statements.so
%{_libdir}/pgsql/pg_trgm.so
%{_libdir}/pgsql/pgcrypto.so
%{_libdir}/pgsql/pgrowlocks.so
%{_libdir}/pgsql/pgstattuple.so
-%{_libdir}/pgsql/pg_stat_statements.so
+%{_libdir}/pgsql/postgres_fdw.so
%{_libdir}/pgsql/refint.so
%{_libdir}/pgsql/seg.so
%{_libdir}/pgsql/tablefunc.so
@@ -989,6 +968,7 @@ fi
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/unaccent.so
+%{_libdir}/pgsql/worker_spi.so
%if %selinux
%{_datadir}/pgsql/contrib/sepgsql.sql
%{_libdir}/pgsql/sepgsql.so
@@ -1010,6 +990,7 @@ fi
%{_bindir}/pg_standby
%{_bindir}/pg_test_fsync
%{_bindir}/pg_test_timing
+%{_bindir}/pg_xlogdump
%{_bindir}/pgbench
%{_bindir}/vacuumlo
%{_mandir}/man1/oid2name.*
@@ -1017,6 +998,7 @@ fi
%{_mandir}/man1/pg_standby.*
%{_mandir}/man1/pg_test_fsync.*
%{_mandir}/man1/pg_test_timing.*
+%{_mandir}/man1/pg_xlogdump.1.gz
%{_mandir}/man1/pgbench.*
%{_mandir}/man1/vacuumlo.*
%{_mandir}/man3/dblink*
@@ -1089,6 +1071,7 @@ fi
%{_libdir}/libecpg_compat.so
%{_libdir}/libpgtypes.so
%{_libdir}/pgsql/pgxs/
+%{_libdir}/pkgconfig/*.pc
%{_mandir}/man1/ecpg.*
%{_mandir}/man3/SPI_*
@@ -1137,6 +1120,10 @@ fi
%endif
%changelog
+* Tue Sep 10 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.0-1
+- update to 9.3 major version per release notes:
+ http://www.postgresql.org/docs/9.3/static/release-9-3.html
+
* Thu Aug 15 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-11
- upgrade: stop old server in case of permissions problem (#896161)
diff --git a/sources b/sources
index 4657dc6..89277b0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
6ee5bb53b97da7c6ad9cb0825d3300dd postgresql-9.2.4.tar.bz2
-64f70057a3a153e8e237d0c79ccc63e9 postgresql-9.2.4-US.pdf
-6b5ea53dde48fcd79acfc8c196b83535 postgresql-9.1.9.tar.bz2
+3d148088eed8b394705ae8df13b6d389 postgresql-9.3.0-US.pdf
+09aee56f3a15ce4a7ea32044fb845b53 postgresql-9.3.0.tar.bz2
commit f9f152f08e77b8925ecf024991b6abecacda50a5
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Aug 15 07:41:09 2013 +0200
upgrade: stop old server in case of permissions problem
Version: 9.2.4-11
Resolves: #896161
diff --git a/postgresql-9.2.4-upgrade-and-perm-problems.patch b/postgresql-9.2.4-upgrade-and-perm-problems.patch
new file mode 100644
index 0000000..4cdcc77
--- /dev/null
+++ b/postgresql-9.2.4-upgrade-and-perm-problems.patch
@@ -0,0 +1,54 @@
+diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
+index c5ecb84..a519a9e 100644
+--- a/contrib/pg_upgrade/server.c
++++ b/contrib/pg_upgrade/server.c
+@@ -166,7 +166,6 @@ static void
+ stop_postmaster_atexit(void)
+ {
+ stop_postmaster(true);
+-
+ }
+
+
+@@ -235,7 +234,23 @@ start_postmaster(ClusterInfo *cluster)
+ false,
+ "%s", cmd);
+
+- /* Check to see if we can connect to the server; if not, report it. */
++ /*
++ * We set this here to make sure atexit() shuts down the server,
++ * but only if we started the server successfully. We do it
++ * before checking for connectivity in case the server started but
++ * there is a connectivity failure. If pg_ctl did not return success,
++ * we will exit below.
++ */
++ if (pg_ctl_return)
++ os_info.running_cluster = cluster;
++
++ /*
++ * pg_ctl -w might have failed because the server couldn't be started,
++ * or there might have been a connection problem in _checking_ if the
++ * server has started. Therefore, even if pg_ctl failed, we continue
++ * and test for connectivity in case we get a connection reason for the
++ * failure.
++ */
+ if ((conn = get_db_conn(cluster, "template1")) == NULL ||
+ PQstatus(conn) != CONNECTION_OK)
+ {
+@@ -249,12 +264,13 @@ start_postmaster(ClusterInfo *cluster)
+ }
+ PQfinish(conn);
+
+- /* If the connection didn't fail, fail now */
++ /*
++ * If pg_ctl failed, and the connection didn't fail, fail now. This
++ * could happen if the server was already running.
++ */
+ if (!pg_ctl_return)
+ pg_log(PG_FATAL, "pg_ctl failed to start the %s server, or connection failed\n",
+ CLUSTER_NAME(cluster));
+-
+- os_info.running_cluster = cluster;
+ }
+
+
diff --git a/postgresql.spec b/postgresql.spec
index e4a8108..c74b933 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 10%{?dist}
+Release: 11%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -118,6 +118,14 @@ Patch9: postgresql-9.2.4-perl-5.18.patch
Patch10: postgresql-9.2.4-aarch64-atomic.patch
Patch11: postgresql-9.2.4-aarch64-atomic-upgrade.patch
+# When user complicates access of 'postgres' user to the database, the
+# pg_upgrade can left the old server running - and re-run of pg_upgrade thus
+# does not help. This patch stops the server in described scenario properly.
+# ~> not yet upstream, patch by Bruce Momjian:
+# ~> http://www.postgresql.org/message-id/20130812193347.GD12510@momjian.us
+# ~> #896161
+Patch12: postgresql-9.2.4-upgrade-and-perm-problems.patch
+
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
@@ -347,6 +355,7 @@ benchmarks.
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch12 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1128,6 +1137,9 @@ fi
%endif
%changelog
+* Thu Aug 15 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-11
+- upgrade: stop old server in case of permissions problem (#896161)
+
* Mon Aug 12 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-10
- disable aggressive loop optimizations for old codebase (#993532)
commit 4dafc07c1335ca70eca8021389f25354d1196c8d
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Mon Aug 12 07:32:50 2013 +0200
upgrade: disable aggressive loop optimizations
This is important for gcc >= 4.8.0 as the optimizations were turned on by
default. New code-base is OK thus enable this only for older
(upgrade-related) code.
Resolves: #993532
Version: 9.2.4-10
diff --git a/postgresql.spec b/postgresql.spec
index 5b5b2b0..e4a8108 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 9%{?dist}
+Release: 10%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -576,7 +576,11 @@ rm -f src/tutorial/GNUmakefile
# any options that affect on-disk file layout match the previous
# major release! Also, note we intentionally do not use %%configure
# here, because we *don't* want its ideas about installation paths.
- ./configure --build=%{_build} --host=%{_host} \
+
+ # The -fno-aggressive-loop-optimizations is hack for #993532
+ CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" ./configure \
+ --build=%{_build} \
+ --host=%{_host} \
--prefix=%{_libdir}/pgsql/postgresql-%{prevmajorversion} \
--disable-rpath \
%if %beta
@@ -1124,6 +1128,9 @@ fi
%endif
%changelog
+* Mon Aug 12 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-10
+- disable aggressive loop optimizations for old codebase (#993532)
+
* Wed Aug 07 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-9
- generate links docdir links in postgresql-check-db-dir correctly (#994048)
commit 9124149d1798f9cbbb23a981f625f8ac8324b6ed
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Aug 7 08:31:13 2013 +0200
spec: fix links to docdir in postgresql-check-db-dir
Resolves: #994048
Version: 9.2.4-9
diff --git a/postgresql.spec b/postgresql.spec
index 4d5ff36..5b5b2b0 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,12 +53,14 @@
%{!?selinux:%global selinux 1}
%{!?runselftest:%global runselftest 1}
+# _pkgdocdir is defined in fc20+, remove once f19 is dead
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 8%{?dist}
+Release: 9%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -636,7 +638,7 @@ install -m 755 postgresql-setup $RPM_BUILD_ROOT%{_bindir}/postgresql-setup
# prep the startup check script, including insertion of some values it needs
sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
-e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
- -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_docdir}/%{name}-%{version}|' \
+ -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_pkgdocdir}|' \
<%{SOURCE4} >postgresql-check-db-dir
touch -r %{SOURCE4} postgresql-check-db-dir
install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-check-db-dir
@@ -1122,6 +1124,9 @@ fi
%endif
%changelog
+* Wed Aug 07 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-9
+- generate links docdir links in postgresql-check-db-dir correctly (#994048)
+
* Tue Aug 06 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-8
- allow `rpmbuild -bi --short-circuit`
commit 83ea972cfdbcfa1ae048d2b153dfa37aeac3a57e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Aug 6 13:06:03 2013 +0200
spec: allow `rpmbuild -bi --short-circuit`
Version: 9.2.4-8
diff --git a/postgresql.spec b/postgresql.spec
index 726fb44..4d5ff36 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 7%{?dist}
+Release: 8%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -733,6 +733,7 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
# Fix some more documentation
cp %{SOURCE8} README.rpm-dist
+rm -rf doc/html # HACK! allow 'rpmbuild -bi --short-circuit'
mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
@@ -1121,6 +1122,9 @@ fi
%endif
%changelog
+* Tue Aug 06 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-8
+- allow `rpmbuild -bi --short-circuit`
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.2.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit a680fe11780d722dd3e6f25ab07bb0cdf4ff0cf7
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Aug 3 23:57:45 2013 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index a63c2e4..726fb44 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 6%{?dist}
+Release: 7%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1121,6 +1121,9 @@ fi
%endif
%changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.2.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Wed Jul 24 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-6
- split aarch64 patch to allow build without postgresql-upgrade
commit cb07b6b8cc835ba94e5dcb4a97d20cae0060732b
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Fri Jul 26 15:51:30 2013 +0200
spec: allow debug also for upgrade when %beta == 1
Version: 9.2.4-6
diff --git a/postgresql.spec b/postgresql.spec
index 3d2a0fe..a63c2e4 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -29,7 +29,7 @@
# The base package, the libs package, the devel package, and the server package
# always get built.
-%global beta 0
+%{!?beta:%global beta 0}
%{?beta:%global __os_install_post /usr/lib/rpm/brp-compress}
%{!?test:%global test 1}
@@ -577,6 +577,10 @@ rm -f src/tutorial/GNUmakefile
./configure --build=%{_build} --host=%{_host} \
--prefix=%{_libdir}/pgsql/postgresql-%{prevmajorversion} \
--disable-rpath \
+%if %beta
+ --enable-debug \
+ --enable-cassert \
+%endif
--with-system-tzdata=/usr/share/zoneinfo
make %{?_smp_mflags} all
commit 9d28c850755fe48d6cfc3d140b0e49a4e1dbcc92
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Jul 24 14:15:40 2013 +0200
spec: split aarch64 patch to allow build for %upgrade == 0
Version: 9.2.4-6
diff --git a/postgresql-9.2.4-aarch64-atomic-upgrade.patch b/postgresql-9.2.4-aarch64-atomic-upgrade.patch
new file mode 100644
index 0000000..2b8c82e
--- /dev/null
+++ b/postgresql-9.2.4-aarch64-atomic-upgrade.patch
@@ -0,0 +1,34 @@
+diff --git a/postgresql-9.1.9/src/include/storage/s_lock.h b/postgresql-9.1.9/src/include/storage/s_lock.h
+index 987fb9c..1ba718c 100644
+--- a/postgresql-9.1.9/src/include/storage/s_lock.h
++++ b/postgresql-9.1.9/src/include/storage/s_lock.h
+@@ -296,6 +296,29 @@ tas(volatile slock_t *lock)
+ #endif /* __arm__ */
+
+
++/*
++ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
++ */
++#if defined(__aarch64__) || defined(__aarch64)
++#ifdef HAVE_GCC_INT_ATOMICS
++#define HAS_TEST_AND_SET
++
++#define TAS(lock) tas(lock)
++
++typedef int slock_t;
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++ return __sync_lock_test_and_set(lock, 1);
++}
++
++#define S_UNLOCK(lock) __sync_lock_release(lock)
++
++#endif /* HAVE_GCC_INT_ATOMICS */
++#endif /* __aarch64__ */
++
++
+ /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
+ #if defined(__s390__) || defined(__s390x__)
+ #define HAS_TEST_AND_SET
diff --git a/postgresql-9.2.4-aarch64-atomic.patch b/postgresql-9.2.4-aarch64-atomic.patch
index 3c5edda..7a297ce 100644
--- a/postgresql-9.2.4-aarch64-atomic.patch
+++ b/postgresql-9.2.4-aarch64-atomic.patch
@@ -1,37 +1,3 @@
-diff --git a/postgresql-9.1.9/src/include/storage/s_lock.h b/postgresql-9.1.9/src/include/storage/s_lock.h
-index 987fb9c..1ba718c 100644
---- a/postgresql-9.1.9/src/include/storage/s_lock.h
-+++ b/postgresql-9.1.9/src/include/storage/s_lock.h
-@@ -296,6 +296,29 @@ tas(volatile slock_t *lock)
- #endif /* __arm__ */
-
-
-+/*
-+ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
-+ */
-+#if defined(__aarch64__) || defined(__aarch64)
-+#ifdef HAVE_GCC_INT_ATOMICS
-+#define HAS_TEST_AND_SET
-+
-+#define TAS(lock) tas(lock)
-+
-+typedef int slock_t;
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+ return __sync_lock_test_and_set(lock, 1);
-+}
-+
-+#define S_UNLOCK(lock) __sync_lock_release(lock)
-+
-+#endif /* HAVE_GCC_INT_ATOMICS */
-+#endif /* __aarch64__ */
-+
-+
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
- #if defined(__s390__) || defined(__s390x__)
- #define HAS_TEST_AND_SET
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index d4a783f..29124b1 100644
--- a/src/include/storage/s_lock.h
diff --git a/postgresql.spec b/postgresql.spec
index 9f264c7..3d2a0fe 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -103,11 +103,6 @@ Patch4: postgresql-config-comment.patch
Patch5: postgresql-multi-sockets.patch
Patch6: postgresql-var-run-socket.patch
-# Add support for atomic operations TAS/S_UNLOCK in aarch64.
-# ~> upstream (612ecf311b)
-# ~> #970661
-Patch7: postgresql-9.2.4-aarch64-atomic.patch
-
# Comments for these patches are in the patch files.
Patch8: postgresql-man.patch
@@ -115,6 +110,12 @@ Patch8: postgresql-man.patch
# ~> upstream (035a5e1e8c34)
Patch9: postgresql-9.2.4-perl-5.18.patch
+# Add support for atomic operations TAS/S_UNLOCK in aarch64.
+# ~> upstream (612ecf311b)
+# ~> #970661
+Patch10: postgresql-9.2.4-aarch64-atomic.patch
+Patch11: postgresql-9.2.4-aarch64-atomic-upgrade.patch
+
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
@@ -343,6 +344,7 @@ benchmarks.
%patch6 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -360,10 +362,11 @@ tar xfj %{SOURCE3}
# (and also see the ppc64p7 hack above)
cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
-%endif
-# the %%{SOURCE3} must be unpacked before this patch is applied
-%patch7 -p1 -b .atomic-aarch64
+pushd postgresql-%{prevversion}
+%patch11 -p2
+popd
+%endif
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
find . -type f -name .gitignore | xargs rm
@@ -1114,6 +1117,9 @@ fi
%endif
%changelog
+* Wed Jul 24 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-6
+- split aarch64 patch to allow build without postgresql-upgrade
+
* Tue Jul 23 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-5
- fix testsuite to allow build against Perl 5.18
commit 44506bd77edb0b9b973a829b0c64c9a99343c93c
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jul 23 10:15:05 2013 +0200
testsuite: fix FTBFS against perl-5.18
Version: 9.2.4-5
diff --git a/postgresql-9.2.4-perl-5.18.patch b/postgresql-9.2.4-perl-5.18.patch
new file mode 100644
index 0000000..dae9b60
--- /dev/null
+++ b/postgresql-9.2.4-perl-5.18.patch
@@ -0,0 +1,83 @@
+commit 035a5e1e8c346efe25df6be4627b5f24cc3736b1
+Author: Tom Lane <tgl(a)sss.pgh.pa.us>
+AuthorDate: Mon Jun 3 14:19:26 2013 -0400
+Commit: Tom Lane <tgl(a)sss.pgh.pa.us>
+CommitDate: Mon Jun 3 14:19:26 2013 -0400
+
+ Add semicolons to eval'd strings to hide a minor Perl behavioral change.
+
+ "eval q{foo}" used to complain that the error was on line 2 of the eval'd
+ string, because eval internally tacked on "\n;" so that the end of the
+ erroneous command was indeed on line 2. But as of Perl 5.18 it more
+ sanely says that the error is on line 1. To avoid Perl-version-dependent
+ regression test results, use "eval q{foo;}" instead in the two places
+ where this matters. Per buildfarm.
+
+ Since people might try to use newer Perl versions with older PG releases,
+ back-patch as far as 9.0 where these test cases were added.
+
+diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
+index 29c1d11..d23a302 100644
+--- a/src/pl/plperl/expected/plperl.out
++++ b/src/pl/plperl/expected/plperl.out
+@@ -626,8 +626,8 @@ DO $$ open my $fh, "</nonesuch"; $$ LANGUAGE plperl;
+ ERROR: 'open' trapped by operation mask at line 1.
+ CONTEXT: PL/Perl anonymous code block
+ -- check that eval is allowed and eval'd restricted ops are caught
+-DO $$ eval q{chdir '.'}; warn "Caught: $@"; $$ LANGUAGE plperl;
+-WARNING: Caught: 'chdir' trapped by operation mask at line 2.
++DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
++WARNING: Caught: 'chdir' trapped by operation mask at line 1.
+ CONTEXT: PL/Perl anonymous code block
+ -- check that compiling do (dofile opcode) is allowed
+ -- but that executing it for a file not already loaded (via require) dies
+diff --git a/src/pl/plperl/expected/plperl_init.out b/src/pl/plperl/expected/plperl_init.out
+index a21ea0b..133828e 100644
+--- a/src/pl/plperl/expected/plperl_init.out
++++ b/src/pl/plperl/expected/plperl_init.out
+@@ -1,14 +1,14 @@
+ -- test plperl.on_plperl_init errors are fatal
+ -- This test tests setting on_plperl_init after loading plperl
+ LOAD 'plperl';
+-SET SESSION plperl.on_plperl_init = ' system("/nonesuch") ';
++SET SESSION plperl.on_plperl_init = ' system("/nonesuch"); ';
+ SHOW plperl.on_plperl_init;
+- plperl.on_plperl_init
+------------------------
+- system("/nonesuch")
++ plperl.on_plperl_init
++------------------------
++ system("/nonesuch");
+ (1 row)
+
+ DO $$ warn 42 $$ language plperl;
+-ERROR: 'system' trapped by operation mask at line 2.
++ERROR: 'system' trapped by operation mask at line 1.
+ CONTEXT: while executing plperl.on_plperl_init
+ PL/Perl anonymous code block
+diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql
+index ad36161..dc6b169 100644
+--- a/src/pl/plperl/sql/plperl.sql
++++ b/src/pl/plperl/sql/plperl.sql
+@@ -405,7 +405,7 @@ DO $$ qx("/nonesuch"); $$ LANGUAGE plperl;
+ DO $$ open my $fh, "</nonesuch"; $$ LANGUAGE plperl;
+
+ -- check that eval is allowed and eval'd restricted ops are caught
+-DO $$ eval q{chdir '.'}; warn "Caught: $@"; $$ LANGUAGE plperl;
++DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
+
+ -- check that compiling do (dofile opcode) is allowed
+ -- but that executing it for a file not already loaded (via require) dies
+diff --git a/src/pl/plperl/sql/plperl_init.sql b/src/pl/plperl/sql/plperl_init.sql
+index d60268d..4ebf3f8 100644
+--- a/src/pl/plperl/sql/plperl_init.sql
++++ b/src/pl/plperl/sql/plperl_init.sql
+@@ -3,7 +3,7 @@
+ -- This test tests setting on_plperl_init after loading plperl
+ LOAD 'plperl';
+
+-SET SESSION plperl.on_plperl_init = ' system("/nonesuch") ';
++SET SESSION plperl.on_plperl_init = ' system("/nonesuch"); ';
+
+ SHOW plperl.on_plperl_init;
+
diff --git a/postgresql.spec b/postgresql.spec
index facc1a9..9f264c7 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -111,6 +111,10 @@ Patch7: postgresql-9.2.4-aarch64-atomic.patch
# Comments for these patches are in the patch files.
Patch8: postgresql-man.patch
+# Build even with Perl 5.18+
+# ~> upstream (035a5e1e8c34)
+Patch9: postgresql-9.2.4-perl-5.18.patch
+
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
@@ -338,6 +342,7 @@ benchmarks.
%patch5 -p1
%patch6 -p1
%patch8 -p1
+%patch9 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1109,6 +1114,9 @@ fi
%endif
%changelog
+* Tue Jul 23 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-5
+- fix testsuite to allow build against Perl 5.18
+
* Thu Jul 18 2013 Petr Pisar <ppisar(a)redhat.com> - 9.2.4-5
- Perl 5.18 rebuild
commit 304cc8de27811acefd1f3c7fa5236130e07dc22c
Author: Petr Psa <ppisar(a)redhat.com>
Date: Thu Jul 18 02:37:26 2013 +0200
Perl 5.18 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index a34bac5..facc1a9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1109,6 +1109,9 @@ fi
%endif
%changelog
+* Thu Jul 18 2013 Petr Pisar <ppisar(a)redhat.com> - 9.2.4-5
+- Perl 5.18 rebuild
+
* Tue Jul 09 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-4
- do not use -b for manual page fixes
commit 6f62d3591cb4d23ecb789b570fd552f978870676
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jul 9 14:31:46 2013 +0200
spec: fix bogus versions in changelog
Version: 9.2.4-4
diff --git a/postgresql.spec b/postgresql.spec
index 5f2cb41..a34bac5 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1109,10 +1109,10 @@ fi
%endif
%changelog
-* Tue Jul 09 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-4
+* Tue Jul 09 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-4
- do not use -b for manual page fixes
-* Thu Jun 20 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-3
+* Thu Jun 20 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-3
- fix README.rpm-dist for the bug (#969050)
- replace hard-wired path with %%{_datadir}
commit 3fea88c1546e6d99de43721ff6aadb919f16e5ad
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jul 9 14:31:08 2013 +0200
spec: do not use 'patch -b' for manual page fixes
The 'make install' target in Makefile is written by hand (not generated by
automake) and it can't tell whether the backups are/(are not) regular
manpages. Thus it would install also all backups as it was manual page.
Detected by RPMDiff (private link):
https://rpmdiff.lab.eng.brq.redhat.com/run/43086/3/
Version: 9.2.4-4
diff --git a/postgresql.spec b/postgresql.spec
index cb95153..5f2cb41 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -337,7 +337,7 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch8 -p1 -b .man-page-day-fixes
+%patch8 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1109,6 +1109,9 @@ fi
%endif
%changelog
+* Tue Jul 09 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-4
+- do not use -b for manual page fixes
+
* Thu Jun 20 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-3
- fix README.rpm-dist for the bug (#969050)
- replace hard-wired path with %%{_datadir}
commit a57d617cefb2fd386aff727294ce946cdf70d571
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jun 20 09:46:48 2013 +0200
spec: replace hard-coded path with macro
Version: 9.2.4-3
diff --git a/postgresql.spec b/postgresql.spec
index a88e371..cb95153 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -441,8 +441,8 @@ export PYTHON=/usr/bin/python3
%if %selinux
--with-selinux \
%endif
- --with-system-tzdata=/usr/share/zoneinfo \
- --datadir=/usr/share/pgsql
+ --with-system-tzdata=%{_datadir}/zoneinfo \
+ --datadir=%{_datadir}/pgsql
# Fortunately we don't need to build much except plpython itself
cd src/backend
@@ -1111,6 +1111,7 @@ fi
%changelog
* Thu Jun 20 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-3
- fix README.rpm-dist for the bug (#969050)
+- replace hard-wired path with %%{_datadir}
* Thu Jun 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-3
- add atomic operations support for aarch64 to preupgrade version also (#970661)
commit 3992fad4ad7fdf48aa74001c9fd9dd08ca9eef6e
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jun 20 09:44:06 2013 +0200
README.rpm-dist: point user to install postgresql-server
Resolves: #969050
Version: 9.2.4-3
diff --git a/README.rpm-dist b/README.rpm-dist
index 0ed6e55..2d7482b 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -32,7 +32,7 @@ Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
RPMs available directly from the upstream PostgreSQL project. Those are
slightly different.
-QUICKSTART
+QUICKSTART (note that this requires postgresql-server installed)
-----------------------------------------------------------------------------
For a fresh installation, you will need to initialize the cluster first. Run:
diff --git a/postgresql.spec b/postgresql.spec
index 5edfaa7..a88e371 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1109,6 +1109,9 @@ fi
%endif
%changelog
+* Thu Jun 20 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.3.4-3
+- fix README.rpm-dist for the bug (#969050)
+
* Thu Jun 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-3
- add atomic operations support for aarch64 to preupgrade version also (#970661)
- apply the forgotten man-page-day patch (#948933)
commit 33319f6255e7c743c9d74f9315e47d0943925edd
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jun 13 10:38:57 2013 +0200
spec: ups, forgot to bump release in changelog during rebase
Version: 9.2.4-3
diff --git a/postgresql.spec b/postgresql.spec
index 3e595b1..5edfaa7 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1109,7 +1109,7 @@ fi
%endif
%changelog
-* Thu Jun 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-2
+* Thu Jun 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-3
- add atomic operations support for aarch64 to preupgrade version also (#970661)
- apply the forgotten man-page-day patch (#948933)
commit 3202ca77236e98f5e133de1de8c127b5e548b088
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jun 13 10:34:28 2013 +0200
man: apply the forgotten man-page-day patch
Version: 9.2.4-3
Related: #948933
diff --git a/postgresql.spec b/postgresql.spec
index 1e1a39b..3e595b1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -337,6 +337,7 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch8 -p1 -b .man-page-day-fixes
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1110,6 +1111,7 @@ fi
%changelog
* Thu Jun 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-2
- add atomic operations support for aarch64 to preupgrade version also (#970661)
+- apply the forgotten man-page-day patch (#948933)
* Thu Jun 13 2013 Jan Stanek <jstanek(a)redhat.com> - 9.2.4-3
- added patch for manual pages (#948933)
commit 0415e338bc5ee986a1219b67cd4923dbe0f88db6
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Thu Jun 13 10:33:54 2013 +0200
postgresql: fix for atomic operations in aarch64
.. is needed also in the older version.
Version: 9.2.4-3
Resolves: #970661
diff --git a/postgresql-9.2.4-aarch64-atomic.patch b/postgresql-9.2.4-aarch64-atomic.patch
index 2f11e98..3c5edda 100644
--- a/postgresql-9.2.4-aarch64-atomic.patch
+++ b/postgresql-9.2.4-aarch64-atomic.patch
@@ -1,21 +1,37 @@
-From: Tom Lane <tgl(a)sss.pgh.pa.us>
-Date: Tue, 4 Jun 2013 19:42:02 +0000 (-0400)
-Subject: Add ARM64 (aarch64) support to s_lock.h.
-X-Git-Url: http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=6...
-
-Add ARM64 (aarch64) support to s_lock.h.
-
-Use the same gcc atomic functions as we do on newer ARM chips.
-(Basically this is a copy and paste of the __arm__ code block,
-but omitting the SWPB option since that definitely won't work.)
-
-Back-patch to 9.2. The patch would work further back, but we'd also
-need to update config.guess/config.sub in older branches to make them
-build out-of-the-box, and there hasn't been demand for it.
-
-Mark Salter
----
-
+diff --git a/postgresql-9.1.9/src/include/storage/s_lock.h b/postgresql-9.1.9/src/include/storage/s_lock.h
+index 987fb9c..1ba718c 100644
+--- a/postgresql-9.1.9/src/include/storage/s_lock.h
++++ b/postgresql-9.1.9/src/include/storage/s_lock.h
+@@ -296,6 +296,29 @@ tas(volatile slock_t *lock)
+ #endif /* __arm__ */
+
+
++/*
++ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
++ */
++#if defined(__aarch64__) || defined(__aarch64)
++#ifdef HAVE_GCC_INT_ATOMICS
++#define HAS_TEST_AND_SET
++
++#define TAS(lock) tas(lock)
++
++typedef int slock_t;
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++ return __sync_lock_test_and_set(lock, 1);
++}
++
++#define S_UNLOCK(lock) __sync_lock_release(lock)
++
++#endif /* HAVE_GCC_INT_ATOMICS */
++#endif /* __aarch64__ */
++
++
+ /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
+ #if defined(__s390__) || defined(__s390x__)
+ #define HAS_TEST_AND_SET
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index d4a783f..29124b1 100644
--- a/src/include/storage/s_lock.h
diff --git a/postgresql.spec b/postgresql.spec
index 302a293..1e1a39b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -337,7 +337,6 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1 -b .atomic-aarch64
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -357,6 +356,9 @@ cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
%endif
+# the %%{SOURCE3} must be unpacked before this patch is applied
+%patch7 -p1 -b .atomic-aarch64
+
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
find . -type f -name .gitignore | xargs rm
@@ -1106,6 +1108,9 @@ fi
%endif
%changelog
+* Thu Jun 13 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-2
+- add atomic operations support for aarch64 to preupgrade version also (#970661)
+
* Thu Jun 13 2013 Jan Stanek <jstanek(a)redhat.com> - 9.2.4-3
- added patch for manual pages (#948933)
commit cac63b3ab08353819627c1258db4c10f1c074f40
Author: Jan Stank <jstanek(a)redhat.com>
Date: Thu Jun 13 09:38:22 2013 +0200
added patch for manual pages (#948933)
diff --git a/postgresql-man.patch b/postgresql-man.patch
new file mode 100644
index 0000000..de989f5
--- /dev/null
+++ b/postgresql-man.patch
@@ -0,0 +1,49 @@
+# PostgreSQL manual page completion
+
+### ecpg ###
+
+diff -up postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken postgresql-9.2.4/doc/src/sgml/man1/ecpg.1
+--- postgresql-9.2.4/doc/src/sgml/man1/ecpg.1.broken 2013-06-05 10:54:39.610443837 +0200
++++ postgresql-9.2.4/doc/src/sgml/man1/ecpg.1 2013-06-05 10:59:24.115997253 +0200
+@@ -81,6 +81,11 @@ INFORMIX_SE\&.
+ Define a C preprocessor symbol\&.
+ .RE
+ .PP
++\fB\-h \fR
++.RS 4
++Parse a header file, this option includes otion \fB\-c\fR\&.
++.RE
++.PP
+ \fB\-i\fR
+ .RS 4
+ Parse system include files as well\&.
+@@ -129,6 +134,11 @@ Allow question mark as placeholder for c
+ .RE
+ .RE
+ .PP
++\fB\-\-regression\fR
++.RS 4
++Run in regression testing mode\&.
++.RE
++.PP
+ \fB\-t\fR
+ .RS 4
+ Turn on autocommit of transactions\&. In this mode, each SQL command is automatically committed unless it is inside an explicit transaction block\&. In the default mode, commands are committed only when
+
+### initdb ###
+
+diff -up postgresql-9.2.4/doc/src/sgml/man1/initdb.1.broken postgresql-9.2.4/doc/src/sgml/man1/initdb.1
+--- postgresql-9.2.4/doc/src/sgml/man1/initdb.1.broken 2013-06-06 10:26:48.405835762 +0200
++++ postgresql-9.2.4/doc/src/sgml/man1/initdb.1 2013-06-06 10:29:46.084209958 +0200
+@@ -227,6 +227,11 @@ determines that an error prevented it fr
+ .PP
+ Other options:
+ .PP
++\fB\-s\fR, \fB\-\-show\fR
++.RS 4
++Print the internal settings, then exit\&.
++.RE
++.PP
+ \fB\-V\fR, \fB\-\-version\fR
+ .RS 4
+ Print the
diff --git a/postgresql.spec b/postgresql.spec
index a4de426..302a293 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -108,6 +108,9 @@ Patch6: postgresql-var-run-socket.patch
# ~> #970661
Patch7: postgresql-9.2.4-aarch64-atomic.patch
+# Comments for these patches are in the patch files.
+Patch8: postgresql-man.patch
+
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
@@ -1103,6 +1106,9 @@ fi
%endif
%changelog
+* Thu Jun 13 2013 Jan Stanek <jstanek(a)redhat.com> - 9.2.4-3
+- added patch for manual pages (#948933)
+
* Tue Jun 11 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-2
- postgresql-setup: don't create whole path to server's data to make sure that
the parent directory has correct permissions (#972425)
commit 63807df6fc123b438309869ea63cc2311658e49c
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jun 11 11:00:56 2013 +0200
postgresql-setup: fail earlier during bad $PGDATA dir creation
Related: #972425
Version: 9.2.4-2
diff --git a/postgresql-setup b/postgresql-setup
index e566106..a755e11 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -66,9 +66,9 @@ script_result=0
# code shared between initdb and upgrade actions
perform_initdb(){
- if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
+ if [ ! -e "$PGDATA" ]
then
- mkdir -p "$PGDATA" || return 1
+ mkdir "$PGDATA" || return 1
chown postgres:postgres "$PGDATA"
chmod go-rwx "$PGDATA"
fi
diff --git a/postgresql.spec b/postgresql.spec
index ea6b2ab..a4de426 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1103,6 +1103,10 @@ fi
%endif
%changelog
+* Tue Jun 11 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-2
+- postgresql-setup: don't create whole path to server's data to make sure that
+ the parent directory has correct permissions (#972425)
+
* Wed Jun 05 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-2
- fix rpmlint warnings
- fix aarch64 build by defining missing atomic operations (#970661)
commit 30d053b7a541f1afd95ec0747ff0e305a8f99e75
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Wed Jun 5 09:34:58 2013 +0200
postgresql: add support for atomic operations in aarch64
Version: 9.2.4-2
Resolves: #970661
diff --git a/postgresql-9.2.4-aarch64-atomic.patch b/postgresql-9.2.4-aarch64-atomic.patch
new file mode 100644
index 0000000..2f11e98
--- /dev/null
+++ b/postgresql-9.2.4-aarch64-atomic.patch
@@ -0,0 +1,52 @@
+From: Tom Lane <tgl(a)sss.pgh.pa.us>
+Date: Tue, 4 Jun 2013 19:42:02 +0000 (-0400)
+Subject: Add ARM64 (aarch64) support to s_lock.h.
+X-Git-Url: http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=6...
+
+Add ARM64 (aarch64) support to s_lock.h.
+
+Use the same gcc atomic functions as we do on newer ARM chips.
+(Basically this is a copy and paste of the __arm__ code block,
+but omitting the SWPB option since that definitely won't work.)
+
+Back-patch to 9.2. The patch would work further back, but we'd also
+need to update config.guess/config.sub in older branches to make them
+build out-of-the-box, and there hasn't been demand for it.
+
+Mark Salter
+---
+
+diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
+index d4a783f..29124b1 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -335,6 +335,29 @@ tas(volatile slock_t *lock)
+ #endif /* __arm__ */
+
+
++/*
++ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
++ */
++#if defined(__aarch64__) || defined(__aarch64)
++#ifdef HAVE_GCC_INT_ATOMICS
++#define HAS_TEST_AND_SET
++
++#define TAS(lock) tas(lock)
++
++typedef int slock_t;
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++ return __sync_lock_test_and_set(lock, 1);
++}
++
++#define S_UNLOCK(lock) __sync_lock_release(lock)
++
++#endif /* HAVE_GCC_INT_ATOMICS */
++#endif /* __aarch64__ */
++
++
+ /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
+ #if defined(__s390__) || defined(__s390x__)
+ #define HAS_TEST_AND_SET
diff --git a/postgresql.spec b/postgresql.spec
index 8ae529b..ea6b2ab 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -103,6 +103,11 @@ Patch4: postgresql-config-comment.patch
Patch5: postgresql-multi-sockets.patch
Patch6: postgresql-var-run-socket.patch
+# Add support for atomic operations TAS/S_UNLOCK in aarch64.
+# ~> upstream (612ecf311b)
+# ~> #970661
+Patch7: postgresql-9.2.4-aarch64-atomic.patch
+
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: readline-devel zlib-devel
@@ -329,6 +334,7 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1 -b .atomic-aarch64
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1097,8 +1103,9 @@ fi
%endif
%changelog
-* Tue Jun 04 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-1
+* Wed Jun 05 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-2
- fix rpmlint warnings
+- fix aarch64 build by defining missing atomic operations (#970661)
* Thu Apr 4 2013 Tom Lane <tgl(a)redhat.com> 9.2.4-1
- Update to PostgreSQL 9.2.4, for various fixes described at
commit b6b61d6de7998fb425ca464fb10fc0022037fa6d
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jun 4 15:28:55 2013 +0200
spec: fix rpmlint warnings
Version: 9.2.4-1
diff --git a/postgresql.spec b/postgresql.spec
index 19ca1d3..8ae529b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -633,8 +633,8 @@ install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
install -d -m 755 $RPM_BUILD_ROOT/var/run/postgresql
# ... and make a tmpfiles script to recreate it at reboot.
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
-install -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/postgresql.conf
+mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+install -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
@@ -1027,7 +1027,7 @@ fi
%dir %{_datadir}/pgsql/contrib
%dir %{_datadir}/pgsql/extension
%{_datadir}/pgsql/extension/plpgsql*
-%{_prefix}/lib/tmpfiles.d/postgresql.conf
+%{_tmpfilesdir}/postgresql.conf
%attr(755,postgres,postgres) %dir /var/run/postgresql
%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
@@ -1097,6 +1097,9 @@ fi
%endif
%changelog
+* Tue Jun 04 2013 Pavel Raiskup <praiskup(a)redhat.com> - 9.2.4-1
+- fix rpmlint warnings
+
* Thu Apr 4 2013 Tom Lane <tgl(a)redhat.com> 9.2.4-1
- Update to PostgreSQL 9.2.4, for various fixes described at
http://www.postgresql.org/docs/9.2/static/release-9-2-4.html
@@ -1699,7 +1702,7 @@ Resolves: #161470
* Mon Aug 30 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-2
- Update to PyGreSQL 3.5.
-* Wed Aug 24 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-1
+* Tue Aug 24 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-1
- Update to PostgreSQL 7.4.5.
- Update JDBC jars to driver build 215.
- Add Obsoletes: entries for rh-postgresql packages, per bug 129278.
commit d27a983cef4e3f8a81f8264470ff11f2bb08560e
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Apr 4 09:42:29 2013 -0400
Update to PostgreSQL 9.2.4
diff --git a/.gitignore b/.gitignore
index bc23b93..46823fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.2.3.tar.bz2
-/postgresql-9.2.3-US.pdf
-/postgresql-9.1.8.tar.bz2
+/postgresql-9.2.4.tar.bz2
+/postgresql-9.2.4-US.pdf
+/postgresql-9.1.9.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 242035b..19ca1d3 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -57,7 +57,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
-Version: 9.2.3
+Version: 9.2.4
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -73,7 +73,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.1.8
+%global prevversion 9.1.9
%global prevmajorversion 9.1
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -333,10 +333,19 @@ benchmarks.
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
+# add ppc64p7 support (https://fedoraproject.org/wiki/Features/Power7Subarch)
+# hopefully need for this will go away next time upstream updates config.sub
+sed -i -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" config/config.sub
+
cp -p %{SOURCE1} .
%if %upgrade
tar xfj %{SOURCE3}
+# make sure older version is up-to-date on config.guess/config.sub;
+# not always necessary, but PG 9.2 knows about aarch64 while 9.1 doesn't
+# (and also see the ppc64p7 hack above)
+cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
+cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
%endif
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
@@ -1088,6 +1097,13 @@ fi
%endif
%changelog
+* Thu Apr 4 2013 Tom Lane <tgl(a)redhat.com> 9.2.4-1
+- Update to PostgreSQL 9.2.4, for various fixes described at
+ http://www.postgresql.org/docs/9.2/static/release-9-2-4.html
+ including the fixes for CVE-2013-1899, CVE-2013-1900, CVE-2013-1901
+Resolves: #929223, #929255, #929328
+- fix build for aarch64 and ppc64p7
+
* Thu Feb 7 2013 Tom Lane <tgl(a)redhat.com> 9.2.3-1
- Update to PostgreSQL 9.2.3, for various fixes described at
http://www.postgresql.org/docs/9.2/static/release-9-2-3.html
diff --git a/sources b/sources
index 5efea97..4657dc6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-59f42a93695b0186ed5eb03c2653a7d4 postgresql-9.2.3.tar.bz2
-33c8cd75dc2e0a5531a665a27b698718 postgresql-9.2.3-US.pdf
-54783b516880a586dcd7c07992d8c0b3 postgresql-9.1.8.tar.bz2
+6ee5bb53b97da7c6ad9cb0825d3300dd postgresql-9.2.4.tar.bz2
+64f70057a3a153e8e237d0c79ccc63e9 postgresql-9.2.4-US.pdf
+6b5ea53dde48fcd79acfc8c196b83535 postgresql-9.1.9.tar.bz2
commit 3b77faf93c0b063152ec767e439aba60c3046287
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Feb 7 10:50:50 2013 -0500
Update to PostgreSQL 9.2.3
diff --git a/.gitignore b/.gitignore
index b5f1982..bc23b93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.2.2.tar.bz2
-/postgresql-9.2.2-US.pdf
-/postgresql-9.1.7.tar.bz2
+/postgresql-9.2.3.tar.bz2
+/postgresql-9.2.3-US.pdf
+/postgresql-9.1.8.tar.bz2
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
index 2161d8a..366bf28 100644
--- a/postgresql-multi-sockets.patch
+++ b/postgresql-multi-sockets.patch
@@ -11,9 +11,9 @@ hunks *must be at the end* so that those files are newer than the
master doc files.
-diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/server.c postgresql-9.2.2/contrib/pg_upgrade/server.c
---- postgresql-9.2.2.orig/contrib/pg_upgrade/server.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/contrib/pg_upgrade/server.c 2012-12-04 11:31:53.614801411 -0500
+diff -Naur postgresql-9.2.3.orig/contrib/pg_upgrade/server.c postgresql-9.2.3/contrib/pg_upgrade/server.c
+--- postgresql-9.2.3.orig/contrib/pg_upgrade/server.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/contrib/pg_upgrade/server.c 2013-02-06 19:57:37.124796707 -0500
@@ -197,7 +197,8 @@
snprintf(socket_string + strlen(socket_string),
sizeof(socket_string) - strlen(socket_string),
@@ -24,9 +24,9 @@ diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/server.c postgresql-9.2.2/co
"unix_socket_directory" : "unix_socket_directories",
cluster->sockdir);
#endif
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.2/doc/src/sgml/client-auth.sgml
---- postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/client-auth.sgml 2012-12-04 11:31:53.656801817 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.3/doc/src/sgml/client-auth.sgml
+--- postgresql-9.2.3.orig/doc/src/sgml/client-auth.sgml 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/client-auth.sgml 2013-02-06 19:57:37.125796568 -0500
@@ -838,7 +838,7 @@
<varname>unix_socket_permissions</varname> (and possibly
<varname>unix_socket_group</varname>) configuration parameters as
@@ -36,9 +36,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.2/
configuration parameter to place the socket file in a suitably
restricted directory.
</para>
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/config.sgml postgresql-9.2.2/doc/src/sgml/config.sgml
---- postgresql-9.2.2.orig/doc/src/sgml/config.sgml 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/config.sgml 2012-12-04 11:31:53.706802299 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/config.sgml postgresql-9.2.3/doc/src/sgml/config.sgml
+--- postgresql-9.2.3.orig/doc/src/sgml/config.sgml 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/config.sgml 2013-02-06 19:57:37.128796163 -0500
@@ -453,17 +453,24 @@
</listitem>
</varlistentry>
@@ -111,9 +111,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/config.sgml postgresql-9.2.2/doc/s
</row>
<row>
<entry><option>-l</option></entry>
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2.2/doc/src/sgml/html/app-postgres.html
---- postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html 2012-12-03 15:31:55.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html/app-postgres.html 2012-12-04 11:31:53.707802308 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2.3/doc/src/sgml/html/app-postgres.html
+--- postgresql-9.2.3.orig/doc/src/sgml/html/app-postgres.html 2013-02-04 16:35:38.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/html/app-postgres.html 2013-02-06 19:57:37.129796032 -0500
@@ -574,11 +574,19 @@
CLASS="COMMAND"
>postgres</TT
@@ -136,9 +136,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html postgresql-
</P
></DD
><DT
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2.2/doc/src/sgml/html/auth-methods.html
---- postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html 2012-12-03 15:31:37.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html/auth-methods.html 2012-12-04 11:31:53.708802316 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2.3/doc/src/sgml/html/auth-methods.html
+--- postgresql-9.2.3.orig/doc/src/sgml/html/auth-methods.html 2013-02-04 16:35:20.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/html/auth-methods.html 2013-02-06 19:57:37.129796032 -0500
@@ -161,7 +161,7 @@
>. Or you
could set the <TT
@@ -148,10 +148,10 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html postgresql-
>
configuration parameter to place the socket file in a suitably
restricted directory.
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html postgresql-9.2.2/doc/src/sgml/html/bookindex.html
---- postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html 2012-12-03 15:32:32.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html/bookindex.html 2012-12-04 11:31:53.711802349 -0500
-@@ -17236,7 +17236,7 @@
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/bookindex.html postgresql-9.2.3/doc/src/sgml/html/bookindex.html
+--- postgresql-9.2.3.orig/doc/src/sgml/html/bookindex.html 2013-02-04 16:36:12.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/html/bookindex.html 2013-02-06 19:57:37.133795530 -0500
+@@ -17243,7 +17243,7 @@
></DL
></DD
><DT
@@ -160,9 +160,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html postgresql-9.2
<A
HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
>Connection Settings</A
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2.2/doc/src/sgml/html/preventing-server-spoofing.html
---- postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-03 15:31:36.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-04 11:31:53.712802361 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2.3/doc/src/sgml/html/preventing-server-spoofing.html
+--- postgresql-9.2.3.orig/doc/src/sgml/html/preventing-server-spoofing.html 2013-02-04 16:35:19.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/html/preventing-server-spoofing.html 2013-02-06 19:57:37.134795410 -0500
@@ -115,8 +115,8 @@
>local</TT
>
@@ -174,9 +174,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.ht
>) that has write permission only
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2.2/doc/src/sgml/html/runtime-config-connection.html
---- postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.html 2012-12-03 15:31:36.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html/runtime-config-connection.html 2012-12-04 11:31:53.712802361 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2.3/doc/src/sgml/html/runtime-config-connection.html
+--- postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-connection.html 2013-02-04 16:35:19.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/html/runtime-config-connection.html 2013-02-06 19:57:37.135795292 -0500
@@ -274,24 +274,31 @@
></DD
><DT
@@ -251,9 +251,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.htm
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2.2/doc/src/sgml/html/runtime-config-short.html
---- postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html 2012-12-03 15:31:37.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html/runtime-config-short.html 2012-12-04 11:31:53.713802371 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2.3/doc/src/sgml/html/runtime-config-short.html
+--- postgresql-9.2.3.orig/doc/src/sgml/html/runtime-config-short.html 2013-02-04 16:35:20.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/html/runtime-config-short.html 2013-02-06 19:57:37.135795292 -0500
@@ -330,7 +330,7 @@
><TD
><TT
@@ -263,9 +263,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html pos
CLASS="REPLACEABLE"
><I
>x</I
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.2/doc/src/sgml/man1/postgres.1
---- postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 2012-12-03 15:33:32.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/man1/postgres.1 2012-12-04 11:31:53.714802380 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.3/doc/src/sgml/man1/postgres.1
+--- postgresql-9.2.3.orig/doc/src/sgml/man1/postgres.1 2013-02-04 16:37:11.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/man1/postgres.1 2013-02-06 19:57:37.136795176 -0500
@@ -195,8 +195,10 @@
.RS 4
Specifies the directory of the Unix\-domain socket on which
@@ -279,9 +279,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.2/d
.RE
.PP
\fB\-l\fR
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2.2/doc/src/sgml/ref/postgres-ref.sgml
---- postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/ref/postgres-ref.sgml 2012-12-04 11:31:53.714802380 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2.3/doc/src/sgml/ref/postgres-ref.sgml
+--- postgresql-9.2.3.orig/doc/src/sgml/ref/postgres-ref.sgml 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/ref/postgres-ref.sgml 2013-02-06 19:57:37.136795176 -0500
@@ -254,8 +254,14 @@
<para>
Specifies the directory of the Unix-domain socket on which
@@ -299,9 +299,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9
</para>
</listitem>
</varlistentry>
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml postgresql-9.2.2/doc/src/sgml/runtime.sgml
---- postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/runtime.sgml 2012-12-04 11:31:53.715802388 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml postgresql-9.2.3/doc/src/sgml/runtime.sgml
+--- postgresql-9.2.3.orig/doc/src/sgml/runtime.sgml 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/runtime.sgml 2013-02-06 19:57:37.137795062 -0500
@@ -1798,7 +1798,7 @@
<para>
The simplest way to prevent spoofing for <literal>local</>
@@ -311,9 +311,9 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml postgresql-9.2.2/doc/
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
some applications might still reference <filename>/tmp</> for the
-diff -Naur postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c postgresql-9.2.2/src/backend/libpq/pqcomm.c
---- postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/backend/libpq/pqcomm.c 2012-12-04 11:34:27.785273808 -0500
+diff -Naur postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c postgresql-9.2.3/src/backend/libpq/pqcomm.c
+--- postgresql-9.2.3.orig/src/backend/libpq/pqcomm.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/backend/libpq/pqcomm.c 2013-02-06 19:57:37.138794950 -0500
@@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client
@@ -539,9 +539,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c postgresql-9.2.2/src
/*
* utime() is POSIX standard, utimes() is a common alternative. If we
* have neither, there's no way to affect the mod or access time of
-diff -Naur postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c postgresql-9.2.2/src/backend/postmaster/postmaster.c
---- postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/backend/postmaster/postmaster.c 2012-12-04 11:31:53.718802420 -0500
+diff -Naur postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c postgresql-9.2.3/src/backend/postmaster/postmaster.c
+--- postgresql-9.2.3.orig/src/backend/postmaster/postmaster.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/backend/postmaster/postmaster.c 2013-02-06 19:57:37.139794840 -0500
@@ -156,7 +156,9 @@
/* The socket number we are listening for connections on */
@@ -676,9 +676,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c postgresql-
last_touch_time = now;
}
}
-diff -Naur postgresql-9.2.2.orig/src/backend/tcop/postgres.c postgresql-9.2.2/src/backend/tcop/postgres.c
---- postgresql-9.2.2.orig/src/backend/tcop/postgres.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/backend/tcop/postgres.c 2012-12-04 11:31:53.719802432 -0500
+diff -Naur postgresql-9.2.3.orig/src/backend/tcop/postgres.c postgresql-9.2.3/src/backend/tcop/postgres.c
+--- postgresql-9.2.3.orig/src/backend/tcop/postgres.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/backend/tcop/postgres.c 2013-02-06 19:57:37.140794732 -0500
@@ -3333,7 +3333,7 @@
break;
@@ -688,9 +688,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/tcop/postgres.c postgresql-9.2.2/sr
break;
case 'l':
-diff -Naur postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c postgresql-9.2.2/src/backend/utils/adt/varlena.c
---- postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/backend/utils/adt/varlena.c 2012-12-04 11:31:53.720802443 -0500
+diff -Naur postgresql-9.2.3.orig/src/backend/utils/adt/varlena.c postgresql-9.2.3/src/backend/utils/adt/varlena.c
+--- postgresql-9.2.3.orig/src/backend/utils/adt/varlena.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/backend/utils/adt/varlena.c 2013-02-06 19:57:37.141794626 -0500
@@ -2446,6 +2446,119 @@
}
@@ -811,9 +811,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c postgresql-9.2.
/*****************************************************************************
* Comparison Functions used for bytea
*
-diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.2.2/src/backend/utils/init/miscinit.c
---- postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/backend/utils/init/miscinit.c 2012-12-04 11:31:53.721802453 -0500
+diff -Naur postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c postgresql-9.2.3/src/backend/utils/init/miscinit.c
+--- postgresql-9.2.3.orig/src/backend/utils/init/miscinit.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/backend/utils/init/miscinit.c 2013-02-06 20:03:33.247073549 -0500
@@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing;
@@ -883,9 +883,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
- );
+ socketDir);
- errno = 0;
- if (write(fd, buffer, strlen(buffer)) != strlen(buffer))
-@@ -934,9 +932,14 @@
+ /*
+ * In a standalone backend, the next line (LOCK_FILE_LINE_LISTEN_ADDR)
+@@ -941,9 +939,14 @@
}
/*
@@ -902,7 +902,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
}
/*
-@@ -945,41 +948,50 @@
+@@ -952,41 +955,50 @@
* When this is called, we must have already switched the working
* directory to DataDir, so we can just use a relative path. This
* helps ensure that we are locking the directory we should be.
@@ -964,7 +964,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
/*
* utime() is POSIX standard, utimes() is a common alternative; if we
* have neither, fall back to actually reading the file (which only
-@@ -1011,8 +1023,10 @@
+@@ -1018,8 +1030,10 @@
* Add (or replace) a line in the data directory lock file.
* The given string should not include a trailing newline.
*
@@ -977,7 +977,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
*/
void
AddToDataDirLockFile(int target_line, const char *str)
-@@ -1020,8 +1034,10 @@
+@@ -1027,8 +1041,10 @@
int fd;
int len;
int lineno;
@@ -990,7 +990,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
fd = open(DIRECTORY_LOCK_FILE, O_RDWR | PG_BINARY, 0);
if (fd < 0)
-@@ -1032,7 +1048,7 @@
+@@ -1039,7 +1055,7 @@
DIRECTORY_LOCK_FILE)));
return;
}
@@ -999,7 +999,7 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
if (len < 0)
{
ereport(LOG,
-@@ -1042,36 +1058,50 @@
+@@ -1049,37 +1065,51 @@
close(fd);
return;
}
@@ -1018,7 +1018,8 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
- if ((ptr = strchr(ptr, '\n')) == NULL)
+ if ((srcptr = strchr(srcptr, '\n')) == NULL)
{
- elog(LOG, "bogus data in \"%s\"", DIRECTORY_LOCK_FILE);
+ elog(LOG, "incomplete data in \"%s\": found only %d newlines while trying to add line %d",
+ DIRECTORY_LOCK_FILE, lineno - 1, target_line);
close(fd);
return;
}
@@ -1058,9 +1059,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.
{
/* if write didn't set errno, assume problem is no disk space */
if (errno == 0)
-diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/guc.c postgresql-9.2.2/src/backend/utils/misc/guc.c
---- postgresql-9.2.2.orig/src/backend/utils/misc/guc.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/backend/utils/misc/guc.c 2012-12-04 11:31:53.723802472 -0500
+diff -Naur postgresql-9.2.3.orig/src/backend/utils/misc/guc.c postgresql-9.2.3/src/backend/utils/misc/guc.c
+--- postgresql-9.2.3.orig/src/backend/utils/misc/guc.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/backend/utils/misc/guc.c 2013-02-06 19:57:37.144794320 -0500
@@ -2894,14 +2894,18 @@
},
@@ -1084,9 +1085,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/guc.c postgresql-9.2.2/s
},
{
-diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2.2/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/backend/utils/misc/postgresql.conf.sample 2012-12-04 11:31:53.723802472 -0500
+diff -Naur postgresql-9.2.3.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2.3/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.2.3.orig/src/backend/utils/misc/postgresql.conf.sample 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/backend/utils/misc/postgresql.conf.sample 2013-02-06 19:57:37.145794222 -0500
@@ -65,7 +65,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction).
@@ -1097,9 +1098,9 @@ diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample p
#unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation
# (change requires restart)
-diff -Naur postgresql-9.2.2.orig/src/bin/initdb/initdb.c postgresql-9.2.2/src/bin/initdb/initdb.c
---- postgresql-9.2.2.orig/src/bin/initdb/initdb.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/bin/initdb/initdb.c 2012-12-04 11:31:53.725802491 -0500
+diff -Naur postgresql-9.2.3.orig/src/bin/initdb/initdb.c postgresql-9.2.3/src/bin/initdb/initdb.c
+--- postgresql-9.2.3.orig/src/bin/initdb/initdb.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/bin/initdb/initdb.c 2013-02-06 19:57:37.146794124 -0500
@@ -983,7 +983,7 @@
setup_config(void)
{
@@ -1125,9 +1126,9 @@ diff -Naur postgresql-9.2.2.orig/src/bin/initdb/initdb.c postgresql-9.2.2/src/bi
#if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
conflines = replace_token(conflines, "#port = 5432", repltok);
-diff -Naur postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.2/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/bin/pg_ctl/pg_ctl.c 2012-12-04 11:31:53.725802491 -0500
+diff -Naur postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.2.3.orig/src/bin/pg_ctl/pg_ctl.c 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/bin/pg_ctl/pg_ctl.c 2013-02-06 19:57:37.147794028 -0500
@@ -559,7 +559,7 @@
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
@@ -1137,9 +1138,9 @@ diff -Naur postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.2/src/bi
* directories, libpq's host parameter must have a
* leading slash to indicate a socket directory. So,
* ignore sockdir if it's relative, and try to use TCP
-diff -Naur postgresql-9.2.2.orig/src/include/libpq/libpq.h postgresql-9.2.2/src/include/libpq/libpq.h
---- postgresql-9.2.2.orig/src/include/libpq/libpq.h 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/include/libpq/libpq.h 2012-12-04 11:31:53.726802502 -0500
+diff -Naur postgresql-9.2.3.orig/src/include/libpq/libpq.h postgresql-9.2.3/src/include/libpq/libpq.h
+--- postgresql-9.2.3.orig/src/include/libpq/libpq.h 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/include/libpq/libpq.h 2013-02-06 19:57:37.147794028 -0500
@@ -44,12 +44,12 @@
/*
* prototypes for functions in pqcomm.c
@@ -1157,9 +1158,9 @@ diff -Naur postgresql-9.2.2.orig/src/include/libpq/libpq.h postgresql-9.2.2/src/
extern void pq_init(void);
extern void pq_comm_reset(void);
extern int pq_getbytes(char *s, size_t len);
-diff -Naur postgresql-9.2.2.orig/src/include/miscadmin.h postgresql-9.2.2/src/include/miscadmin.h
---- postgresql-9.2.2.orig/src/include/miscadmin.h 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/include/miscadmin.h 2012-12-04 11:31:53.726802502 -0500
+diff -Naur postgresql-9.2.3.orig/src/include/miscadmin.h postgresql-9.2.3/src/include/miscadmin.h
+--- postgresql-9.2.3.orig/src/include/miscadmin.h 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/include/miscadmin.h 2013-02-06 19:57:37.148793934 -0500
@@ -411,7 +411,7 @@
* 2 data directory path
* 3 postmaster start timestamp (time_t representation)
@@ -1181,9 +1182,9 @@ diff -Naur postgresql-9.2.2.orig/src/include/miscadmin.h postgresql-9.2.2/src/in
extern void AddToDataDirLockFile(int target_line, const char *str);
extern void ValidatePgVersion(const char *path);
extern void process_shared_preload_libraries(void);
-diff -Naur postgresql-9.2.2.orig/src/include/postmaster/postmaster.h postgresql-9.2.2/src/include/postmaster/postmaster.h
---- postgresql-9.2.2.orig/src/include/postmaster/postmaster.h 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/include/postmaster/postmaster.h 2012-12-04 11:31:53.727802513 -0500
+diff -Naur postgresql-9.2.3.orig/src/include/postmaster/postmaster.h postgresql-9.2.3/src/include/postmaster/postmaster.h
+--- postgresql-9.2.3.orig/src/include/postmaster/postmaster.h 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/include/postmaster/postmaster.h 2013-02-06 19:57:37.148793934 -0500
@@ -19,7 +19,7 @@
extern int PostPortNumber;
extern int Unix_socket_permissions;
@@ -1193,9 +1194,9 @@ diff -Naur postgresql-9.2.2.orig/src/include/postmaster/postmaster.h postgresql-
extern char *ListenAddresses;
extern bool ClientAuthInProgress;
extern int PreAuthDelay;
-diff -Naur postgresql-9.2.2.orig/src/include/utils/builtins.h postgresql-9.2.2/src/include/utils/builtins.h
---- postgresql-9.2.2.orig/src/include/utils/builtins.h 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/include/utils/builtins.h 2012-12-04 11:31:53.727802513 -0500
+diff -Naur postgresql-9.2.3.orig/src/include/utils/builtins.h postgresql-9.2.3/src/include/utils/builtins.h
+--- postgresql-9.2.3.orig/src/include/utils/builtins.h 2013-02-04 16:28:13.000000000 -0500
++++ postgresql-9.2.3/src/include/utils/builtins.h 2013-02-06 19:57:37.149793843 -0500
@@ -754,6 +754,8 @@
extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator,
@@ -1205,13 +1206,13 @@ diff -Naur postgresql-9.2.2.orig/src/include/utils/builtins.h postgresql-9.2.2/s
extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob);
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html-stamp postgresql-9.2.2/doc/src/sgml/html-stamp
---- postgresql-9.2.2.orig/doc/src/sgml/html-stamp 2012-12-03 15:32:32.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html-stamp 2012-12-04 11:31:53.728802524 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/html-stamp postgresql-9.2.3/doc/src/sgml/html-stamp
+--- postgresql-9.2.3.orig/doc/src/sgml/html-stamp 2013-02-04 16:36:12.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/html-stamp 2013-02-06 19:57:37.149793843 -0500
@@ -0,0 +1 @@
+hack
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man-stamp postgresql-9.2.2/doc/src/sgml/man-stamp
---- postgresql-9.2.2.orig/doc/src/sgml/man-stamp 2012-12-03 15:33:38.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/man-stamp 2012-12-04 11:31:53.728802524 -0500
+diff -Naur postgresql-9.2.3.orig/doc/src/sgml/man-stamp postgresql-9.2.3/doc/src/sgml/man-stamp
+--- postgresql-9.2.3.orig/doc/src/sgml/man-stamp 2013-02-04 16:37:18.000000000 -0500
++++ postgresql-9.2.3/doc/src/sgml/man-stamp 2013-02-06 19:57:37.149793843 -0500
@@ -0,0 +1 @@
+hack
diff --git a/postgresql-upgrade-test.patch b/postgresql-upgrade-test.patch
deleted file mode 100644
index 28add1b..0000000
--- a/postgresql-upgrade-test.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Back-patch upstream fix to suppress creation of postmaster's TCP socket
-during pg_upgrade testing. This will be in 9.2.3 and later.
-
-
-diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/test.sh postgresql-9.2.2/contrib/pg_upgrade/test.sh
---- postgresql-9.2.2.orig/contrib/pg_upgrade/test.sh 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/contrib/pg_upgrade/test.sh 2013-01-03 17:33:45.581567466 -0500
-@@ -17,6 +17,13 @@
-
- testhost=`uname -s`
-
-+case $testhost in
-+ MINGW*) LISTEN_ADDRESSES="localhost" ;;
-+ *) LISTEN_ADDRESSES="" ;;
-+esac
-+
-+POSTMASTER_OPTS="-F -c listen_addresses=$LISTEN_ADDRESSES"
-+
- temp_root=$PWD/tmp_check
-
- if [ "$1" = '--install' ]; then
-@@ -71,10 +78,11 @@
- rm -rf "$logdir"
- mkdir "$logdir"
-
-+# enable echo so the user can see what is being executed
- set -x
-
- $oldbindir/initdb
--$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -w
-+$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
- if "$MAKE" -C "$oldsrc" installcheck; then
- pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
- if [ "$newsrc" != "$oldsrc" ]; then
-@@ -117,7 +125,7 @@
-
- pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
-
--pg_ctl start -l "$logdir/postmaster2.log" -w
-+pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
-
- case $testhost in
- MINGW*) cmd /c analyze_new_cluster.bat ;;
-@@ -126,6 +134,11 @@
-
- pg_dumpall -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
- pg_ctl -m fast stop
-+
-+# no need to echo commands anymore
-+set +x
-+echo
-+
- if [ -n "$pg_dumpall2_status" ]; then
- echo "pg_dumpall of post-upgrade database cluster failed"
- exit 1
diff --git a/postgresql.spec b/postgresql.spec
index b335e59..242035b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -57,8 +57,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
-Version: 9.2.2
-Release: 3%{?dist}
+Version: 9.2.3
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -73,7 +73,7 @@ Url: http://www.postgresql.org/
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series;
# but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.1.7
+%global prevversion 9.1.8
%global prevmajorversion 9.1
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -101,8 +101,7 @@ Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-multi-sockets.patch
-Patch6: postgresql-upgrade-test.patch
-Patch7: postgresql-var-run-socket.patch
+Patch6: postgresql-var-run-socket.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -330,7 +329,6 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -571,6 +569,10 @@ make DESTDIR=$RPM_BUILD_ROOT install-world
mv -f src/Makefile.global.save src/Makefile.global
%endif
+# make sure these directories exist even if we suppressed all contrib modules
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/contrib
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pgsql/extension
+
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in
@@ -653,7 +655,6 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
rm bin/initdb
rm bin/pg_basebackup
rm bin/pg_config
- rm bin/pg_controldata
rm bin/pg_dump
rm bin/pg_dumpall
rm bin/pg_restore
@@ -1087,6 +1088,16 @@ fi
%endif
%changelog
+* Thu Feb 7 2013 Tom Lane <tgl(a)redhat.com> 9.2.3-1
+- Update to PostgreSQL 9.2.3, for various fixes described at
+ http://www.postgresql.org/docs/9.2/static/release-9-2-3.html
+ including the fix for CVE-2013-0255
+Resolves: #908722
+- Make the package build with selinux option disabled
+Resolves: #894367
+- Include old version of pg_controldata in postgresql-upgrade subpackage
+Related: #896161
+
* Thu Jan 3 2013 Tom Lane <tgl(a)redhat.com> 9.2.2-3
- Prevent creation of TCP socket during pg_upgrade regression test, so that
concurrent RPM builds on the same machine won't fail
diff --git a/sources b/sources
index 9008490..5efea97 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-1cc388988e69bf75c6b55d59070100f6 postgresql-9.2.2.tar.bz2
-f34d72628321de53e536e689a31bd45c postgresql-9.2.2-US.pdf
-eaf7b67493d59d1a60767ffdfbd65ce9 postgresql-9.1.7.tar.bz2
+59f42a93695b0186ed5eb03c2653a7d4 postgresql-9.2.3.tar.bz2
+33c8cd75dc2e0a5531a665a27b698718 postgresql-9.2.3-US.pdf
+54783b516880a586dcd7c07992d8c0b3 postgresql-9.1.8.tar.bz2
commit 1cd49a06e5e67fbd1bc60706014d22ae6a71da9f
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Jan 3 18:37:36 2013 -0500
Fix bugs 891531 and 891547
diff --git a/postgresql-setup b/postgresql-setup
index 132ef78..e566106 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -91,6 +91,7 @@ perform_initdb(){
mkdir "$PGDATA/pg_log"
chown postgres:postgres "$PGDATA/pg_log"
chmod go-rwx "$PGDATA/pg_log"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA/pg_log"
if [ -f "$PGDATA/PG_VERSION" ]
then
diff --git a/postgresql-upgrade-test.patch b/postgresql-upgrade-test.patch
new file mode 100644
index 0000000..28add1b
--- /dev/null
+++ b/postgresql-upgrade-test.patch
@@ -0,0 +1,55 @@
+Back-patch upstream fix to suppress creation of postmaster's TCP socket
+during pg_upgrade testing. This will be in 9.2.3 and later.
+
+
+diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/test.sh postgresql-9.2.2/contrib/pg_upgrade/test.sh
+--- postgresql-9.2.2.orig/contrib/pg_upgrade/test.sh 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/contrib/pg_upgrade/test.sh 2013-01-03 17:33:45.581567466 -0500
+@@ -17,6 +17,13 @@
+
+ testhost=`uname -s`
+
++case $testhost in
++ MINGW*) LISTEN_ADDRESSES="localhost" ;;
++ *) LISTEN_ADDRESSES="" ;;
++esac
++
++POSTMASTER_OPTS="-F -c listen_addresses=$LISTEN_ADDRESSES"
++
+ temp_root=$PWD/tmp_check
+
+ if [ "$1" = '--install' ]; then
+@@ -71,10 +78,11 @@
+ rm -rf "$logdir"
+ mkdir "$logdir"
+
++# enable echo so the user can see what is being executed
+ set -x
+
+ $oldbindir/initdb
+-$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -w
++$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
+ if "$MAKE" -C "$oldsrc" installcheck; then
+ pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+ if [ "$newsrc" != "$oldsrc" ]; then
+@@ -117,7 +125,7 @@
+
+ pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
+
+-pg_ctl start -l "$logdir/postmaster2.log" -w
++pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
+
+ case $testhost in
+ MINGW*) cmd /c analyze_new_cluster.bat ;;
+@@ -126,6 +134,11 @@
+
+ pg_dumpall -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+ pg_ctl -m fast stop
++
++# no need to echo commands anymore
++set +x
++echo
++
+ if [ -n "$pg_dumpall2_status" ]; then
+ echo "pg_dumpall of post-upgrade database cluster failed"
+ exit 1
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 305dc02..22b8a0c 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -17,9 +17,9 @@ least until 9.3 when that will be part of the upstream package.
diff -Naur postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.2/contrib/pg_upgrade/test.sh
---- postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/contrib/pg_upgrade/test.sh 2012-12-04 14:34:04.661476094 -0500
-@@ -71,10 +71,14 @@
+--- postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh 2013-01-03 17:33:45.581567466 -0500
++++ postgresql-9.2.2/contrib/pg_upgrade/test.sh 2013-01-03 17:40:22.923364917 -0500
+@@ -78,6 +78,12 @@
rm -rf "$logdir"
mkdir "$logdir"
@@ -27,26 +27,14 @@ diff -Naur postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.2/
+PGHOST=$temp_root
+export PGHOST
+
++POSTMASTER_OPTS="$POSTMASTER_OPTS -c unix_socket_directories='$PGHOST'"
++
+ # enable echo so the user can see what is being executed
set -x
- $oldbindir/initdb
--$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -w
-+$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "-c unix_socket_directories='$PGHOST'" -w
- if "$MAKE" -C "$oldsrc" installcheck; then
- pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
- if [ "$newsrc" != "$oldsrc" ]; then
-@@ -117,7 +121,7 @@
-
- pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
-
--pg_ctl start -l "$logdir/postmaster2.log" -w
-+pg_ctl start -l "$logdir/postmaster2.log" -o "-c unix_socket_directories='$PGHOST'" -w
-
- case $testhost in
- MINGW*) cmd /c analyze_new_cluster.bat ;;
diff -Naur postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c postgresql-9.2.2/src/backend/utils/misc/guc.c
---- postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c 2012-12-04 14:25:57.578967623 -0500
-+++ postgresql-9.2.2/src/backend/utils/misc/guc.c 2012-12-04 14:34:04.663476214 -0500
+--- postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c 2013-01-03 17:37:56.632977951 -0500
++++ postgresql-9.2.2/src/backend/utils/misc/guc.c 2013-01-03 17:38:30.183271588 -0500
@@ -2901,7 +2901,7 @@
},
&Unix_socket_directories,
@@ -57,8 +45,8 @@ diff -Naur postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c postgresql-9.2.
"",
#endif
diff -Naur postgresql-9.2.2.sockets/src/bin/initdb/initdb.c postgresql-9.2.2/src/bin/initdb/initdb.c
---- postgresql-9.2.2.sockets/src/bin/initdb/initdb.c 2012-12-04 14:25:57.579967636 -0500
-+++ postgresql-9.2.2/src/bin/initdb/initdb.c 2012-12-04 14:34:04.665476326 -0500
+--- postgresql-9.2.2.sockets/src/bin/initdb/initdb.c 2013-01-03 17:37:56.633977974 -0500
++++ postgresql-9.2.2/src/bin/initdb/initdb.c 2013-01-03 17:38:30.185271611 -0500
@@ -1007,7 +1007,7 @@
#ifdef HAVE_UNIX_SOCKETS
@@ -70,7 +58,7 @@ diff -Naur postgresql-9.2.2.sockets/src/bin/initdb/initdb.c postgresql-9.2.2/src
#endif
diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.2.2/src/include/pg_config_manual.h
--- postgresql-9.2.2.sockets/src/include/pg_config_manual.h 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/include/pg_config_manual.h 2012-12-04 14:34:04.665476326 -0500
++++ postgresql-9.2.2/src/include/pg_config_manual.h 2013-01-03 17:38:30.185271611 -0500
@@ -144,7 +144,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
@@ -82,7 +70,7 @@ diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.
* The random() function is expected to yield values between 0 and
diff -Naur postgresql-9.2.2.sockets/src/test/regress/pg_regress.c postgresql-9.2.2/src/test/regress/pg_regress.c
--- postgresql-9.2.2.sockets/src/test/regress/pg_regress.c 2012-12-03 15:16:10.000000000 -0500
-+++ postgresql-9.2.2/src/test/regress/pg_regress.c 2012-12-04 14:34:04.666476378 -0500
++++ postgresql-9.2.2/src/test/regress/pg_regress.c 2013-01-03 17:38:30.186271622 -0500
@@ -772,7 +772,7 @@
if (hostname != NULL)
doputenv("PGHOST", hostname);
diff --git a/postgresql.spec b/postgresql.spec
index b94d35e..b335e59 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -58,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -101,7 +101,8 @@ Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-multi-sockets.patch
-Patch6: postgresql-var-run-socket.patch
+Patch6: postgresql-upgrade-test.patch
+Patch7: postgresql-var-run-socket.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -329,6 +330,7 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -1085,6 +1087,13 @@ fi
%endif
%changelog
+* Thu Jan 3 2013 Tom Lane <tgl(a)redhat.com> 9.2.2-3
+- Prevent creation of TCP socket during pg_upgrade regression test, so that
+ concurrent RPM builds on the same machine won't fail
+Resolves: #891531
+- Make sure $PGDATA/pg_log/ gets the right SELinux label in postgresql-setup
+Resolves: #891547
+
* Wed Dec 19 2012 Tom Lane <tgl(a)redhat.com> 9.2.2-2
- Make building of plpython3 dependent on Fedora version, per guidelines
Resolves: #888419
commit 73e3a6adf88fa980bf7877367f0208282320e01e
Author: Tom Lane <tgl(a)redhat.com>
Date: Wed Dec 19 12:15:54 2012 -0500
Make building of plpython3 dependent on Fedora version, per guidelines
diff --git a/postgresql.spec b/postgresql.spec
index a876405..b94d35e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -35,7 +35,11 @@
%{!?test:%global test 1}
%{!?upgrade:%global upgrade 1}
%{!?plpython:%global plpython 1}
+%if 0%{?fedora} > 12
%{!?plpython3:%global plpython3 1}
+%else
+%{!?plpython3:%global plpython3 0}
+%endif
%{!?pltcl:%global pltcl 1}
%{!?plperl:%global plperl 1}
%{!?ssl:%global ssl 1}
@@ -54,7 +58,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
Version: 9.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1081,6 +1085,10 @@ fi
%endif
%changelog
+* Wed Dec 19 2012 Tom Lane <tgl(a)redhat.com> 9.2.2-2
+- Make building of plpython3 dependent on Fedora version, per guidelines
+Resolves: #888419
+
* Thu Dec 6 2012 Tom Lane <tgl(a)redhat.com> 9.2.2-1
- Update to PostgreSQL 9.2.2, for various fixes described at
http://www.postgresql.org/docs/9.2/static/release-9-2-2.html
commit 4ffe73e930e01589546cf8bc143ca7d0eb7ea55f
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Dec 6 12:00:23 2012 -0500
Forgot that diff hunk order is important in this patch :-(
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
index 6cc2b88..2161d8a 100644
--- a/postgresql-multi-sockets.patch
+++ b/postgresql-multi-sockets.patch
@@ -6,7 +6,9 @@ documentation files).
Note the patch also touches html-stamp and man-stamp in doc/src/sgml/;
this is to keep the makefiles from trying to rebuild the derived doc
files. We don't want that to happen because the BuildRequires for the
-package don't include the necessary documentation tools.
+package don't include the necessary documentation tools. Those diff
+hunks *must be at the end* so that those files are newer than the
+master doc files.
diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/server.c postgresql-9.2.2/contrib/pg_upgrade/server.c
@@ -261,16 +263,6 @@ diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html pos
CLASS="REPLACEABLE"
><I
>x</I
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html-stamp postgresql-9.2.2/doc/src/sgml/html-stamp
---- postgresql-9.2.2.orig/doc/src/sgml/html-stamp 2012-12-03 15:32:32.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/html-stamp 2012-12-04 11:31:53.728802524 -0500
-@@ -0,0 +1 @@
-+hack
-diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man-stamp postgresql-9.2.2/doc/src/sgml/man-stamp
---- postgresql-9.2.2.orig/doc/src/sgml/man-stamp 2012-12-03 15:33:38.000000000 -0500
-+++ postgresql-9.2.2/doc/src/sgml/man-stamp 2012-12-04 11:31:53.728802524 -0500
-@@ -0,0 +1 @@
-+hack
diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.2/doc/src/sgml/man1/postgres.1
--- postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 2012-12-03 15:33:32.000000000 -0500
+++ postgresql-9.2.2/doc/src/sgml/man1/postgres.1 2012-12-04 11:31:53.714802380 -0500
@@ -1213,3 +1205,13 @@ diff -Naur postgresql-9.2.2.orig/src/include/utils/builtins.h postgresql-9.2.2/s
extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob);
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html-stamp postgresql-9.2.2/doc/src/sgml/html-stamp
+--- postgresql-9.2.2.orig/doc/src/sgml/html-stamp 2012-12-03 15:32:32.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html-stamp 2012-12-04 11:31:53.728802524 -0500
+@@ -0,0 +1 @@
++hack
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man-stamp postgresql-9.2.2/doc/src/sgml/man-stamp
+--- postgresql-9.2.2.orig/doc/src/sgml/man-stamp 2012-12-03 15:33:38.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/man-stamp 2012-12-04 11:31:53.728802524 -0500
+@@ -0,0 +1 @@
++hack
commit 5f6fb7975fa4d0f3529b9ca27d4bd23508071bd2
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Dec 6 11:05:36 2012 -0500
Update to PostgreSQL 9.2.2
diff --git a/.gitignore b/.gitignore
index da03fda..b5f1982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.2.1.tar.bz2
-/postgresql-9.2.1-US.pdf
-/postgresql-9.1.6.tar.bz2
+/postgresql-9.2.2.tar.bz2
+/postgresql-9.2.2-US.pdf
+/postgresql-9.1.7.tar.bz2
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
index 7cb2789..6cc2b88 100644
--- a/postgresql-multi-sockets.patch
+++ b/postgresql-multi-sockets.patch
@@ -9,9 +9,9 @@ files. We don't want that to happen because the BuildRequires for the
package don't include the necessary documentation tools.
-diff -Naur postgresql-9.2rc1.orig/contrib/pg_upgrade/server.c postgresql-9.2rc1/contrib/pg_upgrade/server.c
---- postgresql-9.2rc1.orig/contrib/pg_upgrade/server.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/contrib/pg_upgrade/server.c 2012-09-06 12:06:22.425763034 -0400
+diff -Naur postgresql-9.2.2.orig/contrib/pg_upgrade/server.c postgresql-9.2.2/contrib/pg_upgrade/server.c
+--- postgresql-9.2.2.orig/contrib/pg_upgrade/server.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/contrib/pg_upgrade/server.c 2012-12-04 11:31:53.614801411 -0500
@@ -197,7 +197,8 @@
snprintf(socket_string + strlen(socket_string),
sizeof(socket_string) - strlen(socket_string),
@@ -22,9 +22,9 @@ diff -Naur postgresql-9.2rc1.orig/contrib/pg_upgrade/server.c postgresql-9.2rc1/
"unix_socket_directory" : "unix_socket_directories",
cluster->sockdir);
#endif
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/client-auth.sgml postgresql-9.2rc1/doc/src/sgml/client-auth.sgml
---- postgresql-9.2rc1.orig/doc/src/sgml/client-auth.sgml 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/client-auth.sgml 2012-09-06 12:06:22.426763044 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml postgresql-9.2.2/doc/src/sgml/client-auth.sgml
+--- postgresql-9.2.2.orig/doc/src/sgml/client-auth.sgml 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/client-auth.sgml 2012-12-04 11:31:53.656801817 -0500
@@ -838,7 +838,7 @@
<varname>unix_socket_permissions</varname> (and possibly
<varname>unix_socket_group</varname>) configuration parameters as
@@ -34,9 +34,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/client-auth.sgml postgresql-9.2rc
configuration parameter to place the socket file in a suitably
restricted directory.
</para>
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/config.sgml postgresql-9.2rc1/doc/src/sgml/config.sgml
---- postgresql-9.2rc1.orig/doc/src/sgml/config.sgml 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/config.sgml 2012-09-06 12:06:22.428763063 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/config.sgml postgresql-9.2.2/doc/src/sgml/config.sgml
+--- postgresql-9.2.2.orig/doc/src/sgml/config.sgml 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/config.sgml 2012-12-04 11:31:53.706802299 -0500
@@ -453,17 +453,24 @@
</listitem>
</varlistentry>
@@ -100,7 +100,7 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/config.sgml postgresql-9.2rc1/doc
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-@@ -6606,7 +6613,7 @@
+@@ -6621,7 +6628,7 @@
</row>
<row>
<entry><option>-k <replaceable>x</replaceable></option></entry>
@@ -109,9 +109,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/config.sgml postgresql-9.2rc1/doc
</row>
<row>
<entry><option>-l</option></entry>
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2rc1/doc/src/sgml/html/app-postgres.html
---- postgresql-9.2rc1.orig/doc/src/sgml/html/app-postgres.html 2012-09-05 13:24:03.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/html/app-postgres.html 2012-09-06 12:06:22.429763072 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2.2/doc/src/sgml/html/app-postgres.html
+--- postgresql-9.2.2.orig/doc/src/sgml/html/app-postgres.html 2012-12-03 15:31:55.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html/app-postgres.html 2012-12-04 11:31:53.707802308 -0500
@@ -574,11 +574,19 @@
CLASS="COMMAND"
>postgres</TT
@@ -134,9 +134,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/app-postgres.html postgresql
</P
></DD
><DT
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2rc1/doc/src/sgml/html/auth-methods.html
---- postgresql-9.2rc1.orig/doc/src/sgml/html/auth-methods.html 2012-09-05 13:23:46.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/html/auth-methods.html 2012-09-06 12:06:22.430763081 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2.2/doc/src/sgml/html/auth-methods.html
+--- postgresql-9.2.2.orig/doc/src/sgml/html/auth-methods.html 2012-12-03 15:31:37.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html/auth-methods.html 2012-12-04 11:31:53.708802316 -0500
@@ -161,7 +161,7 @@
>. Or you
could set the <TT
@@ -146,9 +146,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/auth-methods.html postgresql
>
configuration parameter to place the socket file in a suitably
restricted directory.
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/bookindex.html postgresql-9.2rc1/doc/src/sgml/html/bookindex.html
---- postgresql-9.2rc1.orig/doc/src/sgml/html/bookindex.html 2012-09-05 13:24:38.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/html/bookindex.html 2012-09-06 12:06:22.433763111 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html postgresql-9.2.2/doc/src/sgml/html/bookindex.html
+--- postgresql-9.2.2.orig/doc/src/sgml/html/bookindex.html 2012-12-03 15:32:32.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html/bookindex.html 2012-12-04 11:31:53.711802349 -0500
@@ -17236,7 +17236,7 @@
></DL
></DD
@@ -158,9 +158,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/bookindex.html postgresql-9.
<A
HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
>Connection Settings</A
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2rc1/doc/src/sgml/html/preventing-server-spoofing.html
---- postgresql-9.2rc1.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-05 13:23:45.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-06 12:06:22.434763120 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2.2/doc/src/sgml/html/preventing-server-spoofing.html
+--- postgresql-9.2.2.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-03 15:31:36.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html/preventing-server-spoofing.html 2012-12-04 11:31:53.712802361 -0500
@@ -115,8 +115,8 @@
>local</TT
>
@@ -172,9 +172,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/preventing-server-spoofing.h
>) that has write permission only
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2rc1/doc/src/sgml/html/runtime-config-connection.html
---- postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-connection.html 2012-09-05 13:23:45.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/html/runtime-config-connection.html 2012-09-06 12:06:22.435763129 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2.2/doc/src/sgml/html/runtime-config-connection.html
+--- postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-connection.html 2012-12-03 15:31:36.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html/runtime-config-connection.html 2012-12-04 11:31:53.712802361 -0500
@@ -274,24 +274,31 @@
></DD
><DT
@@ -249,9 +249,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-connection.ht
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2rc1/doc/src/sgml/html/runtime-config-short.html
---- postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-short.html 2012-09-05 13:23:46.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/html/runtime-config-short.html 2012-09-06 12:06:22.435763129 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2.2/doc/src/sgml/html/runtime-config-short.html
+--- postgresql-9.2.2.orig/doc/src/sgml/html/runtime-config-short.html 2012-12-03 15:31:37.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html/runtime-config-short.html 2012-12-04 11:31:53.713802371 -0500
@@ -330,7 +330,7 @@
><TD
><TT
@@ -261,9 +261,19 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-short.html po
CLASS="REPLACEABLE"
><I
>x</I
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2rc1/doc/src/sgml/man1/postgres.1
---- postgresql-9.2rc1.orig/doc/src/sgml/man1/postgres.1 2012-09-05 13:25:37.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/man1/postgres.1 2012-09-06 12:06:22.436763138 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/html-stamp postgresql-9.2.2/doc/src/sgml/html-stamp
+--- postgresql-9.2.2.orig/doc/src/sgml/html-stamp 2012-12-03 15:32:32.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/html-stamp 2012-12-04 11:31:53.728802524 -0500
+@@ -0,0 +1 @@
++hack
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man-stamp postgresql-9.2.2/doc/src/sgml/man-stamp
+--- postgresql-9.2.2.orig/doc/src/sgml/man-stamp 2012-12-03 15:33:38.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/man-stamp 2012-12-04 11:31:53.728802524 -0500
+@@ -0,0 +1 @@
++hack
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2.2/doc/src/sgml/man1/postgres.1
+--- postgresql-9.2.2.orig/doc/src/sgml/man1/postgres.1 2012-12-03 15:33:32.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/man1/postgres.1 2012-12-04 11:31:53.714802380 -0500
@@ -195,8 +195,10 @@
.RS 4
Specifies the directory of the Unix\-domain socket on which
@@ -277,9 +287,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2rc1
.RE
.PP
\fB\-l\fR
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2rc1/doc/src/sgml/ref/postgres-ref.sgml
---- postgresql-9.2rc1.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/ref/postgres-ref.sgml 2012-09-06 12:06:22.437763147 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2.2/doc/src/sgml/ref/postgres-ref.sgml
+--- postgresql-9.2.2.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/ref/postgres-ref.sgml 2012-12-04 11:31:53.714802380 -0500
@@ -254,8 +254,14 @@
<para>
Specifies the directory of the Unix-domain socket on which
@@ -297,9 +307,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-
</para>
</listitem>
</varlistentry>
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/runtime.sgml postgresql-9.2rc1/doc/src/sgml/runtime.sgml
---- postgresql-9.2rc1.orig/doc/src/sgml/runtime.sgml 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/runtime.sgml 2012-09-06 12:06:22.438763157 -0400
+diff -Naur postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml postgresql-9.2.2/doc/src/sgml/runtime.sgml
+--- postgresql-9.2.2.orig/doc/src/sgml/runtime.sgml 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/doc/src/sgml/runtime.sgml 2012-12-04 11:31:53.715802388 -0500
@@ -1798,7 +1798,7 @@
<para>
The simplest way to prevent spoofing for <literal>local</>
@@ -309,9 +319,9 @@ diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/runtime.sgml postgresql-9.2rc1/do
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
some applications might still reference <filename>/tmp</> for the
-diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/src/backend/libpq/pqcomm.c
---- postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/libpq/pqcomm.c 2012-09-06 12:06:22.439763167 -0400
+diff -Naur postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c postgresql-9.2.2/src/backend/libpq/pqcomm.c
+--- postgresql-9.2.2.orig/src/backend/libpq/pqcomm.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/backend/libpq/pqcomm.c 2012-12-04 11:34:27.785273808 -0500
@@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client
@@ -403,7 +413,7 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
#if !defined(WIN32) || defined(IPV6_V6ONLY)
int one = 1;
#endif
-@@ -286,10 +303,14 @@
+@@ -286,10 +303,22 @@
#ifdef HAVE_UNIX_SOCKETS
if (family == AF_UNIX)
{
@@ -414,6 +424,14 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
+ * that file path
+ */
+ UNIXSOCK_PATH(unixSocketPath, portNumber, unixSocketDir);
++ if (strlen(unixSocketPath) >= UNIXSOCK_PATH_BUFLEN)
++ {
++ ereport(LOG,
++ (errmsg("Unix-domain socket path \"%s\" is too long (maximum %d bytes)",
++ unixSocketPath,
++ (int) (UNIXSOCK_PATH_BUFLEN - 1))));
++ return STATUS_ERROR;
++ }
+ if (Lock_AF_UNIX(unixSocketDir, unixSocketPath) != STATUS_OK)
return STATUS_ERROR;
- service = sock_path;
@@ -421,7 +439,7 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
}
else
#endif /* HAVE_UNIX_SOCKETS */
-@@ -432,7 +453,7 @@
+@@ -432,7 +461,7 @@
(IS_AF_UNIX(addr->ai_family)) ?
errhint("Is another postmaster already running on port %d?"
" If not, remove socket file \"%s\" and retry.",
@@ -430,7 +448,7 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
errhint("Is another postmaster already running on port %d?"
" If not, wait a few seconds and retry.",
(int) portNumber)));
-@@ -443,7 +464,7 @@
+@@ -443,7 +472,7 @@
#ifdef HAVE_UNIX_SOCKETS
if (addr->ai_family == AF_UNIX)
{
@@ -439,7 +457,7 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
{
closesocket(fd);
break;
-@@ -490,10 +511,8 @@
+@@ -490,18 +519,8 @@
* Lock_AF_UNIX -- configure unix socket file path
*/
static int
@@ -447,11 +465,19 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
+Lock_AF_UNIX(char *unixSocketDir, char *unixSocketPath)
{
- UNIXSOCK_PATH(sock_path, portNumber, unixSocketName);
+- if (strlen(sock_path) >= UNIXSOCK_PATH_BUFLEN)
+- {
+- ereport(LOG,
+- (errmsg("Unix-domain socket path \"%s\" is too long (maximum %d bytes)",
+- sock_path,
+- (int) (UNIXSOCK_PATH_BUFLEN - 1))));
+- return STATUS_ERROR;
+- }
-
/*
* Grab an interlock file associated with the socket file.
*
-@@ -502,13 +521,23 @@
+@@ -510,13 +529,23 @@
* more portable, and second, it lets us remove any pre-existing socket
* file without race conditions.
*/
@@ -477,7 +503,7 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
return STATUS_OK;
}
-@@ -518,11 +547,8 @@
+@@ -526,11 +555,8 @@
* Setup_AF_UNIX -- configure unix socket permissions
*/
static int
@@ -490,7 +516,7 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
/*
* Fix socket ownership/permission if requested. Note we must do this
* before we listen() to avoid a window where unwanted connections could
-@@ -704,20 +730,24 @@
+@@ -712,20 +738,24 @@
}
/*
@@ -521,9 +547,9 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/s
/*
* utime() is POSIX standard, utimes() is a common alternative. If we
* have neither, there's no way to affect the mod or access time of
-diff -Naur postgresql-9.2rc1.orig/src/backend/postmaster/postmaster.c postgresql-9.2rc1/src/backend/postmaster/postmaster.c
---- postgresql-9.2rc1.orig/src/backend/postmaster/postmaster.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/postmaster/postmaster.c 2012-09-06 12:06:22.441763187 -0400
+diff -Naur postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c postgresql-9.2.2/src/backend/postmaster/postmaster.c
+--- postgresql-9.2.2.orig/src/backend/postmaster/postmaster.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/backend/postmaster/postmaster.c 2012-12-04 11:31:53.718802420 -0500
@@ -156,7 +156,9 @@
/* The socket number we are listening for connections on */
@@ -658,10 +684,10 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/postmaster/postmaster.c postgresql
last_touch_time = now;
}
}
-diff -Naur postgresql-9.2rc1.orig/src/backend/tcop/postgres.c postgresql-9.2rc1/src/backend/tcop/postgres.c
---- postgresql-9.2rc1.orig/src/backend/tcop/postgres.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/tcop/postgres.c 2012-09-06 12:06:22.442763197 -0400
-@@ -3343,7 +3343,7 @@
+diff -Naur postgresql-9.2.2.orig/src/backend/tcop/postgres.c postgresql-9.2.2/src/backend/tcop/postgres.c
+--- postgresql-9.2.2.orig/src/backend/tcop/postgres.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/backend/tcop/postgres.c 2012-12-04 11:31:53.719802432 -0500
+@@ -3333,7 +3333,7 @@
break;
case 'k':
@@ -670,9 +696,9 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/tcop/postgres.c postgresql-9.2rc1/
break;
case 'l':
-diff -Naur postgresql-9.2rc1.orig/src/backend/utils/adt/varlena.c postgresql-9.2rc1/src/backend/utils/adt/varlena.c
---- postgresql-9.2rc1.orig/src/backend/utils/adt/varlena.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/utils/adt/varlena.c 2012-09-06 12:06:39.209922137 -0400
+diff -Naur postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c postgresql-9.2.2/src/backend/utils/adt/varlena.c
+--- postgresql-9.2.2.orig/src/backend/utils/adt/varlena.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/backend/utils/adt/varlena.c 2012-12-04 11:31:53.720802443 -0500
@@ -2446,6 +2446,119 @@
}
@@ -793,9 +819,9 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/utils/adt/varlena.c postgresql-9.2
/*****************************************************************************
* Comparison Functions used for bytea
*
-diff -Naur postgresql-9.2rc1.orig/src/backend/utils/init/miscinit.c postgresql-9.2rc1/src/backend/utils/init/miscinit.c
---- postgresql-9.2rc1.orig/src/backend/utils/init/miscinit.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/utils/init/miscinit.c 2012-09-06 12:06:22.445763224 -0400
+diff -Naur postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c postgresql-9.2.2/src/backend/utils/init/miscinit.c
+--- postgresql-9.2.2.orig/src/backend/utils/init/miscinit.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/backend/utils/init/miscinit.c 2012-12-04 11:31:53.721802453 -0500
@@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing;
@@ -1040,9 +1066,9 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/utils/init/miscinit.c postgresql-9
{
/* if write didn't set errno, assume problem is no disk space */
if (errno == 0)
-diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/guc.c postgresql-9.2rc1/src/backend/utils/misc/guc.c
---- postgresql-9.2rc1.orig/src/backend/utils/misc/guc.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/utils/misc/guc.c 2012-09-06 12:06:22.447763243 -0400
+diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/guc.c postgresql-9.2.2/src/backend/utils/misc/guc.c
+--- postgresql-9.2.2.orig/src/backend/utils/misc/guc.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/backend/utils/misc/guc.c 2012-12-04 11:31:53.723802472 -0500
@@ -2894,14 +2894,18 @@
},
@@ -1066,9 +1092,9 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/guc.c postgresql-9.2rc1
},
{
-diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample 2012-09-06 12:06:22.447763243 -0400
+diff -Naur postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2.2/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.2.2.orig/src/backend/utils/misc/postgresql.conf.sample 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/backend/utils/misc/postgresql.conf.sample 2012-12-04 11:31:53.723802472 -0500
@@ -65,7 +65,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction).
@@ -1079,10 +1105,10 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample
#unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation
# (change requires restart)
-diff -Naur postgresql-9.2rc1.orig/src/bin/initdb/initdb.c postgresql-9.2rc1/src/bin/initdb/initdb.c
---- postgresql-9.2rc1.orig/src/bin/initdb/initdb.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/bin/initdb/initdb.c 2012-09-06 12:06:22.448763252 -0400
-@@ -979,7 +979,7 @@
+diff -Naur postgresql-9.2.2.orig/src/bin/initdb/initdb.c postgresql-9.2.2/src/bin/initdb/initdb.c
+--- postgresql-9.2.2.orig/src/bin/initdb/initdb.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/bin/initdb/initdb.c 2012-12-04 11:31:53.725802491 -0500
+@@ -983,7 +983,7 @@
setup_config(void)
{
char **conflines;
@@ -1091,7 +1117,7 @@ diff -Naur postgresql-9.2rc1.orig/src/bin/initdb/initdb.c postgresql-9.2rc1/src/
char path[MAXPGPATH];
const char *default_timezone;
-@@ -1001,6 +1001,15 @@
+@@ -1005,6 +1005,15 @@
n_buffers * (BLCKSZ / 1024));
conflines = replace_token(conflines, "#shared_buffers = 32MB", repltok);
@@ -1107,10 +1133,10 @@ diff -Naur postgresql-9.2rc1.orig/src/bin/initdb/initdb.c postgresql-9.2rc1/src/
#if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
conflines = replace_token(conflines, "#port = 5432", repltok);
-diff -Naur postgresql-9.2rc1.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2rc1/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.2rc1.orig/src/bin/pg_ctl/pg_ctl.c 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/bin/pg_ctl/pg_ctl.c 2012-09-06 12:06:22.449763262 -0400
-@@ -521,7 +521,7 @@
+diff -Naur postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2.2/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.2.2.orig/src/bin/pg_ctl/pg_ctl.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/bin/pg_ctl/pg_ctl.c 2012-12-04 11:31:53.725802491 -0500
+@@ -559,7 +559,7 @@
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
/*
@@ -1119,9 +1145,9 @@ diff -Naur postgresql-9.2rc1.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2rc1/src/
* directories, libpq's host parameter must have a
* leading slash to indicate a socket directory. So,
* ignore sockdir if it's relative, and try to use TCP
-diff -Naur postgresql-9.2rc1.orig/src/include/libpq/libpq.h postgresql-9.2rc1/src/include/libpq/libpq.h
---- postgresql-9.2rc1.orig/src/include/libpq/libpq.h 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/include/libpq/libpq.h 2012-09-06 12:06:22.450763271 -0400
+diff -Naur postgresql-9.2.2.orig/src/include/libpq/libpq.h postgresql-9.2.2/src/include/libpq/libpq.h
+--- postgresql-9.2.2.orig/src/include/libpq/libpq.h 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/include/libpq/libpq.h 2012-12-04 11:31:53.726802502 -0500
@@ -44,12 +44,12 @@
/*
* prototypes for functions in pqcomm.c
@@ -1139,9 +1165,9 @@ diff -Naur postgresql-9.2rc1.orig/src/include/libpq/libpq.h postgresql-9.2rc1/sr
extern void pq_init(void);
extern void pq_comm_reset(void);
extern int pq_getbytes(char *s, size_t len);
-diff -Naur postgresql-9.2rc1.orig/src/include/miscadmin.h postgresql-9.2rc1/src/include/miscadmin.h
---- postgresql-9.2rc1.orig/src/include/miscadmin.h 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/include/miscadmin.h 2012-09-06 12:06:22.450763271 -0400
+diff -Naur postgresql-9.2.2.orig/src/include/miscadmin.h postgresql-9.2.2/src/include/miscadmin.h
+--- postgresql-9.2.2.orig/src/include/miscadmin.h 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/include/miscadmin.h 2012-12-04 11:31:53.726802502 -0500
@@ -411,7 +411,7 @@
* 2 data directory path
* 3 postmaster start timestamp (time_t representation)
@@ -1163,9 +1189,9 @@ diff -Naur postgresql-9.2rc1.orig/src/include/miscadmin.h postgresql-9.2rc1/src/
extern void AddToDataDirLockFile(int target_line, const char *str);
extern void ValidatePgVersion(const char *path);
extern void process_shared_preload_libraries(void);
-diff -Naur postgresql-9.2rc1.orig/src/include/postmaster/postmaster.h postgresql-9.2rc1/src/include/postmaster/postmaster.h
---- postgresql-9.2rc1.orig/src/include/postmaster/postmaster.h 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/include/postmaster/postmaster.h 2012-09-06 12:06:22.451763281 -0400
+diff -Naur postgresql-9.2.2.orig/src/include/postmaster/postmaster.h postgresql-9.2.2/src/include/postmaster/postmaster.h
+--- postgresql-9.2.2.orig/src/include/postmaster/postmaster.h 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/include/postmaster/postmaster.h 2012-12-04 11:31:53.727802513 -0500
@@ -19,7 +19,7 @@
extern int PostPortNumber;
extern int Unix_socket_permissions;
@@ -1175,9 +1201,9 @@ diff -Naur postgresql-9.2rc1.orig/src/include/postmaster/postmaster.h postgresql
extern char *ListenAddresses;
extern bool ClientAuthInProgress;
extern int PreAuthDelay;
-diff -Naur postgresql-9.2rc1.orig/src/include/utils/builtins.h postgresql-9.2rc1/src/include/utils/builtins.h
---- postgresql-9.2rc1.orig/src/include/utils/builtins.h 2012-09-05 01:08:30.000000000 -0400
-+++ postgresql-9.2rc1/src/include/utils/builtins.h 2012-09-06 12:06:22.451763281 -0400
+diff -Naur postgresql-9.2.2.orig/src/include/utils/builtins.h postgresql-9.2.2/src/include/utils/builtins.h
+--- postgresql-9.2.2.orig/src/include/utils/builtins.h 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/include/utils/builtins.h 2012-12-04 11:31:53.727802513 -0500
@@ -754,6 +754,8 @@
extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator,
@@ -1187,13 +1213,3 @@ diff -Naur postgresql-9.2rc1.orig/src/include/utils/builtins.h postgresql-9.2rc1
extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob);
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html-stamp postgresql-9.2rc1/doc/src/sgml/html-stamp
---- postgresql-9.2rc1.orig/doc/src/sgml/html-stamp 2012-09-05 13:24:38.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/html-stamp 2012-09-06 12:06:22.452763290 -0400
-@@ -0,0 +1 @@
-+hack
-diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/man-stamp postgresql-9.2rc1/doc/src/sgml/man-stamp
---- postgresql-9.2rc1.orig/doc/src/sgml/man-stamp 2012-09-05 13:25:43.000000000 -0400
-+++ postgresql-9.2rc1/doc/src/sgml/man-stamp 2012-09-06 12:06:22.452763290 -0400
-@@ -0,0 +1 @@
-+hack
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 3174f2e..305dc02 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -16,10 +16,10 @@ This patch must be applied after postgresql-multi-sockets.patch, at
least until 9.3 when that will be part of the upstream package.
-diff -Naur postgresql-9.2.0.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.0/contrib/pg_upgrade/test.sh
---- postgresql-9.2.0.sockets/contrib/pg_upgrade/test.sh 2012-09-06 17:26:17.000000000 -0400
-+++ postgresql-9.2.0/contrib/pg_upgrade/test.sh 2012-09-06 18:13:18.178092176 -0400
-@@ -62,10 +62,14 @@
+diff -Naur postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.2/contrib/pg_upgrade/test.sh
+--- postgresql-9.2.2.sockets/contrib/pg_upgrade/test.sh 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/contrib/pg_upgrade/test.sh 2012-12-04 14:34:04.661476094 -0500
+@@ -71,10 +71,14 @@
rm -rf "$logdir"
mkdir "$logdir"
@@ -35,18 +35,18 @@ diff -Naur postgresql-9.2.0.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.0/
if "$MAKE" -C "$oldsrc" installcheck; then
pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
if [ "$newsrc" != "$oldsrc" ]; then
-@@ -108,7 +112,7 @@
+@@ -117,7 +121,7 @@
pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
-pg_ctl start -l "$logdir/postmaster2.log" -w
+pg_ctl start -l "$logdir/postmaster2.log" -o "-c unix_socket_directories='$PGHOST'" -w
- if [ $testhost = Msys ] ; then
- cmd /c analyze_new_cluster.bat
-diff -Naur postgresql-9.2.0.sockets/src/backend/utils/misc/guc.c postgresql-9.2.0/src/backend/utils/misc/guc.c
---- postgresql-9.2.0.sockets/src/backend/utils/misc/guc.c 2012-09-06 18:12:36.458693394 -0400
-+++ postgresql-9.2.0/src/backend/utils/misc/guc.c 2012-09-06 18:13:18.181092327 -0400
+ case $testhost in
+ MINGW*) cmd /c analyze_new_cluster.bat ;;
+diff -Naur postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c postgresql-9.2.2/src/backend/utils/misc/guc.c
+--- postgresql-9.2.2.sockets/src/backend/utils/misc/guc.c 2012-12-04 14:25:57.578967623 -0500
++++ postgresql-9.2.2/src/backend/utils/misc/guc.c 2012-12-04 14:34:04.663476214 -0500
@@ -2901,7 +2901,7 @@
},
&Unix_socket_directories,
@@ -56,10 +56,10 @@ diff -Naur postgresql-9.2.0.sockets/src/backend/utils/misc/guc.c postgresql-9.2.
#else
"",
#endif
-diff -Naur postgresql-9.2.0.sockets/src/bin/initdb/initdb.c postgresql-9.2.0/src/bin/initdb/initdb.c
---- postgresql-9.2.0.sockets/src/bin/initdb/initdb.c 2012-09-06 18:12:36.460693488 -0400
-+++ postgresql-9.2.0/src/bin/initdb/initdb.c 2012-09-06 18:13:18.183092471 -0400
-@@ -1003,7 +1003,7 @@
+diff -Naur postgresql-9.2.2.sockets/src/bin/initdb/initdb.c postgresql-9.2.2/src/bin/initdb/initdb.c
+--- postgresql-9.2.2.sockets/src/bin/initdb/initdb.c 2012-12-04 14:25:57.579967636 -0500
++++ postgresql-9.2.2/src/bin/initdb/initdb.c 2012-12-04 14:34:04.665476326 -0500
+@@ -1007,7 +1007,7 @@
#ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -68,9 +68,9 @@ diff -Naur postgresql-9.2.0.sockets/src/bin/initdb/initdb.c postgresql-9.2.0/src
#else
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif
-diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
---- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400
-+++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400
+diff -Naur postgresql-9.2.2.sockets/src/include/pg_config_manual.h postgresql-9.2.2/src/include/pg_config_manual.h
+--- postgresql-9.2.2.sockets/src/include/pg_config_manual.h 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/include/pg_config_manual.h 2012-12-04 14:34:04.665476326 -0500
@@ -144,7 +144,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
@@ -80,9 +80,9 @@ diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.
/*
* The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.2.0.sockets/src/test/regress/pg_regress.c postgresql-9.2.0/src/test/regress/pg_regress.c
---- postgresql-9.2.0.sockets/src/test/regress/pg_regress.c 2012-09-06 17:26:17.000000000 -0400
-+++ postgresql-9.2.0/src/test/regress/pg_regress.c 2012-09-06 18:13:18.184092537 -0400
+diff -Naur postgresql-9.2.2.sockets/src/test/regress/pg_regress.c postgresql-9.2.2/src/test/regress/pg_regress.c
+--- postgresql-9.2.2.sockets/src/test/regress/pg_regress.c 2012-12-03 15:16:10.000000000 -0500
++++ postgresql-9.2.2/src/test/regress/pg_regress.c 2012-12-04 14:34:04.666476378 -0500
@@ -772,7 +772,7 @@
if (hostname != NULL)
doputenv("PGHOST", hostname);
@@ -92,7 +92,7 @@ diff -Naur postgresql-9.2.0.sockets/src/test/regress/pg_regress.c postgresql-9.2
unsetenv("PGHOSTADDR");
if (port != -1)
{
-@@ -2233,7 +2233,7 @@
+@@ -2246,7 +2246,7 @@
*/
header(_("starting postmaster"));
snprintf(buf, sizeof(buf),
diff --git a/postgresql.spec b/postgresql.spec
index 09a9927..a876405 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
-Version: 9.2.1
+Version: 9.2.2
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -67,8 +67,9 @@ Url: http://www.postgresql.org/
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
-# that this be kept up with the latest minor release of the previous series.
-%global prevversion 9.1.6
+# that this be kept up with the latest minor release of the previous series;
+# but update when bugs affecting pg_dump output are fixed.
+%global prevversion 9.1.7
%global prevmajorversion 9.1
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -770,7 +771,14 @@ cat psql-%{majorversion}.lang >>main.lst
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
%post server
+%if 0%{?systemd_post:1}
%systemd_post postgresql.service
+%else
+if [ $1 -eq 1 ]; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%endif
# Run this when upgrading from SysV initscript to native systemd unit
%triggerun server -- postgresql-server < %{first_systemd_version}
@@ -784,10 +792,26 @@ cat psql-%{majorversion}.lang >>main.lst
/bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
%preun server
+%if 0%{?systemd_preun:1}
%systemd_preun postgresql.service
+%else
+if [ $1 -eq 0 ]; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable postgresql.service >/dev/null 2>&1 || :
+ /bin/systemctl stop postgresql.service >/dev/null 2>&1 || :
+fi
+%endif
%postun server
+%if 0%{?systemd_postun_with_restart:1}
%systemd_postun_with_restart postgresql.service
+%else
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ]; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
+fi
+%endif
# FILES section.
@@ -1057,6 +1081,12 @@ cat psql-%{majorversion}.lang >>main.lst
%endif
%changelog
+* Thu Dec 6 2012 Tom Lane <tgl(a)redhat.com> 9.2.2-1
+- Update to PostgreSQL 9.2.2, for various fixes described at
+ http://www.postgresql.org/docs/9.2/static/release-9-2-2.html
+- Use new systemd install/uninstall trigger macros conditionally,
+ so that package can still be installed on pre-F18 branches
+
* Mon Sep 24 2012 Tom Lane <tgl(a)redhat.com> 9.2.1-1
- Update to PostgreSQL 9.2.1, for various fixes described at
http://www.postgresql.org/docs/9.2/static/release-9-2-1.html
diff --git a/sources b/sources
index 234aa3d..9008490 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c0b4799ea9850eae3ead14f0a60e9418 postgresql-9.2.1.tar.bz2
-4b9572104e8ffa86de9dda1981c92791 postgresql-9.2.1-US.pdf
-000755f66c0de58bbd4cd2b89b45b8e2 postgresql-9.1.6.tar.bz2
+1cc388988e69bf75c6b55d59070100f6 postgresql-9.2.2.tar.bz2
+f34d72628321de53e536e689a31bd45c postgresql-9.2.2-US.pdf
+eaf7b67493d59d1a60767ffdfbd65ce9 postgresql-9.1.7.tar.bz2
commit 36551c37db93abed1d948499931712ef665fa966
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Sep 24 11:33:10 2012 -0400
Update to PostgreSQL 9.2.1
diff --git a/.gitignore b/.gitignore
index 96df37d..da03fda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.2.0.tar.bz2
-/postgresql-9.2.0-US.pdf
-/postgresql-9.1.5.tar.bz2
+/postgresql-9.2.1.tar.bz2
+/postgresql-9.2.1-US.pdf
+/postgresql-9.1.6.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 62ce352..09a9927 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.2
-Version: 9.2.0
+Version: 9.2.1
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -68,7 +68,7 @@ Url: http://www.postgresql.org/
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series.
-%global prevversion 9.1.5
+%global prevversion 9.1.6
%global prevmajorversion 9.1
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -97,7 +97,6 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-multi-sockets.patch
Patch6: postgresql-var-run-socket.patch
-Patch7: postgresql-python3.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -325,7 +324,6 @@ benchmarks.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -772,10 +770,7 @@ cat psql-%{majorversion}.lang >>main.lst
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
%post server
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post postgresql.service
# Run this when upgrading from SysV initscript to native systemd unit
%triggerun server -- postgresql-server < %{first_systemd_version}
@@ -789,18 +784,10 @@ fi
/bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
%preun server
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable postgresql.service >/dev/null 2>&1 || :
- /bin/systemctl stop postgresql.service >/dev/null 2>&1 || :
-fi
+%systemd_preun postgresql.service
%postun server
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart postgresql.service
# FILES section.
@@ -1070,6 +1057,13 @@ fi
%endif
%changelog
+* Mon Sep 24 2012 Tom Lane <tgl(a)redhat.com> 9.2.1-1
+- Update to PostgreSQL 9.2.1, for various fixes described at
+ http://www.postgresql.org/docs/9.2/static/release-9-2-1.html
+ including a nasty data-loss bug
+- Adopt new systemd macros for server package install/uninstall triggers
+Resolves: #850277
+
* Mon Sep 10 2012 Tom Lane <tgl(a)redhat.com> 9.2.0-1
- Update to PostgreSQL 9.2.0 (major version bump);
in-place upgrade support now works from 9.1.x as the previous version
diff --git a/sources b/sources
index edb3857..234aa3d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-8c4c32a4abe8cf61b02c8366181ede50 postgresql-9.2.0.tar.bz2
-38951718e05922310a0397e2dcbf9330 postgresql-9.2.0-US.pdf
-c784decb60615aa94c6a31601bc6ffd2 postgresql-9.1.5.tar.bz2
+c0b4799ea9850eae3ead14f0a60e9418 postgresql-9.2.1.tar.bz2
+4b9572104e8ffa86de9dda1981c92791 postgresql-9.2.1-US.pdf
+000755f66c0de58bbd4cd2b89b45b8e2 postgresql-9.1.6.tar.bz2
commit 795d3d14315747049017d69c883be292f0caef2d
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Sep 10 11:15:54 2012 -0400
Update to PostgreSQL 9.2.0; add postgresql-plpython3
diff --git a/.gitignore b/.gitignore
index 663da36..96df37d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+/postgresql-9.2.0.tar.bz2
+/postgresql-9.2.0-US.pdf
/postgresql-9.1.5.tar.bz2
-/postgresql-9.1.5-US.pdf
-/postgresql-9.0.8.tar.bz2
diff --git a/README.rpm-dist b/README.rpm-dist
index 6d2d920..0ed6e55 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,6 +1,6 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 9.1, for the PostgreSQL 9.1 RPM set.
+Version 9.2, for the PostgreSQL 9.2 RPM set.
Devrim Gndz <devrim(a)gunduz.org>
-----------------------------------------------------------------------------
@@ -23,9 +23,9 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 9.1 of PostgreSQL,
+This document is written to be applicable to version 9.2 of PostgreSQL,
which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 9.1 are not documented here.
+point, versions prior to 9.2 are not documented here.
This document is intended for use only with the RPMs supplied in Red Hat
Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
@@ -63,14 +63,15 @@ upgrading.
The user 'postgres' is created during installation of the server subpackage.
This user by default is UID and GID 26. The user has the default shell set to
bash, and the home directory set to /var/lib/pgsql. This user also has no
-default password. If you want to be able to su to it from a non-root account
-or login as 'postgres' you will need to set a password using passwd.
+default password, so the only way to become this user is to su to it from root.
+If you want to be able to su to it from a non-root account or log in directly
+as 'postgres' you will need to set a password using passwd.
UPGRADING AN INSTALLATION
-----------------------------------------------------------------------------
-For a minor-version upgrade (such as 9.1.1 to 9.1.2), just install the
+For a minor-version upgrade (such as 9.2.1 to 9.2.2), just install the
new RPMs; there's usually nothing more to it than that. Upgrading
-across a major release of PostgreSQL (for example, from 9.0.x to 9.1.x)
+across a major release of PostgreSQL (for example, from 9.1.x to 9.2.x)
requires more effort.
If you are upgrading across more than one major release of PostgreSQL
@@ -82,7 +83,7 @@ and run the dump file through psql to restore your data.
In some major releases, the RPMs also support in-place upgrade from the
immediately previous major release. Currently, you can upgrade in-place
-from 9.0.x to 9.1.x. This is much faster than a dump and reload.
+from 9.1.x to 9.2.x. This is much faster than a dump and reload.
To do an in-place upgrade:
* shut down the old postmaster ("systemctl stop postgresql.service")
* optionally make a backup of /var/lib/pgsql/data/ (recommended!)
@@ -115,9 +116,10 @@ postgresql-devel: Development libraries and include files
postgresql-test: The regression tests and associated files
postgresql-upgrade: Support files for upgrading from previous major version
postgresql-docs: Extra documentation, such as the tutorial files
-postgresql-contrib: The contrib source tree, as well as selected binaries
+postgresql-contrib: Add-on loadable modules and programs
postgresql-plperl: PL/Perl procedural language
-postgresql-plpython: PL/Python procedural language
+postgresql-plpython: PL/Python procedural language (for Python 2)
+postgresql-plpython3: PL/Python procedural language (for Python 3)
postgresql-pltcl: PL/Tcl procedural language
You have to install postgresql and postgresql-libs to do anything.
@@ -145,7 +147,7 @@ However, the Red Hat / CentOS / Fedora RPM's install the files like
this:
Executables: /usr/bin
-Libraries: /usr/lib (or /usr/lib64)
+Libraries: /usr/lib (or /usr/lib64 on 64-bit machines)
Documentation: /usr/share/doc/postgresql-docs-x.y.z/html
Contrib documentation: /usr/share/doc/postgresql-contrib-x.y.z
Source: not installed
@@ -196,8 +198,8 @@ As an example, let us create a secondary postmaster called, creatively enough,
You will probably also want to do 'systemctl enable secondary.service'
so that the new postmaster is automatically started in future reboots.
-When doing a major-version upgrade of a secondary postmaster, mention the
-service name in the postgresql-setup command, for example 'postgresql-setup
+When doing a major-version upgrade of a secondary postmaster, add the
+service name to the postgresql-setup command, for example 'postgresql-setup
upgrade secondary'. This will let postgresql-setup find the correct data
directory from the service file.
@@ -223,8 +225,8 @@ your database machine is up to the task.
To run the regression tests under the RPM installation, make sure that the
postmaster has been started (if not, su to root and do "systemctl start
-postgresql.service"), cd to /usr/lib/pgsql/test/regress (or
-/usr/lib64/pgsql/test/regress on a 64-bit machine), su to postgres,
+postgresql.service"), su to postgres, cd to /usr/lib/pgsql/test/regress
+(or /usr/lib64/pgsql/test/regress on a 64-bit machine),
and execute "make check".
This command will start the regression tests and will both show the
results to the screen and store the results in the file regress.out.
@@ -235,8 +237,8 @@ find out whether the differences are actually significant. If you need help
interpreting the results, contact the pgsql-general list at
postgresql.org.
-After testing, say "make clean" to remove the files generated by the test
-script.
+After testing, run "make clean" to remove the files generated by the test
+script. Then you can remove the postgresql-test RPM, if you wish.
STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
-------------------------------------------------------------------------------
@@ -279,41 +281,52 @@ day of the week. You can adjust this by changing postgresql.conf settings.
REBUILDING FROM SOURCE RPM
-------------------------------------------------------------------------------
If your distribution is not supported by the binary RPMs from PostgreSQL.org,
-you will need to rebuild from the source RPM. Download the .src.rpm for this
-release. You will need to be root to rebuild, unless you have set up
-a non-root build environment (which is the recommended method anyway).
+you will need to rebuild from the source RPM.
-Install the source RPM with rpm -i, then cd to the rpm building area
-(which is /usr/src/redhat by default). You will have to have a full
-development environment to rebuild the full RPM set.
+If you have not previously rebuilt any RPMs, set up the required environment:
+make a work directory, say ~/rpmwork, then cd into it and do
+ mkdir BUILD BUILDROOT RPMS SOURCES SPECS SRPMS
+Then make a file ~/.rpmmacros containing
+ %_topdir <full path to work directory here>
+
+Download the postgresql .src.rpm for the release you want and place it in
+the SRPMS subdirectory, then cd there and execute
+ rpmbuild --rebuild postgresql-nnn.src.rpm
+The results will appear under the RPMS subdirectory.
+
+You will have to have a full development environment to rebuild the RPM set.
+If rpmbuild complains of lack of certain packages, install them and try
+again. In some cases, you can disable features to avoid needing some
+development packages, as detailed next.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
beta 0 #build with cassert and do not strip the binaries
-python 1 #build the postgresql-python package.
-tcl 1 #build the postgresql-tcl package.
-test 1 #build the postgresql-test package.
-plpython 1 #build the PL/Python procedural language package.
-pltcl 1 #build the PL/Tcl procedural language package.
-plperl 1 #build the PL/Perl procedural language package.
-ssl 1 #use OpenSSL support.
-kerberos 1 #use Kerberos 5 support.
-nls 1 #build with national language support.
-ldap 1 #build with LDAP support.
-pam 1 #build with PAM support.
-runselftest 1 #do "make check" during the build.
-sdt 1 #build with SystemTap support.
+runselftest 1 #do "make check" during the build
+test 1 #build the postgresql-test package
+upgrade 1 #build the postgresql-upgrade package
+plpython 1 #build the PL/Python procedural language package
+plpython3 1 #build the PL/Python3 procedural language package
+pltcl 1 #build the PL/Tcl procedural language package
+plperl 1 #build the PL/Perl procedural language package
+ssl 1 #build with OpenSSL support
+kerberos 1 #build with Kerberos 5 support
+ldap 1 #build with LDAP support
+nls 1 #build with national language support
+pam 1 #build with PAM support
+sdt 1 #build with SystemTap support
xml 1 #build with XML support
pgfts 1 #build with --enable-thread-safety
+selinux 1 #build contrib/selinux
uuid 1 #build contrib/uuid-ossp
To use these defines, invoke a rebuild like this:
-rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
+rpmbuild --rebuild --define 'plpython 0' --define 'pltcl 0' \
--define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
- postgresql-9.1.2-1.src.rpm
-This line would disable the python, tcl, and test subpackages, disable the
-regression test run during build, and disable kerberos support.
+ postgresql-9.2.0-1.src.rpm
+This line would disable the plpython, pltcl, and test subpackages, disable
+the regression test run during build, and disable kerberos support.
You might need to disable runselftest if there is an installed version of
PostgreSQL that is a different major version from what you are trying to
diff --git a/postgresql-config-comment.patch b/postgresql-config-comment.patch
index f392802..9df0221 100644
--- a/postgresql-config-comment.patch
+++ b/postgresql-config-comment.patch
@@ -5,11 +5,11 @@ to doing it this way though, for example that the postmaster's port number
is visible in "ps" as part of its command line.)
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample 2012-08-17 11:37:03.400210802 -0400
+diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-23 18:06:49.000000000 -0400
++++ postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample 2012-09-01 21:57:55.498629897 -0400
@@ -61,6 +61,8 @@
- # defaults to 'localhost', '*' = all
+ # defaults to 'localhost'; use '*' for all
# (change requires restart)
#port = 5432 # (change requires restart)
+# Note: In RHEL/Fedora installations, you can't set the port number here;
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
index 0dcbe9b..7cb2789 100644
--- a/postgresql-multi-sockets.patch
+++ b/postgresql-multi-sockets.patch
@@ -9,10 +9,23 @@ files. We don't want that to happen because the BuildRequires for the
package don't include the necessary documentation tools.
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.5/doc/src/sgml/client-auth.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/client-auth.sgml 2012-09-06 11:53:55.188679276 -0400
-@@ -831,7 +831,7 @@
+diff -Naur postgresql-9.2rc1.orig/contrib/pg_upgrade/server.c postgresql-9.2rc1/contrib/pg_upgrade/server.c
+--- postgresql-9.2rc1.orig/contrib/pg_upgrade/server.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/contrib/pg_upgrade/server.c 2012-09-06 12:06:22.425763034 -0400
+@@ -197,7 +197,8 @@
+ snprintf(socket_string + strlen(socket_string),
+ sizeof(socket_string) - strlen(socket_string),
+ " -c %s='%s'",
+- (GET_MAJOR_VERSION(cluster->major_version) < 903) ?
++ /* assume 9.1 build will not have unix_socket_directories patch */
++ (GET_MAJOR_VERSION(cluster->major_version) < 902) ?
+ "unix_socket_directory" : "unix_socket_directories",
+ cluster->sockdir);
+ #endif
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/client-auth.sgml postgresql-9.2rc1/doc/src/sgml/client-auth.sgml
+--- postgresql-9.2rc1.orig/doc/src/sgml/client-auth.sgml 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/client-auth.sgml 2012-09-06 12:06:22.426763044 -0400
+@@ -838,7 +838,7 @@
<varname>unix_socket_permissions</varname> (and possibly
<varname>unix_socket_group</varname>) configuration parameters as
described in <xref linkend="runtime-config-connection">. Or you
@@ -21,10 +34,10 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.5/
configuration parameter to place the socket file in a suitably
restricted directory.
</para>
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/src/sgml/config.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/config.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/config.sgml 2012-09-06 11:53:55.200679690 -0400
-@@ -417,17 +417,24 @@
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/config.sgml postgresql-9.2rc1/doc/src/sgml/config.sgml
+--- postgresql-9.2rc1.orig/doc/src/sgml/config.sgml 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/config.sgml 2012-09-06 12:06:22.428763063 -0400
+@@ -453,17 +453,24 @@
</listitem>
</varlistentry>
@@ -56,7 +69,7 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/s
This parameter can only be set at server start.
</para>
-@@ -436,8 +443,8 @@
+@@ -472,8 +479,8 @@
<literal>.s.PGSQL.<replaceable>nnnn</></literal> where
<replaceable>nnnn</> is the server's port number, an ordinary file
named <literal>.s.PGSQL.<replaceable>nnnn</>.lock</literal> will be
@@ -67,7 +80,7 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/s
</para>
<para>
-@@ -454,8 +461,8 @@
+@@ -490,8 +497,8 @@
</indexterm>
<listitem>
<para>
@@ -78,7 +91,7 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/s
server.) In combination with the parameter
<varname>unix_socket_permissions</varname> this can be used as
an additional access control mechanism for Unix-domain connections.
-@@ -478,7 +485,7 @@
+@@ -514,7 +521,7 @@
</indexterm>
<listitem>
<para>
@@ -87,7 +100,7 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/s
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-@@ -6417,7 +6424,7 @@
+@@ -6606,7 +6613,7 @@
</row>
<row>
<entry><option>-k <replaceable>x</replaceable></option></entry>
@@ -96,10 +109,10 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/s
</row>
<row>
<entry><option>-l</option></entry>
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.5/doc/src/sgml/html/app-postgres.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html 2012-08-14 18:56:14.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/app-postgres.html 2012-09-06 11:53:55.201679728 -0400
-@@ -531,11 +531,19 @@
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/app-postgres.html postgresql-9.2rc1/doc/src/sgml/html/app-postgres.html
+--- postgresql-9.2rc1.orig/doc/src/sgml/html/app-postgres.html 2012-09-05 13:24:03.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/html/app-postgres.html 2012-09-06 12:06:22.429763072 -0400
+@@ -574,11 +574,19 @@
CLASS="COMMAND"
>postgres</TT
> is to listen for
@@ -121,9 +134,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html postgresql-
</P
></DD
><DT
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.5/doc/src/sgml/html/auth-methods.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html 2012-08-14 18:55:57.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/auth-methods.html 2012-09-06 11:53:55.201679728 -0400
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/auth-methods.html postgresql-9.2rc1/doc/src/sgml/html/auth-methods.html
+--- postgresql-9.2rc1.orig/doc/src/sgml/html/auth-methods.html 2012-09-05 13:23:46.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/html/auth-methods.html 2012-09-06 12:06:22.430763081 -0400
@@ -161,7 +161,7 @@
>. Or you
could set the <TT
@@ -133,10 +146,10 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html postgresql-
>
configuration parameter to place the socket file in a suitably
restricted directory.
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.5/doc/src/sgml/html/bookindex.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html 2012-08-14 18:56:48.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/bookindex.html 2012-09-06 11:53:55.204679820 -0400
-@@ -16893,7 +16893,7 @@
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/bookindex.html postgresql-9.2rc1/doc/src/sgml/html/bookindex.html
+--- postgresql-9.2rc1.orig/doc/src/sgml/html/bookindex.html 2012-09-05 13:24:38.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/html/bookindex.html 2012-09-06 12:06:22.433763111 -0400
+@@ -17236,7 +17236,7 @@
></DL
></DD
><DT
@@ -145,9 +158,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html postgresql-9.1
<A
HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
>Connection Settings</A
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-08-14 18:55:56.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-06 11:53:55.205679845 -0400
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.2rc1/doc/src/sgml/html/preventing-server-spoofing.html
+--- postgresql-9.2rc1.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-05 13:23:45.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-06 12:06:22.434763120 -0400
@@ -115,8 +115,8 @@
>local</TT
>
@@ -159,9 +172,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.ht
>) that has write permission only
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html 2012-08-14 18:55:56.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html 2012-09-06 11:53:55.205679845 -0400
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.2rc1/doc/src/sgml/html/runtime-config-connection.html
+--- postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-connection.html 2012-09-05 13:23:45.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/html/runtime-config-connection.html 2012-09-06 12:06:22.435763129 -0400
@@ -274,24 +274,31 @@
></DD
><DT
@@ -236,10 +249,10 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.htm
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html
---- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html 2012-08-14 18:55:57.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html 2012-09-06 11:53:55.206679864 -0400
-@@ -323,7 +323,7 @@
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.2rc1/doc/src/sgml/html/runtime-config-short.html
+--- postgresql-9.2rc1.orig/doc/src/sgml/html/runtime-config-short.html 2012-09-05 13:23:46.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/html/runtime-config-short.html 2012-09-06 12:06:22.435763129 -0400
+@@ -330,7 +330,7 @@
><TD
><TT
CLASS="LITERAL"
@@ -248,13 +261,13 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html pos
CLASS="REPLACEABLE"
><I
>x</I
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.5/doc/src/sgml/man1/postgres.1
---- postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 2012-08-14 18:57:43.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/man1/postgres.1 2012-09-06 11:53:55.206679864 -0400
-@@ -180,8 +180,10 @@
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/man1/postgres.1 postgresql-9.2rc1/doc/src/sgml/man1/postgres.1
+--- postgresql-9.2rc1.orig/doc/src/sgml/man1/postgres.1 2012-09-05 13:25:37.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/man1/postgres.1 2012-09-06 12:06:22.436763138 -0400
+@@ -195,8 +195,10 @@
.RS 4
Specifies the directory of the Unix\-domain socket on which
- postgres
+ \fBpostgres\fR
-is to listen for connections from client applications\&. The default is normally
-/tmp, but can be changed at build time\&.
+is to listen for connections from client applications\&. The value can also be a comma\-separated list of directories\&. An empty value specifies not listening on any Unix\-domain sockets, in which case only TCP/IP sockets can be used to connect to the server\&. The default value is normally
@@ -264,10 +277,10 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.5/d
.RE
.PP
\fB\-l\fR
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml 2012-09-06 11:53:55.207679890 -0400
-@@ -233,8 +233,14 @@
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.2rc1/doc/src/sgml/ref/postgres-ref.sgml
+--- postgresql-9.2rc1.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/ref/postgres-ref.sgml 2012-09-06 12:06:22.437763147 -0400
+@@ -254,8 +254,14 @@
<para>
Specifies the directory of the Unix-domain socket on which
<command>postgres</command> is to listen for
@@ -284,10 +297,10 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9
</para>
</listitem>
</varlistentry>
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml postgresql-9.1.5/doc/src/sgml/runtime.sgml
---- postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/runtime.sgml 2012-09-06 11:53:55.208679918 -0400
-@@ -1816,7 +1816,7 @@
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/runtime.sgml postgresql-9.2rc1/doc/src/sgml/runtime.sgml
+--- postgresql-9.2rc1.orig/doc/src/sgml/runtime.sgml 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/runtime.sgml 2012-09-06 12:06:22.438763157 -0400
+@@ -1798,7 +1798,7 @@
<para>
The simplest way to prevent spoofing for <literal>local</>
connections is to use a Unix domain socket directory (<xref
@@ -296,9 +309,9 @@ diff -Naur postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml postgresql-9.1.5/doc/
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
some applications might still reference <filename>/tmp</> for the
-diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src/backend/libpq/pqcomm.c
---- postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/libpq/pqcomm.c 2012-09-06 11:53:55.209679942 -0400
+diff -Naur postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c postgresql-9.2rc1/src/backend/libpq/pqcomm.c
+--- postgresql-9.2rc1.orig/src/backend/libpq/pqcomm.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/backend/libpq/pqcomm.c 2012-09-06 12:06:22.439763167 -0400
@@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client
@@ -508,10 +521,10 @@ diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src
/*
* utime() is POSIX standard, utimes() is a common alternative. If we
* have neither, there's no way to affect the mod or access time of
-diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-9.1.5/src/backend/postmaster/postmaster.c
---- postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/postmaster/postmaster.c 2012-09-06 11:53:55.210679959 -0400
-@@ -157,7 +157,9 @@
+diff -Naur postgresql-9.2rc1.orig/src/backend/postmaster/postmaster.c postgresql-9.2rc1/src/backend/postmaster/postmaster.c
+--- postgresql-9.2rc1.orig/src/backend/postmaster/postmaster.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/backend/postmaster/postmaster.c 2012-09-06 12:06:22.441763187 -0400
+@@ -156,7 +156,9 @@
/* The socket number we are listening for connections on */
int PostPortNumber;
@@ -522,7 +535,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
char *ListenAddresses;
/*
-@@ -590,7 +592,7 @@
+@@ -608,7 +610,7 @@
break;
case 'k':
@@ -531,7 +544,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
break;
case 'l':
-@@ -848,7 +850,7 @@
+@@ -852,7 +854,7 @@
/* Need a modifiable copy of ListenAddresses */
rawstring = pstrdup(ListenAddresses);
@@ -540,7 +553,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
if (!SplitIdentifierString(rawstring, ',', &elemlist))
{
/* syntax error in list */
-@@ -864,12 +866,12 @@
+@@ -868,12 +870,12 @@
if (strcmp(curhost, "*") == 0)
status = StreamServerPort(AF_UNSPEC, NULL,
(unsigned short) PostPortNumber,
@@ -555,7 +568,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
ListenSocket, MAXLISTEN);
if (status == STATUS_OK)
-@@ -888,7 +890,7 @@
+@@ -892,7 +894,7 @@
curhost)));
}
@@ -564,7 +577,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
ereport(FATAL,
(errmsg("could not create any TCP/IP sockets")));
-@@ -935,13 +937,54 @@
+@@ -939,13 +941,54 @@
#endif
#ifdef HAVE_UNIX_SOCKETS
@@ -626,7 +639,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
#endif
/*
-@@ -1529,15 +1572,15 @@
+@@ -1435,15 +1478,15 @@
}
/*
@@ -645,10 +658,10 @@ diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-
last_touch_time = now;
}
}
-diff -Naur postgresql-9.1.5.orig/src/backend/tcop/postgres.c postgresql-9.1.5/src/backend/tcop/postgres.c
---- postgresql-9.1.5.orig/src/backend/tcop/postgres.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/tcop/postgres.c 2012-09-06 11:53:55.211679977 -0400
-@@ -3345,7 +3345,7 @@
+diff -Naur postgresql-9.2rc1.orig/src/backend/tcop/postgres.c postgresql-9.2rc1/src/backend/tcop/postgres.c
+--- postgresql-9.2rc1.orig/src/backend/tcop/postgres.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/backend/tcop/postgres.c 2012-09-06 12:06:22.442763197 -0400
+@@ -3343,7 +3343,7 @@
break;
case 'k':
@@ -657,10 +670,10 @@ diff -Naur postgresql-9.1.5.orig/src/backend/tcop/postgres.c postgresql-9.1.5/sr
break;
case 'l':
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c postgresql-9.1.5/src/backend/utils/adt/varlena.c
---- postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/adt/varlena.c 2012-09-06 11:54:14.148859548 -0400
-@@ -2387,6 +2387,119 @@
+diff -Naur postgresql-9.2rc1.orig/src/backend/utils/adt/varlena.c postgresql-9.2rc1/src/backend/utils/adt/varlena.c
+--- postgresql-9.2rc1.orig/src/backend/utils/adt/varlena.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/backend/utils/adt/varlena.c 2012-09-06 12:06:39.209922137 -0400
+@@ -2446,6 +2446,119 @@
}
@@ -780,9 +793,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
/*****************************************************************************
* Comparison Functions used for bytea
*
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.1.5/src/backend/utils/init/miscinit.c
---- postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/init/miscinit.c 2012-09-06 11:53:55.213680015 -0400
+diff -Naur postgresql-9.2rc1.orig/src/backend/utils/init/miscinit.c postgresql-9.2rc1/src/backend/utils/init/miscinit.c
+--- postgresql-9.2rc1.orig/src/backend/utils/init/miscinit.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/backend/utils/init/miscinit.c 2012-09-06 12:06:22.445763224 -0400
@@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing;
@@ -794,7 +807,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
/* ----------------------------------------------------------------
-@@ -648,32 +648,35 @@
+@@ -640,32 +640,35 @@
*/
/*
@@ -840,7 +853,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
bool isDDLock, const char *refName)
{
int fd;
-@@ -899,12 +902,7 @@
+@@ -891,12 +894,7 @@
DataDir,
(long) MyStartTime,
PostPortNumber,
@@ -854,7 +867,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
errno = 0;
if (write(fd, buffer, strlen(buffer)) != strlen(buffer))
-@@ -942,9 +940,14 @@
+@@ -934,9 +932,14 @@
}
/*
@@ -871,7 +884,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
}
/*
-@@ -953,41 +956,50 @@
+@@ -945,41 +948,50 @@
* When this is called, we must have already switched the working
* directory to DataDir, so we can just use a relative path. This
* helps ensure that we are locking the directory we should be.
@@ -933,7 +946,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
/*
* utime() is POSIX standard, utimes() is a common alternative; if we
* have neither, fall back to actually reading the file (which only
-@@ -1019,8 +1031,10 @@
+@@ -1011,8 +1023,10 @@
* Add (or replace) a line in the data directory lock file.
* The given string should not include a trailing newline.
*
@@ -946,7 +959,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
*/
void
AddToDataDirLockFile(int target_line, const char *str)
-@@ -1028,8 +1042,10 @@
+@@ -1020,8 +1034,10 @@
int fd;
int len;
int lineno;
@@ -959,7 +972,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
fd = open(DIRECTORY_LOCK_FILE, O_RDWR | PG_BINARY, 0);
if (fd < 0)
-@@ -1040,7 +1056,7 @@
+@@ -1032,7 +1048,7 @@
DIRECTORY_LOCK_FILE)));
return;
}
@@ -968,7 +981,7 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
if (len < 0)
{
ereport(LOG,
-@@ -1050,36 +1066,50 @@
+@@ -1042,36 +1058,50 @@
close(fd);
return;
}
@@ -1027,10 +1040,10 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.
{
/* if write didn't set errno, assume problem is no disk space */
if (errno == 0)
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/guc.c postgresql-9.1.5/src/backend/utils/misc/guc.c
---- postgresql-9.1.5.orig/src/backend/utils/misc/guc.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/misc/guc.c 2012-09-06 11:53:55.215680028 -0400
-@@ -2867,14 +2867,18 @@
+diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/guc.c postgresql-9.2rc1/src/backend/utils/misc/guc.c
+--- postgresql-9.2rc1.orig/src/backend/utils/misc/guc.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/backend/utils/misc/guc.c 2012-09-06 12:06:22.447763243 -0400
+@@ -2894,14 +2894,18 @@
},
{
@@ -1053,9 +1066,9 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/guc.c postgresql-9.1.5/s
},
{
-diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample 2012-09-06 11:53:55.216680035 -0400
+diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample 2012-09-06 12:06:22.447763243 -0400
@@ -65,7 +65,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction).
@@ -1066,19 +1079,19 @@ diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample p
#unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation
# (change requires restart)
-diff -Naur postgresql-9.1.5.orig/src/bin/initdb/initdb.c postgresql-9.1.5/src/bin/initdb/initdb.c
---- postgresql-9.1.5.orig/src/bin/initdb/initdb.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/bin/initdb/initdb.c 2012-09-06 11:53:55.217680041 -0400
-@@ -947,7 +947,7 @@
+diff -Naur postgresql-9.2rc1.orig/src/bin/initdb/initdb.c postgresql-9.2rc1/src/bin/initdb/initdb.c
+--- postgresql-9.2rc1.orig/src/bin/initdb/initdb.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/bin/initdb/initdb.c 2012-09-06 12:06:22.448763252 -0400
+@@ -979,7 +979,7 @@
setup_config(void)
{
char **conflines;
-- char repltok[100];
+- char repltok[TZ_STRLEN_MAX + 100];
+ char repltok[MAXPGPATH];
char path[MAXPGPATH];
+ const char *default_timezone;
- fputs(_("creating configuration files ... "), stdout);
-@@ -968,6 +968,15 @@
+@@ -1001,6 +1001,15 @@
n_buffers * (BLCKSZ / 1024));
conflines = replace_token(conflines, "#shared_buffers = 32MB", repltok);
@@ -1094,10 +1107,10 @@ diff -Naur postgresql-9.1.5.orig/src/bin/initdb/initdb.c postgresql-9.1.5/src/bi
#if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
conflines = replace_token(conflines, "#port = 5432", repltok);
-diff -Naur postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c 2012-09-06 11:53:55.218680049 -0400
-@@ -519,7 +519,7 @@
+diff -Naur postgresql-9.2rc1.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.2rc1/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.2rc1.orig/src/bin/pg_ctl/pg_ctl.c 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/bin/pg_ctl/pg_ctl.c 2012-09-06 12:06:22.449763262 -0400
+@@ -521,7 +521,7 @@
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
/*
@@ -1106,9 +1119,9 @@ diff -Naur postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.5/src/bi
* directories, libpq's host parameter must have a
* leading slash to indicate a socket directory. So,
* ignore sockdir if it's relative, and try to use TCP
-diff -Naur postgresql-9.1.5.orig/src/include/libpq/libpq.h postgresql-9.1.5/src/include/libpq/libpq.h
---- postgresql-9.1.5.orig/src/include/libpq/libpq.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/libpq/libpq.h 2012-09-06 11:53:55.218680049 -0400
+diff -Naur postgresql-9.2rc1.orig/src/include/libpq/libpq.h postgresql-9.2rc1/src/include/libpq/libpq.h
+--- postgresql-9.2rc1.orig/src/include/libpq/libpq.h 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/include/libpq/libpq.h 2012-09-06 12:06:22.450763271 -0400
@@ -44,12 +44,12 @@
/*
* prototypes for functions in pqcomm.c
@@ -1126,10 +1139,10 @@ diff -Naur postgresql-9.1.5.orig/src/include/libpq/libpq.h postgresql-9.1.5/src/
extern void pq_init(void);
extern void pq_comm_reset(void);
extern int pq_getbytes(char *s, size_t len);
-diff -Naur postgresql-9.1.5.orig/src/include/miscadmin.h postgresql-9.1.5/src/include/miscadmin.h
---- postgresql-9.1.5.orig/src/include/miscadmin.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/miscadmin.h 2012-09-06 11:53:55.219680061 -0400
-@@ -370,7 +370,7 @@
+diff -Naur postgresql-9.2rc1.orig/src/include/miscadmin.h postgresql-9.2rc1/src/include/miscadmin.h
+--- postgresql-9.2rc1.orig/src/include/miscadmin.h 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/include/miscadmin.h 2012-09-06 12:06:22.450763271 -0400
+@@ -411,7 +411,7 @@
* 2 data directory path
* 3 postmaster start timestamp (time_t representation)
* 4 port number
@@ -1138,7 +1151,7 @@ diff -Naur postgresql-9.1.5.orig/src/include/miscadmin.h postgresql-9.1.5/src/in
* 6 first listen_address (IP address or "*"; empty if no TCP port)
* 7 shared memory key (not present on Windows)
*
-@@ -388,8 +388,9 @@
+@@ -429,8 +429,9 @@
#define LOCK_FILE_LINE_SHMEM_KEY 7
extern void CreateDataDirLockFile(bool amPostmaster);
@@ -1150,10 +1163,10 @@ diff -Naur postgresql-9.1.5.orig/src/include/miscadmin.h postgresql-9.1.5/src/in
extern void AddToDataDirLockFile(int target_line, const char *str);
extern void ValidatePgVersion(const char *path);
extern void process_shared_preload_libraries(void);
-diff -Naur postgresql-9.1.5.orig/src/include/postmaster/postmaster.h postgresql-9.1.5/src/include/postmaster/postmaster.h
---- postgresql-9.1.5.orig/src/include/postmaster/postmaster.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/postmaster/postmaster.h 2012-09-06 11:53:55.219680061 -0400
-@@ -20,7 +20,7 @@
+diff -Naur postgresql-9.2rc1.orig/src/include/postmaster/postmaster.h postgresql-9.2rc1/src/include/postmaster/postmaster.h
+--- postgresql-9.2rc1.orig/src/include/postmaster/postmaster.h 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/include/postmaster/postmaster.h 2012-09-06 12:06:22.451763281 -0400
+@@ -19,7 +19,7 @@
extern int PostPortNumber;
extern int Unix_socket_permissions;
extern char *Unix_socket_group;
@@ -1162,10 +1175,10 @@ diff -Naur postgresql-9.1.5.orig/src/include/postmaster/postmaster.h postgresql-
extern char *ListenAddresses;
extern bool ClientAuthInProgress;
extern int PreAuthDelay;
-diff -Naur postgresql-9.1.5.orig/src/include/utils/builtins.h postgresql-9.1.5/src/include/utils/builtins.h
---- postgresql-9.1.5.orig/src/include/utils/builtins.h 2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/include/utils/builtins.h 2012-09-06 11:53:55.220680072 -0400
-@@ -728,6 +728,8 @@
+diff -Naur postgresql-9.2rc1.orig/src/include/utils/builtins.h postgresql-9.2rc1/src/include/utils/builtins.h
+--- postgresql-9.2rc1.orig/src/include/utils/builtins.h 2012-09-05 01:08:30.000000000 -0400
++++ postgresql-9.2rc1/src/include/utils/builtins.h 2012-09-06 12:06:22.451763281 -0400
+@@ -754,6 +754,8 @@
extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator,
List **namelist);
@@ -1174,13 +1187,13 @@ diff -Naur postgresql-9.1.5.orig/src/include/utils/builtins.h postgresql-9.1.5/s
extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob);
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html-stamp postgresql-9.1.5/doc/src/sgml/html-stamp
---- postgresql-9.1.5.orig/doc/src/sgml/html-stamp 2012-08-14 18:56:48.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/html-stamp 2012-09-06 11:53:55.220680072 -0400
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/html-stamp postgresql-9.2rc1/doc/src/sgml/html-stamp
+--- postgresql-9.2rc1.orig/doc/src/sgml/html-stamp 2012-09-05 13:24:38.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/html-stamp 2012-09-06 12:06:22.452763290 -0400
@@ -0,0 +1 @@
+hack
-diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man-stamp postgresql-9.1.5/doc/src/sgml/man-stamp
---- postgresql-9.1.5.orig/doc/src/sgml/man-stamp 2012-08-14 18:57:47.000000000 -0400
-+++ postgresql-9.1.5/doc/src/sgml/man-stamp 2012-09-06 11:53:55.220680072 -0400
+diff -Naur postgresql-9.2rc1.orig/doc/src/sgml/man-stamp postgresql-9.2rc1/doc/src/sgml/man-stamp
+--- postgresql-9.2rc1.orig/doc/src/sgml/man-stamp 2012-09-05 13:25:43.000000000 -0400
++++ postgresql-9.2rc1/doc/src/sgml/man-stamp 2012-09-06 12:06:22.452763290 -0400
@@ -0,0 +1 @@
+hack
diff --git a/postgresql-oom_score_adj.patch b/postgresql-oom_score_adj.patch
deleted file mode 100644
index aade1d5..0000000
--- a/postgresql-oom_score_adj.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Back-patch upstream's 9.2 patch to add support for setting oom_score_adj.
-
-
-diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/fork_process.c postgresql-9.1.4/src/backend/postmaster/fork_process.c
---- postgresql-9.1.4.orig/src/backend/postmaster/fork_process.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/postmaster/fork_process.c 2012-07-14 17:55:42.911859485 -0400
-@@ -68,12 +68,40 @@
- * process sizes *including shared memory*. (This is unbelievably
- * stupid, but the kernel hackers seem uninterested in improving it.)
- * Therefore it's often a good idea to protect the postmaster by
-- * setting its oom_adj value negative (which has to be done in a
-- * root-owned startup script). If you just do that much, all child
-+ * setting its oom_score_adj value negative (which has to be done in a
-+ * root-owned startup script). If you just do that much, all child
- * processes will also be protected against OOM kill, which might not
-- * be desirable. You can then choose to build with LINUX_OOM_ADJ
-- * #defined to 0, or some other value that you want child processes to
-- * adopt here.
-+ * be desirable. You can then choose to build with
-+ * LINUX_OOM_SCORE_ADJ #defined to 0, or to some other value that you
-+ * want child processes to adopt here.
-+ */
-+#ifdef LINUX_OOM_SCORE_ADJ
-+ {
-+ /*
-+ * Use open() not stdio, to ensure we control the open flags. Some
-+ * Linux security environments reject anything but O_WRONLY.
-+ */
-+ int fd = open("/proc/self/oom_score_adj", O_WRONLY, 0);
-+
-+ /* We ignore all errors */
-+ if (fd >= 0)
-+ {
-+ char buf[16];
-+ int rc;
-+
-+ snprintf(buf, sizeof(buf), "%d\n", LINUX_OOM_SCORE_ADJ);
-+ rc = write(fd, buf, strlen(buf));
-+ (void) rc;
-+ close(fd);
-+ }
-+ }
-+#endif /* LINUX_OOM_SCORE_ADJ */
-+
-+ /*
-+ * Older Linux kernels have oom_adj not oom_score_adj. This works
-+ * similarly except with a different scale of adjustment values.
-+ * If it's necessary to build Postgres to work with either API,
-+ * you can define both LINUX_OOM_SCORE_ADJ and LINUX_OOM_ADJ.
- */
- #ifdef LINUX_OOM_ADJ
- {
diff --git a/postgresql-python3.patch b/postgresql-python3.patch
new file mode 100644
index 0000000..f67383f
--- /dev/null
+++ b/postgresql-python3.patch
@@ -0,0 +1,62 @@
+This won't be needed in 9.2.1 and later.
+
+
+commit 770556d6c69c4edf219d4ace2e4fb29a1f2c35df
+Author: Tom Lane <tgl(a)sss.pgh.pa.us>
+Date: Sat Sep 8 17:39:02 2012 -0400
+
+ Adjust PL/Python regression tests some more for Python 3.3.
+
+ Commit 2cfb1c6f77734db81b6e74bcae630f93b94f69be fixed some issues caused
+ by Python 3.3 choosing to iterate through dict entries in a different order
+ than before. But here's another one: the test cases adjusted here made two
+ bad entries in a dict and expected the one complained of would always be
+ the same.
+
+ Possibly this should be back-patched further than 9.2, but there seems
+ little point unless the earlier fix is too.
+
+diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out
+index 4c46b2b..25060b0 100644
+--- a/src/pl/plpython/expected/plpython_trigger.out
++++ b/src/pl/plpython/expected/plpython_trigger.out
+@@ -476,7 +476,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test;
+ -- TD keys not corresponding to row columns
+ CREATE FUNCTION stupid7() RETURNS trigger
+ AS $$
+- TD["new"] = {'a': 'foo', 'b': 'bar'}
++ TD["new"] = {'v': 'foo', 'a': 'bar'}
+ return "MODIFY";
+ $$ LANGUAGE plpythonu;
+ CREATE TRIGGER stupid_trigger7
+@@ -490,7 +490,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test;
+ -- Unicode variant
+ CREATE FUNCTION stupid7u() RETURNS trigger
+ AS $$
+- TD["new"] = {u'a': 'foo', u'b': 'bar'}
++ TD["new"] = {u'v': 'foo', u'a': 'bar'}
+ return "MODIFY"
+ $$ LANGUAGE plpythonu;
+ CREATE TRIGGER stupid_trigger7
+diff --git a/src/pl/plpython/sql/plpython_trigger.sql b/src/pl/plpython/sql/plpython_trigger.sql
+index 2a4859f..9727f44 100644
+--- a/src/pl/plpython/sql/plpython_trigger.sql
++++ b/src/pl/plpython/sql/plpython_trigger.sql
+@@ -253,7 +253,7 @@ DROP TRIGGER stupid_trigger6 ON trigger_test;
+
+ CREATE FUNCTION stupid7() RETURNS trigger
+ AS $$
+- TD["new"] = {'a': 'foo', 'b': 'bar'}
++ TD["new"] = {'v': 'foo', 'a': 'bar'}
+ return "MODIFY";
+ $$ LANGUAGE plpythonu;
+
+@@ -270,7 +270,7 @@ DROP TRIGGER stupid_trigger7 ON trigger_test;
+
+ CREATE FUNCTION stupid7u() RETURNS trigger
+ AS $$
+- TD["new"] = {u'a': 'foo', u'b': 'bar'}
++ TD["new"] = {u'v': 'foo', u'a': 'bar'}
+ return "MODIFY"
+ $$ LANGUAGE plpythonu;
+
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 5bad691..3174f2e 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -16,29 +16,38 @@ This patch must be applied after postgresql-multi-sockets.patch, at
least until 9.3 when that will be part of the upstream package.
-diff -Naur postgresql-9.1.4.sockets/contrib/pg_upgrade/server.c postgresql-9.1.4/contrib/pg_upgrade/server.c
---- postgresql-9.1.4.sockets/contrib/pg_upgrade/server.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/contrib/pg_upgrade/server.c 2012-08-12 22:43:10.388873678 -0400
-@@ -179,11 +179,14 @@
- */
- snprintf(cmd, sizeof(cmd),
- SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" "
-- "-o \"-p %d %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE,
-+ "-o \"-p %d %s %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE,
- cluster->bindir, output_filename, cluster->pgdata, cluster->port,
- (cluster->controldata.cat_ver >=
- BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? "-b" :
- "-c autovacuum=off -c autovacuum_freeze_max_age=2000000000",
-+ /* assume 9.1 builds will have newer socket directory */
-+ (GET_MAJOR_VERSION(cluster->major_version) < 901) ?
-+ "-c unix_socket_directory=/var/run/postgresql" : "",
- output_filename);
+diff -Naur postgresql-9.2.0.sockets/contrib/pg_upgrade/test.sh postgresql-9.2.0/contrib/pg_upgrade/test.sh
+--- postgresql-9.2.0.sockets/contrib/pg_upgrade/test.sh 2012-09-06 17:26:17.000000000 -0400
++++ postgresql-9.2.0/contrib/pg_upgrade/test.sh 2012-09-06 18:13:18.178092176 -0400
+@@ -62,10 +62,14 @@
+ rm -rf "$logdir"
+ mkdir "$logdir"
- /*
-diff -Naur postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c postgresql-9.1.4/src/backend/utils/misc/guc.c
---- postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c 2012-08-12 20:35:22.559682963 -0400
-+++ postgresql-9.1.4/src/backend/utils/misc/guc.c 2012-08-12 20:35:55.071983609 -0400
-@@ -2874,7 +2874,7 @@
++# we want the Unix sockets in $temp_root
++PGHOST=$temp_root
++export PGHOST
++
+ set -x
+
+ $oldbindir/initdb
+-$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -w
++$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "-c unix_socket_directories='$PGHOST'" -w
+ if "$MAKE" -C "$oldsrc" installcheck; then
+ pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+ if [ "$newsrc" != "$oldsrc" ]; then
+@@ -108,7 +112,7 @@
+
+ pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
+
+-pg_ctl start -l "$logdir/postmaster2.log" -w
++pg_ctl start -l "$logdir/postmaster2.log" -o "-c unix_socket_directories='$PGHOST'" -w
+
+ if [ $testhost = Msys ] ; then
+ cmd /c analyze_new_cluster.bat
+diff -Naur postgresql-9.2.0.sockets/src/backend/utils/misc/guc.c postgresql-9.2.0/src/backend/utils/misc/guc.c
+--- postgresql-9.2.0.sockets/src/backend/utils/misc/guc.c 2012-09-06 18:12:36.458693394 -0400
++++ postgresql-9.2.0/src/backend/utils/misc/guc.c 2012-09-06 18:13:18.181092327 -0400
+@@ -2901,7 +2901,7 @@
},
&Unix_socket_directories,
#ifdef HAVE_UNIX_SOCKETS
@@ -47,10 +56,10 @@ diff -Naur postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c postgresql-9.1.
#else
"",
#endif
-diff -Naur postgresql-9.1.4.sockets/src/bin/initdb/initdb.c postgresql-9.1.4/src/bin/initdb/initdb.c
---- postgresql-9.1.4.sockets/src/bin/initdb/initdb.c 2012-08-12 20:35:22.561682693 -0400
-+++ postgresql-9.1.4/src/bin/initdb/initdb.c 2012-08-12 20:35:55.073983799 -0400
-@@ -970,7 +970,7 @@
+diff -Naur postgresql-9.2.0.sockets/src/bin/initdb/initdb.c postgresql-9.2.0/src/bin/initdb/initdb.c
+--- postgresql-9.2.0.sockets/src/bin/initdb/initdb.c 2012-09-06 18:12:36.460693488 -0400
++++ postgresql-9.2.0/src/bin/initdb/initdb.c 2012-09-06 18:13:18.183092471 -0400
+@@ -1003,7 +1003,7 @@
#ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -59,10 +68,10 @@ diff -Naur postgresql-9.1.4.sockets/src/bin/initdb/initdb.c postgresql-9.1.4/src
#else
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif
-diff -Naur postgresql-9.1.4.sockets/src/include/pg_config_manual.h postgresql-9.1.4/src/include/pg_config_manual.h
---- postgresql-9.1.4.sockets/src/include/pg_config_manual.h 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/include/pg_config_manual.h 2012-08-12 20:35:55.073983799 -0400
-@@ -141,7 +141,7 @@
+diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
+--- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400
++++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400
+@@ -144,7 +144,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
*/
@@ -71,10 +80,10 @@ diff -Naur postgresql-9.1.4.sockets/src/include/pg_config_manual.h postgresql-9.
/*
* The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.1.4.sockets/src/test/regress/pg_regress.c postgresql-9.1.4/src/test/regress/pg_regress.c
---- postgresql-9.1.4.sockets/src/test/regress/pg_regress.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/test/regress/pg_regress.c 2012-08-12 20:38:43.933609334 -0400
-@@ -781,7 +781,7 @@
+diff -Naur postgresql-9.2.0.sockets/src/test/regress/pg_regress.c postgresql-9.2.0/src/test/regress/pg_regress.c
+--- postgresql-9.2.0.sockets/src/test/regress/pg_regress.c 2012-09-06 17:26:17.000000000 -0400
++++ postgresql-9.2.0/src/test/regress/pg_regress.c 2012-09-06 18:13:18.184092537 -0400
+@@ -772,7 +772,7 @@
if (hostname != NULL)
doputenv("PGHOST", hostname);
else
@@ -83,7 +92,7 @@ diff -Naur postgresql-9.1.4.sockets/src/test/regress/pg_regress.c postgresql-9.1
unsetenv("PGHOSTADDR");
if (port != -1)
{
-@@ -2240,7 +2240,7 @@
+@@ -2233,7 +2233,7 @@
*/
header(_("starting postmaster"));
snprintf(buf, sizeof(buf),
diff --git a/postgresql.spec b/postgresql.spec
index 524d81c..62ce352 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -35,6 +35,7 @@
%{!?test:%global test 1}
%{!?upgrade:%global upgrade 1}
%{!?plpython:%global plpython 1}
+%{!?plpython3:%global plpython3 1}
%{!?pltcl:%global pltcl 1}
%{!?plperl:%global plperl 1}
%{!?ssl:%global ssl 1}
@@ -51,9 +52,9 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.1
-Version: 9.1.5
-Release: 2%{?dist}
+%global majorversion 9.2
+Version: 9.2.0
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -67,8 +68,8 @@ Url: http://www.postgresql.org/
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series.
-%global prevversion 9.0.8
-%global prevmajorversion 9.0
+%global prevversion 9.1.5
+%global prevmajorversion 9.1
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -93,10 +94,10 @@ Source15: postgresql-bashprofile
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
-Patch4: postgresql-oom_score_adj.patch
+Patch4: postgresql-config-comment.patch
Patch5: postgresql-multi-sockets.patch
Patch6: postgresql-var-run-socket.patch
-Patch7: postgresql-config-comment.patch
+Patch7: postgresql-python3.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -107,6 +108,10 @@ BuildRequires: systemd-units
BuildRequires: python-devel
%endif
+%if %plpython3
+BuildRequires: python3-devel
+%endif
+
%if %pltcl
BuildRequires: tcl-devel
%endif
@@ -265,14 +270,26 @@ Install this if you want to write database functions in Perl.
%if %plpython
%package plpython
-Summary: The Python procedural language for PostgreSQL
+Summary: The Python2 procedural language for PostgreSQL
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description plpython
The postgresql-plpython package contains the PL/Python procedural language,
which is an extension to the PostgreSQL database server.
-Install this if you want to write database functions in Python.
+Install this if you want to write database functions in Python 2.
+%endif
+
+%if %plpython3
+%package plpython3
+Summary: The Python3 procedural language for PostgreSQL
+Group: Applications/Databases
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
+
+%description plpython3
+The postgresql-plpython3 package contains the PL/Python3 procedural language,
+which is an extension to the PostgreSQL database server.
+Install this if you want to write database functions in Python 3.
%endif
%if %pltcl
@@ -282,7 +299,7 @@ Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description pltcl
-The postgresql-plptcl package contains the PL/Tcl procedural language,
+The postgresql-pltcl package contains the PL/Tcl procedural language,
which is an extension to the PostgreSQL database server.
Install this if you want to write database functions in Tcl.
%endif
@@ -346,6 +363,85 @@ CFLAGS="$CFLAGS -DLINUX_OOM_SCORE_ADJ=0"
# CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
# %%endif
+# plpython requires separate configure/build runs to build against python 2
+# versus python 3. Our strategy is to do the python 3 run first, then make
+# distclean and do it again for the "normal" build. Note that the installed
+# Makefile.global will reflect the python 2 build, which seems appropriate
+# since that's still considered the default plpython version.
+%if %plpython3
+
+export PYTHON=/usr/bin/python3
+
+# These configure options must match main build
+%configure --disable-rpath \
+%if %beta
+ --enable-debug \
+ --enable-cassert \
+%endif
+%if %plperl
+ --with-perl \
+%endif
+%if %pltcl
+ --with-tcl \
+ --with-tclconfig=%{_libdir} \
+%endif
+%if %plpython3
+ --with-python \
+%endif
+%if %ldap
+ --with-ldap \
+%endif
+%if %ssl
+ --with-openssl \
+%endif
+%if %pam
+ --with-pam \
+%endif
+%if %kerberos
+ --with-krb5 \
+ --with-gssapi \
+%endif
+%if %uuid
+ --with-ossp-uuid \
+%endif
+%if %xml
+ --with-libxml \
+ --with-libxslt \
+%endif
+%if %nls
+ --enable-nls \
+%endif
+%if %sdt
+ --enable-dtrace \
+%endif
+%if %selinux
+ --with-selinux \
+%endif
+ --with-system-tzdata=/usr/share/zoneinfo \
+ --datadir=/usr/share/pgsql
+
+# Fortunately we don't need to build much except plpython itself
+cd src/backend
+make submake-errcodes
+cd ../..
+cd src/pl/plpython
+make %{?_smp_mflags} all
+cd ..
+# save built form in a directory that "make distclean" won't touch
+cp -a plpython plpython3
+cd ../..
+
+# must also save this version of Makefile.global for later
+cp src/Makefile.global src/Makefile.global.python3
+
+make distclean
+
+%endif
+
+unset PYTHON
+
+# Normal (not python3) build begins here
+
%configure --disable-rpath \
%if %beta
--enable-debug \
@@ -409,6 +505,24 @@ rm -f src/tutorial/GNUmakefile
pushd src/pl
make MAX_CONNECTIONS=5 check
popd
+%if %plpython3
+ # must install Makefile.global that selects python3
+ mv src/Makefile.global src/Makefile.global.save
+ cp src/Makefile.global.python3 src/Makefile.global
+ touch -r src/Makefile.global.save src/Makefile.global
+ # because "make check" does "make install" on the whole tree,
+ # we must temporarily install plpython3 as src/pl/plpython,
+ # since that is the subdirectory src/pl/Makefile knows about
+ mv src/pl/plpython src/pl/plpython2
+ mv src/pl/plpython3 src/pl/plpython
+ pushd src/pl/plpython
+ make MAX_CONNECTIONS=5 check
+ popd
+ # and clean up our mess
+ mv src/pl/plpython src/pl/plpython3
+ mv src/pl/plpython2 src/pl/plpython
+ mv -f src/Makefile.global.save src/Makefile.global
+%endif
pushd contrib
make MAX_CONNECTIONS=5 check
popd
@@ -442,6 +556,16 @@ rm -f src/tutorial/GNUmakefile
make DESTDIR=$RPM_BUILD_ROOT install-world
+%if %plpython3
+ mv src/Makefile.global src/Makefile.global.save
+ cp src/Makefile.global.python3 src/Makefile.global
+ touch -r src/Makefile.global.save src/Makefile.global
+ pushd src/pl/plpython3
+ make DESTDIR=$RPM_BUILD_ROOT install
+ popd
+ mv -f src/Makefile.global.save src/Makefile.global
+%endif
+
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in
@@ -522,6 +646,7 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
rm bin/dropuser
rm bin/ecpg
rm bin/initdb
+ rm bin/pg_basebackup
rm bin/pg_config
rm bin/pg_controldata
rm bin/pg_dump
@@ -568,7 +693,6 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
%endif
# Fix some more documentation
-# gzip doc/internals.ps
cp %{SOURCE8} README.rpm-dist
mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
@@ -578,6 +702,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%if !%upgrade
rm -f $RPM_BUILD_ROOT%{_bindir}/pg_upgrade
rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/pg_upgrade_support.so
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pg_upgrade.*
%endif
# initialize file lists
@@ -588,6 +713,7 @@ cp /dev/null devel.lst
cp /dev/null plperl.lst
cp /dev/null pltcl.lst
cp /dev/null plpython.lst
+cp /dev/null plpython3.lst
%if %nls
%find_lang ecpg-%{majorversion}
@@ -622,6 +748,11 @@ cat plpgsql-%{majorversion}.lang >>server.lst
%find_lang plpython-%{majorversion}
cat plpython-%{majorversion}.lang >>plpython.lst
%endif
+%if %plpython3
+# plpython3 shares message files with plpython
+%find_lang plpython-%{majorversion}
+cat plpython-%{majorversion}.lang >>plpython3.lst
+%endif
%if %pltcl
%find_lang pltcl-%{majorversion}
cat pltcl-%{majorversion}.lang >>pltcl.lst
@@ -746,6 +877,7 @@ fi
%{_datadir}/pgsql/extension/refint*
%{_datadir}/pgsql/extension/seg*
%{_datadir}/pgsql/extension/tablefunc*
+%{_datadir}/pgsql/extension/tcn*
%{_datadir}/pgsql/extension/test_parser*
%{_datadir}/pgsql/extension/timetravel*
%{_datadir}/pgsql/extension/tsearch2*
@@ -785,6 +917,7 @@ fi
%{_libdir}/pgsql/refint.so
%{_libdir}/pgsql/seg.so
%{_libdir}/pgsql/tablefunc.so
+%{_libdir}/pgsql/tcn.so
%{_libdir}/pgsql/test_parser.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
@@ -809,8 +942,16 @@ fi
%{_bindir}/pg_archivecleanup
%{_bindir}/pg_standby
%{_bindir}/pg_test_fsync
+%{_bindir}/pg_test_timing
%{_bindir}/pgbench
%{_bindir}/vacuumlo
+%{_mandir}/man1/oid2name.*
+%{_mandir}/man1/pg_archivecleanup.*
+%{_mandir}/man1/pg_standby.*
+%{_mandir}/man1/pg_test_fsync.*
+%{_mandir}/man1/pg_test_timing.*
+%{_mandir}/man1/pgbench.*
+%{_mandir}/man1/vacuumlo.*
%{_mandir}/man3/dblink*
%doc contrib/spi/*.example
@@ -832,6 +973,7 @@ fi
%{_bindir}/pg_basebackup
%{_bindir}/pg_controldata
%{_bindir}/pg_ctl
+%{_bindir}/pg_receivexlog
%{_bindir}/pg_resetxlog
%{_bindir}/postgres
%{_bindir}/postmaster
@@ -841,6 +983,7 @@ fi
%{_mandir}/man1/pg_basebackup.*
%{_mandir}/man1/pg_controldata.*
%{_mandir}/man1/pg_ctl.*
+%{_mandir}/man1/pg_receivexlog.*
%{_mandir}/man1/pg_resetxlog.*
%{_mandir}/man1/postgres.*
%{_mandir}/man1/postmaster.*
@@ -887,6 +1030,7 @@ fi
%{_bindir}/pg_upgrade
%{_libdir}/pgsql/pg_upgrade_support.so
%{_libdir}/pgsql/postgresql-%{prevmajorversion}
+%{_mandir}/man1/pg_upgrade.*
%endif
%if %plperl
@@ -907,10 +1051,17 @@ fi
%if %plpython
%files plpython -f plpython.lst
-%{_datadir}/pgsql/extension/plpython*
+%{_datadir}/pgsql/extension/plpythonu*
+%{_datadir}/pgsql/extension/plpython2*
%{_libdir}/pgsql/plpython2.so
%endif
+%if %plpython3
+%files plpython3 -f plpython3.lst
+%{_datadir}/pgsql/extension/plpython3*
+%{_libdir}/pgsql/plpython3.so
+%endif
+
%if %test
%files test
%defattr(-,postgres,postgres)
@@ -919,6 +1070,11 @@ fi
%endif
%changelog
+* Mon Sep 10 2012 Tom Lane <tgl(a)redhat.com> 9.2.0-1
+- Update to PostgreSQL 9.2.0 (major version bump);
+ in-place upgrade support now works from 9.1.x as the previous version
+- Add postgresql-plpython3 subpackage with PL/Python built against Python 3
+
* Tue Aug 28 2012 Tom Lane <tgl(a)redhat.com> 9.1.5-2
- Remove unnecessary ldconfig calls in pre/post triggers
Resolves: #849344
diff --git a/sources b/sources
index bf53086..edb3857 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+8c4c32a4abe8cf61b02c8366181ede50 postgresql-9.2.0.tar.bz2
+38951718e05922310a0397e2dcbf9330 postgresql-9.2.0-US.pdf
c784decb60615aa94c6a31601bc6ffd2 postgresql-9.1.5.tar.bz2
-c497cce8d81a733200584e653c9177f5 postgresql-9.1.5-US.pdf
-0e830b0f6538e04b788c3208060256ef postgresql-9.0.8.tar.bz2
commit bd43a1efccf7a9f1e3857c742efa8406b124603d
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Sep 6 12:01:42 2012 -0400
Allow embedded whitespace in unix_socket_directories items.
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
index efebb8f..0dcbe9b 100644
--- a/postgresql-multi-sockets.patch
+++ b/postgresql-multi-sockets.patch
@@ -1,6 +1,7 @@
Back-port of upstream 9.3 patch to support multiple sockets
-(upstream git commit c9b0cbe98bd783e24a8c4d8d8ac472a494b81292,
-plus updates of derived documentation files).
+(upstream git commits c9b0cbe98bd783e24a8c4d8d8ac472a494b81292 and
+d2286a98ef3fb88bafb57381b4c20b8b878827f1, plus updates of derived
+documentation files).
Note the patch also touches html-stamp and man-stamp in doc/src/sgml/;
this is to keep the makefiles from trying to rebuild the derived doc
@@ -8,9 +9,9 @@ files. We don't want that to happen because the BuildRequires for the
package don't include the necessary documentation tools.
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.4/doc/src/sgml/client-auth.sgml
---- postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/client-auth.sgml 2012-08-12 19:31:41.479999838 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.5/doc/src/sgml/client-auth.sgml
+--- postgresql-9.1.5.orig/doc/src/sgml/client-auth.sgml 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/client-auth.sgml 2012-09-06 11:53:55.188679276 -0400
@@ -831,7 +831,7 @@
<varname>unix_socket_permissions</varname> (and possibly
<varname>unix_socket_group</varname>) configuration parameters as
@@ -20,9 +21,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.4/
configuration parameter to place the socket file in a suitably
restricted directory.
</para>
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/config.sgml postgresql-9.1.4/doc/src/sgml/config.sgml
---- postgresql-9.1.4.orig/doc/src/sgml/config.sgml 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/config.sgml 2012-08-12 19:31:41.481999903 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/config.sgml postgresql-9.1.5/doc/src/sgml/config.sgml
+--- postgresql-9.1.5.orig/doc/src/sgml/config.sgml 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/config.sgml 2012-09-06 11:53:55.200679690 -0400
@@ -417,17 +417,24 @@
</listitem>
</varlistentry>
@@ -86,7 +87,7 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/config.sgml postgresql-9.1.4/doc/s
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-@@ -6413,7 +6420,7 @@
+@@ -6417,7 +6424,7 @@
</row>
<row>
<entry><option>-k <replaceable>x</replaceable></option></entry>
@@ -95,9 +96,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/config.sgml postgresql-9.1.4/doc/s
</row>
<row>
<entry><option>-l</option></entry>
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.4/doc/src/sgml/html/app-postgres.html
---- postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html 2012-05-31 19:23:13.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/html/app-postgres.html 2012-08-12 19:32:55.022709775 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.5/doc/src/sgml/html/app-postgres.html
+--- postgresql-9.1.5.orig/doc/src/sgml/html/app-postgres.html 2012-08-14 18:56:14.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/html/app-postgres.html 2012-09-06 11:53:55.201679728 -0400
@@ -531,11 +531,19 @@
CLASS="COMMAND"
>postgres</TT
@@ -120,9 +121,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html postgresql-
</P
></DD
><DT
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.4/doc/src/sgml/html/auth-methods.html
---- postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html 2012-05-31 19:22:57.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/html/auth-methods.html 2012-08-12 19:32:37.316538936 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.5/doc/src/sgml/html/auth-methods.html
+--- postgresql-9.1.5.orig/doc/src/sgml/html/auth-methods.html 2012-08-14 18:55:57.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/html/auth-methods.html 2012-09-06 11:53:55.201679728 -0400
@@ -161,7 +161,7 @@
>. Or you
could set the <TT
@@ -132,9 +133,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html postgresql-
>
configuration parameter to place the socket file in a suitably
restricted directory.
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.4/doc/src/sgml/html/bookindex.html
---- postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html 2012-05-31 19:23:47.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/html/bookindex.html 2012-08-12 19:33:28.487032655 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.5/doc/src/sgml/html/bookindex.html
+--- postgresql-9.1.5.orig/doc/src/sgml/html/bookindex.html 2012-08-14 18:56:48.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/html/bookindex.html 2012-09-06 11:53:55.204679820 -0400
@@ -16893,7 +16893,7 @@
></DL
></DD
@@ -144,9 +145,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html postgresql-9.1
<A
HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
>Connection Settings</A
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.4/doc/src/sgml/html/preventing-server-spoofing.html
---- postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-05-31 19:22:56.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/html/preventing-server-spoofing.html 2012-08-12 19:32:36.060526818 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html
+--- postgresql-9.1.5.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-08-14 18:55:56.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/html/preventing-server-spoofing.html 2012-09-06 11:53:55.205679845 -0400
@@ -115,8 +115,8 @@
>local</TT
>
@@ -158,9 +159,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.ht
>) that has write permission only
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.4/doc/src/sgml/html/runtime-config-connection.html
---- postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.html 2012-05-31 19:22:56.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/html/runtime-config-connection.html 2012-08-12 19:32:36.376529867 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html
+--- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-connection.html 2012-08-14 18:55:56.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-connection.html 2012-09-06 11:53:55.205679845 -0400
@@ -274,24 +274,31 @@
></DD
><DT
@@ -235,9 +236,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.htm
sockets use the usual Unix file system permission set.
The parameter value is expected to be a numeric mode
specified in the format accepted by the
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.4/doc/src/sgml/html/runtime-config-short.html
---- postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html 2012-05-31 19:22:57.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/html/runtime-config-short.html 2012-08-12 19:32:37.044536313 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html
+--- postgresql-9.1.5.orig/doc/src/sgml/html/runtime-config-short.html 2012-08-14 18:55:57.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/html/runtime-config-short.html 2012-09-06 11:53:55.206679864 -0400
@@ -323,7 +323,7 @@
><TD
><TT
@@ -247,9 +248,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html pos
CLASS="REPLACEABLE"
><I
>x</I
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.4/doc/src/sgml/man1/postgres.1
---- postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 2012-05-31 19:24:40.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/man1/postgres.1 2012-08-12 19:34:17.019500922 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.5/doc/src/sgml/man1/postgres.1
+--- postgresql-9.1.5.orig/doc/src/sgml/man1/postgres.1 2012-08-14 18:57:43.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/man1/postgres.1 2012-09-06 11:53:55.206679864 -0400
@@ -180,8 +180,10 @@
.RS 4
Specifies the directory of the Unix\-domain socket on which
@@ -263,9 +264,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.4/d
.RE
.PP
\fB\-l\fR
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.4/doc/src/sgml/ref/postgres-ref.sgml
---- postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/ref/postgres-ref.sgml 2012-08-12 19:31:41.481999903 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml
+--- postgresql-9.1.5.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/ref/postgres-ref.sgml 2012-09-06 11:53:55.207679890 -0400
@@ -233,8 +233,14 @@
<para>
Specifies the directory of the Unix-domain socket on which
@@ -283,9 +284,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9
</para>
</listitem>
</varlistentry>
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml postgresql-9.1.4/doc/src/sgml/runtime.sgml
---- postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/runtime.sgml 2012-08-12 19:31:41.482999933 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml postgresql-9.1.5/doc/src/sgml/runtime.sgml
+--- postgresql-9.1.5.orig/doc/src/sgml/runtime.sgml 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/runtime.sgml 2012-09-06 11:53:55.208679918 -0400
@@ -1816,7 +1816,7 @@
<para>
The simplest way to prevent spoofing for <literal>local</>
@@ -295,9 +296,9 @@ diff -Naur postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml postgresql-9.1.4/doc/
for a trusted local user. This prevents a malicious user from creating
their own socket file in that directory. If you are concerned that
some applications might still reference <filename>/tmp</> for the
-diff -Naur postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c postgresql-9.1.4/src/backend/libpq/pqcomm.c
---- postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/libpq/pqcomm.c 2012-08-12 19:31:41.483999957 -0400
+diff -Naur postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c postgresql-9.1.5/src/backend/libpq/pqcomm.c
+--- postgresql-9.1.5.orig/src/backend/libpq/pqcomm.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/libpq/pqcomm.c 2012-09-06 11:53:55.209679942 -0400
@@ -42,7 +42,7 @@
* StreamServerPort - Open postmaster's server port
* StreamConnection - Create new connection with client
@@ -507,9 +508,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c postgresql-9.1.4/src
/*
* utime() is POSIX standard, utimes() is a common alternative. If we
* have neither, there's no way to affect the mod or access time of
-diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-9.1.4/src/backend/postmaster/postmaster.c
---- postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/postmaster/postmaster.c 2012-08-12 19:31:41.486000046 -0400
+diff -Naur postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c postgresql-9.1.5/src/backend/postmaster/postmaster.c
+--- postgresql-9.1.5.orig/src/backend/postmaster/postmaster.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/postmaster/postmaster.c 2012-09-06 11:53:55.210679959 -0400
@@ -157,7 +157,9 @@
/* The socket number we are listening for connections on */
@@ -521,7 +522,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
char *ListenAddresses;
/*
-@@ -589,7 +591,7 @@
+@@ -590,7 +592,7 @@
break;
case 'k':
@@ -530,7 +531,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
break;
case 'l':
-@@ -842,7 +844,7 @@
+@@ -848,7 +850,7 @@
/* Need a modifiable copy of ListenAddresses */
rawstring = pstrdup(ListenAddresses);
@@ -539,7 +540,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
if (!SplitIdentifierString(rawstring, ',', &elemlist))
{
/* syntax error in list */
-@@ -858,12 +860,12 @@
+@@ -864,12 +866,12 @@
if (strcmp(curhost, "*") == 0)
status = StreamServerPort(AF_UNSPEC, NULL,
(unsigned short) PostPortNumber,
@@ -554,7 +555,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
ListenSocket, MAXLISTEN);
if (status == STATUS_OK)
-@@ -882,7 +884,7 @@
+@@ -888,7 +890,7 @@
curhost)));
}
@@ -563,7 +564,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
ereport(FATAL,
(errmsg("could not create any TCP/IP sockets")));
-@@ -929,13 +931,54 @@
+@@ -935,13 +937,54 @@
#endif
#ifdef HAVE_UNIX_SOCKETS
@@ -625,7 +626,7 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
#endif
/*
-@@ -1523,15 +1566,15 @@
+@@ -1529,15 +1572,15 @@
}
/*
@@ -644,9 +645,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-
last_touch_time = now;
}
}
-diff -Naur postgresql-9.1.4.orig/src/backend/tcop/postgres.c postgresql-9.1.4/src/backend/tcop/postgres.c
---- postgresql-9.1.4.orig/src/backend/tcop/postgres.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/tcop/postgres.c 2012-08-12 19:31:41.487000086 -0400
+diff -Naur postgresql-9.1.5.orig/src/backend/tcop/postgres.c postgresql-9.1.5/src/backend/tcop/postgres.c
+--- postgresql-9.1.5.orig/src/backend/tcop/postgres.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/tcop/postgres.c 2012-09-06 11:53:55.211679977 -0400
@@ -3345,7 +3345,7 @@
break;
@@ -656,10 +657,10 @@ diff -Naur postgresql-9.1.4.orig/src/backend/tcop/postgres.c postgresql-9.1.4/sr
break;
case 'l':
-diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.4/src/backend/utils/adt/varlena.c
---- postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/utils/adt/varlena.c 2012-08-12 19:31:41.489000154 -0400
-@@ -2387,6 +2387,116 @@
+diff -Naur postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c postgresql-9.1.5/src/backend/utils/adt/varlena.c
+--- postgresql-9.1.5.orig/src/backend/utils/adt/varlena.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/utils/adt/varlena.c 2012-09-06 11:54:14.148859548 -0400
+@@ -2387,6 +2387,119 @@
}
@@ -668,9 +669,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
+ *
+ * This is similar to SplitIdentifierString, except that the parsing
+ * rules are meant to handle pathnames instead of identifiers: there is
-+ * no downcasing, the max length is MAXPGPATH-1, and we apply
-+ * canonicalize_path() to each extracted string. Because of the last,
-+ * the returned strings are separately palloc'd rather than being
++ * no downcasing, embedded spaces are allowed, the max length is MAXPGPATH-1,
++ * and we apply canonicalize_path() to each extracted string. Because of the
++ * last, the returned strings are separately palloc'd rather than being
+ * pointers into rawstring --- but we still scribble on rawstring.
+ *
+ * Inputs:
@@ -727,13 +728,16 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
+ }
+ else
+ {
-+ /* Unquoted name --- extends to separator or whitespace */
-+ curname = nextp;
-+ while (*nextp && *nextp != separator &&
-+ !isspace((unsigned char) *nextp))
++ /* Unquoted name --- extends to separator or end of string */
++ curname = endp = nextp;
++ while (*nextp && *nextp != separator)
++ {
++ /* trailing whitespace should not be included in name */
++ if (!isspace((unsigned char) *nextp))
++ endp = nextp + 1;
+ nextp++;
-+ endp = nextp;
-+ if (curname == nextp)
++ }
++ if (curname == endp)
+ return false; /* empty unquoted name not allowed */
+ }
+
@@ -776,9 +780,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.
/*****************************************************************************
* Comparison Functions used for bytea
*
-diff -Naur postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c postgresql-9.1.4/src/backend/utils/init/miscinit.c
---- postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/utils/init/miscinit.c 2012-08-12 19:31:41.489000154 -0400
+diff -Naur postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c postgresql-9.1.5/src/backend/utils/init/miscinit.c
+--- postgresql-9.1.5.orig/src/backend/utils/init/miscinit.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/utils/init/miscinit.c 2012-09-06 11:53:55.213680015 -0400
@@ -49,8 +49,8 @@
ProcessingMode Mode = InitProcessing;
@@ -1023,9 +1027,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c postgresql-9.
{
/* if write didn't set errno, assume problem is no disk space */
if (errno == 0)
-diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/guc.c postgresql-9.1.4/src/backend/utils/misc/guc.c
---- postgresql-9.1.4.orig/src/backend/utils/misc/guc.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/utils/misc/guc.c 2012-08-12 19:31:41.491000208 -0400
+diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/guc.c postgresql-9.1.5/src/backend/utils/misc/guc.c
+--- postgresql-9.1.5.orig/src/backend/utils/misc/guc.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/utils/misc/guc.c 2012-09-06 11:53:55.215680028 -0400
@@ -2867,14 +2867,18 @@
},
@@ -1049,9 +1053,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/guc.c postgresql-9.1.4/s
},
{
-diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample 2012-08-12 19:31:41.492000232 -0400
+diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample 2012-09-06 11:53:55.216680035 -0400
@@ -65,7 +65,8 @@
# Note: Increasing max_connections costs ~400 bytes of shared memory per
# connection slot, plus lock space (see max_locks_per_transaction).
@@ -1062,9 +1066,9 @@ diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample p
#unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation
# (change requires restart)
-diff -Naur postgresql-9.1.4.orig/src/bin/initdb/initdb.c postgresql-9.1.4/src/bin/initdb/initdb.c
---- postgresql-9.1.4.orig/src/bin/initdb/initdb.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/bin/initdb/initdb.c 2012-08-12 19:31:41.493000252 -0400
+diff -Naur postgresql-9.1.5.orig/src/bin/initdb/initdb.c postgresql-9.1.5/src/bin/initdb/initdb.c
+--- postgresql-9.1.5.orig/src/bin/initdb/initdb.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/bin/initdb/initdb.c 2012-09-06 11:53:55.217680041 -0400
@@ -947,7 +947,7 @@
setup_config(void)
{
@@ -1090,9 +1094,9 @@ diff -Naur postgresql-9.1.4.orig/src/bin/initdb/initdb.c postgresql-9.1.4/src/bi
#if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
conflines = replace_token(conflines, "#port = 5432", repltok);
-diff -Naur postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.4/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/bin/pg_ctl/pg_ctl.c 2012-08-12 19:31:41.494000277 -0400
+diff -Naur postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.1.5.orig/src/bin/pg_ctl/pg_ctl.c 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/bin/pg_ctl/pg_ctl.c 2012-09-06 11:53:55.218680049 -0400
@@ -519,7 +519,7 @@
hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
@@ -1102,9 +1106,9 @@ diff -Naur postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.4/src/bi
* directories, libpq's host parameter must have a
* leading slash to indicate a socket directory. So,
* ignore sockdir if it's relative, and try to use TCP
-diff -Naur postgresql-9.1.4.orig/src/include/libpq/libpq.h postgresql-9.1.4/src/include/libpq/libpq.h
---- postgresql-9.1.4.orig/src/include/libpq/libpq.h 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/include/libpq/libpq.h 2012-08-12 19:31:41.494000277 -0400
+diff -Naur postgresql-9.1.5.orig/src/include/libpq/libpq.h postgresql-9.1.5/src/include/libpq/libpq.h
+--- postgresql-9.1.5.orig/src/include/libpq/libpq.h 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/include/libpq/libpq.h 2012-09-06 11:53:55.218680049 -0400
@@ -44,12 +44,12 @@
/*
* prototypes for functions in pqcomm.c
@@ -1122,9 +1126,9 @@ diff -Naur postgresql-9.1.4.orig/src/include/libpq/libpq.h postgresql-9.1.4/src/
extern void pq_init(void);
extern void pq_comm_reset(void);
extern int pq_getbytes(char *s, size_t len);
-diff -Naur postgresql-9.1.4.orig/src/include/miscadmin.h postgresql-9.1.4/src/include/miscadmin.h
---- postgresql-9.1.4.orig/src/include/miscadmin.h 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/include/miscadmin.h 2012-08-12 19:31:41.495000302 -0400
+diff -Naur postgresql-9.1.5.orig/src/include/miscadmin.h postgresql-9.1.5/src/include/miscadmin.h
+--- postgresql-9.1.5.orig/src/include/miscadmin.h 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/include/miscadmin.h 2012-09-06 11:53:55.219680061 -0400
@@ -370,7 +370,7 @@
* 2 data directory path
* 3 postmaster start timestamp (time_t representation)
@@ -1146,9 +1150,9 @@ diff -Naur postgresql-9.1.4.orig/src/include/miscadmin.h postgresql-9.1.4/src/in
extern void AddToDataDirLockFile(int target_line, const char *str);
extern void ValidatePgVersion(const char *path);
extern void process_shared_preload_libraries(void);
-diff -Naur postgresql-9.1.4.orig/src/include/postmaster/postmaster.h postgresql-9.1.4/src/include/postmaster/postmaster.h
---- postgresql-9.1.4.orig/src/include/postmaster/postmaster.h 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/include/postmaster/postmaster.h 2012-08-12 19:31:41.495000302 -0400
+diff -Naur postgresql-9.1.5.orig/src/include/postmaster/postmaster.h postgresql-9.1.5/src/include/postmaster/postmaster.h
+--- postgresql-9.1.5.orig/src/include/postmaster/postmaster.h 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/include/postmaster/postmaster.h 2012-09-06 11:53:55.219680061 -0400
@@ -20,7 +20,7 @@
extern int PostPortNumber;
extern int Unix_socket_permissions;
@@ -1158,10 +1162,10 @@ diff -Naur postgresql-9.1.4.orig/src/include/postmaster/postmaster.h postgresql-
extern char *ListenAddresses;
extern bool ClientAuthInProgress;
extern int PreAuthDelay;
-diff -Naur postgresql-9.1.4.orig/src/include/utils/builtins.h postgresql-9.1.4/src/include/utils/builtins.h
---- postgresql-9.1.4.orig/src/include/utils/builtins.h 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/include/utils/builtins.h 2012-08-12 19:31:41.496000323 -0400
-@@ -726,6 +726,8 @@
+diff -Naur postgresql-9.1.5.orig/src/include/utils/builtins.h postgresql-9.1.5/src/include/utils/builtins.h
+--- postgresql-9.1.5.orig/src/include/utils/builtins.h 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/include/utils/builtins.h 2012-09-06 11:53:55.220680072 -0400
+@@ -728,6 +728,8 @@
extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator,
List **namelist);
@@ -1170,13 +1174,13 @@ diff -Naur postgresql-9.1.4.orig/src/include/utils/builtins.h postgresql-9.1.4/s
extern Datum replace_text(PG_FUNCTION_ARGS);
extern text *replace_text_regexp(text *src_text, void *regexp,
text *replace_text, bool glob);
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html-stamp postgresql-9.1.4/doc/src/sgml/html-stamp
---- postgresql-9.1.4.orig/doc/src/sgml/html-stamp 2012-05-31 19:23:47.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/html-stamp 2012-08-12 19:50:30.401879619 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/html-stamp postgresql-9.1.5/doc/src/sgml/html-stamp
+--- postgresql-9.1.5.orig/doc/src/sgml/html-stamp 2012-08-14 18:56:48.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/html-stamp 2012-09-06 11:53:55.220680072 -0400
@@ -0,0 +1 @@
+hack
-diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man-stamp postgresql-9.1.4/doc/src/sgml/man-stamp
---- postgresql-9.1.4.orig/doc/src/sgml/man-stamp 2012-05-31 19:24:44.000000000 -0400
-+++ postgresql-9.1.4/doc/src/sgml/man-stamp 2012-08-12 19:50:36.017933728 -0400
+diff -Naur postgresql-9.1.5.orig/doc/src/sgml/man-stamp postgresql-9.1.5/doc/src/sgml/man-stamp
+--- postgresql-9.1.5.orig/doc/src/sgml/man-stamp 2012-08-14 18:57:47.000000000 -0400
++++ postgresql-9.1.5/doc/src/sgml/man-stamp 2012-09-06 11:53:55.220680072 -0400
@@ -0,0 +1 @@
+hack
commit 8f944a5a0139cf66b60830acec9fdb24ae1540ca
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue Aug 28 01:01:14 2012 -0400
Remove unnecessary ldconfig calls in pre/post triggers
diff --git a/postgresql.spec b/postgresql.spec
index 2d6e3cf..524d81c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -181,9 +181,6 @@ Group: Applications/Databases
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
-# for /sbin/ldconfig
-Requires(post): glibc
-Requires(postun): glibc
# We require this to be present for %%{_prefix}/lib/tmpfiles.d
Requires: systemd-units
# Make sure it's there when scriptlets run, too
@@ -644,7 +641,6 @@ cat psql-%{majorversion}.lang >>main.lst
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
%post server
-/sbin/ldconfig
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -669,28 +665,12 @@ if [ $1 -eq 0 ] ; then
fi
%postun server
-/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
fi
-%if %plperl
-%post -p /sbin/ldconfig plperl
-%postun -p /sbin/ldconfig plperl
-%endif
-
-%if %plpython
-%post -p /sbin/ldconfig plpython
-%postun -p /sbin/ldconfig plpython
-%endif
-
-%if %pltcl
-%post -p /sbin/ldconfig pltcl
-%postun -p /sbin/ldconfig pltcl
-%endif
-
# FILES section.
%files -f main.lst
@@ -939,6 +919,10 @@ fi
%endif
%changelog
+* Tue Aug 28 2012 Tom Lane <tgl(a)redhat.com> 9.1.5-2
+- Remove unnecessary ldconfig calls in pre/post triggers
+Resolves: #849344
+
* Fri Aug 17 2012 Tom Lane <tgl(a)redhat.com> 9.1.5-1
- Update to PostgreSQL 9.1.5, for various fixes described at
http://www.postgresql.org/docs/9.1/static/release-9-1-5.html
commit f95c6455f36e0cc7c32faa65880cc5a75ff7e4b0
Author: Tom Lane <tgl(a)redhat.com>
Date: Fri Aug 17 11:48:18 2012 -0400
Update to PostgreSQL 9.1.5
diff --git a/.gitignore b/.gitignore
index 7ea9ff9..663da36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.1.4.tar.bz2
-/postgresql-9.1.4-US.pdf
+/postgresql-9.1.5.tar.bz2
+/postgresql-9.1.5-US.pdf
/postgresql-9.0.8.tar.bz2
diff --git a/README.rpm-dist b/README.rpm-dist
index c7cb21f..6d2d920 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -172,17 +172,24 @@ MULTIPLE POSTMASTERS
-------------------------------------------------------------------------------
The postgresql-server RPM contains a systemd "unit" file, postgresql.service,
that is used to start the PostgreSQL postmaster. If you need to run multiple
-postmasters on one machine, you should clone this file and modify it as
-necessary.
+postmasters on one machine, you can create additional unit files derived
+from this one.
As an example, let us create a secondary postmaster called, creatively enough,
'secondary'. Here are the steps:
-1.) Copy /lib/systemd/system/postgresql.service to
- /etc/systemd/system/secondary.service.
+1.) Create a file named /etc/systemd/system/secondary.service.
(Note that user-created unit files must go into /etc not /lib!)
-2.) Edit /etc/systemd/system/secondary.service to change the PGDATA and
- PGPORT settings so they don't conflict with any other postmaster.
-3.) Create the target PGDATA directory.
+ Put these lines in it:
+ .include /lib/systemd/system/postgresql.service
+ [Service]
+ Environment=PGPORT=nnnn
+ Environment=PGDATA=/path/to/data/directory
+ Replace "nnnn" and "/path/to/data/directory" with appropriate
+ settings that don't conflict with any other postmaster.
+2.) As root, do "/bin/systemctl daemon-reload" to ensure systemd has
+ noticed your updates to the service file.
+3.) Create the target PGDATA directory, making sure that its parent
+ directories have appropriate ownership and permissions.
4.) Initdb the target PGDATA with 'postgresql-setup initdb secondary'.
5.) Edit postgresql.conf in the target PGDATA to change settings as needed.
6.) Start the new postmaster with 'systemctl start secondary.service'.
@@ -194,6 +201,19 @@ service name in the postgresql-setup command, for example 'postgresql-setup
upgrade secondary'. This will let postgresql-setup find the correct data
directory from the service file.
+If you are running SELinux in enforcing mode (which is highly recommended,
+particularly for network-exposed services like PostgreSQL) you will need to
+adjust SELinux policy to allow the postmaster to use non-default PGPORT or
+PGDATA settings. To allow use of a non-default port, say 5433, do this
+as root:
+ semanage port -a -t postgresql_port_t -p tcp 5433
+To allow use of a non-default data directory, say /special/pgdata, do:
+ semanage fcontext -a -t postgresql_db_t "/special/pgdata(/.*)?"
+If you already created the directory, follow that with:
+ restorecon -R /special/pgdata
+These settings are persistent across reboots. For more information
+see "man semanage".
+
REGRESSION TESTING
-------------------------------------------------------------------------------
If you install the postgresql-test RPM then you can run the PostgreSQL
diff --git a/postgresql-config-comment.patch b/postgresql-config-comment.patch
index 58c62b5..f392802 100644
--- a/postgresql-config-comment.patch
+++ b/postgresql-config-comment.patch
@@ -1,26 +1,19 @@
-Add notes warning users that the data directory and port number are
-forced in the service file (the latter now mostly because it's traditional
-in Red Hat installations to set it there rather than in postgresql.conf).
+Add note warning users that Postgres' port number is forced in the service
+file, mainly because it's traditional in Red Hat installations to set it
+there rather than in postgresql.conf. (There are minor usability benefits
+to doing it this way though, for example that the postmaster's port number
+is visible in "ps" as part of its command line.)
-diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample 2012-05-31 19:07:09.000000000 -0400
-+++ postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample 2012-08-13 12:15:10.939846705 -0400
-@@ -38,6 +38,8 @@
- # The default values of these variables are driven from the -D command-line
- # option or PGDATA environment variable, represented here as ConfigDir.
-
-+# Note: In RHEL/Fedora installations, you can't set data_directory here;
-+# adjust it in the service file instead.
- #data_directory = 'ConfigDir' # use data in another directory
- # (change requires restart)
- #hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file
-@@ -60,6 +62,8 @@
- # comma-separated list of addresses;
+diff -Naur postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.1.5.orig/src/backend/utils/misc/postgresql.conf.sample 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/backend/utils/misc/postgresql.conf.sample 2012-08-17 11:37:03.400210802 -0400
+@@ -61,6 +61,8 @@
# defaults to 'localhost', '*' = all
# (change requires restart)
+ #port = 5432 # (change requires restart)
+# Note: In RHEL/Fedora installations, you can't set the port number here;
+# adjust it in the service file instead.
- #port = 5432 # (change requires restart)
#max_connections = 100 # (change requires restart)
# Note: Increasing max_connections costs ~400 bytes of shared memory per
+ # connection slot, plus lock space (see max_locks_per_transaction).
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index d28a502..59c199b 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,9 +7,9 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198.
-diff -Naur postgresql-9.1rc1.orig/src/pl/plperl/GNUmakefile postgresql-9.1rc1/src/pl/plperl/GNUmakefile
---- postgresql-9.1rc1.orig/src/pl/plperl/GNUmakefile 2011-08-18 17:23:13.000000000 -0400
-+++ postgresql-9.1rc1/src/pl/plperl/GNUmakefile 2011-08-18 18:42:43.653729368 -0400
+diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile
+--- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/pl/plperl/GNUmakefile 2012-08-17 11:15:09.457116708 -0400
@@ -43,6 +43,9 @@
SHLIB_LINK = $(perl_embed_ldflags)
@@ -18,5 +18,5 @@ diff -Naur postgresql-9.1rc1.orig/src/pl/plperl/GNUmakefile postgresql-9.1rc1/sr
+SHLIB_LINK += $(rpath)
+
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl --load-extension=plperlu
- REGRESS = plperl plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
+ REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
# if Perl can support two interpreters in one backend,
diff --git a/postgresql.service b/postgresql.service
index 6545b6e..4a55a66 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -14,6 +14,9 @@
# Environment=PGPORT=5433
# This will override the setting appearing below.
+# Note: changing PGPORT or PGDATA will typically require adjusting SELinux
+# configuration as well; see /usr/share/doc/postgresql-*/README.rpm-dist.
+
# Note: do not use a PGDATA pathname containing spaces, or you will
# break postgresql-setup.
diff --git a/postgresql.spec b/postgresql.spec
index a5e1ce3..2d6e3cf 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,8 +52,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
-Version: 9.1.4
-Release: 5%{?dist}
+Version: 9.1.5
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -939,12 +939,17 @@ fi
%endif
%changelog
+* Fri Aug 17 2012 Tom Lane <tgl(a)redhat.com> 9.1.5-1
+- Update to PostgreSQL 9.1.5, for various fixes described at
+ http://www.postgresql.org/docs/9.1/static/release-9-1-5.html
+ including the fixes for CVE-2012-3488, CVE-2012-3489
+
* Mon Aug 13 2012 Tom Lane <tgl(a)redhat.com> 9.1.4-5
- Back-port upstream support for postmaster listening on multiple Unix sockets
- Configure postmaster to create sockets in both /var/run/postgresql and /tmp;
the former is now the default place for libpq to contact the postmaster.
Resolves: #825448
-- Annotate postgresql.config about not setting port number there
+- Annotate postgresql.conf about not setting port number there
- Minor specfile cleanup per suggestions from Tom Callaway
Related: #845110
diff --git a/sources b/sources
index f80623d..bf53086 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-a8035688dba988b782725ac1aec60186 postgresql-9.1.4.tar.bz2
-16153e524a263f7c1e66f5bbc71b8976 postgresql-9.1.4-US.pdf
+c784decb60615aa94c6a31601bc6ffd2 postgresql-9.1.5.tar.bz2
+c497cce8d81a733200584e653c9177f5 postgresql-9.1.5-US.pdf
0e830b0f6538e04b788c3208060256ef postgresql-9.0.8.tar.bz2
commit 497da8cf861bb7f0a41008bbf31de11956303201
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Aug 13 13:13:01 2012 -0400
Place Unix sockets in /var/run/postgresql.
diff --git a/generate-pdf.sh b/generate-pdf.sh
index 8a8ada5..1365bb4 100755
--- a/generate-pdf.sh
+++ b/generate-pdf.sh
@@ -22,7 +22,7 @@ TARGETFILE=postgresql-$VERSION-US.pdf
echo Building $TARGETFILE ...
-# Unpack and configure postgresql
+# Unpack postgresql
rm -rf postgresql-$VERSION
@@ -30,6 +30,12 @@ tar xfj postgresql-$VERSION.tar.bz2
cd postgresql-$VERSION
+# Apply any patches that affect the PDF documentation
+
+patch -p1 < ../postgresql-multi-sockets.patch
+
+# Configure ...
+
./configure >/dev/null
# Build the PDF docs
diff --git a/postgresql-config-comment.patch b/postgresql-config-comment.patch
new file mode 100644
index 0000000..58c62b5
--- /dev/null
+++ b/postgresql-config-comment.patch
@@ -0,0 +1,26 @@
+Add notes warning users that the data directory and port number are
+forced in the service file (the latter now mostly because it's traditional
+in Red Hat installations to set it there rather than in postgresql.conf).
+
+
+diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample 2012-08-13 12:15:10.939846705 -0400
+@@ -38,6 +38,8 @@
+ # The default values of these variables are driven from the -D command-line
+ # option or PGDATA environment variable, represented here as ConfigDir.
+
++# Note: In RHEL/Fedora installations, you can't set data_directory here;
++# adjust it in the service file instead.
+ #data_directory = 'ConfigDir' # use data in another directory
+ # (change requires restart)
+ #hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file
+@@ -60,6 +62,8 @@
+ # comma-separated list of addresses;
+ # defaults to 'localhost', '*' = all
+ # (change requires restart)
++# Note: In RHEL/Fedora installations, you can't set the port number here;
++# adjust it in the service file instead.
+ #port = 5432 # (change requires restart)
+ #max_connections = 100 # (change requires restart)
+ # Note: Increasing max_connections costs ~400 bytes of shared memory per
diff --git a/postgresql-multi-sockets.patch b/postgresql-multi-sockets.patch
new file mode 100644
index 0000000..efebb8f
--- /dev/null
+++ b/postgresql-multi-sockets.patch
@@ -0,0 +1,1182 @@
+Back-port of upstream 9.3 patch to support multiple sockets
+(upstream git commit c9b0cbe98bd783e24a8c4d8d8ac472a494b81292,
+plus updates of derived documentation files).
+
+Note the patch also touches html-stamp and man-stamp in doc/src/sgml/;
+this is to keep the makefiles from trying to rebuild the derived doc
+files. We don't want that to happen because the BuildRequires for the
+package don't include the necessary documentation tools.
+
+
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml postgresql-9.1.4/doc/src/sgml/client-auth.sgml
+--- postgresql-9.1.4.orig/doc/src/sgml/client-auth.sgml 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/client-auth.sgml 2012-08-12 19:31:41.479999838 -0400
+@@ -831,7 +831,7 @@
+ <varname>unix_socket_permissions</varname> (and possibly
+ <varname>unix_socket_group</varname>) configuration parameters as
+ described in <xref linkend="runtime-config-connection">. Or you
+- could set the <varname>unix_socket_directory</varname>
++ could set the <varname>unix_socket_directories</varname>
+ configuration parameter to place the socket file in a suitably
+ restricted directory.
+ </para>
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/config.sgml postgresql-9.1.4/doc/src/sgml/config.sgml
+--- postgresql-9.1.4.orig/doc/src/sgml/config.sgml 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/config.sgml 2012-08-12 19:31:41.481999903 -0400
+@@ -417,17 +417,24 @@
+ </listitem>
+ </varlistentry>
+
+- <varlistentry id="guc-unix-socket-directory" xreflabel="unix_socket_directory">
+- <term><varname>unix_socket_directory</varname> (<type>string</type>)</term>
++ <varlistentry id="guc-unix-socket-directories" xreflabel="unix_socket_directories">
++ <term><varname>unix_socket_directories</varname> (<type>string</type>)</term>
+ <indexterm>
+- <primary><varname>unix_socket_directory</> configuration parameter</primary>
++ <primary><varname>unix_socket_directories</> configuration parameter</primary>
+ </indexterm>
+ <listitem>
+ <para>
+- Specifies the directory of the Unix-domain socket on which the
+- server is to listen for
+- connections from client applications. The default is normally
+- <filename>/tmp</filename>, but can be changed at build time.
++ Specifies the directory of the Unix-domain socket(s) on which the
++ server is to listen for connections from client applications.
++ Multiple sockets can be created by listing multiple directories
++ separated by commas. Whitespace between entries is
++ ignored; surround a directory name with double quotes if you need
++ to include whitespace or commas in the name.
++ An empty value
++ specifies not listening on any Unix-domain sockets, in which case
++ only TCP/IP sockets can be used to connect to the server.
++ The default value is normally
++ <filename>/tmp</filename>, but that can be changed at build time.
+ This parameter can only be set at server start.
+ </para>
+
+@@ -436,8 +443,8 @@
+ <literal>.s.PGSQL.<replaceable>nnnn</></literal> where
+ <replaceable>nnnn</> is the server's port number, an ordinary file
+ named <literal>.s.PGSQL.<replaceable>nnnn</>.lock</literal> will be
+- created in the <varname>unix_socket_directory</> directory. Neither
+- file should ever be removed manually.
++ created in each of the <varname>unix_socket_directories</> directories.
++ Neither file should ever be removed manually.
+ </para>
+
+ <para>
+@@ -454,8 +461,8 @@
+ </indexterm>
+ <listitem>
+ <para>
+- Sets the owning group of the Unix-domain socket. (The owning
+- user of the socket is always the user that starts the
++ Sets the owning group of the Unix-domain socket(s). (The owning
++ user of the sockets is always the user that starts the
+ server.) In combination with the parameter
+ <varname>unix_socket_permissions</varname> this can be used as
+ an additional access control mechanism for Unix-domain connections.
+@@ -478,7 +485,7 @@
+ </indexterm>
+ <listitem>
+ <para>
+- Sets the access permissions of the Unix-domain socket. Unix-domain
++ Sets the access permissions of the Unix-domain socket(s). Unix-domain
+ sockets use the usual Unix file system permission set.
+ The parameter value is expected to be a numeric mode
+ specified in the format accepted by the
+@@ -6413,7 +6420,7 @@
+ </row>
+ <row>
+ <entry><option>-k <replaceable>x</replaceable></option></entry>
+- <entry><literal>unix_socket_directory = <replaceable>x</replaceable></></entry>
++ <entry><literal>unix_socket_directories = <replaceable>x</replaceable></></entry>
+ </row>
+ <row>
+ <entry><option>-l</option></entry>
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html postgresql-9.1.4/doc/src/sgml/html/app-postgres.html
+--- postgresql-9.1.4.orig/doc/src/sgml/html/app-postgres.html 2012-05-31 19:23:13.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/html/app-postgres.html 2012-08-12 19:32:55.022709775 -0400
+@@ -531,11 +531,19 @@
+ CLASS="COMMAND"
+ >postgres</TT
+ > is to listen for
+- connections from client applications. The default is normally
++ connections from client applications. The value can also be a
++ comma-separated list of directories. An empty value
++ specifies not listening on any Unix-domain sockets, in which case
++ only TCP/IP sockets can be used to connect to the server.
++ The default value is normally
+ <TT
+ CLASS="FILENAME"
+ >/tmp</TT
+->, but can be changed at build time.
++>, but that can be changed at build time.
++ Specifying this option is equivalent to setting the <A
++HREF="runtime-config-connection.html#GUC-UNIX-SOCKET-DIRECTORIES"
++>unix_socket_directories</A
++> configuration parameter.
+ </P
+ ></DD
+ ><DT
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html postgresql-9.1.4/doc/src/sgml/html/auth-methods.html
+--- postgresql-9.1.4.orig/doc/src/sgml/html/auth-methods.html 2012-05-31 19:22:57.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/html/auth-methods.html 2012-08-12 19:32:37.316538936 -0400
+@@ -161,7 +161,7 @@
+ >. Or you
+ could set the <TT
+ CLASS="VARNAME"
+->unix_socket_directory</TT
++>unix_socket_directories</TT
+ >
+ configuration parameter to place the socket file in a suitably
+ restricted directory.
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html postgresql-9.1.4/doc/src/sgml/html/bookindex.html
+--- postgresql-9.1.4.orig/doc/src/sgml/html/bookindex.html 2012-05-31 19:23:47.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/html/bookindex.html 2012-08-12 19:33:28.487032655 -0400
+@@ -16893,7 +16893,7 @@
+ ></DL
+ ></DD
+ ><DT
+->unix_socket_directory configuration parameter,
++>unix_socket_directories configuration parameter,
+ <A
+ HREF="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS"
+ >Connection Settings</A
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.html postgresql-9.1.4/doc/src/sgml/html/preventing-server-spoofing.html
+--- postgresql-9.1.4.orig/doc/src/sgml/html/preventing-server-spoofing.html 2012-05-31 19:22:56.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/html/preventing-server-spoofing.html 2012-08-12 19:32:36.060526818 -0400
+@@ -115,8 +115,8 @@
+ >local</TT
+ >
+ connections is to use a Unix domain socket directory (<A
+-HREF="runtime-config-connection.html#GUC-UNIX-SOCKET-DIRECTORY"
+->unix_socket_directory</A
++HREF="runtime-config-connection.html#GUC-UNIX-SOCKET-DIRECTORIES"
++>unix_socket_directories</A
+ >) that has write permission only
+ for a trusted local user. This prevents a malicious user from creating
+ their own socket file in that directory. If you are concerned that
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.html postgresql-9.1.4/doc/src/sgml/html/runtime-config-connection.html
+--- postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-connection.html 2012-05-31 19:22:56.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/html/runtime-config-connection.html 2012-08-12 19:32:36.376529867 -0400
+@@ -274,24 +274,31 @@
+ ></DD
+ ><DT
+ ><A
+-NAME="GUC-UNIX-SOCKET-DIRECTORY"
++NAME="GUC-UNIX-SOCKET-DIRECTORIES"
+ ></A
+ ><TT
+ CLASS="VARNAME"
+->unix_socket_directory</TT
++>unix_socket_directories</TT
+ > (<TT
+ CLASS="TYPE"
+ >string</TT
+ >)</DT
+ ><DD
+ ><P
+-> Specifies the directory of the Unix-domain socket on which the
+- server is to listen for
+- connections from client applications. The default is normally
++> Specifies the directory of the Unix-domain socket(s) on which the
++ server is to listen for connections from client applications.
++ Multiple sockets can be created by listing multiple directories
++ separated by commas. Whitespace between entries is
++ ignored; surround a directory name with double quotes if you need
++ to include whitespace or commas in the name.
++ An empty value
++ specifies not listening on any Unix-domain sockets, in which case
++ only TCP/IP sockets can be used to connect to the server.
++ The default value is normally
+ <TT
+ CLASS="FILENAME"
+ >/tmp</TT
+->, but can be changed at build time.
++>, but that can be changed at build time.
+ This parameter can only be set at server start.
+ </P
+ ><P
+@@ -320,11 +327,11 @@
+ ></TT
+ >.lock</TT
+ > will be
+- created in the <TT
++ created in each of the <TT
+ CLASS="VARNAME"
+->unix_socket_directory</TT
+-> directory. Neither
+- file should ever be removed manually.
++>unix_socket_directories</TT
++> directories.
++ Neither file should ever be removed manually.
+ </P
+ ><P
+ > This parameter is irrelevant on Windows, which does not have
+@@ -344,8 +351,8 @@
+ >)</DT
+ ><DD
+ ><P
+-> Sets the owning group of the Unix-domain socket. (The owning
+- user of the socket is always the user that starts the
++> Sets the owning group of the Unix-domain socket(s). (The owning
++ user of the sockets is always the user that starts the
+ server.) In combination with the parameter
+ <TT
+ CLASS="VARNAME"
+@@ -374,7 +381,7 @@
+ >)</DT
+ ><DD
+ ><P
+-> Sets the access permissions of the Unix-domain socket. Unix-domain
++> Sets the access permissions of the Unix-domain socket(s). Unix-domain
+ sockets use the usual Unix file system permission set.
+ The parameter value is expected to be a numeric mode
+ specified in the format accepted by the
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html postgresql-9.1.4/doc/src/sgml/html/runtime-config-short.html
+--- postgresql-9.1.4.orig/doc/src/sgml/html/runtime-config-short.html 2012-05-31 19:22:57.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/html/runtime-config-short.html 2012-08-12 19:32:37.044536313 -0400
+@@ -323,7 +323,7 @@
+ ><TD
+ ><TT
+ CLASS="LITERAL"
+->unix_socket_directory = <TT
++>unix_socket_directories = <TT
+ CLASS="REPLACEABLE"
+ ><I
+ >x</I
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 postgresql-9.1.4/doc/src/sgml/man1/postgres.1
+--- postgresql-9.1.4.orig/doc/src/sgml/man1/postgres.1 2012-05-31 19:24:40.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/man1/postgres.1 2012-08-12 19:34:17.019500922 -0400
+@@ -180,8 +180,10 @@
+ .RS 4
+ Specifies the directory of the Unix\-domain socket on which
+ postgres
+-is to listen for connections from client applications\&. The default is normally
+-/tmp, but can be changed at build time\&.
++is to listen for connections from client applications\&. The value can also be a comma\-separated list of directories\&. An empty value specifies not listening on any Unix\-domain sockets, in which case only TCP/IP sockets can be used to connect to the server\&. The default value is normally
++/tmp, but that can be changed at build time\&. Specifying this option is equivalent to setting the
++unix_socket_directories
++configuration parameter\&.
+ .RE
+ .PP
+ \fB\-l\fR
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml postgresql-9.1.4/doc/src/sgml/ref/postgres-ref.sgml
+--- postgresql-9.1.4.orig/doc/src/sgml/ref/postgres-ref.sgml 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/ref/postgres-ref.sgml 2012-08-12 19:31:41.481999903 -0400
+@@ -233,8 +233,14 @@
+ <para>
+ Specifies the directory of the Unix-domain socket on which
+ <command>postgres</command> is to listen for
+- connections from client applications. The default is normally
+- <filename>/tmp</filename>, but can be changed at build time.
++ connections from client applications. The value can also be a
++ comma-separated list of directories. An empty value
++ specifies not listening on any Unix-domain sockets, in which case
++ only TCP/IP sockets can be used to connect to the server.
++ The default value is normally
++ <filename>/tmp</filename>, but that can be changed at build time.
++ Specifying this option is equivalent to setting the <xref
++ linkend="guc-unix-socket-directories"> configuration parameter.
+ </para>
+ </listitem>
+ </varlistentry>
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml postgresql-9.1.4/doc/src/sgml/runtime.sgml
+--- postgresql-9.1.4.orig/doc/src/sgml/runtime.sgml 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/runtime.sgml 2012-08-12 19:31:41.482999933 -0400
+@@ -1816,7 +1816,7 @@
+ <para>
+ The simplest way to prevent spoofing for <literal>local</>
+ connections is to use a Unix domain socket directory (<xref
+- linkend="guc-unix-socket-directory">) that has write permission only
++ linkend="guc-unix-socket-directories">) that has write permission only
+ for a trusted local user. This prevents a malicious user from creating
+ their own socket file in that directory. If you are concerned that
+ some applications might still reference <filename>/tmp</> for the
+diff -Naur postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c postgresql-9.1.4/src/backend/libpq/pqcomm.c
+--- postgresql-9.1.4.orig/src/backend/libpq/pqcomm.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/libpq/pqcomm.c 2012-08-12 19:31:41.483999957 -0400
+@@ -42,7 +42,7 @@
+ * StreamServerPort - Open postmaster's server port
+ * StreamConnection - Create new connection with client
+ * StreamClose - Close a client/backend connection
+- * TouchSocketFile - Protect socket file against /tmp cleaners
++ * TouchSocketFiles - Protect socket files against /tmp cleaners
+ * pq_init - initialize libpq at backend startup
+ * pq_comm_reset - reset libpq during error recovery
+ * pq_close - shutdown libpq at backend exit
+@@ -103,8 +103,8 @@
+ char *Unix_socket_group;
+
+
+-/* Where the Unix socket file is */
+-static char sock_path[MAXPGPATH];
++/* Where the Unix socket files are (list of palloc'd strings) */
++static List *sock_paths = NIL;
+
+
+ /*
+@@ -140,8 +140,8 @@
+ static void pq_set_nonblocking(bool nonblocking);
+
+ #ifdef HAVE_UNIX_SOCKETS
+-static int Lock_AF_UNIX(unsigned short portNumber, char *unixSocketName);
+-static int Setup_AF_UNIX(void);
++static int Lock_AF_UNIX(char *unixSocketDir, char *unixSocketPath);
++static int Setup_AF_UNIX(char *sock_path);
+ #endif /* HAVE_UNIX_SOCKETS */
+
+
+@@ -234,29 +234,43 @@
+
+ /* StreamDoUnlink()
+ * Shutdown routine for backend connection
+- * If a Unix socket is used for communication, explicitly close it.
++ * If any Unix sockets are used for communication, explicitly close them.
+ */
+ #ifdef HAVE_UNIX_SOCKETS
+ static void
+ StreamDoUnlink(int code, Datum arg)
+ {
+- Assert(sock_path[0]);
+- unlink(sock_path);
++ ListCell *l;
++
++ /* Loop through all created sockets... */
++ foreach(l, sock_paths)
++ {
++ char *sock_path = (char *) lfirst(l);
++
++ unlink(sock_path);
++ }
++ /* Since we're about to exit, no need to reclaim storage */
++ sock_paths = NIL;
+ }
+ #endif /* HAVE_UNIX_SOCKETS */
+
+ /*
+ * StreamServerPort -- open a "listening" port to accept connections.
+ *
+- * Successfully opened sockets are added to the ListenSocket[] array,
+- * at the first position that isn't PGINVALID_SOCKET.
++ * family should be AF_UNIX or AF_UNSPEC; portNumber is the port number.
++ * For AF_UNIX ports, hostName should be NULL and unixSocketDir must be
++ * specified. For TCP ports, hostName is either NULL for all interfaces or
++ * the interface to listen on, and unixSocketDir is ignored (can be NULL).
++ *
++ * Successfully opened sockets are added to the ListenSocket[] array (of
++ * length MaxListen), at the first position that isn't PGINVALID_SOCKET.
+ *
+ * RETURNS: STATUS_OK or STATUS_ERROR
+ */
+
+ int
+ StreamServerPort(int family, char *hostName, unsigned short portNumber,
+- char *unixSocketName,
++ char *unixSocketDir,
+ pgsocket ListenSocket[], int MaxListen)
+ {
+ pgsocket fd;
+@@ -273,6 +287,9 @@
+ int listen_index = 0;
+ int added = 0;
+
++#ifdef HAVE_UNIX_SOCKETS
++ char unixSocketPath[MAXPGPATH];
++#endif
+ #if !defined(WIN32) || defined(IPV6_V6ONLY)
+ int one = 1;
+ #endif
+@@ -286,10 +303,14 @@
+ #ifdef HAVE_UNIX_SOCKETS
+ if (family == AF_UNIX)
+ {
+- /* Lock_AF_UNIX will also fill in sock_path. */
+- if (Lock_AF_UNIX(portNumber, unixSocketName) != STATUS_OK)
++ /*
++ * Create unixSocketPath from portNumber and unixSocketDir and lock
++ * that file path
++ */
++ UNIXSOCK_PATH(unixSocketPath, portNumber, unixSocketDir);
++ if (Lock_AF_UNIX(unixSocketDir, unixSocketPath) != STATUS_OK)
+ return STATUS_ERROR;
+- service = sock_path;
++ service = unixSocketPath;
+ }
+ else
+ #endif /* HAVE_UNIX_SOCKETS */
+@@ -432,7 +453,7 @@
+ (IS_AF_UNIX(addr->ai_family)) ?
+ errhint("Is another postmaster already running on port %d?"
+ " If not, remove socket file \"%s\" and retry.",
+- (int) portNumber, sock_path) :
++ (int) portNumber, service) :
+ errhint("Is another postmaster already running on port %d?"
+ " If not, wait a few seconds and retry.",
+ (int) portNumber)));
+@@ -443,7 +464,7 @@
+ #ifdef HAVE_UNIX_SOCKETS
+ if (addr->ai_family == AF_UNIX)
+ {
+- if (Setup_AF_UNIX() != STATUS_OK)
++ if (Setup_AF_UNIX(service) != STATUS_OK)
+ {
+ closesocket(fd);
+ break;
+@@ -490,10 +511,8 @@
+ * Lock_AF_UNIX -- configure unix socket file path
+ */
+ static int
+-Lock_AF_UNIX(unsigned short portNumber, char *unixSocketName)
++Lock_AF_UNIX(char *unixSocketDir, char *unixSocketPath)
+ {
+- UNIXSOCK_PATH(sock_path, portNumber, unixSocketName);
+-
+ /*
+ * Grab an interlock file associated with the socket file.
+ *
+@@ -502,13 +521,23 @@
+ * more portable, and second, it lets us remove any pre-existing socket
+ * file without race conditions.
+ */
+- CreateSocketLockFile(sock_path, true);
++ CreateSocketLockFile(unixSocketPath, true, unixSocketDir);
+
+ /*
+ * Once we have the interlock, we can safely delete any pre-existing
+ * socket file to avoid failure at bind() time.
+ */
+- unlink(sock_path);
++ unlink(unixSocketPath);
++
++ /*
++ * Arrange to unlink the socket file(s) at proc_exit. If this is the
++ * first one, set up the on_proc_exit function to do it; then add this
++ * socket file to the list of files to unlink.
++ */
++ if (sock_paths == NIL)
++ on_proc_exit(StreamDoUnlink, 0);
++
++ sock_paths = lappend(sock_paths, pstrdup(unixSocketPath));
+
+ return STATUS_OK;
+ }
+@@ -518,11 +547,8 @@
+ * Setup_AF_UNIX -- configure unix socket permissions
+ */
+ static int
+-Setup_AF_UNIX(void)
++Setup_AF_UNIX(char *sock_path)
+ {
+- /* Arrange to unlink the socket file at exit */
+- on_proc_exit(StreamDoUnlink, 0);
+-
+ /*
+ * Fix socket ownership/permission if requested. Note we must do this
+ * before we listen() to avoid a window where unwanted connections could
+@@ -704,20 +730,24 @@
+ }
+
+ /*
+- * TouchSocketFile -- mark socket file as recently accessed
++ * TouchSocketFiles -- mark socket files as recently accessed
+ *
+ * This routine should be called every so often to ensure that the socket
+- * file has a recent mod date (ordinary operations on sockets usually won't
+- * change the mod date). That saves it from being removed by
++ * files have a recent mod date (ordinary operations on sockets usually won't
++ * change the mod date). That saves them from being removed by
+ * overenthusiastic /tmp-directory-cleaner daemons. (Another reason we should
+ * never have put the socket file in /tmp...)
+ */
+ void
+-TouchSocketFile(void)
++TouchSocketFiles(void)
+ {
+- /* Do nothing if we did not create a socket... */
+- if (sock_path[0] != '\0')
++ ListCell *l;
++
++ /* Loop through all created sockets... */
++ foreach(l, sock_paths)
+ {
++ char *sock_path = (char *) lfirst(l);
++
+ /*
+ * utime() is POSIX standard, utimes() is a common alternative. If we
+ * have neither, there's no way to affect the mod or access time of
+diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c postgresql-9.1.4/src/backend/postmaster/postmaster.c
+--- postgresql-9.1.4.orig/src/backend/postmaster/postmaster.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/postmaster/postmaster.c 2012-08-12 19:31:41.486000046 -0400
+@@ -157,7 +157,9 @@
+
+ /* The socket number we are listening for connections on */
+ int PostPortNumber;
+-char *UnixSocketDir;
++/* The directory names for Unix socket(s) */
++char *Unix_socket_directories;
++/* The TCP listen address(es) */
+ char *ListenAddresses;
+
+ /*
+@@ -589,7 +591,7 @@
+ break;
+
+ case 'k':
+- SetConfigOption("unix_socket_directory", optarg, PGC_POSTMASTER, PGC_S_ARGV);
++ SetConfigOption("unix_socket_directories", optarg, PGC_POSTMASTER, PGC_S_ARGV);
+ break;
+
+ case 'l':
+@@ -842,7 +844,7 @@
+ /* Need a modifiable copy of ListenAddresses */
+ rawstring = pstrdup(ListenAddresses);
+
+- /* Parse string into list of identifiers */
++ /* Parse string into list of hostnames */
+ if (!SplitIdentifierString(rawstring, ',', &elemlist))
+ {
+ /* syntax error in list */
+@@ -858,12 +860,12 @@
+ if (strcmp(curhost, "*") == 0)
+ status = StreamServerPort(AF_UNSPEC, NULL,
+ (unsigned short) PostPortNumber,
+- UnixSocketDir,
++ NULL,
+ ListenSocket, MAXLISTEN);
+ else
+ status = StreamServerPort(AF_UNSPEC, curhost,
+ (unsigned short) PostPortNumber,
+- UnixSocketDir,
++ NULL,
+ ListenSocket, MAXLISTEN);
+
+ if (status == STATUS_OK)
+@@ -882,7 +884,7 @@
+ curhost)));
+ }
+
+- if (!success && list_length(elemlist))
++ if (!success && elemlist != NIL)
+ ereport(FATAL,
+ (errmsg("could not create any TCP/IP sockets")));
+
+@@ -929,13 +931,54 @@
+ #endif
+
+ #ifdef HAVE_UNIX_SOCKETS
+- status = StreamServerPort(AF_UNIX, NULL,
+- (unsigned short) PostPortNumber,
+- UnixSocketDir,
+- ListenSocket, MAXLISTEN);
+- if (status != STATUS_OK)
+- ereport(WARNING,
+- (errmsg("could not create Unix-domain socket")));
++ if (Unix_socket_directories)
++ {
++ char *rawstring;
++ List *elemlist;
++ ListCell *l;
++ int success = 0;
++
++ /* Need a modifiable copy of Unix_socket_directories */
++ rawstring = pstrdup(Unix_socket_directories);
++
++ /* Parse string into list of directories */
++ if (!SplitDirectoriesString(rawstring, ',', &elemlist))
++ {
++ /* syntax error in list */
++ ereport(FATAL,
++ (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
++ errmsg("invalid list syntax for \"unix_socket_directories\"")));
++ }
++
++ foreach(l, elemlist)
++ {
++ char *socketdir = (char *) lfirst(l);
++
++ status = StreamServerPort(AF_UNIX, NULL,
++ (unsigned short) PostPortNumber,
++ socketdir,
++ ListenSocket, MAXLISTEN);
++
++ if (status == STATUS_OK)
++ {
++ success++;
++ /* record the first successful Unix socket in lockfile */
++ if (success == 1)
++ AddToDataDirLockFile(LOCK_FILE_LINE_SOCKET_DIR, socketdir);
++ }
++ else
++ ereport(WARNING,
++ (errmsg("could not create Unix-domain socket in directory \"%s\"",
++ socketdir)));
++ }
++
++ if (!success && elemlist != NIL)
++ ereport(FATAL,
++ (errmsg("could not create any Unix-domain sockets")));
++
++ list_free_deep(elemlist);
++ pfree(rawstring);
++ }
+ #endif
+
+ /*
+@@ -1523,15 +1566,15 @@
+ }
+
+ /*
+- * Touch the socket and lock file every 58 minutes, to ensure that
++ * Touch Unix socket and lock files every 58 minutes, to ensure that
+ * they are not removed by overzealous /tmp-cleaning tasks. We assume
+ * no one runs cleaners with cutoff times of less than an hour ...
+ */
+ now = time(NULL);
+ if (now - last_touch_time >= 58 * SECS_PER_MINUTE)
+ {
+- TouchSocketFile();
+- TouchSocketLockFile();
++ TouchSocketFiles();
++ TouchSocketLockFiles();
+ last_touch_time = now;
+ }
+ }
+diff -Naur postgresql-9.1.4.orig/src/backend/tcop/postgres.c postgresql-9.1.4/src/backend/tcop/postgres.c
+--- postgresql-9.1.4.orig/src/backend/tcop/postgres.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/tcop/postgres.c 2012-08-12 19:31:41.487000086 -0400
+@@ -3345,7 +3345,7 @@
+ break;
+
+ case 'k':
+- SetConfigOption("unix_socket_directory", optarg, ctx, gucsource);
++ SetConfigOption("unix_socket_directories", optarg, ctx, gucsource);
+ break;
+
+ case 'l':
+diff -Naur postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c postgresql-9.1.4/src/backend/utils/adt/varlena.c
+--- postgresql-9.1.4.orig/src/backend/utils/adt/varlena.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/utils/adt/varlena.c 2012-08-12 19:31:41.489000154 -0400
+@@ -2387,6 +2387,116 @@
+ }
+
+
++/*
++ * SplitDirectoriesString --- parse a string containing directory names
++ *
++ * This is similar to SplitIdentifierString, except that the parsing
++ * rules are meant to handle pathnames instead of identifiers: there is
++ * no downcasing, the max length is MAXPGPATH-1, and we apply
++ * canonicalize_path() to each extracted string. Because of the last,
++ * the returned strings are separately palloc'd rather than being
++ * pointers into rawstring --- but we still scribble on rawstring.
++ *
++ * Inputs:
++ * rawstring: the input string; must be modifiable!
++ * separator: the separator punctuation expected between directories
++ * (typically ',' or ';'). Whitespace may also appear around
++ * directories.
++ * Outputs:
++ * namelist: filled with a palloc'd list of directory names.
++ * Caller should list_free_deep() this even on error return.
++ *
++ * Returns TRUE if okay, FALSE if there is a syntax error in the string.
++ *
++ * Note that an empty string is considered okay here.
++ */
++bool
++SplitDirectoriesString(char *rawstring, char separator,
++ List **namelist)
++{
++ char *nextp = rawstring;
++ bool done = false;
++
++ *namelist = NIL;
++
++ while (isspace((unsigned char) *nextp))
++ nextp++; /* skip leading whitespace */
++
++ if (*nextp == '\0')
++ return true; /* allow empty string */
++
++ /* At the top of the loop, we are at start of a new directory. */
++ do
++ {
++ char *curname;
++ char *endp;
++
++ if (*nextp == '\"')
++ {
++ /* Quoted name --- collapse quote-quote pairs */
++ curname = nextp + 1;
++ for (;;)
++ {
++ endp = strchr(nextp + 1, '\"');
++ if (endp == NULL)
++ return false; /* mismatched quotes */
++ if (endp[1] != '\"')
++ break; /* found end of quoted name */
++ /* Collapse adjacent quotes into one quote, and look again */
++ memmove(endp, endp + 1, strlen(endp));
++ nextp = endp;
++ }
++ /* endp now points at the terminating quote */
++ nextp = endp + 1;
++ }
++ else
++ {
++ /* Unquoted name --- extends to separator or whitespace */
++ curname = nextp;
++ while (*nextp && *nextp != separator &&
++ !isspace((unsigned char) *nextp))
++ nextp++;
++ endp = nextp;
++ if (curname == nextp)
++ return false; /* empty unquoted name not allowed */
++ }
++
++ while (isspace((unsigned char) *nextp))
++ nextp++; /* skip trailing whitespace */
++
++ if (*nextp == separator)
++ {
++ nextp++;
++ while (isspace((unsigned char) *nextp))
++ nextp++; /* skip leading whitespace for next */
++ /* we expect another name, so done remains false */
++ }
++ else if (*nextp == '\0')
++ done = true;
++ else
++ return false; /* invalid syntax */
++
++ /* Now safe to overwrite separator with a null */
++ *endp = '\0';
++
++ /* Truncate path if it's overlength */
++ if (strlen(curname) >= MAXPGPATH)
++ curname[MAXPGPATH - 1] = '\0';
++
++ /*
++ * Finished isolating current name --- add it to list
++ */
++ curname = pstrdup(curname);
++ canonicalize_path(curname);
++ *namelist = lappend(*namelist, curname);
++
++ /* Loop back if we didn't reach end of string */
++ } while (!done);
++
++ return true;
++}
++
++
+ /*****************************************************************************
+ * Comparison Functions used for bytea
+ *
+diff -Naur postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c postgresql-9.1.4/src/backend/utils/init/miscinit.c
+--- postgresql-9.1.4.orig/src/backend/utils/init/miscinit.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/utils/init/miscinit.c 2012-08-12 19:31:41.489000154 -0400
+@@ -49,8 +49,8 @@
+
+ ProcessingMode Mode = InitProcessing;
+
+-/* Note: we rely on this to initialize as zeroes */
+-static char socketLockFile[MAXPGPATH];
++/* List of lock files to be removed at proc exit */
++static List *lock_files = NIL;
+
+
+ /* ----------------------------------------------------------------
+@@ -648,32 +648,35 @@
+ */
+
+ /*
+- * proc_exit callback to remove a lockfile.
++ * proc_exit callback to remove lockfiles.
+ */
+ static void
+-UnlinkLockFile(int status, Datum filename)
++UnlinkLockFiles(int status, Datum arg)
+ {
+- char *fname = (char *) DatumGetPointer(filename);
++ ListCell *l;
+
+- if (fname != NULL)
++ foreach(l, lock_files)
+ {
+- if (unlink(fname) != 0)
+- {
+- /* Should we complain if the unlink fails? */
+- }
+- free(fname);
++ char *curfile = (char *) lfirst(l);
++
++ unlink(curfile);
++ /* Should we complain if the unlink fails? */
+ }
++ /* Since we're about to exit, no need to reclaim storage */
++ lock_files = NIL;
+ }
+
+ /*
+ * Create a lockfile.
+ *
+- * filename is the name of the lockfile to create.
++ * filename is the path name of the lockfile to create.
+ * amPostmaster is used to determine how to encode the output PID.
++ * socketDir is the Unix socket directory path to include (possibly empty).
+ * isDDLock and refName are used to determine what error message to produce.
+ */
+ static void
+ CreateLockFile(const char *filename, bool amPostmaster,
++ const char *socketDir,
+ bool isDDLock, const char *refName)
+ {
+ int fd;
+@@ -899,12 +902,7 @@
+ DataDir,
+ (long) MyStartTime,
+ PostPortNumber,
+-#ifdef HAVE_UNIX_SOCKETS
+- (*UnixSocketDir != '\0') ? UnixSocketDir : DEFAULT_PGSOCKET_DIR
+-#else
+- ""
+-#endif
+- );
++ socketDir);
+
+ errno = 0;
+ if (write(fd, buffer, strlen(buffer)) != strlen(buffer))
+@@ -942,9 +940,14 @@
+ }
+
+ /*
+- * Arrange for automatic removal of lockfile at proc_exit.
++ * Arrange to unlink the lock file(s) at proc_exit. If this is the
++ * first one, set up the on_proc_exit function to do it; then add this
++ * lock file to the list of files to unlink.
+ */
+- on_proc_exit(UnlinkLockFile, PointerGetDatum(strdup(filename)));
++ if (lock_files == NIL)
++ on_proc_exit(UnlinkLockFiles, 0);
++
++ lock_files = lappend(lock_files, pstrdup(filename));
+ }
+
+ /*
+@@ -953,41 +956,50 @@
+ * When this is called, we must have already switched the working
+ * directory to DataDir, so we can just use a relative path. This
+ * helps ensure that we are locking the directory we should be.
++ *
++ * Note that the socket directory path line is initially written as empty.
++ * postmaster.c will rewrite it upon creating the first Unix socket.
+ */
+ void
+ CreateDataDirLockFile(bool amPostmaster)
+ {
+- CreateLockFile(DIRECTORY_LOCK_FILE, amPostmaster, true, DataDir);
++ CreateLockFile(DIRECTORY_LOCK_FILE, amPostmaster, "", true, DataDir);
+ }
+
+ /*
+ * Create a lockfile for the specified Unix socket file.
+ */
+ void
+-CreateSocketLockFile(const char *socketfile, bool amPostmaster)
++CreateSocketLockFile(const char *socketfile, bool amPostmaster,
++ const char *socketDir)
+ {
+ char lockfile[MAXPGPATH];
+
+ snprintf(lockfile, sizeof(lockfile), "%s.lock", socketfile);
+- CreateLockFile(lockfile, amPostmaster, false, socketfile);
+- /* Save name of lockfile for TouchSocketLockFile */
+- strcpy(socketLockFile, lockfile);
++ CreateLockFile(lockfile, amPostmaster, socketDir, false, socketfile);
+ }
+
+ /*
+- * TouchSocketLockFile -- mark socket lock file as recently accessed
++ * TouchSocketLockFiles -- mark socket lock files as recently accessed
+ *
+- * This routine should be called every so often to ensure that the lock file
+- * has a recent mod or access date. That saves it
++ * This routine should be called every so often to ensure that the socket
++ * lock files have a recent mod or access date. That saves them
+ * from being removed by overenthusiastic /tmp-directory-cleaner daemons.
+ * (Another reason we should never have put the socket file in /tmp...)
+ */
+ void
+-TouchSocketLockFile(void)
++TouchSocketLockFiles(void)
+ {
+- /* Do nothing if we did not create a socket... */
+- if (socketLockFile[0] != '\0')
++ ListCell *l;
++
++ foreach(l, lock_files)
+ {
++ char *socketLockFile = (char *) lfirst(l);
++
++ /* No need to touch the data directory lock file, we trust */
++ if (strcmp(socketLockFile, DIRECTORY_LOCK_FILE) == 0)
++ continue;
++
+ /*
+ * utime() is POSIX standard, utimes() is a common alternative; if we
+ * have neither, fall back to actually reading the file (which only
+@@ -1019,8 +1031,10 @@
+ * Add (or replace) a line in the data directory lock file.
+ * The given string should not include a trailing newline.
+ *
+- * Caution: this erases all following lines. In current usage that is OK
+- * because lines are added in order. We could improve it if needed.
++ * Note: because we don't truncate the file, if we were to rewrite a line
++ * with less data than it had before, there would be garbage after the last
++ * line. We don't ever actually do that, so not worth adding another kernel
++ * call to cover the possibility.
+ */
+ void
+ AddToDataDirLockFile(int target_line, const char *str)
+@@ -1028,8 +1042,10 @@
+ int fd;
+ int len;
+ int lineno;
+- char *ptr;
+- char buffer[BLCKSZ];
++ char *srcptr;
++ char *destptr;
++ char srcbuffer[BLCKSZ];
++ char destbuffer[BLCKSZ];
+
+ fd = open(DIRECTORY_LOCK_FILE, O_RDWR | PG_BINARY, 0);
+ if (fd < 0)
+@@ -1040,7 +1056,7 @@
+ DIRECTORY_LOCK_FILE)));
+ return;
+ }
+- len = read(fd, buffer, sizeof(buffer) - 1);
++ len = read(fd, srcbuffer, sizeof(srcbuffer) - 1);
+ if (len < 0)
+ {
+ ereport(LOG,
+@@ -1050,36 +1066,50 @@
+ close(fd);
+ return;
+ }
+- buffer[len] = '\0';
++ srcbuffer[len] = '\0';
+
+ /*
+- * Skip over lines we are not supposed to rewrite.
++ * Advance over lines we are not supposed to rewrite, then copy them
++ * to destbuffer.
+ */
+- ptr = buffer;
++ srcptr = srcbuffer;
+ for (lineno = 1; lineno < target_line; lineno++)
+ {
+- if ((ptr = strchr(ptr, '\n')) == NULL)
++ if ((srcptr = strchr(srcptr, '\n')) == NULL)
+ {
+ elog(LOG, "bogus data in \"%s\"", DIRECTORY_LOCK_FILE);
+ close(fd);
+ return;
+ }
+- ptr++;
++ srcptr++;
+ }
++ memcpy(destbuffer, srcbuffer, srcptr - srcbuffer);
++ destptr = destbuffer + (srcptr - srcbuffer);
+
+ /*
+ * Write or rewrite the target line.
+ */
+- snprintf(ptr, buffer + sizeof(buffer) - ptr, "%s\n", str);
++ snprintf(destptr, destbuffer + sizeof(destbuffer) - destptr, "%s\n", str);
++ destptr += strlen(destptr);
++
++ /*
++ * If there are more lines in the old file, append them to destbuffer.
++ */
++ if ((srcptr = strchr(srcptr, '\n')) != NULL)
++ {
++ srcptr++;
++ snprintf(destptr, destbuffer + sizeof(destbuffer) - destptr, "%s",
++ srcptr);
++ }
+
+ /*
+ * And rewrite the data. Since we write in a single kernel call, this
+ * update should appear atomic to onlookers.
+ */
+- len = strlen(buffer);
++ len = strlen(destbuffer);
+ errno = 0;
+ if (lseek(fd, (off_t) 0, SEEK_SET) != 0 ||
+- (int) write(fd, buffer, len) != len)
++ (int) write(fd, destbuffer, len) != len)
+ {
+ /* if write didn't set errno, assume problem is no disk space */
+ if (errno == 0)
+diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/guc.c postgresql-9.1.4/src/backend/utils/misc/guc.c
+--- postgresql-9.1.4.orig/src/backend/utils/misc/guc.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/utils/misc/guc.c 2012-08-12 19:31:41.491000208 -0400
+@@ -2867,14 +2867,18 @@
+ },
+
+ {
+- {"unix_socket_directory", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
+- gettext_noop("Sets the directory where the Unix-domain socket will be created."),
++ {"unix_socket_directories", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
++ gettext_noop("Sets the directories where Unix-domain sockets will be created."),
+ NULL,
+ GUC_SUPERUSER_ONLY
+ },
+- &UnixSocketDir,
++ &Unix_socket_directories,
++#ifdef HAVE_UNIX_SOCKETS
++ DEFAULT_PGSOCKET_DIR,
++#else
+ "",
+- check_canonical_path, NULL, NULL
++#endif
++ NULL, NULL, NULL
+ },
+
+ {
+diff -Naur postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.1.4.orig/src/backend/utils/misc/postgresql.conf.sample 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/utils/misc/postgresql.conf.sample 2012-08-12 19:31:41.492000232 -0400
+@@ -65,7 +65,8 @@
+ # Note: Increasing max_connections costs ~400 bytes of shared memory per
+ # connection slot, plus lock space (see max_locks_per_transaction).
+ #superuser_reserved_connections = 3 # (change requires restart)
+-#unix_socket_directory = '' # (change requires restart)
++#unix_socket_directories = '/tmp' # comma-separated list of directories
++ # (change requires restart)
+ #unix_socket_group = '' # (change requires restart)
+ #unix_socket_permissions = 0777 # begin with 0 to use octal notation
+ # (change requires restart)
+diff -Naur postgresql-9.1.4.orig/src/bin/initdb/initdb.c postgresql-9.1.4/src/bin/initdb/initdb.c
+--- postgresql-9.1.4.orig/src/bin/initdb/initdb.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/bin/initdb/initdb.c 2012-08-12 19:31:41.493000252 -0400
+@@ -947,7 +947,7 @@
+ setup_config(void)
+ {
+ char **conflines;
+- char repltok[100];
++ char repltok[MAXPGPATH];
+ char path[MAXPGPATH];
+
+ fputs(_("creating configuration files ... "), stdout);
+@@ -968,6 +968,15 @@
+ n_buffers * (BLCKSZ / 1024));
+ conflines = replace_token(conflines, "#shared_buffers = 32MB", repltok);
+
++#ifdef HAVE_UNIX_SOCKETS
++ snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
++ DEFAULT_PGSOCKET_DIR);
++#else
++ snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
++#endif
++ conflines = replace_token(conflines, "#unix_socket_directories = '/tmp'",
++ repltok);
++
+ #if DEF_PGPORT != 5432
+ snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
+ conflines = replace_token(conflines, "#port = 5432", repltok);
+diff -Naur postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.1.4/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.1.4.orig/src/bin/pg_ctl/pg_ctl.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/bin/pg_ctl/pg_ctl.c 2012-08-12 19:31:41.494000277 -0400
+@@ -519,7 +519,7 @@
+ hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
+
+ /*
+- * While unix_socket_directory can accept relative
++ * While unix_socket_directories can accept relative
+ * directories, libpq's host parameter must have a
+ * leading slash to indicate a socket directory. So,
+ * ignore sockdir if it's relative, and try to use TCP
+diff -Naur postgresql-9.1.4.orig/src/include/libpq/libpq.h postgresql-9.1.4/src/include/libpq/libpq.h
+--- postgresql-9.1.4.orig/src/include/libpq/libpq.h 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/include/libpq/libpq.h 2012-08-12 19:31:41.494000277 -0400
+@@ -44,12 +44,12 @@
+ /*
+ * prototypes for functions in pqcomm.c
+ */
+-extern int StreamServerPort(int family, char *hostName,
+- unsigned short portNumber, char *unixSocketName, pgsocket ListenSocket[],
+- int MaxListen);
++extern int StreamServerPort(int family, char *hostName,
++ unsigned short portNumber, char *unixSocketDir,
++ pgsocket ListenSocket[], int MaxListen);
+ extern int StreamConnection(pgsocket server_fd, Port *port);
+ extern void StreamClose(pgsocket sock);
+-extern void TouchSocketFile(void);
++extern void TouchSocketFiles(void);
+ extern void pq_init(void);
+ extern void pq_comm_reset(void);
+ extern int pq_getbytes(char *s, size_t len);
+diff -Naur postgresql-9.1.4.orig/src/include/miscadmin.h postgresql-9.1.4/src/include/miscadmin.h
+--- postgresql-9.1.4.orig/src/include/miscadmin.h 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/include/miscadmin.h 2012-08-12 19:31:41.495000302 -0400
+@@ -370,7 +370,7 @@
+ * 2 data directory path
+ * 3 postmaster start timestamp (time_t representation)
+ * 4 port number
+- * 5 socket directory path (empty on Windows)
++ * 5 first Unix socket directory path (empty if none)
+ * 6 first listen_address (IP address or "*"; empty if no TCP port)
+ * 7 shared memory key (not present on Windows)
+ *
+@@ -388,8 +388,9 @@
+ #define LOCK_FILE_LINE_SHMEM_KEY 7
+
+ extern void CreateDataDirLockFile(bool amPostmaster);
+-extern void CreateSocketLockFile(const char *socketfile, bool amPostmaster);
+-extern void TouchSocketLockFile(void);
++extern void CreateSocketLockFile(const char *socketfile, bool amPostmaster,
++ const char *socketDir);
++extern void TouchSocketLockFiles(void);
+ extern void AddToDataDirLockFile(int target_line, const char *str);
+ extern void ValidatePgVersion(const char *path);
+ extern void process_shared_preload_libraries(void);
+diff -Naur postgresql-9.1.4.orig/src/include/postmaster/postmaster.h postgresql-9.1.4/src/include/postmaster/postmaster.h
+--- postgresql-9.1.4.orig/src/include/postmaster/postmaster.h 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/include/postmaster/postmaster.h 2012-08-12 19:31:41.495000302 -0400
+@@ -20,7 +20,7 @@
+ extern int PostPortNumber;
+ extern int Unix_socket_permissions;
+ extern char *Unix_socket_group;
+-extern char *UnixSocketDir;
++extern char *Unix_socket_directories;
+ extern char *ListenAddresses;
+ extern bool ClientAuthInProgress;
+ extern int PreAuthDelay;
+diff -Naur postgresql-9.1.4.orig/src/include/utils/builtins.h postgresql-9.1.4/src/include/utils/builtins.h
+--- postgresql-9.1.4.orig/src/include/utils/builtins.h 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/include/utils/builtins.h 2012-08-12 19:31:41.496000323 -0400
+@@ -726,6 +726,8 @@
+ extern List *textToQualifiedNameList(text *textval);
+ extern bool SplitIdentifierString(char *rawstring, char separator,
+ List **namelist);
++extern bool SplitDirectoriesString(char *rawstring, char separator,
++ List **namelist);
+ extern Datum replace_text(PG_FUNCTION_ARGS);
+ extern text *replace_text_regexp(text *src_text, void *regexp,
+ text *replace_text, bool glob);
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/html-stamp postgresql-9.1.4/doc/src/sgml/html-stamp
+--- postgresql-9.1.4.orig/doc/src/sgml/html-stamp 2012-05-31 19:23:47.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/html-stamp 2012-08-12 19:50:30.401879619 -0400
+@@ -0,0 +1 @@
++hack
+diff -Naur postgresql-9.1.4.orig/doc/src/sgml/man-stamp postgresql-9.1.4/doc/src/sgml/man-stamp
+--- postgresql-9.1.4.orig/doc/src/sgml/man-stamp 2012-05-31 19:24:44.000000000 -0400
++++ postgresql-9.1.4/doc/src/sgml/man-stamp 2012-08-12 19:50:36.017933728 -0400
+@@ -0,0 +1 @@
++hack
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
new file mode 100644
index 0000000..5bad691
--- /dev/null
+++ b/postgresql-var-run-socket.patch
@@ -0,0 +1,94 @@
+Change the built-in default socket directory to be /var/run/postgresql.
+For backwards compatibility with (probably non-libpq-based) clients that
+might still expect to find the socket in /tmp, also create a socket in
+/tmp. This is to resolve communication problems with clients operating
+under systemd's PrivateTmp environment, which won't be using the same
+global /tmp directory as the server; see bug #825448.
+
+Note that we apply the socket directory change at the level of the
+hard-wired defaults in the C code, not by just twiddling the setting in
+postgresql.conf.sample; this is so that the change will take effect on
+server package update, without requiring any existing postgresql.conf
+to be updated. (Of course, a user who dislikes this behavior can still
+override it via postgresql.conf.)
+
+This patch must be applied after postgresql-multi-sockets.patch, at
+least until 9.3 when that will be part of the upstream package.
+
+
+diff -Naur postgresql-9.1.4.sockets/contrib/pg_upgrade/server.c postgresql-9.1.4/contrib/pg_upgrade/server.c
+--- postgresql-9.1.4.sockets/contrib/pg_upgrade/server.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/contrib/pg_upgrade/server.c 2012-08-12 22:43:10.388873678 -0400
+@@ -179,11 +179,14 @@
+ */
+ snprintf(cmd, sizeof(cmd),
+ SYSTEMQUOTE "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" "
+- "-o \"-p %d %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE,
++ "-o \"-p %d %s %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE,
+ cluster->bindir, output_filename, cluster->pgdata, cluster->port,
+ (cluster->controldata.cat_ver >=
+ BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? "-b" :
+ "-c autovacuum=off -c autovacuum_freeze_max_age=2000000000",
++ /* assume 9.1 builds will have newer socket directory */
++ (GET_MAJOR_VERSION(cluster->major_version) < 901) ?
++ "-c unix_socket_directory=/var/run/postgresql" : "",
+ output_filename);
+
+ /*
+diff -Naur postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c postgresql-9.1.4/src/backend/utils/misc/guc.c
+--- postgresql-9.1.4.sockets/src/backend/utils/misc/guc.c 2012-08-12 20:35:22.559682963 -0400
++++ postgresql-9.1.4/src/backend/utils/misc/guc.c 2012-08-12 20:35:55.071983609 -0400
+@@ -2874,7 +2874,7 @@
+ },
+ &Unix_socket_directories,
+ #ifdef HAVE_UNIX_SOCKETS
+- DEFAULT_PGSOCKET_DIR,
++ DEFAULT_PGSOCKET_DIR ", /tmp",
+ #else
+ "",
+ #endif
+diff -Naur postgresql-9.1.4.sockets/src/bin/initdb/initdb.c postgresql-9.1.4/src/bin/initdb/initdb.c
+--- postgresql-9.1.4.sockets/src/bin/initdb/initdb.c 2012-08-12 20:35:22.561682693 -0400
++++ postgresql-9.1.4/src/bin/initdb/initdb.c 2012-08-12 20:35:55.073983799 -0400
+@@ -970,7 +970,7 @@
+
+ #ifdef HAVE_UNIX_SOCKETS
+ snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
+- DEFAULT_PGSOCKET_DIR);
++ DEFAULT_PGSOCKET_DIR ", /tmp");
+ #else
+ snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
+ #endif
+diff -Naur postgresql-9.1.4.sockets/src/include/pg_config_manual.h postgresql-9.1.4/src/include/pg_config_manual.h
+--- postgresql-9.1.4.sockets/src/include/pg_config_manual.h 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/include/pg_config_manual.h 2012-08-12 20:35:55.073983799 -0400
+@@ -141,7 +141,7 @@
+ * here's where to twiddle it. You can also override this at runtime
+ * with the postmaster's -k switch.
+ */
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
+
+ /*
+ * The random() function is expected to yield values between 0 and
+diff -Naur postgresql-9.1.4.sockets/src/test/regress/pg_regress.c postgresql-9.1.4/src/test/regress/pg_regress.c
+--- postgresql-9.1.4.sockets/src/test/regress/pg_regress.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/test/regress/pg_regress.c 2012-08-12 20:38:43.933609334 -0400
+@@ -781,7 +781,7 @@
+ if (hostname != NULL)
+ doputenv("PGHOST", hostname);
+ else
+- unsetenv("PGHOST");
++ doputenv("PGHOST", "/tmp");
+ unsetenv("PGHOSTADDR");
+ if (port != -1)
+ {
+@@ -2240,7 +2240,7 @@
+ */
+ header(_("starting postmaster"));
+ snprintf(buf, sizeof(buf),
+- SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
++ SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" -c \"unix_socket_directories=/tmp\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE,
+ bindir, temp_install,
+ debug ? " -d 5" : "",
+ hostname ? hostname : "",
diff --git a/postgresql.spec b/postgresql.spec
index 352cf65..a5e1ce3 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -85,6 +85,7 @@ Source9: postgresql-setup
Source10: postgresql.service
Source11: initdb.sh
Source12: upgrade.sh
+Source13: postgresql.tmpfiles.d
Source14: postgresql.pam
Source15: postgresql-bashprofile
@@ -93,6 +94,9 @@ Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-oom_score_adj.patch
+Patch5: postgresql-multi-sockets.patch
+Patch6: postgresql-var-run-socket.patch
+Patch7: postgresql-config-comment.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -146,8 +150,6 @@ BuildRequires: libselinux-devel
# main package requires -libs subpackage
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
%description
PostgreSQL is an advanced Object-Relational database management system (DBMS).
The base postgresql package contains the client programs that you'll need to
@@ -182,7 +184,9 @@ Requires(pre): /usr/sbin/useradd
# for /sbin/ldconfig
Requires(post): glibc
Requires(postun): glibc
-# pre/post stuff needs systemd too
+# We require this to be present for %%{_prefix}/lib/tmpfiles.d
+Requires: systemd-units
+# Make sure it's there when scriptlets run, too
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -305,6 +309,9 @@ benchmarks.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -435,7 +442,6 @@ rm -f src/tutorial/GNUmakefile
%endif
%install
-rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install-world
@@ -486,6 +492,13 @@ install -d $RPM_BUILD_ROOT/etc/pam.d
install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
%endif
+# Create the directory for sockets.
+install -d -m 755 $RPM_BUILD_ROOT/var/run/postgresql
+
+# ... and make a tmpfiles script to recreate it at reboot.
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
+install -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/postgresql.conf
+
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
@@ -678,13 +691,9 @@ fi
%postun -p /sbin/ldconfig pltcl
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
# FILES section.
%files -f main.lst
-%defattr(-,root,root)
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
%doc COPYRIGHT README HISTORY doc/bug.template
%doc README.rpm-dist
@@ -721,12 +730,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/pgsql
%files docs
-%defattr(-,root,root)
%doc *-US.pdf
%{_libdir}/pgsql/tutorial/
%files contrib
-%defattr(-,root,root)
%{_datadir}/pgsql/extension/adminpack*
%{_datadir}/pgsql/extension/autoinc*
%{_datadir}/pgsql/extension/btree_gin*
@@ -828,7 +835,6 @@ rm -rf $RPM_BUILD_ROOT
%doc contrib/spi/*.example
%files libs -f libs.lst
-%defattr(-,root,root)
%doc COPYRIGHT
%{_libdir}/libpq.so.*
%{_libdir}/libecpg.so.*
@@ -836,7 +842,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libecpg_compat.so.*
%files server -f server.lst
-%defattr(-,root,root)
%{_unitdir}/postgresql.service
%dir /usr/libexec/initscripts/legacy-actions/postgresql
/usr/libexec/initscripts/legacy-actions/postgresql/*
@@ -872,6 +877,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/pgsql/contrib
%dir %{_datadir}/pgsql/extension
%{_datadir}/pgsql/extension/plpgsql*
+%{_prefix}/lib/tmpfiles.d/postgresql.conf
+%attr(755,postgres,postgres) %dir /var/run/postgresql
%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
@@ -885,7 +892,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/sql_features.txt
%files devel -f devel.lst
-%defattr(-,root,root)
/usr/include/*
%{_bindir}/ecpg
%{_libdir}/libpq.so
@@ -898,7 +904,6 @@ rm -rf $RPM_BUILD_ROOT
%if %upgrade
%files upgrade
-%defattr(-,root,root)
%{_bindir}/pg_upgrade
%{_libdir}/pgsql/pg_upgrade_support.so
%{_libdir}/pgsql/postgresql-%{prevmajorversion}
@@ -906,14 +911,12 @@ rm -rf $RPM_BUILD_ROOT
%if %plperl
%files plperl -f plperl.lst
-%defattr(-,root,root)
%{_datadir}/pgsql/extension/plperl*
%{_libdir}/pgsql/plperl.so
%endif
%if %pltcl
%files pltcl -f pltcl.lst
-%defattr(-,root,root)
%{_datadir}/pgsql/extension/pltcl*
%{_libdir}/pgsql/pltcl.so
%{_bindir}/pltcl_delmod
@@ -924,7 +927,6 @@ rm -rf $RPM_BUILD_ROOT
%if %plpython
%files plpython -f plpython.lst
-%defattr(-,root,root)
%{_datadir}/pgsql/extension/plpython*
%{_libdir}/pgsql/plpython2.so
%endif
@@ -937,6 +939,15 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Aug 13 2012 Tom Lane <tgl(a)redhat.com> 9.1.4-5
+- Back-port upstream support for postmaster listening on multiple Unix sockets
+- Configure postmaster to create sockets in both /var/run/postgresql and /tmp;
+ the former is now the default place for libpq to contact the postmaster.
+Resolves: #825448
+- Annotate postgresql.config about not setting port number there
+- Minor specfile cleanup per suggestions from Tom Callaway
+Related: #845110
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.1.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/postgresql.tmpfiles.d b/postgresql.tmpfiles.d
new file mode 100644
index 0000000..d8d960d
--- /dev/null
+++ b/postgresql.tmpfiles.d
@@ -0,0 +1 @@
+d /var/run/postgresql 0755 postgres postgres -
diff --git a/sources b/sources
index 95818fc..f80623d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a8035688dba988b782725ac1aec60186 postgresql-9.1.4.tar.bz2
-f59cc1a3dbe089d9cc496be119161b3b postgresql-9.1.4-US.pdf
+16153e524a263f7c1e66f5bbc71b8976 postgresql-9.1.4-US.pdf
0e830b0f6538e04b788c3208060256ef postgresql-9.0.8.tar.bz2
commit 0011b0bd433211e93a3dd3a7b90672fbc4a8781c
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jul 20 21:45:24 2012 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 809ebc7..352cf65 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -937,6 +937,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Sat Jul 14 2012 Tom Lane <tgl(a)redhat.com> 9.1.4-3
- Update code to use oom_score_adj not oom_adj, thereby suppressing
whining in the kernel log
commit 67b80785ce2dccd2e57ac5068121c33841762e86
Author: Tom Lane <tgl(a)redhat.com>
Date: Sat Jul 14 23:45:13 2012 -0400
Add legacy action scripts, fix oom_score_adj usage
diff --git a/initdb.sh b/initdb.sh
new file mode 100755
index 0000000..c238574
--- /dev/null
+++ b/initdb.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# Legacy action script for "service postgresql initdb"
+
+# Find the name of the service
+SERVICE_NAME=$(basename $(dirname "$0"))
+if [ x"$SERVICE_NAME" = x. ]
+then
+ SERVICE_NAME=postgresql
+fi
+
+echo Hint: the preferred way to do this is now '"postgresql-setup initdb"' >&2
+
+/usr/bin/postgresql-setup initdb "$SERVICE_NAME"
+
+exit $?
diff --git a/postgresql-oom_score_adj.patch b/postgresql-oom_score_adj.patch
new file mode 100644
index 0000000..aade1d5
--- /dev/null
+++ b/postgresql-oom_score_adj.patch
@@ -0,0 +1,52 @@
+Back-patch upstream's 9.2 patch to add support for setting oom_score_adj.
+
+
+diff -Naur postgresql-9.1.4.orig/src/backend/postmaster/fork_process.c postgresql-9.1.4/src/backend/postmaster/fork_process.c
+--- postgresql-9.1.4.orig/src/backend/postmaster/fork_process.c 2012-05-31 19:07:09.000000000 -0400
++++ postgresql-9.1.4/src/backend/postmaster/fork_process.c 2012-07-14 17:55:42.911859485 -0400
+@@ -68,12 +68,40 @@
+ * process sizes *including shared memory*. (This is unbelievably
+ * stupid, but the kernel hackers seem uninterested in improving it.)
+ * Therefore it's often a good idea to protect the postmaster by
+- * setting its oom_adj value negative (which has to be done in a
+- * root-owned startup script). If you just do that much, all child
++ * setting its oom_score_adj value negative (which has to be done in a
++ * root-owned startup script). If you just do that much, all child
+ * processes will also be protected against OOM kill, which might not
+- * be desirable. You can then choose to build with LINUX_OOM_ADJ
+- * #defined to 0, or some other value that you want child processes to
+- * adopt here.
++ * be desirable. You can then choose to build with
++ * LINUX_OOM_SCORE_ADJ #defined to 0, or to some other value that you
++ * want child processes to adopt here.
++ */
++#ifdef LINUX_OOM_SCORE_ADJ
++ {
++ /*
++ * Use open() not stdio, to ensure we control the open flags. Some
++ * Linux security environments reject anything but O_WRONLY.
++ */
++ int fd = open("/proc/self/oom_score_adj", O_WRONLY, 0);
++
++ /* We ignore all errors */
++ if (fd >= 0)
++ {
++ char buf[16];
++ int rc;
++
++ snprintf(buf, sizeof(buf), "%d\n", LINUX_OOM_SCORE_ADJ);
++ rc = write(fd, buf, strlen(buf));
++ (void) rc;
++ close(fd);
++ }
++ }
++#endif /* LINUX_OOM_SCORE_ADJ */
++
++ /*
++ * Older Linux kernels have oom_adj not oom_score_adj. This works
++ * similarly except with a different scale of adjustment values.
++ * If it's necessary to build Postgres to work with either API,
++ * you can define both LINUX_OOM_SCORE_ADJ and LINUX_OOM_ADJ.
+ */
+ #ifdef LINUX_OOM_ADJ
+ {
diff --git a/postgresql.spec b/postgresql.spec
index 65e3d6c..809ebc7 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -83,6 +83,8 @@ Source7: ecpg_config.h
Source8: README.rpm-dist
Source9: postgresql-setup
Source10: postgresql.service
+Source11: initdb.sh
+Source12: upgrade.sh
Source14: postgresql.pam
Source15: postgresql-bashprofile
@@ -90,6 +92,7 @@ Source15: postgresql-bashprofile
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
+Patch4: postgresql-oom_score_adj.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -301,6 +304,7 @@ benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -330,8 +334,8 @@ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# Add LINUX_OOM_ADJ=0 to ensure child processes reset postmaster's oom_adj
-CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
+# Add LINUX_OOM_SCORE_ADJ=0 to ensure child processes reset postmaster's oom_score_adj
+CFLAGS="$CFLAGS -DLINUX_OOM_SCORE_ADJ=0"
# let's try removing this kluge, it may just be a workaround for bz#520916
# # use -O1 on sparc64 and alpha
# %%ifarch sparc64 alpha
@@ -473,6 +477,10 @@ install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-chec
install -d $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/postgresql.service
+install -d $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql
+install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/initdb
+install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/usr/libexec/initscripts/legacy-actions/postgresql/upgrade
+
%if %pam
install -d $RPM_BUILD_ROOT/etc/pam.d
install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
@@ -830,6 +838,8 @@ rm -rf $RPM_BUILD_ROOT
%files server -f server.lst
%defattr(-,root,root)
%{_unitdir}/postgresql.service
+%dir /usr/libexec/initscripts/legacy-actions/postgresql
+/usr/libexec/initscripts/legacy-actions/postgresql/*
%if %pam
%config(noreplace) /etc/pam.d/postgresql
%endif
@@ -927,6 +937,14 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jul 14 2012 Tom Lane <tgl(a)redhat.com> 9.1.4-3
+- Update code to use oom_score_adj not oom_adj, thereby suppressing
+ whining in the kernel log
+- Add "legacy action" scripts to support "service postgresql initdb" and
+ "service postgresql upgrade" in a now-approved fashion (requires a
+ recent version of initscripts to work)
+Resolves: #800416
+
* Mon Jun 11 2012 Petr Pisar <ppisar(a)redhat.com> - 9.1.4-2
- Perl 5.16 rebuild
diff --git a/upgrade.sh b/upgrade.sh
new file mode 100755
index 0000000..c542494
--- /dev/null
+++ b/upgrade.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# Legacy action script for "service postgresql upgrade"
+
+# Find the name of the service
+SERVICE_NAME=$(basename $(dirname "$0"))
+if [ x"$SERVICE_NAME" = x. ]
+then
+ SERVICE_NAME=postgresql
+fi
+
+echo Hint: the preferred way to do this is now '"postgresql-setup upgrade"' >&2
+
+/usr/bin/postgresql-setup upgrade "$SERVICE_NAME"
+
+exit $?
commit b937d0f13cd7cb8bf5c585509555ae9b6f72994f
Author: Petr Psa <ppisar(a)redhat.com>
Date: Mon Jun 11 15:16:04 2012 +0200
Perl 5.16 rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 8b72f46..65e3d6c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -927,6 +927,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jun 11 2012 Petr Pisar <ppisar(a)redhat.com> - 9.1.4-2
+- Perl 5.16 rebuild
+
* Mon Jun 4 2012 Tom Lane <tgl(a)redhat.com> 9.1.4-1
- Update to PostgreSQL 9.1.4, for various fixes described at
http://www.postgresql.org/docs/9.1/static/release-9-1-4.html
commit e4938de9a3edb96407d7d02830e72e2004c9a580
Author: Tom Lane <tgl(a)redhat.com>
Date: Wed Jun 6 22:43:07 2012 -0400
Update service file per recent packaging guidelines changes.
diff --git a/postgresql.service b/postgresql.service
index 123c4fe..6545b6e 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -22,7 +22,6 @@
[Unit]
Description=PostgreSQL database server
-After=syslog.target
After=network.target
[Service]
@@ -39,7 +38,8 @@ Environment=PGDATA=/var/lib/pgsql/data
# Where to send early-startup messages from the server (before the logging
# options of postgresql.conf take effect)
-StandardOutput=syslog
+# This is normally controlled by the global default set by systemd
+# StandardOutput=syslog
# Disable OOM kill on the postmaster
OOMScoreAdjust=-1000
commit d270fa3ca6b8418f6f26ee47d9cdb851efea60be
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Jun 4 08:31:09 2012 -0400
Update to 9.1.4.
diff --git a/.gitignore b/.gitignore
index bda415a..7ea9ff9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.1.3.tar.bz2
-/postgresql-9.1.3-US.pdf
-/postgresql-9.0.7.tar.bz2
+/postgresql-9.1.4.tar.bz2
+/postgresql-9.1.4-US.pdf
+/postgresql-9.0.8.tar.bz2
diff --git a/postgresql.init b/postgresql.init
deleted file mode 100644
index 46e1294..0000000
--- a/postgresql.init
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# This is not needed any more for the standard systemctl-supported actions,
-# but we keep it around for the nonstandard actions (initdb, upgrade).
-# People are too used to getting at those via "service postgresql foo ..."
-
-# Find the name of the script
-NAME=`basename $0`
-if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]
-then
- NAME=${NAME:3}
-fi
-
-case "$1" in
- start)
- systemctl start ${NAME}.service
- ;;
- stop)
- systemctl stop ${NAME}.service
- ;;
- status)
- systemctl status ${NAME}.service
- ;;
- restart)
- systemctl restart ${NAME}.service
- ;;
- condrestart|try-restart)
- systemctl try-restart ${NAME}.service
- ;;
- reload)
- systemctl reload ${NAME}.service
- ;;
- initdb)
- postgresql-setup initdb
- ;;
- upgrade)
- postgresql-setup upgrade
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|initdb|upgrade}"
- exit 2
-esac
-
-exit $?
diff --git a/postgresql.spec b/postgresql.spec
index 3bebb5b..8b72f46 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,8 +52,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
-Version: 9.1.3
-Release: 3%{?dist}
+Version: 9.1.4
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -67,7 +67,7 @@ Url: http://www.postgresql.org/
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series.
-%global prevversion 9.0.7
+%global prevversion 9.0.8
%global prevmajorversion 9.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -83,7 +83,6 @@ Source7: ecpg_config.h
Source8: README.rpm-dist
Source9: postgresql-setup
Source10: postgresql.service
-Source11: postgresql.init
Source14: postgresql.pam
Source15: postgresql-bashprofile
@@ -474,9 +473,6 @@ install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-chec
install -d $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/postgresql.service
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
-
%if %pam
install -d $RPM_BUILD_ROOT/etc/pam.d
install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
@@ -834,7 +830,6 @@ rm -rf $RPM_BUILD_ROOT
%files server -f server.lst
%defattr(-,root,root)
%{_unitdir}/postgresql.service
-/etc/rc.d/init.d/postgresql
%if %pam
%config(noreplace) /etc/pam.d/postgresql
%endif
@@ -932,6 +927,17 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jun 4 2012 Tom Lane <tgl(a)redhat.com> 9.1.4-1
+- Update to PostgreSQL 9.1.4, for various fixes described at
+ http://www.postgresql.org/docs/9.1/static/release-9-1-4.html
+ including the fixes for CVE-2012-2143, CVE-2012-2655
+Resolves: #826606
+- Update previous version (embedded in postgresql-upgrade) to 9.0.8
+ because fix in whole-row variable dumping could be needed for upgrades
+- Revert fix for bug #800416, per fedora-packaging discussion at
+ http://lists.fedoraproject.org/pipermail/packaging/2012-April/008314.html
+ "service postgresql initdb" is dead and will stay that way
+
* Sat Mar 17 2012 Tom Lane <tgl(a)redhat.com> 9.1.3-3
- Fix postgresql-setup to rely on systemd to parse the unit file, instead
of using ad-hoc code
diff --git a/sources b/sources
index a20d219..95818fc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-641e1915f7ebfdc9f138e4c55b6aec0e postgresql-9.1.3.tar.bz2
-2deab3e198568853354f328852547d5a postgresql-9.1.3-US.pdf
-27e67f48607c29df8ca6aab2a6fdf0b8 postgresql-9.0.7.tar.bz2
+a8035688dba988b782725ac1aec60186 postgresql-9.1.4.tar.bz2
+f59cc1a3dbe089d9cc496be119161b3b postgresql-9.1.4-US.pdf
+0e830b0f6538e04b788c3208060256ef postgresql-9.0.8.tar.bz2
commit de5b387d8f78a230a679ee28733b920eb1849515
Author: Tom Lane <tgl(a)redhat.com>
Date: Sat Mar 17 12:47:37 2012 -0400
Fix postgresql-setup to rely on systemd to parse the unit file
diff --git a/postgresql-setup b/postgresql-setup
index 29da10a..132ef78 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -23,24 +23,27 @@ then
SERVICE_NAME=postgresql
fi
-if [ -f "/etc/systemd/system/${SERVICE_NAME}.service" ]
-then
- SERVICE_FILE="/etc/systemd/system/${SERVICE_NAME}.service"
-elif [ -f "/usr/lib/systemd/system/${SERVICE_NAME}.service" ]
-then
- SERVICE_FILE="/usr/lib/systemd/system/${SERVICE_NAME}.service"
-# this case should go away eventually, but not till F16 is dead:
-elif [ -f "/lib/systemd/system/${SERVICE_NAME}.service" ]
+# this parsing technique fails for PGDATA pathnames containing spaces,
+# but there's not much I can do about it given systemctl's output format...
+PGDATA=`systemctl show -p Environment "${SERVICE_NAME}.service" |
+ sed 's/^Environment=//' | tr ' ' '\n' |
+ sed -n 's/^PGDATA=//p' | tail -n 1`
+
+if [ x"$PGDATA" = x ]
then
- SERVICE_FILE="/lib/systemd/system/${SERVICE_NAME}.service"
-else
- echo "Could not find systemd unit file ${SERVICE_NAME}.service"
+ echo "failed to find PGDATA setting in ${SERVICE_NAME}.service"
exit 1
fi
-# Get port number and data directory from the service file
-PGPORT=`sed -n 's/^[ \t]*Environment=PGPORT=//p' "${SERVICE_FILE}"`
-PGDATA=`sed -n 's/^[ \t]*Environment=PGDATA=//p' "${SERVICE_FILE}"`
+PGPORT=`systemctl show -p Environment "${SERVICE_NAME}.service" |
+ sed 's/^Environment=//' | tr ' ' '\n' |
+ sed -n 's/^PGPORT=//p' | tail -n 1`
+
+if [ x"$PGPORT" = x ]
+then
+ echo "failed to find PGPORT setting in ${SERVICE_NAME}.service"
+ exit 1
+fi
# Log file for initdb
PGLOG=/var/lib/pgsql/initdb.log
@@ -48,8 +51,8 @@ PGLOG=/var/lib/pgsql/initdb.log
# Log file for pg_upgrade
PGUPLOG=/var/lib/pgsql/pgupgrade.log
-export PGPORT
export PGDATA
+export PGPORT
# For SELinux we need to use 'runuser' not 'su'
if [ -x /sbin/runuser ]
diff --git a/postgresql.service b/postgresql.service
index 4414d11..123c4fe 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -14,6 +14,12 @@
# Environment=PGPORT=5433
# This will override the setting appearing below.
+# Note: do not use a PGDATA pathname containing spaces, or you will
+# break postgresql-setup.
+
+# Note: in F-17 and beyond, /usr/lib/... is recommended in the .include line
+# though /lib/... will still work.
+
[Unit]
Description=PostgreSQL database server
After=syslog.target
@@ -25,9 +31,6 @@ Type=forking
User=postgres
Group=postgres
-# Note: avoid inserting whitespace in these Environment= lines, or you may
-# break postgresql-setup.
-
# Port number for server to listen on
Environment=PGPORT=5432
diff --git a/postgresql.spec b/postgresql.spec
index 3bc92c4..3bebb5b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -932,6 +932,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Mar 17 2012 Tom Lane <tgl(a)redhat.com> 9.1.3-3
+- Fix postgresql-setup to rely on systemd to parse the unit file, instead
+ of using ad-hoc code
+Resolves: #804290
+
* Tue Mar 13 2012 Tom Lane <tgl(a)redhat.com> 9.1.3-2
- Fix postgresql-setup to look for unit file in /usr/lib and to ignore
comments therein
commit 338b75480d86c34acbe9b54cbd975394f3c5e6c3
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue Mar 13 19:38:14 2012 -0400
Fix postgresql-setup, re-add init script
diff --git a/postgresql-setup b/postgresql-setup
index 8b2a9ce..29da10a 100644
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -26,6 +26,10 @@ fi
if [ -f "/etc/systemd/system/${SERVICE_NAME}.service" ]
then
SERVICE_FILE="/etc/systemd/system/${SERVICE_NAME}.service"
+elif [ -f "/usr/lib/systemd/system/${SERVICE_NAME}.service" ]
+then
+ SERVICE_FILE="/usr/lib/systemd/system/${SERVICE_NAME}.service"
+# this case should go away eventually, but not till F16 is dead:
elif [ -f "/lib/systemd/system/${SERVICE_NAME}.service" ]
then
SERVICE_FILE="/lib/systemd/system/${SERVICE_NAME}.service"
@@ -35,8 +39,8 @@ else
fi
# Get port number and data directory from the service file
-PGPORT=`sed -n 's/Environment=PGPORT=//p' "${SERVICE_FILE}"`
-PGDATA=`sed -n 's/Environment=PGDATA=//p' "${SERVICE_FILE}"`
+PGPORT=`sed -n 's/^[ \t]*Environment=PGPORT=//p' "${SERVICE_FILE}"`
+PGDATA=`sed -n 's/^[ \t]*Environment=PGDATA=//p' "${SERVICE_FILE}"`
# Log file for initdb
PGLOG=/var/lib/pgsql/initdb.log
diff --git a/postgresql.init b/postgresql.init
new file mode 100644
index 0000000..46e1294
--- /dev/null
+++ b/postgresql.init
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# This is not needed any more for the standard systemctl-supported actions,
+# but we keep it around for the nonstandard actions (initdb, upgrade).
+# People are too used to getting at those via "service postgresql foo ..."
+
+# Find the name of the script
+NAME=`basename $0`
+if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]
+then
+ NAME=${NAME:3}
+fi
+
+case "$1" in
+ start)
+ systemctl start ${NAME}.service
+ ;;
+ stop)
+ systemctl stop ${NAME}.service
+ ;;
+ status)
+ systemctl status ${NAME}.service
+ ;;
+ restart)
+ systemctl restart ${NAME}.service
+ ;;
+ condrestart|try-restart)
+ systemctl try-restart ${NAME}.service
+ ;;
+ reload)
+ systemctl reload ${NAME}.service
+ ;;
+ initdb)
+ postgresql-setup initdb
+ ;;
+ upgrade)
+ postgresql-setup upgrade
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|initdb|upgrade}"
+ exit 2
+esac
+
+exit $?
diff --git a/postgresql.spec b/postgresql.spec
index 3fd9bea..3bc92c4 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -83,6 +83,7 @@ Source7: ecpg_config.h
Source8: README.rpm-dist
Source9: postgresql-setup
Source10: postgresql.service
+Source11: postgresql.init
Source14: postgresql.pam
Source15: postgresql-bashprofile
@@ -473,6 +474,9 @@ install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-chec
install -d $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/postgresql.service
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+
%if %pam
install -d $RPM_BUILD_ROOT/etc/pam.d
install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
@@ -830,6 +834,7 @@ rm -rf $RPM_BUILD_ROOT
%files server -f server.lst
%defattr(-,root,root)
%{_unitdir}/postgresql.service
+/etc/rc.d/init.d/postgresql
%if %pam
%config(noreplace) /etc/pam.d/postgresql
%endif
@@ -927,6 +932,14 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Mar 13 2012 Tom Lane <tgl(a)redhat.com> 9.1.3-2
+- Fix postgresql-setup to look for unit file in /usr/lib and to ignore
+ comments therein
+Resolves: #802835
+- Resurrect a now-mostly-dummy postgresql init script, so that people can
+ keep on using "service postgresql initdb" if they wish
+Resolves: #800416
+
* Mon Feb 27 2012 Tom Lane <tgl(a)redhat.com> 9.1.3-1
- Update to PostgreSQL 9.1.3, for various fixes described at
http://www.postgresql.org/docs/9.1/static/release-9-1-3.html
commit 2e73ff757cfdd20a708fc783e09ff23f3d8644e0
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Feb 27 11:05:52 2012 -0500
Update to PostgreSQL 9.1.3
diff --git a/.gitignore b/.gitignore
index 295e700..bda415a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.1.2.tar.bz2
-/postgresql-9.1.2-US.pdf
-/postgresql-9.0.4.tar.bz2
+/postgresql-9.1.3.tar.bz2
+/postgresql-9.1.3-US.pdf
+/postgresql-9.0.7.tar.bz2
diff --git a/postgresql.service b/postgresql.service
index e59ce5c..4414d11 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -1,3 +1,19 @@
+# It's not recommended to modify this file in-place, because it will be
+# overwritten during package upgrades. If you want to customize, the
+# best way is to create a file "/etc/systemd/system/postgresql.service",
+# containing
+# .include /lib/systemd/system/postgresql.service
+# ...make your changes here...
+# For more info about custom unit files, see
+# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_a...
+
+# For example, if you want to change the server's port number to 5433,
+# create a file named "/etc/systemd/system/postgresql.service" containing:
+# .include /lib/systemd/system/postgresql.service
+# [Service]
+# Environment=PGPORT=5433
+# This will override the setting appearing below.
+
[Unit]
Description=PostgreSQL database server
After=syslog.target
diff --git a/postgresql.spec b/postgresql.spec
index 606a0d1..3fd9bea 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,8 +52,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
-Version: 9.1.2
-Release: 2%{?dist}
+Version: 9.1.3
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -67,7 +67,7 @@ Url: http://www.postgresql.org/
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series.
-%global prevversion 9.0.4
+%global prevversion 9.0.7
%global prevmajorversion 9.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -927,6 +927,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Feb 27 2012 Tom Lane <tgl(a)redhat.com> 9.1.3-1
+- Update to PostgreSQL 9.1.3, for various fixes described at
+ http://www.postgresql.org/docs/9.1/static/release-9-1-3.html
+ including the fixes for CVE-2012-0866, CVE-2012-0867, CVE-2012-0868
+Resolves: #797918
+
* Mon Jan 9 2012 Tom Lane <tgl(a)redhat.com> 9.1.2-2
- Make systemd unit file more user-friendly by resurrecting the old init
script's checks for data directory presence and version match
diff --git a/sources b/sources
index a853c4c..a20d219 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-7dbff52221954c46595313eb7f92c3e0 postgresql-9.1.2.tar.bz2
-41e90d2e3b1ba88801fed96d553d9417 postgresql-9.1.2-US.pdf
-80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2
+641e1915f7ebfdc9f138e4c55b6aec0e postgresql-9.1.3.tar.bz2
+2deab3e198568853354f328852547d5a postgresql-9.1.3-US.pdf
+27e67f48607c29df8ca6aab2a6fdf0b8 postgresql-9.0.7.tar.bz2
commit d44dce3f6c2dfe6800952075ca4f737392baba6a
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Jan 9 15:24:29 2012 -0500
Resurrect startup check for database presence.
diff --git a/postgresql-check-db-dir b/postgresql-check-db-dir
new file mode 100644
index 0000000..4266c7a
--- /dev/null
+++ b/postgresql-check-db-dir
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# This script verifies that the postgresql data directory has been correctly
+# initialized. We do not want to automatically initdb it, because that has
+# a risk of catastrophic failure (ie, overwriting a valuable database) in
+# corner cases, such as a remotely mounted database on a volume that's a
+# bit slow to mount. But we can at least emit a message advising newbies
+# what to do.
+
+PGDATA="$1"
+
+if [ -z "$PGDATA" ]
+then
+ echo "Usage: $0 database-path"
+ exit 1
+fi
+
+# PGVERSION is the full package version, e.g., 9.1.2
+# Note: the specfile inserts the correct value during package build
+PGVERSION=xxxx
+# PGMAJORVERSION is major version, e.g., 9.1 (this should match PG_VERSION)
+PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
+# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
+# Note: the specfile inserts the correct value during package build
+PREVMAJORVERSION=xxxx
+# PGDOCDIR is the directory containing the package's documentation
+# Note: the specfile inserts the correct value during package build
+PGDOCDIR=xxxx
+
+# Check for the PGDATA structure
+if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
+then
+ # Check version of existing PGDATA
+ if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
+ then
+ : A-OK
+ elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
+ then
+ echo $"An old version of the database format was found."
+ echo $"Use \"postgresql-setup upgrade\" to upgrade to version $PGMAJORVERSION."
+ echo $"See $PGDOCDIR/README.rpm-dist for more information."
+ exit 1
+ else
+ echo $"An old version of the database format was found."
+ echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION."
+ echo $"See $PGDOCDIR/README.rpm-dist for more information."
+ exit 1
+ fi
+else
+ # No existing PGDATA! Warn the user to initdb it.
+ echo $"\"$PGDATA\" is missing or empty."
+ echo $"Use \"postgresql-setup initdb\" to initialize the database cluster."
+ echo $"See $PGDOCDIR/README.rpm-dist for more information."
+ exit 1
+fi
+
+exit 0
diff --git a/postgresql.service b/postgresql.service
index 0c733bd..e59ce5c 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -25,6 +25,7 @@ StandardOutput=syslog
# Disable OOM kill on the postmaster
OOMScoreAdjust=-1000
+ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGDATA}
ExecStart=/usr/bin/pg_ctl start -D ${PGDATA} -s -o "-p ${PGPORT}" -w -t 300
ExecStop=/usr/bin/pg_ctl stop -D ${PGDATA} -s -m fast
ExecReload=/usr/bin/pg_ctl reload -D ${PGDATA} -s
diff --git a/postgresql.spec b/postgresql.spec
index 9e096ce..606a0d1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -76,6 +76,7 @@ Source1: postgresql-%{version}-US.pdf
# generate-pdf.sh is not used during RPM build, but include for documentation
Source2: generate-pdf.sh
Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
+Source4: postgresql-check-db-dir
Source5: Makefile.regress
Source6: pg_config.h
Source7: ecpg_config.h
@@ -450,7 +451,7 @@ case `uname -i` in
esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
-cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
+cp -p src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
# prep the setup script, including insertion of some values it needs
sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
@@ -458,8 +459,17 @@ sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
-e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
-e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
<%{SOURCE9} >postgresql-setup
+touch -r %{SOURCE9} postgresql-setup
install -m 755 postgresql-setup $RPM_BUILD_ROOT%{_bindir}/postgresql-setup
+# prep the startup check script, including insertion of some values it needs
+sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
+ -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
+ -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_docdir}/%{name}-%{version}|' \
+ <%{SOURCE4} >postgresql-check-db-dir
+touch -r %{SOURCE4} postgresql-check-db-dir
+install -m 755 postgresql-check-db-dir $RPM_BUILD_ROOT%{_bindir}/postgresql-check-db-dir
+
install -d $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/postgresql.service
@@ -831,6 +841,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/postgres
%{_bindir}/postmaster
%{_bindir}/postgresql-setup
+%{_bindir}/postgresql-check-db-dir
%{_mandir}/man1/initdb.*
%{_mandir}/man1/pg_basebackup.*
%{_mandir}/man1/pg_controldata.*
@@ -916,6 +927,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jan 9 2012 Tom Lane <tgl(a)redhat.com> 9.1.2-2
+- Make systemd unit file more user-friendly by resurrecting the old init
+ script's checks for data directory presence and version match
+Resolves: #771496
+
* Mon Dec 5 2011 Tom Lane <tgl(a)redhat.com> 9.1.2-1
- Update to PostgreSQL 9.1.2, for various fixes described at
http://www.postgresql.org/docs/9.1/static/release-9-1-2.html
commit a60f809e4269969eadd775a435ee7d682389dfbc
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Dec 5 11:32:50 2011 -0500
Update to PostgreSQL 9.1.2
diff --git a/.gitignore b/.gitignore
index 5a63aff..295e700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.1.1.tar.bz2
-/postgresql-9.1.1-US.pdf
+/postgresql-9.1.2.tar.bz2
+/postgresql-9.1.2-US.pdf
/postgresql-9.0.4.tar.bz2
diff --git a/generate-pdf.sh b/generate-pdf.sh
index 9158a45..8a8ada5 100755
--- a/generate-pdf.sh
+++ b/generate-pdf.sh
@@ -13,9 +13,10 @@
# You will need to have the docbook packages installed to run this.
# Expect it to take about 20 minutes and use about 160MB of disk.
-# Extract version from specfile
+set -e
-VERSION=`sed -n 's/^Version: //p' postgresql.spec`
+# Pass package version (e.g., 9.1.2) as argument
+VERSION=$1
TARGETFILE=postgresql-$VERSION-US.pdf
@@ -23,17 +24,19 @@ echo Building $TARGETFILE ...
# Unpack and configure postgresql
-tar xfj postgresql-$VERSION.tar.bz2 || exit 1
+rm -rf postgresql-$VERSION
+
+tar xfj postgresql-$VERSION.tar.bz2
-cd postgresql-$VERSION || exit 1
+cd postgresql-$VERSION
-./configure >/dev/null || exit 1
+./configure >/dev/null
# Build the PDF docs
cd doc/src/sgml
-make postgres-US.pdf >make.log || exit 1
+make postgres-US.pdf >make.log
mv -f postgres-US.pdf ../../../../$TARGETFILE
diff --git a/postgresql-no-sepsql-test.patch b/postgresql-no-sepsql-test.patch
deleted file mode 100644
index e5361e2..0000000
--- a/postgresql-no-sepsql-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-We can't run the contrib/sepgsql regression tests during build, because they
-assume that some root-privilege-requiring hacks have been made to the SELinux
-configuration. So just dike out the settings that would cause them to be run.
-Something similar to this will probably be done upstream for PG 9.1.2 and
-later.
-
-
-diff -Naur postgresql-9.1.1.orig/contrib/sepgsql/Makefile postgresql-9.1.1/contrib/sepgsql/Makefile
---- postgresql-9.1.1.orig/contrib/sepgsql/Makefile 2011-09-22 17:57:57.000000000 -0400
-+++ postgresql-9.1.1/contrib/sepgsql/Makefile 2011-09-26 16:47:53.772278112 -0400
-@@ -5,9 +5,6 @@
- schema.o relation.o proc.o
- DATA_built = sepgsql.sql
-
--REGRESS = label dml misc
--REGRESS_OPTS = --launcher $(top_builddir)/contrib/sepgsql/launcher
--
- EXTRA_CLEAN = -r tmp *.pp sepgsql-regtest.if sepgsql-regtest.fc
-
- ifdef USE_PGXS
diff --git a/postgresql.spec b/postgresql.spec
index ef2b3db..9e096ce 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,8 +52,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
-Version: 9.1.1
-Release: 2%{?dist}
+Version: 9.1.2
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -89,7 +89,6 @@ Source15: postgresql-bashprofile
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
-Patch4: postgresql-no-sepsql-test.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -301,7 +300,6 @@ benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -918,6 +916,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Dec 5 2011 Tom Lane <tgl(a)redhat.com> 9.1.2-1
+- Update to PostgreSQL 9.1.2, for various fixes described at
+ http://www.postgresql.org/docs/9.1/static/release-9-1-2.html
+
* Wed Nov 02 2011 Honza Horak <hhorak(a)redhat.com> 9.1.1-2
- Create a symlink of pg_regress instead of full copy;
Don't strip symbols from regress libs
diff --git a/sources b/sources
index 26f8c85..a853c4c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-061a9f17323117c9358ed60f33ecff78 postgresql-9.1.1.tar.bz2
-a085e5da2adf53e3979c3a16b58eee12 postgresql-9.1.1-US.pdf
+7dbff52221954c46595313eb7f92c3e0 postgresql-9.1.2.tar.bz2
+41e90d2e3b1ba88801fed96d553d9417 postgresql-9.1.2-US.pdf
80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2
commit 9c2d09be8cf37ce0c03892f14ca29e50d35547f1
Merge: f82c498 464a98d
Author: Honza Hork <hhorak(a)redhat.com>
Date: Tue Nov 8 17:58:26 2011 +0100
Merge branch 'master' of ssh://pkgs.fedoraproject.org/postgresql
commit f82c4987401c572b970c4e99ab8c9c0712da4b01
Author: Honza Hork <hhorak(a)redhat.com>
Date: Tue Nov 8 17:57:50 2011 +0100
Changed Resolves to Related by bug #729012
diff --git a/postgresql.spec b/postgresql.spec
index b1fe28c..b4fdcb9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -935,7 +935,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Nov 02 2011 Honza Horak <hhorak(a)redhat.com> 9.1.1-2
- Create a symlink of pg_regress instead of full copy;
Don't strip symbols from regress libs
-Resolves: #729012
+Related: #729012
* Mon Sep 26 2011 Tom Lane <tgl(a)redhat.com> 9.1.1-1
- Update to PostgreSQL 9.1.1, for various fixes described at
commit 464a98d92f46fcfda6e6137ffaf83b4f290423fc
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Nov 7 12:21:47 2011 -0500
Improve %description text for PostgreSQL.
diff --git a/postgresql.spec b/postgresql.spec
index b1fe28c..8f15794 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -146,22 +146,14 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
-PostgreSQL is an advanced Object-Relational database management system
-(DBMS) that supports almost all SQL constructs (including
-transactions, sub-selects and user-defined types and functions). The
-postgresql package includes the client programs and libraries that
-you'll need to access a PostgreSQL DBMS server. These PostgreSQL
-client programs are programs that directly manipulate the internal
-structure of PostgreSQL databases on a PostgreSQL server. These client
-programs can be located on the same machine with the PostgreSQL
-server, or may be on a remote machine which accesses a PostgreSQL
-server over a network connection. This package contains the docs
-in HTML for the whole package, as well as command-line utilities for
-managing PostgreSQL databases on a PostgreSQL server.
-
-If you want to manipulate a PostgreSQL database on a local or remote PostgreSQL
-server, you need this package. You also need to install this package
-if you're installing the postgresql-server package.
+PostgreSQL is an advanced Object-Relational database management system (DBMS).
+The base postgresql package contains the client programs that you'll need to
+access a PostgreSQL DBMS server, as well as HTML documentation for the whole
+system. These client programs can be located on the same machine as the
+PostgreSQL server, or on a remote machine that accesses a PostgreSQL server
+over a network connection. The PostgreSQL server can be found in the
+postgresql-server sub-package.
+
%package libs
Summary: The shared libraries required for any PostgreSQL clients
@@ -177,6 +169,7 @@ PostgreSQL client program or interface. You will need to install this package
to use any other PostgreSQL package or any clients that need to connect to a
PostgreSQL server.
+
%package server
Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
@@ -197,15 +190,10 @@ Requires(post): systemd-sysv
Requires(post): chkconfig
%description server
-The postgresql-server package includes the programs needed to create
+PostgreSQL is an advanced Object-Relational database management system (DBMS).
+The postgresql-server package contains the programs needed to create
and run a PostgreSQL server, which will in turn allow you to create
-and maintain PostgreSQL databases. PostgreSQL is an advanced
-Object-Relational database management system (DBMS) that supports
-almost all SQL constructs (including transactions, sub-selects and
-user-defined types and functions). You should install
-postgresql-server if you want to create and maintain your own
-PostgreSQL databases and/or your own PostgreSQL server. You also need
-to install the postgresql package.
+and maintain PostgreSQL databases.
%package docs
@@ -214,19 +202,19 @@ Group: Applications/Databases
Requires: %{name}%{?_isa} = %{version}-%{release}
%description docs
-The postgresql-docs package includes some additional documentation for
+The postgresql-docs package contains some additional documentation for
PostgreSQL. Currently, this includes the main documentation in PDF format
and source files for the PostgreSQL tutorial.
%package contrib
-Summary: Contributed modules distributed with PostgreSQL
+Summary: Extension modules distributed with PostgreSQL
Group: Applications/Databases
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description contrib
-The postgresql-contrib package contains contributed packages that are
+The postgresql-contrib package contains various extension modules that are
included in the PostgreSQL distribution.
@@ -239,9 +227,9 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
The postgresql-devel package contains the header files and libraries
needed to compile C or C++ applications which will directly interact
-with a PostgreSQL database management server and the ecpg Embedded C
-Postgres preprocessor. You need to install this package if you want to
-develop applications which will interact with a PostgreSQL server.
+with a PostgreSQL database management server. It also contains the ecpg
+Embedded C Postgres preprocessor. You need to install this package if you want
+to develop applications which will interact with a PostgreSQL server.
%if %upgrade
@@ -252,10 +240,9 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description upgrade
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-upgrade package includes the pg_upgrade utility
-and supporting files needed for upgrading a database from the previous
-major version of PostgreSQL.
+The postgresql-upgrade package contains the pg_upgrade utility and supporting
+files needed for upgrading a PostgreSQL database from the previous major
+version of PostgreSQL.
%endif
@@ -267,9 +254,9 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description plperl
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-plperl package contains the PL/Perl
-procedural language for the backend.
+The postgresql-plperl package contains the PL/Perl procedural language,
+which is an extension to the PostgreSQL database server.
+Install this if you want to write database functions in Perl.
%endif
%if %plpython
@@ -279,9 +266,9 @@ Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description plpython
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-plpython package contains the PL/Python
-procedural language for the backend.
+The postgresql-plpython package contains the PL/Python procedural language,
+which is an extension to the PostgreSQL database server.
+Install this if you want to write database functions in Python.
%endif
%if %pltcl
@@ -291,9 +278,9 @@ Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description pltcl
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-pltcl package contains the PL/Tcl
-procedural language for the backend.
+The postgresql-plptcl package contains the PL/Tcl procedural language,
+which is an extension to the PostgreSQL database server.
+Install this if you want to write database functions in Tcl.
%endif
%if %test
@@ -304,10 +291,9 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description test
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-test package includes the sources and pre-built
-binaries of various tests for the PostgreSQL database management
-system, including regression tests and benchmarks.
+The postgresql-test package contains files needed for various tests for the
+PostgreSQL database management system, including regression tests and
+benchmarks.
%endif
%prep
commit c99f89f75b469c681847d61a98c4368e6553e3df
Author: Honza Hork <hhorak(a)redhat.com>
Date: Wed Nov 2 10:05:15 2011 +0100
Create a symlink of pg_regress instead of full copy;
Don't strip symbols from regress libs
Resolves: #729012
diff --git a/postgresql.spec b/postgresql.spec
index e009c11..b1fe28c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
Version: 9.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -301,6 +301,7 @@ procedural language for the backend.
Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description test
PostgreSQL is an advanced Object-Relational database management
@@ -542,8 +543,11 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
# Makefiles, however.
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test
cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
+ # pg_regress binary should be only in one subpackage,
+ # there will be a symlink from -test to -devel
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
+ ln -sf ../../pgxs/src/test/regress/pg_regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress
pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
- strip *.so
rm -f GNUmakefile Makefile *.o
chmod 0755 pg_regress regress.so
popd
@@ -928,6 +932,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Nov 02 2011 Honza Horak <hhorak(a)redhat.com> 9.1.1-2
+- Create a symlink of pg_regress instead of full copy;
+ Don't strip symbols from regress libs
+Resolves: #729012
+
* Mon Sep 26 2011 Tom Lane <tgl(a)redhat.com> 9.1.1-1
- Update to PostgreSQL 9.1.1, for various fixes described at
http://www.postgresql.org/docs/9.1/static/release-9-1-1.html
commit 13cd21d5db0bb3fff74fd166bdf1f4592e9b93e2
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Sep 26 17:29:49 2011 -0400
Update to PostgreSQL 9.1.1
diff --git a/.gitignore b/.gitignore
index c957579..5a63aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.1.0.tar.bz2
-/postgresql-9.1.0-US.pdf
+/postgresql-9.1.1.tar.bz2
+/postgresql-9.1.1-US.pdf
/postgresql-9.0.4.tar.bz2
diff --git a/postgresql-no-sepsql-test.patch b/postgresql-no-sepsql-test.patch
new file mode 100644
index 0000000..e5361e2
--- /dev/null
+++ b/postgresql-no-sepsql-test.patch
@@ -0,0 +1,20 @@
+We can't run the contrib/sepgsql regression tests during build, because they
+assume that some root-privilege-requiring hacks have been made to the SELinux
+configuration. So just dike out the settings that would cause them to be run.
+Something similar to this will probably be done upstream for PG 9.1.2 and
+later.
+
+
+diff -Naur postgresql-9.1.1.orig/contrib/sepgsql/Makefile postgresql-9.1.1/contrib/sepgsql/Makefile
+--- postgresql-9.1.1.orig/contrib/sepgsql/Makefile 2011-09-22 17:57:57.000000000 -0400
++++ postgresql-9.1.1/contrib/sepgsql/Makefile 2011-09-26 16:47:53.772278112 -0400
+@@ -5,9 +5,6 @@
+ schema.o relation.o proc.o
+ DATA_built = sepgsql.sql
+
+-REGRESS = label dml misc
+-REGRESS_OPTS = --launcher $(top_builddir)/contrib/sepgsql/launcher
+-
+ EXTRA_CLEAN = -r tmp *.pp sepgsql-regtest.if sepgsql-regtest.fc
+
+ ifdef USE_PGXS
diff --git a/postgresql.spec b/postgresql.spec
index 08e3211..e009c11 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -19,20 +19,19 @@
# Tom Lane
# and others in the Changelog....
-# This spec file and ancilliary files are licensed in accordance with
+# This spec file and ancillary files are licensed in accordance with
# The PostgreSQL license.
# In this file you can find the default build package list macros.
# These can be overridden by defining on the rpm command line:
# rpm --define 'packagename 1' .... to force the package to build.
# rpm --define 'packagename 0' .... to force the package NOT to build.
-# The base package, the lib package, the devel package, and the server package
+# The base package, the libs package, the devel package, and the server package
# always get built.
%global beta 0
%{?beta:%global __os_install_post /usr/lib/rpm/brp-compress}
-%{!?tcldevel:%global tcldevel 1}
%{!?test:%global test 1}
%{!?upgrade:%global upgrade 1}
%{!?plpython:%global plpython 1}
@@ -46,17 +45,15 @@
%{!?xml:%global xml 1}
%{!?pam:%global pam 1}
%{!?sdt:%global sdt 1}
-%{!?pgfts:%global pgfts 1}
+%{!?selinux:%global selinux 1}
%{!?runselftest:%global runselftest 1}
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.1
-Version: 9.1.0
+Version: 9.1.1
Release: 1%{?dist}
-# Update this whenever F15 gets rebased; it must be NVR-greater than F15 pkg:
-%global first_systemd_version 9.0.4-8
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -64,6 +61,9 @@ License: PostgreSQL
Group: Applications/Databases
Url: http://www.postgresql.org/
+# This number must be NVR-greater than any PG version shipped in F15:
+%global first_systemd_version 0:9.0.99
+
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series.
@@ -89,6 +89,7 @@ Source15: postgresql-bashprofile
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
+Patch4: postgresql-no-sepsql-test.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -100,11 +101,8 @@ BuildRequires: python-devel
%endif
%if %pltcl
-BuildRequires: tcl
-%if %tcldevel
BuildRequires: tcl-devel
%endif
-%endif
%if %ssl
BuildRequires: openssl-devel
@@ -138,6 +136,10 @@ BuildRequires: pam-devel
BuildRequires: systemtap-sdt-devel
%endif
+%if %selinux
+BuildRequires: libselinux-devel
+%endif
+
# main package requires -libs subpackage
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -312,6 +314,7 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -390,8 +393,8 @@ CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
%if %sdt
--enable-dtrace \
%endif
-%if %pgfts
- --enable-thread-safety \
+%if %selinux
+ --with-selinux \
%endif
--with-system-tzdata=/usr/share/zoneinfo \
--datadir=/usr/share/pgsql
@@ -556,13 +559,27 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
# remove files not to be packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+%if !%upgrade
+rm -f $RPM_BUILD_ROOT%{_bindir}/pg_upgrade
+rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/pg_upgrade_support.so
+%endif
+
+# initialize file lists
+cp /dev/null main.lst
+cp /dev/null libs.lst
+cp /dev/null server.lst
+cp /dev/null devel.lst
+cp /dev/null plperl.lst
+cp /dev/null pltcl.lst
+cp /dev/null plpython.lst
+%if %nls
%find_lang ecpg-%{majorversion}
-cat ecpg-%{majorversion}.lang >devel.lst
+cat ecpg-%{majorversion}.lang >>devel.lst
%find_lang ecpglib6-%{majorversion}
-cat ecpglib6-%{majorversion}.lang >libs.lst
+cat ecpglib6-%{majorversion}.lang >>libs.lst
%find_lang initdb-%{majorversion}
-cat initdb-%{majorversion}.lang >server.lst
+cat initdb-%{majorversion}.lang >>server.lst
%find_lang libpq5-%{majorversion}
cat libpq5-%{majorversion}.lang >>libs.lst
%find_lang pg_basebackup-%{majorversion}
@@ -572,7 +589,7 @@ cat pg_controldata-%{majorversion}.lang >>server.lst
%find_lang pg_ctl-%{majorversion}
cat pg_ctl-%{majorversion}.lang >>server.lst
%find_lang pg_config-%{majorversion}
-cat pg_config-%{majorversion}.lang >main.lst
+cat pg_config-%{majorversion}.lang >>main.lst
%find_lang pg_dump-%{majorversion}
cat pg_dump-%{majorversion}.lang >>main.lst
%find_lang pg_resetxlog-%{majorversion}
@@ -581,22 +598,23 @@ cat pg_resetxlog-%{majorversion}.lang >>server.lst
cat pgscripts-%{majorversion}.lang >>main.lst
%if %plperl
%find_lang plperl-%{majorversion}
-cat plperl-%{majorversion}.lang >plperl.lst
+cat plperl-%{majorversion}.lang >>plperl.lst
%endif
%find_lang plpgsql-%{majorversion}
cat plpgsql-%{majorversion}.lang >>server.lst
%if %plpython
%find_lang plpython-%{majorversion}
-cat plpython-%{majorversion}.lang >plpython.lst
+cat plpython-%{majorversion}.lang >>plpython.lst
%endif
%if %pltcl
%find_lang pltcl-%{majorversion}
-cat pltcl-%{majorversion}.lang >pltcl.lst
+cat pltcl-%{majorversion}.lang >>pltcl.lst
%endif
%find_lang postgres-%{majorversion}
cat postgres-%{majorversion}.lang >>server.lst
%find_lang psql-%{majorversion}
cat psql-%{majorversion}.lang >>main.lst
+%endif
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -734,7 +752,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/extension/pgstattuple*
%{_datadir}/pgsql/extension/refint*
%{_datadir}/pgsql/extension/seg*
-%{_datadir}/pgsql/extension/sslinfo*
%{_datadir}/pgsql/extension/tablefunc*
%{_datadir}/pgsql/extension/test_parser*
%{_datadir}/pgsql/extension/timetravel*
@@ -774,12 +791,19 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/pg_stat_statements.so
%{_libdir}/pgsql/refint.so
%{_libdir}/pgsql/seg.so
-%{_libdir}/pgsql/sslinfo.so
%{_libdir}/pgsql/tablefunc.so
%{_libdir}/pgsql/test_parser.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/unaccent.so
+%if %selinux
+%{_datadir}/pgsql/contrib/sepgsql.sql
+%{_libdir}/pgsql/sepgsql.so
+%endif
+%if %ssl
+%{_datadir}/pgsql/extension/sslinfo*
+%{_libdir}/pgsql/sslinfo.so
+%endif
%if %uuid
%{_datadir}/pgsql/extension/uuid-ossp*
%{_libdir}/pgsql/uuid-ossp.so
@@ -836,6 +860,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
+%dir %{_datadir}/pgsql/contrib
%dir %{_datadir}/pgsql/extension
%{_datadir}/pgsql/extension/plpgsql*
%attr(700,postgres,postgres) %dir /var/lib/pgsql
@@ -903,6 +928,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Sep 26 2011 Tom Lane <tgl(a)redhat.com> 9.1.1-1
+- Update to PostgreSQL 9.1.1, for various fixes described at
+ http://www.postgresql.org/docs/9.1/static/release-9-1-1.html
+- Enable build (but not test) of contrib/sepgsql
+- Clean up specfile build options so that turning options off works again
+
* Mon Sep 12 2011 Tom Lane <tgl(a)redhat.com> 9.1.0-1
- Update to PostgreSQL 9.1.0 (major version bump);
in-place upgrade support now works from 9.0.x as the previous version
diff --git a/sources b/sources
index c09c302..26f8c85 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-0497b9da1d7c380c340a9a87ba5500fe postgresql-9.1.0.tar.bz2
-1fd0bd1bbc1e7679c2385934a73c54ec postgresql-9.1.0-US.pdf
+061a9f17323117c9358ed60f33ecff78 postgresql-9.1.1.tar.bz2
+a085e5da2adf53e3979c3a16b58eee12 postgresql-9.1.1-US.pdf
80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2
commit d1e157db19e44b254b467ced3211da1b4f330dc6
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Sep 12 02:05:56 2011 -0400
Update to PostgreSQL 9.1.0
diff --git a/.gitignore b/.gitignore
index 6e08abe..c957579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+/postgresql-9.1.0.tar.bz2
+/postgresql-9.1.0-US.pdf
/postgresql-9.0.4.tar.bz2
-/postgresql-9.0.4-US.pdf
-/postgresql-8.4.6.tar.bz2
diff --git a/Makefile.regress b/Makefile.regress
index 1de43c4..43c7ba4 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -3,9 +3,6 @@
# in an RPM installation
#
-# default encoding
-MULTIBYTE = SQL_ASCII
-
# maximum simultaneous connections for parallel tests
MAXCONNOPT =
ifdef MAX_CONNECTIONS
@@ -20,6 +17,12 @@ endif
srcdir := .
+REGRESS_OPTS += --dlpath=.
+
+pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
+
+pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --psqldir='/usr/bin' $(pg_regress_locale_flags)
+
# Test input and expected files. These are created by pg_regress itself, so we
# don't have a rule to create them. We do need rules to clean them however.
ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source)))
@@ -33,10 +36,10 @@ abs_builddir := $(shell pwd)
check: installcheck-parallel
installcheck: cleandirs
- ./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+ $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS)
installcheck-parallel: cleandirs
- ./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
+ $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
# The tests command the server to write into testtablespace and results.
# On a SELinux-enabled system this will fail unless we mark those directories
@@ -52,12 +55,6 @@ runcheck: check
runtest: installcheck
runtest-parallel: installcheck-parallel
-bigtest: cleandirs
- ./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
-
-bigcheck: cleandirs
- ./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
-
##
## Clean up
diff --git a/README.rpm-dist b/README.rpm-dist
index 2795c31..c7cb21f 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,6 +1,6 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 9.0, for the PostgreSQL 9.0 RPM set.
+Version 9.1, for the PostgreSQL 9.1 RPM set.
Devrim Gndz <devrim(a)gunduz.org>
-----------------------------------------------------------------------------
@@ -23,9 +23,9 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 9.0 of PostgreSQL,
+This document is written to be applicable to version 9.1 of PostgreSQL,
which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 9.0 are not documented here.
+point, versions prior to 9.1 are not documented here.
This document is intended for use only with the RPMs supplied in Red Hat
Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
@@ -68,9 +68,9 @@ or login as 'postgres' you will need to set a password using passwd.
UPGRADING AN INSTALLATION
-----------------------------------------------------------------------------
-For a minor-version upgrade (such as 9.0.1 to 9.0.2), just install the
+For a minor-version upgrade (such as 9.1.1 to 9.1.2), just install the
new RPMs; there's usually nothing more to it than that. Upgrading
-across a major release of PostgreSQL (for example, from 8.3.x to 8.4.x)
+across a major release of PostgreSQL (for example, from 9.0.x to 9.1.x)
requires more effort.
If you are upgrading across more than one major release of PostgreSQL
@@ -82,10 +82,10 @@ and run the dump file through psql to restore your data.
In some major releases, the RPMs also support in-place upgrade from the
immediately previous major release. Currently, you can upgrade in-place
-from 8.4.x to 9.0.x. This is much faster than a dump and reload.
+from 9.0.x to 9.1.x. This is much faster than a dump and reload.
To do an in-place upgrade:
* shut down the old postmaster ("systemctl stop postgresql.service")
-* optionally make a backup of /var/lib/pgsql/data/
+* optionally make a backup of /var/lib/pgsql/data/ (recommended!)
* install the new version's RPMs (install all the ones you had before,
plus postgresql-upgrade)
* as root, run "postgresql-setup upgrade"
@@ -93,7 +93,8 @@ To do an in-place upgrade:
customizations you had before (your old configuration files are in
/var/lib/pgsql/data-old/)
* as root, run "systemctl start postgresql.service"
-* postgresql-upgrade can be removed after the update is complete
+* the postgresql-upgrade RPM can be removed after the update is complete,
+ as can /var/lib/pgsql/data-old/
NOTE: The in-place upgrade process is new and relatively poorly tested,
so if your data is critical it's a really good idea to make a tarball
@@ -290,7 +291,7 @@ uuid 1 #build contrib/uuid-ossp
To use these defines, invoke a rebuild like this:
rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
--define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
- postgresql-9.0.2-1.src.rpm
+ postgresql-9.1.2-1.src.rpm
This line would disable the python, tcl, and test subpackages, disable the
regression test run during build, and disable kerberos support.
diff --git a/postgresql-gcc-workaround.patch b/postgresql-gcc-workaround.patch
deleted file mode 100644
index 7850821..0000000
--- a/postgresql-gcc-workaround.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Back-patch upstream patch to cope with a gcc 4.6.0 bug. This will be
-in PG 9.0.5 and later, but we need it in Fedora *now* because the bug
-breaks WAL replay, thus causing crash recovery failures as well as the
-originally reported symptom of frequent reconnections during standby.
-
-
-commit 45d792f70272ed57b932816562f31c2f79426c2a
-Author: Tom Lane <tgl(a)sss.pgh.pa.us>
-Date: Fri Jun 10 17:03:11 2011 -0400
-
- Work around gcc 4.6.0 bug that breaks WAL replay.
-
- ReadRecord's habit of using both direct references to tmpRecPtr and
- references to *RecPtr (which is pointing at tmpRecPtr) triggers an
- optimization bug in gcc 4.6.0, which apparently has forgotten about
- aliasing rules. Avoid the compiler bug, and make the code more readable
- to boot, by getting rid of the direct references. Improve the comments
- while at it.
-
- Back-patch to all supported versions, in case they get built with 4.6.0.
-
- Tom Lane, with some cosmetic suggestions from Alex Hunsaker
-
-diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
-index bf8075d..6c18db4 100644
---- a/src/backend/access/transam/xlog.c
-+++ b/src/backend/access/transam/xlog.c
-@@ -3676,23 +3676,32 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt)
- RecPtr = &tmpRecPtr;
-
- /*
-- * Align recptr to next page if no more records can fit on the current
-- * page.
-+ * RecPtr is pointing to end+1 of the previous WAL record. We must
-+ * advance it if necessary to where the next record starts. First,
-+ * align to next page if no more records can fit on the current page.
- */
- if (XLOG_BLCKSZ - (RecPtr->xrecoff % XLOG_BLCKSZ) < SizeOfXLogRecord)
-- {
-- NextLogPage(tmpRecPtr);
-- /* We will account for page header size below */
-- }
-+ NextLogPage(*RecPtr);
-
-- if (tmpRecPtr.xrecoff >= XLogFileSize)
-+ /* Check for crossing of xlog segment boundary */
-+ if (RecPtr->xrecoff >= XLogFileSize)
- {
-- (tmpRecPtr.xlogid)++;
-- tmpRecPtr.xrecoff = 0;
-+ (RecPtr->xlogid)++;
-+ RecPtr->xrecoff = 0;
- }
-+
-+ /*
-+ * If at page start, we must skip over the page header. But we can't
-+ * do that until we've read in the page, since the header size is
-+ * variable.
-+ */
- }
- else
- {
-+ /*
-+ * In this case, the passed-in record pointer should already be
-+ * pointing to a valid record starting position.
-+ */
- if (!XRecOffIsValid(RecPtr->xrecoff))
- ereport(PANIC,
- (errmsg("invalid record offset at %X/%X",
-@@ -3721,11 +3730,13 @@ retry:
- if (targetRecOff == 0)
- {
- /*
-- * Can only get here in the continuing-from-prev-page case, because
-- * XRecOffIsValid eliminated the zero-page-offset case otherwise. Need
-- * to skip over the new page's header.
-+ * At page start, so skip over page header. The Assert checks that
-+ * we're not scribbling on caller's record pointer; it's OK because we
-+ * can only get here in the continuing-from-prev-record case, since
-+ * XRecOffIsValid rejected the zero-page-offset case otherwise.
- */
-- tmpRecPtr.xrecoff += pageHeaderSize;
-+ Assert(RecPtr == &tmpRecPtr);
-+ RecPtr->xrecoff += pageHeaderSize;
- targetRecOff = pageHeaderSize;
- }
- else if (targetRecOff < pageHeaderSize)
-diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h
-index 3f0930f..367de37 100644
---- a/src/include/access/xlog_internal.h
-+++ b/src/include/access/xlog_internal.h
-@@ -154,13 +154,13 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
- /* Align a record pointer to next page */
- #define NextLogPage(recptr) \
- do { \
-- if (recptr.xrecoff % XLOG_BLCKSZ != 0) \
-- recptr.xrecoff += \
-- (XLOG_BLCKSZ - recptr.xrecoff % XLOG_BLCKSZ); \
-- if (recptr.xrecoff >= XLogFileSize) \
-+ if ((recptr).xrecoff % XLOG_BLCKSZ != 0) \
-+ (recptr).xrecoff += \
-+ (XLOG_BLCKSZ - (recptr).xrecoff % XLOG_BLCKSZ); \
-+ if ((recptr).xrecoff >= XLogFileSize) \
- { \
-- (recptr.xlogid)++; \
-- recptr.xrecoff = 0; \
-+ ((recptr).xlogid)++; \
-+ (recptr).xrecoff = 0; \
- } \
- } while (0)
-
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
index c6a2b2c..a051014 100644
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@@ -1,10 +1,10 @@
Default to stderr-based logging with a week's worth of daily logfiles.
-diff -Naur postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.0.1/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample 2010-10-01 10:25:44.000000000 -0400
-+++ postgresql-9.0.1/src/backend/utils/misc/postgresql.conf.sample 2010-10-11 11:53:34.650971490 -0400
-@@ -262,17 +262,17 @@
+diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample 2011-08-18 17:23:13.000000000 -0400
++++ postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample 2011-08-18 18:39:39.697526799 -0400
+@@ -279,7 +279,7 @@
# requires logging_collector to be on.
# This is used when logging to stderr:
@@ -13,28 +13,29 @@ diff -Naur postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample p
# into log files. Required to be on for
# csvlogs.
# (change requires restart)
-
+@@ -287,11 +287,11 @@
# These are only used if logging_collector is on:
--#log_directory = 'pg_log' # directory where log files are written,
-+log_directory = 'pg_log' # directory where log files are written,
+ #log_directory = 'pg_log' # directory where log files are written,
# can be absolute or relative to PGDATA
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern,
+log_filename = 'postgresql-%a.log' # log file name pattern,
# can include strftime() escapes
--#log_truncate_on_rotation = off # If on, an existing log file of the
-+log_truncate_on_rotation = on # If on, an existing log file of the
+ #log_file_mode = 0600 # creation mode for log files,
+ # begin with 0 to use octal notation
+-#log_truncate_on_rotation = off # If on, an existing log file with the
++log_truncate_on_rotation = on # If on, an existing log file with the
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
-@@ -280,9 +280,9 @@
+@@ -299,9 +299,9 @@
# or size-driven rotation. Default is
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+log_rotation_age = 1d # Automatic rotation of logfiles will
# happen after that time. 0 disables.
--#log_rotation_size = 10MB # Automatic rotation of logfiles will
-+log_rotation_size = 0 # Automatic rotation of logfiles will
+-#log_rotation_size = 10MB # Automatic rotation of logfiles will
++log_rotation_size = 0 # Automatic rotation of logfiles will
# happen after that much log output.
# 0 disables.
diff --git a/postgresql-perl-5.14.patch b/postgresql-perl-5.14.patch
deleted file mode 100644
index c205c1d..0000000
--- a/postgresql-perl-5.14.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Back-patch upstream patch to cope with perl 5.14. This will be present
-in PG 9.0.5 and later, but we want to build rawhide with 5.14 now.
-
-
-commit cb252c2acd415d304e3254e99f82058d11a69e04
-Author: Andrew Dunstan <andrew(a)dunslane.net>
-Date: Sat Jun 4 19:35:04 2011 -0400
-
- Allow building with perl 5.14.
-
- Patch from Alex Hunsaker.
-
-diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
-index 72c4dc2..1754489 100644
---- a/src/pl/plperl/plperl.c
-+++ b/src/pl/plperl/plperl.c
-@@ -874,7 +874,7 @@ plperl_trusted_init(void)
- if (!isGV_with_GP(sv) || !GvCV(sv))
- continue;
- SvREFCNT_dec(GvCV(sv)); /* free the CV */
-- GvCV(sv) = NULL; /* prevent call via GV */
-+ GvCV_set(sv, NULL); /* prevent call via GV */
- }
- hv_clear(stash);
-
-diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
-index 6d58f11..1d38d9e 100644
---- a/src/pl/plperl/plperl.h
-+++ b/src/pl/plperl/plperl.h
-@@ -42,6 +42,11 @@
- #undef bool
- #endif
-
-+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
-+#ifndef GvCV_set
-+#define GvCV_set(gv, cv) (GvCV(gv) = cv)
-+#endif
-+
- /* declare routines from plperl.c for access by .xs files */
- HV *plperl_spi_exec(char *, int);
- void plperl_return_next(SV *);
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 374e223..d28a502 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,16 +7,16 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198.
-diff -Naur postgresql-9.0.1.orig/src/pl/plperl/GNUmakefile postgresql-9.0.1/src/pl/plperl/GNUmakefile
---- postgresql-9.0.1.orig/src/pl/plperl/GNUmakefile 2010-10-01 10:25:44.000000000 -0400
-+++ postgresql-9.0.1/src/pl/plperl/GNUmakefile 2010-10-11 11:50:19.933972244 -0400
-@@ -40,6 +40,9 @@
+diff -Naur postgresql-9.1rc1.orig/src/pl/plperl/GNUmakefile postgresql-9.1rc1/src/pl/plperl/GNUmakefile
+--- postgresql-9.1rc1.orig/src/pl/plperl/GNUmakefile 2011-08-18 17:23:13.000000000 -0400
++++ postgresql-9.1rc1/src/pl/plperl/GNUmakefile 2011-08-18 18:42:43.653729368 -0400
+@@ -43,6 +43,9 @@
SHLIB_LINK = $(perl_embed_ldflags)
+# Force rpath to be used even though we disable it everywhere else
+SHLIB_LINK += $(rpath)
+
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl --load-language=plperlu
- REGRESS = plperl plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu
- # if Perl can support two interpreters in one backend,
+ REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl --load-extension=plperlu
+ REGRESS = plperl plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
+ # if Perl can support two interpreters in one backend,
diff --git a/postgresql-pgctl-timeout.patch b/postgresql-pgctl-timeout.patch
deleted file mode 100644
index cfeb1a7..0000000
--- a/postgresql-pgctl-timeout.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Back-port a PG 9.1 logic change to allow "pg_ctl start -w" to fail in
-less than the -t timeout interval if the postmaster has clearly failed.
-This is the minimum needed to make it sane to use this method of launching
-the postmaster from a systemd service file. 9.1 will make this area
-considerably more robust.
-
-
-diff -Naur postgresql-9.0.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.0.4/src/bin/pg_ctl/pg_ctl.c
---- postgresql-9.0.4.orig/src/bin/pg_ctl/pg_ctl.c 2011-04-14 23:15:53.000000000 -0400
-+++ postgresql-9.0.4/src/bin/pg_ctl/pg_ctl.c 2011-07-27 18:32:05.547066731 -0400
-@@ -538,6 +538,22 @@
- #endif
- print_msg(".");
-
-+ /*
-+ * The postmaster should create postmaster.pid very soon after
-+ * being started. If it's not there after we've waited 5 or more
-+ * seconds, assume startup failed and give up waiting. (This
-+ * won't cover cases where the postmaster crashes after creating
-+ * the file, nor where there's a pre-existing postmaster, but
-+ * it's better than nothing.)
-+ */
-+ if (i >= 5)
-+ {
-+ struct stat statbuf;
-+
-+ if (stat(pid_file, &statbuf) != 0)
-+ break;
-+ }
-+
- pg_usleep(1000000); /* 1 sec */
- }
- }
diff --git a/postgresql.spec b/postgresql.spec
index 1e18d70..08e3211 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,9 +52,9 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.0
-Version: 9.0.4
-Release: 8%{?dist}
+%global majorversion 9.1
+Version: 9.1.0
+Release: 1%{?dist}
# Update this whenever F15 gets rebased; it must be NVR-greater than F15 pkg:
%global first_systemd_version 9.0.4-8
@@ -67,8 +67,8 @@ Url: http://www.postgresql.org/
# This SRPM includes a copy of the previous major release, which is needed for
# in-place upgrade of an old database. In most cases it will not be critical
# that this be kept up with the latest minor release of the previous series.
-%global prevversion 8.4.6
-%global prevmajorversion 8.4
+%global prevversion 9.0.4
+%global prevmajorversion 9.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
@@ -89,9 +89,6 @@ Source15: postgresql-bashprofile
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
-Patch4: postgresql-gcc-workaround.patch
-Patch5: postgresql-perl-5.14.patch
-Patch6: postgresql-pgctl-timeout.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -315,9 +312,6 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -415,8 +409,15 @@ rm -f src/tutorial/GNUmakefile
make MAX_CONNECTIONS=5 check
make clean
popd
+ pushd src/pl
+ make MAX_CONNECTIONS=5 check
+ popd
+ pushd contrib
+ make MAX_CONNECTIONS=5 check
+ popd
%endif
+# undo the "make clean" above
%if %test
pushd src/test/regress
make all
@@ -541,6 +542,7 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
strip *.so
rm -f GNUmakefile Makefile *.o
+ chmod 0755 pg_regress regress.so
popd
cp %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
@@ -563,6 +565,8 @@ cat ecpglib6-%{majorversion}.lang >libs.lst
cat initdb-%{majorversion}.lang >server.lst
%find_lang libpq5-%{majorversion}
cat libpq5-%{majorversion}.lang >>libs.lst
+%find_lang pg_basebackup-%{majorversion}
+cat pg_basebackup-%{majorversion}.lang >>server.lst
%find_lang pg_controldata-%{majorversion}
cat pg_controldata-%{majorversion}.lang >>server.lst
%find_lang pg_ctl-%{majorversion}
@@ -657,7 +661,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f main.lst
%defattr(-,root,root)
-%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
+%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
%doc COPYRIGHT README HISTORY doc/bug.template
%doc README.rpm-dist
%doc doc/html
@@ -699,8 +703,46 @@ rm -rf $RPM_BUILD_ROOT
%files contrib
%defattr(-,root,root)
+%{_datadir}/pgsql/extension/adminpack*
+%{_datadir}/pgsql/extension/autoinc*
+%{_datadir}/pgsql/extension/btree_gin*
+%{_datadir}/pgsql/extension/btree_gist*
+%{_datadir}/pgsql/extension/chkpass*
+%{_datadir}/pgsql/extension/citext*
+%{_datadir}/pgsql/extension/cube*
+%{_datadir}/pgsql/extension/dblink*
+%{_datadir}/pgsql/extension/dict_int*
+%{_datadir}/pgsql/extension/dict_xsyn*
+%{_datadir}/pgsql/extension/earthdistance*
+%{_datadir}/pgsql/extension/file_fdw*
+%{_datadir}/pgsql/extension/fuzzystrmatch*
+%{_datadir}/pgsql/extension/hstore*
+%{_datadir}/pgsql/extension/insert_username*
+%{_datadir}/pgsql/extension/intagg*
+%{_datadir}/pgsql/extension/intarray*
+%{_datadir}/pgsql/extension/isn*
+%{_datadir}/pgsql/extension/lo*
+%{_datadir}/pgsql/extension/ltree*
+%{_datadir}/pgsql/extension/moddatetime*
+%{_datadir}/pgsql/extension/pageinspect*
+%{_datadir}/pgsql/extension/pg_buffercache*
+%{_datadir}/pgsql/extension/pg_freespacemap*
+%{_datadir}/pgsql/extension/pg_stat_statements*
+%{_datadir}/pgsql/extension/pg_trgm*
+%{_datadir}/pgsql/extension/pgcrypto*
+%{_datadir}/pgsql/extension/pgrowlocks*
+%{_datadir}/pgsql/extension/pgstattuple*
+%{_datadir}/pgsql/extension/refint*
+%{_datadir}/pgsql/extension/seg*
+%{_datadir}/pgsql/extension/sslinfo*
+%{_datadir}/pgsql/extension/tablefunc*
+%{_datadir}/pgsql/extension/test_parser*
+%{_datadir}/pgsql/extension/timetravel*
+%{_datadir}/pgsql/extension/tsearch2*
+%{_datadir}/pgsql/extension/unaccent*
%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/adminpack.so
+%{_libdir}/pgsql/auth_delay.so
%{_libdir}/pgsql/autoinc.so
%{_libdir}/pgsql/auto_explain.so
%{_libdir}/pgsql/btree_gin.so
@@ -711,7 +753,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/dblink.so
%{_libdir}/pgsql/dict_int.so
%{_libdir}/pgsql/dict_xsyn.so
+%{_libdir}/pgsql/dummy_seclabel.so
%{_libdir}/pgsql/earthdistance.so
+%{_libdir}/pgsql/file_fdw.so
%{_libdir}/pgsql/fuzzystrmatch.so
%{_libdir}/pgsql/hstore.so
%{_libdir}/pgsql/insert_username.so
@@ -737,15 +781,17 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/unaccent.so
%if %uuid
+%{_datadir}/pgsql/extension/uuid-ossp*
%{_libdir}/pgsql/uuid-ossp.so
%endif
%if %xml
+%{_datadir}/pgsql/extension/xml2*
%{_libdir}/pgsql/pgxml.so
%endif
-%{_datadir}/pgsql/contrib/
%{_bindir}/oid2name
%{_bindir}/pg_archivecleanup
%{_bindir}/pg_standby
+%{_bindir}/pg_test_fsync
%{_bindir}/pgbench
%{_bindir}/vacuumlo
%{_mandir}/man3/dblink*
@@ -766,6 +812,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) /etc/pam.d/postgresql
%endif
%{_bindir}/initdb
+%{_bindir}/pg_basebackup
%{_bindir}/pg_controldata
%{_bindir}/pg_ctl
%{_bindir}/pg_resetxlog
@@ -773,6 +820,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/postmaster
%{_bindir}/postgresql-setup
%{_mandir}/man1/initdb.*
+%{_mandir}/man1/pg_basebackup.*
%{_mandir}/man1/pg_controldata.*
%{_mandir}/man1/pg_ctl.*
%{_mandir}/man1/pg_resetxlog.*
@@ -788,6 +836,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
+%dir %{_datadir}/pgsql/extension
+%{_datadir}/pgsql/extension/plpgsql*
%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
@@ -823,12 +873,14 @@ rm -rf $RPM_BUILD_ROOT
%if %plperl
%files plperl -f plperl.lst
%defattr(-,root,root)
+%{_datadir}/pgsql/extension/plperl*
%{_libdir}/pgsql/plperl.so
%endif
%if %pltcl
%files pltcl -f pltcl.lst
%defattr(-,root,root)
+%{_datadir}/pgsql/extension/pltcl*
%{_libdir}/pgsql/pltcl.so
%{_bindir}/pltcl_delmod
%{_bindir}/pltcl_listmod
@@ -839,7 +891,7 @@ rm -rf $RPM_BUILD_ROOT
%if %plpython
%files plpython -f plpython.lst
%defattr(-,root,root)
-%{_libdir}/pgsql/plpython.so
+%{_datadir}/pgsql/extension/plpython*
%{_libdir}/pgsql/plpython2.so
%endif
@@ -851,6 +903,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Sep 12 2011 Tom Lane <tgl(a)redhat.com> 9.1.0-1
+- Update to PostgreSQL 9.1.0 (major version bump);
+ in-place upgrade support now works from 9.0.x as the previous version
+
* Wed Jul 27 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-8
- Convert to systemd startup support
Resolves: #696427
diff --git a/sources b/sources
index 80e2ea6..c09c302 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+0497b9da1d7c380c340a9a87ba5500fe postgresql-9.1.0.tar.bz2
+1fd0bd1bbc1e7679c2385934a73c54ec postgresql-9.1.0-US.pdf
80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2
-7d27ebea9aa8654f73e47caa933e3fca postgresql-9.0.4-US.pdf
-fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2
commit 72893f4818b3cec9525e7181472a672b496a70d0
Author: Tom Lane <tgl(a)redhat.com>
Date: Wed Jul 27 19:32:24 2011 -0400
Convert to systemd startup support
diff --git a/README.rpm-dist b/README.rpm-dist
index 38bdc9e..2795c31 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -36,18 +36,24 @@ QUICKSTART
-----------------------------------------------------------------------------
For a fresh installation, you will need to initialize the cluster first. Run:
- service postgresql initdb
+ postgresql-setup initdb
as root, and it will prepare a new database cluster for you. Then you will
need to start PostgreSQL. Again as root, run:
- service postgresql start
+ systemctl start postgresql.service
This command will start a postmaster that willl listen on localhost and Unix
socket 5432 only. Edit /var/lib/pgsql/data/postgresql.conf and pg_hba.conf
if you want to allow remote access -- see the section on Grand Unified
Configuration.
+You will probably also want to do
+
+ systemctl enable postgresql.service
+
+so that the postmaster is automatically started during future reboots.
+
The file /var/lib/pgsql/.bash_profile is packaged to help with the
setting of environment variables. You may edit this file, and it won't be
overwritten during an upgrade. However, enhancements and bugfixes may
@@ -78,15 +84,15 @@ In some major releases, the RPMs also support in-place upgrade from the
immediately previous major release. Currently, you can upgrade in-place
from 8.4.x to 9.0.x. This is much faster than a dump and reload.
To do an in-place upgrade:
-* shut down the old postmaster
+* shut down the old postmaster ("systemctl stop postgresql.service")
* optionally make a backup of /var/lib/pgsql/data/
* install the new version's RPMs (install all the ones you had before,
plus postgresql-upgrade)
-* as root, run "service postgresql upgrade"
+* as root, run "postgresql-setup upgrade"
* update the configuration files /var/lib/pgsql/data/*.conf with any
customizations you had before (your old configuration files are in
/var/lib/pgsql/data-old/)
-* as root, run "service postgresql start"
+* as root, run "systemctl start postgresql.service"
* postgresql-upgrade can be removed after the update is complete
NOTE: The in-place upgrade process is new and relatively poorly tested,
@@ -163,24 +169,29 @@ mailing list.
MULTIPLE POSTMASTERS
-------------------------------------------------------------------------------
-The postgresql-server RPM contains an 'initscript' that is used to start the
-postmaster. The current version of this script has logic to be able to start
-multiple postmasters, with different data areas, listening on different ports,
-etc. To use this functionality requires root access.
+The postgresql-server RPM contains a systemd "unit" file, postgresql.service,
+that is used to start the PostgreSQL postmaster. If you need to run multiple
+postmasters on one machine, you should clone this file and modify it as
+necessary.
As an example, let us create a secondary postmaster called, creatively enough,
'secondary'. Here are the steps:
-1.) create a hard link in /etc/rc.d/init.d (or equivalent location)
- to postgresql named 'secondary' : ln postgresql secondary Pick
- a name not already used in /etc/rc.d/init.d!
-2.) create a file in /etc/sysconfig/pgsql named secondary. This file is
- a shell script -- typically you would define PGDATA, PGPORT, and PGOPTS
- here. Since $PGDATA/postgresql.conf will override many of these
- settings, except PGDATA, you might be surprised on startup.
-3.) create the target PGDATA.
-4.) Initdb the target PGDATA with 'service secondary initdb'.
-5.) Edit postgresql.conf to change the port, address, tcpip settings, etc.
-6.) Start the postmaster with 'service secondary start'.
+1.) Copy /lib/systemd/system/postgresql.service to
+ /etc/systemd/system/secondary.service.
+ (Note that user-created unit files must go into /etc not /lib!)
+2.) Edit /etc/systemd/system/secondary.service to change the PGDATA and
+ PGPORT settings so they don't conflict with any other postmaster.
+3.) Create the target PGDATA directory.
+4.) Initdb the target PGDATA with 'postgresql-setup initdb secondary'.
+5.) Edit postgresql.conf in the target PGDATA to change settings as needed.
+6.) Start the new postmaster with 'systemctl start secondary.service'.
+ You will probably also want to do 'systemctl enable secondary.service'
+ so that the new postmaster is automatically started in future reboots.
+
+When doing a major-version upgrade of a secondary postmaster, mention the
+service name in the postgresql-setup command, for example 'postgresql-setup
+upgrade secondary'. This will let postgresql-setup find the correct data
+directory from the service file.
REGRESSION TESTING
-------------------------------------------------------------------------------
@@ -189,10 +200,11 @@ regression tests. These tests stress your database installation and produce
results that give you assurances that the installation is complete, and that
your database machine is up to the task.
-To run the regression tests under the RPM installation, make sure that
-postmaster has been started (if not, su to root and do "service postgresql
-start"), cd to /usr/lib/pgsql/test/regress (or /usr/lib64/pgsql/test/regress),
-su to postgres, and execute "make check".
+To run the regression tests under the RPM installation, make sure that the
+postmaster has been started (if not, su to root and do "systemctl start
+postgresql.service"), cd to /usr/lib/pgsql/test/regress (or
+/usr/lib64/pgsql/test/regress on a 64-bit machine), su to postgres,
+and execute "make check".
This command will start the regression tests and will both show the
results to the screen and store the results in the file regress.out.
@@ -207,24 +219,20 @@ script.
STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
-------------------------------------------------------------------------------
-Fedora / Red Hat / CentOS use the System V Init package. A startup
-script for PostgreSQL is provided in the server package, as
-/etc/rc.d/init.d/postgresql. To start the postmaster manually,
+Fedora / Red Hat / CentOS use the systemd package to manage server startup.
+A systemd unit file for PostgreSQL is provided in the server package, as
+/lib/systemd/system/postgresql.service. To start the postmaster manually,
as root run
- service postgresql start
+ systemctl start postgresql.service
To shut the postmaster down,
- service postgresql stop
-There are other possible commands to this script -- execute
-'service postgresql' for a listing.
-
-To get this script to run at system startup or any time the system switches
-into runlevels 3, 4, or 5, run:
- chkconfig --add postgresql
- chkconfig --level 345 postgresql on
-and the proper symlinks will be created. See the chkconfig man page for more
-information. Note that this is manual -- while the startup script can include
-tags to allow chkconfig to automatically perform the symlinking, this is not
-done at this time.
+ systemctl stop postgresql.service
+These two commands only change the postmaster's current status. If you
+want the postmaster to be started automatically during future system startups,
+run
+ systemctl enable postgresql.service
+To undo that again,
+ systemctl disable postgresql.service
+See "man systemctl" for other possible subcommands.
GRAND UNIFIED CONFIGURATION (GUC) FILE
-------------------------------------------------------------------------------
@@ -232,7 +240,7 @@ The PostgreSQL server has many tunable parameters -- the file
/var/lib/pgsql/data/postgresql.conf is the master configuration file for the
whole system.
-The RPM ships with the default file -- you will need to tune the
+The RPM ships with a mostly-default file -- you will need to tune the
parameters for your installation. In particular, you might want to allow
nonlocal TCP/IP socket connections -- in order to allow these, you will need
to edit the postgresql.conf file. The line in question contains the string
diff --git a/postgresql-pgctl-timeout.patch b/postgresql-pgctl-timeout.patch
new file mode 100644
index 0000000..cfeb1a7
--- /dev/null
+++ b/postgresql-pgctl-timeout.patch
@@ -0,0 +1,33 @@
+Back-port a PG 9.1 logic change to allow "pg_ctl start -w" to fail in
+less than the -t timeout interval if the postmaster has clearly failed.
+This is the minimum needed to make it sane to use this method of launching
+the postmaster from a systemd service file. 9.1 will make this area
+considerably more robust.
+
+
+diff -Naur postgresql-9.0.4.orig/src/bin/pg_ctl/pg_ctl.c postgresql-9.0.4/src/bin/pg_ctl/pg_ctl.c
+--- postgresql-9.0.4.orig/src/bin/pg_ctl/pg_ctl.c 2011-04-14 23:15:53.000000000 -0400
++++ postgresql-9.0.4/src/bin/pg_ctl/pg_ctl.c 2011-07-27 18:32:05.547066731 -0400
+@@ -538,6 +538,22 @@
+ #endif
+ print_msg(".");
+
++ /*
++ * The postmaster should create postmaster.pid very soon after
++ * being started. If it's not there after we've waited 5 or more
++ * seconds, assume startup failed and give up waiting. (This
++ * won't cover cases where the postmaster crashes after creating
++ * the file, nor where there's a pre-existing postmaster, but
++ * it's better than nothing.)
++ */
++ if (i >= 5)
++ {
++ struct stat statbuf;
++
++ if (stat(pid_file, &statbuf) != 0)
++ break;
++ }
++
+ pg_usleep(1000000); /* 1 sec */
+ }
+ }
diff --git a/postgresql-setup b/postgresql-setup
new file mode 100644
index 0000000..8b2a9ce
--- /dev/null
+++ b/postgresql-setup
@@ -0,0 +1,199 @@
+#!/bin/sh
+#
+# postgresql-setup Initialization and upgrade operations for PostgreSQL
+
+# PGVERSION is the full package version, e.g., 9.0.2
+# Note: the specfile inserts the correct value during package build
+PGVERSION=xxxx
+# PGENGINE is the directory containing the postmaster executable
+# Note: the specfile inserts the correct value during package build
+PGENGINE=xxxx
+# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
+# Note: the specfile inserts the correct value during package build
+PREVMAJORVERSION=xxxx
+# PREVPGENGINE is the directory containing the previous postmaster executable
+# Note: the specfile inserts the correct value during package build
+PREVPGENGINE=xxxx
+
+# Absorb configuration settings from the specified systemd service file,
+# or the default "postgresql" service if not specified
+SERVICE_NAME="$2"
+if [ x"$SERVICE_NAME" = x ]
+then
+ SERVICE_NAME=postgresql
+fi
+
+if [ -f "/etc/systemd/system/${SERVICE_NAME}.service" ]
+then
+ SERVICE_FILE="/etc/systemd/system/${SERVICE_NAME}.service"
+elif [ -f "/lib/systemd/system/${SERVICE_NAME}.service" ]
+then
+ SERVICE_FILE="/lib/systemd/system/${SERVICE_NAME}.service"
+else
+ echo "Could not find systemd unit file ${SERVICE_NAME}.service"
+ exit 1
+fi
+
+# Get port number and data directory from the service file
+PGPORT=`sed -n 's/Environment=PGPORT=//p' "${SERVICE_FILE}"`
+PGDATA=`sed -n 's/Environment=PGDATA=//p' "${SERVICE_FILE}"`
+
+# Log file for initdb
+PGLOG=/var/lib/pgsql/initdb.log
+
+# Log file for pg_upgrade
+PGUPLOG=/var/lib/pgsql/pgupgrade.log
+
+export PGPORT
+export PGDATA
+
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+ SU=runuser
+else
+ SU=su
+fi
+
+script_result=0
+
+# code shared between initdb and upgrade actions
+perform_initdb(){
+ if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
+ then
+ mkdir -p "$PGDATA" || return 1
+ chown postgres:postgres "$PGDATA"
+ chmod go-rwx "$PGDATA"
+ fi
+ # Clean up SELinux tagging for PGDATA
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+
+ # Create the initdb log file if needed
+ if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+ then
+ touch "$PGLOG" || return 1
+ chown postgres:postgres "$PGLOG"
+ chmod go-rwx "$PGLOG"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
+ fi
+
+ # Initialize the database
+ $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
+
+ # Create directory for postmaster log files
+ mkdir "$PGDATA/pg_log"
+ chown postgres:postgres "$PGDATA/pg_log"
+ chmod go-rwx "$PGDATA/pg_log"
+
+ if [ -f "$PGDATA/PG_VERSION" ]
+ then
+ return 0
+ fi
+ return 1
+}
+
+initdb(){
+ if [ -f "$PGDATA/PG_VERSION" ]
+ then
+ echo $"Data directory is not empty!"
+ echo
+ script_result=1
+ else
+ echo -n $"Initializing database ... "
+ if perform_initdb
+ then
+ echo $"OK"
+ else
+ echo $"failed, see $PGLOG"
+ script_result=1
+ fi
+ echo
+ fi
+}
+
+upgrade(){
+ # must see previous version in PG_VERSION
+ if [ ! -f "$PGDATA/PG_VERSION" -o \
+ x`cat "$PGDATA/PG_VERSION"` != x"$PREVMAJORVERSION" ]
+ then
+ echo
+ echo $"Cannot upgrade because database is not of version $PREVMAJORVERSION."
+ echo
+ exit 1
+ fi
+ if [ ! -x "$PGENGINE/pg_upgrade" ]
+ then
+ echo
+ echo $"Please install the postgresql-upgrade RPM."
+ echo
+ exit 5
+ fi
+
+ # Make sure service is stopped
+ # Using service here makes it work both with systemd and other init systems
+ service "$SERVICE_NAME" stop
+
+ # Set up log file for pg_upgrade
+ rm -f "$PGUPLOG"
+ touch "$PGUPLOG" || exit 1
+ chown postgres:postgres "$PGUPLOG"
+ chmod go-rwx "$PGUPLOG"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGUPLOG"
+
+ # Move old DB to PGDATAOLD
+ PGDATAOLD="${PGDATA}-old"
+ rm -rf "$PGDATAOLD"
+ mv "$PGDATA" "$PGDATAOLD" || exit 1
+
+ echo -n $"Upgrading database: "
+
+ # Create empty new-format database
+ if perform_initdb
+ then
+ # Do the upgrade
+ $SU -l postgres -c "$PGENGINE/pg_upgrade \
+ '--old-bindir=$PREVPGENGINE' \
+ '--new-bindir=$PGENGINE' \
+ '--old-datadir=$PGDATAOLD' \
+ '--new-datadir=$PGDATA' \
+ --link \
+ '--old-port=$PGPORT' '--new-port=$PGPORT' \
+ --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
+ if [ $? -ne 0 ]
+ then
+ # pg_upgrade failed
+ script_result=1
+ fi
+ else
+ # initdb failed
+ script_result=1
+ fi
+
+ if [ $script_result -eq 0 ]
+ then
+ echo $"OK"
+ else
+ # Clean up after failure
+ rm -rf "$PGDATA"
+ mv "$PGDATAOLD" "$PGDATA"
+
+ echo $"failed"
+ fi
+ echo
+ echo $"See $PGUPLOG for details."
+}
+
+# See how we were called.
+case "$1" in
+ initdb)
+ initdb
+ ;;
+ upgrade)
+ upgrade
+ ;;
+ *)
+ echo $"Usage: $0 {initdb|upgrade} [ service_name ]"
+ exit 2
+esac
+
+exit $script_result
diff --git a/postgresql.init b/postgresql.init
deleted file mode 100644
index b7dc208..0000000
--- a/postgresql.init
+++ /dev/null
@@ -1,337 +0,0 @@
-#!/bin/sh
-#
-# postgresql This is the init script for starting up the PostgreSQL
-# server.
-#
-# This script is slightly unusual in that the name of the daemon (postmaster)
-# is not the same as the name of the subsystem (postgresql)
-#
-# chkconfig: - 64 36
-# description: PostgreSQL database server.
-# processname: postmaster
-# pidfile: /var/run/postmaster.PORT.pid
-### BEGIN INIT INFO
-# Provides: postgresql
-# Required-Start: $local_fs $remote_fs $network $named $syslog $time
-# Required-Stop: $local_fs $remote_fs $network $named $syslog $time
-# Short-Description: start and stop PostgreSQL server
-# Description: PostgreSQL database server
-### END INIT INFO
-
-# PGVERSION is the full package version, e.g., 9.0.2
-# Note: the specfile inserts the correct value during package build
-PGVERSION=xxxx
-# PGMAJORVERSION is major version, e.g., 9.0 (this should match PG_VERSION)
-PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-# Note: the specfile inserts the correct value during package build
-PREVMAJORVERSION=xxxx
-# PREVPGENGINE is the directory containing the previous postmaster executable
-# Note: the specfile inserts the correct value during package build
-PREVPGENGINE=xxxx
-# PGDOCDIR is the directory containing the package's documentation
-# Note: the specfile inserts the correct value during package build
-PGDOCDIR=xxxx
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Get network config.
-. /etc/sysconfig/network
-
-# Find the name of the script
-NAME=`basename $0`
-if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]
-then
- NAME=${NAME:3}
-fi
-
-# For SELinux we need to use 'runuser' not 'su'
-if [ -x /sbin/runuser ]
-then
- SU=runuser
-else
- SU=su
-fi
-
-
-# Set defaults for configuration variables
-PGENGINE=/usr/bin
-PGPORT=5432
-PGDATA=/var/lib/pgsql/data
-PGLOG=/var/lib/pgsql/pgstartup.log
-# Value to set as postmaster process's oom_adj
-PG_OOM_ADJ=-17
-
-# Override defaults from /etc/sysconfig/pgsql if file is present
-[ -f /etc/sysconfig/pgsql/${NAME} ] && . /etc/sysconfig/pgsql/${NAME}
-
-export PGDATA
-export PGPORT
-
-lockfile="/var/lock/subsys/${NAME}"
-pidfile="/var/run/postmaster.${PGPORT}.pid"
-
-script_result=0
-
-start(){
- [ -x "$PGENGINE/postmaster" ] || exit 5
-
- PSQL_START=$"Starting ${NAME} service: "
-
- # Make sure startup-time log file is valid
- if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
- then
- touch "$PGLOG" || exit 4
- chown postgres:postgres "$PGLOG"
- chmod go-rwx "$PGLOG"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
- fi
-
- # Check for the PGDATA structure
- if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
- then
- # Check version of existing PGDATA
- if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
- then
- : A-OK
- elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
- then
- echo
- echo $"An old version of the database format was found."
- echo $"Use \"service postgresql upgrade\" to upgrade to version $PGMAJORVERSION."
- echo $"See $PGDOCDIR/README.rpm-dist for more information."
- exit 1
- else
- echo
- echo $"An old version of the database format was found."
- echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION."
- echo $"See $PGDOCDIR/README.rpm-dist for more information."
- exit 1
- fi
- else
- # No existing PGDATA! Warn the user to initdb it.
- echo
- echo $"$PGDATA is missing. Use \"service postgresql initdb\" to initialize the cluster first."
- echo_failure
- echo
- exit 1
- fi
-
- echo -n "$PSQL_START"
- test x"$PG_OOM_ADJ" != x && echo "$PG_OOM_ADJ" > /proc/self/oom_adj
- $SU -l postgres -c "$PGENGINE/postmaster -p '$PGPORT' -D '$PGDATA' ${PGOPTS} &" >> "$PGLOG" 2>&1 < /dev/null
- sleep 2
- pid=`head -n 1 "$PGDATA/postmaster.pid" 2>/dev/null`
- if [ "x$pid" != x ]
- then
- success "$PSQL_START"
- touch "$lockfile"
- echo $pid > "$pidfile"
- echo
- else
- failure "$PSQL_START"
- echo
- script_result=1
- fi
-}
-
-stop(){
- echo -n $"Stopping ${NAME} service: "
- if [ -e "$lockfile" ]
- then
- $SU -l postgres -c "$PGENGINE/pg_ctl stop -D '$PGDATA' -s -m fast" > /dev/null 2>&1 < /dev/null
- ret=$?
- if [ $ret -eq 0 ]
- then
- echo_success
- rm -f "$pidfile"
- rm -f "$lockfile"
- else
- echo_failure
- script_result=1
- fi
- else
- # not running; per LSB standards this is "ok"
- echo_success
- fi
- echo
-}
-
-restart(){
- stop
- start
-}
-
-condrestart(){
- [ -e "$lockfile" ] && restart || :
-}
-
-reload(){
- $SU -l postgres -c "$PGENGINE/pg_ctl reload -D '$PGDATA' -s" > /dev/null 2>&1 < /dev/null
-}
-
-# code shared between initdb and upgrade actions
-perform_initdb(){
- if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
- then
- mkdir -p "$PGDATA" || return 1
- chown postgres:postgres "$PGDATA"
- chmod go-rwx "$PGDATA"
- fi
- # Clean up SELinux tagging for PGDATA
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
-
- # Make sure the startup-time log file is OK, too
- if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
- then
- touch "$PGLOG" || return 1
- chown postgres:postgres "$PGLOG"
- chmod go-rwx "$PGLOG"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
- fi
-
- # Initialize the database
- $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
-
- # Create directory for postmaster log
- mkdir "$PGDATA/pg_log"
- chown postgres:postgres "$PGDATA/pg_log"
- chmod go-rwx "$PGDATA/pg_log"
-
- if [ -f "$PGDATA/PG_VERSION" ]
- then
- return 0
- fi
- return 1
-}
-
-initdb(){
- if [ -f "$PGDATA/PG_VERSION" ]
- then
- echo -n $"Data directory is not empty!"
- echo_failure
- echo
- script_result=1
- else
- echo -n $"Initializing database: "
- if perform_initdb
- then
- echo_success
- else
- echo_failure
- script_result=1
- fi
- echo
- fi
-}
-
-upgrade(){
- # must see previous version in PG_VERSION
- if [ ! -f "$PGDATA/PG_VERSION" -o \
- x`cat "$PGDATA/PG_VERSION"` != x"$PREVMAJORVERSION" ]
- then
- echo
- echo $"Cannot upgrade because database is not of version $PREVMAJORVERSION."
- echo_failure
- echo
- exit 1
- fi
- if [ ! -x "$PGENGINE/pg_upgrade" ]
- then
- echo
- echo $"Please install the postgresql-upgrade RPM."
- echo_failure
- echo
- exit 5
- fi
- # Make sure service is stopped
- stop
-
- echo -n $"Upgrading database: "
-
- # Set up log file for pg_upgrade
- PGUPLOG=/var/lib/pgsql/pgupgrade.log
- rm -f "$PGUPLOG"
- touch "$PGUPLOG" || exit 1
- chown postgres:postgres "$PGUPLOG"
- chmod go-rwx "$PGUPLOG"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGUPLOG"
-
- # Move old DB to PGDATAOLD
- PGDATAOLD="${PGDATA}-old"
- rm -rf "$PGDATAOLD"
- mv "$PGDATA" "$PGDATAOLD" || exit 1
-
- # Create empty new-format database
- if perform_initdb
- then
- # Do the upgrade
- $SU -l postgres -c "$PGENGINE/pg_upgrade \
- '--old-bindir=$PREVPGENGINE' \
- '--new-bindir=$PGENGINE' \
- '--old-datadir=$PGDATAOLD' \
- '--new-datadir=$PGDATA' \
- --link \
- '--old-port=$PGPORT' '--new-port=$PGPORT' \
- --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
- if [ $? -ne 0 ]
- then
- # pg_upgrade failed
- script_result=1
- fi
- else
- # initdb failed
- script_result=1
- fi
-
- if [ $script_result -eq 0 ]
- then
- echo_success
- else
- # Clean up after failure
- rm -rf "$PGDATA"
- mv "$PGDATAOLD" "$PGDATA"
-
- echo_failure
- fi
- echo
- echo $"See $PGUPLOG for details."
-}
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p "$pidfile" postmaster
- script_result=$?
- ;;
- restart)
- restart
- ;;
- condrestart|try-restart)
- condrestart
- ;;
- reload)
- reload
- ;;
- force-reload)
- restart
- ;;
- initdb)
- initdb
- ;;
- upgrade)
- upgrade
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|initdb|upgrade}"
- exit 2
-esac
-
-exit $script_result
diff --git a/postgresql.service b/postgresql.service
new file mode 100644
index 0000000..0c733bd
--- /dev/null
+++ b/postgresql.service
@@ -0,0 +1,36 @@
+[Unit]
+Description=PostgreSQL database server
+After=syslog.target
+After=network.target
+
+[Service]
+Type=forking
+
+User=postgres
+Group=postgres
+
+# Note: avoid inserting whitespace in these Environment= lines, or you may
+# break postgresql-setup.
+
+# Port number for server to listen on
+Environment=PGPORT=5432
+
+# Location of database directory
+Environment=PGDATA=/var/lib/pgsql/data
+
+# Where to send early-startup messages from the server (before the logging
+# options of postgresql.conf take effect)
+StandardOutput=syslog
+
+# Disable OOM kill on the postmaster
+OOMScoreAdjust=-1000
+
+ExecStart=/usr/bin/pg_ctl start -D ${PGDATA} -s -o "-p ${PGPORT}" -w -t 300
+ExecStop=/usr/bin/pg_ctl stop -D ${PGDATA} -s -m fast
+ExecReload=/usr/bin/pg_ctl reload -D ${PGDATA} -s
+
+# Give a reasonable amount of time for the server to start up/shut down
+TimeoutSec=300
+
+[Install]
+WantedBy=multi-user.target
diff --git a/postgresql.spec b/postgresql.spec
index d874f80..1e18d70 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,10 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.4
-Release: 7%{?dist}
+Release: 8%{?dist}
+# Update this whenever F15 gets rebased; it must be NVR-greater than F15 pkg:
+%global first_systemd_version 9.0.4-8
+
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -73,11 +76,12 @@ Source1: postgresql-%{version}-US.pdf
# generate-pdf.sh is not used during RPM build, but include for documentation
Source2: generate-pdf.sh
Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
-Source4: postgresql.init
Source5: Makefile.regress
Source6: pg_config.h
Source7: ecpg_config.h
Source8: README.rpm-dist
+Source9: postgresql-setup
+Source10: postgresql.service
Source14: postgresql.pam
Source15: postgresql-bashprofile
@@ -87,12 +91,12 @@ Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-gcc-workaround.patch
Patch5: postgresql-perl-5.14.patch
+Patch6: postgresql-pgctl-timeout.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
-# for /sbin/ldconfig
-Requires(post): glibc initscripts
-Requires(postun): glibc initscripts
+BuildRequires: readline-devel zlib-devel
+BuildRequires: systemd-units
%if %plpython
BuildRequires: python-devel
@@ -105,9 +109,6 @@ BuildRequires: tcl-devel
%endif
%endif
-BuildRequires: readline-devel
-BuildRequires: zlib-devel >= 1.0.4
-
%if %ssl
BuildRequires: openssl-devel
%endif
@@ -167,6 +168,9 @@ if you're installing the postgresql-server package.
Summary: The shared libraries required for any PostgreSQL clients
Group: Applications/Databases
Provides: libpq.so = %{version}-%{release}
+# for /sbin/ldconfig
+Requires(post): glibc
+Requires(postun): glibc
%description libs
The postgresql-libs package provides the essential shared libraries for any
@@ -180,11 +184,18 @@ Group: Applications/Databases
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
+# for /sbin/ldconfig
+Requires(post): glibc
+Requires(postun): glibc
+# pre/post stuff needs systemd too
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+# This is actually needed for the %%triggerun script but Requires(triggerun)
+# is not valid. We can use post because this particular %%triggerun script
+# should fire just after this package is installed.
+Requires(post): systemd-sysv
Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(postun): initscripts
%description server
The postgresql-server package includes the programs needed to create
@@ -306,6 +317,7 @@ system, including regression tests and benchmarks.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -388,7 +400,6 @@ CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
--enable-thread-safety \
%endif
--with-system-tzdata=/usr/share/zoneinfo \
- --sysconfdir=/etc/sysconfig/pgsql \
--datadir=/usr/share/pgsql
make %{?_smp_mflags} world
@@ -452,14 +463,16 @@ esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
-# prep the initscript, including insertion of some values it needs
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+# prep the setup script, including insertion of some values it needs
sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
+ -e 's|^PGENGINE=.*$|PGENGINE=%{_bindir}|' \
-e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
-e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
- -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_docdir}/%{name}-%{version}|' \
- <%{SOURCE4} >postgresql.init
-install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+ <%{SOURCE9} >postgresql-setup
+install -m 755 postgresql-setup $RPM_BUILD_ROOT%{_bindir}/postgresql-setup
+
+install -d $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/postgresql.service
%if %pam
install -d $RPM_BUILD_ROOT/etc/pam.d
@@ -475,9 +488,6 @@ install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
# postgres' .bash_profile
install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
-# Create the multiple postmaster startup directory
-install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
-
%if %upgrade
pushd postgresql-%{prevversion}
@@ -593,19 +603,36 @@ cat psql-%{majorversion}.lang >>main.lst
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
%post server
-/sbin/chkconfig --add postgresql
/sbin/ldconfig
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+# Run this when upgrading from SysV initscript to native systemd unit
+%triggerun server -- postgresql-server < %{first_systemd_version}
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply postgresql
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save postgresql >/dev/null 2>&1 || :
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del postgresql >/dev/null 2>&1 || :
+/bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
%preun server
-if [ $1 = 0 ] ; then
- /sbin/service postgresql stop >/dev/null 2>&1
- /sbin/chkconfig --del postgresql
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable postgresql.service >/dev/null 2>&1 || :
+ /bin/systemctl stop postgresql.service >/dev/null 2>&1 || :
fi
%postun server
/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- /sbin/service postgresql condrestart >/dev/null 2>&1 || :
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart postgresql.service >/dev/null 2>&1 || :
fi
%if %plperl
@@ -734,17 +761,17 @@ rm -rf $RPM_BUILD_ROOT
%files server -f server.lst
%defattr(-,root,root)
-/etc/rc.d/init.d/postgresql
+%{_unitdir}/postgresql.service
%if %pam
%config(noreplace) /etc/pam.d/postgresql
%endif
-%attr (755,root,root) %dir /etc/sysconfig/pgsql
%{_bindir}/initdb
%{_bindir}/pg_controldata
%{_bindir}/pg_ctl
%{_bindir}/pg_resetxlog
%{_bindir}/postgres
%{_bindir}/postmaster
+%{_bindir}/postgresql-setup
%{_mandir}/man1/initdb.*
%{_mandir}/man1/pg_controldata.*
%{_mandir}/man1/pg_ctl.*
@@ -824,6 +851,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jul 27 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-8
+- Convert to systemd startup support
+Resolves: #696427
+
* Thu Jul 21 2011 Petr Sabata <contyk(a)redhat.com> - 9.0.4-7
- Perl mass rebuild
commit 7de7a32f914908b000d1b7c00d9010087fa757a8
Author: Petr Sabata <contyk(a)redhat.com>
Date: Thu Jul 21 18:41:56 2011 +0200
Perl mass rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 1cb9745..d874f80 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -824,6 +824,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Jul 21 2011 Petr Sabata <contyk(a)redhat.com> - 9.0.4-7
+- Perl mass rebuild
+
* Wed Jul 20 2011 Petr Sabata <contyk(a)redhat.com> - 9.0.4-6
- Perl mass rebuild
commit e60877113e497bcc187e99f022d52e202a66e58c
Author: Petr Sabata <contyk(a)redhat.com>
Date: Wed Jul 20 11:59:35 2011 +0200
Perl mass rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 8e45248..1cb9745 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -824,6 +824,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jul 20 2011 Petr Sabata <contyk(a)redhat.com> - 9.0.4-6
+- Perl mass rebuild
+
* Wed Jul 6 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-5
- Remove erroneously-included Default-Start line from LSB init block
Related: #717024
commit 225f74aa3b2b351e4a0d20736254e9bb3de2b481
Author: Tom Lane <tgl(a)redhat.com>
Date: Wed Jul 6 18:22:54 2011 -0400
fat-fingered changelog entry
diff --git a/postgresql.spec b/postgresql.spec
index cd0b3f6..8e45248 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -824,7 +824,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Wed Jul 6 Tom Lane <tgl(a)redhat.com> 9.0.4-5
+* Wed Jul 6 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-5
- Remove erroneously-included Default-Start line from LSB init block
Related: #717024
commit de983032c207109ecaf4c44587b63ead19cf6f73
Author: Tom Lane <tgl(a)redhat.com>
Date: Wed Jul 6 18:21:23 2011 -0400
Remove erroneously-included Default-Start line from LSB init block
diff --git a/postgresql.init b/postgresql.init
index b19edb0..b7dc208 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -14,8 +14,6 @@
# Provides: postgresql
# Required-Start: $local_fs $remote_fs $network $named $syslog $time
# Required-Stop: $local_fs $remote_fs $network $named $syslog $time
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
# Short-Description: start and stop PostgreSQL server
# Description: PostgreSQL database server
### END INIT INFO
diff --git a/postgresql.spec b/postgresql.spec
index afb93a8..cd0b3f6 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -824,6 +824,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jul 6 Tom Lane <tgl(a)redhat.com> 9.0.4-5
+- Remove erroneously-included Default-Start line from LSB init block
+Related: #717024
+
* Fri Jun 17 2011 Marcela Malov <mmaslano(a)redhat.com> 9.0.4-4
- Perl mass rebuild
- incorporate upstream patch to make it build with Perl 5.14
commit 9b6ef0aa030e2f48a5f441abb5a005355b371a77
Author: Tom Lane <tgl(a)redhat.com>
Date: Fri Jun 17 13:32:41 2011 -0400
Add upstream patch needed for Perl 5.14
diff --git a/postgresql-perl-5.14.patch b/postgresql-perl-5.14.patch
new file mode 100644
index 0000000..c205c1d
--- /dev/null
+++ b/postgresql-perl-5.14.patch
@@ -0,0 +1,41 @@
+Back-patch upstream patch to cope with perl 5.14. This will be present
+in PG 9.0.5 and later, but we want to build rawhide with 5.14 now.
+
+
+commit cb252c2acd415d304e3254e99f82058d11a69e04
+Author: Andrew Dunstan <andrew(a)dunslane.net>
+Date: Sat Jun 4 19:35:04 2011 -0400
+
+ Allow building with perl 5.14.
+
+ Patch from Alex Hunsaker.
+
+diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
+index 72c4dc2..1754489 100644
+--- a/src/pl/plperl/plperl.c
++++ b/src/pl/plperl/plperl.c
+@@ -874,7 +874,7 @@ plperl_trusted_init(void)
+ if (!isGV_with_GP(sv) || !GvCV(sv))
+ continue;
+ SvREFCNT_dec(GvCV(sv)); /* free the CV */
+- GvCV(sv) = NULL; /* prevent call via GV */
++ GvCV_set(sv, NULL); /* prevent call via GV */
+ }
+ hv_clear(stash);
+
+diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
+index 6d58f11..1d38d9e 100644
+--- a/src/pl/plperl/plperl.h
++++ b/src/pl/plperl/plperl.h
+@@ -42,6 +42,11 @@
+ #undef bool
+ #endif
+
++/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
++#ifndef GvCV_set
++#define GvCV_set(gv, cv) (GvCV(gv) = cv)
++#endif
++
+ /* declare routines from plperl.c for access by .xs files */
+ HV *plperl_spi_exec(char *, int);
+ void plperl_return_next(SV *);
diff --git a/postgresql.spec b/postgresql.spec
index 951d4e9..afb93a8 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -86,6 +86,7 @@ Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-gcc-workaround.patch
+Patch5: postgresql-perl-5.14.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -304,6 +305,7 @@ system, including regression tests and benchmarks.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -822,8 +824,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Fri Jun 17 2011 Marcela Malov <mmaslano(a)redhat.com> - 9.0.4-4
+* Fri Jun 17 2011 Marcela Malov <mmaslano(a)redhat.com> 9.0.4-4
- Perl mass rebuild
+- incorporate upstream patch to make it build with Perl 5.14
* Fri Jun 10 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-3
- Work around gcc 4.6.0 bug (temporary backport from next upstream release)
commit faae8041b1cb176b77d04212d3b41ac6c18c00b6
Author: Marcela Malov <mmaslano(a)redhat.com>
Date: Fri Jun 17 18:09:39 2011 +0200
Perl mass rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 45e863f..951d4e9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -822,6 +822,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Jun 17 2011 Marcela Malov <mmaslano(a)redhat.com> - 9.0.4-4
+- Perl mass rebuild
+
* Fri Jun 10 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-3
- Work around gcc 4.6.0 bug (temporary backport from next upstream release)
commit 562fb683dfc2f8877afeaea21eb0fb829d623788
Author: Tom Lane <tgl(a)redhat.com>
Date: Fri Jun 10 17:16:01 2011 -0400
Work around gcc 4.6.0 bug
diff --git a/postgresql-gcc-workaround.patch b/postgresql-gcc-workaround.patch
new file mode 100644
index 0000000..7850821
--- /dev/null
+++ b/postgresql-gcc-workaround.patch
@@ -0,0 +1,111 @@
+Back-patch upstream patch to cope with a gcc 4.6.0 bug. This will be
+in PG 9.0.5 and later, but we need it in Fedora *now* because the bug
+breaks WAL replay, thus causing crash recovery failures as well as the
+originally reported symptom of frequent reconnections during standby.
+
+
+commit 45d792f70272ed57b932816562f31c2f79426c2a
+Author: Tom Lane <tgl(a)sss.pgh.pa.us>
+Date: Fri Jun 10 17:03:11 2011 -0400
+
+ Work around gcc 4.6.0 bug that breaks WAL replay.
+
+ ReadRecord's habit of using both direct references to tmpRecPtr and
+ references to *RecPtr (which is pointing at tmpRecPtr) triggers an
+ optimization bug in gcc 4.6.0, which apparently has forgotten about
+ aliasing rules. Avoid the compiler bug, and make the code more readable
+ to boot, by getting rid of the direct references. Improve the comments
+ while at it.
+
+ Back-patch to all supported versions, in case they get built with 4.6.0.
+
+ Tom Lane, with some cosmetic suggestions from Alex Hunsaker
+
+diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
+index bf8075d..6c18db4 100644
+--- a/src/backend/access/transam/xlog.c
++++ b/src/backend/access/transam/xlog.c
+@@ -3676,23 +3676,32 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt)
+ RecPtr = &tmpRecPtr;
+
+ /*
+- * Align recptr to next page if no more records can fit on the current
+- * page.
++ * RecPtr is pointing to end+1 of the previous WAL record. We must
++ * advance it if necessary to where the next record starts. First,
++ * align to next page if no more records can fit on the current page.
+ */
+ if (XLOG_BLCKSZ - (RecPtr->xrecoff % XLOG_BLCKSZ) < SizeOfXLogRecord)
+- {
+- NextLogPage(tmpRecPtr);
+- /* We will account for page header size below */
+- }
++ NextLogPage(*RecPtr);
+
+- if (tmpRecPtr.xrecoff >= XLogFileSize)
++ /* Check for crossing of xlog segment boundary */
++ if (RecPtr->xrecoff >= XLogFileSize)
+ {
+- (tmpRecPtr.xlogid)++;
+- tmpRecPtr.xrecoff = 0;
++ (RecPtr->xlogid)++;
++ RecPtr->xrecoff = 0;
+ }
++
++ /*
++ * If at page start, we must skip over the page header. But we can't
++ * do that until we've read in the page, since the header size is
++ * variable.
++ */
+ }
+ else
+ {
++ /*
++ * In this case, the passed-in record pointer should already be
++ * pointing to a valid record starting position.
++ */
+ if (!XRecOffIsValid(RecPtr->xrecoff))
+ ereport(PANIC,
+ (errmsg("invalid record offset at %X/%X",
+@@ -3721,11 +3730,13 @@ retry:
+ if (targetRecOff == 0)
+ {
+ /*
+- * Can only get here in the continuing-from-prev-page case, because
+- * XRecOffIsValid eliminated the zero-page-offset case otherwise. Need
+- * to skip over the new page's header.
++ * At page start, so skip over page header. The Assert checks that
++ * we're not scribbling on caller's record pointer; it's OK because we
++ * can only get here in the continuing-from-prev-record case, since
++ * XRecOffIsValid rejected the zero-page-offset case otherwise.
+ */
+- tmpRecPtr.xrecoff += pageHeaderSize;
++ Assert(RecPtr == &tmpRecPtr);
++ RecPtr->xrecoff += pageHeaderSize;
+ targetRecOff = pageHeaderSize;
+ }
+ else if (targetRecOff < pageHeaderSize)
+diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h
+index 3f0930f..367de37 100644
+--- a/src/include/access/xlog_internal.h
++++ b/src/include/access/xlog_internal.h
+@@ -154,13 +154,13 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
+ /* Align a record pointer to next page */
+ #define NextLogPage(recptr) \
+ do { \
+- if (recptr.xrecoff % XLOG_BLCKSZ != 0) \
+- recptr.xrecoff += \
+- (XLOG_BLCKSZ - recptr.xrecoff % XLOG_BLCKSZ); \
+- if (recptr.xrecoff >= XLogFileSize) \
++ if ((recptr).xrecoff % XLOG_BLCKSZ != 0) \
++ (recptr).xrecoff += \
++ (XLOG_BLCKSZ - (recptr).xrecoff % XLOG_BLCKSZ); \
++ if ((recptr).xrecoff >= XLogFileSize) \
+ { \
+- (recptr.xlogid)++; \
+- recptr.xrecoff = 0; \
++ ((recptr).xlogid)++; \
++ (recptr).xrecoff = 0; \
+ } \
+ } while (0)
+
diff --git a/postgresql.spec b/postgresql.spec
index 8ec8fc1..45e863f 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -85,6 +85,7 @@ Source15: postgresql-bashprofile
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
+Patch4: postgresql-gcc-workaround.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -302,6 +303,7 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -820,6 +822,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Jun 10 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-3
+- Work around gcc 4.6.0 bug (temporary backport from next upstream release)
+
* Tue May 10 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-2
- Add LSB init block to initscript, to ensure sane ordering at system boot
Resolves: #703215
commit cbf5959e96086e65fbb4064b888a45b1af6aed27
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue May 10 16:12:31 2011 -0400
LSB init block to initscript
diff --git a/postgresql.init b/postgresql.init
index 595ed61..b19edb0 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -3,13 +3,22 @@
# postgresql This is the init script for starting up the PostgreSQL
# server.
#
+# This script is slightly unusual in that the name of the daemon (postmaster)
+# is not the same as the name of the subsystem (postgresql)
+#
# chkconfig: - 64 36
# description: PostgreSQL database server.
# processname: postmaster
# pidfile: /var/run/postmaster.PORT.pid
-
-# This script is slightly unusual in that the name of the daemon (postmaster)
-# is not the same as the name of the subsystem (postgresql)
+### BEGIN INIT INFO
+# Provides: postgresql
+# Required-Start: $local_fs $remote_fs $network $named $syslog $time
+# Required-Stop: $local_fs $remote_fs $network $named $syslog $time
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop PostgreSQL server
+# Description: PostgreSQL database server
+### END INIT INFO
# PGVERSION is the full package version, e.g., 9.0.2
# Note: the specfile inserts the correct value during package build
diff --git a/postgresql.spec b/postgresql.spec
index fa6c21b..8ec8fc1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -820,6 +820,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue May 10 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-2
+- Add LSB init block to initscript, to ensure sane ordering at system boot
+Resolves: #703215
+
* Mon Apr 18 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-1
- Update to PostgreSQL 9.0.4, for various fixes described at
http://www.postgresql.org/docs/9.0/static/release-9-0-4.html
commit 7632f67fca4cf787e43e2923f4d963ad8f2ff8a9
Author: Tom Lane <tgl(a)redhat.com>
Date: Mon Apr 18 11:04:47 2011 -0400
Update to PostgreSQL 9.0.4
diff --git a/.gitignore b/.gitignore
index 49151a4..6e08abe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.0.3.tar.bz2
-/postgresql-9.0.3-US.pdf
+/postgresql-9.0.4.tar.bz2
+/postgresql-9.0.4-US.pdf
/postgresql-8.4.6.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index a89e791..fa6c21b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,8 +53,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
-Version: 9.0.3
-Release: 3%{?dist}
+Version: 9.0.4
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -820,6 +820,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Apr 18 2011 Tom Lane <tgl(a)redhat.com> 9.0.4-1
+- Update to PostgreSQL 9.0.4, for various fixes described at
+ http://www.postgresql.org/docs/9.0/static/release-9-0-4.html
+- Add %%{?_isa} to cross-subpackage Requires, per latest packaging guidelines
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index ef628d4..80e2ea6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-928df8c40bb012ad10756e58b70516fb postgresql-9.0.3.tar.bz2
-d3168a6304a4e1b44af1619ba2a2dc82 postgresql-9.0.3-US.pdf
+80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2
+7d27ebea9aa8654f73e47caa933e3fca postgresql-9.0.4-US.pdf
fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2
commit 9877679a0c14404a63f768d52c0af44298ceeec2
Author: Devrim GNDZ <devrim(a)gunduz.org>
Date: Tue Feb 15 23:33:39 2011 +0200
Update my email address.
diff --git a/README.rpm-dist b/README.rpm-dist
index 0d8e36f..38bdc9e 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,7 +1,7 @@
README.rpm-dist
-----------------------------------------------------------------------------
Version 9.0, for the PostgreSQL 9.0 RPM set.
-Devrim Gndz <devrim(a)CommandPrompt.com>
+Devrim Gndz <devrim(a)gunduz.org>
-----------------------------------------------------------------------------
Contents:
commit 2af4178aee04be56df5c6676f06d8ad5727ee2cb
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Feb 10 02:01:11 2011 -0500
_isa-ify inter-subpackage dependencies, per Packaging Guidelines.
diff --git a/postgresql.spec b/postgresql.spec
index cf8e344..a89e791 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -139,7 +139,7 @@ BuildRequires: systemtap-sdt-devel
%endif
# main package requires -libs subpackage
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -175,8 +175,8 @@ PostgreSQL server.
%package server
Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -199,7 +199,7 @@ to install the postgresql package.
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description docs
The postgresql-docs package includes some additional documentation for
@@ -210,8 +210,8 @@ and source files for the PostgreSQL tutorial.
%package contrib
Summary: Contributed modules distributed with PostgreSQL
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description contrib
The postgresql-contrib package contains contributed packages that are
@@ -221,8 +221,8 @@ included in the PostgreSQL distribution.
%package devel
Summary: PostgreSQL development header files and libraries
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
The postgresql-devel package contains the header files and libraries
@@ -236,8 +236,8 @@ develop applications which will interact with a PostgreSQL server.
%package upgrade
Summary: Support for upgrading from the previous major release of PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description upgrade
PostgreSQL is an advanced Object-Relational database management
@@ -251,7 +251,7 @@ major version of PostgreSQL.
%package plperl
Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description plperl
@@ -264,7 +264,7 @@ procedural language for the backend.
%package plpython
Summary: The Python procedural language for PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description plpython
PostgreSQL is an advanced Object-Relational database management
@@ -276,7 +276,7 @@ procedural language for the backend.
%package pltcl
Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description pltcl
PostgreSQL is an advanced Object-Relational database management
@@ -288,7 +288,7 @@ procedural language for the backend.
%package test
Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases
-Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description test
PostgreSQL is an advanced Object-Relational database management
commit 426a182de1b0e6cb0e945a5575cd0b5cf9f4df91
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 9 10:11:10 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 69996bb..cf8e344 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -820,6 +820,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 9.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Thu Feb 3 2011 Tom Lane <tgl(a)redhat.com> 9.0.3-2
- Remove filter-requires-perl-Pg.sh, which doesn't seem to be needed now that
PyGreSQL has been split out; and our use of it isn't compatible with rpm 4.9
commit c425547bbc57ac8c15ba4ae97812e3dd609b9e80
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Feb 3 12:20:24 2011 -0500
Remove filter-requires-perl-Pg.sh
diff --git a/filter-requires-perl-Pg.sh b/filter-requires-perl-Pg.sh
deleted file mode 100755
index f37557f..0000000
--- a/filter-requires-perl-Pg.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/perl.req $* | grep -v 'perl(Pg'
diff --git a/postgresql.spec b/postgresql.spec
index 9854dc1..69996bb 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -54,7 +54,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
Version: 9.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -80,7 +80,6 @@ Source7: ecpg_config.h
Source8: README.rpm-dist
Source14: postgresql.pam
Source15: postgresql-bashprofile
-Source16: filter-requires-perl-Pg.sh
# Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch
@@ -298,8 +297,6 @@ binaries of various tests for the PostgreSQL database management
system, including regression tests and benchmarks.
%endif
-%global __perl_requires %{SOURCE16}
-
%prep
%setup -q
%patch1 -p1
@@ -823,6 +820,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Feb 3 2011 Tom Lane <tgl(a)redhat.com> 9.0.3-2
+- Remove filter-requires-perl-Pg.sh, which doesn't seem to be needed now that
+ PyGreSQL has been split out; and our use of it isn't compatible with rpm 4.9
+ anyway
+
* Tue Feb 1 2011 Tom Lane <tgl(a)redhat.com> 9.0.3-1
- Update to PostgreSQL 9.0.3, for various fixes described at
http://www.postgresql.org/docs/9.0/static/release-9-0-3.html
commit e5c31247fcc4e8009b39a09ff904aa37e852e811
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue Feb 1 10:35:37 2011 -0500
Update to PostgreSQL 9.0.3
diff --git a/.gitignore b/.gitignore
index b1ff8a8..49151a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/postgresql-9.0.2.tar.bz2
-/postgresql-9.0.2-US.pdf
+/postgresql-9.0.3.tar.bz2
+/postgresql-9.0.3-US.pdf
/postgresql-8.4.6.tar.bz2
diff --git a/postgresql-upgrade-fixes.patch b/postgresql-upgrade-fixes.patch
deleted file mode 100644
index ce493b8..0000000
--- a/postgresql-upgrade-fixes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Patch pg_upgrade to not insist on useless baggage in the upgrade RPM,
-as well as being more careful to check for things it does need.
-
-
-diff -Naur postgresql-9.0.2.orig/contrib/pg_upgrade/exec.c postgresql-9.0.2/contrib/pg_upgrade/exec.c
---- postgresql-9.0.2.orig/contrib/pg_upgrade/exec.c 2010-12-13 21:55:50.000000000 -0500
-+++ postgresql-9.0.2/contrib/pg_upgrade/exec.c 2010-12-28 16:56:05.734506648 -0500
-@@ -14,7 +14,7 @@
-
-
- static void check_data_dir(migratorContext *ctx, const char *pg_data);
--static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster);
-+static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster);
- static int check_exec(migratorContext *ctx, const char *dir, const char *cmdName);
- static const char *validate_exec(const char *path);
-
-@@ -99,7 +99,7 @@
- check_ok(ctx);
-
- prep_status(ctx, "Checking old bin directory (%s)", ctx->old.bindir);
-- check_bin_dir(ctx, &ctx->old);
-+ check_bin_dir(ctx, &ctx->old, CLUSTER_OLD);
- check_ok(ctx);
-
- prep_status(ctx, "Checking new data directory (%s)", ctx->new.pgdata);
-@@ -107,7 +107,7 @@
- check_ok(ctx);
-
- prep_status(ctx, "Checking new bin directory (%s)", ctx->new.bindir);
-- check_bin_dir(ctx, &ctx->new);
-+ check_bin_dir(ctx, &ctx->new, CLUSTER_NEW);
- check_ok(ctx);
- }
-
-@@ -158,12 +158,18 @@
- * exit().
- */
- static void
--check_bin_dir(migratorContext *ctx, ClusterInfo *cluster)
-+check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster)
- {
- check_exec(ctx, cluster->bindir, "postgres");
-- check_exec(ctx, cluster->bindir, "psql");
- check_exec(ctx, cluster->bindir, "pg_ctl");
-- check_exec(ctx, cluster->bindir, "pg_dumpall");
-+ check_exec(ctx, cluster->bindir, "pg_resetxlog");
-+ if (whichCluster == CLUSTER_NEW)
-+ {
-+ /* these are only needed in the new cluster */
-+ check_exec(ctx, cluster->bindir, "pg_config");
-+ check_exec(ctx, cluster->bindir, "psql");
-+ check_exec(ctx, cluster->bindir, "pg_dumpall");
-+ }
- }
-
-
-diff -Naur postgresql-9.0.2.orig/contrib/pg_upgrade/option.c postgresql-9.0.2/contrib/pg_upgrade/option.c
---- postgresql-9.0.2.orig/contrib/pg_upgrade/option.c 2010-12-13 21:55:50.000000000 -0500
-+++ postgresql-9.0.2/contrib/pg_upgrade/option.c 2010-12-28 16:53:44.730531216 -0500
-@@ -308,7 +308,11 @@
- static void
- get_pkglibdirs(migratorContext *ctx)
- {
-- ctx->old.libpath = get_pkglibdir(ctx, ctx->old.bindir);
-+ /*
-+ * we do not need to know the libpath in the old cluster, and might not
-+ * have a working pg_config to ask for it anyway.
-+ */
-+ ctx->old.libpath = NULL;
- ctx->new.libpath = get_pkglibdir(ctx, ctx->new.bindir);
- }
-
diff --git a/postgresql.spec b/postgresql.spec
index 4dc73f2..9854dc1 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.0
-Version: 9.0.2
+Version: 9.0.3
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -86,7 +86,6 @@ Source16: filter-requires-perl-Pg.sh
Patch1: rpm-pgsql.patch
Patch2: postgresql-logging.patch
Patch3: postgresql-perl-rpath.patch
-Patch4: postgresql-upgrade-fixes.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -306,7 +305,6 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -825,6 +823,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Feb 1 2011 Tom Lane <tgl(a)redhat.com> 9.0.3-1
+- Update to PostgreSQL 9.0.3, for various fixes described at
+ http://www.postgresql.org/docs/9.0/static/release-9-0-3.html
+ including the fix for CVE-2010-4015
+Resolves: #674296
+
* Tue Dec 28 2010 Tom Lane <tgl(a)redhat.com> 9.0.2-1
- Update to PostgreSQL 9.0.2 (major version bump)
- Create infrastructure for in-place database upgrade using pg_upgrade
diff --git a/sources b/sources
index f5c42f6..ef628d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-fc79ef32b602f75f2ccd37647bc008e9 postgresql-9.0.2.tar.bz2
-7b72c6603a9567c356dedb7bfb658a36 postgresql-9.0.2-US.pdf
+928df8c40bb012ad10756e58b70516fb postgresql-9.0.3.tar.bz2
+d3168a6304a4e1b44af1619ba2a2dc82 postgresql-9.0.3-US.pdf
fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2
commit 4753f3695e35f89143fc89f78cd83678e1c61dc8
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue Dec 28 19:13:08 2010 -0500
Update to PostgreSQL 9.0.2
diff --git a/.gitignore b/.gitignore
index 25b1f8e..b1ff8a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+/postgresql-9.0.2.tar.bz2
+/postgresql-9.0.2-US.pdf
/postgresql-8.4.6.tar.bz2
-/postgresql-8.4.6-US.pdf
diff --git a/README.rpm-dist b/README.rpm-dist
index e4f43a8..0d8e36f 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,29 +1,21 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 8.4, for the PostgreSQL 8.4 RPM set.
+Version 9.0, for the PostgreSQL 9.0 RPM set.
Devrim Gndz <devrim(a)CommandPrompt.com>
-----------------------------------------------------------------------------
Contents:
- 0.) Quick note about '-i'
1.) Introduction and QuickStart
- 2.) PostgreSQL RPM packages and rationale
- 3.) Starting multiple postmasters
- 4.) Regression Testing
- 5.) Starting postmaster automatically on startup
- 6.) Grand Unified Configuration(GUC) File
- 7.) Logging set up
- 8.) Rebuilding from the source RPM
- 9.) Contrib files
-10.) Further Information Resource
-
-QUICK NOTE ABOUT '-i'
------------------------------------------------------------------------------
-The postmaster '-i' option is NOT used by default in the initscript shipped
-with these RPMs. Please do NOT modify the initscript to add the '-i' back
-in -- it will get overwritten on the next package upgrade. Rather, see the
-section below on the Grand Unified Configuration file, which includes the
-recommended way to get '-i' functionality.
+ 2.) Upgrading an installation
+ 3.) PostgreSQL RPM packages and rationale
+ 4.) Starting multiple postmasters
+ 5.) Regression Testing
+ 6.) Starting postmaster automatically on startup
+ 7.) Grand Unified Configuration(GUC) File
+ 8.) Logging set up
+ 9.) Rebuilding from the source RPM
+10.) Contrib files
+11.) Further Information Resource
INTRODUCTION
-----------------------------------------------------------------------------
@@ -31,27 +23,14 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 8.4 of PostgreSQL,
+This document is written to be applicable to version 9.0 of PostgreSQL,
which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 8.4 are not documented here.
-
-Official PostgreSQL Global Development Group RPMs carry a 'PGDG after the
-release number. Other RPMsets as distributed with Linux distributions may
-have a different release number and initials.
-
-If you want to stay up-to-date on the PostgreSQL core itself, you may
-want to use PGDG set, instead of the binaries supplied by distribution.
-
-These RPMs do not support any sort of major version upgrading process
-other than that documented in the regular documentation. That is, you
-must dump, upgrade,initdb, and restore your data if you are
-performing a major version update. This is not needed for minor version
-updates.
-
-For major version upgrade, dump first, then remove the old server
-subpackage, install the new package, and restore the data from dump.
+point, versions prior to 9.0 are not documented here.
-This document is intended for use only with Red Hat, CentOS and Fedora.
+This document is intended for use only with the RPMs supplied in Red Hat
+Enterprise Linux, CentOS and Fedora. Note that there are also "PGDG"
+RPMs available directly from the upstream PostgreSQL project. Those are
+slightly different.
QUICKSTART
-----------------------------------------------------------------------------
@@ -78,9 +57,43 @@ upgrading.
The user 'postgres' is created during installation of the server subpackage.
This user by default is UID and GID 26. The user has the default shell set to
bash, and the home directory set to /var/lib/pgsql. This user also has no
-default password -- in order to be able to su to it from a non-root account
+default password. If you want to be able to su to it from a non-root account
or login as 'postgres' you will need to set a password using passwd.
+UPGRADING AN INSTALLATION
+-----------------------------------------------------------------------------
+For a minor-version upgrade (such as 9.0.1 to 9.0.2), just install the
+new RPMs; there's usually nothing more to it than that. Upgrading
+across a major release of PostgreSQL (for example, from 8.3.x to 8.4.x)
+requires more effort.
+
+If you are upgrading across more than one major release of PostgreSQL
+(for example, from 8.3.x to 9.0.x), you will need to follow the "traditional"
+dump and reload process to bring your data into the new version. That is:
+*before* upgrading, run pg_dumpall to extract all your data into a SQL file.
+Shut down the old postmaster, upgrade to the new version RPMs, initdb,
+and run the dump file through psql to restore your data.
+
+In some major releases, the RPMs also support in-place upgrade from the
+immediately previous major release. Currently, you can upgrade in-place
+from 8.4.x to 9.0.x. This is much faster than a dump and reload.
+To do an in-place upgrade:
+* shut down the old postmaster
+* optionally make a backup of /var/lib/pgsql/data/
+* install the new version's RPMs (install all the ones you had before,
+ plus postgresql-upgrade)
+* as root, run "service postgresql upgrade"
+* update the configuration files /var/lib/pgsql/data/*.conf with any
+ customizations you had before (your old configuration files are in
+ /var/lib/pgsql/data-old/)
+* as root, run "service postgresql start"
+* postgresql-upgrade can be removed after the update is complete
+
+NOTE: The in-place upgrade process is new and relatively poorly tested,
+so if your data is critical it's a really good idea to make a tarball
+backup of /var/lib/pgsql/data/ before running the upgrade. This will
+let you get back to where you were in case of disaster.
+
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
PostgreSQL is split up into multiple packages so that users can 'pick and
@@ -88,13 +101,12 @@ choose' what pieces are needed, and what dependencies are required.
The RPMset is packaged in the following subpackages:
-postgresql: Key clients and libraries, and documentation
+postgresql: Key client programs and documentation
postgresql-libs: Client shared libraries
postgresql-server: Server executables and data files
postgresql-devel: Development libraries and include files
-postgresql-python: The PyGreSQL client library
-postgresql-tcl: Tcl client library (Pgtcl)
postgresql-test: The regression tests and associated files
+postgresql-upgrade: Support files for upgrading from previous major version
postgresql-docs: Extra documentation, such as the tutorial files
postgresql-contrib: The contrib source tree, as well as selected binaries
postgresql-plperl: PL/Perl procedural language
@@ -105,14 +117,10 @@ You have to install postgresql and postgresql-libs to do anything.
postgresql-server is needed unless you only plan to use the clients to work
with a remote PostgreSQL server. The others are optional.
-Note that there is no postgresql-perl, postgresql-jdbc, postgresql-odbc, or
-postgresql-tk package any longer. This is due to these portions being split
-into separate source distributions.
-
-While PyGreSQL was split out from the core PostgreSQL distribution, thanks to
-Kaj's work it is still included as the python subpackage. Also, Pgtcl is
-still included as the tcl subpackage, although it is not part of the core
-distribution anymore.
+Note that there are no postgresql-perl, postgresql-jdbc, postgresql-odbc,
+postgresql-python, postgresql-tcl, or postgresql-tk subpackages any longer.
+Those programs have been split off into separate source distributions.
+They are still available, but in some cases not under those RPM names.
RPM FILE LOCATIONS.
-----------------------------------------------------------------------------
@@ -142,7 +150,6 @@ Development Headers: /usr/include/pgsql
Other shared data: /usr/share/pgsql
Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
or /usr/lib64/pgsql/test/regress
-Documentation SGML: /usr/share/doc/postgresql-docs-x.y.z/sgml
While it may seem gratuitous to place these files in different locations, the
FHS requires it -- distributions should not ever touch /usr/local. It may
@@ -171,15 +178,10 @@ As an example, let us create a secondary postmaster called, creatively enough,
here. Since $PGDATA/postgresql.conf will override many of these
settings, except PGDATA, you might be surprised on startup.
3.) create the target PGDATA.
-4.) Initdb the targe PGDATA as documented in the main documentation.
- Automatic initdb may or may not work for you, so a manual one is
- preferred. This must be done as user 'postgres'
+4.) Initdb the target PGDATA with 'service secondary initdb'.
5.) Edit postgresql.conf to change the port, address, tcpip settings, etc.
6.) Start the postmaster with 'service secondary start'.
-Note that there may be problems with the standard symlink -- consider this
-support experimental at this point in time.
-
REGRESSION TESTING
-------------------------------------------------------------------------------
If you install the postgresql-test RPM then you can run the PostgreSQL
@@ -188,9 +190,8 @@ results that give you assurances that the installation is complete, and that
your database machine is up to the task.
To run the regression tests under the RPM installation, make sure that
-postmaster has been started (if not, su to root and execute the
-"/etc/rc.d/init.d/postgresql start" init script), cd to
-/usr/lib/pgsql/test/regress (or /usr/lib64/pgsql/test/regress),
+postmaster has been started (if not, su to root and do "service postgresql
+start"), cd to /usr/lib/pgsql/test/regress (or /usr/lib64/pgsql/test/regress),
su to postgres, and execute "make check".
This command will start the regression tests and will both show the
results to the screen and store the results in the file regress.out.
@@ -208,8 +209,8 @@ STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
-------------------------------------------------------------------------------
Fedora / Red Hat / CentOS use the System V Init package. A startup
script for PostgreSQL is provided in the server package, as
-/etc/rc.d/init.d/postgresql. To start the postmaster, with sanity
-checking, as root, run
+/etc/rc.d/init.d/postgresql. To start the postmaster manually,
+as root run
service postgresql start
To shut the postmaster down,
service postgresql stop
@@ -281,7 +282,7 @@ uuid 1 #build contrib/uuid-ossp
To use these defines, invoke a rebuild like this:
rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
--define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
- postgresql-8.4.0-1.src.rpm
+ postgresql-9.0.2-1.src.rpm
This line would disable the python, tcl, and test subpackages, disable the
regression test run during build, and disable kerberos support.
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
deleted file mode 100644
index f45ebe2..0000000
--- a/postgresql-ac-version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream has a policy of only supporting one autoconf version with any
-given PostgreSQL version; which is good for ensuring repeatable results
-for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
-Dike out the check.
-
-
-diff -Naur postgresql-8.4.6.orig/configure.in postgresql-8.4.6/configure.in
---- postgresql-8.4.6.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.6/configure.in 2009-09-04 13:03:07.000000000 -0400
-@@ -19,10 +19,6 @@
-
- AC_INIT([PostgreSQL], [8.4.6], [pgsql-bugs(a)postgresql.org])
-
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended. You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
index b6bd368..c6a2b2c 100644
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@@ -1,10 +1,10 @@
-Select stderr-based logging with a week's worth of daily logfiles.
+Default to stderr-based logging with a week's worth of daily logfiles.
-diff -Naur postgresql-8.4.0.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.4.0/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-8.4.0.orig/src/backend/utils/misc/postgresql.conf.sample 2009-04-22 20:23:45.000000000 -0400
-+++ postgresql-8.4.0/src/backend/utils/misc/postgresql.conf.sample 2009-08-12 23:20:46.000000000 -0400
-@@ -236,17 +236,17 @@
+diff -Naur postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.0.1/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.0.1.orig/src/backend/utils/misc/postgresql.conf.sample 2010-10-01 10:25:44.000000000 -0400
++++ postgresql-9.0.1/src/backend/utils/misc/postgresql.conf.sample 2010-10-11 11:53:34.650971490 -0400
+@@ -262,17 +262,17 @@
# requires logging_collector to be on.
# This is used when logging to stderr:
@@ -26,7 +26,7 @@ diff -Naur postgresql-8.4.0.orig/src/backend/utils/misc/postgresql.conf.sample p
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
-@@ -254,9 +254,9 @@
+@@ -280,9 +280,9 @@
# or size-driven rotation. Default is
# off, meaning append to existing files
# in all cases.
diff --git a/postgresql-oom-adj.patch b/postgresql-oom-adj.patch
deleted file mode 100644
index 4ac05e6..0000000
--- a/postgresql-oom-adj.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Back-ported patch from Postgres devel head: reset oom_adj to zero in any
-postmaster child process. This allows us to disable OOM kill on the postmaster
-(see the init script) without affecting OOM behavior for child processes.
-
-
-diff -Naur postgresql-8.4.2.orig/src/backend/postmaster/fork_process.c postgresql-8.4.2/src/backend/postmaster/fork_process.c
---- postgresql-8.4.2.orig/src/backend/postmaster/fork_process.c 2009-01-01 12:23:46.000000000 -0500
-+++ postgresql-8.4.2/src/backend/postmaster/fork_process.c 2010-01-11 12:28:17.000000000 -0500
-@@ -12,7 +12,9 @@
- #include "postgres.h"
- #include "postmaster/fork_process.h"
-
-+#include <fcntl.h>
- #include <time.h>
-+#include <sys/stat.h>
- #include <sys/time.h>
- #include <unistd.h>
-
-@@ -60,6 +62,38 @@
- setitimer(ITIMER_PROF, &prof_itimer, NULL);
- #endif
-
-+ /*
-+ * By default, Linux tends to kill the postmaster in out-of-memory
-+ * situations, because it blames the postmaster for the sum of child
-+ * process sizes *including shared memory*. (This is unbelievably
-+ * stupid, but the kernel hackers seem uninterested in improving it.)
-+ * Therefore it's often a good idea to protect the postmaster by
-+ * setting its oom_adj value negative (which has to be done in a
-+ * root-owned startup script). If you just do that much, all child
-+ * processes will also be protected against OOM kill, which might not
-+ * be desirable. You can then choose to build with LINUX_OOM_ADJ
-+ * #defined to 0, or some other value that you want child processes
-+ * to adopt here.
-+ */
-+#ifdef LINUX_OOM_ADJ
-+ {
-+ /*
-+ * Use open() not stdio, to ensure we control the open flags.
-+ * Some Linux security environments reject anything but O_WRONLY.
-+ */
-+ int fd = open("/proc/self/oom_adj", O_WRONLY, 0);
-+
-+ /* We ignore all errors */
-+ if (fd >= 0)
-+ {
-+ char buf[16];
-+
-+ snprintf(buf, sizeof(buf), "%d\n", LINUX_OOM_ADJ);
-+ (void) write(fd, buf, strlen(buf));
-+ close(fd);
-+ }
-+ }
-+#endif /* LINUX_OOM_ADJ */
- }
-
- return result;
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 28331ee..374e223 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,10 +7,10 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198.
-diff -Naur postgresql-8.4.4.orig/src/pl/plperl/GNUmakefile postgresql-8.4.4/src/pl/plperl/GNUmakefile
---- postgresql-8.4.4.orig/src/pl/plperl/GNUmakefile 2010-05-13 12:40:36.000000000 -0400
-+++ postgresql-8.4.4/src/pl/plperl/GNUmakefile 2010-05-14 11:50:27.000000000 -0400
-@@ -38,6 +38,9 @@
+diff -Naur postgresql-9.0.1.orig/src/pl/plperl/GNUmakefile postgresql-9.0.1/src/pl/plperl/GNUmakefile
+--- postgresql-9.0.1.orig/src/pl/plperl/GNUmakefile 2010-10-01 10:25:44.000000000 -0400
++++ postgresql-9.0.1/src/pl/plperl/GNUmakefile 2010-10-11 11:50:19.933972244 -0400
+@@ -40,6 +40,9 @@
SHLIB_LINK = $(perl_embed_ldflags)
@@ -18,5 +18,5 @@ diff -Naur postgresql-8.4.4.orig/src/pl/plperl/GNUmakefile postgresql-8.4.4/src/
+SHLIB_LINK += $(rpath)
+
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl --load-language=plperlu
- REGRESS = plperl plperl_trigger plperl_shared plperl_elog
+ REGRESS = plperl plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu
# if Perl can support two interpreters in one backend,
diff --git a/postgresql-upgrade-fixes.patch b/postgresql-upgrade-fixes.patch
new file mode 100644
index 0000000..ce493b8
--- /dev/null
+++ b/postgresql-upgrade-fixes.patch
@@ -0,0 +1,72 @@
+Patch pg_upgrade to not insist on useless baggage in the upgrade RPM,
+as well as being more careful to check for things it does need.
+
+
+diff -Naur postgresql-9.0.2.orig/contrib/pg_upgrade/exec.c postgresql-9.0.2/contrib/pg_upgrade/exec.c
+--- postgresql-9.0.2.orig/contrib/pg_upgrade/exec.c 2010-12-13 21:55:50.000000000 -0500
++++ postgresql-9.0.2/contrib/pg_upgrade/exec.c 2010-12-28 16:56:05.734506648 -0500
+@@ -14,7 +14,7 @@
+
+
+ static void check_data_dir(migratorContext *ctx, const char *pg_data);
+-static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster);
++static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster);
+ static int check_exec(migratorContext *ctx, const char *dir, const char *cmdName);
+ static const char *validate_exec(const char *path);
+
+@@ -99,7 +99,7 @@
+ check_ok(ctx);
+
+ prep_status(ctx, "Checking old bin directory (%s)", ctx->old.bindir);
+- check_bin_dir(ctx, &ctx->old);
++ check_bin_dir(ctx, &ctx->old, CLUSTER_OLD);
+ check_ok(ctx);
+
+ prep_status(ctx, "Checking new data directory (%s)", ctx->new.pgdata);
+@@ -107,7 +107,7 @@
+ check_ok(ctx);
+
+ prep_status(ctx, "Checking new bin directory (%s)", ctx->new.bindir);
+- check_bin_dir(ctx, &ctx->new);
++ check_bin_dir(ctx, &ctx->new, CLUSTER_NEW);
+ check_ok(ctx);
+ }
+
+@@ -158,12 +158,18 @@
+ * exit().
+ */
+ static void
+-check_bin_dir(migratorContext *ctx, ClusterInfo *cluster)
++check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster)
+ {
+ check_exec(ctx, cluster->bindir, "postgres");
+- check_exec(ctx, cluster->bindir, "psql");
+ check_exec(ctx, cluster->bindir, "pg_ctl");
+- check_exec(ctx, cluster->bindir, "pg_dumpall");
++ check_exec(ctx, cluster->bindir, "pg_resetxlog");
++ if (whichCluster == CLUSTER_NEW)
++ {
++ /* these are only needed in the new cluster */
++ check_exec(ctx, cluster->bindir, "pg_config");
++ check_exec(ctx, cluster->bindir, "psql");
++ check_exec(ctx, cluster->bindir, "pg_dumpall");
++ }
+ }
+
+
+diff -Naur postgresql-9.0.2.orig/contrib/pg_upgrade/option.c postgresql-9.0.2/contrib/pg_upgrade/option.c
+--- postgresql-9.0.2.orig/contrib/pg_upgrade/option.c 2010-12-13 21:55:50.000000000 -0500
++++ postgresql-9.0.2/contrib/pg_upgrade/option.c 2010-12-28 16:53:44.730531216 -0500
+@@ -308,7 +308,11 @@
+ static void
+ get_pkglibdirs(migratorContext *ctx)
+ {
+- ctx->old.libpath = get_pkglibdir(ctx, ctx->old.bindir);
++ /*
++ * we do not need to know the libpath in the old cluster, and might not
++ * have a working pg_config to ask for it anyway.
++ */
++ ctx->old.libpath = NULL;
+ ctx->new.libpath = get_pkglibdir(ctx, ctx->new.bindir);
+ }
+
diff --git a/postgresql.init b/postgresql.init
index 44d032c..595ed61 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -11,11 +11,20 @@
# This script is slightly unusual in that the name of the daemon (postmaster)
# is not the same as the name of the subsystem (postgresql)
-# PGVERSION is the full package version, e.g., 8.4.0
+# PGVERSION is the full package version, e.g., 9.0.2
# Note: the specfile inserts the correct value during package build
PGVERSION=xxxx
-# PGMAJORVERSION is major version, e.g., 8.4 (this should match PG_VERSION)
+# PGMAJORVERSION is major version, e.g., 9.0 (this should match PG_VERSION)
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
+# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
+# Note: the specfile inserts the correct value during package build
+PREVMAJORVERSION=xxxx
+# PREVPGENGINE is the directory containing the previous postmaster executable
+# Note: the specfile inserts the correct value during package build
+PREVPGENGINE=xxxx
+# PGDOCDIR is the directory containing the package's documentation
+# Note: the specfile inserts the correct value during package build
+PGDOCDIR=xxxx
# Source function library.
. /etc/rc.d/init.d/functions
@@ -76,35 +85,27 @@ start(){
if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
then
# Check version of existing PGDATA
- if [ x`cat "$PGDATA/PG_VERSION"` != x"$PGMAJORVERSION" ]
+ if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
+ then
+ : A-OK
+ elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
then
- SYSDOCDIR="(Your System's documentation directory)"
- if [ -d "/usr/doc/postgresql-$PGVERSION" ]
- then
- SYSDOCDIR=/usr/doc
- fi
- if [ -d "/usr/share/doc/postgresql-$PGVERSION" ]
- then
- SYSDOCDIR=/usr/share/doc
- fi
- if [ -d "/usr/doc/packages/postgresql-$PGVERSION" ]
- then
- SYSDOCDIR=/usr/doc/packages
- fi
- if [ -d "/usr/share/doc/packages/postgresql-$PGVERSION" ]
- then
- SYSDOCDIR=/usr/share/doc/packages
- fi
echo
echo $"An old version of the database format was found."
- echo $"You need to upgrade the data format before using PostgreSQL."
- echo $"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+ echo $"Use \"service postgresql upgrade\" to upgrade to version $PGMAJORVERSION."
+ echo $"See $PGDOCDIR/README.rpm-dist for more information."
+ exit 1
+ else
+ echo
+ echo $"An old version of the database format was found."
+ echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION."
+ echo $"See $PGDOCDIR/README.rpm-dist for more information."
exit 1
fi
else
# No existing PGDATA! Warn the user to initdb it.
echo
- echo "$PGDATA is missing. Use \"service postgresql initdb\" to initialize the cluster first."
+ echo $"$PGDATA is missing. Use \"service postgresql initdb\" to initialize the cluster first."
echo_failure
echo
exit 1
@@ -163,18 +164,11 @@ reload(){
$SU -l postgres -c "$PGENGINE/pg_ctl reload -D '$PGDATA' -s" > /dev/null 2>&1 < /dev/null
}
-initdb(){
- if [ -f "$PGDATA/PG_VERSION" ]
- then
- echo -n "Data directory is not empty!"
- echo_failure
- echo
- script_result=1
- else
- echo -n $"Initializing database: "
+# code shared between initdb and upgrade actions
+perform_initdb(){
if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
then
- mkdir -p "$PGDATA" || exit 1
+ mkdir -p "$PGDATA" || return 1
chown postgres:postgres "$PGDATA"
chmod go-rwx "$PGDATA"
fi
@@ -184,7 +178,7 @@ initdb(){
# Make sure the startup-time log file is OK, too
if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
then
- touch "$PGLOG" || exit 1
+ touch "$PGLOG" || return 1
chown postgres:postgres "$PGLOG"
chmod go-rwx "$PGLOG"
[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
@@ -200,6 +194,22 @@ initdb(){
if [ -f "$PGDATA/PG_VERSION" ]
then
+ return 0
+ fi
+ return 1
+}
+
+initdb(){
+ if [ -f "$PGDATA/PG_VERSION" ]
+ then
+ echo -n $"Data directory is not empty!"
+ echo_failure
+ echo
+ script_result=1
+ else
+ echo -n $"Initializing database: "
+ if perform_initdb
+ then
echo_success
else
echo_failure
@@ -209,6 +219,79 @@ initdb(){
fi
}
+upgrade(){
+ # must see previous version in PG_VERSION
+ if [ ! -f "$PGDATA/PG_VERSION" -o \
+ x`cat "$PGDATA/PG_VERSION"` != x"$PREVMAJORVERSION" ]
+ then
+ echo
+ echo $"Cannot upgrade because database is not of version $PREVMAJORVERSION."
+ echo_failure
+ echo
+ exit 1
+ fi
+ if [ ! -x "$PGENGINE/pg_upgrade" ]
+ then
+ echo
+ echo $"Please install the postgresql-upgrade RPM."
+ echo_failure
+ echo
+ exit 5
+ fi
+ # Make sure service is stopped
+ stop
+
+ echo -n $"Upgrading database: "
+
+ # Set up log file for pg_upgrade
+ PGUPLOG=/var/lib/pgsql/pgupgrade.log
+ rm -f "$PGUPLOG"
+ touch "$PGUPLOG" || exit 1
+ chown postgres:postgres "$PGUPLOG"
+ chmod go-rwx "$PGUPLOG"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGUPLOG"
+
+ # Move old DB to PGDATAOLD
+ PGDATAOLD="${PGDATA}-old"
+ rm -rf "$PGDATAOLD"
+ mv "$PGDATA" "$PGDATAOLD" || exit 1
+
+ # Create empty new-format database
+ if perform_initdb
+ then
+ # Do the upgrade
+ $SU -l postgres -c "$PGENGINE/pg_upgrade \
+ '--old-bindir=$PREVPGENGINE' \
+ '--new-bindir=$PGENGINE' \
+ '--old-datadir=$PGDATAOLD' \
+ '--new-datadir=$PGDATA' \
+ --link \
+ '--old-port=$PGPORT' '--new-port=$PGPORT' \
+ --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
+ if [ $? -ne 0 ]
+ then
+ # pg_upgrade failed
+ script_result=1
+ fi
+ else
+ # initdb failed
+ script_result=1
+ fi
+
+ if [ $script_result -eq 0 ]
+ then
+ echo_success
+ else
+ # Clean up after failure
+ rm -rf "$PGDATA"
+ mv "$PGDATAOLD" "$PGDATA"
+
+ echo_failure
+ fi
+ echo
+ echo $"See $PGUPLOG for details."
+}
+
# See how we were called.
case "$1" in
start)
@@ -236,8 +319,11 @@ case "$1" in
initdb)
initdb
;;
+ upgrade)
+ upgrade
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|initdb}"
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|initdb|upgrade}"
exit 2
esac
diff --git a/postgresql.spec b/postgresql.spec
old mode 100755
new mode 100644
index d18c879..4dc73f2
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -34,6 +34,7 @@
%{!?tcldevel:%global tcldevel 1}
%{!?test:%global test 1}
+%{!?upgrade:%global upgrade 1}
%{!?plpython:%global plpython 1}
%{!?pltcl:%global pltcl 1}
%{!?plperl:%global plperl 1}
@@ -51,37 +52,43 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 8.4
-Version: 8.4.6
+%global majorversion 9.0
+Version: 9.0.2
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
Group: Applications/Databases
-Url: http://www.postgresql.org/
+Url: http://www.postgresql.org/
+
+# This SRPM includes a copy of the previous major release, which is needed for
+# in-place upgrade of an old database. In most cases it will not be critical
+# that this be kept up with the latest minor release of the previous series.
+%global prevversion 8.4.6
+%global prevmajorversion 8.4
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
Source1: postgresql-%{version}-US.pdf
# generate-pdf.sh is not used during RPM build, but include for documentation
Source2: generate-pdf.sh
-Source3: postgresql.init
-Source4: Makefile.regress
-Source5: pg_config.h
-Source6: README.rpm-dist
+Source3: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevvers...
+Source4: postgresql.init
+Source5: Makefile.regress
+Source6: pg_config.h
Source7: ecpg_config.h
+Source8: README.rpm-dist
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
# Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch
-Patch2: postgresql-ac-version.patch
-Patch3: postgresql-logging.patch
-Patch4: postgresql-oom-adj.patch
-Patch6: postgresql-perl-rpath.patch
+Patch2: postgresql-logging.patch
+Patch3: postgresql-perl-rpath.patch
+Patch4: postgresql-upgrade-fixes.patch
-BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
# for /sbin/ldconfig
Requires(post): glibc initscripts
@@ -134,14 +141,14 @@ BuildRequires: systemtap-sdt-devel
%endif
# main package requires -libs subpackage
-Requires: postgresql-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
PostgreSQL is an advanced Object-Relational database management system
(DBMS) that supports almost all SQL constructs (including
-transactions, subselects and user-defined types and functions). The
+transactions, sub-selects and user-defined types and functions). The
postgresql package includes the client programs and libraries that
you'll need to access a PostgreSQL DBMS server. These PostgreSQL
client programs are programs that directly manipulate the internal
@@ -171,6 +178,7 @@ PostgreSQL server.
Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -183,7 +191,7 @@ The postgresql-server package includes the programs needed to create
and run a PostgreSQL server, which will in turn allow you to create
and maintain PostgreSQL databases. PostgreSQL is an advanced
Object-Relational database management system (DBMS) that supports
-almost all SQL constructs (including transactions, subselects and
+almost all SQL constructs (including transactions, sub-selects and
user-defined types and functions). You should install
postgresql-server if you want to create and maintain your own
PostgreSQL databases and/or your own PostgreSQL server. You also need
@@ -193,7 +201,7 @@ to install the postgresql package.
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
-Requires: postgresql = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description docs
The postgresql-docs package includes some additional documentation for
@@ -204,7 +212,8 @@ and source files for the PostgreSQL tutorial.
%package contrib
Summary: Contributed modules distributed with PostgreSQL
Group: Applications/Databases
-Requires: postgresql = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description contrib
The postgresql-contrib package contains contributed packages that are
@@ -214,7 +223,8 @@ included in the PostgreSQL distribution.
%package devel
Summary: PostgreSQL development header files and libraries
Group: Development/Libraries
-Requires: postgresql = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
The postgresql-devel package contains the header files and libraries
@@ -223,11 +233,27 @@ with a PostgreSQL database management server and the ecpg Embedded C
Postgres preprocessor. You need to install this package if you want to
develop applications which will interact with a PostgreSQL server.
+
+%if %upgrade
+%package upgrade
+Summary: Support for upgrading from the previous major release of PostgreSQL
+Group: Applications/Databases
+Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+
+%description upgrade
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-upgrade package includes the pg_upgrade utility
+and supporting files needed for upgrading a database from the previous
+major version of PostgreSQL.
+%endif
+
+
%if %plperl
%package plperl
Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases
-Requires: postgresql-server = %{version}-%{release}
+Requires: %{name}-server = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description plperl
@@ -240,7 +266,7 @@ procedural language for the backend.
%package plpython
Summary: The Python procedural language for PostgreSQL
Group: Applications/Databases
-Requires: postgresql-server = %{version}-%{release}
+Requires: %{name}-server = %{version}-%{release}
%description plpython
PostgreSQL is an advanced Object-Relational database management
@@ -252,7 +278,7 @@ procedural language for the backend.
%package pltcl
Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
-Requires: postgresql-server = %{version}-%{release}
+Requires: %{name}-server = %{version}-%{release}
%description pltcl
PostgreSQL is an advanced Object-Relational database management
@@ -264,7 +290,7 @@ procedural language for the backend.
%package test
Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases
-Requires: postgresql-server = %{version}-%{release}
+Requires: %{name}-server = %{version}-%{release}
%description test
PostgreSQL is an advanced Object-Relational database management
@@ -281,12 +307,16 @@ system, including regression tests and benchmarks.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch6 -p1
-autoconf
+# We used to run autoconf here, but there's no longer any real need to,
+# since Postgres ships with a reasonably modern configure script.
cp -p %{SOURCE1} .
+%if %upgrade
+tar xfj %{SOURCE3}
+%endif
+
# remove .gitignore files to ensure none get into the RPMs (bug #642210)
find . -type f -name .gitignore | xargs rm
@@ -310,9 +340,9 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
# let's try removing this kluge, it may just be a workaround for bz#520916
# # use -O1 on sparc64 and alpha
-# %ifarch sparc64 alpha
+# %%ifarch sparc64 alpha
# CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
-# %endif
+# %%endif
%configure --disable-rpath \
%if %beta
@@ -362,8 +392,7 @@ CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
--sysconfdir=/etc/sysconfig/pgsql \
--datadir=/usr/share/pgsql
-make %{?_smp_mflags} all
-make %{?_smp_mflags} -C contrib all
+make %{?_smp_mflags} world
# Have to hack makefile to put correct path into tutorial scripts
sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/tutorial/GNUmakefile
@@ -384,20 +413,36 @@ rm -f src/tutorial/GNUmakefile
popd
%endif
+%if %upgrade
+ pushd postgresql-%{prevversion}
+
+ # The upgrade build can be pretty stripped-down, but make sure that
+ # any options that affect on-disk file layout match the previous
+ # major release! Also, note we intentionally do not use %%configure
+ # here, because we *don't* want its ideas about installation paths.
+ ./configure --build=%{_build} --host=%{_host} \
+ --prefix=%{_libdir}/pgsql/postgresql-%{prevmajorversion} \
+ --disable-rpath \
+ --with-system-tzdata=/usr/share/zoneinfo
+
+ make %{?_smp_mflags} all
+
+ popd
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-make -C contrib DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install-world
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in
i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
+ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/usr/include/
mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/usr/include/pgsql/server/
mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
;;
@@ -408,8 +453,13 @@ esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
+# prep the initscript, including insertion of some values it needs
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-sed 's/^PGVERSION=.*$/PGVERSION=%{version}/' <%{SOURCE3} >postgresql.init
+sed -e 's|^PGVERSION=.*$|PGVERSION=%{version}|' \
+ -e 's|^PREVMAJORVERSION=.*$|PREVMAJORVERSION=%{prevmajorversion}|' \
+ -e 's|^PREVPGENGINE=.*$|PREVPGENGINE=%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin|' \
+ -e 's|^PGDOCDIR=.*$|PGDOCDIR=%{_docdir}/%{name}-%{version}|' \
+ <%{SOURCE4} >postgresql.init
install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
%if %pam
@@ -430,6 +480,49 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
+%if %upgrade
+ pushd postgresql-%{prevversion}
+ make DESTDIR=$RPM_BUILD_ROOT install
+ popd
+
+ # remove stuff we don't actually need for upgrade purposes
+ pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/postgresql-%{prevmajorversion}
+ rm bin/clusterdb
+ rm bin/createdb
+ rm bin/createlang
+ rm bin/createuser
+ rm bin/dropdb
+ rm bin/droplang
+ rm bin/dropuser
+ rm bin/ecpg
+ rm bin/initdb
+ rm bin/pg_config
+ rm bin/pg_controldata
+ rm bin/pg_dump
+ rm bin/pg_dumpall
+ rm bin/pg_restore
+ rm bin/psql
+ rm bin/reindexdb
+ rm bin/vacuumdb
+ rm -rf include
+ rm lib/dict_snowball.so
+ rm lib/libecpg*
+ rm lib/libpg*
+ rm lib/libpq*
+ rm -rf lib/pgxs
+ rm lib/plpgsql.so
+ rm -rf share/doc
+ rm -rf share/man
+ rm -rf share/tsearch_data
+ rm share/*.bki
+ rm share/*description
+ rm share/*.sample
+ rm share/*.sql
+ rm share/*.txt
+ popd
+%endif
+
+
%if %test
# tests. There are many files included here that are unnecessary,
# but include them anyway for completeness. We replace the original
@@ -440,13 +533,13 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
strip *.so
rm -f GNUmakefile Makefile *.o
popd
- cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
+ cp %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
%endif
# Fix some more documentation
# gzip doc/internals.ps
-cp %{SOURCE6} README.rpm-dist
+cp %{SOURCE8} README.rpm-dist
mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
@@ -461,14 +554,14 @@ cat ecpglib6-%{majorversion}.lang >libs.lst
cat initdb-%{majorversion}.lang >server.lst
%find_lang libpq5-%{majorversion}
cat libpq5-%{majorversion}.lang >>libs.lst
-%find_lang pg_config-%{majorversion}
-cat pg_config-%{majorversion}.lang >>devel.lst
%find_lang pg_controldata-%{majorversion}
cat pg_controldata-%{majorversion}.lang >>server.lst
%find_lang pg_ctl-%{majorversion}
cat pg_ctl-%{majorversion}.lang >>server.lst
+%find_lang pg_config-%{majorversion}
+cat pg_config-%{majorversion}.lang >main.lst
%find_lang pg_dump-%{majorversion}
-cat pg_dump-%{majorversion}.lang >main.lst
+cat pg_dump-%{majorversion}.lang >>main.lst
%find_lang pg_resetxlog-%{majorversion}
cat pg_resetxlog-%{majorversion}.lang >>server.lst
%find_lang pgscripts-%{majorversion}
@@ -549,6 +642,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/dropdb
%{_bindir}/droplang
%{_bindir}/dropuser
+%{_bindir}/pg_config
%{_bindir}/pg_dump
%{_bindir}/pg_dumpall
%{_bindir}/pg_restore
@@ -562,6 +656,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dropdb.*
%{_mandir}/man1/droplang.*
%{_mandir}/man1/dropuser.*
+%{_mandir}/man1/pg_config.*
%{_mandir}/man1/pg_dump.*
%{_mandir}/man1/pg_dumpall.*
%{_mandir}/man1/pg_restore.*
@@ -599,6 +694,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/ltree.so
%{_libdir}/pgsql/moddatetime.so
%{_libdir}/pgsql/pageinspect.so
+%{_libdir}/pgsql/passwordcheck.so
%{_libdir}/pgsql/pg_buffercache.so
%{_libdir}/pgsql/pg_freespacemap.so
%{_libdir}/pgsql/pg_trgm.so
@@ -613,6 +709,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/test_parser.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
+%{_libdir}/pgsql/unaccent.so
%if %uuid
%{_libdir}/pgsql/uuid-ossp.so
%endif
@@ -621,9 +718,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%{_datadir}/pgsql/contrib/
%{_bindir}/oid2name
+%{_bindir}/pg_archivecleanup
%{_bindir}/pg_standby
%{_bindir}/pgbench
%{_bindir}/vacuumlo
+%{_mandir}/man3/dblink*
%doc contrib/spi/*.example
%files libs -f libs.lst
@@ -667,7 +766,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
+%{_libdir}/pgsql/libpqwalreceiver.so
%{_libdir}/pgsql/*_and_*.so
+%{_libdir}/pgsql/euc2004_sjis2004.so
%{_datadir}/pgsql/conversion_create.sql
%{_datadir}/pgsql/information_schema.sql
%{_datadir}/pgsql/snowball_create.sql
@@ -677,14 +778,21 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
/usr/include/*
%{_bindir}/ecpg
-%{_bindir}/pg_config
%{_libdir}/libpq.so
%{_libdir}/libecpg.so
%{_libdir}/libecpg_compat.so
%{_libdir}/libpgtypes.so
%{_libdir}/pgsql/pgxs/
%{_mandir}/man1/ecpg.*
-%{_mandir}/man1/pg_config.*
+%{_mandir}/man3/SPI_*
+
+%if %upgrade
+%files upgrade
+%defattr(-,root,root)
+%{_bindir}/pg_upgrade
+%{_libdir}/pgsql/pg_upgrade_support.so
+%{_libdir}/pgsql/postgresql-%{prevmajorversion}
+%endif
%if %plperl
%files plperl -f plperl.lst
@@ -706,6 +814,7 @@ rm -rf $RPM_BUILD_ROOT
%files plpython -f plpython.lst
%defattr(-,root,root)
%{_libdir}/pgsql/plpython.so
+%{_libdir}/pgsql/plpython2.so
%endif
%if %test
@@ -716,6 +825,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Dec 28 2010 Tom Lane <tgl(a)redhat.com> 9.0.2-1
+- Update to PostgreSQL 9.0.2 (major version bump)
+- Create infrastructure for in-place database upgrade using pg_upgrade
+Resolves: #398221
+
* Thu Dec 16 2010 Tom Lane <tgl(a)redhat.com> 8.4.6-1
- Update to PostgreSQL 8.4.6, for various fixes described at
http://www.postgresql.org/docs/8.4/static/release-8-4-6.html
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch
index b7d5343..aec64ac 100644
--- a/rpm-pgsql.patch
+++ b/rpm-pgsql.patch
@@ -8,10 +8,10 @@ However, datadir and sysconfdir are already set up in the specfile's
configure call, so we do not have to append anything to them.
-diff -Naur postgresql-8.4.3.orig/src/Makefile.global.in postgresql-8.4.3/src/Makefile.global.in
---- postgresql-8.4.3.orig/src/Makefile.global.in 2009-06-22 23:46:00.000000000 -0400
-+++ postgresql-8.4.3/src/Makefile.global.in 2010-03-13 22:18:12.000000000 -0500
-@@ -54,8 +54,7 @@
+diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in
+--- postgresql-9.0.1.orig/src/Makefile.global.in 2010-10-01 10:25:44.000000000 -0400
++++ postgresql-9.0.1/src/Makefile.global.in 2010-10-11 11:52:05.224975308 -0400
+@@ -55,8 +55,7 @@
# Installation directories
#
# These are set by the equivalent --xxxdir configure options. We
@@ -21,7 +21,7 @@ diff -Naur postgresql-8.4.3.orig/src/Makefile.global.in postgresql-8.4.3/src/Mak
#
# In a PGXS build, we cannot use the values inserted into Makefile.global
# by configure, since the installation tree may have been relocated.
-@@ -73,45 +72,23 @@
+@@ -74,45 +73,23 @@
bindir := @bindir@
datadir := @datadir@
diff --git a/sources b/sources
index 2f6eb3d..f5c42f6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
+fc79ef32b602f75f2ccd37647bc008e9 postgresql-9.0.2.tar.bz2
+7b72c6603a9567c356dedb7bfb658a36 postgresql-9.0.2-US.pdf
fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2
-9c5e14846e614da71807d5a09a2232dc postgresql-8.4.6-US.pdf
commit 6b84484ca599fe957a07394a67c61613a78f54d8
Author: Tom Lane <tgl(a)redhat.com>
Date: Thu Dec 16 14:44:35 2010 -0500
Update to PostgreSQL 8.4.6
diff --git a/.gitignore b/.gitignore
index 948254d..25b1f8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/postgresql-8.4.5.tar.bz2
-/postgresql-8.4.5-US.pdf
+/postgresql-8.4.6.tar.bz2
+/postgresql-8.4.6-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 53c774a..f45ebe2 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.4.5.orig/configure.in postgresql-8.4.5/configure.in
---- postgresql-8.4.5.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.5/configure.in 2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.6.orig/configure.in postgresql-8.4.6/configure.in
+--- postgresql-8.4.6.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.6/configure.in 2009-09-04 13:03:07.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.4.5], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.6], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index cc232db..d18c879 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
-Version: 8.4.5
+Version: 8.4.6
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -287,6 +287,9 @@ autoconf
cp -p %{SOURCE1} .
+# remove .gitignore files to ensure none get into the RPMs (bug #642210)
+find . -type f -name .gitignore | xargs rm
+
%build
# fail quickly and obviously if user tries to build as root
@@ -357,8 +360,7 @@ CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
%endif
--with-system-tzdata=/usr/share/zoneinfo \
--sysconfdir=/etc/sysconfig/pgsql \
- --datadir=/usr/share/pgsql \
- --with-docdir=%{_docdir}
+ --datadir=/usr/share/pgsql
make %{?_smp_mflags} all
make %{?_smp_mflags} -C contrib all
@@ -714,6 +716,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Dec 16 2010 Tom Lane <tgl(a)redhat.com> 8.4.6-1
+- Update to PostgreSQL 8.4.6, for various fixes described at
+ http://www.postgresql.org/docs/8.4/static/release-8-4-6.html
+- Ensure we don't package any .gitignore files from the source tarball
+Related: #642210
+
* Tue Oct 5 2010 Tom Lane <tgl(a)redhat.com> 8.4.5-1
- Update to PostgreSQL 8.4.5, for various fixes described at
http://www.postgresql.org/docs/8.4/static/release-8-4-5.html
diff --git a/sources b/sources
index 5f91317..2f6eb3d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-391a3f2eddd6fa78bb6ceba9955ffa5f postgresql-8.4.5.tar.bz2
-b1eb40dd133acb73671c8862a45ed9c9 postgresql-8.4.5-US.pdf
+fcc3daaf2292fa6bf1185ec45e512db6 postgresql-8.4.6.tar.bz2
+9c5e14846e614da71807d5a09a2232dc postgresql-8.4.6-US.pdf
commit 24943ae8ab1702d35e43a8191e3ef42d5e12a1d6
Author: Tom Lane <tgl(a)sss.pgh.pa.us>
Date: Tue Oct 5 15:19:41 2010 -0400
Update to PostgreSQL 8.4.5
diff --git a/.gitignore b/.gitignore
index 2846e3a..948254d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-postgresql-8.4.4.tar.bz2
-postgresql-8.4.4-US.pdf
+/postgresql-8.4.5.tar.bz2
+/postgresql-8.4.5-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index e04d852..53c774a 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.4.4.orig/configure.in postgresql-8.4.4/configure.in
---- postgresql-8.4.4.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.4/configure.in 2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.5.orig/configure.in postgresql-8.4.5/configure.in
+--- postgresql-8.4.5.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.5/configure.in 2009-09-04 13:03:07.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.4.4], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.5], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.init b/postgresql.init
index ad2e470..44d032c 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -218,7 +218,7 @@ case "$1" in
stop
;;
status)
- status postmaster
+ status -p "$pidfile" postmaster
script_result=$?
;;
restart)
diff --git a/postgresql.spec b/postgresql.spec
index f80e42f..cc232db 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,8 +52,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
-Version: 8.4.4
-Release: 3%{?dist}
+Version: 8.4.5
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -714,6 +714,14 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Oct 5 2010 Tom Lane <tgl(a)redhat.com> 8.4.5-1
+- Update to PostgreSQL 8.4.5, for various fixes described at
+ http://www.postgresql.org/docs/8.4/static/release-8-4-5.html
+ including the fix for CVE-2010-3433
+Related: #639371
+- Add -p "$pidfile" to initscript's status call to improve corner cases.
+Related: #561010
+
* Sat Jul 31 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 8.4.4-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
- Duplicate COPYRIGHT in -libs subpackage, per revised packaging guidelines
diff --git a/sources b/sources
index f169b55..5f91317 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4bf2448ad965bca3940df648c02194df postgresql-8.4.4.tar.bz2
-1d67db52cd8493c2b76dd827e8d46d25 postgresql-8.4.4-US.pdf
+391a3f2eddd6fa78bb6ceba9955ffa5f postgresql-8.4.5.tar.bz2
+b1eb40dd133acb73671c8862a45ed9c9 postgresql-8.4.5-US.pdf
commit ac363ac9e1cc45f6fab5ca19e591fb50695b67d8
Author: Orcan Ogetbil <oget.fedora(a)gmail.com>
Date: Sat Jul 31 00:56:13 2010 -0400
* Sat Jul 31 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 8.4.4-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
- Duplicate COPYRIGHT in -libs subpackage, per revised packaging guidelines
diff --git a/postgresql.spec b/postgresql.spec
index 26e021c..f80e42f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -714,6 +714,8 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jul 31 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 8.4.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
- Duplicate COPYRIGHT in -libs subpackage, per revised packaging guidelines
* Wed Jun 02 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 8.4.4-2
commit ec6aaa08b7723e880511c73c9c5ef83709ebcd1b
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Thu Jul 29 09:38:35 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 2846e3a..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-postgresql-8.4.4.tar.bz2
-postgresql-8.4.4-US.pdf
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2846e3a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+postgresql-8.4.4.tar.bz2
+postgresql-8.4.4-US.pdf
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f281bf4..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: postgresql
-# $Id$
-NAME := postgresql
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit 19bd07f632fc5a178ac2c1e32848a0397f2277b8
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Jul 8 20:21:30 2010 +0000
Duplicate COPYRIGHT in -libs subpackage, per revised packaging guidelines
diff --git a/postgresql.spec b/postgresql.spec
index 6ab4a40..26e021c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -626,6 +626,7 @@ rm -rf $RPM_BUILD_ROOT
%files libs -f libs.lst
%defattr(-,root,root)
+%doc COPYRIGHT
%{_libdir}/libpq.so.*
%{_libdir}/libecpg.so.*
%{_libdir}/libpgtypes.so.*
@@ -713,6 +714,8 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+- Duplicate COPYRIGHT in -libs subpackage, per revised packaging guidelines
+
* Wed Jun 02 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 8.4.4-2
- Mass rebuild with perl-5.12.0
commit 5f6138f93274b42d9dbced899a907d3216907e2e
Author: Marcela Malov <mmaslano(a)fedoraproject.org>
Date: Tue Jun 1 22:16:43 2010 +0000
- Mass rebuild with perl-5.12.0
diff --git a/postgresql.spec b/postgresql.spec
index 10e412c..6ab4a40 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -713,6 +713,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 8.4.4-2
+- Mass rebuild with perl-5.12.0
+
* Mon May 17 2010 Tom Lane <tgl(a)redhat.com> 8.4.4-1
- Update to PostgreSQL 8.4.4, for various fixes described at
http://www.postgresql.org/docs/8.4/static/release-8-4-4.html
commit 3adc308eb217765f86e77736d8968ed14b5e1ccd
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon May 17 17:30:50 2010 +0000
Update to PostgreSQL 8.4.4
diff --git a/.cvsignore b/.cvsignore
index 0c68227..2846e3a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postgresql-8.4.3.tar.bz2
-postgresql-8.4.3-US.pdf
+postgresql-8.4.4.tar.bz2
+postgresql-8.4.4-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 8555061..e04d852 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.4.3.orig/configure.in postgresql-8.4.3/configure.in
---- postgresql-8.4.3.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.3/configure.in 2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.4.orig/configure.in postgresql-8.4.4/configure.in
+--- postgresql-8.4.4.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.4/configure.in 2009-09-04 13:03:07.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.4.3], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.4], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 26634b7..28331ee 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,9 +7,9 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198.
-diff -Naur postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile postgresql-8.4.0/src/pl/plperl/GNUmakefile
---- postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile 2009-06-05 14:29:56.000000000 -0400
-+++ postgresql-8.4.0/src/pl/plperl/GNUmakefile 2009-08-12 23:28:57.000000000 -0400
+diff -Naur postgresql-8.4.4.orig/src/pl/plperl/GNUmakefile postgresql-8.4.4/src/pl/plperl/GNUmakefile
+--- postgresql-8.4.4.orig/src/pl/plperl/GNUmakefile 2010-05-13 12:40:36.000000000 -0400
++++ postgresql-8.4.4/src/pl/plperl/GNUmakefile 2010-05-14 11:50:27.000000000 -0400
@@ -38,6 +38,9 @@
SHLIB_LINK = $(perl_embed_ldflags)
@@ -17,6 +17,6 @@ diff -Naur postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile postgresql-8.4.0/src/
+# Force rpath to be used even though we disable it everywhere else
+SHLIB_LINK += $(rpath)
+
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl
+ REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl --load-language=plperlu
REGRESS = plperl plperl_trigger plperl_shared plperl_elog
- # where to find psql for running the tests
+ # if Perl can support two interpreters in one backend,
diff --git a/postgresql.spec b/postgresql.spec
index eea68be..10e412c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
-Version: 8.4.3
+Version: 8.4.4
Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -713,6 +713,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon May 17 2010 Tom Lane <tgl(a)redhat.com> 8.4.4-1
+- Update to PostgreSQL 8.4.4, for various fixes described at
+ http://www.postgresql.org/docs/8.4/static/release-8-4-4.html
+ including fixes for CVE-2010-1169 and CVE-2010-1170
+Resolves: #593032
+
* Sun Mar 14 2010 Tom Lane <tgl(a)redhat.com> 8.4.3-1
- Update to PostgreSQL 8.4.3, for various fixes described at
http://www.postgresql.org/docs/8.4/static/release-8-4-3.html
diff --git a/sources b/sources
index 6e72099..f169b55 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7f70e7b140fb190f268837255582b07e postgresql-8.4.3.tar.bz2
-fa50777e0964e86bd1bfbefda645aa82 postgresql-8.4.3-US.pdf
+4bf2448ad965bca3940df648c02194df postgresql-8.4.4.tar.bz2
+1d67db52cd8493c2b76dd827e8d46d25 postgresql-8.4.4-US.pdf
commit 446c31a8ed98ee070df29017a7752f6cfc08b3a4
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun Mar 14 03:48:10 2010 +0000
Update to PostgreSQL 8.4.3
diff --git a/.cvsignore b/.cvsignore
index 3efa645..0c68227 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postgresql-8.4.2.tar.bz2
-postgresql-8.4.2-US.pdf
+postgresql-8.4.3.tar.bz2
+postgresql-8.4.3-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 8582720..8555061 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.4.2.orig/configure.in postgresql-8.4.2/configure.in
---- postgresql-8.4.2.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.2/configure.in 2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.3.orig/configure.in postgresql-8.4.3/configure.in
+--- postgresql-8.4.3.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.3/configure.in 2009-09-04 13:03:07.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.3], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql-dtrace.patch b/postgresql-dtrace.patch
deleted file mode 100644
index 947a347..0000000
--- a/postgresql-dtrace.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Latest systemtap versions require the probes.o file after all, per bug #557266.
-This patch will be incorporated upstream soon.
-
-
-diff -Naur postgresql-8.4.2.orig/src/backend/Makefile postgresql-8.4.2/src/backend/Makefile
---- postgresql-8.4.2.orig/src/backend/Makefile 2009-09-05 17:14:13.000000000 -0400
-+++ postgresql-8.4.2/src/backend/Makefile 2010-01-20 17:21:37.000000000 -0500
-@@ -20,13 +20,13 @@
-
- include $(srcdir)/common.mk
-
--# As of 9/2009:
--# * The probes.o file is necessary for dtrace support on Solaris.
--# * OS X's dtrace doesn't use it and doesn't even recognize the -G option.
--# * Systemtap's dtrace will take -G, but it produces a useless empty file.
--# So, build probes.o only on Solaris.
--# This will likely need adjustment as other platforms add dtrace support.
--ifeq ($(PORTNAME), solaris)
-+# As of 1/2010:
-+# The probes.o file is necessary for dtrace support on Solaris, and on recent
-+# versions of systemtap. (Older systemtap releases just produce an empty
-+# file, but that's okay.) However, OS X's dtrace doesn't use it and doesn't
-+# even recognize the -G option. So, build probes.o except on Darwin.
-+# This might need adjustment as other platforms add dtrace support.
-+ifneq ($(PORTNAME), darwin)
- ifeq ($(enable_dtrace), yes)
- LOCALOBJS += utils/probes.o
- endif
diff --git a/postgresql.spec b/postgresql.spec
index 53a10d8..eea68be 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,8 +52,8 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
-Version: 8.4.2
-Release: 8%{?dist}
+Version: 8.4.3
+Release: 1%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -74,12 +74,12 @@ Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
+# Comments for these patches are in the patch files.
Patch1: rpm-pgsql.patch
Patch2: postgresql-ac-version.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-oom-adj.patch
Patch6: postgresql-perl-rpath.patch
-Patch7: postgresql-dtrace.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -282,7 +282,6 @@ system, including regression tests and benchmarks.
%patch3 -p1
%patch4 -p1
%patch6 -p1
-%patch7 -p1
autoconf
@@ -714,6 +713,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Mar 14 2010 Tom Lane <tgl(a)redhat.com> 8.4.3-1
+- Update to PostgreSQL 8.4.3, for various fixes described at
+ http://www.postgresql.org/docs/8.4/static/release-8-4-3.html
+
* Mon Feb 22 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-8
- Bring init script into some modicum of compliance with Fedora/LSB standards
Resolves: #201043
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch
index e595db7..b7d5343 100644
--- a/rpm-pgsql.patch
+++ b/rpm-pgsql.patch
@@ -1,60 +1,72 @@
For the RPMs, we want the custom installation directories to end in
/pgsql not /postgresql. This is historical but not worth changing.
+Notice that this patch also makes the appending of /pgsql unconditional.
+This is to avoid unexpected behavior if the RPM is built in a working
+directory whose path happens to include "postgres" or "pgsql" already.
+However, datadir and sysconfdir are already set up in the specfile's
+configure call, so we do not have to append anything to them.
-diff -Naur postgresql-8.4.0.orig/src/Makefile.global.in postgresql-8.4.0/src/Makefile.global.in
---- postgresql-8.4.0.orig/src/Makefile.global.in 2009-06-22 23:46:00.000000000 -0400
-+++ postgresql-8.4.0/src/Makefile.global.in 2009-08-12 23:14:53.000000000 -0400
-@@ -54,7 +54,7 @@
+
+diff -Naur postgresql-8.4.3.orig/src/Makefile.global.in postgresql-8.4.3/src/Makefile.global.in
+--- postgresql-8.4.3.orig/src/Makefile.global.in 2009-06-22 23:46:00.000000000 -0400
++++ postgresql-8.4.3/src/Makefile.global.in 2010-03-13 22:18:12.000000000 -0500
+@@ -54,8 +54,7 @@
# Installation directories
#
# These are set by the equivalent --xxxdir configure options. We
-# append "postgresql" to some of them, if the string does not already
-+# append "pgsql" to some of them, if the string does not already
- # contain "pgsql" or "postgres", in order to avoid directory clutter.
+-# contain "pgsql" or "postgres", in order to avoid directory clutter.
++# append "pgsql" to some of them, in order to avoid directory clutter.
#
# In a PGXS build, we cannot use the values inserted into Makefile.global
-@@ -75,14 +75,14 @@
+ # by configure, since the installation tree may have been relocated.
+@@ -73,45 +72,23 @@
+ bindir := @bindir@
+
datadir := @datadir@
- ifeq "$(findstring pgsql, $(datadir))" ""
- ifeq "$(findstring postgres, $(datadir))" ""
+-ifeq "$(findstring pgsql, $(datadir))" ""
+-ifeq "$(findstring postgres, $(datadir))" ""
-override datadir := $(datadir)/postgresql
-+override datadir := $(datadir)/pgsql
- endif
- endif
+-endif
+-endif
sysconfdir := @sysconfdir@
- ifeq "$(findstring pgsql, $(sysconfdir))" ""
- ifeq "$(findstring postgres, $(sysconfdir))" ""
+-ifeq "$(findstring pgsql, $(sysconfdir))" ""
+-ifeq "$(findstring postgres, $(sysconfdir))" ""
-override sysconfdir := $(sysconfdir)/postgresql
-+override sysconfdir := $(sysconfdir)/pgsql
- endif
- endif
+-endif
+-endif
+
+ libdir := @libdir@
-@@ -91,7 +91,7 @@
pkglibdir = $(libdir)
- ifeq "$(findstring pgsql, $(pkglibdir))" ""
- ifeq "$(findstring postgres, $(pkglibdir))" ""
+-ifeq "$(findstring pgsql, $(pkglibdir))" ""
+-ifeq "$(findstring postgres, $(pkglibdir))" ""
-override pkglibdir := $(pkglibdir)/postgresql
+-endif
+-endif
+override pkglibdir := $(pkglibdir)/pgsql
- endif
- endif
-@@ -100,7 +100,7 @@
+ includedir := @includedir@
+
pkgincludedir = $(includedir)
- ifeq "$(findstring pgsql, $(pkgincludedir))" ""
- ifeq "$(findstring postgres, $(pkgincludedir))" ""
+-ifeq "$(findstring pgsql, $(pkgincludedir))" ""
+-ifeq "$(findstring postgres, $(pkgincludedir))" ""
-override pkgincludedir := $(pkgincludedir)/postgresql
+-endif
+-endif
+override pkgincludedir := $(pkgincludedir)/pgsql
- endif
- endif
-@@ -109,7 +109,7 @@
+ mandir := @mandir@
+
docdir := @docdir@
- ifeq "$(findstring pgsql, $(docdir))" ""
- ifeq "$(findstring postgres, $(docdir))" ""
+-ifeq "$(findstring pgsql, $(docdir))" ""
+-ifeq "$(findstring postgres, $(docdir))" ""
-override docdir := $(docdir)/postgresql
+-endif
+-endif
+override docdir := $(docdir)/pgsql
- endif
- endif
+
+ htmldir := @htmldir@
diff --git a/sources b/sources
index 480865c..6e72099 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d738227e2f1f742d2f2d4ab56496c5c6 postgresql-8.4.2.tar.bz2
-f01eb7590a297e18a89005d74d693f21 postgresql-8.4.2-US.pdf
+7f70e7b140fb190f268837255582b07e postgresql-8.4.3.tar.bz2
+fa50777e0964e86bd1bfbefda645aa82 postgresql-8.4.3-US.pdf
commit 9cc5f2029d4bcbe0297d7f106892bdf5602c24ca
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Feb 22 18:16:56 2010 +0000
Fix initscript LSB compliance issues
diff --git a/postgresql.init b/postgresql.init
index 386ef97..ad2e470 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -1,79 +1,18 @@
#!/bin/sh
+#
# postgresql This is the init script for starting up the PostgreSQL
-# server
+# server.
#
# chkconfig: - 64 36
-# description: Starts and stops the PostgreSQL backend daemon that handles \
-# all database requests.
+# description: PostgreSQL database server.
# processname: postmaster
-# pidfile: /var/run/postmaster.pid
-
-# Version 6.5.3-2 Lamar Owen
-# Added code to determine if PGDATA exists, whether it is current version
-# or not, and initdb if no PGDATA (initdb will not overwrite a database).
-
-# Version 7.0 Lamar Owen
-# Added logging code
-# Changed PGDATA.
-
-# Version 7.0.2 Trond Eivind Glomsrd <teg(a)redhat.com>
-# use functions, add conditional restart
-
-# Version 7.0.3 Lamar Owen <lamar(a)postgresql.org>
-# Check for the existence of functions before blindly using them
-# in particular -- check for success () and failure () before using.
-# More Cross-distribution support -- PGVERSION variable, and docdir checks.
-
-# Version 7.1 Release Candidate Lamar Owen <lamar(a)postgresql.org>
-# initdb parameters have changed.
-
-# Version 7.1.2 Trond Eivind Glomsrd <teg(a)redhat.com>
-# Specify shell for su
-# Handle stop better - kill unwanted output, make it wait until the database is ready
-# Handle locales slightly differently - always using "C" isn't a valid option
-# Kill output from database initialization
-# Mark messages for translation
-
-# Version 7.1.2-2.PGDG Lamar Owen <lamar.owen(a)wgcr.org>
-# sync up.
-# Karl's fixes for some quoting issues.
-
-# Version 7.2b2 Lamar Owen <lamar.owen(a)wgcr.org>
-# version change.
-
-# Version 7.2 final. Lamar Owen <lamar.owen(a)wgcr.org>
-# reload from Peter E.
-# Eliminate the pidof postmaster test in stop -- we're using pg_ctl so we don't need pidof.
-# Tested the $? return for the stop script -- it does in fact propagate.
-# TODO: multiple postmasters.
+# pidfile: /var/run/postmaster.PORT.pid
-# Version 7.3 Lamar Owen <lamar.owen(a)ramifordistat.net>
-# Multiple postmasters, courtesy Karl DeBisschop
-
-# Version 7.4 Lamar Owen.
-
-# Version 7.4.3 Tom Lane <tgl(a)sss.pgh.pa.us>
-# Support condstop for uninstall
-# Minor other changes suggested by Fernando Nasser.
-
-# Version 7.4.5 Tom Lane <tgl(a)sss.pgh.pa.us>
-# Rewrite to start postmaster directly, rather than via pg_ctl; this avoids
-# fooling the postmaster's stale-lockfile check by having too many
-# postgres-owned processes laying about.
-
-# Version 8.1 Devrim Gunduz <devrim(a)PostgreSQL.org>
-# Increased sleep time from 1 sec to 2 sec.
-
-# Version 8.2 Devrim Gunduz <devrim(a)CommandPrompt.com>
-# Set initdb as a seperate option.
-
-# Version 8.3 Devrim Gunduz <devrim(a)CommandPrompt.com>
-
-# Version 8.4 Devrim Gunduz <devrim(a)CommandPrompt.com>
-# Remove "sameuser" from initdb, to match the new hba conf file.
+# This script is slightly unusual in that the name of the daemon (postmaster)
+# is not the same as the name of the subsystem (postgresql)
# PGVERSION is the full package version, e.g., 8.4.0
-# Note: the specfile ordinarily updates this during install
+# Note: the specfile inserts the correct value during package build
PGVERSION=xxxx
# PGMAJORVERSION is major version, e.g., 8.4 (this should match PG_VERSION)
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
@@ -81,10 +20,7 @@ PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
# Source function library.
. /etc/rc.d/init.d/functions
-# Get function listing for cross-distribution logic.
-TYPESET=`typeset -f|grep "declare"`
-
-# Get config.
+# Get network config.
. /etc/sysconfig/network
# Find the name of the script
@@ -117,21 +53,20 @@ PG_OOM_ADJ=-17
export PGDATA
export PGPORT
-# Check that networking is up.
-# Pretty much need it for postmaster.
-[ "${NETWORKING}" = "no" ] && exit 1
-
-[ -f "$PGENGINE/postmaster" ] || exit 1
+lockfile="/var/lock/subsys/${NAME}"
+pidfile="/var/run/postmaster.${PGPORT}.pid"
script_result=0
start(){
+ [ -x "$PGENGINE/postmaster" ] || exit 5
+
PSQL_START=$"Starting ${NAME} service: "
# Make sure startup-time log file is valid
if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
then
- touch "$PGLOG" || exit 1
+ touch "$PGLOG" || exit 4
chown postgres:postgres "$PGLOG"
chmod go-rwx "$PGLOG"
[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
@@ -140,8 +75,7 @@ start(){
# Check for the PGDATA structure
if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
then
- # Check version of existing PGDATA
-
+ # Check version of existing PGDATA
if [ x`cat "$PGDATA/PG_VERSION"` != x"$PGMAJORVERSION" ]
then
SYSDOCDIR="(Your System's documentation directory)"
@@ -167,10 +101,8 @@ start(){
echo $"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
exit 1
fi
-
- # No existing PGDATA! Warn the user to initdb it.
-
else
+ # No existing PGDATA! Warn the user to initdb it.
echo
echo "$PGDATA is missing. Use \"service postgresql initdb\" to initialize the cluster first."
echo_failure
@@ -182,12 +114,12 @@ start(){
test x"$PG_OOM_ADJ" != x && echo "$PG_OOM_ADJ" > /proc/self/oom_adj
$SU -l postgres -c "$PGENGINE/postmaster -p '$PGPORT' -D '$PGDATA' ${PGOPTS} &" >> "$PGLOG" 2>&1 < /dev/null
sleep 2
- pid=`pidof -s "$PGENGINE/postmaster"`
- if [ $pid ] && [ -f "$PGDATA/postmaster.pid" ]
+ pid=`head -n 1 "$PGDATA/postmaster.pid" 2>/dev/null`
+ if [ "x$pid" != x ]
then
success "$PSQL_START"
- touch /var/lock/subsys/${NAME}
- head -n 1 "$PGDATA/postmaster.pid" > "/var/run/postmaster.${PGPORT}.pid"
+ touch "$lockfile"
+ echo $pid > "$pidfile"
echo
else
failure "$PSQL_START"
@@ -198,18 +130,24 @@ start(){
stop(){
echo -n $"Stopping ${NAME} service: "
- $SU -l postgres -c "$PGENGINE/pg_ctl stop -D '$PGDATA' -s -m fast" > /dev/null 2>&1 < /dev/null
- ret=$?
- if [ $ret -eq 0 ]
+ if [ -e "$lockfile" ]
then
+ $SU -l postgres -c "$PGENGINE/pg_ctl stop -D '$PGDATA' -s -m fast" > /dev/null 2>&1 < /dev/null
+ ret=$?
+ if [ $ret -eq 0 ]
+ then
echo_success
- else
+ rm -f "$pidfile"
+ rm -f "$lockfile"
+ else
echo_failure
script_result=1
+ fi
+ else
+ # not running; per LSB standards this is "ok"
+ echo_success
fi
echo
- rm -f "/var/run/postmaster.${PGPORT}.pid"
- rm -f "/var/lock/subsys/${NAME}"
}
restart(){
@@ -218,11 +156,7 @@ restart(){
}
condrestart(){
- [ -e /var/lock/subsys/${NAME} ] && restart
-}
-
-condstop(){
- [ -e /var/lock/subsys/${NAME} ] && stop
+ [ -e "$lockfile" ] && restart || :
}
reload(){
@@ -275,9 +209,6 @@ initdb(){
fi
}
-# This script is slightly unusual in that the name of the daemon (postmaster)
-# is not the same as the name of the subsystem (postgresql)
-
# See how we were called.
case "$1" in
start)
@@ -293,21 +224,21 @@ case "$1" in
restart)
restart
;;
- condrestart)
+ condrestart|try-restart)
condrestart
;;
- condstop)
- condstop
- ;;
- reload|force-reload)
+ reload)
reload
;;
+ force-reload)
+ restart
+ ;;
initdb)
initdb
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload|initdb}"
- exit 1
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|initdb}"
+ exit 2
esac
exit $script_result
diff --git a/postgresql.spec b/postgresql.spec
index 68b4a77..53a10d8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.2
-Release: 7%{?dist}
+Release: 8%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
License: PostgreSQL
@@ -170,10 +170,13 @@ PostgreSQL server.
%package server
Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
-Requires: postgresql = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+Requires(postun): initscripts
%description server
The postgresql-server package includes the programs needed to create
@@ -492,18 +495,18 @@ cat psql-%{majorversion}.lang >>main.lst
%postun libs -p /sbin/ldconfig
%pre server
-groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+/usr/sbin/groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
+/usr/sbin/useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
%post server
-chkconfig --add postgresql
+/sbin/chkconfig --add postgresql
/sbin/ldconfig
%preun server
if [ $1 = 0 ] ; then
- /sbin/service postgresql condstop >/dev/null 2>&1
- chkconfig --del postgresql
+ /sbin/service postgresql stop >/dev/null 2>&1
+ /sbin/chkconfig --del postgresql
fi
%postun server
@@ -711,6 +714,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Feb 22 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-8
+- Bring init script into some modicum of compliance with Fedora/LSB standards
+Resolves: #201043
+
* Thu Feb 18 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> 8.4.2-7
- adjust license tag to reflect OSI decision
commit b7fa69b9cb348b3b6c56f24e96fc256abaf7e0c1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Feb 18 15:25:30 2010 +0000
adjust license tag to reflect OSI decision
diff --git a/postgresql.spec b/postgresql.spec
index 032bb1b..68b4a77 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,10 +53,10 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.2
-Release: 6%{?dist}
-# PostgreSQL calls their license simplified BSD, but the requirements are
-# more similar to other MIT licenses.
-License: MIT
+Release: 7%{?dist}
+# The PostgreSQL license is very similar to other MIT licenses, but the OSI
+# recognizes it as an independent license, so we do as well.
+License: PostgreSQL
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Feb 18 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> 8.4.2-7
+- adjust license tag to reflect OSI decision
+
* Tue Jan 26 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-6
- Emit explicit error message if user tries to build RPM as root
Related: #558921
commit 1a80a96e7464a07f49a215052e48c3490bd99b30
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Jan 26 18:29:52 2010 +0000
Emit explicit error message if user tries to build RPM as root
diff --git a/postgresql.spec b/postgresql.spec
index 6112efc..032bb1b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License: MIT
@@ -287,6 +287,16 @@ cp -p %{SOURCE1} .
%build
+# fail quickly and obviously if user tries to build as root
+%if %runselftest
+ if [ x"`id -u`" = x0 ]; then
+ echo "postgresql's regression tests fail if run as root."
+ echo "If you really need to build the RPM as root, use"
+ echo "--define='runselftest 0' to skip the regression tests."
+ exit 1
+ fi
+%endif
+
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
# Strip out -ffast-math from CFLAGS....
@@ -701,6 +711,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Jan 26 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-6
+- Emit explicit error message if user tries to build RPM as root
+Related: #558921
+
* Wed Jan 20 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-5
- Latest version of systemtap needs the probes.o file to be built again
Resolves: #557266
commit 962b39e67ea46a2b3588f87263ac2c65050412a7
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Jan 20 22:34:36 2010 +0000
Latest version of systemtap needs the probes.o file to be built again
diff --git a/postgresql-dtrace.patch b/postgresql-dtrace.patch
new file mode 100644
index 0000000..947a347
--- /dev/null
+++ b/postgresql-dtrace.patch
@@ -0,0 +1,28 @@
+Latest systemtap versions require the probes.o file after all, per bug #557266.
+This patch will be incorporated upstream soon.
+
+
+diff -Naur postgresql-8.4.2.orig/src/backend/Makefile postgresql-8.4.2/src/backend/Makefile
+--- postgresql-8.4.2.orig/src/backend/Makefile 2009-09-05 17:14:13.000000000 -0400
++++ postgresql-8.4.2/src/backend/Makefile 2010-01-20 17:21:37.000000000 -0500
+@@ -20,13 +20,13 @@
+
+ include $(srcdir)/common.mk
+
+-# As of 9/2009:
+-# * The probes.o file is necessary for dtrace support on Solaris.
+-# * OS X's dtrace doesn't use it and doesn't even recognize the -G option.
+-# * Systemtap's dtrace will take -G, but it produces a useless empty file.
+-# So, build probes.o only on Solaris.
+-# This will likely need adjustment as other platforms add dtrace support.
+-ifeq ($(PORTNAME), solaris)
++# As of 1/2010:
++# The probes.o file is necessary for dtrace support on Solaris, and on recent
++# versions of systemtap. (Older systemtap releases just produce an empty
++# file, but that's okay.) However, OS X's dtrace doesn't use it and doesn't
++# even recognize the -G option. So, build probes.o except on Darwin.
++# This might need adjustment as other platforms add dtrace support.
++ifneq ($(PORTNAME), darwin)
+ ifeq ($(enable_dtrace), yes)
+ LOCALOBJS += utils/probes.o
+ endif
diff --git a/postgresql.spec b/postgresql.spec
index 7c75b63..6112efc 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -79,6 +79,7 @@ Patch2: postgresql-ac-version.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-oom-adj.patch
Patch6: postgresql-perl-rpath.patch
+Patch7: postgresql-dtrace.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -278,6 +279,7 @@ system, including regression tests and benchmarks.
%patch3 -p1
%patch4 -p1
%patch6 -p1
+%patch7 -p1
autoconf
@@ -700,6 +702,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jan 20 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-5
+- Latest version of systemtap needs the probes.o file to be built again
+Resolves: #557266
- Provide script and instructions for building the documentation PDF
* Mon Jan 11 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-4
commit 63cfa0eb28e83dc0f90e8ba375b3e7e08682966e
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Jan 20 20:46:00 2010 +0000
Provide script and instructions for building the documentation PDF
diff --git a/postgresql.spec b/postgresql.spec
index 933a858..7c75b63 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License: MIT
@@ -63,6 +63,8 @@ Url: http://www.postgresql.org/
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
# The PDF file is generated by generate-pdf.sh, which see for comments
Source1: postgresql-%{version}-US.pdf
+# generate-pdf.sh is not used during RPM build, but include for documentation
+Source2: generate-pdf.sh
Source3: postgresql.init
Source4: Makefile.regress
Source5: pg_config.h
@@ -697,6 +699,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jan 20 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-5
+- Provide script and instructions for building the documentation PDF
+
* Mon Jan 11 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-4
- Arrange for the postmaster, but not any of its child processes, to be run
with oom_adj -17. This compensates for the OOM killer not being smart about
commit 8d21c7a1707625d5536a440b2febfd7d48080b6d
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Jan 16 05:40:31 2010 +0000
Document how to generate PDF doc file.
diff --git a/generate-pdf.sh b/generate-pdf.sh
new file mode 100755
index 0000000..9158a45
--- /dev/null
+++ b/generate-pdf.sh
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+# This script builds the PDF version of the PostgreSQL documentation.
+#
+# In principle we could do this as part of the RPM build, but there are
+# good reasons not to:
+# 1. The build would take longer and have a larger BuildRequires footprint.
+# 2. The generated PDF has timestamps in it, which would inevitably result
+# in multilib conflicts due to slightly different timestamps.
+# So instead, we run this manually when rebasing to a new upstream release,
+# and treat the resulting PDF as a separate Source file.
+#
+# You will need to have the docbook packages installed to run this.
+# Expect it to take about 20 minutes and use about 160MB of disk.
+
+# Extract version from specfile
+
+VERSION=`sed -n 's/^Version: //p' postgresql.spec`
+
+TARGETFILE=postgresql-$VERSION-US.pdf
+
+echo Building $TARGETFILE ...
+
+# Unpack and configure postgresql
+
+tar xfj postgresql-$VERSION.tar.bz2 || exit 1
+
+cd postgresql-$VERSION || exit 1
+
+./configure >/dev/null || exit 1
+
+# Build the PDF docs
+
+cd doc/src/sgml
+
+make postgres-US.pdf >make.log || exit 1
+
+mv -f postgres-US.pdf ../../../../$TARGETFILE
+
+# Clean up
+
+cd ../../../..
+
+rm -rf postgresql-$VERSION
+
+exit 0
diff --git a/postgresql.spec b/postgresql.spec
index 058a6ac..933a858 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -61,6 +61,8 @@ Group: Applications/Databases
Url: http://www.postgresql.org/
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+# The PDF file is generated by generate-pdf.sh, which see for comments
+Source1: postgresql-%{version}-US.pdf
Source3: postgresql.init
Source4: Makefile.regress
Source5: pg_config.h
@@ -69,7 +71,6 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.2-US.pdf
Patch1: rpm-pgsql.patch
Patch2: postgresql-ac-version.patch
@@ -278,7 +279,7 @@ system, including regression tests and benchmarks.
autoconf
-cp -p %{SOURCE17} .
+cp -p %{SOURCE1} .
%build
commit 8c0b3110102786ff58b48b8739da6068b5348d80
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Jan 11 18:11:25 2010 +0000
Work around unintelligent kernel OOM-kill algorithm.
diff --git a/postgresql-oom-adj.patch b/postgresql-oom-adj.patch
new file mode 100644
index 0000000..4ac05e6
--- /dev/null
+++ b/postgresql-oom-adj.patch
@@ -0,0 +1,57 @@
+Back-ported patch from Postgres devel head: reset oom_adj to zero in any
+postmaster child process. This allows us to disable OOM kill on the postmaster
+(see the init script) without affecting OOM behavior for child processes.
+
+
+diff -Naur postgresql-8.4.2.orig/src/backend/postmaster/fork_process.c postgresql-8.4.2/src/backend/postmaster/fork_process.c
+--- postgresql-8.4.2.orig/src/backend/postmaster/fork_process.c 2009-01-01 12:23:46.000000000 -0500
++++ postgresql-8.4.2/src/backend/postmaster/fork_process.c 2010-01-11 12:28:17.000000000 -0500
+@@ -12,7 +12,9 @@
+ #include "postgres.h"
+ #include "postmaster/fork_process.h"
+
++#include <fcntl.h>
+ #include <time.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+
+@@ -60,6 +62,38 @@
+ setitimer(ITIMER_PROF, &prof_itimer, NULL);
+ #endif
+
++ /*
++ * By default, Linux tends to kill the postmaster in out-of-memory
++ * situations, because it blames the postmaster for the sum of child
++ * process sizes *including shared memory*. (This is unbelievably
++ * stupid, but the kernel hackers seem uninterested in improving it.)
++ * Therefore it's often a good idea to protect the postmaster by
++ * setting its oom_adj value negative (which has to be done in a
++ * root-owned startup script). If you just do that much, all child
++ * processes will also be protected against OOM kill, which might not
++ * be desirable. You can then choose to build with LINUX_OOM_ADJ
++ * #defined to 0, or some other value that you want child processes
++ * to adopt here.
++ */
++#ifdef LINUX_OOM_ADJ
++ {
++ /*
++ * Use open() not stdio, to ensure we control the open flags.
++ * Some Linux security environments reject anything but O_WRONLY.
++ */
++ int fd = open("/proc/self/oom_adj", O_WRONLY, 0);
++
++ /* We ignore all errors */
++ if (fd >= 0)
++ {
++ char buf[16];
++
++ snprintf(buf, sizeof(buf), "%d\n", LINUX_OOM_ADJ);
++ (void) write(fd, buf, strlen(buf));
++ close(fd);
++ }
++ }
++#endif /* LINUX_OOM_ADJ */
+ }
+
+ return result;
diff --git a/postgresql.init b/postgresql.init
index 6eb80f5..386ef97 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -108,6 +108,8 @@ PGENGINE=/usr/bin
PGPORT=5432
PGDATA=/var/lib/pgsql/data
PGLOG=/var/lib/pgsql/pgstartup.log
+# Value to set as postmaster process's oom_adj
+PG_OOM_ADJ=-17
# Override defaults from /etc/sysconfig/pgsql if file is present
[ -f /etc/sysconfig/pgsql/${NAME} ] && . /etc/sysconfig/pgsql/${NAME}
@@ -177,6 +179,7 @@ start(){
fi
echo -n "$PSQL_START"
+ test x"$PG_OOM_ADJ" != x && echo "$PG_OOM_ADJ" > /proc/self/oom_adj
$SU -l postgres -c "$PGENGINE/postmaster -p '$PGPORT' -D '$PGDATA' ${PGOPTS} &" >> "$PGLOG" 2>&1 < /dev/null
sleep 2
pid=`pidof -s "$PGENGINE/postmaster"`
diff --git a/postgresql.spec b/postgresql.spec
index 031d40b..058a6ac 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,7 +53,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License: MIT
@@ -74,6 +74,7 @@ Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.2-US.pdf
Patch1: rpm-pgsql.patch
Patch2: postgresql-ac-version.patch
Patch3: postgresql-logging.patch
+Patch4: postgresql-oom-adj.patch
Patch6: postgresql-perl-rpath.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
@@ -272,6 +273,7 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%patch6 -p1
autoconf
@@ -281,10 +283,11 @@ cp -p %{SOURCE17} .
%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+# Add LINUX_OOM_ADJ=0 to ensure child processes reset postmaster's oom_adj
+CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
# let's try removing this kluge, it may just be a workaround for bz#520916
# # use -O1 on sparc64 and alpha
# %ifarch sparc64 alpha
@@ -693,6 +696,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jan 11 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-4
+- Arrange for the postmaster, but not any of its child processes, to be run
+ with oom_adj -17. This compensates for the OOM killer not being smart about
+ accounting for shared memory usage.
+
* Sat Jan 9 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-3
- Remove the postgresql-python and postgresql-tcl subpackages. These files
are now broken out as their own packages (PyGreSQL and tcl-pgtcl,
commit 2a1cdc60c9ab67af8f7240a71c6c6edeeb174e99
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Jan 9 05:23:05 2010 +0000
PyGreSQL and tcl-pgtcl are finally split out as separate packages.
diff --git a/.cvsignore b/.cvsignore
index da7283e..3efa645 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,2 @@
postgresql-8.4.2.tar.bz2
-PyGreSQL-3.8.1.tgz
-pgtcl1.6.2.tar.gz
-pgtcldocs-20070115.zip
postgresql-8.4.2-US.pdf
diff --git a/pgtcl-no-rpath.patch b/pgtcl-no-rpath.patch
deleted file mode 100644
index b29b78c..0000000
--- a/pgtcl-no-rpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch prevents use of rpath, which isn't wanted on Fedora.
-
-Also, tweak Makefile.in to ensure that the -L switch for libpq appears
-before any -L for the Tcl libraries during the link. This prevents the
-generated library from being bound to the wrong version of libpq when
-building on a machine that has an older version of libpq already installed
-(bug #166665).
-
-
-diff -Naur pgtcl1.5.3.orig/Makefile.in pgtcl1.5.3/Makefile.in
---- pgtcl1.5.3.orig/Makefile.in 2006-09-09 21:59:59.000000000 -0400
-+++ pgtcl1.5.3/Makefile.in 2007-01-10 18:58:19.000000000 -0500
-@@ -101,7 +101,7 @@
- RANLIB_STUB = @RANLIB_STUB@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
- SHLIB_LD = @SHLIB_LD@
--SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(PG_LIBS) $(TCL_LIBS)
-+SHLIB_LD_LIBS = $(PG_LIBS) @SHLIB_LD_LIBS@ $(TCL_LIBS)
- STLIB_LD = @STLIB_LD@
- #TCL_DEFS = @TCL_DEFS@
- TCL_BIN_DIR = @TCL_BIN_DIR@
-diff -Naur pgtcl1.5.3.orig/aclocal.m4 pgtcl1.5.3/aclocal.m4
---- pgtcl1.5.3.orig/aclocal.m4 2006-09-09 20:27:09.000000000 -0400
-+++ pgtcl1.5.3/aclocal.m4 2007-01-10 18:56:46.000000000 -0500
-@@ -844,7 +844,7 @@
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR},-rpath,${LIB_PGTCL_RUNTIME_DIR}'
-+ CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- if test "`uname -m`" = "alpha" ; then
- CFLAGS="$CFLAGS -mieee"
diff --git a/postgresql.spec b/postgresql.spec
index 0157bdc..031d40b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -32,15 +32,11 @@
%global beta 0
%{?beta:%global __os_install_post /usr/lib/rpm/brp-compress}
-%{!?aconfver:%global aconfver autoconf}
-
%{!?tcldevel:%global tcldevel 1}
%{!?test:%global test 1}
%{!?plpython:%global plpython 1}
%{!?pltcl:%global pltcl 1}
%{!?plperl:%global plperl 1}
-%{!?python:%global python 1}
-%{!?tcl:%global tcl 1}
%{!?ssl:%global ssl 1}
%{!?kerberos:%global kerberos 1}
%{!?ldap:%global ldap 1}
@@ -52,15 +48,12 @@
%{!?pgfts:%global pgfts 1}
%{!?runselftest:%global runselftest 1}
-# Python major version.
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 8.4
Version: 8.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License: MIT
@@ -77,14 +70,10 @@ Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.2-US.pdf
-Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
-Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
Patch1: rpm-pgsql.patch
Patch2: postgresql-ac-version.patch
Patch3: postgresql-logging.patch
-Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
@@ -93,11 +82,11 @@ BuildRequires: perl(ExtUtils::Embed), perl-devel
Requires(post): glibc initscripts
Requires(postun): glibc initscripts
-%if %python || %plpython
+%if %plpython
BuildRequires: python-devel
%endif
-%if %tcl || %pltcl
+%if %pltcl
BuildRequires: tcl
%if %tcldevel
BuildRequires: tcl-devel
@@ -263,35 +252,6 @@ system. The postgresql-pltcl package contains the PL/Tcl
procedural language for the backend.
%endif
-%if %tcl
-%package tcl
-Summary: A Tcl client library for PostgreSQL
-Group: Applications/Databases
-# this is intentionally not a version-specific Requires:
-Requires: libpq.so
-Requires: tcl >= 8.5
-
-%description tcl
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-tcl package contains the Pgtcl client library
-and its documentation.
-%endif
-
-%if %python
-%package python
-Summary: Development module for Python code to access a PostgreSQL DB
-Group: Applications/Databases
-# this is intentionally not a version-specific Requires:
-Requires: libpq.so
-Requires: python mx
-
-%description python
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-python package includes a module for
-developers to use when writing Python code for accessing a PostgreSQL
-database.
-%endif
-
%if %test
%package test
Summary: The test suite distributed with PostgreSQL
@@ -312,38 +272,12 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-# patch5 is applied later
%patch6 -p1
-#call autoconf 2.53 or greater
-%aconfver
+autoconf
cp -p %{SOURCE17} .
-%if %python
- tar xzf %{SOURCE18}
- PYGRESQLDIR=`basename %{SOURCE18} .tgz`
- mv $PYGRESQLDIR PyGreSQL
- # Some versions of PyGreSQL.tgz contain wrong file permissions
- chmod 755 PyGreSQL/tutorial
- chmod 644 PyGreSQL/tutorial/*.py
- chmod 755 PyGreSQL/tutorial/advanced.py PyGreSQL/tutorial/basics.py
-%endif
-
-%if %tcl
- tar xzf %{SOURCE19}
- PGTCLDIR=`basename %{SOURCE19} .tar.gz`
- mv $PGTCLDIR Pgtcl
- unzip %{SOURCE20}
- PGTCLDOCDIR=`basename %{SOURCE20} .zip`
- mv $PGTCLDOCDIR Pgtcl-docs
-
- pushd Pgtcl
-%patch5 -p1
-%aconfver
- popd
-%endif
-
%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
@@ -428,32 +362,6 @@ rm -f src/tutorial/GNUmakefile
popd
%endif
-%if %python
- PYTHON=/usr/bin/python
- python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
- python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
- python_includespec="-I${python_prefix}/include/python${python_version}"
-
- pushd PyGreSQL
-
- gcc $CFLAGS -fpic -shared -o _pgmodule.so ${python_includespec} -I../src/interfaces/libpq -I../src/include -L../src/interfaces/libpq -lpq pgmodule.c
-
- popd
-%endif
-
-%if %tcl
- pushd Pgtcl
- # pgtcl's configure only handles one include directory :-(
- ./configure --prefix=/usr \
- --libdir=%{_libdir} \
- --with-tcl=%{_libdir} \
- --with-postgres-include="../src/interfaces/libpq -I../src/include" \
- --with-postgres-lib=../src/interfaces/libpq
- # note: as of pgtcl 1.5.2, its makefile is not parallel-safe
- make all
- popd
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -478,20 +386,6 @@ esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
-%if %tcl
- TCL_VERSION=`echo 'puts $tcl_version' | tclsh`
- TCLLIBDIR="%{_libdir}/tcl$TCL_VERSION"
- # check the target directory is a dir, not a symlink
- if [ -h "$TCLLIBDIR" ] ; then
- echo "$TCLLIBDIR must not be a symlink"
- exit 1
- fi
- PGTCL_DIR="${RPM_BUILD_ROOT}${TCLLIBDIR}/Pgtcl"
- install -d -m 755 "$PGTCL_DIR"
- cp Pgtcl/pkgIndex.tcl "$PGTCL_DIR"
- cp Pgtcl/libpgtcl*.so "$PGTCL_DIR"
-%endif
-
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
sed 's/^PGVERSION=.*$/PGVERSION=%{version}/' <%{SOURCE3} >postgresql.init
install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
@@ -534,15 +428,6 @@ cp %{SOURCE6} README.rpm-dist
mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
-%if %python
- pushd PyGreSQL
- install -m 0755 -d $RPM_BUILD_ROOT%{python_sitearch}
- install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{python_sitearch}
- install -m 0644 pg.py $RPM_BUILD_ROOT%{python_sitearch}
- install -m 0644 pgdb.py $RPM_BUILD_ROOT%{python_sitearch}
- popd
-%endif
-
# remove files not to be packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -778,13 +663,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ecpg.*
%{_mandir}/man1/pg_config.*
-%if %tcl
-%files tcl
-%defattr(-,root,root)
-%{_libdir}/tcl*/Pgtcl/
-%doc Pgtcl-docs/*
-%endif
-
%if %plperl
%files plperl -f plperl.lst
%defattr(-,root,root)
@@ -807,15 +685,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/plpython.so
%endif
-%if %python
-%files python
-%defattr(-,root,root)
-%doc PyGreSQL/docs/*.txt
-%doc PyGreSQL/tutorial
-%{python_sitearch}/_pgmodule.so
-%{python_sitearch}/*.py
-%endif
-
%if %test
%files test
%defattr(-,postgres,postgres)
@@ -824,6 +693,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jan 9 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-3
+- Remove the postgresql-python and postgresql-tcl subpackages. These files
+ are now broken out as their own packages (PyGreSQL and tcl-pgtcl,
+ respectively), to reflect the now longstanding split of upstream projects.
+Related: #452306, #452321
+
* Tue Jan 5 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-2
- Remove static libraries (.a files) from package, per packaging guidelines
- Change %%define to %%global, per packaging guidelines
diff --git a/sources b/sources
index d2e244f..480865c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
d738227e2f1f742d2f2d4ab56496c5c6 postgresql-8.4.2.tar.bz2
-5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
-abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
-8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
f01eb7590a297e18a89005d74d693f21 postgresql-8.4.2-US.pdf
commit a6a1e9bfab6192bbdaea41e88368ae7d242316d7
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Jan 5 17:56:35 2010 +0000
Remove static libraries, also fix %define problem
diff --git a/postgresql.spec b/postgresql.spec
index a80885b..0157bdc 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -29,38 +29,38 @@
# The base package, the lib package, the devel package, and the server package
# always get built.
-%define beta 0
-%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
-
-%{!?aconfver:%define aconfver autoconf}
-
-%{!?tcldevel:%define tcldevel 1}
-%{!?test:%define test 1}
-%{!?plpython:%define plpython 1}
-%{!?pltcl:%define pltcl 1}
-%{!?plperl:%define plperl 1}
-%{!?python:%define python 1}
-%{!?tcl:%define tcl 1}
-%{!?ssl:%define ssl 1}
-%{!?kerberos:%define kerberos 1}
-%{!?ldap:%define ldap 1}
-%{!?nls:%define nls 1}
-%{!?uuid:%define uuid 1}
-%{!?xml:%define xml 1}
-%{!?pam:%define pam 1}
-%{!?sdt:%define sdt 1}
-%{!?pgfts:%define pgfts 1}
-%{!?runselftest:%define runselftest 1}
+%global beta 0
+%{?beta:%global __os_install_post /usr/lib/rpm/brp-compress}
+
+%{!?aconfver:%global aconfver autoconf}
+
+%{!?tcldevel:%global tcldevel 1}
+%{!?test:%global test 1}
+%{!?plpython:%global plpython 1}
+%{!?pltcl:%global pltcl 1}
+%{!?plperl:%global plperl 1}
+%{!?python:%global python 1}
+%{!?tcl:%global tcl 1}
+%{!?ssl:%global ssl 1}
+%{!?kerberos:%global kerberos 1}
+%{!?ldap:%global ldap 1}
+%{!?nls:%global nls 1}
+%{!?uuid:%global uuid 1}
+%{!?xml:%global xml 1}
+%{!?pam:%global pam 1}
+%{!?sdt:%global sdt 1}
+%{!?pgfts:%global pgfts 1}
+%{!?runselftest:%global runselftest 1}
# Python major version.
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: PostgreSQL client programs
Name: postgresql
-%define majorversion 8.4
+%global majorversion 8.4
Version: 8.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License: MIT
@@ -305,7 +305,7 @@ binaries of various tests for the PostgreSQL database management
system, including regression tests and benchmarks.
%endif
-%define __perl_requires %{SOURCE16}
+%global __perl_requires %{SOURCE16}
%prep
%setup -q
@@ -543,6 +543,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
popd
%endif
+# remove files not to be packaged
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
%find_lang ecpg-%{majorversion}
cat ecpg-%{majorversion}.lang >devel.lst
%find_lang ecpglib6-%{majorversion}
@@ -769,13 +772,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/pg_config
%{_libdir}/libpq.so
%{_libdir}/libecpg.so
-%{_libdir}/libpq.a
-%{_libdir}/libecpg.a
%{_libdir}/libecpg_compat.so
-%{_libdir}/libecpg_compat.a
-%{_libdir}/libpgport.a
%{_libdir}/libpgtypes.so
-%{_libdir}/libpgtypes.a
%{_libdir}/pgsql/pgxs/
%{_mandir}/man1/ecpg.*
%{_mandir}/man1/pg_config.*
@@ -826,6 +824,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Jan 5 2010 Tom Lane <tgl(a)redhat.com> 8.4.2-2
+- Remove static libraries (.a files) from package, per packaging guidelines
+- Change %%define to %%global, per packaging guidelines
+
* Wed Dec 16 2009 Tom Lane <tgl(a)redhat.com> 8.4.2-1
- Update to PostgreSQL 8.4.2, for various fixes described at
http://www.postgresql.org/docs/8.4/static/release-8-4-2.html
commit 27a52c7f5fe3fc5a67af6b47c3294b40501a0f10
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Dec 16 05:34:05 2009 +0000
Update to PostgreSQL 8.4.2
diff --git a/.cvsignore b/.cvsignore
index c849a66..da7283e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.4.1.tar.bz2
+postgresql-8.4.2.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.4.1-US.pdf
+postgresql-8.4.2-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index b6bc5e6..8582720 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.4.1.orig/configure.in postgresql-8.4.1/configure.in
---- postgresql-8.4.1.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.1/configure.in 2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.2.orig/configure.in postgresql-8.4.2/configure.in
+--- postgresql-8.4.2.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.2/configure.in 2009-09-04 13:03:07.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.4.1], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index 6772f73..a80885b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -56,11 +56,11 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-Summary: PostgreSQL client programs and libraries
+Summary: PostgreSQL client programs
Name: postgresql
%define majorversion 8.4
-Version: 8.4.1
-Release: 5%{?dist}
+Version: 8.4.2
+Release: 1%{?dist}
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License: MIT
@@ -76,7 +76,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.1-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.2-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -90,7 +90,8 @@ Patch6: postgresql-perl-rpath.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
# for /sbin/ldconfig
-Prereq: glibc initscripts
+Requires(post): glibc initscripts
+Requires(postun): glibc initscripts
%if %python || %plpython
BuildRequires: python-devel
@@ -141,11 +142,6 @@ BuildRequires: systemtap-sdt-devel
# main package requires -libs subpackage
Requires: postgresql-libs = %{version}-%{release}
-Obsoletes: postgresql-clients
-Obsoletes: postgresql-perl
-Obsoletes: postgresql-tk
-Obsoletes: rh-postgresql
-
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
@@ -169,8 +165,7 @@ if you're installing the postgresql-server package.
%package libs
Summary: The shared libraries required for any PostgreSQL clients
Group: Applications/Databases
-Provides: libpq.so
-Obsoletes: rh-postgresql-libs
+Provides: libpq.so = %{version}-%{release}
%description libs
The postgresql-libs package provides the essential shared libraries for any
@@ -181,9 +176,10 @@ PostgreSQL server.
%package server
Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
-Prereq: /usr/sbin/useradd /sbin/chkconfig
Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-server
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
%description server
The postgresql-server package includes the programs needed to create
@@ -201,7 +197,6 @@ to install the postgresql package.
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-docs
%description docs
The postgresql-docs package includes some additional documentation for
@@ -210,10 +205,9 @@ and source files for the PostgreSQL tutorial.
%package contrib
-Summary: Contributed source and binaries distributed with PostgreSQL
+Summary: Contributed modules distributed with PostgreSQL
Group: Applications/Databases
Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-contrib
%description contrib
The postgresql-contrib package contains contributed packages that are
@@ -224,7 +218,6 @@ included in the PostgreSQL distribution.
Summary: PostgreSQL development header files and libraries
Group: Development/Libraries
Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-devel
%description devel
The postgresql-devel package contains the header files and libraries
@@ -238,8 +231,6 @@ develop applications which will interact with a PostgreSQL server.
Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases
Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description plperl
@@ -253,8 +244,6 @@ procedural language for the backend.
Summary: The Python procedural language for PostgreSQL
Group: Applications/Databases
Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
%description plpython
PostgreSQL is an advanced Object-Relational database management
@@ -267,8 +256,6 @@ procedural language for the backend.
Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
%description pltcl
PostgreSQL is an advanced Object-Relational database management
@@ -283,7 +270,6 @@ Group: Applications/Databases
# this is intentionally not a version-specific Requires:
Requires: libpq.so
Requires: tcl >= 8.5
-Obsoletes: rh-postgresql-tcl
%description tcl
PostgreSQL is an advanced Object-Relational database management
@@ -298,7 +284,6 @@ Group: Applications/Databases
# this is intentionally not a version-specific Requires:
Requires: libpq.so
Requires: python mx
-Obsoletes: rh-postgresql-python
%description python
PostgreSQL is an advanced Object-Relational database management
@@ -312,7 +297,6 @@ database.
Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases
Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-test
%description test
PostgreSQL is an advanced Object-Relational database management
@@ -603,15 +587,7 @@ cat psql-%{majorversion}.lang >>main.lst
%pre server
groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
- -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
-
-# If we're upgrading from rh-postgresql, we have to repeat the above actions
-# after rh-postgresql-server is uninstalled, because its postun script runs
-# after our pre script ...
-%triggerpostun -n postgresql-server -- rh-postgresql-server
-groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
%post server
@@ -631,23 +607,18 @@ if [ $1 -ge 1 ] ; then
fi
%if %plperl
-%post -p /sbin/ldconfig plperl
-%postun -p /sbin/ldconfig plperl
+%post -p /sbin/ldconfig plperl
+%postun -p /sbin/ldconfig plperl
%endif
%if %plpython
-%post -p /sbin/ldconfig plpython
-%postun -p /sbin/ldconfig plpython
+%post -p /sbin/ldconfig plpython
+%postun -p /sbin/ldconfig plpython
%endif
%if %pltcl
-%post -p /sbin/ldconfig pltcl
-%postun -p /sbin/ldconfig pltcl
-%endif
-
-%if %test
-%post test
-chown -R postgres:postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
+%post -p /sbin/ldconfig pltcl
+%postun -p /sbin/ldconfig pltcl
%endif
%clean
@@ -855,6 +826,17 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Dec 16 2009 Tom Lane <tgl(a)redhat.com> 8.4.2-1
+- Update to PostgreSQL 8.4.2, for various fixes described at
+ http://www.postgresql.org/docs/8.4/static/release-8-4-2.html
+ including two security issues
+Related: #546321
+Related: #547662
+- Use -N not the obsolete -n in useradd call
+Resolves: #495727
+- Clean up specfile to eliminate rpmlint gripes, mainly by removing
+ no-longer-needed provisions for superseding rh-postgresql
+
* Mon Dec 7 2009 Stepan Kasal <skasal(a)redhat.com> - 8.4.1-5
- rebuild against perl 5.10.1
diff --git a/sources b/sources
index a276f9e..d2e244f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2
+d738227e2f1f742d2f2d4ab56496c5c6 postgresql-8.4.2.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-37ebde274743cc5ed3cf3d49c3f84119 postgresql-8.4.1-US.pdf
+f01eb7590a297e18a89005d74d693f21 postgresql-8.4.2-US.pdf
commit b34a338c09c59e0dd18fbad5821d53a8eabb6dfd
Author: tpn Kasal <kasal(a)fedoraproject.org>
Date: Mon Dec 7 02:41:35 2009 +0000
- rebuild against perl 5.10.1
diff --git a/postgresql.spec b/postgresql.spec
index d7cb7a8..6772f73 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License: MIT
@@ -855,6 +855,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Dec 7 2009 Stepan Kasal <skasal(a)redhat.com> - 8.4.1-5
+- rebuild against perl 5.10.1
+
* Thu Oct 15 2009 Tom Lane <tgl(a)redhat.com> 8.4.1-4
- add sparc/sparc64 to multilib header support
commit 0e8c66f8dd6718ff502a2e6d0cceee5dcc594268
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 23:31:44 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index 05165a9..f281bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := postgresql
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit b1315b865a0a8c4d2eeed3114e9fba616a02be72
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Fri Oct 16 03:47:52 2009 +0000
add sparc/sparc64 to multilib header support
diff --git a/ecpg_config.h b/ecpg_config.h
index 5b0bdd2..6fecfcb 100644
--- a/ecpg_config.h
+++ b/ecpg_config.h
@@ -22,4 +22,8 @@
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ecpg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "ecpg_config_sparc.h"
#endif
diff --git a/pg_config.h b/pg_config.h
index f00828a..97ef2ba 100644
--- a/pg_config.h
+++ b/pg_config.h
@@ -22,4 +22,8 @@
#include "pg_config_s390x.h"
#elif defined(__s390__)
#include "pg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "pg_config_sparc.h"
#endif
diff --git a/postgresql.spec b/postgresql.spec
index 11780b4..d7cb7a8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,8 +60,9 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.1
-Release: 3%{?dist}
-# PG considers their license to be simplified BSD, but it's more nearly MIT
+Release: 4%{?dist}
+# PostgreSQL calls their license simplified BSD, but the requirements are
+# more similar to other MIT licenses.
License: MIT
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -478,7 +479,7 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in
- i386 | x86_64 | ppc | ppc64 | s390 | s390x)
+ i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
@@ -854,6 +855,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Oct 15 2009 Tom Lane <tgl(a)redhat.com> 8.4.1-4
+- add sparc/sparc64 to multilib header support
+
* Mon Sep 21 2009 Tom Lane <tgl(a)redhat.com> 8.4.1-3
- Ensure pgstartup.log gets the right ownership/permissions during initdb
Resolves: #498959
commit 8387bb8f87d49463413e237acef387a0e5ad0a52
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Sep 22 00:45:57 2009 +0000
Ensure pgstartup.log gets the right ownership/permissions during initdb
diff --git a/postgresql.init b/postgresql.init
index f273ac5..6eb80f5 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -132,7 +132,7 @@ start(){
touch "$PGLOG" || exit 1
chown postgres:postgres "$PGLOG"
chmod go-rwx "$PGLOG"
- [ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG" 2>/dev/null
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
fi
# Check for the PGDATA structure
@@ -243,8 +243,19 @@ initdb(){
fi
# Clean up SELinux tagging for PGDATA
[ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+
+ # Make sure the startup-time log file is OK, too
+ if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+ then
+ touch "$PGLOG" || exit 1
+ chown postgres:postgres "$PGLOG"
+ chmod go-rwx "$PGLOG"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
+ fi
+
# Initialize the database
$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
+
# Create directory for postmaster log
mkdir "$PGDATA/pg_log"
chown postgres:postgres "$PGDATA/pg_log"
diff --git a/postgresql.spec b/postgresql.spec
index 7e4e4e7..11780b4 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
# PG considers their license to be simplified BSD, but it's more nearly MIT
License: MIT
Group: Applications/Databases
@@ -854,6 +854,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Sep 21 2009 Tom Lane <tgl(a)redhat.com> 8.4.1-3
+- Ensure pgstartup.log gets the right ownership/permissions during initdb
+Resolves: #498959
+
* Wed Sep 16 2009 Tomas Mraz <tmraz(a)redhat.com> - 8.4.1-2
- Use password-auth common PAM configuration instead of system-auth
commit 17942eb8cd12e9c9bb07ab42d7b42986b1a8e845
Author: Tom Mrz <tmraz(a)fedoraproject.org>
Date: Wed Sep 16 17:50:13 2009 +0000
- Use password-auth common PAM configuration instead of system-auth
diff --git a/postgresql.pam b/postgresql.pam
index 40bfa6f..1d78594 100644
--- a/postgresql.pam
+++ b/postgresql.pam
@@ -1,3 +1,3 @@
#%PAM-1.0
-auth include system-auth
-account include system-auth
+auth include password-auth
+account include password-auth
diff --git a/postgresql.spec b/postgresql.spec
index f1a0035..7e4e4e7 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# PG considers their license to be simplified BSD, but it's more nearly MIT
License: MIT
Group: Applications/Databases
@@ -854,6 +854,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz(a)redhat.com> - 8.4.1-2
+- Use password-auth common PAM configuration instead of system-auth
+
* Wed Sep 9 2009 Tom Lane <tgl(a)redhat.com> 8.4.1-1
- Update to PostgreSQL 8.4.1, for various fixes described at
http://www.postgresql.org/docs/8.4/static/release-8-4-1.html
commit a8e2f352997003546fcff2d479d0614093759da8
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Sep 9 15:13:29 2009 +0000
Update to PostgreSQL 8.4.1
diff --git a/.cvsignore b/.cvsignore
index e9bc1ce..c849a66 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.4.0.tar.bz2
+postgresql-8.4.1.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.4.0-US.pdf
+postgresql-8.4.1-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 9782d13..b6bc5e6 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.4.0.orig/configure.in postgresql-8.4.0/configure.in
---- postgresql-8.4.0.orig/configure.in 2009-06-26 20:14:47.000000000 -0400
-+++ postgresql-8.4.0/configure.in 2009-08-12 23:09:31.000000000 -0400
+diff -Naur postgresql-8.4.1.orig/configure.in postgresql-8.4.1/configure.in
+--- postgresql-8.4.1.orig/configure.in 2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.1/configure.in 2009-09-04 13:03:07.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.1], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index f8ddd12..f1a0035 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -59,8 +59,9 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
-Version: 8.4.0
-Release: 3.2%{?dist}
+Version: 8.4.1
+Release: 1%{?dist}
+# PG considers their license to be simplified BSD, but it's more nearly MIT
License: MIT
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -74,7 +75,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.0-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.1-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -90,10 +91,6 @@ BuildRequires: perl(ExtUtils::Embed), perl-devel
# for /sbin/ldconfig
Prereq: glibc initscripts
-%ifarch s390 s390x
-%define sdt 0
-%endif
-
%if %python || %plpython
BuildRequires: python-devel
%endif
@@ -369,10 +366,11 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# use -O1 on sparc64, s390x and alpha
-%ifarch sparc64 alpha s390x s390
-CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
-%endif
+# let's try removing this kluge, it may just be a workaround for bz#520916
+# # use -O1 on sparc64 and alpha
+# %ifarch sparc64 alpha
+# CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+# %endif
%configure --disable-rpath \
%if %beta
@@ -856,6 +854,13 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Sep 9 2009 Tom Lane <tgl(a)redhat.com> 8.4.1-1
+- Update to PostgreSQL 8.4.1, for various fixes described at
+ http://www.postgresql.org/docs/8.4/static/release-8-4-1.html
+ including two security issues
+Related: #522085
+Related: #522092
+
* Tue Sep 01 2009 Karsten Hopp <karsten(a)redhat.com> 8.4.0-3.2
- bump release and build again with the correct libssl
diff --git a/sources b/sources
index 046a91f..a276f9e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-1f172d5f60326e972837f58fa5acd130 postgresql-8.4.0.tar.bz2
+f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-bbed2a7dad711eef335701391b9f112d postgresql-8.4.0-US.pdf
+37ebde274743cc5ed3cf3d49c3f84119 postgresql-8.4.1-US.pdf
commit 10587f4e78e8283a0db2812aaed6c43a99ca07e0
Author: Karsten Hopp <karsten(a)fedoraproject.org>
Date: Tue Sep 1 20:39:52 2009 +0000
- bump release and build again with the correct libssl
diff --git a/postgresql.spec b/postgresql.spec
index 8bf55b9..f8ddd12 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.0
-Release: 3.1%{?dist}
+Release: 3.2%{?dist}
License: MIT
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -856,6 +856,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Sep 01 2009 Karsten Hopp <karsten(a)redhat.com> 8.4.0-3.2
+- bump release and build again with the correct libssl
+
* Tue Sep 01 2009 Karsten Hopp <karsten(a)redhat.com> 8.4.0-3.1
- disable dtrace on s390x as a workaround until #520469 has been fixed
commit 8f9b7125d6b8c815397edf0c9cd813f8d24d4870
Author: Karsten Hopp <karsten(a)fedoraproject.org>
Date: Tue Sep 1 17:31:59 2009 +0000
- disable dtrace on s390x as a workaround until #520469 has been fixed
diff --git a/postgresql.spec b/postgresql.spec
index 0746530..8bf55b9 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.0
-Release: 3%{?dist}
+Release: 3.1%{?dist}
License: MIT
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -90,6 +90,10 @@ BuildRequires: perl(ExtUtils::Embed), perl-devel
# for /sbin/ldconfig
Prereq: glibc initscripts
+%ifarch s390 s390x
+%define sdt 0
+%endif
+
%if %python || %plpython
BuildRequires: python-devel
%endif
@@ -365,8 +369,8 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# use -O1 on sparc64 and alpha
-%ifarch sparc64 alpha
+# use -O1 on sparc64, s390x and alpha
+%ifarch sparc64 alpha s390x s390
CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
%endif
@@ -852,6 +856,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Sep 01 2009 Karsten Hopp <karsten(a)redhat.com> 8.4.0-3.1
+- disable dtrace on s390x as a workaround until #520469 has been fixed
+
* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 8.4.0-3
- rebuilt with new openssl
commit 3c5103515205acf3e36143df49f2c51247728586
Author: Tom Mrz <tmraz(a)fedoraproject.org>
Date: Fri Aug 21 15:29:10 2009 +0000
- rebuilt with new openssl
diff --git a/postgresql.spec b/postgresql.spec
index 7ce2906..0746530 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -852,6 +852,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 8.4.0-3
+- rebuilt with new openssl
+
* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> 8.4.0-2
- update License tag to MIT (PostgreSQL calls it "BSD", but it is MIT)
- Note: This changes nothing from a license compatibility perspective.
commit 8b3d2d6051ee60398fa0aedd267034e716deccc1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 20 18:55:13 2009 +0000
license tag fix
diff --git a/postgresql.spec b/postgresql.spec
index 9c3cc02..7ce2906 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,8 +60,8 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.0
-Release: 1%{?dist}
-License: BSD
+Release: 2%{?dist}
+License: MIT
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -852,6 +852,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Aug 20 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> 8.4.0-2
+- update License tag to MIT (PostgreSQL calls it "BSD", but it is MIT)
+- Note: This changes nothing from a license compatibility perspective.
+
* Mon Aug 17 2009 Tom Lane <tgl(a)redhat.com> 8.4.0-1
- Update to PostgreSQL 8.4.0. See release notes at
http://www.postgresql.org/docs/8.4/static/release-8-4.html
commit 084ca74c6414a272863de0ae756ee704386ae380
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Aug 18 02:58:55 2009 +0000
Update to PostgreSQL 8.4.0.
diff --git a/.cvsignore b/.cvsignore
index b522c56..e9bc1ce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.7.tar.bz2
+postgresql-8.4.0.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3.7-US.pdf
+postgresql-8.4.0-US.pdf
diff --git a/Makefile.regress b/Makefile.regress
index c722d29..1de43c4 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -33,10 +33,10 @@ abs_builddir := $(shell pwd)
check: installcheck-parallel
installcheck: cleandirs
- ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+ ./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
installcheck-parallel: cleandirs
- ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
+ ./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
# The tests command the server to write into testtablespace and results.
# On a SELinux-enabled system this will fail unless we mark those directories
@@ -53,10 +53,10 @@ runtest: installcheck
runtest-parallel: installcheck-parallel
bigtest: cleandirs
- ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
+ ./pg_regress --schedule=$(srcdir)/serial_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
bigcheck: cleandirs
- ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
+ ./pg_regress --schedule=$(srcdir)/parallel_schedule --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
##
diff --git a/README.rpm-dist b/README.rpm-dist
index 4924c39..e4f43a8 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,12 +1,12 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 8.2, for the PostgreSQL 8.2.1-2 RPMset.
-Devrim Gndz <devrim(a)CommandPrompt.com>, Lamar Owen <lowen(a)pari.edu>
+Version 8.4, for the PostgreSQL 8.4 RPM set.
+Devrim Gndz <devrim(a)CommandPrompt.com>
-----------------------------------------------------------------------------
Contents:
0.) Quick note about '-i'
- 1.) Introduction, QuickStart, and credits
+ 1.) Introduction and QuickStart
2.) PostgreSQL RPM packages and rationale
3.) Starting multiple postmasters
4.) Regression Testing
@@ -31,44 +31,49 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 8.2 of PostgreSQL,
+This document is written to be applicable to version 8.4 of PostgreSQL,
which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 8.2 are not documented here.
+point, versions prior to 8.4 are not documented here.
-Official PostgreSQL Global Development Group RPMs have from version 7.1.2
-on carried a 'PGDG' after the release number. Other RPMsets distributed
-with Linux distributions may have a different release number and initials.
+Official PostgreSQL Global Development Group RPMs carry a 'PGDG after the
+release number. Other RPMsets as distributed with Linux distributions may
+have a different release number and initials.
-It is preferable for the distribution-specific set to be the one used, as
-the PGDG set is intentionally generic. So, if your distro has a set of RPMs,
-use them in preference. If you want to stay up-to-date on the PostgreSQL
-core itself, use the PGDG generic set -- but understand that it is a
-GENERIC set.
+If you want to stay up-to-date on the PostgreSQL core itself, you may
+want to use PGDG set, instead of the binaries supplied by distribution.
-These RPMs no longer support any sort of upgrading process other than that
-documented in the regular documentation. That is, you must dump, upgrade,
-initdb, and restore your data. Dump first, then remove the old server
-subpackage, install the new package, and restore the data from dump. (A new
-method of running multiple versions of PostgreSQL, along with the capability
-to run multiple postmasters, is in development, but was not ready for this
-release.)
+These RPMs do not support any sort of major version upgrading process
+other than that documented in the regular documentation. That is, you
+must dump, upgrade,initdb, and restore your data if you are
+performing a major version update. This is not needed for minor version
+updates.
-SuSE has maintained their own RPMset for some time -- their documentation
-supercedes any found in this file.
+For major version upgrade, dump first, then remove the old server
+subpackage, install the new package, and restore the data from dump.
+
+This document is intended for use only with Red Hat, CentOS and Fedora.
QUICKSTART
-----------------------------------------------------------------------------
-For a fresh installation on a recent Red Hat or similar system, a simple
+For a fresh installation, you will need to initialize the cluster first. Run:
+
+ service postgresql initdb
+
+as root, and it will prepare a new database cluster for you. Then you will
+need to start PostgreSQL. Again as root, run:
+
service postgresql start
-as root will prepare a new database (initdb), and start a postmaster that
-will listen on localhost and Unix socket 5432 only. Edit
-/var/lib/pgsql/data/postgresql.conf and pg_hba.conf if you want to allow
-remote access -- see the section on Grand Unified Configuration.
-The file /var/lib/pgsql/.bash_profile is now packaged to help with the
+This command will start a postmaster that willl listen on localhost and Unix
+socket 5432 only. Edit /var/lib/pgsql/data/postgresql.conf and pg_hba.conf
+if you want to allow remote access -- see the section on Grand Unified
+Configuration.
+
+The file /var/lib/pgsql/.bash_profile is packaged to help with the
setting of environment variables. You may edit this file, and it won't be
-overwritten during an upgrade. However, enhancements and bugfixes may be added
-to this file, so be sure to check .bash_profile.rpmnew after upgrading.
+overwritten during an upgrade. However, enhancements and bugfixes may
+be added to this file, so be sure to check .bash_profile.rpmnew after
+upgrading.
The user 'postgres' is created during installation of the server subpackage.
This user by default is UID and GID 26. The user has the default shell set to
@@ -76,26 +81,6 @@ bash, and the home directory set to /var/lib/pgsql. This user also has no
default password -- in order to be able to su to it from a non-root account
or login as 'postgres' you will need to set a password using passwd.
-CREDITS
------------------------------------------------------------------------------
-Thomas Lockhart
-Uncle George
-Ryan Kirkpatrick
-Trond Eivind Glomsrd
-Mark Knox
-Mike Mascari
-Nicolas Huillard
-Karl DeBisschop
-Roger Luethi
-Jeff Johnson
-Reinhard Max
-Peter Eisentraut
-Joe Conway
-Andrew Overholt
-David Jee
-Kaj J. Niemi
-Devrim Gunduz
-
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
PostgreSQL is split up into multiple packages so that users can 'pick and
@@ -139,31 +124,25 @@ various subdirectories.
Different distributions have different ideas of some of these file locations.
In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
-/usr/share/doc, /usr/share/doc/packages, or some other similar path. The
-Red Hat / Fedora Core locations are listed below.
+/usr/share/doc, /usr/share/doc/packages, or some other similar path.
+
+However, the Red Hat / CentOS / Fedora RPM's install the files like
+this:
-However, the RPMs install the files like this:
Executables: /usr/bin
-Libraries: /usr/lib
-Documentation: /usr/share/doc/postgresql-x.y.z
+Libraries: /usr/lib (or /usr/lib64)
+Documentation: /usr/share/doc/postgresql-docs-x.y.z/html
Contrib documentation: /usr/share/doc/postgresql-contrib-x.y.z
Source: not installed
Data: /var/lib/pgsql/data
-Backup area: /var/lib/pgsql/backup
+Backup area: /var/lib/pgsql/backups
Templates: /usr/share/pgsql
-Procedural Languages: /usr/lib/pgsql
+Procedural Languages: /usr/lib/pgsql or /usr/lib64/pgsql
Development Headers: /usr/include/pgsql
-Localization data: /usr/share/locale
Other shared data: /usr/share/pgsql
Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
-Tutorial: /usr/lib/pgsql/tutorial (in the -docs package)
-Extra documentation: /usr/share/doc/postgresql-docs-x.y.z
-
-On some 64-bit architectures, /usr/lib64 is used instead of /usr/lib.
-
-The above list describes the Red Hat / Fedora Core layout. These locations
-may change for other distributions. Use of 'rpm -ql' for each package is
-recommended as the 'official' information source.
+ or /usr/lib64/pgsql/test/regress
+Documentation SGML: /usr/share/doc/postgresql-docs-x.y.z/sgml
While it may seem gratuitous to place these files in different locations, the
FHS requires it -- distributions should not ever touch /usr/local. It may
@@ -211,24 +190,26 @@ your database machine is up to the task.
To run the regression tests under the RPM installation, make sure that
postmaster has been started (if not, su to root and execute the
"/etc/rc.d/init.d/postgresql start" init script), cd to
-/usr/lib/pgsql/test/regress, su to postgres, and execute "make check".
+/usr/lib/pgsql/test/regress (or /usr/lib64/pgsql/test/regress),
+su to postgres, and execute "make check".
This command will start the regression tests and will both show the
results to the screen and store the results in the file regress.out.
If any tests fail, see the file regression.diffs in that directory for details,
and read the "Regression Tests" section of the PostgreSQL documentation to
find out whether the differences are actually significant. If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org or
-the pgsqlrpms-general list at pgfoundry.org.
+interpreting the results, contact the pgsql-general list at
+postgresql.org.
After testing, say "make clean" to remove the files generated by the test
script.
STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
-------------------------------------------------------------------------------
-Red Hat Linux uses the System V Init package. A startup script for PostgreSQL
-is provided in the server package, as /etc/rc.d/init.d/postgresql. To start
-the postmaster, with sanity checking, as root, run
+Fedora / Red Hat / CentOS use the System V Init package. A startup
+script for PostgreSQL is provided in the server package, as
+/etc/rc.d/init.d/postgresql. To start the postmaster, with sanity
+checking, as root, run
service postgresql start
To shut the postmaster down,
service postgresql stop
@@ -269,12 +250,12 @@ REBUILDING FROM SOURCE RPM
-------------------------------------------------------------------------------
If your distribution is not supported by the binary RPMs from PostgreSQL.org,
you will need to rebuild from the source RPM. Download the .src.rpm for this
-release. You will need to be root to rebuild, unless you have already set up
-a non-root build environment.
+release. You will need to be root to rebuild, unless you have set up
+a non-root build environment (which is the recommended method anyway).
-Install the source RPM with rpm -i, then CD to the rpm building area (on Red
-Hat or Fedora Core this is /usr/src/redhat by default). You will have to have
-a full development environment to rebuild the full RPM set.
+Install the source RPM with rpm -i, then cd to the rpm building area
+(which is /usr/src/redhat by default). You will have to have a full
+development environment to rebuild the full RPM set.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
@@ -283,22 +264,25 @@ beta 0 #build with cassert and do not strip the binaries
python 1 #build the postgresql-python package.
tcl 1 #build the postgresql-tcl package.
test 1 #build the postgresql-test package.
-plpython 1 #build the PL/Python package
-pltcl 1 #build the PL/Tcl package.
-plperl 1 #build the PL/Perl package.
+plpython 1 #build the PL/Python procedural language package.
+pltcl 1 #build the PL/Tcl procedural language package.
+plperl 1 #build the PL/Perl procedural language package.
ssl 1 #use OpenSSL support.
kerberos 1 #use Kerberos 5 support.
nls 1 #build with national language support.
+ldap 1 #build with LDAP support.
pam 1 #build with PAM support.
runselftest 1 #do "make check" during the build.
-xml 1 #build contrib/xml2
+sdt 1 #build with SystemTap support.
+xml 1 #build with XML support
pgfts 1 #build with --enable-thread-safety
+uuid 1 #build contrib/uuid-ossp
To use these defines, invoke a rebuild like this:
rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
- --define 'test 0' --define 'runselftest 1' --define 'kerberos 0' \
- postgresql-8.2.1-1.src.rpm
-This line would disable the python, tcl, and test subpackages, enable the
+ --define 'test 0' --define 'runselftest 0' --define 'kerberos 0' \
+ postgresql-8.4.0-1.src.rpm
+This line would disable the python, tcl, and test subpackages, disable the
regression test run during build, and disable kerberos support.
You might need to disable runselftest if there is an installed version of
@@ -314,23 +298,16 @@ CONTRIB FILES
The contents of the contrib tree are packaged into the -contrib subpackage
and are processed with make and make install. There is documentation in
/usr/share/doc/postgresql-contrib-VERSION for these modules. Most of the
-modules are in /usr/lib/pgsql for loadable modules, and binaries are in
-/usr/bin. In the future these files may be split out, depending upon function
-and dependencies.
+modules are in /usr/lib/pgsql (or /usr/lib64/pgsql) for loadable
+modules, and binaries are in /usr/bin. In the future these files may be
+split out, depending upon function and dependencies.
MORE INFORMATION
-------------------------------------------------------------------------------
You can get more information at http://www.postgresql.org and
-http://pgfoundry.org/projects/pgsqlrpms
+http://yum.pgsqlrpms.org
Please help make this packaging better -- let us know if you find problems, or
-better ways of doing things. You can reach us by e-mail at
+better ways of doing things. You can reach us by e-mail at
pgsqlrpms-hackers(a)pgfoundry.org
-
-SUSE products usually ship with the latest version of PostgreSQL that
-was available at the time they were released. RPMs for newer versions
-of PostgreSQL can be found on the SUSE FTP server and it's mirrors.
-
-ftp://ftp.suse.com/pub/projects/postgresql
-http://www.novell.com/products/linuxprofessional/downloads/ftp/int_mirrors.html
-------------------------------------------------------------------------------
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 05e3fb0..9782d13 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,17 +4,17 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.3.7.orig/configure.in postgresql-8.3.7/configure.in
---- postgresql-8.3.7.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.7/configure.in 2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.4.0.orig/configure.in postgresql-8.4.0/configure.in
+--- postgresql-8.4.0.orig/configure.in 2009-06-26 20:14:47.000000000 -0400
++++ postgresql-8.4.0/configure.in 2009-08-12 23:09:31.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.3.7], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs(a)postgresql.org])
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
-recommended. You can remove the check from 'configure.in' but it is then
-your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config)
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
index 2fa8ed3..b6bd368 100644
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@@ -1,7 +1,10 @@
-diff -Naur postgresql-8.3RC2.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.3RC2/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-8.3RC2.orig/src/backend/utils/misc/postgresql.conf.sample 2008-01-09 21:50:01.000000000 -0500
-+++ postgresql-8.3RC2/src/backend/utils/misc/postgresql.conf.sample 2008-01-18 11:44:08.000000000 -0500
-@@ -237,17 +237,17 @@
+Select stderr-based logging with a week's worth of daily logfiles.
+
+
+diff -Naur postgresql-8.4.0.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.4.0/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-8.4.0.orig/src/backend/utils/misc/postgresql.conf.sample 2009-04-22 20:23:45.000000000 -0400
++++ postgresql-8.4.0/src/backend/utils/misc/postgresql.conf.sample 2009-08-12 23:20:46.000000000 -0400
+@@ -236,17 +236,17 @@
# requires logging_collector to be on.
# This is used when logging to stderr:
@@ -23,15 +26,15 @@ diff -Naur postgresql-8.3RC2.orig/src/backend/utils/misc/postgresql.conf.sample
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
-@@ -255,9 +255,9 @@
+@@ -254,9 +254,9 @@
# or size-driven rotation. Default is
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+log_rotation_age = 1d # Automatic rotation of logfiles will
- # happen after that time. 0 to disable.
+ # happen after that time. 0 disables.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+log_rotation_size = 0 # Automatic rotation of logfiles will
# happen after that much log output.
- # 0 to disable.
+ # 0 disables.
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 74484c4..26634b7 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,12 +7,12 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198.
-diff -Naur postgresql-8.2.0.orig/src/pl/plperl/GNUmakefile postgresql-8.2.0/src/pl/plperl/GNUmakefile
---- postgresql-8.2.0.orig/src/pl/plperl/GNUmakefile 2006-07-20 20:24:04.000000000 -0400
-+++ postgresql-8.2.0/src/pl/plperl/GNUmakefile 2006-12-04 20:00:56.000000000 -0500
-@@ -36,6 +36,9 @@
+diff -Naur postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile postgresql-8.4.0/src/pl/plperl/GNUmakefile
+--- postgresql-8.4.0.orig/src/pl/plperl/GNUmakefile 2009-06-05 14:29:56.000000000 -0400
++++ postgresql-8.4.0/src/pl/plperl/GNUmakefile 2009-08-12 23:28:57.000000000 -0400
+@@ -38,6 +38,9 @@
- SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
+ SHLIB_LINK = $(perl_embed_ldflags)
+# Force rpath to be used even though we disable it everywhere else
+SHLIB_LINK += $(rpath)
diff --git a/postgresql-test.patch b/postgresql-test.patch
deleted file mode 100644
index 5b1d6f4..0000000
--- a/postgresql-test.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-In the postgresql-test RPM, the contrib .so's that are used by the tests
-are installed right in the directory where the tests are run. We must
-adjust the CREATE FUNCTION commands accordingly. Note that this also
-means that the specfile has to copy the .so's into the test directory
-while doing the in-build-tree regression tests.
-
-
-diff -Naur postgresql-8.3RC2.orig/src/test/regress/input/create_function_1.source postgresql-8.3RC2/src/test/regress/input/create_function_1.source
---- postgresql-8.3RC2.orig/src/test/regress/input/create_function_1.source 2006-02-27 11:09:50.000000000 -0500
-+++ postgresql-8.3RC2/src/test/regress/input/create_function_1.source 2008-01-18 13:38:51.000000000 -0500
-@@ -24,17 +24,17 @@
-
- CREATE FUNCTION check_primary_key ()
- RETURNS trigger
-- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_builddir@/refint@DLSUFFIX@'
- LANGUAGE C;
-
- CREATE FUNCTION check_foreign_key ()
- RETURNS trigger
-- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_builddir@/refint@DLSUFFIX@'
- LANGUAGE C;
-
- CREATE FUNCTION autoinc ()
- RETURNS trigger
-- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
-+ AS '@abs_builddir@/autoinc@DLSUFFIX@'
- LANGUAGE C;
-
- CREATE FUNCTION funny_dup17 ()
-diff -Naur postgresql-8.3RC2.orig/src/test/regress/output/create_function_1.source postgresql-8.3RC2/src/test/regress/output/create_function_1.source
---- postgresql-8.3RC2.orig/src/test/regress/output/create_function_1.source 2007-06-18 17:40:58.000000000 -0400
-+++ postgresql-8.3RC2/src/test/regress/output/create_function_1.source 2008-01-18 13:38:51.000000000 -0500
-@@ -25,15 +25,15 @@
- NOTICE: argument type city_budget is only a shell
- CREATE FUNCTION check_primary_key ()
- RETURNS trigger
-- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_builddir@/refint@DLSUFFIX@'
- LANGUAGE C;
- CREATE FUNCTION check_foreign_key ()
- RETURNS trigger
-- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_builddir@/refint@DLSUFFIX@'
- LANGUAGE C;
- CREATE FUNCTION autoinc ()
- RETURNS trigger
-- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
-+ AS '@abs_builddir@/autoinc@DLSUFFIX@'
- LANGUAGE C;
- CREATE FUNCTION funny_dup17 ()
- RETURNS trigger
diff --git a/postgresql.init b/postgresql.init
index adb395a..f273ac5 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -67,10 +67,15 @@
# Version 8.2 Devrim Gunduz <devrim(a)CommandPrompt.com>
# Set initdb as a seperate option.
-# PGVERSION is the full package version, e.g., 8.2.0
+# Version 8.3 Devrim Gunduz <devrim(a)CommandPrompt.com>
+
+# Version 8.4 Devrim Gunduz <devrim(a)CommandPrompt.com>
+# Remove "sameuser" from initdb, to match the new hba conf file.
+
+# PGVERSION is the full package version, e.g., 8.4.0
# Note: the specfile ordinarily updates this during install
PGVERSION=xxxx
-# PGMAJORVERSION is major version, e.g., 8.2 (this should match PG_VERSION)
+# PGMAJORVERSION is major version, e.g., 8.4 (this should match PG_VERSION)
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
# Source function library.
@@ -101,13 +106,7 @@ fi
# Set defaults for configuration variables
PGENGINE=/usr/bin
PGPORT=5432
-PGDATA=/var/lib/pgsql
-if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base/template1" ]
-then
- echo "Using old-style directory structure"
-else
- PGDATA=/var/lib/pgsql/data
-fi
+PGDATA=/var/lib/pgsql/data
PGLOG=/var/lib/pgsql/pgstartup.log
# Override defaults from /etc/sysconfig/pgsql if file is present
@@ -245,7 +244,7 @@ initdb(){
# Clean up SELinux tagging for PGDATA
[ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
# Initialize the database
- $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident sameuser'" >> "$PGLOG" 2>&1 < /dev/null
+ $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
# Create directory for postmaster log
mkdir "$PGDATA/pg_log"
chown postgres:postgres "$PGDATA/pg_log"
diff --git a/postgresql.spec b/postgresql.spec
index 93f87f5..9c3cc02 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,25 +1,6 @@
-# Conventions for PostgreSQL Global Development Group RPM releases:
-
-# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
-# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
-# test releases.
-
-# Pre-releases are those that are built from CVS snapshots or pre-release
-# tarballs from postgresql.org. Official beta releases are not
-# considered pre-releases, nor are release candidates, as their beta or
-# release candidate status is reflected in the version of the tarball. Pre-
-# releases' versions do not change -- the pre-release tarball of 7.0.3, for
-# example, has the same tarball version as the final official release of 7.0.3:
-# but the tarball is different.
-
-# Test releases are where PostgreSQL itself is not in beta, but certain parts of
-# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
-
-# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
-# -- only test releases or full releases should be.
# This is the PostgreSQL Global Development Group Official RPMset spec file,
# or a derivative thereof.
-# Copyright 2003 Lamar Owen <lowen(a)pari.edu> <lamar.owen(a)wgcr.org>
+# Copyright 2003-2009 Lamar Owen <lowen(a)pari.edu> <lamar.owen(a)wgcr.org>
# and others listed.
# Major Contributors:
@@ -41,18 +22,12 @@
# This spec file and ancilliary files are licensed in accordance with
# The PostgreSQL license.
-# In this file you can find the default build package list macros. These can be overridden by defining
-# on the rpm command line:
+# In this file you can find the default build package list macros.
+# These can be overridden by defining on the rpm command line:
# rpm --define 'packagename 1' .... to force the package to build.
# rpm --define 'packagename 0' .... to force the package NOT to build.
-# The base package, the lib package, the devel package, and the server package always get built.
-
-#build7x, build8, and build9 similar
-%{?build7x:%define tcldevel 0}
-%{?build7x:%define aconfver autoconf-2.53}
-%{?build8:%define build89 1}
-%{?build8:%define tcldevel 0}
-%{?build9:%define build89 1}
+# The base package, the lib package, the devel package, and the server package
+# always get built.
%define beta 0
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
@@ -83,8 +58,9 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3.7
-Release: 2%{?dist}
+%define majorversion 8.4
+Version: 8.4.0
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -98,7 +74,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.7-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.0-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -106,7 +82,6 @@ Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
Patch1: rpm-pgsql.patch
Patch2: postgresql-ac-version.patch
Patch3: postgresql-logging.patch
-Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
@@ -185,7 +160,7 @@ server over a network connection. This package contains the docs
in HTML for the whole package, as well as command-line utilities for
managing PostgreSQL databases on a PostgreSQL server.
-If you want to manipulate a PostgreSQL database on a remote PostgreSQL
+If you want to manipulate a PostgreSQL database on a local or remote PostgreSQL
server, you need this package. You also need to install this package
if you're installing the postgresql-server package.
@@ -228,8 +203,8 @@ Obsoletes: rh-postgresql-docs
%description docs
The postgresql-docs package includes some additional documentation for
-PostgreSQL. Currently, this includes the main documentation in PDF format,
-the FAQ, and source files for the PostgreSQL tutorial.
+PostgreSQL. Currently, this includes the main documentation in PDF format
+and source files for the PostgreSQL tutorial.
%package contrib
@@ -256,7 +231,6 @@ with a PostgreSQL database management server and the ecpg Embedded C
Postgres preprocessor. You need to install this package if you want to
develop applications which will interact with a PostgreSQL server.
-#------------
%if %plperl
%package plperl
Summary: The Perl procedural language for PostgreSQL
@@ -272,7 +246,6 @@ system. The postgresql-plperl package contains the PL/Perl
procedural language for the backend.
%endif
-#------------
%if %plpython
%package plpython
Summary: The Python procedural language for PostgreSQL
@@ -287,7 +260,6 @@ system. The postgresql-plpython package contains the PL/Python
procedural language for the backend.
%endif
-#------------
%if %pltcl
%package pltcl
Summary: The Tcl procedural language for PostgreSQL
@@ -302,7 +274,6 @@ system. The postgresql-pltcl package contains the PL/Tcl
procedural language for the backend.
%endif
-#------------
%if %tcl
%package tcl
Summary: A Tcl client library for PostgreSQL
@@ -318,7 +289,6 @@ system. The postgresql-tcl package contains the Pgtcl client library
and its documentation.
%endif
-#------------
%if %python
%package python
Summary: Development module for Python code to access a PostgreSQL DB
@@ -335,7 +305,6 @@ developers to use when writing Python code for accessing a PostgreSQL
database.
%endif
-#----------
%if %test
%package test
Summary: The test suite distributed with PostgreSQL
@@ -357,7 +326,6 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# patch5 is applied later
%patch6 -p1
@@ -402,10 +370,6 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
%endif
-# Use --as-needed to eliminate unnecessary link dependencies.
-# NB: Postgres 8.4 will do this for itself.
-LDFLAGS="-Wl,--as-needed"; export LDFLAGS
-
%configure --disable-rpath \
%if %beta
--enable-debug \
@@ -466,11 +430,8 @@ rm -f src/tutorial/GNUmakefile
%if %runselftest
pushd src/test/regress
make all
- cp ../../../contrib/spi/refint.so .
- cp ../../../contrib/spi/autoinc.so .
make MAX_CONNECTIONS=5 check
make clean
- rm refint.so autoinc.so
popd
%endif
@@ -572,8 +533,6 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
# Makefiles, however.
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test
cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
- install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
- install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
strip *.so
rm -f GNUmakefile Makefile *.o
@@ -597,21 +556,44 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
popd
%endif
-%find_lang libpq
-%find_lang initdb
-%find_lang pg_config
-%find_lang pg_ctl
-%find_lang pg_dump
-%find_lang postgres
-%find_lang psql
-%find_lang pg_resetxlog
-%find_lang pg_controldata
-%find_lang pgscripts
-
-cat libpq.lang > libpq.lst
-cat pg_config.lang > pg_config.lst
-cat initdb.lang pg_ctl.lang psql.lang pg_dump.lang pgscripts.lang > main.lst
-cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
+%find_lang ecpg-%{majorversion}
+cat ecpg-%{majorversion}.lang >devel.lst
+%find_lang ecpglib6-%{majorversion}
+cat ecpglib6-%{majorversion}.lang >libs.lst
+%find_lang initdb-%{majorversion}
+cat initdb-%{majorversion}.lang >server.lst
+%find_lang libpq5-%{majorversion}
+cat libpq5-%{majorversion}.lang >>libs.lst
+%find_lang pg_config-%{majorversion}
+cat pg_config-%{majorversion}.lang >>devel.lst
+%find_lang pg_controldata-%{majorversion}
+cat pg_controldata-%{majorversion}.lang >>server.lst
+%find_lang pg_ctl-%{majorversion}
+cat pg_ctl-%{majorversion}.lang >>server.lst
+%find_lang pg_dump-%{majorversion}
+cat pg_dump-%{majorversion}.lang >main.lst
+%find_lang pg_resetxlog-%{majorversion}
+cat pg_resetxlog-%{majorversion}.lang >>server.lst
+%find_lang pgscripts-%{majorversion}
+cat pgscripts-%{majorversion}.lang >>main.lst
+%if %plperl
+%find_lang plperl-%{majorversion}
+cat plperl-%{majorversion}.lang >plperl.lst
+%endif
+%find_lang plpgsql-%{majorversion}
+cat plpgsql-%{majorversion}.lang >>server.lst
+%if %plpython
+%find_lang plpython-%{majorversion}
+cat plpython-%{majorversion}.lang >plpython.lst
+%endif
+%if %pltcl
+%find_lang pltcl-%{majorversion}
+cat pltcl-%{majorversion}.lang >pltcl.lst
+%endif
+%find_lang postgres-%{majorversion}
+cat postgres-%{majorversion}.lang >>server.lst
+%find_lang psql-%{majorversion}
+cat psql-%{majorversion}.lang >>main.lst
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -672,7 +654,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f main.lst
%defattr(-,root,root)
-%doc doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
+%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
%doc COPYRIGHT README HISTORY doc/bug.template
%doc README.rpm-dist
%doc doc/html
@@ -707,7 +689,6 @@ rm -rf $RPM_BUILD_ROOT
%files docs
%defattr(-,root,root)
-%doc doc/src/FAQ
%doc *-US.pdf
%{_libdir}/pgsql/tutorial/
@@ -716,8 +697,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/adminpack.so
%{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/auto_explain.so
+%{_libdir}/pgsql/btree_gin.so
%{_libdir}/pgsql/btree_gist.so
%{_libdir}/pgsql/chkpass.so
+%{_libdir}/pgsql/citext.so
%{_libdir}/pgsql/cube.so
%{_libdir}/pgsql/dblink.so
%{_libdir}/pgsql/dict_int.so
@@ -726,7 +710,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/fuzzystrmatch.so
%{_libdir}/pgsql/hstore.so
%{_libdir}/pgsql/insert_username.so
-%{_libdir}/pgsql/int_aggregate.so
%{_libdir}/pgsql/isn.so
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
@@ -738,6 +721,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/pgcrypto.so
%{_libdir}/pgsql/pgrowlocks.so
%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/pg_stat_statements.so
%{_libdir}/pgsql/refint.so
%{_libdir}/pgsql/seg.so
%{_libdir}/pgsql/sslinfo.so
@@ -756,9 +740,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/pg_standby
%{_bindir}/pgbench
%{_bindir}/vacuumlo
-%doc contrib/*/README.* contrib/spi/*.example
+%doc contrib/spi/*.example
-%files libs -f libpq.lang
+%files libs -f libs.lst
%defattr(-,root,root)
%{_libdir}/libpq.so.*
%{_libdir}/libecpg.so.*
@@ -773,14 +757,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%attr (755,root,root) %dir /etc/sysconfig/pgsql
%{_bindir}/initdb
-%{_bindir}/ipcclean
%{_bindir}/pg_controldata
%{_bindir}/pg_ctl
%{_bindir}/pg_resetxlog
%{_bindir}/postgres
%{_bindir}/postmaster
%{_mandir}/man1/initdb.*
-%{_mandir}/man1/ipcclean.*
%{_mandir}/man1/pg_controldata.*
%{_mandir}/man1/pg_ctl.*
%{_mandir}/man1/pg_resetxlog.*
@@ -806,7 +788,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/snowball_create.sql
%{_datadir}/pgsql/sql_features.txt
-%files devel -f pg_config.lst
+%files devel -f devel.lst
%defattr(-,root,root)
/usr/include/*
%{_bindir}/ecpg
@@ -832,13 +814,13 @@ rm -rf $RPM_BUILD_ROOT
%endif
%if %plperl
-%files plperl
+%files plperl -f plperl.lst
%defattr(-,root,root)
%{_libdir}/pgsql/plperl.so
%endif
%if %pltcl
-%files pltcl
+%files pltcl -f pltcl.lst
%defattr(-,root,root)
%{_libdir}/pgsql/pltcl.so
%{_bindir}/pltcl_delmod
@@ -848,7 +830,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
%if %plpython
-%files plpython
+%files plpython -f plpython.lst
%defattr(-,root,root)
%{_libdir}/pgsql/plpython.so
%endif
@@ -870,6 +852,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Aug 17 2009 Tom Lane <tgl(a)redhat.com> 8.4.0-1
+- Update to PostgreSQL 8.4.0. See release notes at
+ http://www.postgresql.org/docs/8.4/static/release-8-4.html
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 8.3.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch
index ee77427..e595db7 100644
--- a/rpm-pgsql.patch
+++ b/rpm-pgsql.patch
@@ -1,7 +1,11 @@
-diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Makefile.global.in
---- postgresql-8.1.0.orig/src/Makefile.global.in 2005-09-27 13:39:32.000000000 -0400
-+++ postgresql-8.1.0/src/Makefile.global.in 2005-11-07 14:58:59.000000000 -0500
-@@ -53,7 +53,7 @@
+For the RPMs, we want the custom installation directories to end in
+/pgsql not /postgresql. This is historical but not worth changing.
+
+
+diff -Naur postgresql-8.4.0.orig/src/Makefile.global.in postgresql-8.4.0/src/Makefile.global.in
+--- postgresql-8.4.0.orig/src/Makefile.global.in 2009-06-22 23:46:00.000000000 -0400
++++ postgresql-8.4.0/src/Makefile.global.in 2009-08-12 23:14:53.000000000 -0400
+@@ -54,7 +54,7 @@
# Installation directories
#
# These are set by the equivalent --xxxdir configure options. We
@@ -10,7 +14,7 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak
# contain "pgsql" or "postgres", in order to avoid directory clutter.
#
# In a PGXS build, we cannot use the values inserted into Makefile.global
-@@ -73,14 +73,14 @@
+@@ -75,14 +75,14 @@
datadir := @datadir@
ifeq "$(findstring pgsql, $(datadir))" ""
ifeq "$(findstring postgres, $(datadir))" ""
@@ -27,7 +31,7 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak
endif
endif
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
pkglibdir = $(libdir)
ifeq "$(findstring pgsql, $(pkglibdir))" ""
ifeq "$(findstring postgres, $(pkglibdir))" ""
@@ -36,7 +40,7 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak
endif
endif
-@@ -98,7 +98,7 @@
+@@ -100,7 +100,7 @@
pkgincludedir = $(includedir)
ifeq "$(findstring pgsql, $(pkgincludedir))" ""
ifeq "$(findstring postgres, $(pkgincludedir))" ""
@@ -46,11 +50,11 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak
endif
@@ -109,7 +109,7 @@
- ifneq (,$(docdir))
+ docdir := @docdir@
ifeq "$(findstring pgsql, $(docdir))" ""
ifeq "$(findstring postgres, $(docdir))" ""
-override docdir := $(docdir)/postgresql
+override docdir := $(docdir)/pgsql
endif
endif
- endif
+
diff --git a/sources b/sources
index bba3c17..046a91f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-7b7e91a2221e55fe1b167e663217a96d postgresql-8.3.7.tar.bz2
+1f172d5f60326e972837f58fa5acd130 postgresql-8.4.0.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-cf36036b0a973f793b2ba25dfdbcf879 postgresql-8.3.7-US.pdf
+bbed2a7dad711eef335701391b9f112d postgresql-8.4.0-US.pdf
commit cddd7916a21eb15881c02a88fa35b84853e75ccb
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sun Jul 26 19:14:39 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 9703c94..93f87f5 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -84,7 +84,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -870,6 +870,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 8.3.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sat Mar 21 2009 Tom Lane <tgl(a)redhat.com> 8.3.7-1
- Update to PostgreSQL 8.3.7, for various fixes described at
http://www.postgresql.org/docs/8.3/static/release-8-3-7.html
commit cc83805459b5ab860366d0bf6a287dfa656aad22
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Jul 2 00:34:17 2009 +0000
Remove no-longer-needed BuildRequires: e2fsprogs-devel
diff --git a/postgresql.spec b/postgresql.spec
index a5993b0..9703c94 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -135,7 +135,6 @@ BuildRequires: openssl-devel
%if %kerberos
BuildRequires: krb5-devel
-BuildRequires: e2fsprogs-devel
%endif
%if %ldap
commit bc5e872454761688b6d4e3e05f9909a6e8592ca8
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Mar 21 22:43:50 2009 +0000
Update to PostgreSQL 8.3.7
diff --git a/.cvsignore b/.cvsignore
index 4ca82cf..b522c56 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.6.tar.bz2
+postgresql-8.3.7.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3.6-US.pdf
+postgresql-8.3.7-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index bd7d8cd..05e3fb0 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.3.6.orig/configure.in postgresql-8.3.6/configure.in
---- postgresql-8.3.6.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.6/configure.in 2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.3.7.orig/configure.in postgresql-8.3.7/configure.in
+--- postgresql-8.3.7.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.7/configure.in 2008-09-25 10:26:10.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.3.6], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.7], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql-sdt-includes.patch b/postgresql-sdt-includes.patch
deleted file mode 100644
index 6166397..0000000
--- a/postgresql-sdt-includes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Do not expose pg_trace.h (ie, <sys/sdt.h>) as something that every dependent
-package will need to #include successfully. Otherwise we'd need to make
-postgresql-devel Require: systemtap-sdt-devel, which doesn't seem like a
-desirable thing to do. This patch is already applied upstream and won't
-be needed in 8.3.7.
-
-
-diff -Naur postgresql-8.3.6.orig/src/backend/access/transam/xact.c postgresql-8.3.6/src/backend/access/transam/xact.c
---- postgresql-8.3.6.orig/src/backend/access/transam/xact.c 2008-04-26 19:35:33.000000000 -0400
-+++ postgresql-8.3.6/src/backend/access/transam/xact.c 2009-03-10 21:17:26.000000000 -0400
-@@ -33,6 +33,7 @@
- #include "executor/spi.h"
- #include "libpq/be-fsstubs.h"
- #include "miscadmin.h"
-+#include "pg_trace.h"
- #include "pgstat.h"
- #include "storage/fd.h"
- #include "storage/lmgr.h"
-diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c postgresql-8.3.6/src/backend/storage/lmgr/lock.c
---- postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c 2008-03-04 14:54:13.000000000 -0500
-+++ postgresql-8.3.6/src/backend/storage/lmgr/lock.c 2009-03-10 21:17:26.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "access/twophase.h"
- #include "access/twophase_rmgr.h"
- #include "miscadmin.h"
-+#include "pg_trace.h"
- #include "pgstat.h"
- #include "utils/memutils.h"
- #include "utils/ps_status.h"
-diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c
---- postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c 2008-01-01 14:45:52.000000000 -0500
-+++ postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c 2009-03-10 21:17:26.000000000 -0400
-@@ -25,6 +25,7 @@
- #include "access/multixact.h"
- #include "access/subtrans.h"
- #include "miscadmin.h"
-+#include "pg_trace.h"
- #include "storage/ipc.h"
- #include "storage/proc.h"
- #include "storage/spin.h"
-diff -Naur postgresql-8.3.6.orig/src/include/c.h postgresql-8.3.6/src/include/c.h
---- postgresql-8.3.6.orig/src/include/c.h 2008-02-23 14:11:55.000000000 -0500
-+++ postgresql-8.3.6/src/include/c.h 2009-03-10 21:17:26.000000000 -0400
-@@ -57,7 +57,6 @@
- #include "pg_config_os.h" /* must be before any system header files */
- #endif
- #include "postgres_ext.h"
--#include "pg_trace.h"
-
- #if _MSC_VER >= 1400
- #define errcode __msvc_errcode
diff --git a/postgresql.spec b/postgresql.spec
index d253ba4..a5993b0 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,8 +83,8 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3.6
-Release: 4%{?dist}
+Version: 8.3.7
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -98,7 +98,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.6-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.7-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -109,7 +109,6 @@ Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
-Patch7: postgresql-sdt-includes.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -362,7 +361,6 @@ system, including regression tests and benchmarks.
%patch4 -p1
# patch5 is applied later
%patch6 -p1
-%patch7 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -873,6 +871,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Mar 21 2009 Tom Lane <tgl(a)redhat.com> 8.3.7-1
+- Update to PostgreSQL 8.3.7, for various fixes described at
+ http://www.postgresql.org/docs/8.3/static/release-8-3-7.html
+ notably the fix for CVE-2009-0922
+
* Tue Mar 10 2009 Tom Lane <tgl(a)redhat.com> 8.3.6-4
- Prevent dependent packages from needing to include sys/sdt.h
(unintended side effect of previous patch)
diff --git a/sources b/sources
index 9519f37..bba3c17 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-4f8c67d802bd03b5b844e268bba7d44a postgresql-8.3.6.tar.bz2
+7b7e91a2221e55fe1b167e663217a96d postgresql-8.3.7.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-c0a875cb8694315fcbf87bf973a3169c postgresql-8.3.6-US.pdf
+cf36036b0a973f793b2ba25dfdbcf879 postgresql-8.3.7-US.pdf
commit 18a2a1a2f2ea180d353058877e181df6b71b94f4
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Mar 11 01:36:52 2009 +0000
Prevent dependent packages from needing to include sys/sdt.h
diff --git a/postgresql-sdt-includes.patch b/postgresql-sdt-includes.patch
new file mode 100644
index 0000000..6166397
--- /dev/null
+++ b/postgresql-sdt-includes.patch
@@ -0,0 +1,51 @@
+Do not expose pg_trace.h (ie, <sys/sdt.h>) as something that every dependent
+package will need to #include successfully. Otherwise we'd need to make
+postgresql-devel Require: systemtap-sdt-devel, which doesn't seem like a
+desirable thing to do. This patch is already applied upstream and won't
+be needed in 8.3.7.
+
+
+diff -Naur postgresql-8.3.6.orig/src/backend/access/transam/xact.c postgresql-8.3.6/src/backend/access/transam/xact.c
+--- postgresql-8.3.6.orig/src/backend/access/transam/xact.c 2008-04-26 19:35:33.000000000 -0400
++++ postgresql-8.3.6/src/backend/access/transam/xact.c 2009-03-10 21:17:26.000000000 -0400
+@@ -33,6 +33,7 @@
+ #include "executor/spi.h"
+ #include "libpq/be-fsstubs.h"
+ #include "miscadmin.h"
++#include "pg_trace.h"
+ #include "pgstat.h"
+ #include "storage/fd.h"
+ #include "storage/lmgr.h"
+diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c postgresql-8.3.6/src/backend/storage/lmgr/lock.c
+--- postgresql-8.3.6.orig/src/backend/storage/lmgr/lock.c 2008-03-04 14:54:13.000000000 -0500
++++ postgresql-8.3.6/src/backend/storage/lmgr/lock.c 2009-03-10 21:17:26.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "access/twophase.h"
+ #include "access/twophase_rmgr.h"
+ #include "miscadmin.h"
++#include "pg_trace.h"
+ #include "pgstat.h"
+ #include "utils/memutils.h"
+ #include "utils/ps_status.h"
+diff -Naur postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c
+--- postgresql-8.3.6.orig/src/backend/storage/lmgr/lwlock.c 2008-01-01 14:45:52.000000000 -0500
++++ postgresql-8.3.6/src/backend/storage/lmgr/lwlock.c 2009-03-10 21:17:26.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include "access/multixact.h"
+ #include "access/subtrans.h"
+ #include "miscadmin.h"
++#include "pg_trace.h"
+ #include "storage/ipc.h"
+ #include "storage/proc.h"
+ #include "storage/spin.h"
+diff -Naur postgresql-8.3.6.orig/src/include/c.h postgresql-8.3.6/src/include/c.h
+--- postgresql-8.3.6.orig/src/include/c.h 2008-02-23 14:11:55.000000000 -0500
++++ postgresql-8.3.6/src/include/c.h 2009-03-10 21:17:26.000000000 -0400
+@@ -57,7 +57,6 @@
+ #include "pg_config_os.h" /* must be before any system header files */
+ #endif
+ #include "postgres_ext.h"
+-#include "pg_trace.h"
+
+ #if _MSC_VER >= 1400
+ #define errcode __msvc_errcode
diff --git a/postgresql.spec b/postgresql.spec
index 061c123..d253ba4 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -84,7 +84,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.6
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -109,6 +109,7 @@ Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
+Patch7: postgresql-sdt-includes.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -361,6 +362,7 @@ system, including regression tests and benchmarks.
%patch4 -p1
# patch5 is applied later
%patch6 -p1
+%patch7 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -398,8 +400,8 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-# use -O1 on sparc64
-%ifarch sparc64
+# use -O1 on sparc64 and alpha
+%ifarch sparc64 alpha
CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
%endif
@@ -871,6 +873,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Mar 10 2009 Tom Lane <tgl(a)redhat.com> 8.3.6-4
+- Prevent dependent packages from needing to include sys/sdt.h
+ (unintended side effect of previous patch)
+- Use -O1 on alpha, per report from Oliver Falk; -O2 tickles gcc bugs
+
* Sun Mar 8 2009 Tom Lane <tgl(a)redhat.com> 8.3.6-3
- Enable tracing via systemtap
Resolves: #488941
commit 14d34333ddbba64725fcfd8e042ee847585acef6
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun Mar 8 20:29:14 2009 +0000
Enable tracing via systemtap
diff --git a/postgresql.spec b/postgresql.spec
index 6f2c2a3..061c123 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -73,6 +73,7 @@
%{!?uuid:%define uuid 1}
%{!?xml:%define xml 1}
%{!?pam:%define pam 1}
+%{!?sdt:%define sdt 1}
%{!?pgfts:%define pgfts 1}
%{!?runselftest:%define runselftest 1}
@@ -83,7 +84,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.6
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -157,6 +158,10 @@ BuildRequires: libxml2-devel libxslt-devel
BuildRequires: pam-devel
%endif
+%if %sdt
+BuildRequires: systemtap-sdt-devel
+%endif
+
# main package requires -libs subpackage
Requires: postgresql-libs = %{version}-%{release}
@@ -440,6 +445,9 @@ LDFLAGS="-Wl,--as-needed"; export LDFLAGS
%if %nls
--enable-nls \
%endif
+%if %sdt
+ --enable-dtrace \
+%endif
%if %pgfts
--enable-thread-safety \
%endif
@@ -863,6 +871,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Mar 8 2009 Tom Lane <tgl(a)redhat.com> 8.3.6-3
+- Enable tracing via systemtap
+Resolves: #488941
+
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 8.3.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
commit e1e05110f8753ce5b2dc3ee6ac7b524632840788
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Fri Feb 27 01:43:49 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 83d6779..6f2c2a3 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -863,6 +863,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 8.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Sat Feb 7 2009 Tom Lane <tgl(a)redhat.com> 8.3.6-1
- Update to PostgreSQL 8.3.6, for various fixes described at
http://www.postgresql.org/docs/8.3/static/release-8-3-6.html
commit d4ab76cc9284646f217c221a8306cf48764abe1b
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Feb 7 05:55:40 2009 +0000
Update to PostgreSQL 8.3.6
diff --git a/.cvsignore b/.cvsignore
index b58faa9..4ca82cf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.5.tar.bz2
+postgresql-8.3.6.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3.5-US.pdf
+postgresql-8.3.6-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index afe3e31..bd7d8cd 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.3.5.orig/configure.in postgresql-8.3.5/configure.in
---- postgresql-8.3.5.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.5/configure.in 2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.3.6.orig/configure.in postgresql-8.3.6/configure.in
+--- postgresql-8.3.6.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.6/configure.in 2008-09-25 10:26:10.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.3.5], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.6], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index 9efd66d..83d6779 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,8 +82,8 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3.5
-Release: 4%{?dist}
+Version: 8.3.6
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -97,7 +97,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.5-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.6-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -399,7 +399,7 @@ CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
%endif
# Use --as-needed to eliminate unnecessary link dependencies.
-# Hopefully upstream will do this for itself in some future release.
+# NB: Postgres 8.4 will do this for itself.
LDFLAGS="-Wl,--as-needed"; export LDFLAGS
%configure --disable-rpath \
@@ -863,6 +863,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Feb 7 2009 Tom Lane <tgl(a)redhat.com> 8.3.6-1
+- Update to PostgreSQL 8.3.6, for various fixes described at
+ http://www.postgresql.org/docs/8.3/static/release-8-3-6.html
+
* Wed Jan 21 2009 Dennis Gilmore <dennis(a)ausil.us> 8.3.5-4
- use -O1 on sparc64
diff --git a/sources b/sources
index c7a1b2e..9519f37 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-3bc028774d7a79e926be0c6a9c7ca209 postgresql-8.3.5.tar.bz2
+4f8c67d802bd03b5b844e268bba7d44a postgresql-8.3.6.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-45042f646d2d7979acd9f3d03572c705 postgresql-8.3.5-US.pdf
+c0a875cb8694315fcbf87bf973a3169c postgresql-8.3.6-US.pdf
commit 2f4174b6392479e3c5a9146dabfbf39342b38ffd
Author: Dennis Gilmore <ausil(a)fedoraproject.org>
Date: Thu Jan 22 07:36:28 2009 +0000
build -O1 sparc64
diff --git a/postgresql.spec b/postgresql.spec
index 385c596..9efd66d 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.5
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -393,6 +393,10 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+# use -O1 on sparc64
+%ifarch sparc64
+CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+%endif
# Use --as-needed to eliminate unnecessary link dependencies.
# Hopefully upstream will do this for itself in some future release.
@@ -859,6 +863,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jan 21 2009 Dennis Gilmore <dennis(a)ausil.us> 8.3.5-4
+- use -O1 on sparc64
+
* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 8.3.5-3
- rebuild with new openssl
commit 74b1eab5e6d2c51b04fbf162f6b6465a53c6463f
Author: Tom Mrz <tmraz(a)fedoraproject.org>
Date: Sat Jan 17 19:46:16 2009 +0000
- rebuild with new openssl
diff --git a/postgresql.spec b/postgresql.spec
index 0515a21..385c596 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -859,6 +859,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 8.3.5-3
+- rebuild with new openssl
+
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 8.3.5-2
- Rebuild for Python 2.6
commit 31b180c96972b91ae7c31db9fff08e58d392dbee
Author: Ignacio Vazquez-Abrams <ivazquez(a)fedoraproject.org>
Date: Sat Nov 29 17:56:28 2008 +0000
Rebuild for Python 2.6
diff --git a/postgresql.spec b/postgresql.spec
index c91680d..0515a21 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -859,6 +859,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 8.3.5-2
+- Rebuild for Python 2.6
+
* Sun Nov 2 2008 Tom Lane <tgl(a)redhat.com> 8.3.5-1
- Update to PostgreSQL 8.3.5.
- Improve display from init script's initdb action, per Michael Schwendt
commit ef0957ba0a0b4226da155c632724c0e3183b6d55
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun Nov 2 18:23:29 2008 +0000
Update to PostgreSQL 8.3.5
diff --git a/.cvsignore b/.cvsignore
index b1dfd87..b58faa9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.4.tar.bz2
+postgresql-8.3.5.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3.4-US.pdf
+postgresql-8.3.5-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 8626036..afe3e31 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.3.4.orig/configure.in postgresql-8.3.4/configure.in
---- postgresql-8.3.4.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.4/configure.in 2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.3.5.orig/configure.in postgresql-8.3.5/configure.in
+--- postgresql-8.3.5.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.5/configure.in 2008-09-25 10:26:10.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.3.4], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.5], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.init b/postgresql.init
index 37d6011..adb395a 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -230,8 +230,9 @@ reload(){
initdb(){
if [ -f "$PGDATA/PG_VERSION" ]
then
- echo "Data directory is not empty!"
+ echo -n "Data directory is not empty!"
echo_failure
+ echo
script_result=1
else
echo -n $"Initializing database: "
@@ -257,6 +258,7 @@ initdb(){
echo_failure
script_result=1
fi
+ echo
fi
}
diff --git a/postgresql.spec b/postgresql.spec
index 745b4e8..c91680d 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3.4
+Version: 8.3.5
Release: 1%{?dist}
License: BSD
Group: Applications/Databases
@@ -97,7 +97,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.4-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.5-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -859,6 +859,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Nov 2 2008 Tom Lane <tgl(a)redhat.com> 8.3.5-1
+- Update to PostgreSQL 8.3.5.
+- Improve display from init script's initdb action, per Michael Schwendt
+
* Thu Sep 25 2008 Tom Lane <tgl(a)redhat.com> 8.3.4-1
- Update to PostgreSQL 8.3.4.
diff --git a/sources b/sources
index 998b695..c7a1b2e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-c339b9d3c0c4add64c7a76640fc93744 postgresql-8.3.4.tar.bz2
+3bc028774d7a79e926be0c6a9c7ca209 postgresql-8.3.5.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-cbe2df6b07791aa5050b065c1ae2a132 postgresql-8.3.4-US.pdf
+45042f646d2d7979acd9f3d03572c705 postgresql-8.3.5-US.pdf
commit 516dbde4276c1b61710e441793cb5a7e5f68f9ac
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Sep 25 14:40:14 2008 +0000
Update to PostgreSQL 8.3.4
diff --git a/.cvsignore b/.cvsignore
index c9c6149..b1dfd87 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.3.tar.bz2
+postgresql-8.3.4.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3.3-US.pdf
+postgresql-8.3.4-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index f6bb105..8626036 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.3.3.orig/configure.in postgresql-8.3.3/configure.in
---- postgresql-8.3.3.orig/configure.in 2008-06-08 20:38:40.000000000 -0400
-+++ postgresql-8.3.3/configure.in 2008-07-28 21:45:08.000000000 -0400
+diff -Naur postgresql-8.3.4.orig/configure.in postgresql-8.3.4/configure.in
+--- postgresql-8.3.4.orig/configure.in 2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.4/configure.in 2008-09-25 10:26:10.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.3.3], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.4], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index ad27a82..745b4e8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,8 +82,8 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3.3
-Release: 3%{?dist}
+Version: 8.3.4
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -97,7 +97,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.3-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.4-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -859,6 +859,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Sep 25 2008 Tom Lane <tgl(a)redhat.com> 8.3.4-1
+- Update to PostgreSQL 8.3.4.
+
* Mon Jul 28 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-3
- Fix build failure caused by new default patch fuzz = 0 policy in rawhide.
diff --git a/sources b/sources
index 4fa4a87..998b695 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-0ae4bd9620e84d3e08dcf923808d14d0 postgresql-8.3.3.tar.bz2
+c339b9d3c0c4add64c7a76640fc93744 postgresql-8.3.4.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-62043e967e738d93e6f0402ba152f6de postgresql-8.3.3-US.pdf
+cbe2df6b07791aa5050b065c1ae2a132 postgresql-8.3.4-US.pdf
commit b2169aa2ae531c635371b352af8effe0a6bc4f82
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Jul 29 01:50:10 2008 +0000
So apparently, %patch -F does not actually *work* in the current Fedora
infrastructure. Grumble.
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index decc317..f6bb105 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.3RC2.orig/configure.in postgresql-8.3RC2/configure.in
---- postgresql-8.3RC2.orig/configure.in 2008-01-17 23:47:32.000000000 -0500
-+++ postgresql-8.3RC2/configure.in 2008-01-18 11:39:58.000000000 -0500
+diff -Naur postgresql-8.3.3.orig/configure.in postgresql-8.3.3/configure.in
+--- postgresql-8.3.3.orig/configure.in 2008-06-08 20:38:40.000000000 -0400
++++ postgresql-8.3.3/configure.in 2008-07-28 21:45:08.000000000 -0400
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.3RC2], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.3], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index d4dae7b..ad27a82 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -351,8 +351,7 @@ system, including regression tests and benchmarks.
%prep
%setup -q
%patch1 -p1
-# intentionally allowing fuzz here because of adjacent version number
-%patch2 -p1 -F2
+%patch2 -p1
%patch3 -p1
%patch4 -p1
# patch5 is applied later
@@ -862,9 +861,6 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Jul 28 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-3
- Fix build failure caused by new default patch fuzz = 0 policy in rawhide.
- The only patch that actually broke was postgresql-ac-version.patch, and
- for that it seems better to allow fuzz than to have a guaranteed patch
- failure on every upstream minor version update.
* Fri Jun 20 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-2
- Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib.
commit 09bd3b3257582470a3ad0666b6229f47028ba4f7
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Jul 29 00:24:16 2008 +0000
Fix FTBFS problem occasioned by _default_patch_fuzz = 0 in rawhide
diff --git a/postgresql.spec b/postgresql.spec
index 8391f36..d4dae7b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -351,7 +351,8 @@ system, including regression tests and benchmarks.
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
+# intentionally allowing fuzz here because of adjacent version number
+%patch2 -p1 -F2
%patch3 -p1
%patch4 -p1
# patch5 is applied later
@@ -859,6 +860,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jul 28 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-3
+- Fix build failure caused by new default patch fuzz = 0 policy in rawhide.
+ The only patch that actually broke was postgresql-ac-version.patch, and
+ for that it seems better to allow fuzz than to have a guaranteed patch
+ failure on every upstream minor version update.
+
* Fri Jun 20 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-2
- Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib.
Needed because tcl 8.5 no longer puts /usr/lib into its package search path.
commit 898ed62300242c98f75cadbd6700a0f7d23dab5c
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Fri Jun 20 16:54:12 2008 +0000
Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib
diff --git a/postgresql.spec b/postgresql.spec
index 5e6a827..8391f36 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -305,7 +305,7 @@ Summary: A Tcl client library for PostgreSQL
Group: Applications/Databases
# this is intentionally not a version-specific Requires:
Requires: libpq.so
-Requires: tcl >= 8.3
+Requires: tcl >= 8.5
Obsoletes: rh-postgresql-tcl
%description tcl
@@ -520,9 +520,17 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
%if %tcl
- install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/Pgtcl
- cp Pgtcl/pkgIndex.tcl $RPM_BUILD_ROOT%{_libdir}/Pgtcl
- cp Pgtcl/libpgtcl*.so $RPM_BUILD_ROOT%{_libdir}/Pgtcl
+ TCL_VERSION=`echo 'puts $tcl_version' | tclsh`
+ TCLLIBDIR="%{_libdir}/tcl$TCL_VERSION"
+ # check the target directory is a dir, not a symlink
+ if [ -h "$TCLLIBDIR" ] ; then
+ echo "$TCLLIBDIR must not be a symlink"
+ exit 1
+ fi
+ PGTCL_DIR="${RPM_BUILD_ROOT}${TCLLIBDIR}/Pgtcl"
+ install -d -m 755 "$PGTCL_DIR"
+ cp Pgtcl/pkgIndex.tcl "$PGTCL_DIR"
+ cp Pgtcl/libpgtcl*.so "$PGTCL_DIR"
%endif
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -808,7 +816,7 @@ rm -rf $RPM_BUILD_ROOT
%if %tcl
%files tcl
%defattr(-,root,root)
-%{_libdir}/Pgtcl/
+%{_libdir}/tcl*/Pgtcl/
%doc Pgtcl-docs/*
%endif
@@ -851,6 +859,14 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Jun 20 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-2
+- Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib.
+ Needed because tcl 8.5 no longer puts /usr/lib into its package search path.
+ NOTE: do not back-port this change into branches using pre-8.5 tcl, because
+ /usr/lib/tcl8.4 had been a symlink to /usr/share/tcl8.4, and /usr/share
+ is exactly where we must not put Pgtcl.
+Resolves: #228263
+
* Wed Jun 11 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-1
- Update to PostgreSQL 8.3.3.
- Remove postgresql-prefer-ncurses.patch, no longer needed in recent
commit 493aa00b1af386b32c5d119b7906d0f21c02d7b0
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Jun 11 16:18:40 2008 +0000
Update to PostgreSQL 8.3.3
diff --git a/.cvsignore b/.cvsignore
index e46e082..c9c6149 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.1.tar.bz2
+postgresql-8.3.3.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3.1-US.pdf
+postgresql-8.3.3-US.pdf
diff --git a/postgresql-prefer-ncurses.patch b/postgresql-prefer-ncurses.patch
deleted file mode 100644
index 04a4efb..0000000
--- a/postgresql-prefer-ncurses.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch hacks the Postgres configure script to prefer libncurses over
-libtermcap. This is needed in the current Fedora environment because while
-both are available, libtermcap is deprecated and will be removed in the
-fairly near future. Because the need for this is short-term, I'm not
-going to try to push it upstream; this patch can go away once libtermcap
-is no longer present in the standard build environment.
-
-
-diff -Naur postgresql-8.2.1.orig/config/programs.m4 postgresql-8.2.1/config/programs.m4
---- postgresql-8.2.1.orig/config/programs.m4 2006-05-23 15:28:45.000000000 -0400
-+++ postgresql-8.2.1/config/programs.m4 2007-01-10 18:42:22.000000000 -0500
-@@ -88,7 +88,7 @@
- fi
- for pgac_rllib in $READLINE_ORDER ; do
- AC_MSG_CHECKING([for ${pgac_rllib}])
-- for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+ for pgac_lib in "" " -lncurses" " -ltermcap" " -lcurses" ; do
- LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
- AC_TRY_LINK_FUNC([readline], [[
- # Older NetBSD, OpenBSD, and Irix have a broken linker that does not
diff --git a/postgresql-xslt.patch b/postgresql-xslt.patch
deleted file mode 100644
index 1e2405b..0000000
--- a/postgresql-xslt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This patch is needed to build successfully on PPC, where the linker is
-evidently pickier about functions vs variables than on other Fedora
-platforms. Note it is already committed upstream, so we won't need it
-in postgres 8.3.2 and later.
-
-
-Index: configure.in
-===================================================================
-RCS file: /cvsroot/pgsql/configure.in,v
-retrieving revision 1.546.2.3
-diff -c -r1.546.2.3 configure.in
-*** configure.in 14 Mar 2008 03:23:22 -0000 1.546.2.3
---- configure.in 28 Apr 2008 22:41:54 -0000
-***************
-*** 795,801 ****
- fi
-
- if test "$with_libxslt" = yes ; then
-! AC_CHECK_LIB(xslt, xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
- fi
-
- # for contrib/uuid-ossp
---- 795,801 ----
- fi
-
- if test "$with_libxslt" = yes ; then
-! AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
- fi
-
- # for contrib/uuid-ossp
diff --git a/postgresql.spec b/postgresql.spec
index 7fc18e9..5e6a827 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,8 +82,8 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3.1
-Release: 5%{?dist}
+Version: 8.3.3
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -97,7 +97,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.1-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.3-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -108,8 +108,6 @@ Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
-Patch8: postgresql-prefer-ncurses.patch
-Patch9: postgresql-xslt.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -358,8 +356,6 @@ system, including regression tests and benchmarks.
%patch4 -p1
# patch5 is applied later
%patch6 -p1
-%patch8 -p1
-%patch9 -p0
#call autoconf 2.53 or greater
%aconfver
@@ -855,6 +851,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jun 11 2008 Tom Lane <tgl(a)redhat.com> 8.3.3-1
+- Update to PostgreSQL 8.3.3.
+- Remove postgresql-prefer-ncurses.patch, no longer needed in recent
+ Fedora releases because libtermcap is gone.
+
* Sat May 17 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-5
- rebuild because of buildsystem hiccup
diff --git a/sources b/sources
index 6b4d272..4fa4a87 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-a5e0ed6a85b450dc217ec71da93243a7 postgresql-8.3.1.tar.bz2
+0ae4bd9620e84d3e08dcf923808d14d0 postgresql-8.3.3.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-5b8a011a414c7af37938cd45a98a0ed0 postgresql-8.3.1-US.pdf
+62043e967e738d93e6f0402ba152f6de postgresql-8.3.3-US.pdf
commit 6e3b5a3bca7ee3e0694a31a3afe809ecaebc8959
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun May 18 03:41:30 2008 +0000
rebuild because of buildsystem hiccup
diff --git a/postgresql.spec b/postgresql.spec
index d363644..7fc18e9 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -855,6 +855,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat May 17 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-5
+- rebuild because of buildsystem hiccup
+
* Sat May 17 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-4
- Enable LDAP support
Resolves: #445315
commit affd6a00b596a6f7148c431443dfcb06af0d846f
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun May 18 02:17:53 2008 +0000
Enable LDAP support. Use -Wl,--as-needed to suppress bogus dependencies.
diff --git a/postgresql.spec b/postgresql.spec
index 75d78b8..d363644 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -68,6 +68,7 @@
%{!?tcl:%define tcl 1}
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
+%{!?ldap:%define ldap 1}
%{!?nls:%define nls 1}
%{!?uuid:%define uuid 1}
%{!?xml:%define xml 1}
@@ -82,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -138,6 +139,10 @@ BuildRequires: krb5-devel
BuildRequires: e2fsprogs-devel
%endif
+%if %ldap
+BuildRequires: openldap-devel
+%endif
+
%if %nls
BuildRequires: gettext >= 0.10.35
%endif
@@ -393,6 +398,10 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+# Use --as-needed to eliminate unnecessary link dependencies.
+# Hopefully upstream will do this for itself in some future release.
+LDFLAGS="-Wl,--as-needed"; export LDFLAGS
+
%configure --disable-rpath \
%if %beta
--enable-debug \
@@ -408,6 +417,9 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
%if %plpython
--with-python \
%endif
+%if %ldap
+ --with-ldap \
+%endif
%if %ssl
--with-openssl \
%endif
@@ -843,6 +855,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat May 17 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-4
+- Enable LDAP support
+Resolves: #445315
+- Use -Wl,--as-needed to suppress bogus dependencies for libraries that
+ are really only needed by some of the subpackages
+
* Mon Apr 28 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-3
- Fix build breakage on PPC due to incorrect configure test
Related: #444317
commit f6af6c0fb92601682b74580e54169a8253705eea
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Apr 28 23:00:55 2008 +0000
Fix build breakage on PPC due to incorrect configure test
diff --git a/postgresql-xslt.patch b/postgresql-xslt.patch
new file mode 100644
index 0000000..1e2405b
--- /dev/null
+++ b/postgresql-xslt.patch
@@ -0,0 +1,30 @@
+This patch is needed to build successfully on PPC, where the linker is
+evidently pickier about functions vs variables than on other Fedora
+platforms. Note it is already committed upstream, so we won't need it
+in postgres 8.3.2 and later.
+
+
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/pgsql/configure.in,v
+retrieving revision 1.546.2.3
+diff -c -r1.546.2.3 configure.in
+*** configure.in 14 Mar 2008 03:23:22 -0000 1.546.2.3
+--- configure.in 28 Apr 2008 22:41:54 -0000
+***************
+*** 795,801 ****
+ fi
+
+ if test "$with_libxslt" = yes ; then
+! AC_CHECK_LIB(xslt, xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
+ fi
+
+ # for contrib/uuid-ossp
+--- 795,801 ----
+ fi
+
+ if test "$with_libxslt" = yes ; then
+! AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
+ fi
+
+ # for contrib/uuid-ossp
diff --git a/postgresql.spec b/postgresql.spec
index 6bb8a8b..75d78b8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -108,6 +108,7 @@ Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
Patch8: postgresql-prefer-ncurses.patch
+Patch9: postgresql-xslt.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -353,6 +354,7 @@ system, including regression tests and benchmarks.
# patch5 is applied later
%patch6 -p1
%patch8 -p1
+%patch9 -p0
#call autoconf 2.53 or greater
%aconfver
@@ -841,6 +843,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Apr 28 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-3
+- Fix build breakage on PPC due to incorrect configure test
+Related: #444317
+
* Sat Apr 26 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-2
- Clean up cross-subpackage Requires: to ensure that updating any one
subpackage brings in the matching versions of others.
commit 3a834ad97f4f99294383c4208ff9df18acb5ef96
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun Apr 27 00:54:00 2008 +0000
Clean up cross-subpackage Requires: per #444271
diff --git a/postgresql.spec b/postgresql.spec
index a07c373..6bb8a8b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -153,6 +153,9 @@ BuildRequires: libxml2-devel libxslt-devel
BuildRequires: pam-devel
%endif
+# main package requires -libs subpackage
+Requires: postgresql-libs = %{version}-%{release}
+
Obsoletes: postgresql-clients
Obsoletes: postgresql-perl
Obsoletes: postgresql-tk
@@ -194,7 +197,7 @@ PostgreSQL server.
Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
-Prereq: postgresql = %{version}-%{release} libpq.so
+Requires: postgresql = %{version}-%{release}
Obsoletes: rh-postgresql-server
%description server
@@ -212,7 +215,7 @@ to install the postgresql package.
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
-Prereq: postgresql = %{version}-%{release}
+Requires: postgresql = %{version}-%{release}
Obsoletes: rh-postgresql-docs
%description docs
@@ -224,7 +227,7 @@ the FAQ, and source files for the PostgreSQL tutorial.
%package contrib
Summary: Contributed source and binaries distributed with PostgreSQL
Group: Applications/Databases
-Prereq: postgresql = %{version}-%{release}
+Requires: postgresql = %{version}-%{release}
Obsoletes: rh-postgresql-contrib
%description contrib
@@ -235,8 +238,7 @@ included in the PostgreSQL distribution.
%package devel
Summary: PostgreSQL development header files and libraries
Group: Development/Libraries
-Prereq: postgresql = %{version}-%{release}
-Requires: postgresql-libs = %{version}-%{release}
+Requires: postgresql = %{version}-%{release}
Obsoletes: rh-postgresql-devel
%description devel
@@ -251,8 +253,7 @@ develop applications which will interact with a PostgreSQL server.
%package plperl
Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases
-PreReq: postgresql = %{version}-%{release}
-PreReq: postgresql-server = %{version}-%{release}
+Requires: postgresql-server = %{version}-%{release}
Obsoletes: rh-postgresql-pl
Obsoletes: postgresql-pl
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -268,8 +269,7 @@ procedural language for the backend.
%package plpython
Summary: The Python procedural language for PostgreSQL
Group: Applications/Databases
-PreReq: postgresql = %{version}-%{release}
-PreReq: postgresql-server = %{version}-%{release}
+Requires: postgresql-server = %{version}-%{release}
Obsoletes: rh-postgresql-pl
Obsoletes: postgresql-pl
@@ -284,8 +284,7 @@ procedural language for the backend.
%package pltcl
Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
-PreReq: postgresql = %{version}-%{release}
-PreReq: postgresql-server = %{version}-%{release}
+Requires: postgresql-server = %{version}-%{release}
Obsoletes: rh-postgresql-pl
Obsoletes: postgresql-pl
@@ -300,6 +299,7 @@ procedural language for the backend.
%package tcl
Summary: A Tcl client library for PostgreSQL
Group: Applications/Databases
+# this is intentionally not a version-specific Requires:
Requires: libpq.so
Requires: tcl >= 8.3
Obsoletes: rh-postgresql-tcl
@@ -315,6 +315,7 @@ and its documentation.
%package python
Summary: Development module for Python code to access a PostgreSQL DB
Group: Applications/Databases
+# this is intentionally not a version-specific Requires:
Requires: libpq.so
Requires: python mx
Obsoletes: rh-postgresql-python
@@ -331,8 +332,7 @@ database.
%package test
Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases
-PreReq: postgresql = %{version}-%{release}
-PreReq: postgresql-server = %{version}-%{release}
+Requires: postgresql-server = %{version}-%{release}
Obsoletes: rh-postgresql-test
%description test
@@ -841,6 +841,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Apr 26 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-2
+- Clean up cross-subpackage Requires: to ensure that updating any one
+ subpackage brings in the matching versions of others.
+Resolves: #444271
+
* Tue Mar 25 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-1
- Update to PostgreSQL 8.3.1.
commit d81bd839fe75f8976d71f627c60e2e6ba264e825
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Mar 26 03:48:22 2008 +0000
Update to PostgreSQL 8.3.1
diff --git a/.cvsignore b/.cvsignore
index 6882d7a..e46e082 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.0.tar.bz2
+postgresql-8.3.1.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3.0-US.pdf
+postgresql-8.3.1-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 22f5930..a07c373 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,8 +81,8 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3.0
-Release: 3%{?dist}
+Version: 8.3.1
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -96,7 +96,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.0-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.1-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -841,6 +841,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Mar 25 2008 Tom Lane <tgl(a)redhat.com> 8.3.1-1
+- Update to PostgreSQL 8.3.1.
+
* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 8.3.0-3
- add Requires for versioned perl (libperl.so)
diff --git a/sources b/sources
index 05b8bb2..6b4d272 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-53d6816eac7442f9bc8103439ebee22e postgresql-8.3.0.tar.bz2
+a5e0ed6a85b450dc217ec71da93243a7 postgresql-8.3.1.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-3d41dd6ccf89b6948b0a914237a5de3e postgresql-8.3.0-US.pdf
+5b8a011a414c7af37938cd45a98a0ed0 postgresql-8.3.1-US.pdf
commit 853387736c919f82b68348e5ca0b740f5bc6a1a8
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 18 18:53:20 2008 +0000
add Requires for versioned perl (libperl.so)
diff --git a/postgresql.spec b/postgresql.spec
index f57aed1..22f5930 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -110,7 +110,9 @@ Patch6: postgresql-perl-rpath.patch
Patch8: postgresql-prefer-ncurses.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
-Prereq: /sbin/ldconfig initscripts
+BuildRequires: perl(ExtUtils::Embed), perl-devel
+# for /sbin/ldconfig
+Prereq: glibc initscripts
%if %python || %plpython
BuildRequires: python-devel
@@ -253,6 +255,7 @@ PreReq: postgresql = %{version}-%{release}
PreReq: postgresql-server = %{version}-%{release}
Obsoletes: rh-postgresql-pl
Obsoletes: postgresql-pl
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description plperl
PostgreSQL is an advanced Object-Relational database management
@@ -838,6 +841,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 8.3.0-3
+- add Requires for versioned perl (libperl.so)
+
* Wed Feb 6 2008 Tom Lane <tgl(a)redhat.com> 8.3.0-2
- Enable the new GSSAPI support in 8.3.0.
commit 1f28b3c18cd91756f6002a6b0d63e1d6500f680d
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Feb 6 05:57:49 2008 +0000
Enable the new GSSAPI support in 8.3.0 (forgotten in the original update)
diff --git a/postgresql.spec b/postgresql.spec
index c8ed4b6..f57aed1 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -411,6 +411,7 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
%endif
%if %kerberos
--with-krb5 \
+ --with-gssapi \
%endif
%if %uuid
--with-ossp-uuid \
@@ -837,6 +838,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Feb 6 2008 Tom Lane <tgl(a)redhat.com> 8.3.0-2
+- Enable the new GSSAPI support in 8.3.0.
+
* Mon Feb 4 2008 Tom Lane <tgl(a)redhat.com> 8.3.0-1
- Update to PostgreSQL 8.3.0.
commit e6b898c56d5d8aaa5fb369898e6e8cff58a284c0
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Feb 5 03:49:51 2008 +0000
Update to PostgreSQL 8.3.0
diff --git a/.cvsignore b/.cvsignore
index 3b37c3c..6882d7a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3RC2.tar.bz2
+postgresql-8.3.0.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.3RC2-US.pdf
+postgresql-8.3.0-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 9d9bf9e..c8ed4b6 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.3RC2
+Version: 8.3.0
Release: 1%{?dist}
License: BSD
Group: Applications/Databases
@@ -96,7 +96,7 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3RC2-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.0-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -837,6 +837,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Feb 4 2008 Tom Lane <tgl(a)redhat.com> 8.3.0-1
+- Update to PostgreSQL 8.3.0.
+
* Fri Jan 18 2008 Tom Lane <tgl(a)redhat.com> 8.3RC2-1
- Update to PostgreSQL 8.3RC2 (not waiting for 8.3.0 because Fedora 9 alpha
should be 8.3-based not 8.2-based).
diff --git a/sources b/sources
index 6f734a3..05b8bb2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-7af035db3d8bdd9248f55e5aa8679836 postgresql-8.3RC2.tar.bz2
+53d6816eac7442f9bc8103439ebee22e postgresql-8.3.0.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-1d5acd907fded37ebcc80e267319d847 postgresql-8.3RC2-US.pdf
+3d41dd6ccf89b6948b0a914237a5de3e postgresql-8.3.0-US.pdf
commit 8bf3ae46afb32ec2ef8bdd3bb2b5ae34000ce0f8
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Fri Jan 18 20:48:56 2008 +0000
Update to PostgreSQL 8.3RC2 and pgtcl 1.6.2.
diff --git a/.cvsignore b/.cvsignore
index 530812c..3b37c3c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.2.6.tar.bz2
+postgresql-8.3RC2.tar.bz2
PyGreSQL-3.8.1.tgz
-pgtcl1.6.0.tar.gz
+pgtcl1.6.2.tar.gz
pgtcldocs-20070115.zip
-postgresql-8.2.1-US.pdf
+postgresql-8.3RC2-US.pdf
diff --git a/Makefile.regress b/Makefile.regress
index df28c64..c722d29 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -3,24 +3,40 @@
# in an RPM installation
#
-# database encoding
-MULTIBYTE := SQL_ASCII
+# default encoding
+MULTIBYTE = SQL_ASCII
# maximum simultaneous connections for parallel tests
-MAXCONNOPT :=
+MAXCONNOPT =
ifdef MAX_CONNECTIONS
MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS)
endif
+# locale
+NOLOCALE =
+ifdef NO_LOCALE
+NOLOCALE += --no-locale
+endif
+
srcdir := .
+# Test input and expected files. These are created by pg_regress itself, so we
+# don't have a rule to create them. We do need rules to clean them however.
+ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source)))
+input_files := $(foreach file, $(ifile_list), sql/$(file).sql)
+ofile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/output/*.source)))
+output_files := $(foreach file, $(ofile_list), expected/$(file).out)
+
+abs_srcdir := $(shell pwd)
+abs_builddir := $(shell pwd)
+
check: installcheck-parallel
installcheck: cleandirs
- ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
+ ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
installcheck-parallel: cleandirs
- ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
+ ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
# The tests command the server to write into testtablespace and results.
# On a SELinux-enabled system this will fail unless we mark those directories
@@ -37,10 +53,10 @@ runtest: installcheck
runtest-parallel: installcheck-parallel
bigtest: cleandirs
- ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
+ ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
bigcheck: cleandirs
- ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
+ ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
##
@@ -48,6 +64,7 @@ bigcheck: cleandirs
##
clean distclean maintainer-clean:
+ rm -f $(output_files) $(input_files)
rm -rf testtablespace
rm -rf results tmp_check log
rm -f regression.diffs regression.out regress.out run_check.out
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 2533e04..decc317 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,17 +4,17 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
Dike out the check.
-diff -Naur postgresql-8.2.6.orig/configure.in postgresql-8.2.6/configure.in
---- postgresql-8.2.6.orig/configure.in 2008-01-03 16:40:50.000000000 -0500
-+++ postgresql-8.2.6/configure.in 2008-01-04 11:25:42.000000000 -0500
+diff -Naur postgresql-8.3RC2.orig/configure.in postgresql-8.3RC2/configure.in
+--- postgresql-8.3RC2.orig/configure.in 2008-01-17 23:47:32.000000000 -0500
++++ postgresql-8.3RC2/configure.in 2008-01-18 11:39:58.000000000 -0500
@@ -19,10 +19,6 @@
- AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs(a)postgresql.org])
+ AC_INIT([PostgreSQL], [8.3RC2], [pgsql-bugs(a)postgresql.org])
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
-Untested combinations of 'autoconf' and PostgreSQL versions are not
-recommended. You can remove the check from 'configure.in' but it is then
-your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2006, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config)
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
index 6c68c65..2fa8ed3 100644
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@@ -1,37 +1,37 @@
-diff -Naur postgresql-8.2.0.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.2.0/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-8.2.0.orig/src/backend/utils/misc/postgresql.conf.sample 2006-11-20 20:23:37.000000000 -0500
-+++ postgresql-8.2.0/src/backend/utils/misc/postgresql.conf.sample 2006-12-04 19:54:58.000000000 -0500
-@@ -226,16 +226,16 @@
- # depending on platform.
+diff -Naur postgresql-8.3RC2.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.3RC2/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-8.3RC2.orig/src/backend/utils/misc/postgresql.conf.sample 2008-01-09 21:50:01.000000000 -0500
++++ postgresql-8.3RC2/src/backend/utils/misc/postgresql.conf.sample 2008-01-18 11:44:08.000000000 -0500
+@@ -237,17 +237,17 @@
+ # requires logging_collector to be on.
# This is used when logging to stderr:
--#redirect_stderr = off # Enable capturing of stderr into log
-+redirect_stderr = on # Enable capturing of stderr into log
- # files
+-#logging_collector = off # Enable capturing of stderr and csvlog
++logging_collector = on # Enable capturing of stderr and csvlog
+ # into log files. Required to be on for
+ # csvlogs.
# (change requires restart)
- # These are only used if redirect_stderr is on:
--#log_directory = 'pg_log' # Directory where log files are written
-+log_directory = 'pg_log' # Directory where log files are written
- # Can be absolute or relative to PGDATA
--#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # Log file name pattern.
-+log_filename = 'postgresql-%a.log' # Log file name pattern.
- # Can include strftime() escapes
--#log_truncate_on_rotation = off # If on, any existing log file of the same
-+log_truncate_on_rotation = on # If on, any existing log file of the same
- # name as the new log file will be
- # truncated rather than appended to. But
- # such truncation only occurs on
-@@ -243,10 +243,10 @@
- # or size-driven rotation. Default is
+ # These are only used if logging_collector is on:
+-#log_directory = 'pg_log' # directory where log files are written,
++log_directory = 'pg_log' # directory where log files are written,
+ # can be absolute or relative to PGDATA
+-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern,
++log_filename = 'postgresql-%a.log' # log file name pattern,
+ # can include strftime() escapes
+-#log_truncate_on_rotation = off # If on, an existing log file of the
++log_truncate_on_rotation = on # If on, an existing log file of the
+ # same name as the new log file will be
+ # truncated rather than appended to.
+ # But such truncation only occurs on
+@@ -255,9 +255,9 @@
+ # or size-driven rotation. Default is
# off, meaning append to existing files
# in all cases.
--#log_rotation_age = 1d # Automatic rotation of logfiles will
-+log_rotation_age = 1d # Automatic rotation of logfiles will
- # happen after that time. 0 to
- # disable.
+-#log_rotation_age = 1d # Automatic rotation of logfiles will
++log_rotation_age = 1d # Automatic rotation of logfiles will
+ # happen after that time. 0 to disable.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+log_rotation_size = 0 # Automatic rotation of logfiles will
- # happen after that much log
- # output. 0 to disable.
+ # happen after that much log output.
+ # 0 to disable.
diff --git a/postgresql-test.patch b/postgresql-test.patch
index dead4c5..5b1d6f4 100644
--- a/postgresql-test.patch
+++ b/postgresql-test.patch
@@ -1,73 +1,53 @@
-diff -Naur postgresql-8.2.0.orig/src/test/regress/GNUmakefile postgresql-8.2.0/src/test/regress/GNUmakefile
---- postgresql-8.2.0.orig/src/test/regress/GNUmakefile 2006-07-20 20:24:04.000000000 -0400
-+++ postgresql-8.2.0/src/test/regress/GNUmakefile 2006-12-04 19:56:54.000000000 -0500
-@@ -102,12 +102,23 @@
- testtablespace := $(abs_builddir)/testtablespace
-
-
-+ifdef RPMTESTING
-+define sed-command
-+sed -e 's,@abs_srcdir@,$(libdir)/pgsql/test/regress,g' \
-+ -e 's,@abs_builddir@,$(libdir)/pgsql/test/regress,g' \
-+ -e 's,@abs_spidir@,$(libdir)/pgsql/test/regress,g' \
-+ -e 's,@testtablespace@,$(libdir)/pgsql/test/regress/testtablespace,g' \
-+ -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@
-+endef
-+else
- define sed-command
- sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \
- -e 's,@abs_builddir@,$(abs_builddir),g' \
-+ -e 's,@abs_spidir@,$(abs_builddir)/../../../contrib/spi,g' \
- -e 's,@testtablespace@,$(testtablespace),g' \
- -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@
- endef
-+endif
-
- $(input_files): sql/%.sql: input/%.source
- $(sed-command)
-diff -Naur postgresql-8.2.0.orig/src/test/regress/input/create_function_1.source postgresql-8.2.0/src/test/regress/input/create_function_1.source
---- postgresql-8.2.0.orig/src/test/regress/input/create_function_1.source 2006-02-27 11:09:50.000000000 -0500
-+++ postgresql-8.2.0/src/test/regress/input/create_function_1.source 2006-12-04 19:58:24.000000000 -0500
+In the postgresql-test RPM, the contrib .so's that are used by the tests
+are installed right in the directory where the tests are run. We must
+adjust the CREATE FUNCTION commands accordingly. Note that this also
+means that the specfile has to copy the .so's into the test directory
+while doing the in-build-tree regression tests.
+
+
+diff -Naur postgresql-8.3RC2.orig/src/test/regress/input/create_function_1.source postgresql-8.3RC2/src/test/regress/input/create_function_1.source
+--- postgresql-8.3RC2.orig/src/test/regress/input/create_function_1.source 2006-02-27 11:09:50.000000000 -0500
++++ postgresql-8.3RC2/src/test/regress/input/create_function_1.source 2008-01-18 13:38:51.000000000 -0500
@@ -24,17 +24,17 @@
CREATE FUNCTION check_primary_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_spidir@/refint@DLSUFFIX@'
++ AS '@abs_builddir@/refint@DLSUFFIX@'
LANGUAGE C;
CREATE FUNCTION check_foreign_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_spidir@/refint@DLSUFFIX@'
++ AS '@abs_builddir@/refint@DLSUFFIX@'
LANGUAGE C;
CREATE FUNCTION autoinc ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
-+ AS '@abs_spidir@/autoinc@DLSUFFIX@'
++ AS '@abs_builddir@/autoinc@DLSUFFIX@'
LANGUAGE C;
CREATE FUNCTION funny_dup17 ()
-diff -Naur postgresql-8.2.0.orig/src/test/regress/output/create_function_1.source postgresql-8.2.0/src/test/regress/output/create_function_1.source
---- postgresql-8.2.0.orig/src/test/regress/output/create_function_1.source 2006-03-14 17:48:25.000000000 -0500
-+++ postgresql-8.2.0/src/test/regress/output/create_function_1.source 2006-12-04 19:58:54.000000000 -0500
+diff -Naur postgresql-8.3RC2.orig/src/test/regress/output/create_function_1.source postgresql-8.3RC2/src/test/regress/output/create_function_1.source
+--- postgresql-8.3RC2.orig/src/test/regress/output/create_function_1.source 2007-06-18 17:40:58.000000000 -0400
++++ postgresql-8.3RC2/src/test/regress/output/create_function_1.source 2008-01-18 13:38:51.000000000 -0500
@@ -25,15 +25,15 @@
NOTICE: argument type city_budget is only a shell
CREATE FUNCTION check_primary_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_spidir@/refint@DLSUFFIX@'
++ AS '@abs_builddir@/refint@DLSUFFIX@'
LANGUAGE C;
CREATE FUNCTION check_foreign_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
-+ AS '@abs_spidir@/refint@DLSUFFIX@'
++ AS '@abs_builddir@/refint@DLSUFFIX@'
LANGUAGE C;
CREATE FUNCTION autoinc ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
-+ AS '@abs_spidir@/autoinc@DLSUFFIX@'
++ AS '@abs_builddir@/autoinc@DLSUFFIX@'
LANGUAGE C;
CREATE FUNCTION funny_dup17 ()
RETURNS trigger
diff --git a/postgresql-use-zoneinfo.patch b/postgresql-use-zoneinfo.patch
deleted file mode 100644
index 01b1d2b..0000000
--- a/postgresql-use-zoneinfo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-PostgreSQL includes its own copy of the zic timezone database, which is great
-for ensuring portable results but not so great from a package maintenance
-perspective. Since the data is in the same format as is provided by the
-Linux-standard /usr/share/zoneinfo files, we can avoid having to update
-postgresql for timezone updates by just using those files instead.
-
-Note: as of PG 8.3 this patch will be unnecessary; use configure's
---with-system-tzdata switch instead.
-
-
-diff -Naur postgresql-8.2.4.orig/src/timezone/Makefile postgresql-8.2.4/src/timezone/Makefile
---- postgresql-8.2.4.orig/src/timezone/Makefile 2007-03-14 13:38:15.000000000 -0400
-+++ postgresql-8.2.4/src/timezone/Makefile 2007-08-25 16:38:53.000000000 -0400
-@@ -38,14 +38,12 @@
- $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
-
- install: all installdirs
-- ./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
- $(MAKE) -C tznames $@
-
- installdirs:
- $(mkinstalldirs) '$(DESTDIR)$(datadir)'
-
- uninstall:
-- rm -rf '$(DESTDIR)$(datadir)/timezone'
- $(MAKE) -C tznames $@
-
- clean distclean maintainer-clean:
-diff -Naur postgresql-8.2.4.orig/src/timezone/pgtz.c postgresql-8.2.4/src/timezone/pgtz.c
---- postgresql-8.2.4.orig/src/timezone/pgtz.c 2006-11-21 18:11:55.000000000 -0500
-+++ postgresql-8.2.4/src/timezone/pgtz.c 2007-08-25 16:42:32.000000000 -0400
-@@ -31,9 +31,6 @@
- pg_tz *global_timezone = NULL;
-
-
--static char tzdir[MAXPGPATH];
--static bool done_tzdir = false;
--
- static bool scan_directory_ci(const char *dirname,
- const char *fname, int fnamelen,
- char *canonname, int canonnamelen);
-@@ -45,17 +42,10 @@
- /*
- * Return full pathname of timezone data directory
- */
--static char *
-+static const char *
- pg_TZDIR(void)
- {
-- if (done_tzdir)
-- return tzdir;
--
-- get_share_path(my_exec_path, tzdir);
-- strlcpy(tzdir + strlen(tzdir), "/timezone", MAXPGPATH - strlen(tzdir));
--
-- done_tzdir = true;
-- return tzdir;
-+ return "/usr/share/zoneinfo";
- }
-
-
diff --git a/postgresql.spec b/postgresql.spec
index 09d5c29..9d9bf9e 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -69,6 +69,7 @@
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
+%{!?uuid:%define uuid 1}
%{!?xml:%define xml 1}
%{!?pam:%define pam 1}
%{!?pgfts:%define pgfts 1}
@@ -80,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.2.6
+Version: 8.3RC2
Release: 1%{?dist}
License: BSD
Group: Applications/Databases
@@ -95,9 +96,9 @@ Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3RC2-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
Patch1: rpm-pgsql.patch
@@ -107,7 +108,6 @@ Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
Patch8: postgresql-prefer-ncurses.patch
-Patch9: postgresql-use-zoneinfo.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
Prereq: /sbin/ldconfig initscripts
@@ -139,6 +139,10 @@ BuildRequires: e2fsprogs-devel
BuildRequires: gettext >= 0.10.35
%endif
+%if %uuid
+BuildRequires: uuid-devel
+%endif
+
%if %xml
BuildRequires: libxml2-devel libxslt-devel
%endif
@@ -346,7 +350,6 @@ system, including regression tests and benchmarks.
# patch5 is applied later
%patch6 -p1
%patch8 -p1
-%patch9 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -409,21 +412,26 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
%if %kerberos
--with-krb5 \
%endif
+%if %uuid
+ --with-ossp-uuid \
+%endif
+%if %xml
+ --with-libxml \
+ --with-libxslt \
+%endif
%if %nls
--enable-nls \
%endif
%if %pgfts
--enable-thread-safety \
%endif
+ --with-system-tzdata=/usr/share/zoneinfo \
--sysconfdir=/etc/sysconfig/pgsql \
--datadir=/usr/share/pgsql \
--with-docdir=%{_docdir}
make %{?_smp_mflags} all
make %{?_smp_mflags} -C contrib all
-%if %xml
-make %{?_smp_mflags} -C contrib/xml2 all
-%endif
# Have to hack makefile to put correct path into tutorial scripts
sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/tutorial/GNUmakefile
@@ -433,14 +441,17 @@ rm -f src/tutorial/GNUmakefile
%if %runselftest
pushd src/test/regress
make all
+ cp ../../../contrib/spi/refint.so .
+ cp ../../../contrib/spi/autoinc.so .
make MAX_CONNECTIONS=5 check
make clean
+ rm refint.so autoinc.so
popd
%endif
%if %test
pushd src/test/regress
- make RPMTESTING=1 all
+ make all
popd
%endif
@@ -475,9 +486,6 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make -C contrib DESTDIR=$RPM_BUILD_ROOT install
-%if %xml
-make -C contrib/xml2 DESTDIR=$RPM_BUILD_ROOT install
-%endif
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
@@ -679,6 +687,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/chkpass.so
%{_libdir}/pgsql/cube.so
%{_libdir}/pgsql/dblink.so
+%{_libdir}/pgsql/dict_int.so
+%{_libdir}/pgsql/dict_xsyn.so
%{_libdir}/pgsql/earthdistance.so
%{_libdir}/pgsql/fuzzystrmatch.so
%{_libdir}/pgsql/hstore.so
@@ -688,6 +698,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
%{_libdir}/pgsql/moddatetime.so
+%{_libdir}/pgsql/pageinspect.so
%{_libdir}/pgsql/pg_buffercache.so
%{_libdir}/pgsql/pg_freespacemap.so
%{_libdir}/pgsql/pg_trgm.so
@@ -698,13 +709,18 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/seg.so
%{_libdir}/pgsql/sslinfo.so
%{_libdir}/pgsql/tablefunc.so
+%{_libdir}/pgsql/test_parser.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
+%if %uuid
+%{_libdir}/pgsql/uuid-ossp.so
+%endif
%if %xml
%{_libdir}/pgsql/pgxml.so
%endif
%{_datadir}/pgsql/contrib/
%{_bindir}/oid2name
+%{_bindir}/pg_standby
%{_bindir}/pgbench
%{_bindir}/vacuumlo
%doc contrib/*/README.* contrib/spi/*.example
@@ -743,6 +759,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/system_views.sql
%{_datadir}/pgsql/*.sample
%{_datadir}/pgsql/timezonesets/
+%{_datadir}/pgsql/tsearch_data/
+%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql
@@ -752,6 +770,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/*_and_*.so
%{_datadir}/pgsql/conversion_create.sql
%{_datadir}/pgsql/information_schema.sql
+%{_datadir}/pgsql/snowball_create.sql
%{_datadir}/pgsql/sql_features.txt
%files devel -f pg_config.lst
@@ -818,6 +837,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Jan 18 2008 Tom Lane <tgl(a)redhat.com> 8.3RC2-1
+- Update to PostgreSQL 8.3RC2 (not waiting for 8.3.0 because Fedora 9 alpha
+ should be 8.3-based not 8.2-based).
+- Update to pgtcl 1.6.2
+
* Mon Jan 7 2008 Tom Lane <tgl(a)redhat.com> 8.2.6-1
- Update to PostgreSQL 8.2.6 to fix CVE-2007-4769, CVE-2007-4772,
CVE-2007-6067, CVE-2007-6600, CVE-2007-6601
diff --git a/sources b/sources
index 97c8686..6f734a3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2
+7af035db3d8bdd9248f55e5aa8679836 postgresql-8.3RC2.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
-25eda4bb40fb3d4ec9b205a1fdc1bbbc pgtcl1.6.0.tar.gz
+abf26e3cd7f8229f468045ed1fb7e748 pgtcl1.6.2.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
-0c25dc2055e2fa9ff9d05afc9252e1f2 postgresql-8.2.1-US.pdf
+1d5acd907fded37ebcc80e267319d847 postgresql-8.3RC2-US.pdf
commit 8d5bd11f6b98274c21bf5a194cde080b742e3481
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Jan 7 19:28:34 2008 +0000
Make initscript and pam config files be installed unconditionally
diff --git a/postgresql.spec b/postgresql.spec
index 724f530..09d5c29 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -503,19 +503,13 @@ cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp Pgtcl/libpgtcl*.so $RPM_BUILD_ROOT%{_libdir}/Pgtcl
%endif
-if [ -d /etc/rc.d/init.d ]
-then
- install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
- sed 's/^PGVERSION=.*$/PGVERSION=%{version}/' <%{SOURCE3} >postgresql.init
- install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
-fi
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+sed 's/^PGVERSION=.*$/PGVERSION=%{version}/' <%{SOURCE3} >postgresql.init
+install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
%if %pam
-if [ -d /etc/pam.d ]
-then
- install -d $RPM_BUILD_ROOT/etc/pam.d
- install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
-fi
+install -d $RPM_BUILD_ROOT/etc/pam.d
+install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
%endif
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
@@ -827,6 +821,8 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 7 2008 Tom Lane <tgl(a)redhat.com> 8.2.6-1
- Update to PostgreSQL 8.2.6 to fix CVE-2007-4769, CVE-2007-4772,
CVE-2007-6067, CVE-2007-6600, CVE-2007-6601
+- Make initscript and pam config files be installed unconditionally;
+ seems new buildroots don't necessarily have those directories in place
* Wed Dec 5 2007 Tom Lane <tgl(a)redhat.com> 8.2.5-2
- Rebuild for new openssl
commit 6bcab53b120eebe369d4b6fc77eaeb1cff0bd8b4
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Jan 7 19:01:59 2008 +0000
Update to PostgreSQL 8.2.6 to fix CVE-2007-6600 and others
diff --git a/.cvsignore b/.cvsignore
index d4d00b1..530812c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.2.5.tar.bz2
+postgresql-8.2.6.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.6.0.tar.gz
pgtcldocs-20070115.zip
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
new file mode 100644
index 0000000..2533e04
--- /dev/null
+++ b/postgresql-ac-version.patch
@@ -0,0 +1,20 @@
+Upstream has a policy of only supporting one autoconf version with any
+given PostgreSQL version; which is good for ensuring repeatable results
+for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
+Dike out the check.
+
+
+diff -Naur postgresql-8.2.6.orig/configure.in postgresql-8.2.6/configure.in
+--- postgresql-8.2.6.orig/configure.in 2008-01-03 16:40:50.000000000 -0500
++++ postgresql-8.2.6/configure.in 2008-01-04 11:25:42.000000000 -0500
+@@ -19,10 +19,6 @@
+
+ AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs(a)postgresql.org])
+
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended. You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2006, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
diff --git a/postgresql.spec b/postgresql.spec
index 73918f0..724f530 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -80,8 +80,8 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.2.5
-Release: 2%{?dist}
+Version: 8.2.6
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -101,6 +101,7 @@ Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
Patch1: rpm-pgsql.patch
+Patch2: postgresql-ac-version.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
@@ -339,6 +340,7 @@ system, including regression tests and benchmarks.
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
# patch5 is applied later
@@ -822,6 +824,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jan 7 2008 Tom Lane <tgl(a)redhat.com> 8.2.6-1
+- Update to PostgreSQL 8.2.6 to fix CVE-2007-4769, CVE-2007-4772,
+ CVE-2007-6067, CVE-2007-6600, CVE-2007-6601
+
* Wed Dec 5 2007 Tom Lane <tgl(a)redhat.com> 8.2.5-2
- Rebuild for new openssl
diff --git a/sources b/sources
index 2a6b0b0..97c8686 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-bb1cd309ea72f070cb964736f5755847 postgresql-8.2.5.tar.bz2
+17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
25eda4bb40fb3d4ec9b205a1fdc1bbbc pgtcl1.6.0.tar.gz
8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
commit e5fb010be79af3e395529fa3590f7c1ad08e4055
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Dec 5 14:30:04 2007 +0000
Rebuild for new openssl
diff --git a/postgresql.spec b/postgresql.spec
index a20344f..73918f0 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -822,6 +822,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Dec 5 2007 Tom Lane <tgl(a)redhat.com> 8.2.5-2
+- Rebuild for new openssl
+
* Thu Sep 20 2007 Tom Lane <tgl(a)redhat.com> 8.2.5-1
- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
commit 21fb15a0f7d1a0b0e4eaee469bb1edcabc0a97ff
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Mon Oct 15 19:17:54 2007 +0000
makefile update to properly grab makefile.common
diff --git a/Makefile b/Makefile
index 2f82951..05165a9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,19 @@
NAME := postgresql
SPECFILE = $(firstword $(wildcard *.spec))
-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
commit a7e7a421561e3f12274800909d4d959738bb4adf
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Sep 20 20:18:09 2007 +0000
Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
diff --git a/.cvsignore b/.cvsignore
index 8b4408e..d4d00b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.2.4.tar.bz2
+postgresql-8.2.5.tar.bz2
PyGreSQL-3.8.1.tgz
-pgtcl1.5.3.tar.gz
-pgtcldocs-20060909.zip
+pgtcl1.6.0.tar.gz
+pgtcldocs-20070115.zip
postgresql-8.2.1-US.pdf
diff --git a/README.rpm-dist b/README.rpm-dist
index 2890c71..4924c39 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -218,7 +218,8 @@ results to the screen and store the results in the file regress.out.
If any tests fail, see the file regression.diffs in that directory for details,
and read the "Regression Tests" section of the PostgreSQL documentation to
find out whether the differences are actually significant. If you need help
-interpreting the results, contact the pgsql-ports list at postgresql.org.
+interpreting the results, contact the pgsql-ports list at postgresql.org or
+the pgsqlrpms-general list at pgfoundry.org.
After testing, say "make clean" to remove the files generated by the test
script.
diff --git a/postgresql.spec b/postgresql.spec
index 56b1aa6..a20344f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -80,8 +80,8 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.2.4
-Release: 6%{?dist}
+Version: 8.2.5
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -97,8 +97,8 @@ Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.5.3.tar.gz
-Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20060909.zip
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.0.tar.gz
+Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
Patch1: rpm-pgsql.patch
Patch3: postgresql-logging.patch
@@ -822,6 +822,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Sep 20 2007 Tom Lane <tgl(a)redhat.com> 8.2.5-1
+- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0
+
* Tue Sep 4 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-6
- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
diff --git a/sources b/sources
index 098d37b..2a6b0b0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-af7ec100a33c41bfb8d87b5e0ec2f44a postgresql-8.2.4.tar.bz2
+bb1cd309ea72f070cb964736f5755847 postgresql-8.2.5.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
-43ad97c7dd108fb7a165b4755d8aec32 pgtcl1.5.3.tar.gz
-a71b4aced6b0b068335f8e040e5b9fb6 pgtcldocs-20060909.zip
+25eda4bb40fb3d4ec9b205a1fdc1bbbc pgtcl1.6.0.tar.gz
+8ce98e93b238c3329d0fe43810442c44 pgtcldocs-20070115.zip
0c25dc2055e2fa9ff9d05afc9252e1f2 postgresql-8.2.1-US.pdf
commit 23226f90bbbaef85ecd164129259131addf7a27c
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Sep 4 17:26:37 2007 +0000
Fix multilib problem introduced in 8.2.x: new include file ecpg_config.h is
architecture-dependent.
diff --git a/ecpg_config.h b/ecpg_config.h
new file mode 100644
index 0000000..5b0bdd2
--- /dev/null
+++ b/ecpg_config.h
@@ -0,0 +1,25 @@
+/*
+ * Kluge to support multilib installation of both 32- and 64-bit RPMS:
+ * we need to arrange that header files that appear in both RPMs are
+ * identical. Hence, this file is architecture-independent and calls
+ * in an arch-dependent file that will appear in just one RPM.
+ *
+ * To avoid breaking arches not explicitly supported by Red Hat, we
+ * use this indirection file *only* on known multilib arches.
+ *
+ * Note: this may well fail if user tries to use gcc's -I- option.
+ * But that option is deprecated anyway.
+ */
+#if defined(__x86_64__)
+#include "ecpg_config_x86_64.h"
+#elif defined(__i386__)
+#include "ecpg_config_i386.h"
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#include "ecpg_config_ppc64.h"
+#elif defined(__ppc__) || defined(__powerpc__)
+#include "ecpg_config_ppc.h"
+#elif defined(__s390x__)
+#include "ecpg_config_s390x.h"
+#elif defined(__s390__)
+#include "ecpg_config_s390.h"
+#endif
diff --git a/postgresql.spec b/postgresql.spec
index 21d6460..56b1aa6 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -91,6 +91,7 @@ Source3: postgresql.init
Source4: Makefile.regress
Source5: pg_config.h
Source6: README.rpm-dist
+Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
@@ -484,6 +485,8 @@ case `uname -i` in
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+ mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
+ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
;;
*)
;;
@@ -819,6 +822,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Sep 4 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-6
+- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
+
* Sat Aug 25 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-5
- Use nicer solution for tzdata file substitution: upstream discussion
concluded that hardwiring the path was better than a symlink after all.
commit 05e04c889cdc29d527bf916031d37bf33ef0868e
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Aug 25 20:53:39 2007 +0000
Use nicer solution for tzdata file substitution.
diff --git a/postgresql-use-zoneinfo.patch b/postgresql-use-zoneinfo.patch
index 2fbccc0..01b1d2b 100644
--- a/postgresql-use-zoneinfo.patch
+++ b/postgresql-use-zoneinfo.patch
@@ -2,38 +2,20 @@ PostgreSQL includes its own copy of the zic timezone database, which is great
for ensuring portable results but not so great from a package maintenance
perspective. Since the data is in the same format as is provided by the
Linux-standard /usr/share/zoneinfo files, we can avoid having to update
-postgresql for timezone updates by just symlinking to those files.
+postgresql for timezone updates by just using those files instead.
-It is allegedly desirable for the link in question to be a relative symlink.
-I have strong doubts about this, not least because it requires the horrid
-install-time kluge seen below --- we can't use a simple relative symlink when
-making the temporary installation used for "make check", since that will be at
-an indeterminate location compared to /usr/share. The actual relative link
-also depends fundamentally upon knowing where the PG datadir will get
-installed, namely /usr/share/pgsql.
-
-And if you thought that was bad, it turns out that RPM has some fundamental
-bugs that make it difficult or impossible to replace a directory with a
-symlink during RPM upgrade. Rather than risk getting caught in that quagmire,
-we choose to name the symlink something different than its predecessor
-subdirectory. (This part of the hack could perhaps get undone someday, when
-there is no longer any danger of someone trying to rpm-upgrade from an
-installation that isn't patched this way.)
+Note: as of PG 8.3 this patch will be unnecessary; use configure's
+--with-system-tzdata switch instead.
diff -Naur postgresql-8.2.4.orig/src/timezone/Makefile postgresql-8.2.4/src/timezone/Makefile
--- postgresql-8.2.4.orig/src/timezone/Makefile 2007-03-14 13:38:15.000000000 -0400
-+++ postgresql-8.2.4/src/timezone/Makefile 2007-08-22 16:57:41.000000000 -0400
-@@ -38,14 +38,18 @@
++++ postgresql-8.2.4/src/timezone/Makefile 2007-08-25 16:38:53.000000000 -0400
+@@ -38,14 +38,12 @@
$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
install: all installdirs
- ./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
-+ if [ x'$(DESTDIR)' = x`echo '$(DESTDIR)' | sed 's,tmp_check/install,,'` ] ; then \
-+ ln -s '../zoneinfo' '$(DESTDIR)$(datadir)/zoneinfo' ; \
-+ else \
-+ ln -s '/usr/share/zoneinfo' '$(DESTDIR)$(datadir)/zoneinfo' ; \
-+ fi
$(MAKE) -C tznames $@
installdirs:
@@ -41,19 +23,39 @@ diff -Naur postgresql-8.2.4.orig/src/timezone/Makefile postgresql-8.2.4/src/time
uninstall:
- rm -rf '$(DESTDIR)$(datadir)/timezone'
-+ rm '$(DESTDIR)$(datadir)/zoneinfo'
$(MAKE) -C tznames $@
clean distclean maintainer-clean:
diff -Naur postgresql-8.2.4.orig/src/timezone/pgtz.c postgresql-8.2.4/src/timezone/pgtz.c
--- postgresql-8.2.4.orig/src/timezone/pgtz.c 2006-11-21 18:11:55.000000000 -0500
-+++ postgresql-8.2.4/src/timezone/pgtz.c 2007-08-22 16:57:04.000000000 -0400
-@@ -52,7 +52,7 @@
- return tzdir;
++++ postgresql-8.2.4/src/timezone/pgtz.c 2007-08-25 16:42:32.000000000 -0400
+@@ -31,9 +31,6 @@
+ pg_tz *global_timezone = NULL;
+
- get_share_path(my_exec_path, tzdir);
+-static char tzdir[MAXPGPATH];
+-static bool done_tzdir = false;
+-
+ static bool scan_directory_ci(const char *dirname,
+ const char *fname, int fnamelen,
+ char *canonname, int canonnamelen);
+@@ -45,17 +42,10 @@
+ /*
+ * Return full pathname of timezone data directory
+ */
+-static char *
++static const char *
+ pg_TZDIR(void)
+ {
+- if (done_tzdir)
+- return tzdir;
+-
+- get_share_path(my_exec_path, tzdir);
- strlcpy(tzdir + strlen(tzdir), "/timezone", MAXPGPATH - strlen(tzdir));
-+ strlcpy(tzdir + strlen(tzdir), "/zoneinfo", MAXPGPATH - strlen(tzdir));
+-
+- done_tzdir = true;
+- return tzdir;
++ return "/usr/share/zoneinfo";
+ }
+
- done_tzdir = true;
- return tzdir;
diff --git a/postgresql.spec b/postgresql.spec
index 51670a3..21d6460 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -743,7 +743,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/postgres.shdescription
%{_datadir}/pgsql/system_views.sql
%{_datadir}/pgsql/*.sample
-%{_datadir}/pgsql/zoneinfo
%{_datadir}/pgsql/timezonesets/
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
@@ -820,6 +819,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Aug 25 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-5
+- Use nicer solution for tzdata file substitution: upstream discussion
+ concluded that hardwiring the path was better than a symlink after all.
+
* Wed Aug 22 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-4
- Use tzdata package's data files instead of private copy, so that
postgresql-server need not be turned for routine timezone updates
commit 1a0df18342e3731d46b5b2b607c0947dec4ed3ab
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Aug 22 22:11:06 2007 +0000
Seems we need an explicit BuildRequires on gawk now
diff --git a/postgresql.spec b/postgresql.spec
index 98ec2a4..51670a3 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -107,7 +107,7 @@ Patch6: postgresql-perl-rpath.patch
Patch8: postgresql-prefer-ncurses.patch
Patch9: postgresql-use-zoneinfo.patch
-BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
Prereq: /sbin/ldconfig initscripts
%if %python || %plpython
@@ -825,6 +825,7 @@ rm -rf $RPM_BUILD_ROOT
postgresql-server need not be turned for routine timezone updates
- Don't remove postgres user/group during RPM uninstall, per Fedora
packaging guidelines
+- Seems we need an explicit BuildRequires on gawk now
- Rebuild to fix Fedora toolchain issues
* Sun Aug 12 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-3
commit 3ab1d6bb3fe03d618305a236d776f5276be38275
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Aug 22 21:27:31 2007 +0000
Remove postgresql package's local copy of tzdata files, so it won't need to
be turned for routine timezone updates.
diff --git a/postgresql-use-zoneinfo.patch b/postgresql-use-zoneinfo.patch
new file mode 100644
index 0000000..2fbccc0
--- /dev/null
+++ b/postgresql-use-zoneinfo.patch
@@ -0,0 +1,59 @@
+PostgreSQL includes its own copy of the zic timezone database, which is great
+for ensuring portable results but not so great from a package maintenance
+perspective. Since the data is in the same format as is provided by the
+Linux-standard /usr/share/zoneinfo files, we can avoid having to update
+postgresql for timezone updates by just symlinking to those files.
+
+It is allegedly desirable for the link in question to be a relative symlink.
+I have strong doubts about this, not least because it requires the horrid
+install-time kluge seen below --- we can't use a simple relative symlink when
+making the temporary installation used for "make check", since that will be at
+an indeterminate location compared to /usr/share. The actual relative link
+also depends fundamentally upon knowing where the PG datadir will get
+installed, namely /usr/share/pgsql.
+
+And if you thought that was bad, it turns out that RPM has some fundamental
+bugs that make it difficult or impossible to replace a directory with a
+symlink during RPM upgrade. Rather than risk getting caught in that quagmire,
+we choose to name the symlink something different than its predecessor
+subdirectory. (This part of the hack could perhaps get undone someday, when
+there is no longer any danger of someone trying to rpm-upgrade from an
+installation that isn't patched this way.)
+
+
+diff -Naur postgresql-8.2.4.orig/src/timezone/Makefile postgresql-8.2.4/src/timezone/Makefile
+--- postgresql-8.2.4.orig/src/timezone/Makefile 2007-03-14 13:38:15.000000000 -0400
++++ postgresql-8.2.4/src/timezone/Makefile 2007-08-22 16:57:41.000000000 -0400
+@@ -38,14 +38,18 @@
+ $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
+
+ install: all installdirs
+- ./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
++ if [ x'$(DESTDIR)' = x`echo '$(DESTDIR)' | sed 's,tmp_check/install,,'` ] ; then \
++ ln -s '../zoneinfo' '$(DESTDIR)$(datadir)/zoneinfo' ; \
++ else \
++ ln -s '/usr/share/zoneinfo' '$(DESTDIR)$(datadir)/zoneinfo' ; \
++ fi
+ $(MAKE) -C tznames $@
+
+ installdirs:
+ $(mkinstalldirs) '$(DESTDIR)$(datadir)'
+
+ uninstall:
+- rm -rf '$(DESTDIR)$(datadir)/timezone'
++ rm '$(DESTDIR)$(datadir)/zoneinfo'
+ $(MAKE) -C tznames $@
+
+ clean distclean maintainer-clean:
+diff -Naur postgresql-8.2.4.orig/src/timezone/pgtz.c postgresql-8.2.4/src/timezone/pgtz.c
+--- postgresql-8.2.4.orig/src/timezone/pgtz.c 2006-11-21 18:11:55.000000000 -0500
++++ postgresql-8.2.4/src/timezone/pgtz.c 2007-08-22 16:57:04.000000000 -0400
+@@ -52,7 +52,7 @@
+ return tzdir;
+
+ get_share_path(my_exec_path, tzdir);
+- strlcpy(tzdir + strlen(tzdir), "/timezone", MAXPGPATH - strlen(tzdir));
++ strlcpy(tzdir + strlen(tzdir), "/zoneinfo", MAXPGPATH - strlen(tzdir));
+
+ done_tzdir = true;
+ return tzdir;
diff --git a/postgresql.spec b/postgresql.spec
index 4be14a2..98ec2a4 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -105,6 +105,7 @@ Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
Patch8: postgresql-prefer-ncurses.patch
+Patch9: postgresql-use-zoneinfo.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
@@ -342,6 +343,7 @@ system, including regression tests and benchmarks.
# patch5 is applied later
%patch6 -p1
%patch8 -p1
+%patch9 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -602,10 +604,6 @@ fi
if [ $1 -ge 1 ] ; then
/sbin/service postgresql condrestart >/dev/null 2>&1 || :
fi
-if [ $1 = 0 ] ; then
- userdel postgres >/dev/null 2>&1 || :
- groupdel postgres >/dev/null 2>&1 || :
-fi
%if %plperl
%post -p /sbin/ldconfig plperl
@@ -745,7 +743,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/postgres.shdescription
%{_datadir}/pgsql/system_views.sql
%{_datadir}/pgsql/*.sample
-%{_datadir}/pgsql/timezone/
+%{_datadir}/pgsql/zoneinfo
%{_datadir}/pgsql/timezonesets/
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
@@ -822,6 +820,13 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Aug 22 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-4
+- Use tzdata package's data files instead of private copy, so that
+ postgresql-server need not be turned for routine timezone updates
+- Don't remove postgres user/group during RPM uninstall, per Fedora
+ packaging guidelines
+- Rebuild to fix Fedora toolchain issues
+
* Sun Aug 12 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-3
- Recent perl changes in rawhide mean we need a more specific BuildRequires
commit d31a87d61da46ed66776198ceca88490d57e5582
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun Aug 12 21:21:08 2007 +0000
Fix perl BuildRequires
diff --git a/postgresql.spec b/postgresql.spec
index f3d98d7..4be14a2 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -106,7 +106,7 @@ Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
Patch8: postgresql-prefer-ncurses.patch
-BuildRequires: perl glibc-devel bison flex autoconf
+BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
%if %python || %plpython
@@ -822,6 +822,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Aug 12 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-3
+- Recent perl changes in rawhide mean we need a more specific BuildRequires
+
* Wed Jun 20 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-2
- Fix oversight in postgresql-test makefile: pg_regress isn't a shell script
anymore. Per upstream bug 3398.
commit 1fbccd00b7309925318575dbcf2670706940622d
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Jun 20 19:19:24 2007 +0000
Fix breakage in postgresql-test: pg_regress isn't a shell script anymore
diff --git a/Makefile.regress b/Makefile.regress
index 9a09a80..df28c64 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -17,10 +17,10 @@ srcdir := .
check: installcheck-parallel
installcheck: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
+ ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
installcheck-parallel: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
+ ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
# The tests command the server to write into testtablespace and results.
# On a SELinux-enabled system this will fail unless we mark those directories
@@ -37,10 +37,10 @@ runtest: installcheck
runtest-parallel: installcheck-parallel
bigtest: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
+ ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
bigcheck: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
+ ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
##
diff --git a/postgresql.spec b/postgresql.spec
index a01e73e..f3d98d7 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -534,7 +534,7 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
strip *.so
- rm -f GNUmakefile Makefile
+ rm -f GNUmakefile Makefile *.o
popd
cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
@@ -822,6 +822,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jun 20 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-2
+- Fix oversight in postgresql-test makefile: pg_regress isn't a shell script
+ anymore. Per upstream bug 3398.
+
* Tue Apr 24 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-1
- Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs
Resolves: #237682
commit 2ee0978ca26c6b0e6de5089b15ff5d9b36e9bccd
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Apr 24 19:21:40 2007 +0000
Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs Resolves:
#237682
diff --git a/.cvsignore b/.cvsignore
index 3078cc6..8b4408e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.2.3.tar.bz2
+postgresql-8.2.4.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.5.3.tar.gz
pgtcldocs-20060909.zip
diff --git a/postgresql.spec b/postgresql.spec
index 4256310..a01e73e 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -78,10 +78,10 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-Summary: PostgreSQL client programs and libraries.
+Summary: PostgreSQL client programs and libraries
Name: postgresql
-Version: 8.2.3
-Release: 2%{?dist}
+Version: 8.2.4
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -106,42 +106,42 @@ Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
Patch8: postgresql-prefer-ncurses.patch
-Buildrequires: perl glibc-devel bison flex autoconf
+BuildRequires: perl glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
%if %python || %plpython
-BuildPrereq: python-devel
+BuildRequires: python-devel
%endif
%if %tcl || %pltcl
-BuildPrereq: tcl
+BuildRequires: tcl
%if %tcldevel
-Buildrequires: tcl-devel
+BuildRequires: tcl-devel
%endif
%endif
-BuildPrereq: readline-devel
-BuildPrereq: zlib-devel >= 1.0.4
+BuildRequires: readline-devel
+BuildRequires: zlib-devel >= 1.0.4
%if %ssl
-BuildPrereq: openssl-devel
+BuildRequires: openssl-devel
%endif
%if %kerberos
-BuildPrereq: krb5-devel
-BuildPrereq: e2fsprogs-devel
+BuildRequires: krb5-devel
+BuildRequires: e2fsprogs-devel
%endif
%if %nls
-BuildPrereq: gettext >= 0.10.35
+BuildRequires: gettext >= 0.10.35
%endif
%if %xml
-BuildPrereq: libxml2-devel libxslt-devel
+BuildRequires: libxml2-devel libxslt-devel
%endif
%if %pam
-BuildPrereq: pam-devel
+BuildRequires: pam-devel
%endif
Obsoletes: postgresql-clients
@@ -170,7 +170,7 @@ server, you need this package. You also need to install this package
if you're installing the postgresql-server package.
%package libs
-Summary: The shared libraries required for any PostgreSQL clients.
+Summary: The shared libraries required for any PostgreSQL clients
Group: Applications/Databases
Provides: libpq.so
Obsoletes: rh-postgresql-libs
@@ -182,7 +182,7 @@ to use any other PostgreSQL package or any clients that need to connect to a
PostgreSQL server.
%package server
-Summary: The programs needed to create and run a PostgreSQL server.
+Summary: The programs needed to create and run a PostgreSQL server
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
Prereq: postgresql = %{version}-%{release} libpq.so
@@ -224,7 +224,7 @@ included in the PostgreSQL distribution.
%package devel
-Summary: PostgreSQL development header files and libraries.
+Summary: PostgreSQL development header files and libraries
Group: Development/Libraries
Prereq: postgresql = %{version}-%{release}
Requires: postgresql-libs = %{version}-%{release}
@@ -240,7 +240,7 @@ develop applications which will interact with a PostgreSQL server.
#------------
%if %plperl
%package plperl
-Summary: The Perl procedural language for PostgreSQL.
+Summary: The Perl procedural language for PostgreSQL
Group: Applications/Databases
PreReq: postgresql = %{version}-%{release}
PreReq: postgresql-server = %{version}-%{release}
@@ -256,7 +256,7 @@ procedural language for the backend.
#------------
%if %plpython
%package plpython
-Summary: The Python procedural language for PostgreSQL.
+Summary: The Python procedural language for PostgreSQL
Group: Applications/Databases
PreReq: postgresql = %{version}-%{release}
PreReq: postgresql-server = %{version}-%{release}
@@ -272,7 +272,7 @@ procedural language for the backend.
#------------
%if %pltcl
%package pltcl
-Summary: The Tcl procedural language for PostgreSQL.
+Summary: The Tcl procedural language for PostgreSQL
Group: Applications/Databases
PreReq: postgresql = %{version}-%{release}
PreReq: postgresql-server = %{version}-%{release}
@@ -288,7 +288,7 @@ procedural language for the backend.
#------------
%if %tcl
%package tcl
-Summary: A Tcl client library for PostgreSQL.
+Summary: A Tcl client library for PostgreSQL
Group: Applications/Databases
Requires: libpq.so
Requires: tcl >= 8.3
@@ -303,7 +303,7 @@ and its documentation.
#------------
%if %python
%package python
-Summary: Development module for Python code to access a PostgreSQL DB.
+Summary: Development module for Python code to access a PostgreSQL DB
Group: Applications/Databases
Requires: libpq.so
Requires: python mx
@@ -319,7 +319,7 @@ database.
#----------
%if %test
%package test
-Summary: The test suite distributed with PostgreSQL.
+Summary: The test suite distributed with PostgreSQL
Group: Applications/Databases
PreReq: postgresql = %{version}-%{release}
PreReq: postgresql-server = %{version}-%{release}
@@ -822,6 +822,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Apr 24 2007 Tom Lane <tgl(a)redhat.com> 8.2.4-1
+- Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs
+Resolves: #237682
+
* Wed Feb 14 2007 Karsten Hopp <karsten(a)redhat.com> 8.2.3-2
- rebuild with tcl-8.4
diff --git a/sources b/sources
index a975503..098d37b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-cb47771004d53505200ffd00ac45bc32 postgresql-8.2.3.tar.bz2
+af7ec100a33c41bfb8d87b5e0ec2f44a postgresql-8.2.4.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
43ad97c7dd108fb7a165b4755d8aec32 pgtcl1.5.3.tar.gz
a71b4aced6b0b068335f8e040e5b9fb6 pgtcldocs-20060909.zip
commit 32445b61dc087cabd303d3f8dbf3a1c5b4dd7912
Author: Karsten Hopp <karsten(a)fedoraproject.org>
Date: Wed Feb 14 16:45:46 2007 +0000
- rebuild with tcl-8.4
diff --git a/postgresql.spec b/postgresql.spec
index 11ac7cf..4256310 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -822,6 +822,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Feb 14 2007 Karsten Hopp <karsten(a)redhat.com> 8.2.3-2
+- rebuild with tcl-8.4
+
* Wed Feb 7 2007 Tom Lane <tgl(a)redhat.com> 8.2.3-1
- Update to PostgreSQL 8.2.3 due to regression induced by security fix
Resolves: #227522
commit 8f32cc1efc5d7a7074f71ab0fb70aa84c96efec3
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Feb 7 14:58:38 2007 +0000
Update to PostgreSQL 8.2.3 Resolves: #227522
diff --git a/.cvsignore b/.cvsignore
index a1e6929..3078cc6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.2.2.tar.bz2
+postgresql-8.2.3.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.5.3.tar.gz
pgtcldocs-20060909.zip
diff --git a/postgresql.spec b/postgresql.spec
index dbfef69..11ac7cf 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -80,7 +80,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.2.2
+Version: 8.2.3
Release: 1%{?dist}
License: BSD
Group: Applications/Databases
@@ -822,6 +822,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Feb 7 2007 Tom Lane <tgl(a)redhat.com> 8.2.3-1
+- Update to PostgreSQL 8.2.3 due to regression induced by security fix
+Resolves: #227522
+
* Sun Feb 4 2007 Tom Lane <tgl(a)redhat.com> 8.2.2-1
- Update to PostgreSQL 8.2.2 to fix CVE-2007-0555, CVE-2007-0556
Related: #225496
diff --git a/sources b/sources
index bae9ca3..a975503 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-17a9703c83f3558d13ffbd96867caf38 postgresql-8.2.2.tar.bz2
+cb47771004d53505200ffd00ac45bc32 postgresql-8.2.3.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
43ad97c7dd108fb7a165b4755d8aec32 pgtcl1.5.3.tar.gz
a71b4aced6b0b068335f8e040e5b9fb6 pgtcldocs-20060909.zip
commit 3fe398b2dc17ef4c2a47223651dd6c27c648452b
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sun Feb 4 18:34:03 2007 +0000
Update to PostgreSQL 8.2.2.
diff --git a/.cvsignore b/.cvsignore
index a4188bd..a1e6929 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.2.1.tar.bz2
+postgresql-8.2.2.tar.bz2
PyGreSQL-3.8.1.tgz
pgtcl1.5.3.tar.gz
pgtcldocs-20060909.zip
diff --git a/postgresql.init b/postgresql.init
index 6a8e05a..37d6011 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -118,7 +118,7 @@ export PGPORT
# Check that networking is up.
# Pretty much need it for postmaster.
-[ "${NETWORKING}" = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 1
[ -f "$PGENGINE/postmaster" ] || exit 1
diff --git a/postgresql.spec b/postgresql.spec
index ed028b1..dbfef69 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -80,8 +80,8 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.2.1
-Release: 2%{?dist}
+Version: 8.2.2
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -149,7 +149,7 @@ Obsoletes: postgresql-perl
Obsoletes: postgresql-tk
Obsoletes: rh-postgresql
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
PostgreSQL is an advanced Object-Relational database management system
@@ -822,6 +822,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Feb 4 2007 Tom Lane <tgl(a)redhat.com> 8.2.2-1
+- Update to PostgreSQL 8.2.2 to fix CVE-2007-0555, CVE-2007-0556
+Related: #225496
+
* Fri Jan 12 2007 Tom Lane <tgl(a)redhat.com> 8.2.1-2
- Split -pl subpackage into three new packages to reduce dependencies
and track upstream project's packaging.
diff --git a/sources b/sources
index 09d943e..bae9ca3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-5cf003dfdbcab69974c091c3a0aa85eb postgresql-8.2.1.tar.bz2
+17a9703c83f3558d13ffbd96867caf38 postgresql-8.2.2.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
43ad97c7dd108fb7a165b4755d8aec32 pgtcl1.5.3.tar.gz
a71b4aced6b0b068335f8e040e5b9fb6 pgtcldocs-20060909.zip
commit d6ea25dd9308cd9d8c5f90b8625d81f214dd2f81
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Jan 13 04:30:50 2007 +0000
Split -pl subpackage into three new packages to reduce dependencies and
track upstream project's packaging.
diff --git a/README.rpm-dist b/README.rpm-dist
index 6286083..2890c71 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,7 +1,7 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 8.1, for the PostgreSQL 8.1.1-1 RPMset.
-Lamar Owen <lamar.owen(a)wgcr.org>
+Version 8.2, for the PostgreSQL 8.2.1-2 RPMset.
+Devrim Gndz <devrim(a)CommandPrompt.com>, Lamar Owen <lowen(a)pari.edu>
-----------------------------------------------------------------------------
Contents:
@@ -31,9 +31,9 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 8.1 of PostgreSQL,
+This document is written to be applicable to version 8.2 of PostgreSQL,
which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 8.1 are not documented here.
+point, versions prior to 8.2 are not documented here.
Official PostgreSQL Global Development Group RPMs have from version 7.1.2
on carried a 'PGDG' after the release number. Other RPMsets distributed
@@ -94,6 +94,7 @@ Joe Conway
Andrew Overholt
David Jee
Kaj J. Niemi
+Devrim Gunduz
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
@@ -106,23 +107,24 @@ postgresql: Key clients and libraries, and documentation
postgresql-libs: Client shared libraries
postgresql-server: Server executables and data files
postgresql-devel: Development libraries and include files
-postgresql-jdbc: JARs for the JDBC client library
-postgresql-python: The PygreSQL client library
+postgresql-python: The PyGreSQL client library
postgresql-tcl: Tcl client library (Pgtcl)
postgresql-test: The regression tests and associated files
postgresql-docs: Extra documentation, such as the tutorial files
postgresql-contrib: The contrib source tree, as well as selected binaries
-postgresql-pl: PL/Perl (if possible on this dist), PL/Python, and PL/Tcl
+postgresql-plperl: PL/Perl procedural language
+postgresql-plpython: PL/Python procedural language
+postgresql-pltcl: PL/Tcl procedural language
You have to install postgresql and postgresql-libs to do anything.
postgresql-server is needed unless you only plan to use the clients to work
with a remote PostgreSQL server. The others are optional.
-Note that there is no postgresql-perl, postgresql-odbc, postgresql-tk, or
-postgresql-plperl package any longer. This is due to these portions being
-removed from the PostgreSQL source tarball.
+Note that there is no postgresql-perl, postgresql-jdbc, postgresql-odbc, or
+postgresql-tk package any longer. This is due to these portions being split
+into separate source distributions.
-While PygreSQL was split out from the core PostgreSQL distribution, thanks to
+While PyGreSQL was split out from the core PostgreSQL distribution, thanks to
Kaj's work it is still included as the python subpackage. Also, Pgtcl is
still included as the tcl subpackage, although it is not part of the core
distribution anymore.
@@ -138,8 +140,7 @@ various subdirectories.
Different distributions have different ideas of some of these file locations.
In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
/usr/share/doc, /usr/share/doc/packages, or some other similar path. The
-Red Hat/Fedora locations are listed below. On SuSE <7.1, substitute 'postgres'
-for 'postgresql' below.
+Red Hat / Fedora Core locations are listed below.
However, the RPMs install the files like this:
Executables: /usr/bin
@@ -160,8 +161,8 @@ Extra documentation: /usr/share/doc/postgresql-docs-x.y.z
On some 64-bit architectures, /usr/lib64 is used instead of /usr/lib.
-The above list describes the Red Hat/Fedora layout. These locations may
-change for other distributions. Use of 'rpm -ql' for each package is
+The above list describes the Red Hat / Fedora Core layout. These locations
+may change for other distributions. Use of 'rpm -ql' for each package is
recommended as the 'official' information source.
While it may seem gratuitous to place these files in different locations, the
@@ -171,7 +172,7 @@ the beauty of RPM -- you don't have to keep track of the files, RPM does it
for you.
These RPMs are designed to be LSB-compliant -- if you find this not to be the
-case, please let us know by way of the pgsqlrpms-hackers(a)pgfoundry.org
+case, please let us know by way of the pgsqlrpms-hackers(a)pgfoundry.org
mailing list.
MULTIPLE POSTMASTERS
@@ -278,13 +279,12 @@ This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
beta 0 #build with cassert and do not strip the binaries
+python 1 #build the postgresql-python package.
tcl 1 #build the postgresql-tcl package.
-jdbc 1 #build the postgresql-jdbc package.
-pls 1 #build the postgresql-pl package.
test 1 #build the postgresql-test package.
-python 1 #build the postgresql-python package.
-pltcl 1 #build the pltcl portion of the postgresql-pl package.
-plperl 1 #build the plperl portion of the postgresql-pl package.
+plpython 1 #build the PL/Python package
+pltcl 1 #build the PL/Tcl package.
+plperl 1 #build the PL/Perl package.
ssl 1 #use OpenSSL support.
kerberos 1 #use Kerberos 5 support.
nls 1 #build with national language support.
@@ -296,7 +296,7 @@ pgfts 1 #build with --enable-thread-safety
To use these defines, invoke a rebuild like this:
rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
--define 'test 0' --define 'runselftest 1' --define 'kerberos 0' \
- postgresql-8.1.1-1.src.rpm
+ postgresql-8.2.1-1.src.rpm
This line would disable the python, tcl, and test subpackages, enable the
regression test run during build, and disable kerberos support.
diff --git a/postgresql.spec b/postgresql.spec
index 0b24e82..ed028b1 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -61,11 +61,11 @@
%{!?tcldevel:%define tcldevel 1}
%{!?test:%define test 1}
-%{!?python:%define python 1}
+%{!?plpython:%define plpython 1}
%{!?pltcl:%define pltcl 1}
%{!?plperl:%define plperl 1}
+%{!?python:%define python 1}
%{!?tcl:%define tcl 1}
-%{!?pls:%define pls 1}
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -109,7 +109,7 @@ Patch8: postgresql-prefer-ncurses.patch
Buildrequires: perl glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
-%if %python
+%if %python || %plpython
BuildPrereq: python-devel
%endif
@@ -238,18 +238,51 @@ Postgres preprocessor. You need to install this package if you want to
develop applications which will interact with a PostgreSQL server.
#------------
-%if %pls
-%package pl
-Summary: The PL procedural languages for PostgreSQL.
+%if %plperl
+%package plperl
+Summary: The Perl procedural language for PostgreSQL.
+Group: Applications/Databases
+PreReq: postgresql = %{version}-%{release}
+PreReq: postgresql-server = %{version}-%{release}
+Obsoletes: rh-postgresql-pl
+Obsoletes: postgresql-pl
+
+%description plperl
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-plperl package contains the PL/Perl
+procedural language for the backend.
+%endif
+
+#------------
+%if %plpython
+%package plpython
+Summary: The Python procedural language for PostgreSQL.
Group: Applications/Databases
PreReq: postgresql = %{version}-%{release}
PreReq: postgresql-server = %{version}-%{release}
Obsoletes: rh-postgresql-pl
+Obsoletes: postgresql-pl
-%description pl
+%description plpython
PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-pl package contains the PL/Perl, PL/Tcl, and PL/Python
-procedural languages for the backend. PL/Pgsql is part of the core server package.
+system. The postgresql-plpython package contains the PL/Python
+procedural language for the backend.
+%endif
+
+#------------
+%if %pltcl
+%package pltcl
+Summary: The Tcl procedural language for PostgreSQL.
+Group: Applications/Databases
+PreReq: postgresql = %{version}-%{release}
+PreReq: postgresql-server = %{version}-%{release}
+Obsoletes: rh-postgresql-pl
+Obsoletes: postgresql-pl
+
+%description pltcl
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-pltcl package contains the PL/Tcl
+procedural language for the backend.
%endif
#------------
@@ -359,7 +392,7 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
--with-tcl \
--with-tclconfig=%{_libdir} \
%endif
-%if %python
+%if %plpython
--with-python \
%endif
%if %ssl
@@ -574,9 +607,19 @@ if [ $1 = 0 ] ; then
groupdel postgres >/dev/null 2>&1 || :
fi
-%if %pls
-%post -p /sbin/ldconfig pl
-%postun -p /sbin/ldconfig pl
+%if %plperl
+%post -p /sbin/ldconfig plperl
+%postun -p /sbin/ldconfig plperl
+%endif
+
+%if %plpython
+%post -p /sbin/ldconfig plpython
+%postun -p /sbin/ldconfig plpython
+%endif
+
+%if %pltcl
+%post -p /sbin/ldconfig pltcl
+%postun -p /sbin/ldconfig pltcl
%endif
%if %test
@@ -740,23 +783,27 @@ rm -rf $RPM_BUILD_ROOT
%doc Pgtcl-docs/*
%endif
-%if %pls
-%files pl
-%defattr(-,root,root)
%if %plperl
+%files plperl
+%defattr(-,root,root)
%{_libdir}/pgsql/plperl.so
%endif
+
%if %pltcl
+%files pltcl
+%defattr(-,root,root)
%{_libdir}/pgsql/pltcl.so
%{_bindir}/pltcl_delmod
%{_bindir}/pltcl_listmod
%{_bindir}/pltcl_loadmod
%{_datadir}/pgsql/unknown.pltcl
%endif
-%if %python
+
+%if %plpython
+%files plpython
+%defattr(-,root,root)
%{_libdir}/pgsql/plpython.so
%endif
-%endif
%if %python
%files python
@@ -775,6 +822,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Jan 12 2007 Tom Lane <tgl(a)redhat.com> 8.2.1-2
+- Split -pl subpackage into three new packages to reduce dependencies
+ and track upstream project's packaging.
+
* Wed Jan 10 2007 Tom Lane <tgl(a)redhat.com> 8.2.1-1
- Update to PostgreSQL 8.2.1
- Update to pgtcl 1.5.3
commit 721f5ecff516f361863dbe1a2c827f443a447cb4
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Jan 11 00:17:11 2007 +0000
Update to PostgreSQL 8.2.1, pgtcl 1.5.3
diff --git a/.cvsignore b/.cvsignore
index ec29517..a4188bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.2.0.tar.bz2
+postgresql-8.2.1.tar.bz2
PyGreSQL-3.8.1.tgz
-pgtcl1.5.2.tar.gz
-pgtcldocs-20041108.zip
-postgresql-8.1-US.pdf
+pgtcl1.5.3.tar.gz
+pgtcldocs-20060909.zip
+postgresql-8.2.1-US.pdf
diff --git a/pgtcl-no-rpath.patch b/pgtcl-no-rpath.patch
index ae42d88..b29b78c 100644
--- a/pgtcl-no-rpath.patch
+++ b/pgtcl-no-rpath.patch
@@ -1,84 +1,33 @@
-This patch removes some bogus stuff from the pgtcl configure script;
-in particular it gets rid of rpath specifications that we don't want
-or need on an RPM platform, as well as long-obsolete optimization
-bypasses.
+This patch prevents use of rpath, which isn't wanted on Fedora.
-We also remove some direct hacks on LIBOBJS because modern Autoconf
-doesn't like them; not worth fixing properly since they won't be
-invoked on our systems anyway.
-
-Finally, tweak Makefile.in to ensure that the -L switch for libpq appears
+Also, tweak Makefile.in to ensure that the -L switch for libpq appears
before any -L for the Tcl libraries during the link. This prevents the
generated library from being bound to the wrong version of libpq when
building on a machine that has an older version of libpq already installed
(bug #166665).
-diff -Naur Pgtcl.orig/aclocal.m4 Pgtcl/aclocal.m4
---- Pgtcl.orig/aclocal.m4 2004-02-15 15:15:37.000000000 -0500
-+++ Pgtcl/aclocal.m4 2005-03-11 18:26:44.610459295 -0500
-@@ -293,12 +293,6 @@
- DL_OBJS="tclLoadDl.o"
- LDFLAGS=""
-
-- # AIX v<=4.1 has some different flags than 4.2+
-- if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
-- LIBOBJS="$LIBOBJS tclLoadAix.o"
-- DL_LIBS="-lld"
-- fi
--
- # On AIX <=v4 systems, libbsd.a has to be linked in to support
- # non-blocking file IO. This library has to be linked in after
- # the MATH_LIBS or it breaks the pow() function. The way to
-@@ -490,18 +484,12 @@
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".so"
-
-- # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
-- # when you inline the string and math operations. Turn this off to
-- # get rid of the warnings.
--
-- CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
--
- if test "$have_dl" = yes; then
- SHLIB_LD="${CC} -shared"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS="-rdynamic"
-- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR},-rpath,${LIB_PGTCL_RUNTIME_DIR}'
-+ LD_SEARCH_FLAGS=""
- else
- AC_CHECK_HEADER(dld.h, [
- SHLIB_LD="ld -shared"
-@@ -514,17 +502,6 @@
- EXTRA_CFLAGS="-mieee"
- fi
-
-- # The combo of gcc + glibc has a bug related
-- # to inlining of functions like strtod(). The
-- # -fno-builtin flag should address this problem
-- # but it does not work. The -fno-inline flag
-- # is kind of overkill but it works.
-- # Disable inlining only when one of the
-- # files in compat/*.c is being linked in.
-- if test x"${LIBOBJS}" != x ; then
-- EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
-- fi
--
- ;;
- GNU*)
- SHLIB_CFLAGS="-fPIC"
-
-
-diff -Naur Pgtcl.orig/Makefile.in Pgtcl/Makefile.in
---- Pgtcl.orig/Makefile.in 2004-06-13 17:49:14.000000000 -0400
-+++ Pgtcl/Makefile.in 2005-10-04 14:23:37.000000000 -0400
-@@ -121,7 +121,7 @@
+diff -Naur pgtcl1.5.3.orig/Makefile.in pgtcl1.5.3/Makefile.in
+--- pgtcl1.5.3.orig/Makefile.in 2006-09-09 21:59:59.000000000 -0400
++++ pgtcl1.5.3/Makefile.in 2007-01-10 18:58:19.000000000 -0500
+@@ -101,7 +101,7 @@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
- SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
- # Added EXTRA_LIBS for special cases like -lssl
--SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(PG_LIBS) $(TCL_LIBS) @EXTRA_LIBS@
-+SHLIB_LD_LIBS = $(PG_LIBS) @SHLIB_LD_LIBS@ $(TCL_LIBS) @EXTRA_LIBS@
+-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(PG_LIBS) $(TCL_LIBS)
++SHLIB_LD_LIBS = $(PG_LIBS) @SHLIB_LD_LIBS@ $(TCL_LIBS)
STLIB_LD = @STLIB_LD@
- TCL_DEFS = @TCL_DEFS@
+ #TCL_DEFS = @TCL_DEFS@
TCL_BIN_DIR = @TCL_BIN_DIR@
+diff -Naur pgtcl1.5.3.orig/aclocal.m4 pgtcl1.5.3/aclocal.m4
+--- pgtcl1.5.3.orig/aclocal.m4 2006-09-09 20:27:09.000000000 -0400
++++ pgtcl1.5.3/aclocal.m4 2007-01-10 18:56:46.000000000 -0500
+@@ -844,7 +844,7 @@
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR},-rpath,${LIB_PGTCL_RUNTIME_DIR}'
++ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ if test "`uname -m`" = "alpha" ; then
+ CFLAGS="$CFLAGS -mieee"
diff --git a/postgresql-prefer-ncurses.patch b/postgresql-prefer-ncurses.patch
new file mode 100644
index 0000000..04a4efb
--- /dev/null
+++ b/postgresql-prefer-ncurses.patch
@@ -0,0 +1,20 @@
+This patch hacks the Postgres configure script to prefer libncurses over
+libtermcap. This is needed in the current Fedora environment because while
+both are available, libtermcap is deprecated and will be removed in the
+fairly near future. Because the need for this is short-term, I'm not
+going to try to push it upstream; this patch can go away once libtermcap
+is no longer present in the standard build environment.
+
+
+diff -Naur postgresql-8.2.1.orig/config/programs.m4 postgresql-8.2.1/config/programs.m4
+--- postgresql-8.2.1.orig/config/programs.m4 2006-05-23 15:28:45.000000000 -0400
++++ postgresql-8.2.1/config/programs.m4 2007-01-10 18:42:22.000000000 -0500
+@@ -88,7 +88,7 @@
+ fi
+ for pgac_rllib in $READLINE_ORDER ; do
+ AC_MSG_CHECKING([for ${pgac_rllib}])
+- for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
++ for pgac_lib in "" " -lncurses" " -ltermcap" " -lcurses" ; do
+ LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
+ AC_TRY_LINK_FUNC([readline], [[
+ # Older NetBSD, OpenBSD, and Irix have a broken linker that does not
diff --git a/postgresql.spec b/postgresql.spec
index 79b69c5..0b24e82 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -80,8 +80,8 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.2.0
-Release: 2%{?dist}
+Version: 8.2.1
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -94,17 +94,17 @@ Source6: README.rpm-dist
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.1-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.2.1-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
-Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
-Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
+Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.5.3.tar.gz
+Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20060909.zip
Patch1: rpm-pgsql.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
-Patch7: pgtcl-quote.patch
+Patch8: postgresql-prefer-ncurses.patch
Buildrequires: perl glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
@@ -308,7 +308,7 @@ system, including regression tests and benchmarks.
%patch4 -p1
# patch5 is applied later
%patch6 -p1
-# patch7 is applied later
+%patch8 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -333,9 +333,8 @@ cp -p %{SOURCE17} .
PGTCLDOCDIR=`basename %{SOURCE20} .zip`
mv $PGTCLDOCDIR Pgtcl-docs
-%patch5 -p0
-%patch7 -p0
pushd Pgtcl
+%patch5 -p1
%aconfver
popd
%endif
@@ -776,6 +775,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jan 10 2007 Tom Lane <tgl(a)redhat.com> 8.2.1-1
+- Update to PostgreSQL 8.2.1
+- Update to pgtcl 1.5.3
+- Be sure we link to libncurses, not libtermcap which is disappearing in Fedora
+
* Thu Dec 7 2006 Jeremy Katz <katzj(a)redhat.com> - 8.2.0-2
- rebuild for python 2.5
diff --git a/sources b/sources
index ad17314..09d943e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-490cb3a614545cbd3ce9b1c75c1d2b2e postgresql-8.2.0.tar.bz2
+5cf003dfdbcab69974c091c3a0aa85eb postgresql-8.2.1.tar.bz2
5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
-d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
-3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
-66d80897840724917cb838c76393692b postgresql-8.1-US.pdf
+43ad97c7dd108fb7a165b4755d8aec32 pgtcl1.5.3.tar.gz
+a71b4aced6b0b068335f8e040e5b9fb6 pgtcldocs-20060909.zip
+0c25dc2055e2fa9ff9d05afc9252e1f2 postgresql-8.2.1-US.pdf
commit a703279f8ef09ba2ceb2c7010f623a8c814044c3
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Thu Dec 7 18:27:05 2006 +0000
- rebuild for python 2.5
diff --git a/postgresql.spec b/postgresql.spec
index 1702d3d..79b69c5 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -75,13 +75,13 @@
%{!?runselftest:%define runselftest 1}
# Python major version.
-%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -516,10 +516,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
%if %python
pushd PyGreSQL
- install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
- install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
- install -m 0644 pg.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
- install -m 0644 pgdb.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+ install -m 0755 -d $RPM_BUILD_ROOT%{python_sitearch}
+ install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{python_sitearch}
+ install -m 0644 pg.py $RPM_BUILD_ROOT%{python_sitearch}
+ install -m 0644 pgdb.py $RPM_BUILD_ROOT%{python_sitearch}
popd
%endif
@@ -764,8 +764,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%doc PyGreSQL/docs/*.txt
%doc PyGreSQL/tutorial
-%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
-%{_libdir}/python%{pyver}/site-packages/*.py
+%{python_sitearch}/_pgmodule.so
+%{python_sitearch}/*.py
%endif
%if %test
@@ -776,6 +776,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Dec 7 2006 Jeremy Katz <katzj(a)redhat.com> - 8.2.0-2
+- rebuild for python 2.5
+
* Mon Dec 4 2006 Tom Lane <tgl(a)redhat.com> 8.2.0-1
- Update to PostgreSQL 8.2.0
- Update to PyGreSQL 3.8.1
commit 94058424b05107e5303017d97a74d2f815c301af
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Dec 5 03:01:02 2006 +0000
Update to Postgres 8.2.0, fix a couple of small packaging bugs.
diff --git a/.cvsignore b/.cvsignore
index 46f586f..ec29517 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.1.4.tar.bz2
-PyGreSQL-3.8.tgz
+postgresql-8.2.0.tar.bz2
+PyGreSQL-3.8.1.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
postgresql-8.1-US.pdf
diff --git a/Makefile.regress b/Makefile.regress
index 5ec27f0..9a09a80 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -28,7 +28,7 @@ installcheck-parallel: cleandirs
cleandirs:
-rm -rf testtablespace results
mkdir testtablespace results
- [ -x /usr/bin/chcon ] && /usr/bin/chcon -t postgresql_db_t testtablespace results
+ [ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_db_t testtablespace results
# old interfaces follow...
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
index 22a891d..6c68c65 100644
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@@ -1,36 +1,37 @@
-diff -Naur postgresql-8.1.0.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.1.0/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-8.1.0.orig/src/backend/utils/misc/postgresql.conf.sample 2005-10-08 15:32:58.000000000 -0400
-+++ postgresql-8.1.0/src/backend/utils/misc/postgresql.conf.sample 2005-11-07 15:04:13.000000000 -0500
-@@ -211,15 +211,15 @@
+diff -Naur postgresql-8.2.0.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.2.0/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-8.2.0.orig/src/backend/utils/misc/postgresql.conf.sample 2006-11-20 20:23:37.000000000 -0500
++++ postgresql-8.2.0/src/backend/utils/misc/postgresql.conf.sample 2006-12-04 19:54:58.000000000 -0500
+@@ -226,16 +226,16 @@
# depending on platform.
# This is used when logging to stderr:
-#redirect_stderr = off # Enable capturing of stderr into log
+redirect_stderr = on # Enable capturing of stderr into log
# files
+ # (change requires restart)
# These are only used if redirect_stderr is on:
-#log_directory = 'pg_log' # Directory where log files are written
+log_directory = 'pg_log' # Directory where log files are written
# Can be absolute or relative to PGDATA
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # Log file name pattern.
-+log_filename = 'postgresql-%a.log' # Log file name pattern.
++log_filename = 'postgresql-%a.log' # Log file name pattern.
# Can include strftime() escapes
-#log_truncate_on_rotation = off # If on, any existing log file of the same
-+log_truncate_on_rotation = on # If on, any existing log file of the same
++log_truncate_on_rotation = on # If on, any existing log file of the same
# name as the new log file will be
# truncated rather than appended to. But
# such truncation only occurs on
-@@ -227,10 +227,10 @@
+@@ -243,10 +243,10 @@
# or size-driven rotation. Default is
# off, meaning append to existing files
# in all cases.
--#log_rotation_age = 1440 # Automatic rotation of logfiles will
-+log_rotation_age = 1440 # Automatic rotation of logfiles will
- # happen after so many minutes. 0 to
+-#log_rotation_age = 1d # Automatic rotation of logfiles will
++log_rotation_age = 1d # Automatic rotation of logfiles will
+ # happen after that time. 0 to
# disable.
--#log_rotation_size = 10240 # Automatic rotation of logfiles will
+-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+log_rotation_size = 0 # Automatic rotation of logfiles will
- # happen after so many kilobytes of log
+ # happen after that much log
# output. 0 to disable.
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 93c9534..74484c4 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,9 +7,9 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198.
-diff -Naur postgresql-8.1.0.orig/src/pl/plperl/GNUmakefile postgresql-8.1.0/src/pl/plperl/GNUmakefile
---- postgresql-8.1.0.orig/src/pl/plperl/GNUmakefile 2005-07-13 13:12:56.000000000 -0400
-+++ postgresql-8.1.0/src/pl/plperl/GNUmakefile 2005-11-07 15:10:33.000000000 -0500
+diff -Naur postgresql-8.2.0.orig/src/pl/plperl/GNUmakefile postgresql-8.2.0/src/pl/plperl/GNUmakefile
+--- postgresql-8.2.0.orig/src/pl/plperl/GNUmakefile 2006-07-20 20:24:04.000000000 -0400
++++ postgresql-8.2.0/src/pl/plperl/GNUmakefile 2006-12-04 20:00:56.000000000 -0500
@@ -36,6 +36,9 @@
SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
@@ -19,4 +19,4 @@ diff -Naur postgresql-8.1.0.orig/src/pl/plperl/GNUmakefile postgresql-8.1.0/src/
+
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl
REGRESS = plperl plperl_trigger plperl_shared plperl_elog
-
+ # where to find psql for running the tests
diff --git a/postgresql-test.patch b/postgresql-test.patch
index 2a96519..dead4c5 100644
--- a/postgresql-test.patch
+++ b/postgresql-test.patch
@@ -1,7 +1,7 @@
-diff -Naur postgresql-8.0.0rc5.orig/src/test/regress/GNUmakefile postgresql-8.0.0rc5/src/test/regress/GNUmakefile
---- postgresql-8.0.0rc5.orig/src/test/regress/GNUmakefile 2004-11-17 13:05:06.000000000 -0500
-+++ postgresql-8.0.0rc5/src/test/regress/GNUmakefile 2005-01-12 14:48:45.618011257 -0500
-@@ -84,12 +84,23 @@
+diff -Naur postgresql-8.2.0.orig/src/test/regress/GNUmakefile postgresql-8.2.0/src/test/regress/GNUmakefile
+--- postgresql-8.2.0.orig/src/test/regress/GNUmakefile 2006-07-20 20:24:04.000000000 -0400
++++ postgresql-8.2.0/src/test/regress/GNUmakefile 2006-12-04 19:56:54.000000000 -0500
+@@ -102,12 +102,23 @@
testtablespace := $(abs_builddir)/testtablespace
@@ -25,49 +25,49 @@ diff -Naur postgresql-8.0.0rc5.orig/src/test/regress/GNUmakefile postgresql-8.0.
$(input_files): sql/%.sql: input/%.source
$(sed-command)
-diff -Naur postgresql-8.0.0rc5.orig/src/test/regress/input/create_function_1.source postgresql-8.0.0rc5/src/test/regress/input/create_function_1.source
---- postgresql-8.0.0rc5.orig/src/test/regress/input/create_function_1.source 2002-08-21 20:01:51.000000000 -0400
-+++ postgresql-8.0.0rc5/src/test/regress/input/create_function_1.source 2005-01-12 14:50:50.679124338 -0500
+diff -Naur postgresql-8.2.0.orig/src/test/regress/input/create_function_1.source postgresql-8.2.0/src/test/regress/input/create_function_1.source
+--- postgresql-8.2.0.orig/src/test/regress/input/create_function_1.source 2006-02-27 11:09:50.000000000 -0500
++++ postgresql-8.2.0/src/test/regress/input/create_function_1.source 2006-12-04 19:58:24.000000000 -0500
@@ -24,17 +24,17 @@
CREATE FUNCTION check_primary_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
+ AS '@abs_spidir@/refint@DLSUFFIX@'
- LANGUAGE 'C';
+ LANGUAGE C;
CREATE FUNCTION check_foreign_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
+ AS '@abs_spidir@/refint@DLSUFFIX@'
- LANGUAGE 'C';
+ LANGUAGE C;
CREATE FUNCTION autoinc ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
+ AS '@abs_spidir@/autoinc@DLSUFFIX@'
- LANGUAGE 'C';
+ LANGUAGE C;
CREATE FUNCTION funny_dup17 ()
-diff -Naur postgresql-8.0.0rc5.orig/src/test/regress/output/create_function_1.source postgresql-8.0.0rc5/src/test/regress/output/create_function_1.source
---- postgresql-8.0.0rc5.orig/src/test/regress/output/create_function_1.source 2004-03-21 17:29:11.000000000 -0500
-+++ postgresql-8.0.0rc5/src/test/regress/output/create_function_1.source 2005-01-12 14:51:08.149762180 -0500
+diff -Naur postgresql-8.2.0.orig/src/test/regress/output/create_function_1.source postgresql-8.2.0/src/test/regress/output/create_function_1.source
+--- postgresql-8.2.0.orig/src/test/regress/output/create_function_1.source 2006-03-14 17:48:25.000000000 -0500
++++ postgresql-8.2.0/src/test/regress/output/create_function_1.source 2006-12-04 19:58:54.000000000 -0500
@@ -25,15 +25,15 @@
NOTICE: argument type city_budget is only a shell
CREATE FUNCTION check_primary_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
+ AS '@abs_spidir@/refint@DLSUFFIX@'
- LANGUAGE 'C';
+ LANGUAGE C;
CREATE FUNCTION check_foreign_key ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
+ AS '@abs_spidir@/refint@DLSUFFIX@'
- LANGUAGE 'C';
+ LANGUAGE C;
CREATE FUNCTION autoinc ()
RETURNS trigger
- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
+ AS '@abs_spidir@/autoinc@DLSUFFIX@'
- LANGUAGE 'C';
+ LANGUAGE C;
CREATE FUNCTION funny_dup17 ()
RETURNS trigger
diff --git a/postgresql.init b/postgresql.init
index 96e81eb..6a8e05a 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -61,16 +61,20 @@
# fooling the postmaster's stale-lockfile check by having too many
# postgres-owned processes laying about.
+# Version 8.1 Devrim Gunduz <devrim(a)PostgreSQL.org>
+# Increased sleep time from 1 sec to 2 sec.
-# PGVERSION is the full package version, e.g., 7.4.7
+# Version 8.2 Devrim Gunduz <devrim(a)CommandPrompt.com>
+# Set initdb as a seperate option.
+
+# PGVERSION is the full package version, e.g., 8.2.0
# Note: the specfile ordinarily updates this during install
PGVERSION=xxxx
-# PGMAJORVERSION is major version, e.g., 7.4 (this should match PG_VERSION)
+# PGMAJORVERSION is major version, e.g., 8.2 (this should match PG_VERSION)
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
# Source function library.
-INITD=/etc/rc.d/init.d
-. $INITD/functions
+. /etc/rc.d/init.d/functions
# Get function listing for cross-distribution logic.
TYPESET=`typeset -f|grep "declare"`
@@ -163,28 +167,14 @@ start(){
exit 1
fi
- # No existing PGDATA! Initdb it.
+ # No existing PGDATA! Warn the user to initdb it.
else
- echo -n $"Initializing database: "
- if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
- then
- mkdir -p "$PGDATA" || exit 1
- chown postgres:postgres "$PGDATA"
- chmod go-rwx "$PGDATA"
- fi
- # Clean up SELinux tagging for PGDATA
- [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
- # Initialize the database
- $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident sameuser'" >> "$PGLOG" 2>&1 < /dev/null
- # Create directory for postmaster log
- mkdir "$PGDATA/pg_log"
- chown postgres:postgres "$PGDATA/pg_log"
- chmod go-rwx "$PGDATA/pg_log"
-
- [ -f "$PGDATA/PG_VERSION" ] && echo_success
- [ ! -f "$PGDATA/PG_VERSION" ] && echo_failure
echo
+ echo "$PGDATA is missing. Use \"service postgresql initdb\" to initialize the cluster first."
+ echo_failure
+ echo
+ exit 1
fi
echo -n "$PSQL_START"
@@ -237,6 +227,39 @@ reload(){
$SU -l postgres -c "$PGENGINE/pg_ctl reload -D '$PGDATA' -s" > /dev/null 2>&1 < /dev/null
}
+initdb(){
+ if [ -f "$PGDATA/PG_VERSION" ]
+ then
+ echo "Data directory is not empty!"
+ echo_failure
+ script_result=1
+ else
+ echo -n $"Initializing database: "
+ if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
+ then
+ mkdir -p "$PGDATA" || exit 1
+ chown postgres:postgres "$PGDATA"
+ chmod go-rwx "$PGDATA"
+ fi
+ # Clean up SELinux tagging for PGDATA
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+ # Initialize the database
+ $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident sameuser'" >> "$PGLOG" 2>&1 < /dev/null
+ # Create directory for postmaster log
+ mkdir "$PGDATA/pg_log"
+ chown postgres:postgres "$PGDATA/pg_log"
+ chmod go-rwx "$PGDATA/pg_log"
+
+ if [ -f "$PGDATA/PG_VERSION" ]
+ then
+ echo_success
+ else
+ echo_failure
+ script_result=1
+ fi
+ fi
+}
+
# This script is slightly unusual in that the name of the daemon (postmaster)
# is not the same as the name of the subsystem (postgresql)
@@ -264,8 +287,11 @@ case "$1" in
reload|force-reload)
reload
;;
+ initdb)
+ initdb
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload|initdb}"
exit 1
esac
diff --git a/postgresql.spec b/postgresql.spec
index 0fe077f..1702d3d 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,6 @@
%{!?aconfver:%define aconfver autoconf}
%{!?tcldevel:%define tcldevel 1}
-%{!?jdbc:%define jdbc 0}
%{!?test:%define test 1}
%{!?python:%define python 1}
%{!?pltcl:%define pltcl 1}
@@ -81,8 +80,8 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.1.4
-Release: 1.1
+Version: 8.2.0
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -92,21 +91,15 @@ Source3: postgresql.init
Source4: Makefile.regress
Source5: pg_config.h
Source6: README.rpm-dist
-%if %jdbc
-Source8: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc3.jar
-%endif
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source17: http://www.postgresql.org/docs/manuals/postgresql-8.1-US.pdf
-Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.tgz
+Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
Patch1: rpm-pgsql.patch
-Patch2: postgresql-src-tutorial.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
@@ -291,19 +284,6 @@ database.
%endif
#----------
-%if %jdbc
-%package jdbc
-Summary: Files needed for Java programs to access a PostgreSQL database.
-Group: Applications/Databases
-Obsoletes: rh-postgresql-jdbc
-
-%description jdbc
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-jdbc package includes the .jar files needed for
-Java programs to access a PostgreSQL database.
-%endif
-
-#------------
%if %test
%package test
Summary: The test suite distributed with PostgreSQL.
@@ -323,11 +303,7 @@ system, including regression tests and benchmarks.
%prep
%setup -q
-pushd doc
-tar zxf postgres.tar.gz
-popd
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
# patch5 is applied later
@@ -337,11 +313,6 @@ popd
#call autoconf 2.53 or greater
%aconfver
-pushd doc
-tar -zcf postgres.tar.gz *.html stylesheet.css
-rm -f *.html stylesheet.css
-popd
-
cp -p %{SOURCE17} .
%if %python
@@ -349,7 +320,6 @@ cp -p %{SOURCE17} .
PYGRESQLDIR=`basename %{SOURCE18} .tgz`
mv $PYGRESQLDIR PyGreSQL
# Some versions of PyGreSQL.tgz contain wrong file permissions
- chmod 644 PyGreSQL/announce.txt PyGreSQL/changelog.txt PyGreSQL/README
chmod 755 PyGreSQL/tutorial
chmod 644 PyGreSQL/tutorial/*.py
chmod 755 PyGreSQL/tutorial/advanced.py PyGreSQL/tutorial/basics.py
@@ -488,23 +458,6 @@ esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
-%if %jdbc
- # Java/JDBC
- # Red Hat's standard place to put jarfiles is /usr/share/java
-
- # JDBC jars
- install -d $RPM_BUILD_ROOT/usr/share/java
- install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
- install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
- install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
- # Versionless symlinks to the versioned jars
- pushd $RPM_BUILD_ROOT/usr/share/java
- ln -s `basename %{SOURCE8}` postgresql-jdbc2.jar
- ln -s `basename %{SOURCE9}` postgresql-jdbc2ee.jar
- ln -s `basename %{SOURCE10}` postgresql-jdbc3.jar
- popd
-%endif
-
%if %tcl
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/Pgtcl
cp Pgtcl/pkgIndex.tcl $RPM_BUILD_ROOT%{_libdir}/Pgtcl
@@ -681,39 +634,37 @@ rm -rf $RPM_BUILD_ROOT
%files contrib
%defattr(-,root,root)
%{_libdir}/pgsql/_int.so
+%{_libdir}/pgsql/adminpack.so
%{_libdir}/pgsql/autoinc.so
%{_libdir}/pgsql/btree_gist.so
%{_libdir}/pgsql/chkpass.so
%{_libdir}/pgsql/cube.so
%{_libdir}/pgsql/dblink.so
%{_libdir}/pgsql/earthdistance.so
-%{_libdir}/pgsql/fti.so
%{_libdir}/pgsql/fuzzystrmatch.so
+%{_libdir}/pgsql/hstore.so
%{_libdir}/pgsql/insert_username.so
%{_libdir}/pgsql/int_aggregate.so
-%{_libdir}/pgsql/isbn_issn.so
+%{_libdir}/pgsql/isn.so
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
%{_libdir}/pgsql/moddatetime.so
-%{_libdir}/pgsql/pending.so
-%{_libdir}/pgsql/pgcrypto.so
-%{_libdir}/pgsql/pgstattuple.so
%{_libdir}/pgsql/pg_buffercache.so
+%{_libdir}/pgsql/pg_freespacemap.so
%{_libdir}/pgsql/pg_trgm.so
+%{_libdir}/pgsql/pgcrypto.so
+%{_libdir}/pgsql/pgrowlocks.so
+%{_libdir}/pgsql/pgstattuple.so
%{_libdir}/pgsql/refint.so
%{_libdir}/pgsql/seg.so
+%{_libdir}/pgsql/sslinfo.so
%{_libdir}/pgsql/tablefunc.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
-%{_libdir}/pgsql/user_locks.so
%if %xml
%{_libdir}/pgsql/pgxml.so
%endif
%{_datadir}/pgsql/contrib/
-%{_bindir}/DBMirror.pl
-%{_bindir}/clean_pending.pl
-%{_bindir}/dbf2pg
-%{_bindir}/fti.pl
%{_bindir}/oid2name
%{_bindir}/pgbench
%{_bindir}/vacuumlo
@@ -749,9 +700,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/postmaster.*
%{_datadir}/pgsql/postgres.bki
%{_datadir}/pgsql/postgres.description
+%{_datadir}/pgsql/postgres.shdescription
%{_datadir}/pgsql/system_views.sql
%{_datadir}/pgsql/*.sample
%{_datadir}/pgsql/timezone/
+%{_datadir}/pgsql/timezonesets/
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql
@@ -809,18 +762,12 @@ rm -rf $RPM_BUILD_ROOT
%if %python
%files python
%defattr(-,root,root)
-%doc PyGreSQL/announce.txt PyGreSQL/changelog.txt PyGreSQL/README
+%doc PyGreSQL/docs/*.txt
%doc PyGreSQL/tutorial
%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
%{_libdir}/python%{pyver}/site-packages/*.py
%endif
-%if %jdbc
-%files jdbc
-%defattr(-,root,root)
-%{_datadir}/java/*
-%endif
-
%if %test
%files test
%defattr(-,postgres,postgres)
@@ -829,6 +776,16 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Dec 4 2006 Tom Lane <tgl(a)redhat.com> 8.2.0-1
+- Update to PostgreSQL 8.2.0
+- Update to PyGreSQL 3.8.1
+- Fix chcon arguments in test/regress/Makefile
+Related: #201035
+- Adjust init script to not fool /etc/rc.d/rc
+Resolves: #161470
+- Change init script to not do initdb automatically, but require
+ manual "service postgresql initdb" for safety. Per upstream discussions.
+
* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 8.1.4-1.1
- rebuild
diff --git a/sources b/sources
index f1b91dd..ad17314 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-a65bdc5d833169d28bf6fbaaa8d57fcf postgresql-8.1.4.tar.bz2
-312f5e90a63ea17f8c65bc83b85a55f3 PyGreSQL-3.8.tgz
+490cb3a614545cbd3ce9b1c75c1d2b2e postgresql-8.2.0.tar.bz2
+5575979dac93c9c5795d7693a8f91c86 PyGreSQL-3.8.1.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
66d80897840724917cb838c76393692b postgresql-8.1-US.pdf
commit a1b4e26b2e483f1f41098ad1f215a8d5eeb4d255
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Jul 12 07:51:45 2006 +0000
bumped for rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 3835128..0fe077f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.4
-Release: 1
+Release: 1.1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -829,6 +829,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 8.1.4-1.1
+- rebuild
+
* Mon May 22 2006 Tom Lane <tgl(a)redhat.com> 8.1.4-1
- Update to PostgreSQL 8.1.4 (includes fixes for CVE-2006-2313, CVE-2006-2314;
see bug #192173)
commit 702bdb8c8b42b90bef851f30735bfe0ae8deaadd
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon May 22 16:08:15 2006 +0000
Update to PostgreSQL 8.1.4 and PyGreSQL 3.8.
diff --git a/.cvsignore b/.cvsignore
index 2600886..46f586f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.1.3.tar.bz2
-PyGreSQL-3.7.tgz
+postgresql-8.1.4.tar.bz2
+PyGreSQL-3.8.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
postgresql-8.1-US.pdf
diff --git a/postgresql.init b/postgresql.init
index d616b96..96e81eb 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -129,7 +129,7 @@ start(){
touch "$PGLOG" || exit 1
chown postgres:postgres "$PGLOG"
chmod go-rwx "$PGLOG"
- [ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG"
+ [ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG" 2>/dev/null
fi
# Check for the PGDATA structure
diff --git a/postgresql.spec b/postgresql.spec
index 42ed993..3835128 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,8 +81,8 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.1.3
-Release: 2
+Version: 8.1.4
+Release: 1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -101,7 +101,7 @@ Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source17: http://www.postgresql.org/docs/manuals/postgresql-8.1-US.pdf
-Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.7.tgz
+Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.tgz
Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
@@ -349,7 +349,7 @@ cp -p %{SOURCE17} .
PYGRESQLDIR=`basename %{SOURCE18} .tgz`
mv $PYGRESQLDIR PyGreSQL
# Some versions of PyGreSQL.tgz contain wrong file permissions
- chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
+ chmod 644 PyGreSQL/announce.txt PyGreSQL/changelog.txt PyGreSQL/README
chmod 755 PyGreSQL/tutorial
chmod 644 PyGreSQL/tutorial/*.py
chmod 755 PyGreSQL/tutorial/advanced.py PyGreSQL/tutorial/basics.py
@@ -809,7 +809,8 @@ rm -rf $RPM_BUILD_ROOT
%if %python
%files python
%defattr(-,root,root)
-%doc PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
+%doc PyGreSQL/announce.txt PyGreSQL/changelog.txt PyGreSQL/README
+%doc PyGreSQL/tutorial
%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
%{_libdir}/python%{pyver}/site-packages/*.py
%endif
@@ -828,6 +829,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon May 22 2006 Tom Lane <tgl(a)redhat.com> 8.1.4-1
+- Update to PostgreSQL 8.1.4 (includes fixes for CVE-2006-2313, CVE-2006-2314;
+ see bug #192173)
+- Update to PyGreSQL 3.8
+- Suppress noise from chcon, per bug #187744
+
* Mon Mar 27 2006 Tom Lane <tgl(a)redhat.com> 8.1.3-2
- Remove JDBC from this build; we will package it as separate SRPM
diff --git a/sources b/sources
index 52cfdd7..f1b91dd 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-bb510edbb533962c0692e211b3bd8cfa postgresql-8.1.3.tar.bz2
-9fa4c2fc1dd0b3b93a3381c048443e16 PyGreSQL-3.7.tgz
+a65bdc5d833169d28bf6fbaaa8d57fcf postgresql-8.1.4.tar.bz2
+312f5e90a63ea17f8c65bc83b85a55f3 PyGreSQL-3.8.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
66d80897840724917cb838c76393692b postgresql-8.1-US.pdf
commit 5cdde2cf0cc3dcee84bb2622fb081ab0e77b86f4
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Mar 27 21:18:02 2006 +0000
Remove JDBC from this build; we will package it as separate SRPM
diff --git a/.cvsignore b/.cvsignore
index 4f133b9..2600886 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,6 +3,3 @@ PyGreSQL-3.7.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
postgresql-8.1-US.pdf
-postgresql-8.1-405.jdbc2.jar
-postgresql-8.1-405.jdbc2ee.jar
-postgresql-8.1-405.jdbc3.jar
diff --git a/postgresql.spec b/postgresql.spec
index 2b6ca39..42ed993 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@
%{!?aconfver:%define aconfver autoconf}
%{!?tcldevel:%define tcldevel 1}
-%{!?jdbc:%define jdbc 1}
+%{!?jdbc:%define jdbc 0}
%{!?test:%define test 1}
%{!?python:%define python 1}
%{!?pltcl:%define pltcl 1}
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.3
-Release: 1.1
+Release: 2
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -92,9 +92,11 @@ Source3: postgresql.init
Source4: Makefile.regress
Source5: pg_config.h
Source6: README.rpm-dist
+%if %jdbc
Source8: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2.jar
Source9: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2ee.jar
Source10: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc3.jar
+%endif
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
@@ -826,6 +828,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Mar 27 2006 Tom Lane <tgl(a)redhat.com> 8.1.3-2
+- Remove JDBC from this build; we will package it as separate SRPM
+
* Mon Feb 13 2006 Jesse Keating <jkeating(a)redhat.com> - 8.1.3-1.1
- rebump for build order issues during double-long bump
diff --git a/sources b/sources
index 7dcef5b..52cfdd7 100644
--- a/sources
+++ b/sources
@@ -3,6 +3,3 @@ bb510edbb533962c0692e211b3bd8cfa postgresql-8.1.3.tar.bz2
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
66d80897840724917cb838c76393692b postgresql-8.1-US.pdf
-32e874651c4916bfd1a827c503d3505a postgresql-8.1-405.jdbc2.jar
-80ca36179ab2ea0fd4e8dbf6d76ade6a postgresql-8.1-405.jdbc2ee.jar
-2b699f0e686bcf7ec56bea16474ab2c2 postgresql-8.1-405.jdbc3.jar
commit d3e4ca4b5a975614c6ea1cbd14f633528c64c059
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Mar 2 19:04:52 2006 +0000
Minor updates to sync README with the upstream (PGDG) RPM distribution.
diff --git a/README.rpm-dist b/README.rpm-dist
index cdbfc01..6286083 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,6 +1,6 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 8.1, for the PostgreSQL 8.1.0-1 RPMset.
+Version 8.1, for the PostgreSQL 8.1.1-1 RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
-----------------------------------------------------------------------------
@@ -23,9 +23,7 @@ The postmaster '-i' option is NOT used by default in the initscript shipped
with these RPMs. Please do NOT modify the initscript to add the '-i' back
in -- it will get overwritten on the next package upgrade. Rather, see the
section below on the Grand Unified Configuration file, which includes the
-recommended way to get '-i' functionality. Note that as of PostgreSQL 8.0,
-you don't need '-i' anyway if all you want to allow is local TCP/IP
-connections.
+recommended way to get '-i' functionality.
INTRODUCTION
-----------------------------------------------------------------------------
@@ -173,7 +171,7 @@ the beauty of RPM -- you don't have to keep track of the files, RPM does it
for you.
These RPMs are designed to be LSB-compliant -- if you find this not to be the
-case, please let us know by way of the pgsqlrpms-hackers(a)PostgreSQL.org
+case, please let us know by way of the pgsqlrpms-hackers(a)pgfoundry.org
mailing list.
MULTIPLE POSTMASTERS
@@ -280,7 +278,6 @@ This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
beta 0 #build with cassert and do not strip the binaries
-perl 1 #build the postgresql-perl package.
tcl 1 #build the postgresql-tcl package.
jdbc 1 #build the postgresql-jdbc package.
pls 1 #build the postgresql-pl package.
@@ -293,12 +290,14 @@ kerberos 1 #use Kerberos 5 support.
nls 1 #build with national language support.
pam 1 #build with PAM support.
runselftest 1 #do "make check" during the build.
+xml 1 #build contrib/xml2
+pgfts 1 #build with --enable-thread-safety
To use these defines, invoke a rebuild like this:
-rpm --rebuild --define 'perl 0' --define 'tcl 0' \
+rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \
--define 'test 0' --define 'runselftest 1' --define 'kerberos 0' \
- postgresql-8.1.0-1.src.rpm
-This line would disable the perl, tcl, and test subpackages, enable the
+ postgresql-8.1.1-1.src.rpm
+This line would disable the python, tcl, and test subpackages, enable the
regression test run during build, and disable kerberos support.
You might need to disable runselftest if there is an installed version of
@@ -320,11 +319,12 @@ and dependencies.
MORE INFORMATION
-------------------------------------------------------------------------------
-You can get more information at http://www.postgresql.org
+You can get more information at http://www.postgresql.org and
+http://pgfoundry.org/projects/pgsqlrpms
Please help make this packaging better -- let us know if you find problems, or
better ways of doing things. You can reach us by e-mail at
-pgsqlrpms-hackers(a)PostgreSQL.org .
+pgsqlrpms-hackers(a)pgfoundry.org
SUSE products usually ship with the latest version of PostgreSQL that
was available at the time they were released. RPMs for newer versions
commit f9c572344a90869d24c0cecd6f8b3a7b84d6a6d4
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Mon Feb 13 18:43:53 2006 +0000
rebump for build order issues in double-long bump
diff --git a/postgresql.spec b/postgresql.spec
index c855f3f..2b6ca39 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.3
-Release: 1
+Release: 1.1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -826,6 +826,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating(a)redhat.com> - 8.1.3-1.1
+- rebump for build order issues during double-long bump
+
* Mon Feb 13 2006 Tom Lane <tgl(a)redhat.com> 8.1.3-1
- Update to PostgreSQL 8.1.3 (fixes bug #180617, CVE-2006-0553)
- Update to jdbc driver build 405
commit 3b6d1bc1365ee6ab6e47a204e636b0f4a89acbdb
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Feb 13 15:53:02 2006 +0000
Update to PostgreSQL 8.1.3 (CVE-2006-0553); also update JDBC driver and fix
bug #177564.
diff --git a/.cvsignore b/.cvsignore
index 30d6381..4f133b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,8 @@
-postgresql-8.1.2.tar.bz2
+postgresql-8.1.3.tar.bz2
PyGreSQL-3.7.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
-postgresql-8.1-404.jdbc2.jar
-postgresql-8.1-404.jdbc2ee.jar
-postgresql-8.1-404.jdbc3.jar
postgresql-8.1-US.pdf
+postgresql-8.1-405.jdbc2.jar
+postgresql-8.1-405.jdbc2ee.jar
+postgresql-8.1-405.jdbc3.jar
diff --git a/pg_config.h b/pg_config.h
index 4f1df24..f00828a 100644
--- a/pg_config.h
+++ b/pg_config.h
@@ -4,13 +4,14 @@
* identical. Hence, this file is architecture-independent and calls
* in an arch-dependent file that will appear in just one RPM.
*
+ * To avoid breaking arches not explicitly supported by Red Hat, we
+ * use this indirection file *only* on known multilib arches.
+ *
* Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway.
*/
#if defined(__x86_64__)
#include "pg_config_x86_64.h"
-#elif defined(__ia64__)
-#include "pg_config_ia64.h"
#elif defined(__i386__)
#include "pg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
diff --git a/postgresql.spec b/postgresql.spec
index af982ab..c855f3f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,8 +81,8 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.1.2
-Release: 1.1
+Version: 8.1.3
+Release: 1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -92,9 +92,9 @@ Source3: postgresql.init
Source4: Makefile.regress
Source5: pg_config.h
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc3.jar
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
@@ -471,10 +471,17 @@ make -C contrib/xml2 DESTDIR=$RPM_BUILD_ROOT install
%endif
# multilib header hack; note pg_config.h is installed in two places!
-mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
-mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+# we only apply this to known Red Hat multilib arches, per bug #177564
+case `uname -i` in
+ i386 | x86_64 | ppc | ppc64 | s390 | s390x)
+ mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
+ mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+ ;;
+ *)
+ ;;
+esac
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
@@ -819,6 +826,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Feb 13 2006 Tom Lane <tgl(a)redhat.com> 8.1.3-1
+- Update to PostgreSQL 8.1.3 (fixes bug #180617, CVE-2006-0553)
+- Update to jdbc driver build 405
+- Modify multilib header hack to not break non-RH arches, per bug #177564
+
* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 8.1.2-1.1
- rebuilt for new gcc4.1 snapshot and glibc changes
diff --git a/sources b/sources
index bdc1c2d..7dcef5b 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
-12d54a11bc3a414477d37ef338bec161 postgresql-8.1.2.tar.bz2
+bb510edbb533962c0692e211b3bd8cfa postgresql-8.1.3.tar.bz2
9fa4c2fc1dd0b3b93a3381c048443e16 PyGreSQL-3.7.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
-441d73f6f3a56c1abf8970ed79f51d28 postgresql-8.1-404.jdbc2.jar
-f506ae68d039bcc820641c1b1a8430c7 postgresql-8.1-404.jdbc2ee.jar
-8d8788f0a8b8d2184b452e3f34d62966 postgresql-8.1-404.jdbc3.jar
66d80897840724917cb838c76393692b postgresql-8.1-US.pdf
+32e874651c4916bfd1a827c503d3505a postgresql-8.1-405.jdbc2.jar
+80ca36179ab2ea0fd4e8dbf6d76ade6a postgresql-8.1-405.jdbc2ee.jar
+2b699f0e686bcf7ec56bea16474ab2c2 postgresql-8.1-405.jdbc3.jar
commit 396c0e4db9cc3d486d6a5d923854d2cf40e22e50
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 7 13:35:32 2006 +0000
bump for new gcc/glibc
diff --git a/postgresql.spec b/postgresql.spec
index d382d29..af982ab 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.2
-Release: 1
+Release: 1.1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -819,6 +819,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 8.1.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
* Mon Jan 9 2006 Tom Lane <tgl(a)redhat.com> 8.1.2-1
- Update to PostgreSQL 8.1.2
- Repair extraneous quote in pgtcl configure script ... odd that bash
commit 1dfa8f900779acf120bb3b0ce5d1ee0a4ea4209a
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Jan 9 17:59:35 2006 +0000
Repair extraneous quote in pgtcl configure script ... odd that bash didn't
use to spit up on this.
diff --git a/postgresql.spec b/postgresql.spec
index 3973fa3..d382d29 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -109,6 +109,7 @@ Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
+Patch7: pgtcl-quote.patch
Buildrequires: perl glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
@@ -329,6 +330,7 @@ popd
%patch4 -p1
# patch5 is applied later
%patch6 -p1
+# patch7 is applied later
#call autoconf 2.53 or greater
%aconfver
@@ -360,6 +362,7 @@ cp -p %{SOURCE17} .
mv $PGTCLDOCDIR Pgtcl-docs
%patch5 -p0
+%patch7 -p0
pushd Pgtcl
%aconfver
popd
@@ -816,8 +819,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Sun Jan 8 2006 Tom Lane <tgl(a)redhat.com> 8.1.2-1
+* Mon Jan 9 2006 Tom Lane <tgl(a)redhat.com> 8.1.2-1
- Update to PostgreSQL 8.1.2
+- Repair extraneous quote in pgtcl configure script ... odd that bash
+ didn't use to spit up on this.
* Thu Dec 15 2005 Tom Lane <tgl(a)redhat.com> 8.1.1-3
- fix pg_config.h for 64-bit and ppc platforms
commit 49d3183d225e598be2288e4165e9fc0844a31d22
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Jan 9 01:14:36 2006 +0000
Update to PostgreSQL 8.1.2.
diff --git a/.cvsignore b/.cvsignore
index 91041d8..30d6381 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.1.1.tar.bz2
+postgresql-8.1.2.tar.bz2
PyGreSQL-3.7.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
diff --git a/postgresql.spec b/postgresql.spec
index 27ead00..3973fa3 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -81,8 +81,8 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.1.1
-Release: 3
+Version: 8.1.2
+Release: 1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -816,6 +816,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Jan 8 2006 Tom Lane <tgl(a)redhat.com> 8.1.2-1
+- Update to PostgreSQL 8.1.2
+
* Thu Dec 15 2005 Tom Lane <tgl(a)redhat.com> 8.1.1-3
- fix pg_config.h for 64-bit and ppc platforms
- update Makefile.regress (needs to --load-language=plpgsql)
diff --git a/sources b/sources
index d66a8e9..bdc1c2d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-d22d7bd1d5e5f9aa89d574ff66e2c8bb postgresql-8.1.1.tar.bz2
+12d54a11bc3a414477d37ef338bec161 postgresql-8.1.2.tar.bz2
9fa4c2fc1dd0b3b93a3381c048443e16 PyGreSQL-3.7.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
commit fc98a4f6097a1d8f1c2f5efbfb66029ddc6879f7
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Dec 15 19:38:07 2005 +0000
Fix pg_config.h, also update postgresql-test Makefile to work with 8.1.
diff --git a/Makefile.regress b/Makefile.regress
index 9a825c2..5ec27f0 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -17,10 +17,10 @@ srcdir := .
check: installcheck-parallel
installcheck: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
installcheck-parallel: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT)
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
# The tests command the server to write into testtablespace and results.
# On a SELinux-enabled system this will fail unless we mark those directories
@@ -37,10 +37,10 @@ runtest: installcheck
runtest-parallel: installcheck-parallel
bigtest: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) numeric_big
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
bigcheck: cleandirs
- $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) numeric_big
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
##
diff --git a/pg_config.h b/pg_config.h
index 8e93875..4f1df24 100644
--- a/pg_config.h
+++ b/pg_config.h
@@ -7,24 +7,18 @@
* Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway.
*/
-#ifdef __i386__
-#include "pg_config_i386.h"
-#endif
-#ifdef __x86_64__
+#if defined(__x86_64__)
#include "pg_config_x86_64.h"
-#endif
-#ifdef __ia64__
+#elif defined(__ia64__)
#include "pg_config_ia64.h"
-#endif
-#ifdef __ppc__
-#include "pg_config_ppc.h"
-#endif
-#ifdef __ppc64__
+#elif defined(__i386__)
+#include "pg_config_i386.h"
+#elif defined(__ppc64__) || defined(__powerpc64__)
#include "pg_config_ppc64.h"
-#endif
-#ifdef __s390__
-#include "pg_config_s390.h"
-#endif
-#ifdef __s390x__
+#elif defined(__ppc__) || defined(__powerpc__)
+#include "pg_config_ppc.h"
+#elif defined(__s390x__)
#include "pg_config_s390x.h"
+#elif defined(__s390__)
+#include "pg_config_s390.h"
#endif
diff --git a/postgresql.spec b/postgresql.spec
index 0eef07c..27ead00 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.1
-Release: 2
+Release: 3
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -816,6 +816,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Dec 15 2005 Tom Lane <tgl(a)redhat.com> 8.1.1-3
+- fix pg_config.h for 64-bit and ppc platforms
+- update Makefile.regress (needs to --load-language=plpgsql)
+
* Wed Dec 14 2005 Tom Lane <tgl(a)redhat.com> 8.1.1-2
- oops, looks like we want uname -i not uname -m
commit d644a0e2b0460a61bfdbb4e3a5e687ebe3360ae2
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Dec 15 04:34:51 2005 +0000
oops, looks like we want uname -i not uname -m
diff --git a/postgresql.spec b/postgresql.spec
index d245e11..0eef07c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.1
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -468,9 +468,9 @@ make -C contrib/xml2 DESTDIR=$RPM_BUILD_ROOT install
%endif
# multilib header hack; note pg_config.h is installed in two places!
-mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -m`.h
+mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
-mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -m`.h
+mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
@@ -816,6 +816,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Dec 14 2005 Tom Lane <tgl(a)redhat.com> 8.1.1-2
+- oops, looks like we want uname -i not uname -m
+
* Wed Dec 14 2005 Tom Lane <tgl(a)redhat.com> 8.1.1-1
- Update to PostgreSQL 8.1.1
- Make pg_config.h architecture-independent for multilib installs;
commit a15ec211c95d7f72e508867d9af6290da5995d14
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Dec 14 22:33:00 2005 +0000
Update to PostgreSQL 8.1.1; fix multilib issues for devel package.
diff --git a/.cvsignore b/.cvsignore
index 45355c1..91041d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.1.0.tar.bz2
+postgresql-8.1.1.tar.bz2
PyGreSQL-3.7.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
diff --git a/pg_config.h b/pg_config.h
new file mode 100644
index 0000000..8e93875
--- /dev/null
+++ b/pg_config.h
@@ -0,0 +1,30 @@
+/*
+ * Kluge to support multilib installation of both 32- and 64-bit RPMS:
+ * we need to arrange that header files that appear in both RPMs are
+ * identical. Hence, this file is architecture-independent and calls
+ * in an arch-dependent file that will appear in just one RPM.
+ *
+ * Note: this may well fail if user tries to use gcc's -I- option.
+ * But that option is deprecated anyway.
+ */
+#ifdef __i386__
+#include "pg_config_i386.h"
+#endif
+#ifdef __x86_64__
+#include "pg_config_x86_64.h"
+#endif
+#ifdef __ia64__
+#include "pg_config_ia64.h"
+#endif
+#ifdef __ppc__
+#include "pg_config_ppc.h"
+#endif
+#ifdef __ppc64__
+#include "pg_config_ppc64.h"
+#endif
+#ifdef __s390__
+#include "pg_config_s390.h"
+#endif
+#ifdef __s390x__
+#include "pg_config_s390x.h"
+#endif
diff --git a/postgresql.spec b/postgresql.spec
index f7caada..d245e11 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -48,17 +48,17 @@
# The base package, the lib package, the devel package, and the server package always get built.
#build7x, build8, and build9 similar
-%{?build8:%define build89 1}
-%{?build9:%define build89 1}
%{?build7x:%define tcldevel 0}
-%{?build8:%define tcldevel 0}
%{?build7x:%define aconfver autoconf-2.53}
-
-%{!?aconfver:%define aconfver autoconf}
+%{?build8:%define build89 1}
+%{?build8:%define tcldevel 0}
+%{?build9:%define build89 1}
%define beta 0
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
+%{!?aconfver:%define aconfver autoconf}
+
%{!?tcldevel:%define tcldevel 1}
%{!?jdbc:%define jdbc 1}
%{!?test:%define test 1}
@@ -81,8 +81,8 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.1.0
-Release: 4.1
+Version: 8.1.1
+Release: 1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -90,6 +90,7 @@ Url: http://www.postgresql.org/
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init
Source4: Makefile.regress
+Source5: pg_config.h
Source6: README.rpm-dist
Source8: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2.jar
Source9: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2ee.jar
@@ -466,6 +467,12 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
make -C contrib/xml2 DESTDIR=$RPM_BUILD_ROOT install
%endif
+# multilib header hack; note pg_config.h is installed in two places!
+mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -m`.h
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
+mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -m`.h
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
@@ -809,6 +816,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Dec 14 2005 Tom Lane <tgl(a)redhat.com> 8.1.1-1
+- Update to PostgreSQL 8.1.1
+- Make pg_config.h architecture-independent for multilib installs;
+ put the original pg_config.h into pg_config_$ARCH.h
+
* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
- rebuilt
diff --git a/sources b/sources
index bd3b791..d66a8e9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-5e1f1a7c5f62170b56a3bf2512fdec2d postgresql-8.1.0.tar.bz2
+d22d7bd1d5e5f9aa89d574ff66e2c8bb postgresql-8.1.1.tar.bz2
9fa4c2fc1dd0b3b93a3381c048443e16 PyGreSQL-3.7.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
commit 3159c0a81119e7b8b5e90f0ec48698db6979f5e8
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Fri Dec 9 22:42:46 2005 +0000
gcc update bump
diff --git a/postgresql.spec b/postgresql.spec
index fe67f62..f7caada 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.0
-Release: 4
+Release: 4.1
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -809,6 +809,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
+- rebuilt
+
* Sat Nov 12 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-4
- Update included PDF-format manual to 8.1.
commit d925f018c42cc252c2644f01152408157f33df2d
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Nov 12 19:58:46 2005 +0000
Update included PDF-format manual to 8.1.
diff --git a/.cvsignore b/.cvsignore
index 60d1b46..45355c1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,4 +5,4 @@ pgtcldocs-20041108.zip
postgresql-8.1-404.jdbc2.jar
postgresql-8.1-404.jdbc2ee.jar
postgresql-8.1-404.jdbc3.jar
-postgresql-8.0-US.pdf
+postgresql-8.1-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 4bf8d5f..fe67f62 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.0
-Release: 3
+Release: 4
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -97,7 +97,7 @@ Source10: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc3.jar
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.0-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.1-US.pdf
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.7.tgz
Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
@@ -809,6 +809,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Nov 12 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-4
+- Update included PDF-format manual to 8.1.
+
* Wed Nov 9 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-3
- Rebuild due to openssl library update.
diff --git a/sources b/sources
index 9153d31..bd3b791 100644
--- a/sources
+++ b/sources
@@ -5,4 +5,4 @@ d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
441d73f6f3a56c1abf8970ed79f51d28 postgresql-8.1-404.jdbc2.jar
f506ae68d039bcc820641c1b1a8430c7 postgresql-8.1-404.jdbc2ee.jar
8d8788f0a8b8d2184b452e3f34d62966 postgresql-8.1-404.jdbc3.jar
-2edd229aa83105175a1212a001dd030a postgresql-8.0-US.pdf
+66d80897840724917cb838c76393692b postgresql-8.1-US.pdf
commit 70e7092d312d6336257114f48b00c89cf75ad91a
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Nov 9 22:36:40 2005 +0000
Rebuild due to openssl library update (this time for sure?)
diff --git a/postgresql.spec b/postgresql.spec
index c756903..4bf8d5f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.0
-Release: 2
+Release: 3
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -809,6 +809,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Nov 9 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-3
+- Rebuild due to openssl library update.
+
* Wed Nov 9 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-2
- Rebuild due to openssl library update.
commit 4fe43eb8022cfdee3c285fc3d390c60b1aec516f
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Nov 9 17:58:45 2005 +0000
Rebuild due to openssl library update.
diff --git a/postgresql.spec b/postgresql.spec
index 5e3680f..c756903 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.0
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -809,6 +809,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Nov 9 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-2
+- Rebuild due to openssl library update.
+
* Mon Nov 7 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-1
- Update to PostgreSQL 8.1.0, PyGreSQL 3.7, and jdbc driver build 404
- Fix PAM config file (must have account not only auth) (bug #167040)
commit 80b1caeeda0486d9992ce525f9aaf15e5e6d1fde
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Nov 7 21:54:56 2005 +0000
Update to PostgreSQL 8.1.0, fix bugs 167040 and 170141.
diff --git a/.cvsignore b/.cvsignore
index 8f41596..60d1b46 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,8 @@
-postgresql-8.0.4.tar.bz2
-PyGreSQL-3.6.2.tgz
+postgresql-8.1.0.tar.bz2
+PyGreSQL-3.7.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
-postgresql-8.0-312.jdbc2.jar
-postgresql-8.0-312.jdbc2ee.jar
-postgresql-8.0-312.jdbc3.jar
+postgresql-8.1-404.jdbc2.jar
+postgresql-8.1-404.jdbc2ee.jar
+postgresql-8.1-404.jdbc3.jar
postgresql-8.0-US.pdf
diff --git a/README.rpm-dist b/README.rpm-dist
index 6a143e8..cdbfc01 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,6 +1,6 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 8.0, for the PostgreSQL 8.0.0-1PGDG RPMset.
+Version 8.1, for the PostgreSQL 8.1.0-1 RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
-----------------------------------------------------------------------------
@@ -33,9 +33,9 @@ This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 8.0 of PostgreSQL,
+This document is written to be applicable to version 8.1 of PostgreSQL,
which is the current version of the RPMs as of this writing. More to the
-point, versions prior to 8.0 are not documented here.
+point, versions prior to 8.1 are not documented here.
Official PostgreSQL Global Development Group RPMs have from version 7.1.2
on carried a 'PGDG' after the release number. Other RPMsets distributed
@@ -173,8 +173,8 @@ the beauty of RPM -- you don't have to keep track of the files, RPM does it
for you.
These RPMs are designed to be LSB-compliant -- if you find this not to be the
-case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
-list.
+case, please let us know by way of the pgsqlrpms-hackers(a)PostgreSQL.org
+mailing list.
MULTIPLE POSTMASTERS
-------------------------------------------------------------------------------
@@ -272,15 +272,13 @@ you will need to rebuild from the source RPM. Download the .src.rpm for this
release. You will need to be root to rebuild, unless you have already set up
a non-root build environment.
-Install the source RPM with rpm -i, then CD to the rpm building area (on RedHat
-this is /usr/src/redhat by default). You will have to have a full development
-environment to rebuild the full RPM set.
+Install the source RPM with rpm -i, then CD to the rpm building area (on Red
+Hat or Fedora Core this is /usr/src/redhat by default). You will have to have
+a full development environment to rebuild the full RPM set.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
-build6x undef #don't build for Red Hat 6.x. Define it to cause
- # other options to be tailored to 6.x.
beta 0 #build with cassert and do not strip the binaries
perl 1 #build the postgresql-perl package.
tcl 1 #build the postgresql-tcl package.
@@ -299,7 +297,7 @@ runselftest 1 #do "make check" during the build.
To use these defines, invoke a rebuild like this:
rpm --rebuild --define 'perl 0' --define 'tcl 0' \
--define 'test 0' --define 'runselftest 1' --define 'kerberos 0' \
- postgresql-8.0.0-1PGDG.src.rpm
+ postgresql-8.1.0-1.src.rpm
This line would disable the perl, tcl, and test subpackages, enable the
regression test run during build, and disable kerberos support.
@@ -324,12 +322,14 @@ MORE INFORMATION
-------------------------------------------------------------------------------
You can get more information at http://www.postgresql.org
-Please help make this packaging better -- let me know if you find problems, or
-better ways of doing things. You can reach me by e-mail at
-pgsql-ports(a)postgresql.org -- please include an [RPM] string in the subject, as
-I use automatic mail folder processing to put mail in the right place.
+Please help make this packaging better -- let us know if you find problems, or
+better ways of doing things. You can reach us by e-mail at
+pgsqlrpms-hackers(a)PostgreSQL.org .
-SuSE information is available at SuSE's website and information contacts.
-A 7.4 SuSE RPM is available on ftp.postgresql.org. It is different from this
-RPM due to SuSE's different needs.
------------------------------------------------------------------------------
+SUSE products usually ship with the latest version of PostgreSQL that
+was available at the time they were released. RPMs for newer versions
+of PostgreSQL can be found on the SUSE FTP server and it's mirrors.
+
+ftp://ftp.suse.com/pub/projects/postgresql
+http://www.novell.com/products/linuxprofessional/downloads/ftp/int_mirrors.html
+-------------------------------------------------------------------------------
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
index 0905249..22a891d 100644
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@@ -1,32 +1,36 @@
-diff -Naur postgresql-8.0.0rc5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.0.0rc5/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-8.0.0rc5.orig/src/backend/utils/misc/postgresql.conf.sample 2004-11-05 14:16:16.000000000 -0500
-+++ postgresql-8.0.0rc5/src/backend/utils/misc/postgresql.conf.sample 2005-01-11 19:18:21.282906899 -0500
-@@ -177,22 +177,22 @@
- # platform.
+diff -Naur postgresql-8.1.0.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.1.0/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-8.1.0.orig/src/backend/utils/misc/postgresql.conf.sample 2005-10-08 15:32:58.000000000 -0400
++++ postgresql-8.1.0/src/backend/utils/misc/postgresql.conf.sample 2005-11-07 15:04:13.000000000 -0500
+@@ -211,15 +211,15 @@
+ # depending on platform.
- # This is relevant when logging to stderr:
--#redirect_stderr = false # Enable capturing of stderr into log files.
-+redirect_stderr = true # Enable capturing of stderr into log files.
- # These are only relevant if redirect_stderr is true:
--#log_directory = 'pg_log' # Directory where log files are written.
-+log_directory = 'pg_log' # Directory where log files are written.
- # May be specified absolute or relative to PGDATA
+ # This is used when logging to stderr:
+-#redirect_stderr = off # Enable capturing of stderr into log
++redirect_stderr = on # Enable capturing of stderr into log
+ # files
+
+ # These are only used if redirect_stderr is on:
+-#log_directory = 'pg_log' # Directory where log files are written
++log_directory = 'pg_log' # Directory where log files are written
+ # Can be absolute or relative to PGDATA
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # Log file name pattern.
-+log_filename = 'postgresql-%a.log' # Log file name pattern.
- # May include strftime() escapes
--#log_truncate_on_rotation = false # If true, any existing log file of the
-+log_truncate_on_rotation = true # If true, any existing log file of the
- # same name as the new log file will be truncated
- # rather than appended to. But such truncation
- # only occurs on time-driven rotation,
- # not on restarts or size-driven rotation.
- # Default is false, meaning append to existing
- # files in all cases.
--#log_rotation_age = 1440 # Automatic rotation of logfiles will happen after
-+log_rotation_age = 1440 # Automatic rotation of logfiles will happen after
- # so many minutes. 0 to disable.
--#log_rotation_size = 10240 # Automatic rotation of logfiles will happen after
-+log_rotation_size = 0 # Automatic rotation of logfiles will happen after
- # so many kilobytes of log output. 0 to disable.
++log_filename = 'postgresql-%a.log' # Log file name pattern.
+ # Can include strftime() escapes
+-#log_truncate_on_rotation = off # If on, any existing log file of the same
++log_truncate_on_rotation = on # If on, any existing log file of the same
+ # name as the new log file will be
+ # truncated rather than appended to. But
+ # such truncation only occurs on
+@@ -227,10 +227,10 @@
+ # or size-driven rotation. Default is
+ # off, meaning append to existing files
+ # in all cases.
+-#log_rotation_age = 1440 # Automatic rotation of logfiles will
++log_rotation_age = 1440 # Automatic rotation of logfiles will
+ # happen after so many minutes. 0 to
+ # disable.
+-#log_rotation_size = 10240 # Automatic rotation of logfiles will
++log_rotation_size = 0 # Automatic rotation of logfiles will
+ # happen after so many kilobytes of log
+ # output. 0 to disable.
- # These are relevant when logging to syslog:
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 4d27d10..93c9534 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,9 +7,9 @@ So work around it by adding an rpath spec to plperl.so (only).
Per bug #162198.
-diff -Naur postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile postgresql-8.0.4/src/pl/plperl/GNUmakefile
---- postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile 2005-07-17 00:05:49.000000000 -0400
-+++ postgresql-8.0.4/src/pl/plperl/GNUmakefile 2005-10-04 17:40:51.000000000 -0400
+diff -Naur postgresql-8.1.0.orig/src/pl/plperl/GNUmakefile postgresql-8.1.0/src/pl/plperl/GNUmakefile
+--- postgresql-8.1.0.orig/src/pl/plperl/GNUmakefile 2005-07-13 13:12:56.000000000 -0400
++++ postgresql-8.1.0/src/pl/plperl/GNUmakefile 2005-11-07 15:10:33.000000000 -0500
@@ -36,6 +36,9 @@
SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
@@ -17,6 +17,6 @@ diff -Naur postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile postgresql-8.0.4/src/
+# Force rpath to be used even though we disable it everywhere else
+SHLIB_LINK += $(rpath)
+
- include $(top_srcdir)/src/Makefile.shlib
-
+ REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl
+ REGRESS = plperl plperl_trigger plperl_shared plperl_elog
diff --git a/postgresql.pam b/postgresql.pam
index 2630c7f..40bfa6f 100644
--- a/postgresql.pam
+++ b/postgresql.pam
@@ -1,2 +1,3 @@
#%PAM-1.0
auth include system-auth
+account include system-auth
diff --git a/postgresql.spec b/postgresql.spec
index 3d0a1a0..5e3680f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,12 +1,52 @@
-# build6x usage: define to 1 to build for RHL6.x. Don't define at all for others.
-%{?build6x:%define kerberos 0}
-%{?build6x:%define nls 0}
-%{?build6x:%define ssl 0}
-%{?build6x:%define tcldevel 0}
-%{?build6x:%define aconfver /bin/true}
-#work around the undefined or defined to 1 build 6x interaction with the pam stuff
-%{!?build6x:%define non6xpamdeps 1}
-%{?build6x:%define non6xpamdeps 0}
+# Conventions for PostgreSQL Global Development Group RPM releases:
+
+# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
+# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
+# test releases.
+
+# Pre-releases are those that are built from CVS snapshots or pre-release
+# tarballs from postgresql.org. Official beta releases are not
+# considered pre-releases, nor are release candidates, as their beta or
+# release candidate status is reflected in the version of the tarball. Pre-
+# releases' versions do not change -- the pre-release tarball of 7.0.3, for
+# example, has the same tarball version as the final official release of 7.0.3:
+# but the tarball is different.
+
+# Test releases are where PostgreSQL itself is not in beta, but certain parts of
+# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
+
+# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
+# -- only test releases or full releases should be.
+# This is the PostgreSQL Global Development Group Official RPMset spec file,
+# or a derivative thereof.
+# Copyright 2003 Lamar Owen <lowen(a)pari.edu> <lamar.owen(a)wgcr.org>
+# and others listed.
+
+# Major Contributors:
+# ---------------
+# Lamar Owen
+# Trond Eivind Glomsrd <teg(a)redhat.com>
+# Thomas Lockhart
+# Reinhard Max
+# Karl DeBisschop
+# Peter Eisentraut
+# Joe Conway
+# Andrew Overholt
+# David Jee
+# Kaj J. Niemi
+# Sander Steffann
+# Tom Lane
+# and others in the Changelog....
+
+# This spec file and ancilliary files are licensed in accordance with
+# The PostgreSQL license.
+
+# In this file you can find the default build package list macros. These can be overridden by defining
+# on the rpm command line:
+# rpm --define 'packagename 1' .... to force the package to build.
+# rpm --define 'packagename 0' .... to force the package NOT to build.
+# The base package, the lib package, the devel package, and the server package always get built.
+
#build7x, build8, and build9 similar
%{?build8:%define build89 1}
%{?build9:%define build89 1}
@@ -14,25 +54,24 @@
%{?build8:%define tcldevel 0}
%{?build7x:%define aconfver autoconf-2.53}
-%{!?tcldevel:%define tcldevel 1}
%{!?aconfver:%define aconfver autoconf}
%define beta 0
-
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
-%{!?tcl:%define tcl 1}
+%{!?tcldevel:%define tcldevel 1}
%{!?jdbc:%define jdbc 1}
%{!?test:%define test 1}
%{!?python:%define python 1}
%{!?pltcl:%define pltcl 1}
%{!?plperl:%define plperl 1}
+%{!?tcl:%define tcl 1}
%{!?pls:%define pls 1}
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
-%{!?pam:%define pam 1}
%{!?xml:%define xml 1}
+%{!?pam:%define pam 1}
%{!?pgfts:%define pgfts 1}
%{!?runselftest:%define runselftest 1}
@@ -42,84 +81,71 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.0.4
-
-# Conventions for PostgreSQL Global Development Group RPM releases:
-
-# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
-# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
-# test releases.
-
-# Pre-releases are those that are built from CVS snapshots or pre-release
-# tarballs from postgresql.org. Official beta releases are not
-# considered pre-releases, nor are release candidates, as their beta or
-# release candidate status is reflected in the version of the tarball. Pre-
-# releases' versions do not change -- the pre-release tarball of 7.0.3, for
-# example, has the same tarball version as the final official release of 7.0.3:
-# but the tarball is different.
-
-# Test releases are where PostgreSQL itself is not in beta, but certain parts of
-# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
-
-# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
-# -- only test releases or full releases should be.
-
-Release: 2
+Version: 8.1.0
+Release: 1
License: BSD
Group: Applications/Databases
+Url: http://www.postgresql.org/
+
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init
Source4: Makefile.regress
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/postgresql-8.0-312.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.0-312.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.0-312.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc3.jar
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source17: postgresql-8.0-US.pdf
-Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.2.tgz
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.0-US.pdf
+Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.7.tgz
Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
+
Patch1: rpm-pgsql.patch
Patch2: postgresql-src-tutorial.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
Patch6: postgresql-perl-rpath.patch
-Buildrequires: perl glibc-devel bison flex
+
+Buildrequires: perl glibc-devel bison flex autoconf
Prereq: /sbin/ldconfig initscripts
+
%if %python
BuildPrereq: python-devel
%endif
+
%if %tcl || %pltcl
BuildPrereq: tcl
%if %tcldevel
Buildrequires: tcl-devel
%endif
%endif
+
BuildPrereq: readline-devel
BuildPrereq: zlib-devel >= 1.0.4
+
%if %ssl
BuildPrereq: openssl-devel
%endif
+
%if %kerberos
BuildPrereq: krb5-devel
BuildPrereq: e2fsprogs-devel
%endif
+
%if %nls
BuildPrereq: gettext >= 0.10.35
%endif
-%if %pam
-%if %non6xpamdeps
-BuildPrereq: pam-devel
-%endif
-%endif
+
%if %xml
-BuildPrereq: libxml2-devel
+BuildPrereq: libxml2-devel libxslt-devel
%endif
-Url: http://www.postgresql.org/
+%if %pam
+BuildPrereq: pam-devel
+%endif
Obsoletes: postgresql-clients
Obsoletes: postgresql-perl
@@ -128,37 +154,6 @@ Obsoletes: rh-postgresql
Buildroot: %{_tmppath}/%{name}-%{version}-root
-# This is the PostgreSQL Global Development Group Official RPMset spec file,
-# or a derivative thereof.
-# Copyright 2003 Lamar Owen <lowen(a)pari.edu> <lamar.owen(a)wgcr.org>
-# and others listed.
-
-# Major Contributors:
-# ---------------
-# Lamar Owen
-# Trond Eivind Glomsrd <teg(a)redhat.com>
-# Thomas Lockhart
-# Reinhard Max
-# Karl DeBisschop
-# Peter Eisentraut
-# Joe Conway
-# Andrew Overholt
-# David Jee
-# Kaj J. Niemi
-# Sander Steffann
-# Tom Lane
-# and others in the Changelog....
-
-# This spec file and ancilliary files are licensed in accordance with
-# The PostgreSQL license.
-
-# On top of this file you can find the default build package list macros. These can be overridden by defining
-# on the rpm command line:
-# rpm --define 'packagename 1' .... to force the package to build.
-# rpm --define 'packagename 0' .... to force the package NOT to build.
-# The base package, the lib package, the devel package, and the server package always get built.
-
-
%description
PostgreSQL is an advanced Object-Relational database management system
(DBMS) that supports almost all SQL constructs (including
@@ -243,9 +238,7 @@ The postgresql-devel package contains the header files and libraries
needed to compile C or C++ applications which will directly interact
with a PostgreSQL database management server and the ecpg Embedded C
Postgres preprocessor. You need to install this package if you want to
-develop applications which will interact with a PostgreSQL server. If
-you're installing postgresql-server, you need to install this
-package.
+develop applications which will interact with a PostgreSQL server.
#------------
%if %pls
@@ -258,7 +251,7 @@ Obsoletes: rh-postgresql-pl
%description pl
PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-pl package contains the the PL/Perl, PL/Tcl, and PL/Python
+system. The postgresql-pl package contains the PL/Perl, PL/Tcl, and PL/Python
procedural languages for the backend. PL/Pgsql is part of the core server package.
%endif
@@ -514,12 +507,6 @@ then
fi
%endif
-# Remove stuff we don't want to ship.
-rm -f $RPM_BUILD_ROOT%{_bindir}/findoidjoins
-rm -f $RPM_BUILD_ROOT%{_bindir}/make_oidjoins_check
-rm -f $RPM_BUILD_ROOT%{_docdir}/pgsql/contrib/README.findoidjoins
-rm -f contrib/findoidjoins/README.findoidjoins
-
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
@@ -648,6 +635,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/pg_dumpall
%{_bindir}/pg_restore
%{_bindir}/psql
+%{_bindir}/reindexdb
%{_bindir}/vacuumdb
%{_mandir}/man1/clusterdb.*
%{_mandir}/man1/createdb.*
@@ -660,6 +648,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/pg_dumpall.*
%{_mandir}/man1/pg_restore.*
%{_mandir}/man1/psql.*
+%{_mandir}/man1/reindexdb.*
%{_mandir}/man1/vacuumdb.*
%{_mandir}/man7/*
%dir %{_libdir}/pgsql
@@ -678,7 +667,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/chkpass.so
%{_libdir}/pgsql/cube.so
%{_libdir}/pgsql/dblink.so
-%{_libdir}/pgsql/dbsize.so
%{_libdir}/pgsql/earthdistance.so
%{_libdir}/pgsql/fti.so
%{_libdir}/pgsql/fuzzystrmatch.so
@@ -687,20 +675,16 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/isbn_issn.so
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
-%{_libdir}/pgsql/misc_utils.so
%{_libdir}/pgsql/moddatetime.so
-%{_libdir}/pgsql/noup.so
%{_libdir}/pgsql/pending.so
%{_libdir}/pgsql/pgcrypto.so
%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/pg_buffercache.so
%{_libdir}/pgsql/pg_trgm.so
%{_libdir}/pgsql/refint.so
-%{_libdir}/pgsql/rtree_gist.so
%{_libdir}/pgsql/seg.so
-%{_libdir}/pgsql/string_io.so
%{_libdir}/pgsql/tablefunc.so
%{_libdir}/pgsql/timetravel.so
-%{_libdir}/pgsql/tsearch.so
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/user_locks.so
%if %xml
@@ -709,15 +693,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/contrib/
%{_bindir}/DBMirror.pl
%{_bindir}/clean_pending.pl
-%{_bindir}/my2pg.pl
-%{_bindir}/mysql2pgsql
%{_bindir}/dbf2pg
%{_bindir}/fti.pl
%{_bindir}/oid2name
-%{_bindir}/pg_dumplo
%{_bindir}/pgbench
%{_bindir}/vacuumlo
-%{_bindir}/pg_autovacuum
%doc contrib/*/README.* contrib/spi/*.example
%files libs -f libpq.lang
@@ -731,7 +711,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
/etc/rc.d/init.d/postgresql
%if %pam
-/etc/pam.d/postgresql
+%config(noreplace) /etc/pam.d/postgresql
%endif
%attr (755,root,root) %dir /etc/sysconfig/pgsql
%{_bindir}/initdb
@@ -829,6 +809,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Nov 7 2005 Tom Lane <tgl(a)redhat.com> 8.1.0-1
+- Update to PostgreSQL 8.1.0, PyGreSQL 3.7, and jdbc driver build 404
+- Fix PAM config file (must have account not only auth) (bug #167040)
+- Add BuildPrereq: libxslt-devel (bug #170141)
+- Sync with PGDG SRPM as much as feasible
+
* Fri Oct 14 2005 Tomas Mraz <tmraz(a)redhat.com>
- use include instead of pam_stack in pam config
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch
index 87eff85..ee77427 100644
--- a/rpm-pgsql.patch
+++ b/rpm-pgsql.patch
@@ -1,6 +1,6 @@
-diff -Naur postgresql-8.0.0rc5.orig/src/Makefile.global.in postgresql-8.0.0rc5/src/Makefile.global.in
---- postgresql-8.0.0rc5.orig/src/Makefile.global.in 2004-12-18 21:16:18.000000000 -0500
-+++ postgresql-8.0.0rc5/src/Makefile.global.in 2005-01-11 16:06:30.570550658 -0500
+diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Makefile.global.in
+--- postgresql-8.1.0.orig/src/Makefile.global.in 2005-09-27 13:39:32.000000000 -0400
++++ postgresql-8.1.0/src/Makefile.global.in 2005-11-07 14:58:59.000000000 -0500
@@ -53,7 +53,7 @@
# Installation directories
#
@@ -8,17 +8,9 @@ diff -Naur postgresql-8.0.0rc5.orig/src/Makefile.global.in postgresql-8.0.0rc5/s
-# append "postgresql" to some of them, if the string does not already
+# append "pgsql" to some of them, if the string does not already
# contain "pgsql" or "postgres", in order to avoid directory clutter.
-
- prefix := @prefix@
-@@ -65,21 +65,21 @@
- libexecdir := @libexecdir@
- ifeq "$(findstring pgsql, $(libexecdir))" ""
- ifeq "$(findstring postgres, $(libexecdir))" ""
--override libexecdir := $(libexecdir)/postgresql
-+override libexecdir := $(libexecdir)/pgsql
- endif
- endif
-
+ #
+ # In a PGXS build, we cannot use the values inserted into Makefile.global
+@@ -73,14 +73,14 @@
datadir := @datadir@
ifeq "$(findstring pgsql, $(datadir))" ""
ifeq "$(findstring postgres, $(datadir))" ""
@@ -35,7 +27,7 @@ diff -Naur postgresql-8.0.0rc5.orig/src/Makefile.global.in postgresql-8.0.0rc5/s
endif
endif
-@@ -87,7 +87,7 @@
+@@ -89,7 +89,7 @@
pkglibdir = $(libdir)
ifeq "$(findstring pgsql, $(pkglibdir))" ""
ifeq "$(findstring postgres, $(pkglibdir))" ""
@@ -44,7 +36,7 @@ diff -Naur postgresql-8.0.0rc5.orig/src/Makefile.global.in postgresql-8.0.0rc5/s
endif
endif
-@@ -95,7 +95,7 @@
+@@ -98,7 +98,7 @@
pkgincludedir = $(includedir)
ifeq "$(findstring pgsql, $(pkgincludedir))" ""
ifeq "$(findstring postgres, $(pkgincludedir))" ""
@@ -52,7 +44,7 @@ diff -Naur postgresql-8.0.0rc5.orig/src/Makefile.global.in postgresql-8.0.0rc5/s
+override pkgincludedir := $(pkgincludedir)/pgsql
endif
endif
- includedir_server = $(pkgincludedir)/server
+
@@ -109,7 +109,7 @@
ifneq (,$(docdir))
ifeq "$(findstring pgsql, $(docdir))" ""
diff --git a/sources b/sources
index 896f398..9153d31 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
-381bd337cf703220aafdf1ee24dae78d postgresql-8.0.4.tar.bz2
-1f2694ea546c852c5a0ba2b17f7c5ce1 PyGreSQL-3.6.2.tgz
+5e1f1a7c5f62170b56a3bf2512fdec2d postgresql-8.1.0.tar.bz2
+9fa4c2fc1dd0b3b93a3381c048443e16 PyGreSQL-3.7.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
-e51763911fe5ccec81bf4201f25e3f53 postgresql-8.0-312.jdbc2.jar
-ebb4384c3d116482c8ed438ac96461fc postgresql-8.0-312.jdbc2ee.jar
-41bcf06cdf7a3c84efd2fdd894303b24 postgresql-8.0-312.jdbc3.jar
+441d73f6f3a56c1abf8970ed79f51d28 postgresql-8.1-404.jdbc2.jar
+f506ae68d039bcc820641c1b1a8430c7 postgresql-8.1-404.jdbc2ee.jar
+8d8788f0a8b8d2184b452e3f34d62966 postgresql-8.1-404.jdbc3.jar
2edd229aa83105175a1212a001dd030a postgresql-8.0-US.pdf
commit 81785f0dfeb0da0a510bb1fc6eed5f0b1ab93072
Author: Tom Mrz <tmraz(a)fedoraproject.org>
Date: Fri Oct 14 10:23:11 2005 +0000
- use include instead of pam_stack in pam config
diff --git a/postgresql.pam b/postgresql.pam
index ac6df7d..2630c7f 100644
--- a/postgresql.pam
+++ b/postgresql.pam
@@ -1,2 +1,2 @@
#%PAM-1.0
-auth required pam_stack.so service=system-auth
+auth include system-auth
diff --git a/postgresql.spec b/postgresql.spec
index acee83f..3d0a1a0 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -829,6 +829,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Oct 14 2005 Tomas Mraz <tmraz(a)redhat.com>
+- use include instead of pam_stack in pam config
+
* Tue Oct 4 2005 Tom Lane <tgl(a)redhat.com> 8.0.4-2
- Add rpath to plperl.so (bug #162198)
commit f718878f5b9e033ae8eceb96a3034d095e078ac6
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Oct 4 22:04:22 2005 +0000
Really truly fix bug #162198.
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 115d9c0..4d27d10 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -9,14 +9,14 @@ Per bug #162198.
diff -Naur postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile postgresql-8.0.4/src/pl/plperl/GNUmakefile
--- postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile 2005-07-17 00:05:49.000000000 -0400
-+++ postgresql-8.0.4/src/pl/plperl/GNUmakefile 2005-10-04 12:15:27.000000000 -0400
-@@ -27,6 +27,9 @@
++++ postgresql-8.0.4/src/pl/plperl/GNUmakefile 2005-10-04 17:40:51.000000000 -0400
+@@ -36,6 +36,9 @@
- rpathdir = $(perl_archlibexp)/CORE
+ SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
+# Force rpath to be used even though we disable it everywhere else
-+LDFLAGS += $(rpath)
++SHLIB_LINK += $(rpath)
+
+ include $(top_srcdir)/src/Makefile.shlib
+
- NAME = plperl
- SO_MAJOR_VERSION = 0
diff --git a/postgresql.spec b/postgresql.spec
index 1248ba8..acee83f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.4
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -829,9 +829,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Oct 4 2005 Tom Lane <tgl(a)redhat.com> 8.0.4-2
+- Add rpath to plperl.so (bug #162198)
+
* Tue Oct 4 2005 Tom Lane <tgl(a)redhat.com> 8.0.4-1
- Update to PostgreSQL 8.0.4, PyGreSQL 3.6.2, and jdbc driver build 312
-- Add rpath to plperl.so (bug #162198)
- Adjust pgtcl link command to ensure it binds to correct libpq (bug #166665)
- Remove obsolete Conflicts: against other python versions (bug #166754)
- Add /etc/pam.d/postgresql (bug #167040)
commit 32269db0ad6656acc1476a6c689da2c811a73000
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Oct 4 19:37:36 2005 +0000
Update to PostgreSQL 8.0.4, fix several minor packaging problems.
diff --git a/.cvsignore b/.cvsignore
index 1d7dd83..8f41596 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,8 @@
-postgresql-8.0.3.tar.bz2
-PyGreSQL-3.6.1.tgz
+postgresql-8.0.4.tar.bz2
+PyGreSQL-3.6.2.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
-postgresql-8.0-311.jdbc2.jar
-postgresql-8.0-311.jdbc2ee.jar
-postgresql-8.0-311.jdbc3.jar
+postgresql-8.0-312.jdbc2.jar
+postgresql-8.0-312.jdbc2ee.jar
+postgresql-8.0-312.jdbc3.jar
postgresql-8.0-US.pdf
diff --git a/pgtcl-no-rpath.patch b/pgtcl-no-rpath.patch
index 6f0bd34..ae42d88 100644
--- a/pgtcl-no-rpath.patch
+++ b/pgtcl-no-rpath.patch
@@ -7,6 +7,13 @@ We also remove some direct hacks on LIBOBJS because modern Autoconf
doesn't like them; not worth fixing properly since they won't be
invoked on our systems anyway.
+Finally, tweak Makefile.in to ensure that the -L switch for libpq appears
+before any -L for the Tcl libraries during the link. This prevents the
+generated library from being bound to the wrong version of libpq when
+building on a machine that has an older version of libpq already installed
+(bug #166665).
+
+
diff -Naur Pgtcl.orig/aclocal.m4 Pgtcl/aclocal.m4
--- Pgtcl.orig/aclocal.m4 2004-02-15 15:15:37.000000000 -0500
+++ Pgtcl/aclocal.m4 2005-03-11 18:26:44.610459295 -0500
@@ -61,3 +68,17 @@ diff -Naur Pgtcl.orig/aclocal.m4 Pgtcl/aclocal.m4
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
+
+
+diff -Naur Pgtcl.orig/Makefile.in Pgtcl/Makefile.in
+--- Pgtcl.orig/Makefile.in 2004-06-13 17:49:14.000000000 -0400
++++ Pgtcl/Makefile.in 2005-10-04 14:23:37.000000000 -0400
+@@ -121,7 +121,7 @@
+ SHLIB_LD = @SHLIB_LD@
+ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
+ # Added EXTRA_LIBS for special cases like -lssl
+-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(PG_LIBS) $(TCL_LIBS) @EXTRA_LIBS@
++SHLIB_LD_LIBS = $(PG_LIBS) @SHLIB_LD_LIBS@ $(TCL_LIBS) @EXTRA_LIBS@
+ STLIB_LD = @STLIB_LD@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_BIN_DIR = @TCL_BIN_DIR@
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
new file mode 100644
index 0000000..115d9c0
--- /dev/null
+++ b/postgresql-perl-rpath.patch
@@ -0,0 +1,22 @@
+We configure Postgres with --disable-rpath because for the most part we
+want to leave it to ldconfig to determine where libraries are. However,
+for some reason the Perl package puts libperl.so in a nonstandard place
+and doesn't add that place to the ldconfig search path. I think this
+is a Perl packaging bug, myself, but apparently it's not going to change.
+So work around it by adding an rpath spec to plperl.so (only).
+Per bug #162198.
+
+
+diff -Naur postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile postgresql-8.0.4/src/pl/plperl/GNUmakefile
+--- postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile 2005-07-17 00:05:49.000000000 -0400
++++ postgresql-8.0.4/src/pl/plperl/GNUmakefile 2005-10-04 12:15:27.000000000 -0400
+@@ -27,6 +27,9 @@
+
+ rpathdir = $(perl_archlibexp)/CORE
+
++# Force rpath to be used even though we disable it everywhere else
++LDFLAGS += $(rpath)
++
+
+ NAME = plperl
+ SO_MAJOR_VERSION = 0
diff --git a/postgresql.pam b/postgresql.pam
new file mode 100644
index 0000000..ac6df7d
--- /dev/null
+++ b/postgresql.pam
@@ -0,0 +1,2 @@
+#%PAM-1.0
+auth required pam_stack.so service=system-auth
diff --git a/postgresql.spec b/postgresql.spec
index e27d413..1248ba8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -32,17 +32,17 @@
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
%{!?pam:%define pam 1}
+%{!?xml:%define xml 1}
%{!?pgfts:%define pgfts 1}
%{!?runselftest:%define runselftest 1}
# Python major version.
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')}
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.0.3
+Version: 8.0.4
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -71,13 +71,14 @@ Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t
Source3: postgresql.init
Source4: Makefile.regress
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.0-312.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.0-312.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.0-312.jdbc3.jar
+Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source17: postgresql-8.0-US.pdf
-Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.1.tgz
+Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.2.tgz
Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
Patch1: rpm-pgsql.patch
@@ -85,6 +86,7 @@ Patch2: postgresql-src-tutorial.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
Patch5: pgtcl-no-rpath.patch
+Patch6: postgresql-perl-rpath.patch
Buildrequires: perl glibc-devel bison flex
Prereq: /sbin/ldconfig initscripts
%if %python
@@ -108,12 +110,14 @@ BuildPrereq: e2fsprogs-devel
%if %nls
BuildPrereq: gettext >= 0.10.35
%endif
-
%if %pam
%if %non6xpamdeps
BuildPrereq: pam-devel
%endif
%endif
+%if %xml
+BuildPrereq: libxml2-devel
+%endif
Url: http://www.postgresql.org/
@@ -280,7 +284,6 @@ Summary: Development module for Python code to access a PostgreSQL DB.
Group: Applications/Databases
Requires: libpq.so
Requires: python mx
-Conflicts: python < %pyver, python >= %pynextver
Obsoletes: rh-postgresql-python
%description python
@@ -330,6 +333,8 @@ popd
%patch2 -p1
%patch3 -p1
%patch4 -p1
+# patch5 is applied later
+%patch6 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -410,6 +415,9 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
make %{?_smp_mflags} all
make %{?_smp_mflags} -C contrib all
+%if %xml
+make %{?_smp_mflags} -C contrib/xml2 all
+%endif
# Have to hack makefile to put correct path into tutorial scripts
sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/tutorial/GNUmakefile
@@ -461,6 +469,9 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make -C contrib DESTDIR=$RPM_BUILD_ROOT install
+%if %xml
+make -C contrib/xml2 DESTDIR=$RPM_BUILD_ROOT install
+%endif
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
@@ -495,6 +506,14 @@ then
install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
fi
+%if %pam
+if [ -d /etc/pam.d ]
+then
+ install -d $RPM_BUILD_ROOT/etc/pam.d
+ install -m 644 %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/postgresql
+fi
+%endif
+
# Remove stuff we don't want to ship.
rm -f $RPM_BUILD_ROOT%{_bindir}/findoidjoins
rm -f $RPM_BUILD_ROOT%{_bindir}/make_oidjoins_check
@@ -684,6 +703,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/tsearch.so
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/user_locks.so
+%if %xml
+%{_libdir}/pgsql/pgxml.so
+%endif
%{_datadir}/pgsql/contrib/
%{_bindir}/DBMirror.pl
%{_bindir}/clean_pending.pl
@@ -708,6 +730,9 @@ rm -rf $RPM_BUILD_ROOT
%files server -f server.lst
%defattr(-,root,root)
/etc/rc.d/init.d/postgresql
+%if %pam
+/etc/pam.d/postgresql
+%endif
%attr (755,root,root) %dir /etc/sysconfig/pgsql
%{_bindir}/initdb
%{_bindir}/ipcclean
@@ -804,6 +829,14 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Oct 4 2005 Tom Lane <tgl(a)redhat.com> 8.0.4-1
+- Update to PostgreSQL 8.0.4, PyGreSQL 3.6.2, and jdbc driver build 312
+- Add rpath to plperl.so (bug #162198)
+- Adjust pgtcl link command to ensure it binds to correct libpq (bug #166665)
+- Remove obsolete Conflicts: against other python versions (bug #166754)
+- Add /etc/pam.d/postgresql (bug #167040)
+- Include contrib/xml2 in build (bug #167492)
+
* Tue May 10 2005 Tom Lane <tgl(a)redhat.com> 8.0.3-1
- Update to PostgreSQL 8.0.3 (includes security and data-loss fixes; see
bz#156727, CAN-2005-1409, CAN-2005-1410)
diff --git a/sources b/sources
index 767515b..896f398 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
-c0914a133ce6c1e0f1d8b93982d6e881 postgresql-8.0.3.tar.bz2
-057c2d93f333ff2ed2177a8b87e19c0c PyGreSQL-3.6.1.tgz
+381bd337cf703220aafdf1ee24dae78d postgresql-8.0.4.tar.bz2
+1f2694ea546c852c5a0ba2b17f7c5ce1 PyGreSQL-3.6.2.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
-5d5d0d8e97ea3d117380068131b136ac postgresql-8.0-311.jdbc2.jar
-c4d7009a4baaf06858a2923066ba2529 postgresql-8.0-311.jdbc2ee.jar
-0ae011c390d94566326c61aad3ad9b6a postgresql-8.0-311.jdbc3.jar
+e51763911fe5ccec81bf4201f25e3f53 postgresql-8.0-312.jdbc2.jar
+ebb4384c3d116482c8ed438ac96461fc postgresql-8.0-312.jdbc2ee.jar
+41bcf06cdf7a3c84efd2fdd894303b24 postgresql-8.0-312.jdbc3.jar
2edd229aa83105175a1212a001dd030a postgresql-8.0-US.pdf
commit e8f554df7da74b7e7951a33e14d62925095e5971
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue May 10 15:34:35 2005 +0000
Update to PostgreSQL 8.0.3 (includes security and data-loss fixes; see
bz#156727, CAN-2005-1409, CAN-2005-1410).
diff --git a/.cvsignore b/.cvsignore
index 3446a69..1d7dd83 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,8 @@
-postgresql-8.0.2.tar.bz2
+postgresql-8.0.3.tar.bz2
PyGreSQL-3.6.1.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
-postgresql-8.0.309.jdbc2.jar
-postgresql-8.0.309.jdbc2ee.jar
-postgresql-8.0.309.jdbc3.jar
+postgresql-8.0-311.jdbc2.jar
+postgresql-8.0-311.jdbc2ee.jar
+postgresql-8.0-311.jdbc3.jar
postgresql-8.0-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 4d968d7..e27d413 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -42,7 +42,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.0.2
+Version: 8.0.3
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -64,16 +64,16 @@ Version: 8.0.2
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 2
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init
Source4: Makefile.regress
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.0-311.jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source17: postgresql-8.0-US.pdf
@@ -569,6 +569,14 @@ groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
+# If we're upgrading from rh-postgresql, we have to repeat the above actions
+# after rh-postgresql-server is uninstalled, because its postun script runs
+# after our pre script ...
+%triggerpostun -n postgresql-server -- rh-postgresql-server
+groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
+useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+ -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
+
%post server
chkconfig --add postgresql
/sbin/ldconfig
@@ -581,6 +589,9 @@ fi
%postun server
/sbin/ldconfig
+if [ $1 -ge 1 ] ; then
+ /sbin/service postgresql condrestart >/dev/null 2>&1 || :
+fi
if [ $1 = 0 ] ; then
userdel postgres >/dev/null 2>&1 || :
groupdel postgres >/dev/null 2>&1 || :
@@ -793,7 +804,14 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Thu Apr 14 2005 Florian La Roche <laroche(a)redhat.com>
+* Tue May 10 2005 Tom Lane <tgl(a)redhat.com> 8.0.3-1
+- Update to PostgreSQL 8.0.3 (includes security and data-loss fixes; see
+ bz#156727, CAN-2005-1409, CAN-2005-1410)
+- Update to jdbc driver build 311
+- Recreate postgres user after superseding an rh-postgresql install (bug #151911)
+- Ensure postgresql server is restarted if running during an upgrade
+
+* Thu Apr 14 2005 Florian La Roche <laroche(a)redhat.com> 8.0.2-2
- rebuild for postgresql-tcl
* Tue Apr 12 2005 Tom Lane <tgl(a)redhat.com> 8.0.2-1
diff --git a/sources b/sources
index ef0fef6..767515b 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
-1d44b9ca9a05a0df6c4bf8ebb7164a06 postgresql-8.0.2.tar.bz2
+c0914a133ce6c1e0f1d8b93982d6e881 postgresql-8.0.3.tar.bz2
057c2d93f333ff2ed2177a8b87e19c0c PyGreSQL-3.6.1.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
-35ecfedea6bfb21eca15c85da6f062e9 postgresql-8.0.309.jdbc2.jar
-0c565f0fce11c55242467aade130f86c postgresql-8.0.309.jdbc2ee.jar
-04fb5bd60b3caddbf9322d6a9398f108 postgresql-8.0.309.jdbc3.jar
+5d5d0d8e97ea3d117380068131b136ac postgresql-8.0-311.jdbc2.jar
+c4d7009a4baaf06858a2923066ba2529 postgresql-8.0-311.jdbc2ee.jar
+0ae011c390d94566326c61aad3ad9b6a postgresql-8.0-311.jdbc3.jar
2edd229aa83105175a1212a001dd030a postgresql-8.0-US.pdf
commit 391b6660548f55af29c7e5307d09a2886a708a63
Author: Florian La Roche <laroche(a)fedoraproject.org>
Date: Wed Apr 13 22:45:47 2005 +0000
- rebuild
diff --git a/postgresql.spec b/postgresql.spec
index 67a0e0b..4d968d7 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.2
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -793,6 +793,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Apr 14 2005 Florian La Roche <laroche(a)redhat.com>
+- rebuild for postgresql-tcl
+
* Tue Apr 12 2005 Tom Lane <tgl(a)redhat.com> 8.0.2-1
- Update to PostgreSQL 8.0.2.
commit 41ac9b745762d1fcc27e7097a91261c260b0897b
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Apr 13 03:02:18 2005 +0000
Update to PostgreSQL 8.0.2.
diff --git a/.cvsignore b/.cvsignore
index 8c1b6bf..3446a69 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.0.1.tar.bz2
+postgresql-8.0.2.tar.bz2
PyGreSQL-3.6.1.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
diff --git a/postgresql.spec b/postgresql.spec
index 515a931..67a0e0b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -42,7 +42,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.0.1
+Version: 8.0.2
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -64,7 +64,7 @@ Version: 8.0.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 5
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -793,6 +793,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Apr 12 2005 Tom Lane <tgl(a)redhat.com> 8.0.2-1
+- Update to PostgreSQL 8.0.2.
+
* Fri Mar 11 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-5
- Remove unwanted rpath specification from pgtcl (bz#150649)
diff --git a/sources b/sources
index 3a189e8..ef0fef6 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-075ac81c865b0af865459260bf1ca890 postgresql-8.0.1.tar.bz2
+1d44b9ca9a05a0df6c4bf8ebb7164a06 postgresql-8.0.2.tar.bz2
057c2d93f333ff2ed2177a8b87e19c0c PyGreSQL-3.6.1.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
commit ec5d1aeb9ea70ad0faf8635e1708e3d717f06dd1
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Fri Mar 11 23:54:09 2005 +0000
Remove unwanted rpath specification from pgtcl (bz#150649).
diff --git a/pgtcl-no-rpath.patch b/pgtcl-no-rpath.patch
new file mode 100644
index 0000000..6f0bd34
--- /dev/null
+++ b/pgtcl-no-rpath.patch
@@ -0,0 +1,63 @@
+This patch removes some bogus stuff from the pgtcl configure script;
+in particular it gets rid of rpath specifications that we don't want
+or need on an RPM platform, as well as long-obsolete optimization
+bypasses.
+
+We also remove some direct hacks on LIBOBJS because modern Autoconf
+doesn't like them; not worth fixing properly since they won't be
+invoked on our systems anyway.
+
+diff -Naur Pgtcl.orig/aclocal.m4 Pgtcl/aclocal.m4
+--- Pgtcl.orig/aclocal.m4 2004-02-15 15:15:37.000000000 -0500
++++ Pgtcl/aclocal.m4 2005-03-11 18:26:44.610459295 -0500
+@@ -293,12 +293,6 @@
+ DL_OBJS="tclLoadDl.o"
+ LDFLAGS=""
+
+- # AIX v<=4.1 has some different flags than 4.2+
+- if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
+- LIBOBJS="$LIBOBJS tclLoadAix.o"
+- DL_LIBS="-lld"
+- fi
+-
+ # On AIX <=v4 systems, libbsd.a has to be linked in to support
+ # non-blocking file IO. This library has to be linked in after
+ # the MATH_LIBS or it breaks the pow() function. The way to
+@@ -490,18 +484,12 @@
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+
+- # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
+- # when you inline the string and math operations. Turn this off to
+- # get rid of the warnings.
+-
+- CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+-
+ if test "$have_dl" = yes; then
+ SHLIB_LD="${CC} -shared"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS="-rdynamic"
+- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR},-rpath,${LIB_PGTCL_RUNTIME_DIR}'
++ LD_SEARCH_FLAGS=""
+ else
+ AC_CHECK_HEADER(dld.h, [
+ SHLIB_LD="ld -shared"
+@@ -514,17 +502,6 @@
+ EXTRA_CFLAGS="-mieee"
+ fi
+
+- # The combo of gcc + glibc has a bug related
+- # to inlining of functions like strtod(). The
+- # -fno-builtin flag should address this problem
+- # but it does not work. The -fno-inline flag
+- # is kind of overkill but it works.
+- # Disable inlining only when one of the
+- # files in compat/*.c is being linked in.
+- if test x"${LIBOBJS}" != x ; then
+- EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
+- fi
+-
+ ;;
+ GNU*)
+ SHLIB_CFLAGS="-fPIC"
diff --git a/postgresql.spec b/postgresql.spec
index d423117..515a931 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 4
+Release: 5
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -84,6 +84,7 @@ Patch1: rpm-pgsql.patch
Patch2: postgresql-src-tutorial.patch
Patch3: postgresql-logging.patch
Patch4: postgresql-test.patch
+Patch5: pgtcl-no-rpath.patch
Buildrequires: perl glibc-devel bison flex
Prereq: /sbin/ldconfig initscripts
%if %python
@@ -358,6 +359,11 @@ cp -p %{SOURCE17} .
unzip %{SOURCE20}
PGTCLDOCDIR=`basename %{SOURCE20} .zip`
mv $PGTCLDOCDIR Pgtcl-docs
+
+%patch5 -p0
+ pushd Pgtcl
+%aconfver
+ popd
%endif
%build
@@ -787,6 +793,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Mar 11 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-5
+- Remove unwanted rpath specification from pgtcl (bz#150649)
+
* Wed Mar 2 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-4
- Attach Obsoletes: declarations for rh-postgresql to subpackages (bz#144435)
- Make Requires: and Prereq: package linkages specify release not only
commit dadd60bc80fd401ff6916e911f7dc058a2af65cd
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Mar 2 21:14:35 2005 +0000
Fix Obsoletes/Requires specs as per bz#144435 and recent discussions.
diff --git a/postgresql.spec b/postgresql.spec
index 44b7a29..d423117 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 3
+Release: 4
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -120,16 +120,6 @@ Obsoletes: postgresql-clients
Obsoletes: postgresql-perl
Obsoletes: postgresql-tk
Obsoletes: rh-postgresql
-Obsoletes: rh-postgresql-contrib
-Obsoletes: rh-postgresql-devel
-Obsoletes: rh-postgresql-docs
-Obsoletes: rh-postgresql-jdbc
-Obsoletes: rh-postgresql-libs
-Obsoletes: rh-postgresql-pl
-Obsoletes: rh-postgresql-python
-Obsoletes: rh-postgresql-server
-Obsoletes: rh-postgresql-tcl
-Obsoletes: rh-postgresql-test
Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -186,6 +176,7 @@ if you're installing the postgresql-server package.
Summary: The shared libraries required for any PostgreSQL clients.
Group: Applications/Databases
Provides: libpq.so
+Obsoletes: rh-postgresql-libs
%description libs
The postgresql-libs package provides the essential shared libraries for any
@@ -197,8 +188,8 @@ PostgreSQL server.
Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
-Prereq: postgresql = %{version} libpq.so
-Conflicts: postgresql < 7.4
+Prereq: postgresql = %{version}-%{release} libpq.so
+Obsoletes: rh-postgresql-server
%description server
The postgresql-server package includes the programs needed to create
@@ -215,16 +206,21 @@ to install the postgresql package.
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
-Prereq: postgresql = %{version}
+Prereq: postgresql = %{version}-%{release}
+Obsoletes: rh-postgresql-docs
+
%description docs
The postgresql-docs package includes some additional documentation for
PostgreSQL. Currently, this includes the main documentation in PDF format,
the FAQ, and source files for the PostgreSQL tutorial.
+
%package contrib
Summary: Contributed source and binaries distributed with PostgreSQL
Group: Applications/Databases
-Prereq: postgresql = %{version}
+Prereq: postgresql = %{version}-%{release}
+Obsoletes: rh-postgresql-contrib
+
%description contrib
The postgresql-contrib package contains contributed packages that are
included in the PostgreSQL distribution.
@@ -233,8 +229,9 @@ included in the PostgreSQL distribution.
%package devel
Summary: PostgreSQL development header files and libraries.
Group: Development/Libraries
-Prereq: postgresql = %{version}
-Requires: postgresql-libs = %{version}
+Prereq: postgresql = %{version}-%{release}
+Requires: postgresql-libs = %{version}-%{release}
+Obsoletes: rh-postgresql-devel
%description devel
The postgresql-devel package contains the header files and libraries
@@ -250,8 +247,9 @@ package.
%package pl
Summary: The PL procedural languages for PostgreSQL.
Group: Applications/Databases
-PreReq: postgresql = %{version}
-PreReq: postgresql-server = %{version}
+PreReq: postgresql = %{version}-%{release}
+PreReq: postgresql-server = %{version}-%{release}
+Obsoletes: rh-postgresql-pl
%description pl
PostgreSQL is an advanced Object-Relational database management
@@ -266,6 +264,7 @@ Summary: A Tcl client library for PostgreSQL.
Group: Applications/Databases
Requires: libpq.so
Requires: tcl >= 8.3
+Obsoletes: rh-postgresql-tcl
%description tcl
PostgreSQL is an advanced Object-Relational database management
@@ -281,6 +280,7 @@ Group: Applications/Databases
Requires: libpq.so
Requires: python mx
Conflicts: python < %pyver, python >= %pynextver
+Obsoletes: rh-postgresql-python
%description python
PostgreSQL is an advanced Object-Relational database management
@@ -294,6 +294,7 @@ database.
%package jdbc
Summary: Files needed for Java programs to access a PostgreSQL database.
Group: Applications/Databases
+Obsoletes: rh-postgresql-jdbc
%description jdbc
PostgreSQL is an advanced Object-Relational database management
@@ -306,8 +307,9 @@ Java programs to access a PostgreSQL database.
%package test
Summary: The test suite distributed with PostgreSQL.
Group: Applications/Databases
-PreReq: postgresql = %{version}
-PreReq: postgresql-server = %{version}
+PreReq: postgresql = %{version}-%{release}
+PreReq: postgresql-server = %{version}-%{release}
+Obsoletes: rh-postgresql-test
%description test
PostgreSQL is an advanced Object-Relational database management
@@ -785,6 +787,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Mar 2 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-4
+- Attach Obsoletes: declarations for rh-postgresql to subpackages (bz#144435)
+- Make Requires: and Prereq: package linkages specify release not only
+ version, as per recent mailing list discussion.
+
* Tue Mar 1 2005 Tomas Mraz <tmraz(a)redhat.com> 8.0.1-3
- rebuild with openssl-0.9.7e
commit a70d6a15563e3aa68149db3b4797ab50d7f1a71b
Author: Tom Mrz <tmraz(a)fedoraproject.org>
Date: Tue Mar 1 19:42:10 2005 +0000
- rebuild with openssl-0.9.7e
diff --git a/postgresql.spec b/postgresql.spec
index ac60dbc..44b7a29 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 2
+Release: 3
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -785,6 +785,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Mar 1 2005 Tomas Mraz <tmraz(a)redhat.com> 8.0.1-3
+- rebuild with openssl-0.9.7e
+
* Mon Feb 21 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-2
- Repair improper error message in init script when PGVERSION doesn't match.
- Arrange for auto update of version embedded in init script.
commit 26b954acadd443bfa51fbc04dde1727546aa4d24
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Feb 21 21:44:36 2005 +0000
Minor bug fixes in init script.
diff --git a/postgresql.init b/postgresql.init
index 89ef562..d616b96 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -62,8 +62,11 @@
# postgres-owned processes laying about.
-# PGVERSION is:
-PGVERSION=8.0
+# PGVERSION is the full package version, e.g., 7.4.7
+# Note: the specfile ordinarily updates this during install
+PGVERSION=xxxx
+# PGMAJORVERSION is major version, e.g., 7.4 (this should match PG_VERSION)
+PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
# Source function library.
INITD=/etc/rc.d/init.d
@@ -134,7 +137,7 @@ start(){
then
# Check version of existing PGDATA
- if [ `cat "$PGDATA/PG_VERSION"` != "$PGVERSION" ]
+ if [ x`cat "$PGDATA/PG_VERSION"` != x"$PGMAJORVERSION" ]
then
SYSDOCDIR="(Your System's documentation directory)"
if [ -d "/usr/doc/postgresql-$PGVERSION" ]
@@ -154,7 +157,9 @@ start(){
SYSDOCDIR=/usr/share/doc/packages
fi
echo
- echo $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+ echo $"An old version of the database format was found."
+ echo $"You need to upgrade the data format before using PostgreSQL."
+ echo $"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
exit 1
fi
diff --git a/postgresql.spec b/postgresql.spec
index df07a62..ac60dbc 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -483,7 +483,8 @@ cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
if [ -d /etc/rc.d/init.d ]
then
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
- install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+ sed 's/^PGVERSION=.*$/PGVERSION=%{version}/' <%{SOURCE3} >postgresql.init
+ install -m 755 postgresql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
fi
# Remove stuff we don't want to ship.
@@ -784,6 +785,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Feb 21 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-2
+- Repair improper error message in init script when PGVERSION doesn't match.
+- Arrange for auto update of version embedded in init script.
+
* Sun Jan 30 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-1
- Update to PostgreSQL 8.0.1.
- Add versionless symlinks to jar files (bz#145744)
commit eb3bf28c7e376f8f302ebdd6cd53b2aef7b0485a
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Jan 31 03:15:07 2005 +0000
Update to Postgres 8.0.1; add unversioned symlinks for JDBC jarfiles, per
bz#145744.
diff --git a/.cvsignore b/.cvsignore
index 881212a..8c1b6bf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.0.0.tar.bz2
+postgresql-8.0.1.tar.bz2
PyGreSQL-3.6.1.tgz
pgtcl1.5.2.tar.gz
pgtcldocs-20041108.zip
diff --git a/postgresql.spec b/postgresql.spec
index 50294bb..df07a62 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -42,7 +42,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 8.0.0
+Version: 8.0.1
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -466,6 +466,12 @@ cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
+ # Versionless symlinks to the versioned jars
+ pushd $RPM_BUILD_ROOT/usr/share/java
+ ln -s `basename %{SOURCE8}` postgresql-jdbc2.jar
+ ln -s `basename %{SOURCE9}` postgresql-jdbc2ee.jar
+ ln -s `basename %{SOURCE10}` postgresql-jdbc3.jar
+ popd
%endif
%if %tcl
@@ -507,7 +513,7 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
- pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/
+ pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
strip *.so
rm -f GNUmakefile Makefile
popd
@@ -778,6 +784,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Jan 30 2005 Tom Lane <tgl(a)redhat.com> 8.0.1-1
+- Update to PostgreSQL 8.0.1.
+- Add versionless symlinks to jar files (bz#145744)
+
* Wed Jan 19 2005 Tom Lane <tgl(a)redhat.com> 8.0.0-1
- Update to PostgreSQL 8.0.0, PyGreSQL 3.6.1, pgtcl 1.5.2,
and jdbc driver build 309.
diff --git a/sources b/sources
index c66e691..3a189e8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-3fe6bb504a6457daa80bc32daf10122e postgresql-8.0.0.tar.bz2
+075ac81c865b0af865459260bf1ca890 postgresql-8.0.1.tar.bz2
057c2d93f333ff2ed2177a8b87e19c0c PyGreSQL-3.6.1.tgz
d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
commit 6e96691327716b7fb6ea0b9a45fa9474bbc02493
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Jan 19 05:02:11 2005 +0000
Update to PostgreSQL 8.0.
diff --git a/.cvsignore b/.cvsignore
index 026e962..881212a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,8 @@
-postgresql-7.4.6.tar.bz2
-PyGreSQL-3.6.tgz
+postgresql-8.0.0.tar.bz2
+PyGreSQL-3.6.1.tgz
+pgtcl1.5.2.tar.gz
+pgtcldocs-20041108.zip
+postgresql-8.0.309.jdbc2.jar
+postgresql-8.0.309.jdbc2ee.jar
+postgresql-8.0.309.jdbc3.jar
+postgresql-8.0-US.pdf
diff --git a/Makefile.regress b/Makefile.regress
new file mode 100644
index 0000000..9a825c2
--- /dev/null
+++ b/Makefile.regress
@@ -0,0 +1,53 @@
+#
+# Simplified makefile for running the PostgreSQL regression tests
+# in an RPM installation
+#
+
+# database encoding
+MULTIBYTE := SQL_ASCII
+
+# maximum simultaneous connections for parallel tests
+MAXCONNOPT :=
+ifdef MAX_CONNECTIONS
+MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS)
+endif
+
+srcdir := .
+
+check: installcheck-parallel
+
+installcheck: cleandirs
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)
+
+installcheck-parallel: cleandirs
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT)
+
+# The tests command the server to write into testtablespace and results.
+# On a SELinux-enabled system this will fail unless we mark those directories
+# as writable by the server.
+cleandirs:
+ -rm -rf testtablespace results
+ mkdir testtablespace results
+ [ -x /usr/bin/chcon ] && /usr/bin/chcon -t postgresql_db_t testtablespace results
+
+# old interfaces follow...
+
+runcheck: check
+runtest: installcheck
+runtest-parallel: installcheck-parallel
+
+bigtest: cleandirs
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) numeric_big
+
+bigcheck: cleandirs
+ $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) numeric_big
+
+
+##
+## Clean up
+##
+
+clean distclean maintainer-clean:
+ rm -rf testtablespace
+ rm -rf results tmp_check log
+ rm -f regression.diffs regression.out regress.out run_check.out
diff --git a/README.rpm-dist b/README.rpm-dist
index e230002..6a143e8 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,42 +1,44 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 6.0, for the PostgreSQL 7.4-0.1PGDG RPMset.
+Version 8.0, for the PostgreSQL 8.0.0-1PGDG RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
-----------------------------------------------------------------------------
Contents:
- 0.) Quick -i note.
+ 0.) Quick note about '-i'
1.) Introduction, QuickStart, and credits
2.) PostgreSQL RPM packages and rationale
3.) Starting multiple postmasters
4.) Regression Testing
5.) Starting postmaster automatically on startup
- 6.) Grand Unified Configuration(GUC) File.
- 7.) Rebuilding the source RPM.
- 8.) Contrib files.
- 9.) Logging set up
+ 6.) Grand Unified Configuration(GUC) File
+ 7.) Logging set up
+ 8.) Rebuilding from the source RPM
+ 9.) Contrib files
10.) Further Information Resource
-QUICK '-i' NOTE
+QUICK NOTE ABOUT '-i'
-----------------------------------------------------------------------------
The postmaster '-i' option is NOT used by default in the initscript shipped
with these RPMs. Please do NOT modify the initscript to add the '-i' back
in -- it will get overwritten on the next package upgrade. Rather, see the
section below on the Grand Unified Configuration file, which includes the
-recommended way to get '-i' functionality back.
+recommended way to get '-i' functionality. Note that as of PostgreSQL 8.0,
+you don't need '-i' anyway if all you want to allow is local TCP/IP
+connections.
INTRODUCTION
-----------------------------------------------------------------------------
-This document exists to explain the layout of the RPM's for PostgreSQL,to
+This document exists to explain the layout of the RPMs for PostgreSQL, to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 7.4 of PostgreSQL,
-which is the current version of the RPM's as of this writing. More to the
-point, versions prior to 7.3 are not documented here.
+This document is written to be applicable to version 8.0 of PostgreSQL,
+which is the current version of the RPMs as of this writing. More to the
+point, versions prior to 8.0 are not documented here.
-Official PostgreSQL Global Development Group RPM's have from version 7.1.2
-on carried a 'PGDG' after the release number. Other RPMset's as distributed
+Official PostgreSQL Global Development Group RPMs have from version 7.1.2
+on carried a 'PGDG' after the release number. Other RPMsets distributed
with Linux distributions may have a different release number and initials.
It is preferable for the distribution-specific set to be the one used, as
@@ -45,32 +47,25 @@ use them in preference. If you want to stay up-to-date on the PostgreSQL
core itself, use the PGDG generic set -- but understand that it is a
GENERIC set.
-These RPMs are designed to be LSB-compliant -- if you find this not to be the
-case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
-list.
-
These RPMs no longer support any sort of upgrading process other than that
documented in the regular documentation. That is, you must dump, upgrade,
-initdb, and restore your data. The 7.2 to 7.3 migration can be quite
-difficult, even to the point of requiring hand-editing of the dumpfile.
+initdb, and restore your data. Dump first, then remove the old server
+subpackage, install the new package, and restore the data from dump. (A new
+method of running multiple versions of PostgreSQL, along with the capability
+to run multiple postmasters, is in development, but was not ready for this
+release.)
-Thus, the 7.3 postgresql-server RPM specifically conflicted with prior
-versions. The old server subpackage must be removed first, the new package
-installed, and the data restored from dump. However, RPM itself did not
-honor this. A new method of running multiple versions of PostgreSQL, along
-with the capability to run multiple postmasters, is in development, but was
-not ready for this release.
-
-A new section on running multiple postmasters has replaced the old upgrade
-instructions.
+SuSE has maintained their own RPMset for some time -- their documentation
+supercedes any found in this file.
QUICKSTART
-----------------------------------------------------------------------------
For a fresh installation on a recent Red Hat or similar system, a simple
-service postgresql start
+ service postgresql start
as root will prepare a new database (initdb), and start a postmaster that
-will listen on Unix socket 5432 only. Edit /var/lib/pgsql/data/postgresql.conf
-to enable TCP/IP -- see the section on '-i.'
+will listen on localhost and Unix socket 5432 only. Edit
+/var/lib/pgsql/data/postgresql.conf and pg_hba.conf if you want to allow
+remote access -- see the section on Grand Unified Configuration.
The file /var/lib/pgsql/.bash_profile is now packaged to help with the
setting of environment variables. You may edit this file, and it won't be
@@ -80,12 +75,9 @@ to this file, so be sure to check .bash_profile.rpmnew after upgrading.
The user 'postgres' is created during installation of the server subpackage.
This user by default is UID and GID 26. The user has the default shell set to
bash, and the home directory set to /var/lib/pgsql. This user also has no
-default password -- in order to be able to su to from a non-root account
+default password -- in order to be able to su to it from a non-root account
or login as 'postgres' you will need to set a password using passwd.
-While PygreSQL was split out from the main tarball, thanks to Kaj's work it
-is still included as the python subpackage.
-
CREDITS
-----------------------------------------------------------------------------
Thomas Lockhart
@@ -107,62 +99,72 @@ Kaj J. Niemi
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
+PostgreSQL is split up into multiple packages so that users can 'pick and
+choose' what pieces are needed, and what dependencies are required.
+
The RPMset is packaged in the following subpackages:
-postgresql: Some clients and libraries, and documentation
+postgresql: Key clients and libraries, and documentation
+postgresql-libs: Client shared libraries
postgresql-server: Server executables and data files
-postgresql-devel: Client-side development libraries
-postgresql-tcl: TCL/TK client libraries and docs
+postgresql-devel: Development libraries and include files
+postgresql-jdbc: JARs for the JDBC client library
postgresql-python: The PygreSQL client library
-postgresql-jdbc: JAR of the JDBC client
-postgresql-test: The regression tests and associated files.
-postgresql-tcl: Tcl client and PL ONLY.
-postgresql-libs: client shared libraries.
-postgresql-docs: extra documentation,such as the SGML doc sources.
-postgresql-contrib: The contrib source tree, as well as selected binaries.
+postgresql-tcl: Tcl client library (Pgtcl)
+postgresql-test: The regression tests and associated files
+postgresql-docs: Extra documentation, such as the tutorial files
+postgresql-contrib: The contrib source tree, as well as selected binaries
postgresql-pl: PL/Perl (if possible on this dist), PL/Python, and PL/Tcl
+You have to install postgresql and postgresql-libs to do anything.
+postgresql-server is needed unless you only plan to use the clients to work
+with a remote PostgreSQL server. The others are optional.
+
Note that there is no postgresql-perl, postgresql-odbc, postgresql-tk, or
postgresql-plperl package any longer. This is due to these portions being
-removed from the PostgreSQL source tarball. The TK client package 'pgaccess'
-was the core of the -tk subpackage -- so the pgtksh client was rolled back
-into the -tcl package.
+removed from the PostgreSQL source tarball.
-PostgreSQL is split up into multiple packages so that users can 'pick and
-choose' what pieces are needed, and what dependencies are required.
+While PygreSQL was split out from the core PostgreSQL distribution, thanks to
+Kaj's work it is still included as the python subpackage. Also, Pgtcl is
+still included as the tcl subpackage, although it is not part of the core
+distribution anymore.
RPM FILE LOCATIONS.
-----------------------------------------------------------------------------
-In compliance with the Linux FHS, the PostgreSQL RPM's install files in a manner
-not consistent with most of the PostgreSQL documentation. According to the
-standard PostgreSQL documentation, PostgreSQL is installed under the directory
-/usr/local/pgsql, with executables, source, and data existing in various
-subdirectories.
+To be in compliance with the Linux FHS, the PostgreSQL RPMs install files in
+a manner not consistent with most of the PostgreSQL documentation. According
+to the standard PostgreSQL documentation, PostgreSQL is installed under the
+directory /usr/local/pgsql, with executables, source, and data existing in
+various subdirectories.
Different distributions have different ideas of some of these file locations.
In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
/usr/share/doc, /usr/share/doc/packages, or some other similar path. The
-RedHat 7 locations are listed below. On SuSE <7.1, substitute 'postgres' for
-'postgresql' below, and 'pg_tk' for 'postgresql-tk' below.
+Red Hat/Fedora locations are listed below. On SuSE <7.1, substitute 'postgres'
+for 'postgresql' below.
-However, the RPM's install the files like this:
+However, the RPMs install the files like this:
Executables: /usr/bin
-Libaries: /usr/lib
+Libraries: /usr/lib
Documentation: /usr/share/doc/postgresql-x.y.z
-Contrib: /usr/share/doc/postgresql-x.y.z/contrib
+Contrib documentation: /usr/share/doc/postgresql-contrib-x.y.z
Source: not installed
Data: /var/lib/pgsql/data
Backup area: /var/lib/pgsql/backup
Templates: /usr/share/pgsql
Procedural Languages: /usr/lib/pgsql
Development Headers: /usr/include/pgsql
+Localization data: /usr/share/locale
Other shared data: /usr/share/pgsql
Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
-Documentation SGML: /usr/share/doc/postgresql-docs-x.y.z
+Tutorial: /usr/lib/pgsql/tutorial (in the -docs package)
+Extra documentation: /usr/share/doc/postgresql-docs-x.y.z
-The above list references the Red Hat 7.x structure. These locations may
+On some 64-bit architectures, /usr/lib64 is used instead of /usr/lib.
+
+The above list describes the Red Hat/Fedora layout. These locations may
change for other distributions. Use of 'rpm -ql' for each package is
-recommended as the 'Official' location source.
+recommended as the 'official' information source.
While it may seem gratuitous to place these files in different locations, the
FHS requires it -- distributions should not ever touch /usr/local. It may
@@ -170,8 +172,9 @@ also seem like more work to keep track of where everything is -- but, that's
the beauty of RPM -- you don't have to keep track of the files, RPM does it
for you.
-These RPM's are meant to be LSB-compliant. If you find errors in them that
-cause thembe be non-compliant, please let me know.
+These RPMs are designed to be LSB-compliant -- if you find this not to be the
+case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
+list.
MULTIPLE POSTMASTERS
-------------------------------------------------------------------------------
@@ -201,59 +204,46 @@ support experimental at this point in time.
REGRESSION TESTING
-------------------------------------------------------------------------------
-One of the features of the newer RPM sets is the capability to perform the
+If you install the postgresql-test RPM then you can run the PostgreSQL
regression tests. These tests stress your database installation and produce
results that give you assurances that the installation is complete, and that
your database machine is up to the task.
To run the regression tests under the RPM installation, make sure that
postmaster has been started (if not, su to root and execute the
-'/etc/rc.d/init.d/postgresql start' init script), cd to
-/usr/lib/pgsql/test/regress, su to postgres, and execute the command line:
-time ./pg_regress.sh --schedule=parallel_schedule
-This command line will start the regression tests and will both show the
+"/etc/rc.d/init.d/postgresql start" init script), cd to
+/usr/lib/pgsql/test/regress, su to postgres, and execute "make check".
+This command will start the regression tests and will both show the
results to the screen and store the results in the file regress.out.
-It will also give you a crude benchmark of how fast your machine performs.
-
-If tests fail, please see the file regression.diffs in that directory. If
-you need help interpreting that file, contact the pgsql-ports list on
-postgresql.org.
-
-There are some tests that will almost always fail with RedHat Linux 5.x and 6.x
-installations. The geometry, float8, and on occassion the random test will
-fail. These failures are normal for RedHat 5.2 and 6.1. For RedHat 6.1 with
-certain i18n settings, there will be other tests fail.
-For 7.1RC1, all 76 tests passed on RedHat 6.2 and RedHat 7.0. This
-was accomplished by fiddling with the locale settings. In version 7.1.2 this
-capability was removed -- you need to set your locale to 'C' before executing
-the first postmaster startup, or many more regression tests will fail.
+If any tests fail, see the file regression.diffs in that directory for details,
+and read the "Regression Tests" section of the PostgreSQL documentation to
+find out whether the differences are actually significant. If you need help
+interpreting the results, contact the pgsql-ports list at postgresql.org.
-For interpretation of the regression tests, see the PostgreSQL documentation.
+After testing, say "make clean" to remove the files generated by the test
+script.
STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
-------------------------------------------------------------------------------
-RedHat Linux uses the System V Init package. A startup script for PostgreSQL
+Red Hat Linux uses the System V Init package. A startup script for PostgreSQL
is provided in the server package, as /etc/rc.d/init.d/postgresql. To start
the postmaster, with sanity checking, as root, run
-service postgresql start
-to shut postmaster down,
-service postgresql stop
-There are other parameters to this script -- execute 'service postgresql' for a
-listing.
-
-To get this script to run at system startup or any time the system switches into
-runlevels 3, 4, or 5, run:
-chkconfig --add postgresql
-chkconfig --level 345 postgresql on
-and the proper symlinks will be created. Check the chkconfig man page for more
+ service postgresql start
+To shut the postmaster down,
+ service postgresql stop
+There are other possible commands to this script -- execute
+'service postgresql' for a listing.
+
+To get this script to run at system startup or any time the system switches
+into runlevels 3, 4, or 5, run:
+ chkconfig --add postgresql
+ chkconfig --level 345 postgresql on
+and the proper symlinks will be created. See the chkconfig man page for more
information. Note that this is manual -- while the startup script can include
tags to allow chkconfig to automatically perform the symlinking, this is not
done at this time.
-SuSE has maintained their own RPMset for some time -- their documentation
-supercedes any found in this file.
-
GRAND UNIFIED CONFIGURATION (GUC) FILE
-------------------------------------------------------------------------------
The PostgreSQL server has many tunable parameters -- the file
@@ -262,19 +252,22 @@ whole system.
The RPM ships with the default file -- you will need to tune the
parameters for your installation. In particular, you might want to allow
-TCP/IP socket connections -- in order to allow these, you will need to edit
-the postgresql.conf file. The line in question contains the string
-'tcpip_socket' --want to both uncomment the line and set the parameter to true
-in order to get the TCP/IP socket to open.
+nonlocal TCP/IP socket connections -- in order to allow these, you will need
+to edit the postgresql.conf file. The line in question contains the string
+'listen_addresses' -- you need to both uncomment the line and set the value
+to '*' to get the postmaster to accept nonlocal connections. You'll also need
+to adjust pg_hba.conf appropriately.
-This is the same behavior the -i command line switch provides. It is
-preferable to use the postgresql.conf file, however, as future versions
-of the RPMset will allow multiple postmaster instances -- and that will only
-be possible thanks to the decoupling of settings out to each datadir.
+LOGGING SET UP
+-------------------------------------------------------------------------------
+By default, the postmaster's stderr log is directed into files placed in a
+pg_log subdirectory of the data directory (ie, /var/lib/pgsql/data/pg_log).
+The out-of-the-box configuration rotates among seven files, one for each
+day of the week. You can adjust this by changing postgresql.conf settings.
REBUILDING FROM SOURCE RPM
-------------------------------------------------------------------------------
-If your distribution is not supported by the binary RPM's from PostgreSQL.org,
+If your distribution is not supported by the binary RPMs from PostgreSQL.org,
you will need to rebuild from the source RPM. Download the .src.rpm for this
release. You will need to be root to rebuild, unless you have already set up
a non-root build environment.
@@ -291,7 +284,6 @@ build6x undef #don't build for Red Hat 6.x. Define it to cause
beta 0 #build with cassert and do not strip the binaries
perl 1 #build the postgresql-perl package.
tcl 1 #build the postgresql-tcl package.
-tkpkg 1 #build the postgresql-tk package.
jdbc 1 #build the postgresql-jdbc package.
pls 1 #build the postgresql-pl package.
test 1 #build the postgresql-test package.
@@ -302,13 +294,20 @@ ssl 1 #use OpenSSL support.
kerberos 1 #use Kerberos 5 support.
nls 1 #build with national language support.
pam 1 #build with PAM support.
+runselftest 1 #do "make check" during the build.
To use these defines, invoke a rebuild like this:
-rpm --rebuild --define 'perl 0' --define 'tcl 0' --define 'tkpkg 0'\
- --define 'test 0' --define 'newintarray 1' --define 'kerberos 0' \
- postgresql-7.1.3-1PGDG.src.rpm
-This line would disable the perl, tcl, tk, and test subpackages, enable the
-newer intarray code, and disable kerberos support.
+rpm --rebuild --define 'perl 0' --define 'tcl 0' \
+ --define 'test 0' --define 'runselftest 1' --define 'kerberos 0' \
+ postgresql-8.0.0-1PGDG.src.rpm
+This line would disable the perl, tcl, and test subpackages, enable the
+regression test run during build, and disable kerberos support.
+
+You might need to disable runselftest if there is an installed version of
+PostgreSQL that is a different major version from what you are trying to
+build. The self test tends to pick up the installed libpq.so shared library
+in place of the one being built :-(, so if that isn't compatible the test will
+fail. Also, you can't use runselftest when doing the build as root.
More of these conditionals will be added in the future.
@@ -321,23 +320,6 @@ modules are in /usr/lib/pgsql for loadable modules, and binaries are in
/usr/bin. In the future these files may be split out, depending upon function
and dependencies.
-LOGGING SET UP
--------------------------------------------------------------------------------
-To get rollable syslog set up, see the documentation for the file
-postgresql.conf, by default in the directory /var/lib/pgsql/data, as relates to
-the syslog options. Then, add a line to /etc/syslog.conf, using the man page
-for syslog.conf as a source. Example:
-If postgresql.conf has the following lines for the syslog settings:
-syslog = 1 # range 0-2
-syslog_facility = 'LOCAL0'
-syslog_ident = 'postgres'
-
-Then you need to add the line to /etc/syslog.conf:
-local0.* /var/log/postgresql
-
-Then set up an entry in /etc/logrotate.d to roll postgresql the way you want it
-rolled.
-
MORE INFORMATION
-------------------------------------------------------------------------------
You can get more information at http://www.postgresql.org
@@ -351,4 +333,3 @@ SuSE information is available at SuSE's website and information contacts.
A 7.4 SuSE RPM is available on ftp.postgresql.org. It is different from this
RPM due to SuSE's different needs.
-----------------------------------------------------------------------------
-
diff --git a/postgresql-bashprofile b/postgresql-bashprofile
index b6c014d..1cd70d3 100644
--- a/postgresql-bashprofile
+++ b/postgresql-bashprofile
@@ -1,5 +1,4 @@
+[ -f /etc/profile ] && source /etc/profile
+
PGDATA=/var/lib/pgsql/data
-[ -f $PGDATA/../initdb.i18n ] && source $PGDATA/../initdb.i18n
export PGDATA
-
-
diff --git a/postgresql-logging.patch b/postgresql-logging.patch
new file mode 100644
index 0000000..0905249
--- /dev/null
+++ b/postgresql-logging.patch
@@ -0,0 +1,32 @@
+diff -Naur postgresql-8.0.0rc5.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-8.0.0rc5/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-8.0.0rc5.orig/src/backend/utils/misc/postgresql.conf.sample 2004-11-05 14:16:16.000000000 -0500
++++ postgresql-8.0.0rc5/src/backend/utils/misc/postgresql.conf.sample 2005-01-11 19:18:21.282906899 -0500
+@@ -177,22 +177,22 @@
+ # platform.
+
+ # This is relevant when logging to stderr:
+-#redirect_stderr = false # Enable capturing of stderr into log files.
++redirect_stderr = true # Enable capturing of stderr into log files.
+ # These are only relevant if redirect_stderr is true:
+-#log_directory = 'pg_log' # Directory where log files are written.
++log_directory = 'pg_log' # Directory where log files are written.
+ # May be specified absolute or relative to PGDATA
+-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # Log file name pattern.
++log_filename = 'postgresql-%a.log' # Log file name pattern.
+ # May include strftime() escapes
+-#log_truncate_on_rotation = false # If true, any existing log file of the
++log_truncate_on_rotation = true # If true, any existing log file of the
+ # same name as the new log file will be truncated
+ # rather than appended to. But such truncation
+ # only occurs on time-driven rotation,
+ # not on restarts or size-driven rotation.
+ # Default is false, meaning append to existing
+ # files in all cases.
+-#log_rotation_age = 1440 # Automatic rotation of logfiles will happen after
++log_rotation_age = 1440 # Automatic rotation of logfiles will happen after
+ # so many minutes. 0 to disable.
+-#log_rotation_size = 10240 # Automatic rotation of logfiles will happen after
++log_rotation_size = 0 # Automatic rotation of logfiles will happen after
+ # so many kilobytes of log output. 0 to disable.
+
+ # These are relevant when logging to syslog:
diff --git a/postgresql-test.patch b/postgresql-test.patch
new file mode 100644
index 0000000..2a96519
--- /dev/null
+++ b/postgresql-test.patch
@@ -0,0 +1,73 @@
+diff -Naur postgresql-8.0.0rc5.orig/src/test/regress/GNUmakefile postgresql-8.0.0rc5/src/test/regress/GNUmakefile
+--- postgresql-8.0.0rc5.orig/src/test/regress/GNUmakefile 2004-11-17 13:05:06.000000000 -0500
++++ postgresql-8.0.0rc5/src/test/regress/GNUmakefile 2005-01-12 14:48:45.618011257 -0500
+@@ -84,12 +84,23 @@
+ testtablespace := $(abs_builddir)/testtablespace
+
+
++ifdef RPMTESTING
++define sed-command
++sed -e 's,@abs_srcdir@,$(libdir)/pgsql/test/regress,g' \
++ -e 's,@abs_builddir@,$(libdir)/pgsql/test/regress,g' \
++ -e 's,@abs_spidir@,$(libdir)/pgsql/test/regress,g' \
++ -e 's,@testtablespace@,$(libdir)/pgsql/test/regress/testtablespace,g' \
++ -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@
++endef
++else
+ define sed-command
+ sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \
+ -e 's,@abs_builddir@,$(abs_builddir),g' \
++ -e 's,@abs_spidir@,$(abs_builddir)/../../../contrib/spi,g' \
+ -e 's,@testtablespace@,$(testtablespace),g' \
+ -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@
+ endef
++endif
+
+ $(input_files): sql/%.sql: input/%.source
+ $(sed-command)
+diff -Naur postgresql-8.0.0rc5.orig/src/test/regress/input/create_function_1.source postgresql-8.0.0rc5/src/test/regress/input/create_function_1.source
+--- postgresql-8.0.0rc5.orig/src/test/regress/input/create_function_1.source 2002-08-21 20:01:51.000000000 -0400
++++ postgresql-8.0.0rc5/src/test/regress/input/create_function_1.source 2005-01-12 14:50:50.679124338 -0500
+@@ -24,17 +24,17 @@
+
+ CREATE FUNCTION check_primary_key ()
+ RETURNS trigger
+- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
++ AS '@abs_spidir@/refint@DLSUFFIX@'
+ LANGUAGE 'C';
+
+ CREATE FUNCTION check_foreign_key ()
+ RETURNS trigger
+- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
++ AS '@abs_spidir@/refint@DLSUFFIX@'
+ LANGUAGE 'C';
+
+ CREATE FUNCTION autoinc ()
+ RETURNS trigger
+- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
++ AS '@abs_spidir@/autoinc@DLSUFFIX@'
+ LANGUAGE 'C';
+
+ CREATE FUNCTION funny_dup17 ()
+diff -Naur postgresql-8.0.0rc5.orig/src/test/regress/output/create_function_1.source postgresql-8.0.0rc5/src/test/regress/output/create_function_1.source
+--- postgresql-8.0.0rc5.orig/src/test/regress/output/create_function_1.source 2004-03-21 17:29:11.000000000 -0500
++++ postgresql-8.0.0rc5/src/test/regress/output/create_function_1.source 2005-01-12 14:51:08.149762180 -0500
+@@ -25,15 +25,15 @@
+ NOTICE: argument type city_budget is only a shell
+ CREATE FUNCTION check_primary_key ()
+ RETURNS trigger
+- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
++ AS '@abs_spidir@/refint@DLSUFFIX@'
+ LANGUAGE 'C';
+ CREATE FUNCTION check_foreign_key ()
+ RETURNS trigger
+- AS '@abs_builddir@/../../../contrib/spi/refint(a)DLSUFFIX@'
++ AS '@abs_spidir@/refint@DLSUFFIX@'
+ LANGUAGE 'C';
+ CREATE FUNCTION autoinc ()
+ RETURNS trigger
+- AS '@abs_builddir@/../../../contrib/spi/autoinc(a)DLSUFFIX@'
++ AS '@abs_spidir@/autoinc@DLSUFFIX@'
+ LANGUAGE 'C';
+ CREATE FUNCTION funny_dup17 ()
+ RETURNS trigger
diff --git a/postgresql.init b/postgresql.init
index 65c3ed4..89ef562 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -63,7 +63,7 @@
# PGVERSION is:
-PGVERSION=7.4
+PGVERSION=8.0
# Source function library.
INITD=/etc/rc.d/init.d
@@ -94,121 +94,125 @@ fi
# Set defaults for configuration variables
PGENGINE=/usr/bin
PGPORT=5432
-export PGDATA=/var/lib/pgsql
-if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base/template1 ]
+PGDATA=/var/lib/pgsql
+if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base/template1" ]
then
echo "Using old-style directory structure"
else
- export PGDATA=/var/lib/pgsql/data
+ PGDATA=/var/lib/pgsql/data
fi
-PGLOG=/dev/null
+PGLOG=/var/lib/pgsql/pgstartup.log
# Override defaults from /etc/sysconfig/pgsql if file is present
[ -f /etc/sysconfig/pgsql/${NAME} ] && . /etc/sysconfig/pgsql/${NAME}
+
export PGDATA
export PGPORT
-export PGOPTS
# Check that networking is up.
# Pretty much need it for postmaster.
[ "${NETWORKING}" = "no" ] && exit 0
-[ -f $PGENGINE/postmaster ] || exit 0
+[ -f "$PGENGINE/postmaster" ] || exit 1
+
+script_result=0
start(){
PSQL_START=$"Starting ${NAME} service: "
+ # Make sure startup-time log file is valid
+ if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+ then
+ touch "$PGLOG" || exit 1
+ chown postgres:postgres "$PGLOG"
+ chmod go-rwx "$PGLOG"
+ [ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG"
+ fi
+
# Check for the PGDATA structure
- if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base ]
+ if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
then
# Check version of existing PGDATA
- if [ `cat $PGDATA/PG_VERSION` != "$PGVERSION" ]
+ if [ `cat "$PGDATA/PG_VERSION"` != "$PGVERSION" ]
then
SYSDOCDIR="(Your System's documentation directory)"
- if [ -d /usr/doc/postgresql-$PGVERSION ]
+ if [ -d "/usr/doc/postgresql-$PGVERSION" ]
then
SYSDOCDIR=/usr/doc
fi
- if [ -d /usr/share/doc/postgresql-$PGVERSION ]
+ if [ -d "/usr/share/doc/postgresql-$PGVERSION" ]
then
SYSDOCDIR=/usr/share/doc
fi
- if [ -d /usr/doc/packages/postgresql-$PGVERSION ]
+ if [ -d "/usr/doc/packages/postgresql-$PGVERSION" ]
then
SYSDOCDIR=/usr/doc/packages
fi
- if [ -d /usr/share/doc/packages/postgresql-$PGVERSION ]
+ if [ -d "/usr/share/doc/packages/postgresql-$PGVERSION" ]
then
SYSDOCDIR=/usr/share/doc/packages
fi
echo
echo $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
exit 1
-# This doesn't seem to do anything useful...
-# else
-# if echo "$TYPESET"|grep "declare -f success ()" >/dev/null
-# then
-# success "$PSQL_CHECK"
-# else
-# echo " [ OK ]"
-# fi
-# echo
fi
# No existing PGDATA! Initdb it.
else
- echo -n $"Initializing database: "
- if [ ! -e $PGDATA -a ! -h $PGDATA ]
+ echo -n $"Initializing database: "
+ if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
then
- mkdir -p $PGDATA || exit 1
- chown postgres:postgres $PGDATA
- chmod go-rwx $PGDATA
- [ -x /sbin/restorecon ] && restorecon -R $PGDATA
+ mkdir -p "$PGDATA" || exit 1
+ chown postgres:postgres "$PGDATA"
+ chmod go-rwx "$PGDATA"
fi
- # Make sure the locale from the initdb is preserved for later startups...
- [ -f /etc/sysconfig/i18n ] && cp /etc/sysconfig/i18n $PGDATA/../initdb.i18n
- # Just in case no locale was set, use en_US
- [ ! -f /etc/sysconfig/i18n ] && echo "LANG=en_US" > $PGDATA/../initdb.i18n
- # Is expanded this early to be used in the command $SU runs
- echo "export LANG LC_ALL LC_CTYPE LC_COLLATE LC_NUMERIC LC_CTYPE LC_TIME" >> $PGDATA/../initdb.i18n
+ # Clean up SELinux tagging for PGDATA
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
# Initialize the database
- $SU -l postgres -c "$PGENGINE/initdb --pgdata=$PGDATA" >> $PGLOG 2>&1 < /dev/null
- [ -f $PGDATA/PG_VERSION ] && echo_success
- [ ! -f $PGDATA/PG_VERSION ] && echo_failure
+ $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident sameuser'" >> "$PGLOG" 2>&1 < /dev/null
+ # Create directory for postmaster log
+ mkdir "$PGDATA/pg_log"
+ chown postgres:postgres "$PGDATA/pg_log"
+ chmod go-rwx "$PGDATA/pg_log"
+
+ [ -f "$PGDATA/PG_VERSION" ] && echo_success
+ [ ! -f "$PGDATA/PG_VERSION" ] && echo_failure
echo
fi
echo -n "$PSQL_START"
- $SU -l postgres -c "$PGENGINE/postmaster -p ${PGPORT} -D '${PGDATA}' ${PGOPTS} &" >> $PGLOG 2>&1 < /dev/null
- sleep 1
- pid=`pidof -s $PGENGINE/postmaster`
- if [ $pid ] && [ -f "${PGDATA}/postmaster.pid" ]
+ $SU -l postgres -c "$PGENGINE/postmaster -p '$PGPORT' -D '$PGDATA' ${PGOPTS} &" >> "$PGLOG" 2>&1 < /dev/null
+ sleep 2
+ pid=`pidof -s "$PGENGINE/postmaster"`
+ if [ $pid ] && [ -f "$PGDATA/postmaster.pid" ]
then
success "$PSQL_START"
touch /var/lock/subsys/${NAME}
- head -n 1 "${PGDATA}/postmaster.pid" > /var/run/postmaster.${PGPORT}.pid
+ head -n 1 "$PGDATA/postmaster.pid" > "/var/run/postmaster.${PGPORT}.pid"
echo
else
failure "$PSQL_START"
echo
+ script_result=1
fi
}
stop(){
echo -n $"Stopping ${NAME} service: "
- $SU -l postgres -c "$PGENGINE/pg_ctl stop -D '${PGDATA}' -s -m fast" > /dev/null 2>&1 < /dev/null
+ $SU -l postgres -c "$PGENGINE/pg_ctl stop -D '$PGDATA' -s -m fast" > /dev/null 2>&1 < /dev/null
ret=$?
if [ $ret -eq 0 ]
then
echo_success
else
echo_failure
+ script_result=1
fi
echo
- rm -f /var/run/postmaster.${PGPORT}.pid
- rm -f /var/lock/subsys/${NAME}
+ rm -f "/var/run/postmaster.${PGPORT}.pid"
+ rm -f "/var/lock/subsys/${NAME}"
}
restart(){
@@ -225,7 +229,7 @@ condstop(){
}
reload(){
- $SU -l postgres -c "$PGENGINE/pg_ctl reload -D '${PGDATA}' -s" > /dev/null 2>&1 < /dev/null
+ $SU -l postgres -c "$PGENGINE/pg_ctl reload -D '$PGDATA' -s" > /dev/null 2>&1 < /dev/null
}
# This script is slightly unusual in that the name of the daemon (postmaster)
@@ -241,6 +245,7 @@ case "$1" in
;;
status)
status postmaster
+ script_result=$?
;;
restart)
restart
@@ -259,4 +264,4 @@ case "$1" in
exit 1
esac
-exit 0
+exit $script_result
diff --git a/postgresql.spec b/postgresql.spec
index 35063ee..50294bb 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -10,14 +10,11 @@
#build7x, build8, and build9 similar
%{?build8:%define build89 1}
%{?build9:%define build89 1}
-%{?build7x:%define kerbdir /usr/kerberos}
%{?build7x:%define tcldevel 0}
-%{?build89:%define kerbdir /usr/kerberos}
%{?build8:%define tcldevel 0}
%{?build7x:%define aconfver autoconf-2.53}
%{!?tcldevel:%define tcldevel 1}
-%{!?kerbdir:%define kerbdir /usr}
%{!?aconfver:%define aconfver autoconf}
%define beta 0
@@ -25,7 +22,6 @@
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
%{!?tcl:%define tcl 1}
-%{!?tkpkg:%define tkpkg 0}
%{!?jdbc:%define jdbc 1}
%{!?test:%define test 1}
%{!?python:%define python 1}
@@ -37,6 +33,7 @@
%{!?nls:%define nls 1}
%{!?pam:%define pam 1}
%{!?pgfts:%define pgfts 1}
+%{!?runselftest:%define runselftest 1}
# Python major version.
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
@@ -45,7 +42,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.4.6
+Version: 8.0.0
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -67,42 +64,37 @@ Version: 7.4.6
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 5
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init
-Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+Source4: Makefile.regress
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/pg74.215.jdbc1.jar
-Source9: http://jdbc.postgresql.org/download/pg74.215.jdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pg74.215.jdbc2ee.jar
-Source11: http://jdbc.postgresql.org/download/pg74.215.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.0.309.jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.tgz
-Patch1: rpm-pgsql-7.4.patch
-Patch2: rpm-multilib-%{version}.patch
-Patch3: postgresql-7.4-tighten.patch
-Patch4: postgresql-7.4-getppid.patch
-Patch5: postgresql-plperl.patch
-Patch6: postgresql-7.4-src-tutorial.patch
-Patch7: postgresql-7.3.4-s390-pic.patch
-Patch8: postgresql-7.4-com_err.patch
+Source17: postgresql-8.0-US.pdf
+Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.1.tgz
+Source19: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcl1.5.2.tar.gz
+Source20: ftp://gborg.postgresql.org/pub/pgtclng/stable/pgtcldocs-20041108.zip
+Patch1: rpm-pgsql.patch
+Patch2: postgresql-src-tutorial.patch
+Patch3: postgresql-logging.patch
+Patch4: postgresql-test.patch
Buildrequires: perl glibc-devel bison flex
Prereq: /sbin/ldconfig initscripts
%if %python
BuildPrereq: python-devel
%endif
-%if %tcl
+%if %tcl || %pltcl
BuildPrereq: tcl
%if %tcldevel
Buildrequires: tcl-devel
%endif
%endif
-%if %tkpkg
-BuildPrereq: tk
-%endif
BuildPrereq: readline-devel
BuildPrereq: zlib-devel >= 1.0.4
%if %ssl
@@ -205,7 +197,7 @@ PostgreSQL server.
Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
-Requires: postgresql = %{version} libpq.so
+Prereq: postgresql = %{version} libpq.so
Conflicts: postgresql < 7.4
%description server
@@ -223,16 +215,16 @@ to install the postgresql package.
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
+Prereq: postgresql = %{version}
%description docs
-The postgresql-docs package includes the SGML source for the documentation
-as well as the documentation in PDF format and some extra documentation.
-Install this package if you want to help with the PostgreSQL documentation
-project, or if you want to generate printed documentation.
+The postgresql-docs package includes some additional documentation for
+PostgreSQL. Currently, this includes the main documentation in PDF format,
+the FAQ, and source files for the PostgreSQL tutorial.
%package contrib
Summary: Contributed source and binaries distributed with PostgreSQL
Group: Applications/Databases
-Requires: postgresql = %{version}
+Prereq: postgresql = %{version}
%description contrib
The postgresql-contrib package contains contributed packages that are
included in the PostgreSQL distribution.
@@ -241,6 +233,7 @@ included in the PostgreSQL distribution.
%package devel
Summary: PostgreSQL development header files and libraries.
Group: Development/Libraries
+Prereq: postgresql = %{version}
Requires: postgresql-libs = %{version}
%description devel
@@ -257,7 +250,7 @@ package.
%package pl
Summary: The PL procedural languages for PostgreSQL.
Group: Applications/Databases
-Requires: postgresql = %{version}
+PreReq: postgresql = %{version}
PreReq: postgresql-server = %{version}
%description pl
@@ -271,12 +264,13 @@ procedural languages for the backend. PL/Pgsql is part of the core server packa
%package tcl
Summary: A Tcl client library for PostgreSQL.
Group: Applications/Databases
-Requires: tcl >= 8.0
+Requires: libpq.so
+Requires: tcl >= 8.3
%description tcl
PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-tcl package contains the libpgtcl client library,
-the pg-enhanced pgtclsh,and the pg-enhanced tksh, if so configured at buildtime.
+system. The postgresql-tcl package contains the Pgtcl client library
+and its documentation.
%endif
#------------
@@ -284,10 +278,10 @@ the pg-enhanced pgtclsh,and the pg-enhanced tksh, if so configured at buildtime.
%package python
Summary: Development module for Python code to access a PostgreSQL DB.
Group: Applications/Databases
+Requires: libpq.so
Requires: python mx
Conflicts: python < %pyver, python >= %pynextver
-
%description python
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-python package includes a module for
@@ -303,7 +297,7 @@ Group: Applications/Databases
%description jdbc
PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-jdbc package includes the .jar file needed for
+system. The postgresql-jdbc package includes the .jar files needed for
Java programs to access a PostgreSQL database.
%endif
@@ -312,7 +306,7 @@ Java programs to access a PostgreSQL database.
%package test
Summary: The test suite distributed with PostgreSQL.
Group: Applications/Databases
-Requires: postgresql = %{version}
+PreReq: postgresql = %{version}
PreReq: postgresql-server = %{version}
%description test
@@ -333,10 +327,6 @@ popd
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -346,8 +336,7 @@ tar -zcf postgres.tar.gz *.html stylesheet.css
rm -f *.html stylesheet.css
popd
-#cp -p %{SOURCE17} .
-#tar zxf %{SOURCE17}
+cp -p %{SOURCE17} .
%if %python
tar xzf %{SOURCE18}
@@ -360,19 +349,23 @@ popd
chmod 755 PyGreSQL/tutorial/advanced.py PyGreSQL/tutorial/basics.py
%endif
+%if %tcl
+ tar xzf %{SOURCE19}
+ PGTCLDIR=`basename %{SOURCE19} .tar.gz`
+ mv $PGTCLDIR Pgtcl
+ unzip %{SOURCE20}
+ PGTCLDOCDIR=`basename %{SOURCE20} .zip`
+ mv $PGTCLDOCDIR Pgtcl-docs
+%endif
+
%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-%if %kerberos
-CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
-CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
-%endif
# Strip out -ffast-math from CFLAGS....
-
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-export LIBNAME=%{_lib}
+
%configure --disable-rpath \
%if %beta
--enable-debug \
@@ -381,15 +374,10 @@ export LIBNAME=%{_lib}
%if %plperl
--with-perl \
%endif
-%if %tcl
+%if %pltcl
--with-tcl \
--with-tclconfig=%{_libdir} \
%endif
-%if %tkpkg
- --with-tkconfig=%{_libdir} \
-%else
- --without-tk \
-%endif
%if %python
--with-python \
%endif
@@ -400,7 +388,7 @@ export LIBNAME=%{_lib}
--with-pam \
%endif
%if %kerberos
- --with-krb5=%kerbdir \
+ --with-krb5 \
%endif
%if %nls
--enable-nls \
@@ -415,9 +403,22 @@ export LIBNAME=%{_lib}
make %{?_smp_mflags} all
make %{?_smp_mflags} -C contrib all
-%if %test
- pushd src/test
+# Have to hack makefile to put correct path into tutorial scripts
+sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/tutorial/GNUmakefile
+make %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all
+rm -f src/tutorial/GNUmakefile
+
+%if %runselftest
+ pushd src/test/regress
make all
+ make MAX_CONNECTIONS=5 check
+ make clean
+ popd
+%endif
+
+%if %test
+ pushd src/test/regress
+ make RPMTESTING=1 all
popd
%endif
@@ -429,23 +430,32 @@ make %{?_smp_mflags} -C contrib all
pushd PyGreSQL
- gcc $CFLAGS -fpic -shared -o _pgmodule.so ${python_includespec} -I../src/interfaces/libpq -I../src/include -I%{kerbdir}/include -L../src/interfaces/libpq -lpq pgmodule.c
+ gcc $CFLAGS -fpic -shared -o _pgmodule.so ${python_includespec} -I../src/interfaces/libpq -I../src/include -L../src/interfaces/libpq -lpq pgmodule.c
popd
%endif
+%if %tcl
+ pushd Pgtcl
+ # pgtcl's configure only handles one include directory :-(
+ ./configure --prefix=/usr \
+ --libdir=%{_libdir} \
+ --with-tcl=%{_libdir} \
+ --with-postgres-include="../src/interfaces/libpq -I../src/include" \
+ --with-postgres-lib=../src/interfaces/libpq
+ # note: as of pgtcl 1.5.2, its makefile is not parallel-safe
+ make all
+ popd
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make -C contrib DESTDIR=$RPM_BUILD_ROOT install
-# install dev headers.
-
-make DESTDIR=$RPM_BUILD_ROOT install-all-headers
-
-# copy over Makefile.global to the include dir....
-install -m 644 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
+cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
%if %jdbc
# Java/JDBC
@@ -456,8 +466,12 @@ install -m 644 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
- install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java
+%endif
+%if %tcl
+ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/Pgtcl
+ cp Pgtcl/pkgIndex.tcl $RPM_BUILD_ROOT%{_libdir}/Pgtcl
+ cp Pgtcl/libpgtcl*.so $RPM_BUILD_ROOT%{_libdir}/Pgtcl
%endif
if [ -d /etc/rc.d/init.d ]
@@ -469,7 +483,7 @@ fi
# Remove stuff we don't want to ship.
rm -f $RPM_BUILD_ROOT%{_bindir}/findoidjoins
rm -f $RPM_BUILD_ROOT%{_bindir}/make_oidjoins_check
-rm -f $RPM_BUILD_ROOT%{_docdir}/postgresql/contrib/README.findoidjoins
+rm -f $RPM_BUILD_ROOT%{_docdir}/pgsql/contrib/README.findoidjoins
rm -f contrib/findoidjoins/README.findoidjoins
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
@@ -486,26 +500,26 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
%if %test
- # tests. There are many files included here that are unnecessary, but include
- # them anyway for completeness.
- mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
- cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
- install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
- install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
- pushd $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress/
+ # tests. There are many files included here that are unnecessary,
+ # but include them anyway for completeness. We replace the original
+ # Makefiles, however.
+ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test
+ cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test
+ install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
+ install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress
+ pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/
strip *.so
+ rm -f GNUmakefile Makefile
popd
+ cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
+ chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile
%endif
# Fix some more documentation
# gzip doc/internals.ps
cp %{SOURCE6} README.rpm-dist
-mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
-rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql
-%if %tkpkg
-%else
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
-%endif
+mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
%if %python
pushd PyGreSQL
@@ -517,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
%endif
%find_lang libpq
+%find_lang initdb
+%find_lang pg_config
+%find_lang pg_ctl
%find_lang pg_dump
%find_lang postgres
%find_lang psql
@@ -525,7 +542,8 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
%find_lang pgscripts
cat libpq.lang > libpq.lst
-cat psql.lang pg_dump.lang pgscripts.lang > main.lst
+cat pg_config.lang > pg_config.lst
+cat initdb.lang pg_ctl.lang psql.lang pg_dump.lang pgscripts.lang > main.lst
cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
%post libs -p /sbin/ldconfig
@@ -535,9 +553,6 @@ cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
-touch /var/log/pgsql
-chown postgres:postgres /var/log/pgsql
-chmod 0700 /var/log/pgsql
%post server
chkconfig --add postgresql
@@ -556,11 +571,6 @@ if [ $1 = 0 ] ; then
groupdel postgres >/dev/null 2>&1 || :
fi
-%if %tcl
-%post -p /sbin/ldconfig tcl
-%postun -p /sbin/ldconfig tcl
-%endif
-
%if %pls
%post -p /sbin/ldconfig pl
%postun -p /sbin/ldconfig pl
@@ -591,8 +601,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/dropuser
%{_bindir}/pg_dump
%{_bindir}/pg_dumpall
-%{_bindir}/pg_encoding
-%{_bindir}/pg_id
%{_bindir}/pg_restore
%{_bindir}/psql
%{_bindir}/vacuumdb
@@ -613,9 +621,9 @@ rm -rf $RPM_BUILD_ROOT
%files docs
%defattr(-,root,root)
-%doc doc/src/*
-#doc *-US.pdf
-%doc src/tutorial
+%doc doc/src/FAQ
+%doc *-US.pdf
+%{_libdir}/pgsql/tutorial/
%files contrib
%defattr(-,root,root)
@@ -640,8 +648,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/pending.so
%{_libdir}/pgsql/pgcrypto.so
%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/pg_trgm.so
%{_libdir}/pgsql/refint.so
-%{_libdir}/pgsql/rserv.so
%{_libdir}/pgsql/rtree_gist.so
%{_libdir}/pgsql/seg.so
%{_libdir}/pgsql/string_io.so
@@ -651,24 +659,15 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/tsearch2.so
%{_libdir}/pgsql/user_locks.so
%{_datadir}/pgsql/contrib/
+%{_bindir}/DBMirror.pl
+%{_bindir}/clean_pending.pl
+%{_bindir}/my2pg.pl
+%{_bindir}/mysql2pgsql
%{_bindir}/dbf2pg
%{_bindir}/fti.pl
%{_bindir}/oid2name
%{_bindir}/pg_dumplo
-%{_bindir}/pg_logger
%{_bindir}/pgbench
-%{_bindir}/RservTest
-%{_bindir}/MasterInit
-%{_bindir}/MasterAddTable
-%{_bindir}/Replicate
-%{_bindir}/MasterSync
-%{_bindir}/CleanLog
-%{_bindir}/SlaveInit
-%{_bindir}/SlaveAddTable
-%{_bindir}/GetSyncID
-%{_bindir}/PrepareSnapshot
-%{_bindir}/ApplySnapshot
-%{_bindir}/InitRservTest
%{_bindir}/vacuumlo
%{_bindir}/pg_autovacuum
%doc contrib/*/README.* contrib/spi/*.example
@@ -685,7 +684,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/rc.d/init.d/postgresql
%attr (755,root,root) %dir /etc/sysconfig/pgsql
%{_bindir}/initdb
-%{_bindir}/initlocation
%{_bindir}/ipcclean
%{_bindir}/pg_controldata
%{_bindir}/pg_ctl
@@ -693,7 +691,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/postgres
%{_bindir}/postmaster
%{_mandir}/man1/initdb.*
-%{_mandir}/man1/initlocation.*
%{_mandir}/man1/ipcclean.*
%{_mandir}/man1/pg_controldata.*
%{_mandir}/man1/pg_ctl.*
@@ -702,7 +699,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/postmaster.*
%{_datadir}/pgsql/postgres.bki
%{_datadir}/pgsql/postgres.description
+%{_datadir}/pgsql/system_views.sql
%{_datadir}/pgsql/*.sample
+%{_datadir}/pgsql/timezone/
%{_libdir}/pgsql/plpgsql.so
%dir %{_datadir}/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql
@@ -714,7 +713,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/information_schema.sql
%{_datadir}/pgsql/sql_features.txt
-%files devel
+%files devel -f pg_config.lst
%defattr(-,root,root)
/usr/include/*
%{_bindir}/ecpg
@@ -723,28 +722,20 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libecpg.so
%{_libdir}/libpq.a
%{_libdir}/libecpg.a
-%if %tcl
-%{_libdir}/libpgtcl.a
-%endif
%{_libdir}/libecpg_compat.so
%{_libdir}/libecpg_compat.a
+%{_libdir}/libpgport.a
%{_libdir}/libpgtypes.so
%{_libdir}/libpgtypes.a
+%{_libdir}/pgsql/pgxs/
%{_mandir}/man1/ecpg.*
%{_mandir}/man1/pg_config.*
%if %tcl
%files tcl
%defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/libpgtcl.so.*
-# libpgtcl.so is not in devel because Tcl scripts may load it by that name.
-%{_libdir}/libpgtcl.so
-%{_bindir}/pgtclsh
-%{_mandir}/man1/pgtclsh.*
-%if %tkpkg
-%{_bindir}/pgtksh
-%{_mandir}/man1/pgtksh.*
-%endif
+%{_libdir}/Pgtcl/
+%doc Pgtcl-docs/*
%endif
%if %pls
@@ -776,20 +767,31 @@ rm -rf $RPM_BUILD_ROOT
%if %jdbc
%files jdbc
%defattr(-,root,root)
-%{_datadir}/java/pg74.215.jdbc1.jar
-%{_datadir}/java/pg74.215.jdbc2.jar
-%{_datadir}/java/pg74.215.jdbc2ee.jar
-%{_datadir}/java/pg74.215.jdbc3.jar
+%{_datadir}/java/*
%endif
%if %test
%files test
%defattr(-,postgres,postgres)
-%attr(-,postgres,postgres) /usr/lib/pgsql/test/*
-%attr(-,postgres,postgres) %dir /usr/lib/pgsql/test
+%attr(-,postgres,postgres) %{_libdir}/pgsql/test/*
+%attr(-,postgres,postgres) %dir %{_libdir}/pgsql/test
%endif
%changelog
+* Wed Jan 19 2005 Tom Lane <tgl(a)redhat.com> 8.0.0-1
+- Update to PostgreSQL 8.0.0, PyGreSQL 3.6.1, pgtcl 1.5.2,
+ and jdbc driver build 309.
+- Extensive cleanout of obsolete cruft in patch set.
+- Regression tests are run during RPM build (NOTE: cannot build as root when
+ this is enabled).
+- Postmaster stderr goes someplace useful, not /dev/null (bz#76503, #103767)
+- Make init script return a useful exit status (bz#80782)
+- Move docs' tutorial directory to %%{_libdir}/pgsql/tutorial, since it
+ includes .so files that surely do not belong under /usr/share.
+- Remove useless .sgml files from docs RPM (bz#134450)
+- Put regression tests under /usr/lib64 on 64-bit archs, since .so files
+ are not architecture-independent.
+
* Wed Jan 12 2005 Tim Waugh <twaugh(a)redhat.com> 7.4.6-5
- Rebuilt for new readline.
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch
new file mode 100644
index 0000000..87eff85
--- /dev/null
+++ b/rpm-pgsql.patch
@@ -0,0 +1,64 @@
+diff -Naur postgresql-8.0.0rc5.orig/src/Makefile.global.in postgresql-8.0.0rc5/src/Makefile.global.in
+--- postgresql-8.0.0rc5.orig/src/Makefile.global.in 2004-12-18 21:16:18.000000000 -0500
++++ postgresql-8.0.0rc5/src/Makefile.global.in 2005-01-11 16:06:30.570550658 -0500
+@@ -53,7 +53,7 @@
+ # Installation directories
+ #
+ # These are set by the equivalent --xxxdir configure options. We
+-# append "postgresql" to some of them, if the string does not already
++# append "pgsql" to some of them, if the string does not already
+ # contain "pgsql" or "postgres", in order to avoid directory clutter.
+
+ prefix := @prefix@
+@@ -65,21 +65,21 @@
+ libexecdir := @libexecdir@
+ ifeq "$(findstring pgsql, $(libexecdir))" ""
+ ifeq "$(findstring postgres, $(libexecdir))" ""
+-override libexecdir := $(libexecdir)/postgresql
++override libexecdir := $(libexecdir)/pgsql
+ endif
+ endif
+
+ datadir := @datadir@
+ ifeq "$(findstring pgsql, $(datadir))" ""
+ ifeq "$(findstring postgres, $(datadir))" ""
+-override datadir := $(datadir)/postgresql
++override datadir := $(datadir)/pgsql
+ endif
+ endif
+
+ sysconfdir := @sysconfdir@
+ ifeq "$(findstring pgsql, $(sysconfdir))" ""
+ ifeq "$(findstring postgres, $(sysconfdir))" ""
+-override sysconfdir := $(sysconfdir)/postgresql
++override sysconfdir := $(sysconfdir)/pgsql
+ endif
+ endif
+
+@@ -87,7 +87,7 @@
+ pkglibdir = $(libdir)
+ ifeq "$(findstring pgsql, $(pkglibdir))" ""
+ ifeq "$(findstring postgres, $(pkglibdir))" ""
+-override pkglibdir := $(pkglibdir)/postgresql
++override pkglibdir := $(pkglibdir)/pgsql
+ endif
+ endif
+
+@@ -95,7 +95,7 @@
+ pkgincludedir = $(includedir)
+ ifeq "$(findstring pgsql, $(pkgincludedir))" ""
+ ifeq "$(findstring postgres, $(pkgincludedir))" ""
+-override pkgincludedir := $(pkgincludedir)/postgresql
++override pkgincludedir := $(pkgincludedir)/pgsql
+ endif
+ endif
+ includedir_server = $(pkgincludedir)/server
+@@ -109,7 +109,7 @@
+ ifneq (,$(docdir))
+ ifeq "$(findstring pgsql, $(docdir))" ""
+ ifeq "$(findstring postgres, $(docdir))" ""
+-override docdir := $(docdir)/postgresql
++override docdir := $(docdir)/pgsql
+ endif
+ endif
+ endif
diff --git a/sources b/sources
index c83620d..c66e691 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,8 @@
-f0ea2b372a7bdaf2613e92176ebf5e0f postgresql-7.4.6.tar.bz2
-3857df12291f7fad3cce553f05d97f4a PyGreSQL-3.6.tgz
+3fe6bb504a6457daa80bc32daf10122e postgresql-8.0.0.tar.bz2
+057c2d93f333ff2ed2177a8b87e19c0c PyGreSQL-3.6.1.tgz
+d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz
+3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip
+35ecfedea6bfb21eca15c85da6f062e9 postgresql-8.0.309.jdbc2.jar
+0c565f0fce11c55242467aade130f86c postgresql-8.0.309.jdbc2ee.jar
+04fb5bd60b3caddbf9322d6a9398f108 postgresql-8.0.309.jdbc3.jar
+2edd229aa83105175a1212a001dd030a postgresql-8.0-US.pdf
commit cc192f6092626400720804e8b3321ab5967e6cfb
Author: Tim Waugh <twaugh(a)fedoraproject.org>
Date: Wed Jan 12 16:30:20 2005 +0000
- Rebuilt for new readline.
diff --git a/postgresql.spec b/postgresql.spec
index ba9be8b..35063ee 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.6
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 4
+Release: 5
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -790,6 +790,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jan 12 2005 Tim Waugh <twaugh(a)redhat.com> 7.4.6-5
+- Rebuilt for new readline.
+
* Tue Jan 11 2005 Dan Walsh <dwalsh(a)redhat.com> 7.4.6-4
- Add restorecon to postgresql.init in order to restore database to correct
- SELinux context.
commit 09d8b02f0f15d2931d3ef87f1d236d96e36080d1
Author: Daniel J Walsh <dwalsh(a)fedoraproject.org>
Date: Tue Jan 11 21:21:32 2005 +0000
fix to only restorecon on data directory postgresql.init
diff --git a/postgresql.init b/postgresql.init
index 6dd7ba2..65c3ed4 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -94,7 +94,6 @@ fi
# Set defaults for configuration variables
PGENGINE=/usr/bin
PGPORT=5432
-export PGDATADIR=/var/lib/pgsql
export PGDATA=/var/lib/pgsql
if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base/template1 ]
then
@@ -166,7 +165,7 @@ start(){
mkdir -p $PGDATA || exit 1
chown postgres:postgres $PGDATA
chmod go-rwx $PGDATA
- [ -x /sbin/restorecon ] && restorecon -R $PGDATADIR
+ [ -x /sbin/restorecon ] && restorecon -R $PGDATA
fi
# Make sure the locale from the initdb is preserved for later startups...
[ -f /etc/sysconfig/i18n ] && cp /etc/sysconfig/i18n $PGDATA/../initdb.i18n
commit 60170234ebc77eec82e3b22c61f3e816c35f5884
Author: Daniel J Walsh <dwalsh(a)fedoraproject.org>
Date: Tue Jan 11 20:42:37 2005 +0000
fix restorecon line
diff --git a/postgresql.init b/postgresql.init
index fc98742..6dd7ba2 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -166,7 +166,7 @@ start(){
mkdir -p $PGDATA || exit 1
chown postgres:postgres $PGDATA
chmod go-rwx $PGDATA
- [ -x /sbin/restorecon ] && restorecon $PGDATADIR
+ [ -x /sbin/restorecon ] && restorecon -R $PGDATADIR
fi
# Make sure the locale from the initdb is preserved for later startups...
[ -f /etc/sysconfig/i18n ] && cp /etc/sysconfig/i18n $PGDATA/../initdb.i18n
commit a884bda9879e83d55764818ca172b5d8486f3849
Author: Daniel J Walsh <dwalsh(a)fedoraproject.org>
Date: Tue Jan 11 20:20:45 2005 +0000
- Add restorecon to postgresql.init in order to restore database to correct
- SELinux context.
diff --git a/postgresql.init b/postgresql.init
index 9f41e9e..fc98742 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -94,6 +94,7 @@ fi
# Set defaults for configuration variables
PGENGINE=/usr/bin
PGPORT=5432
+export PGDATADIR=/var/lib/pgsql
export PGDATA=/var/lib/pgsql
if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base/template1 ]
then
@@ -165,6 +166,7 @@ start(){
mkdir -p $PGDATA || exit 1
chown postgres:postgres $PGDATA
chmod go-rwx $PGDATA
+ [ -x /sbin/restorecon ] && restorecon $PGDATADIR
fi
# Make sure the locale from the initdb is preserved for later startups...
[ -f /etc/sysconfig/i18n ] && cp /etc/sysconfig/i18n $PGDATA/../initdb.i18n
diff --git a/postgresql.spec b/postgresql.spec
index 976aaad..ba9be8b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.6
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 3
+Release: 4
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -790,6 +790,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Jan 11 2005 Dan Walsh <dwalsh(a)redhat.com> 7.4.6-4
+- Add restorecon to postgresql.init in order to restore database to correct
+- SELinux context.
+
* Thu Dec 16 2004 Tom Lane <tgl(a)redhat.com> 7.4.6-3
- Update to PyGreSQL 3.6 (to fix bug #142711)
- Adjust a few file permissions (bug #142431)
commit ec364abd8ac0e5afdc6dc6c9fa3e56e79c1585f7
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Thu Dec 16 22:02:42 2004 +0000
Update to PyGreSQL 3.6 (to fix bug #142711). Adjust a few file permissions
(bug #142431). Assign %{_libdir}/pgsql to base package instead of
-server (bug #74003).
diff --git a/.cvsignore b/.cvsignore
index 2781485..026e962 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-PyGreSQL-3.5.tgz
postgresql-7.4.6.tar.bz2
+PyGreSQL-3.6.tgz
diff --git a/postgresql.spec b/postgresql.spec
index e50e0c7..976aaad 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.6
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 2
+Release: 3
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -80,7 +80,7 @@ Source10: http://jdbc.postgresql.org/download/pg74.215.jdbc2ee.jar
Source11: http://jdbc.postgresql.org/download/pg74.215.jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.5.tgz
+Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.tgz
Patch1: rpm-pgsql-7.4.patch
Patch2: rpm-multilib-%{version}.patch
Patch3: postgresql-7.4-tighten.patch
@@ -353,9 +353,11 @@ popd
tar xzf %{SOURCE18}
PYGRESQLDIR=`basename %{SOURCE18} .tgz`
mv $PYGRESQLDIR PyGreSQL
- # Some versions of PyGreSQL.tgz contain wrong permissions for docs files
+ # Some versions of PyGreSQL.tgz contain wrong file permissions
chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
- chmod 755 PyGreSQL/tutorial PyGreSQL/tutorial/*.py
+ chmod 755 PyGreSQL/tutorial
+ chmod 644 PyGreSQL/tutorial/*.py
+ chmod 755 PyGreSQL/tutorial/advanced.py PyGreSQL/tutorial/basics.py
%endif
%build
@@ -443,7 +445,7 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install-all-headers
# copy over Makefile.global to the include dir....
-install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
+install -m 644 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
%if %jdbc
# Java/JDBC
@@ -451,10 +453,10 @@ install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
# JDBC jars
install -d $RPM_BUILD_ROOT/usr/share/java
- install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
- install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
- install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
- install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java
+ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
+ install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
+ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
+ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java
%endif
@@ -509,8 +511,8 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
pushd PyGreSQL
install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
- install -m 0755 pg.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
- install -m 0755 pgdb.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+ install -m 0644 pg.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+ install -m 0644 pgdb.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
popd
%endif
@@ -607,6 +609,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/psql.*
%{_mandir}/man1/vacuumdb.*
%{_mandir}/man7/*
+%dir %{_libdir}/pgsql
%files docs
%defattr(-,root,root)
@@ -701,7 +704,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/postgres.description
%{_datadir}/pgsql/*.sample
%{_libdir}/pgsql/plpgsql.so
-%dir %{_libdir}/pgsql
%dir %{_datadir}/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
@@ -788,6 +790,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Dec 16 2004 Tom Lane <tgl(a)redhat.com> 7.4.6-3
+- Update to PyGreSQL 3.6 (to fix bug #142711)
+- Adjust a few file permissions (bug #142431)
+- Assign %%{_libdir}/pgsql to base package instead of -server (bug #74003)
+
* Mon Nov 15 2004 Tom Lane <tgl(a)redhat.com> 7.4.6-2
- Rebuild so python components play with python 2.4 (bug 139160)
diff --git a/sources b/sources
index e5b6d7d..c83620d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-aec4cc8600af25b1fe895f2ee6cd9801 PyGreSQL-3.5.tgz
f0ea2b372a7bdaf2613e92176ebf5e0f postgresql-7.4.6.tar.bz2
+3857df12291f7fad3cce553f05d97f4a PyGreSQL-3.6.tgz
commit be132bc359573ec720184d96c75a96a400dfd1fe
Author: Elliot Lee <sopwith(a)fedoraproject.org>
Date: Tue Nov 16 23:01:49 2004 +0000
_smp_mflags
diff --git a/postgresql.spec b/postgresql.spec
index 5d05350..e50e0c7 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -410,8 +410,8 @@ export LIBNAME=%{_lib}
--datadir=/usr/share/pgsql \
--with-docdir=%{_docdir}
-make all
-make -C contrib all
+make %{?_smp_mflags} all
+make %{?_smp_mflags} -C contrib all
%if %test
pushd src/test
commit e5eb733d244d6af31ab81fd245a7efeb5a1fd7e2
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Mon Nov 15 17:36:58 2004 +0000
Rebuild so python components play with python 2.4.
diff --git a/postgresql.spec b/postgresql.spec
index 68ed204..5d05350 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.6
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -788,6 +788,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Nov 15 2004 Tom Lane <tgl(a)redhat.com> 7.4.6-2
+- Rebuild so python components play with python 2.4 (bug 139160)
+
* Sat Oct 23 2004 Tom Lane <tgl(a)redhat.com> 7.4.6-1
- Update to PostgreSQL 7.4.6 (bugs 136947, 136949)
- Make init script more paranoid about mkdir step of initializing a new
commit fefe019c9668356783a8ebb933e7fded2eb2534d
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Sat Oct 23 20:23:22 2004 +0000
Update to Postgres 7.4.6 (bugs 136947, 136949)
diff --git a/.cvsignore b/.cvsignore
index 312b51a..2781485 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
PyGreSQL-3.5.tgz
-postgresql-7.4.5.tar.bz2
+postgresql-7.4.6.tar.bz2
diff --git a/postgresql.init b/postgresql.init
index dab3cf7..9f41e9e 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -160,9 +160,9 @@ start(){
else
echo -n $"Initializing database: "
- if [ ! -d $PGDATA ]
+ if [ ! -e $PGDATA -a ! -h $PGDATA ]
then
- mkdir -p $PGDATA
+ mkdir -p $PGDATA || exit 1
chown postgres:postgres $PGDATA
chmod go-rwx $PGDATA
fi
diff --git a/postgresql.spec b/postgresql.spec
index dd4800c..68ed204 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -45,7 +45,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.4.5
+Version: 7.4.6
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -67,7 +67,7 @@ Version: 7.4.5
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 4
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -788,6 +788,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Oct 23 2004 Tom Lane <tgl(a)redhat.com> 7.4.6-1
+- Update to PostgreSQL 7.4.6 (bugs 136947, 136949)
+- Make init script more paranoid about mkdir step of initializing a new
+ database (bugs 136947, 136949)
+
* Wed Oct 20 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-4
- Remove contrib/oidjoins stuff from installed fileset; it's of no use
to ordinary users and has a security issue (bugs 136300, 136301)
diff --git a/sources b/sources
index 62165e8..e5b6d7d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
aec4cc8600af25b1fe895f2ee6cd9801 PyGreSQL-3.5.tgz
-97e750c8e69c208b75b6efedc5a36efb postgresql-7.4.5.tar.bz2
+f0ea2b372a7bdaf2613e92176ebf5e0f postgresql-7.4.6.tar.bz2
commit 3c38c700e24defcee32514ef8df5d9e0d6e6aa1d
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Wed Oct 20 17:22:14 2004 +0000
Small adjustments to fix bugs 136300, 136301, 128852.
diff --git a/postgresql.init b/postgresql.init
index 70f9097..dab3cf7 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -2,7 +2,7 @@
# postgresql This is the init script for starting up the PostgreSQL
# server
#
-# chkconfig: - 75 25
+# chkconfig: - 64 36
# description: Starts and stops the PostgreSQL backend daemon that handles \
# all database requests.
# processname: postmaster
diff --git a/postgresql.spec b/postgresql.spec
index 37da957..dd4800c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.5
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 3
+Release: 4
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -464,6 +464,11 @@ then
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
fi
+# Remove stuff we don't want to ship.
+rm -f $RPM_BUILD_ROOT%{_bindir}/findoidjoins
+rm -f $RPM_BUILD_ROOT%{_bindir}/make_oidjoins_check
+rm -f $RPM_BUILD_ROOT%{_docdir}/postgresql/contrib/README.findoidjoins
+rm -f contrib/findoidjoins/README.findoidjoins
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
@@ -644,8 +649,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pgsql/user_locks.so
%{_datadir}/pgsql/contrib/
%{_bindir}/dbf2pg
-%{_bindir}/findoidjoins
-%{_bindir}/make_oidjoins_check
%{_bindir}/fti.pl
%{_bindir}/oid2name
%{_bindir}/pg_dumplo
@@ -785,6 +788,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Oct 20 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-4
+- Remove contrib/oidjoins stuff from installed fileset; it's of no use
+ to ordinary users and has a security issue (bugs 136300, 136301)
+- adjust chkconfig priority (bug 128852)
+
* Tue Oct 05 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-3
- Solve the stale lockfile problem (bugs 71295, 96981, 134090)
- Use runuser instead of su for SELinux (bug 134588)
commit 3fd417a3173ba646f48d76df98649dcb2fbcd682
Author: Tom Lane <tgl(a)fedoraproject.org>
Date: Tue Oct 5 15:32:24 2004 +0000
Solve stale-lockfile problem; use runuser instead of su.
diff --git a/postgresql.init b/postgresql.init
index 4ddff8b..70f9097 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -56,6 +56,11 @@
# Support condstop for uninstall
# Minor other changes suggested by Fernando Nasser.
+# Version 7.4.5 Tom Lane <tgl(a)sss.pgh.pa.us>
+# Rewrite to start postmaster directly, rather than via pg_ctl; this avoids
+# fooling the postmaster's stale-lockfile check by having too many
+# postgres-owned processes laying about.
+
# PGVERSION is:
PGVERSION=7.4
@@ -77,6 +82,14 @@ then
NAME=${NAME:3}
fi
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+ SU=runuser
+else
+ SU=su
+fi
+
# Set defaults for configuration variables
PGENGINE=/usr/bin
@@ -157,45 +170,34 @@ start(){
[ -f /etc/sysconfig/i18n ] && cp /etc/sysconfig/i18n $PGDATA/../initdb.i18n
# Just in case no locale was set, use en_US
[ ! -f /etc/sysconfig/i18n ] && echo "LANG=en_US" > $PGDATA/../initdb.i18n
- # Is expanded this early to be used in the command su runs
+ # Is expanded this early to be used in the command $SU runs
echo "export LANG LC_ALL LC_CTYPE LC_COLLATE LC_NUMERIC LC_CTYPE LC_TIME" >> $PGDATA/../initdb.i18n
# Initialize the database
- su -l postgres -c "$PGENGINE/initdb --pgdata=$PGDATA" >> $PGLOG 2>&1 < /dev/null
+ $SU -l postgres -c "$PGENGINE/initdb --pgdata=$PGDATA" >> $PGLOG 2>&1 < /dev/null
[ -f $PGDATA/PG_VERSION ] && echo_success
[ ! -f $PGDATA/PG_VERSION ] && echo_failure
echo
fi
- # Check for postmaster already running...
- # note that pg_ctl only looks at the data structures in PGDATA
- # you really do need the pidof()
+ echo -n "$PSQL_START"
+ $SU -l postgres -c "$PGENGINE/postmaster -p ${PGPORT} -D '${PGDATA}' ${PGOPTS} &" >> $PGLOG 2>&1 < /dev/null
+ sleep 1
pid=`pidof -s $PGENGINE/postmaster`
- if [ $pid ] && $PGENGINE/pg_ctl status -D $PGDATA > /dev/null 2>&1
+ if [ $pid ] && [ -f "${PGDATA}/postmaster.pid" ]
then
- echo $"Postmaster already running."
+ success "$PSQL_START"
+ touch /var/lock/subsys/${NAME}
+ head -n 1 "${PGDATA}/postmaster.pid" > /var/run/postmaster.${PGPORT}.pid
+ echo
else
- #all systems go -- remove any stale lock files
- rm -f /tmp/.s.PGSQL.${PGPORT} > /dev/null
- echo -n "$PSQL_START"
- su -l postgres -c "$PGENGINE/pg_ctl -D $PGDATA -p $PGENGINE/postmaster -o '-p ${PGPORT} ${PGOPTS}' start" >> $PGLOG 2>&1 < /dev/null
- sleep 1
- pid=`pidof -s $PGENGINE/postmaster`
- if [ $pid ]
- then
- success "$PSQL_START"
- touch /var/lock/subsys/${NAME}
- echo $pid > /var/run/postmaster.${PGPORT}.pid
- echo
- else
- failure "$PSQL_START"
- echo
- fi
+ failure "$PSQL_START"
+ echo
fi
}
stop(){
echo -n $"Stopping ${NAME} service: "
- su -l postgres -c "$PGENGINE/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1 < /dev/null
+ $SU -l postgres -c "$PGENGINE/pg_ctl stop -D '${PGDATA}' -s -m fast" > /dev/null 2>&1 < /dev/null
ret=$?
if [ $ret -eq 0 ]
then
@@ -222,7 +224,7 @@ condstop(){
}
reload(){
- su -l postgres -c "$PGENGINE/pg_ctl reload -D $PGDATA -s" > /dev/null 2>&1 < /dev/null
+ $SU -l postgres -c "$PGENGINE/pg_ctl reload -D '${PGDATA}' -s" > /dev/null 2>&1 < /dev/null
}
# This script is slightly unusual in that the name of the daemon (postmaster)
@@ -257,4 +259,3 @@ case "$1" in
esac
exit 0
-
diff --git a/postgresql.spec b/postgresql.spec
index 3cb7832..37da957 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.5
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 2
+Release: 3
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -84,6 +84,7 @@ Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.5.tgz
Patch1: rpm-pgsql-7.4.patch
Patch2: rpm-multilib-%{version}.patch
Patch3: postgresql-7.4-tighten.patch
+Patch4: postgresql-7.4-getppid.patch
Patch5: postgresql-plperl.patch
Patch6: postgresql-7.4-src-tutorial.patch
Patch7: postgresql-7.3.4-s390-pic.patch
@@ -331,7 +332,7 @@ popd
%patch1 -p1
%patch2 -p1
%patch3 -p1
-# %patch4 -p1
+%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@@ -784,6 +785,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Oct 05 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-3
+- Solve the stale lockfile problem (bugs 71295, 96981, 134090)
+- Use runuser instead of su for SELinux (bug 134588)
+
* Mon Aug 30 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-2
- Update to PyGreSQL 3.5.
commit 0c2148cdc2de32e15feeeb207f04987d0f763011
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:49:25 2004 +0000
auto-import changelog data from postgresql-7.4.5-2.src.rpm
Mon Aug 30 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-2
- Update to PyGreSQL 3.5.
diff --git a/.cvsignore b/.cvsignore
index 2d382b9..312b51a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-PyGreSQL-3.4.tgz
+PyGreSQL-3.5.tgz
postgresql-7.4.5.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index 4a36f55..3cb7832 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.5
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -80,7 +80,7 @@ Source10: http://jdbc.postgresql.org/download/pg74.215.jdbc2ee.jar
Source11: http://jdbc.postgresql.org/download/pg74.215.jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4.tgz
+Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.5.tgz
Patch1: rpm-pgsql-7.4.patch
Patch2: rpm-multilib-%{version}.patch
Patch3: postgresql-7.4-tighten.patch
@@ -353,7 +353,7 @@ popd
PYGRESQLDIR=`basename %{SOURCE18} .tgz`
mv $PYGRESQLDIR PyGreSQL
# Some versions of PyGreSQL.tgz contain wrong permissions for docs files
- chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog
+ chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
chmod 755 PyGreSQL/tutorial PyGreSQL/tutorial/*.py
%endif
@@ -762,7 +762,7 @@ rm -rf $RPM_BUILD_ROOT
%if %python
%files python
%defattr(-,root,root)
-%doc PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog
+%doc PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
%{_libdir}/python%{pyver}/site-packages/*.py
%endif
@@ -784,6 +784,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Aug 30 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-2
+- Update to PyGreSQL 3.5.
+
* Wed Aug 24 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-1
- Update to PostgreSQL 7.4.5.
- Update JDBC jars to driver build 215.
diff --git a/sources b/sources
index 6047b4a..62165e8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-235d31d1c4d1323c743d1cdff0866551 PyGreSQL-3.4.tgz
+aec4cc8600af25b1fe895f2ee6cd9801 PyGreSQL-3.5.tgz
97e750c8e69c208b75b6efedc5a36efb postgresql-7.4.5.tar.bz2
commit eeda6e654919bab35e4dc7b2831c6f5fe87f5dd4
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:49:08 2004 +0000
auto-import changelog data from postgresql-7.4.5-1.src.rpm
Tue Aug 24 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-1
- Update to PostgreSQL 7.4.5.
- Update JDBC jars to driver build 215.
- Add Obsoletes: entries for rh-postgresql packages, per bug 129278.
diff --git a/.cvsignore b/.cvsignore
index 4966653..2d382b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
PyGreSQL-3.4.tgz
-postgresql-7.4.3.tar.bz2
+postgresql-7.4.5.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index a6b81c2..4a36f55 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -45,7 +45,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.4.3
+Version: 7.4.5
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -67,17 +67,17 @@ Version: 7.4.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 3
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/pg74.214.jdbc1.jar
-Source9: http://jdbc.postgresql.org/download/pg74.214.jdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pg74.214.jdbc2ee.jar
-Source11: http://jdbc.postgresql.org/download/pg74.214.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/pg74.215.jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg74.215.jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg74.215.jdbc2ee.jar
+Source11: http://jdbc.postgresql.org/download/pg74.215.jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4.tgz
@@ -122,9 +122,22 @@ BuildPrereq: pam-devel
%endif
Url: http://www.postgresql.org/
+
Obsoletes: postgresql-clients
Obsoletes: postgresql-perl
Obsoletes: postgresql-tk
+Obsoletes: rh-postgresql
+Obsoletes: rh-postgresql-contrib
+Obsoletes: rh-postgresql-devel
+Obsoletes: rh-postgresql-docs
+Obsoletes: rh-postgresql-jdbc
+Obsoletes: rh-postgresql-libs
+Obsoletes: rh-postgresql-pl
+Obsoletes: rh-postgresql-python
+Obsoletes: rh-postgresql-server
+Obsoletes: rh-postgresql-tcl
+Obsoletes: rh-postgresql-test
+
Buildroot: %{_tmppath}/%{name}-%{version}-root
# This is the PostgreSQL Global Development Group Official RPMset spec file,
@@ -757,10 +770,10 @@ rm -rf $RPM_BUILD_ROOT
%if %jdbc
%files jdbc
%defattr(-,root,root)
-%{_datadir}/java/pg74.214.jdbc1.jar
-%{_datadir}/java/pg74.214.jdbc2.jar
-%{_datadir}/java/pg74.214.jdbc2ee.jar
-%{_datadir}/java/pg74.214.jdbc3.jar
+%{_datadir}/java/pg74.215.jdbc1.jar
+%{_datadir}/java/pg74.215.jdbc2.jar
+%{_datadir}/java/pg74.215.jdbc2ee.jar
+%{_datadir}/java/pg74.215.jdbc3.jar
%endif
%if %test
@@ -771,6 +784,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Aug 24 2004 Tom Lane <tgl(a)redhat.com> 7.4.5-1
+- Update to PostgreSQL 7.4.5.
+- Update JDBC jars to driver build 215.
+- Add Obsoletes: entries for rh-postgresql packages, per bug 129278.
+
* Sat Jul 10 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-3
- Undo ill-considered chkconfig change that causes server to start
immediately upon install. Mea culpa (bug 127552).
diff --git a/sources b/sources
index a3eb43f..6047b4a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
235d31d1c4d1323c743d1cdff0866551 PyGreSQL-3.4.tgz
-204d8ab0c51d9691da2bd986ddbdc477 postgresql-7.4.3.tar.bz2
+97e750c8e69c208b75b6efedc5a36efb postgresql-7.4.5.tar.bz2
commit 419f136136533b4d88a7c65e0d6d23f85e21804c
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:48:53 2004 +0000
auto-import changelog data from postgresql-7.4.3-3.src.rpm
Sat Jul 10 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-3
- Undo ill-considered chkconfig change that causes server to start
immediately upon install. Mea culpa (bug 127552).
diff --git a/postgresql.init b/postgresql.init
index ecf39b4..4ddff8b 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -2,7 +2,7 @@
# postgresql This is the init script for starting up the PostgreSQL
# server
#
-# chkconfig: 2345 75 25
+# chkconfig: - 75 25
# description: Starts and stops the PostgreSQL backend daemon that handles \
# all database requests.
# processname: postmaster
@@ -110,7 +110,7 @@ start(){
then
# Check version of existing PGDATA
- if [ `cat $PGDATA/PG_VERSION` != '7.4' ]
+ if [ `cat $PGDATA/PG_VERSION` != "$PGVERSION" ]
then
SYSDOCDIR="(Your System's documentation directory)"
if [ -d /usr/doc/postgresql-$PGVERSION ]
diff --git a/postgresql.spec b/postgresql.spec
index 33d9e00..a6b81c2 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Version: 7.4.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 2
+Release: 3
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -771,6 +771,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jul 10 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-3
+- Undo ill-considered chkconfig change that causes server to start
+ immediately upon install. Mea culpa (bug 127552).
+
* Sat Jul 03 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-2
- Update JDBC jars to driver build 214.
commit 54d361551f527a3bc85746c780febe9deeda98dd
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:48:05 2004 +0000
auto-import changelog data from postgresql-7.4.3-2.src.rpm
Sat Jul 03 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-2
- Update JDBC jars to driver build 214.
diff --git a/postgresql.spec b/postgresql.spec
index 0b28526..33d9e00 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,17 +67,17 @@ Version: 7.4.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/pg74.1jdbc1.jar
-Source9: http://jdbc.postgresql.org/download/pg74.1jdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pg74.1jdbc2ee.jar
-Source11: http://jdbc.postgresql.org/download/pg74.1jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/pg74.214.jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg74.214.jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg74.214.jdbc2ee.jar
+Source11: http://jdbc.postgresql.org/download/pg74.214.jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4.tgz
@@ -757,10 +757,10 @@ rm -rf $RPM_BUILD_ROOT
%if %jdbc
%files jdbc
%defattr(-,root,root)
-%{_datadir}/java/pg74.1jdbc1.jar
-%{_datadir}/java/pg74.1jdbc2.jar
-%{_datadir}/java/pg74.1jdbc2ee.jar
-%{_datadir}/java/pg74.1jdbc3.jar
+%{_datadir}/java/pg74.214.jdbc1.jar
+%{_datadir}/java/pg74.214.jdbc2.jar
+%{_datadir}/java/pg74.214.jdbc2ee.jar
+%{_datadir}/java/pg74.214.jdbc3.jar
%endif
%if %test
@@ -771,6 +771,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jul 03 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-2
+- Update JDBC jars to driver build 214.
+
* Wed Jun 23 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-1
- Update to PostgreSQL 7.4.3.
- Uninstalling server RPM stops postmaster first, per bug 114846.
commit aba59f5cde0cd3f184acd683a18bc647e0e52de6
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:47:56 2004 +0000
auto-import changelog data from postgresql-7.4.3-1.src.rpm
Wed Jun 23 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-1
- Update to PostgreSQL 7.4.3.
- Uninstalling server RPM stops postmaster first, per bug 114846.
- Fix su commands to not assume PG user's shell is sh-like, per bug 124024.
- Fix permissions on postgresql-python doc files, per bug 124822.
- Minor postgresql.init improvements.
Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
diff --git a/.cvsignore b/.cvsignore
index 5512c03..4966653 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
PyGreSQL-3.4.tgz
-postgresql-7.4.2.tar.bz2
+postgresql-7.4.3.tar.bz2
diff --git a/postgresql.init b/postgresql.init
index 8b08700..ecf39b4 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -2,7 +2,7 @@
# postgresql This is the init script for starting up the PostgreSQL
# server
#
-# chkconfig: - 85 15
+# chkconfig: 2345 75 25
# description: Starts and stops the PostgreSQL backend daemon that handles \
# all database requests.
# processname: postmaster
@@ -15,7 +15,6 @@
# Version 7.0 Lamar Owen
# Added logging code
# Changed PGDATA.
-#
# Version 7.0.2 Trond Eivind Glomsrd <teg(a)redhat.com>
# use functions, add conditional restart
@@ -48,10 +47,15 @@
# Tested the $? return for the stop script -- it does in fact propagate.
# TODO: multiple postmasters.
-# VErsion 7.3 Lamar OWen <lamar.owen(a)ramifordistat.net>
+# Version 7.3 Lamar Owen <lamar.owen(a)ramifordistat.net>
# Multiple postmasters, courtesy Karl DeBisschop
-# VErsion 7.4 Lamar Owen.
+# Version 7.4 Lamar Owen.
+
+# Version 7.4.3 Tom Lane <tgl(a)sss.pgh.pa.us>
+# Support condstop for uninstall
+# Minor other changes suggested by Fernando Nasser.
+
# PGVERSION is:
PGVERSION=7.4
@@ -74,7 +78,8 @@ then
fi
-# Set defaults for port and database directory
+# Set defaults for configuration variables
+PGENGINE=/usr/bin
PGPORT=5432
export PGDATA=/var/lib/pgsql
if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base/template1 ]
@@ -83,6 +88,7 @@ then
else
export PGDATA=/var/lib/pgsql/data
fi
+PGLOG=/dev/null
# Override defaults from /etc/sysconfig/pgsql if file is present
[ -f /etc/sysconfig/pgsql/${NAME} ] && . /etc/sysconfig/pgsql/${NAME}
@@ -94,7 +100,7 @@ export PGOPTS
# Pretty much need it for postmaster.
[ "${NETWORKING}" = "no" ] && exit 0
-[ -f /usr/bin/postmaster ] || exit 0
+[ -f $PGENGINE/postmaster ] || exit 0
start(){
PSQL_START=$"Starting ${NAME} service: "
@@ -154,7 +160,7 @@ start(){
# Is expanded this early to be used in the command su runs
echo "export LANG LC_ALL LC_CTYPE LC_COLLATE LC_NUMERIC LC_CTYPE LC_TIME" >> $PGDATA/../initdb.i18n
# Initialize the database
- su -l postgres -c "/usr/bin/initdb --pgdata=$PGDATA > /dev/null 2>&1" < /dev/null
+ su -l postgres -c "$PGENGINE/initdb --pgdata=$PGDATA" >> $PGLOG 2>&1 < /dev/null
[ -f $PGDATA/PG_VERSION ] && echo_success
[ ! -f $PGDATA/PG_VERSION ] && echo_failure
echo
@@ -163,17 +169,17 @@ start(){
# Check for postmaster already running...
# note that pg_ctl only looks at the data structures in PGDATA
# you really do need the pidof()
- pid=`pidof -s /usr/bin/postmaster`
- if [ $pid ] && /usr/bin/pg_ctl status -D $PGDATA > /dev/null 2>&1
+ pid=`pidof -s $PGENGINE/postmaster`
+ if [ $pid ] && $PGENGINE/pg_ctl status -D $PGDATA > /dev/null 2>&1
then
echo $"Postmaster already running."
else
#all systems go -- remove any stale lock files
rm -f /tmp/.s.PGSQL.${PGPORT} > /dev/null
echo -n "$PSQL_START"
- su -l postgres -c "/usr/bin/pg_ctl -D $PGDATA -p /usr/bin/postmaster -o '-p ${PGPORT} ${PGOPTS}' start > /dev/null 2>&1" < /dev/null
+ su -l postgres -c "$PGENGINE/pg_ctl -D $PGDATA -p $PGENGINE/postmaster -o '-p ${PGPORT} ${PGOPTS}' start" >> $PGLOG 2>&1 < /dev/null
sleep 1
- pid=`pidof -s /usr/bin/postmaster`
+ pid=`pidof -s $PGENGINE/postmaster`
if [ $pid ]
then
success "$PSQL_START"
@@ -189,7 +195,7 @@ start(){
stop(){
echo -n $"Stopping ${NAME} service: "
- su -l postgres -c "/usr/bin/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1 < /dev/null
+ su -l postgres -c "$PGENGINE/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1 < /dev/null
ret=$?
if [ $ret -eq 0 ]
then
@@ -211,8 +217,12 @@ condrestart(){
[ -e /var/lock/subsys/${NAME} ] && restart
}
+condstop(){
+ [ -e /var/lock/subsys/${NAME} ] && stop
+}
+
reload(){
- su -l postgres -c "/usr/bin/pg_ctl reload -D $PGDATA -s" > /dev/null 2>&1 < /dev/null
+ su -l postgres -c "$PGENGINE/pg_ctl reload -D $PGDATA -s" > /dev/null 2>&1 < /dev/null
}
# This script is slightly unusual in that the name of the daemon (postmaster)
@@ -235,11 +245,14 @@ case "$1" in
condrestart)
condrestart
;;
+ condstop)
+ condstop
+ ;;
reload|force-reload)
reload
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
exit 1
esac
diff --git a/postgresql.spec b/postgresql.spec
index 2894efc..0b28526 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -45,7 +45,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.4.2
+Version: 7.4.3
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -81,7 +81,7 @@ Source11: http://jdbc.postgresql.org/download/pg74.1jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4.tgz
-Patch1: rpm-pgsql-%{version}.patch
+Patch1: rpm-pgsql-7.4.patch
Patch2: rpm-multilib-%{version}.patch
Patch3: postgresql-7.4-tighten.patch
Patch5: postgresql-plperl.patch
@@ -339,6 +339,9 @@ popd
tar xzf %{SOURCE18}
PYGRESQLDIR=`basename %{SOURCE18} .tgz`
mv $PYGRESQLDIR PyGreSQL
+ # Some versions of PyGreSQL.tgz contain wrong permissions for docs files
+ chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog
+ chmod 755 PyGreSQL/tutorial PyGreSQL/tutorial/*.py
%endif
%build
@@ -521,14 +524,12 @@ chkconfig --add postgresql
%preun server
if [ $1 = 0 ] ; then
+ /sbin/service postgresql condstop >/dev/null 2>&1
chkconfig --del postgresql
fi
%postun server
/sbin/ldconfig
-if [ $1 -ge 1 ]; then
- /sbin/service postgresql condrestart >/dev/null 2>&1
-fi
if [ $1 = 0 ] ; then
userdel postgres >/dev/null 2>&1 || :
groupdel postgres >/dev/null 2>&1 || :
@@ -770,6 +771,16 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jun 23 2004 Tom Lane <tgl(a)redhat.com> 7.4.3-1
+- Update to PostgreSQL 7.4.3.
+- Uninstalling server RPM stops postmaster first, per bug 114846.
+- Fix su commands to not assume PG user's shell is sh-like, per bug 124024.
+- Fix permissions on postgresql-python doc files, per bug 124822.
+- Minor postgresql.init improvements.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
* Wed Mar 10 2004 Tom Lane <tgl(a)redhat.com> 7.4.2-1
- Update to PostgreSQL 7.4.2; sync with community SRPM as much as possible.
- Support PGOPTS from /etc/sysconfig/pgsql, per bug 111504.
diff --git a/sources b/sources
index 79f791a..a3eb43f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
235d31d1c4d1323c743d1cdff0866551 PyGreSQL-3.4.tgz
-54a03da34c8520635957f833a4a077ee postgresql-7.4.2.tar.bz2
+204d8ab0c51d9691da2bd986ddbdc477 postgresql-7.4.3.tar.bz2
commit 027e0bdc7c9964283b0d3afae2469002f0fc9799
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:47:18 2004 +0000
auto-import changelog data from postgresql-7.4.2-1.src.rpm
Wed Mar 10 2004 Tom Lane <tgl(a)redhat.com> 7.4.2-1
- Update to PostgreSQL 7.4.2; sync with community SRPM as much as possible.
- Support PGOPTS from /etc/sysconfig/pgsql, per bug 111504.
- Fix permissions on /etc/sysconfig/pgsql, per bug 115278.
- SELinux patch in init file: always su </dev/null, per bug 117901.
- Rebuilt
Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
Wed Feb 25 2004 Tom Lane <tgl(a)redhat.com>
- Update to PostgreSQL 7.4.1.
- Rebuilt
Tue Feb 24 2004 Tom Lane <tgl(a)redhat.com>
- Fix chown syntax in postgresql.init also.
- Rebuilt
Mon Feb 23 2004 Tim Waugh <twaugh(a)redhat.com>
- Use ':' instead of '.' as separator for chown.
Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
Fri Jan 09 2004 Lamar Owen <lowen(a)pari.edu>
- 7.4.1-1PGDG
- Merge Sander Steffann's changes up to 7.4-0.5PGDG
- Proper 7.4.1 JDBC jars this time.
- Patch for no pl/python from Alvaro
diff --git a/.cvsignore b/.cvsignore
index feab2e3..5512c03 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-PyGreSQL-3.4-pre021201.tgz
-postgresql-7.4.tar.bz2
+PyGreSQL-3.4.tgz
+postgresql-7.4.2.tar.bz2
diff --git a/postgresql.init b/postgresql.init
index 08aad37..8b08700 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# postgresql This is the init script for starting up the PostgreSQL
# server
#
@@ -88,6 +88,7 @@ fi
[ -f /etc/sysconfig/pgsql/${NAME} ] && . /etc/sysconfig/pgsql/${NAME}
export PGDATA
export PGPORT
+export PGOPTS
# Check that networking is up.
# Pretty much need it for postmaster.
@@ -143,7 +144,7 @@ start(){
if [ ! -d $PGDATA ]
then
mkdir -p $PGDATA
- chown postgres.postgres $PGDATA
+ chown postgres:postgres $PGDATA
chmod go-rwx $PGDATA
fi
# Make sure the locale from the initdb is preserved for later startups...
@@ -153,7 +154,7 @@ start(){
# Is expanded this early to be used in the command su runs
echo "export LANG LC_ALL LC_CTYPE LC_COLLATE LC_NUMERIC LC_CTYPE LC_TIME" >> $PGDATA/../initdb.i18n
# Initialize the database
- su -l postgres -s /bin/sh -c "/usr/bin/initdb --pgdata=$PGDATA > /dev/null 2>&1" < /dev/null
+ su -l postgres -c "/usr/bin/initdb --pgdata=$PGDATA > /dev/null 2>&1" < /dev/null
[ -f $PGDATA/PG_VERSION ] && echo_success
[ ! -f $PGDATA/PG_VERSION ] && echo_failure
echo
@@ -170,7 +171,7 @@ start(){
#all systems go -- remove any stale lock files
rm -f /tmp/.s.PGSQL.${PGPORT} > /dev/null
echo -n "$PSQL_START"
- su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl -D $PGDATA -p /usr/bin/postmaster -o '-p ${PGPORT}' start > /dev/null 2>&1" < /dev/null
+ su -l postgres -c "/usr/bin/pg_ctl -D $PGDATA -p /usr/bin/postmaster -o '-p ${PGPORT} ${PGOPTS}' start > /dev/null 2>&1" < /dev/null
sleep 1
pid=`pidof -s /usr/bin/postmaster`
if [ $pid ]
@@ -188,7 +189,7 @@ start(){
stop(){
echo -n $"Stopping ${NAME} service: "
- su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1
+ su -l postgres -c "/usr/bin/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1 < /dev/null
ret=$?
if [ $ret -eq 0 ]
then
@@ -211,7 +212,7 @@ condrestart(){
}
reload(){
- su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl reload -D $PGDATA -s" > /dev/null 2>&1
+ su -l postgres -c "/usr/bin/pg_ctl reload -D $PGDATA -s" > /dev/null 2>&1 < /dev/null
}
# This script is slightly unusual in that the name of the daemon (postmaster)
diff --git a/postgresql.spec b/postgresql.spec
index 3643c98..2894efc 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -2,16 +2,22 @@
%{?build6x:%define kerberos 0}
%{?build6x:%define nls 0}
%{?build6x:%define ssl 0}
+%{?build6x:%define tcldevel 0}
%{?build6x:%define aconfver /bin/true}
#work around the undefined or defined to 1 build 6x interaction with the pam stuff
%{!?build6x:%define non6xpamdeps 1}
%{?build6x:%define non6xpamdeps 0}
-#build7x and build89 similar
-%{?build7x:%define kerbdir --with-krb5=/usr/kerberos}
-%{?build89:%define kerbdir --with-krb5=/usr/kerberos}
+#build7x, build8, and build9 similar
+%{?build8:%define build89 1}
+%{?build9:%define build89 1}
+%{?build7x:%define kerbdir /usr/kerberos}
+%{?build7x:%define tcldevel 0}
+%{?build89:%define kerbdir /usr/kerberos}
+%{?build8:%define tcldevel 0}
%{?build7x:%define aconfver autoconf-2.53}
-%{!?kerbdir:%define kerbdir --with-krb5}
+%{!?tcldevel:%define tcldevel 1}
+%{!?kerbdir:%define kerbdir /usr}
%{!?aconfver:%define aconfver autoconf}
%define beta 0
@@ -39,7 +45,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.4
+Version: 7.4.2
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -61,33 +67,27 @@ Version: 7.4
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 5
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/pg73jdbc1.jar
-Source9: http://jdbc.postgresql.org/download/pg73jdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pg73jdbc3.jar
-Source11: http://jdbc.postgresql.org/download/devpgjdbc1.jar
-Source12: http://jdbc.postgresql.org/download/devpgjdbc2.jar
-Source13: http://jdbc.postgresql.org/download/devpgjdbc3.jar
+Source8: http://jdbc.postgresql.org/download/pg74.1jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg74.1jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg74.1jdbc2ee.jar
+Source11: http://jdbc.postgresql.org/download/pg74.1jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
-#Source17: postgresql-7.3.4-USpdfdocs.tar.gz
-Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4-pre021201.tgz
+Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4.tgz
Patch1: rpm-pgsql-%{version}.patch
Patch2: rpm-multilib-%{version}.patch
-Patch3: postgresql-%{version}-tighten.patch
-Patch4: postgresql-ppc64.patch
+Patch3: postgresql-7.4-tighten.patch
Patch5: postgresql-plperl.patch
Patch6: postgresql-7.4-src-tutorial.patch
Patch7: postgresql-7.3.4-s390-pic.patch
Patch8: postgresql-7.4-com_err.patch
-Patch9: PyGreSQL-3.4-pre021201-bugfix.patch
-Patch10: postgresql-7.4-headers.patch
Buildrequires: perl glibc-devel bison flex
Prereq: /sbin/ldconfig initscripts
%if %python
@@ -95,8 +95,10 @@ BuildPrereq: python-devel
%endif
%if %tcl
BuildPrereq: tcl
+%if %tcldevel
Buildrequires: tcl-devel
%endif
+%endif
%if %tkpkg
BuildPrereq: tk
%endif
@@ -142,6 +144,8 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root
# Andrew Overholt
# David Jee
# Kaj J. Niemi
+# Sander Steffann
+# Tom Lane
# and others in the Changelog....
# This spec file and ancilliary files are licensed in accordance with
@@ -188,7 +192,7 @@ Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
Requires: postgresql = %{version} libpq.so
-Conflicts: postgresql < 7.3
+Conflicts: postgresql < 7.4
%description server
The postgresql-server package includes the programs needed to create
@@ -319,7 +323,6 @@ popd
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch10 -p1
#call autoconf 2.53 or greater
%aconfver
@@ -334,7 +337,6 @@ popd
%if %python
tar xzf %{SOURCE18}
- patch -p0 < %{PATCH9}
PYGRESQLDIR=`basename %{SOURCE18} .tgz`
mv $PYGRESQLDIR PyGreSQL
%endif
@@ -379,7 +381,7 @@ export LIBNAME=%{_lib}
--with-pam \
%endif
%if %kerberos
- %kerbdir \
+ --with-krb5=%kerbdir \
%endif
%if %nls
--enable-nls \
@@ -408,7 +410,7 @@ make -C contrib all
pushd PyGreSQL
- gcc $CFLAGS -fpic -shared -o _pgmodule.so ${python_includespec} -I../src/interfaces/libpq -I../src/include -L../src/interfaces/libpq -lpq pgmodule.c
+ gcc $CFLAGS -fpic -shared -o _pgmodule.so ${python_includespec} -I../src/interfaces/libpq -I../src/include -I%{kerbdir}/include -L../src/interfaces/libpq -lpq pgmodule.c
popd
%endif
@@ -436,8 +438,6 @@ install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java
- install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/usr/share/java
- install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/usr/share/java
%endif
@@ -512,7 +512,7 @@ groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
touch /var/log/pgsql
-chown postgres.postgres /var/log/pgsql
+chown postgres:postgres /var/log/pgsql
chmod 0700 /var/log/pgsql
%post server
@@ -546,7 +546,7 @@ fi
%if %test
%post test
-chown -R postgres.postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
+chown -R postgres:postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
%endif
%clean
@@ -662,7 +662,7 @@ rm -rf $RPM_BUILD_ROOT
%files server -f server.lst
%defattr(-,root,root)
/etc/rc.d/init.d/postgresql
-%dir /etc/sysconfig/pgsql
+%attr (755,root,root) %dir /etc/sysconfig/pgsql
%{_bindir}/initdb
%{_bindir}/initlocation
%{_bindir}/ipcclean
@@ -740,13 +740,15 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/pltcl_loadmod
%{_datadir}/pgsql/unknown.pltcl
%endif
+%if %python
%{_libdir}/pgsql/plpython.so
%endif
+%endif
%if %python
%files python
%defattr(-,root,root)
-%doc PyGreSQL/README PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog
+%doc PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog
%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
%{_libdir}/python%{pyver}/site-packages/*.py
%endif
@@ -754,12 +756,10 @@ rm -rf $RPM_BUILD_ROOT
%if %jdbc
%files jdbc
%defattr(-,root,root)
-%{_datadir}/java/pg73jdbc1.jar
-%{_datadir}/java/pg73jdbc2.jar
-%{_datadir}/java/pg73jdbc3.jar
-%{_datadir}/java/devpgjdbc1.jar
-%{_datadir}/java/devpgjdbc2.jar
-%{_datadir}/java/devpgjdbc3.jar
+%{_datadir}/java/pg74.1jdbc1.jar
+%{_datadir}/java/pg74.1jdbc2.jar
+%{_datadir}/java/pg74.1jdbc2ee.jar
+%{_datadir}/java/pg74.1jdbc3.jar
%endif
%if %test
@@ -770,6 +770,36 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Mar 10 2004 Tom Lane <tgl(a)redhat.com> 7.4.2-1
+- Update to PostgreSQL 7.4.2; sync with community SRPM as much as possible.
+- Support PGOPTS from /etc/sysconfig/pgsql, per bug 111504.
+- Fix permissions on /etc/sysconfig/pgsql, per bug 115278.
+- SELinux patch in init file: always su </dev/null, per bug 117901.
+- Rebuilt
+
+* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Wed Feb 25 2004 Tom Lane <tgl(a)redhat.com>
+- Update to PostgreSQL 7.4.1.
+- Rebuilt
+
+* Tue Feb 24 2004 Tom Lane <tgl(a)redhat.com>
+- Fix chown syntax in postgresql.init also.
+- Rebuilt
+
+* Mon Feb 23 2004 Tim Waugh <twaugh(a)redhat.com>
+- Use ':' instead of '.' as separator for chown.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Fri Jan 9 2004 Lamar Owen <lowen(a)pari.edu>
+- 7.4.1-1PGDG
+- Merge Sander Steffann's changes up to 7.4-0.5PGDG
+- Proper 7.4.1 JDBC jars this time.
+- Patch for no pl/python from Alvaro
+
* Fri Dec 05 2003 David Jee <djee(a)redhat.com> 7.4-5
- Rebuild for Perl 5.8.2.
diff --git a/sources b/sources
index 6bb80f6..79f791a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8448fa076c1c3724706dfa93f24efc51 PyGreSQL-3.4-pre021201.tgz
-9db7432c431d1570b1f605727daf27bc postgresql-7.4.tar.bz2
+235d31d1c4d1323c743d1cdff0866551 PyGreSQL-3.4.tgz
+54a03da34c8520635957f833a4a077ee postgresql-7.4.2.tar.bz2
commit c205ec8396c8af9d2cbc2d866ffbc7ad7cc8af43
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:46:07 2004 +0000
auto-import changelog data from postgresql-7.4-5.src.rpm
Fri Dec 05 2003 David Jee <djee(a)redhat.com> 7.4-5
- Rebuild for Perl 5.8.2.
Mon Dec 01 2003 David Jee <djee(a)redhat.com> 7.4-4
- Add PyGreSQL patch for deprecated column pg_type.typprtlen [Bug #111263]
- Add headers patch which moves ecpg headers to /usr/include/ecpg [Bug
#111195]
Fri Nov 28 2003 David Jee <djee(a)redhat.com> 7.4-3
- uncomment buildrequires tcl-devel
Fri Nov 28 2003 David Jee <djee(a)redhat.com> 7.4-2
- rebuild
Mon Nov 24 2003 David Jee <djee(a)redhat.com> 7.4-1
- initial Red Hat build
- move jars to /usr/share/java
- fix rpm-multilib patch to use sysconfig
diff --git a/.cvsignore b/.cvsignore
index 0a35bc8..feab2e3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postgresql-7.3.4-USpdfdocs.tar.gz
-postgresql-7.3.4.tar.gz
+PyGreSQL-3.4-pre021201.tgz
+postgresql-7.4.tar.bz2
diff --git a/README.rpm-dist b/README.rpm-dist
index ce775d3..e230002 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,6 +1,6 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 5.0, for the PostgreSQL 7.3-1PGDG RPMset.
+Version 6.0, for the PostgreSQL 7.4-0.1PGDG RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
-----------------------------------------------------------------------------
@@ -31,7 +31,7 @@ This document exists to explain the layout of the RPM's for PostgreSQL,to
describe various RPM specifics, and to document special features found
in the RPMset.
-This document is written to be applicable to version 7.3 of PostgreSQL,
+This document is written to be applicable to version 7.4 of PostgreSQL,
which is the current version of the RPM's as of this writing. More to the
point, versions prior to 7.3 are not documented here.
@@ -54,9 +54,12 @@ documented in the regular documentation. That is, you must dump, upgrade,
initdb, and restore your data. The 7.2 to 7.3 migration can be quite
difficult, even to the point of requiring hand-editing of the dumpfile.
-Thus, the 7.3 postgresql-server RPM specifically conflicts with prior
+Thus, the 7.3 postgresql-server RPM specifically conflicted with prior
versions. The old server subpackage must be removed first, the new package
-installed, and the data restored from dump.
+installed, and the data restored from dump. However, RPM itself did not
+honor this. A new method of running multiple versions of PostgreSQL, along
+with the capability to run multiple postmasters, is in development, but was
+not ready for this release.
A new section on running multiple postmasters has replaced the old upgrade
instructions.
@@ -80,6 +83,9 @@ bash, and the home directory set to /var/lib/pgsql. This user also has no
default password -- in order to be able to su to from a non-root account
or login as 'postgres' you will need to set a password using passwd.
+While PygreSQL was split out from the main tarball, thanks to Kaj's work it
+is still included as the python subpackage.
+
CREDITS
-----------------------------------------------------------------------------
Thomas Lockhart
@@ -95,6 +101,9 @@ Jeff Johnson
Reinhard Max
Peter Eisentraut
Joe Conway
+Andrew Overholt
+David Jee
+Kaj J. Niemi
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
@@ -339,5 +348,7 @@ pgsql-ports(a)postgresql.org -- please include an [RPM] string in the subject, as
I use automatic mail folder processing to put mail in the right place.
SuSE information is available at SuSE's website and information contacts.
+A 7.4 SuSE RPM is available on ftp.postgresql.org. It is different from this
+RPM due to SuSE's different needs.
-----------------------------------------------------------------------------
diff --git a/postgresql.init b/postgresql.init
index b9a236f..08aad37 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -51,8 +51,10 @@
# VErsion 7.3 Lamar OWen <lamar.owen(a)ramifordistat.net>
# Multiple postmasters, courtesy Karl DeBisschop
+# VErsion 7.4 Lamar Owen.
+
# PGVERSION is:
-PGVERSION=7.3
+PGVERSION=7.4
# Source function library.
INITD=/etc/rc.d/init.d
@@ -101,7 +103,7 @@ start(){
then
# Check version of existing PGDATA
- if [ `cat $PGDATA/PG_VERSION` != '7.3' ]
+ if [ `cat $PGDATA/PG_VERSION` != '7.4' ]
then
SYSDOCDIR="(Your System's documentation directory)"
if [ -d /usr/doc/postgresql-$PGVERSION ]
diff --git a/postgresql.spec b/postgresql.spec
new file mode 100755
index 0000000..3643c98
--- /dev/null
+++ b/postgresql.spec
@@ -0,0 +1,817 @@
+# build6x usage: define to 1 to build for RHL6.x. Don't define at all for others.
+%{?build6x:%define kerberos 0}
+%{?build6x:%define nls 0}
+%{?build6x:%define ssl 0}
+%{?build6x:%define aconfver /bin/true}
+#work around the undefined or defined to 1 build 6x interaction with the pam stuff
+%{!?build6x:%define non6xpamdeps 1}
+%{?build6x:%define non6xpamdeps 0}
+#build7x and build89 similar
+%{?build7x:%define kerbdir --with-krb5=/usr/kerberos}
+%{?build89:%define kerbdir --with-krb5=/usr/kerberos}
+%{?build7x:%define aconfver autoconf-2.53}
+
+%{!?kerbdir:%define kerbdir --with-krb5}
+%{!?aconfver:%define aconfver autoconf}
+
+%define beta 0
+
+%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
+
+%{!?tcl:%define tcl 1}
+%{!?tkpkg:%define tkpkg 0}
+%{!?jdbc:%define jdbc 1}
+%{!?test:%define test 1}
+%{!?python:%define python 1}
+%{!?pltcl:%define pltcl 1}
+%{!?plperl:%define plperl 1}
+%{!?pls:%define pls 1}
+%{!?ssl:%define ssl 1}
+%{!?kerberos:%define kerberos 1}
+%{!?nls:%define nls 1}
+%{!?pam:%define pam 1}
+%{!?pgfts:%define pgfts 1}
+
+# Python major version.
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')}
+
+
+Summary: PostgreSQL client programs and libraries.
+Name: postgresql
+Version: 7.4
+
+# Conventions for PostgreSQL Global Development Group RPM releases:
+
+# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
+# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
+# test releases.
+
+# Pre-releases are those that are built from CVS snapshots or pre-release
+# tarballs from postgresql.org. Official beta releases are not
+# considered pre-releases, nor are release candidates, as their beta or
+# release candidate status is reflected in the version of the tarball. Pre-
+# releases' versions do not change -- the pre-release tarball of 7.0.3, for
+# example, has the same tarball version as the final official release of 7.0.3:
+# but the tarball is different.
+
+# Test releases are where PostgreSQL itself is not in beta, but certain parts of
+# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
+
+# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
+# -- only test releases or full releases should be.
+
+Release: 5
+License: BSD
+Group: Applications/Databases
+Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+Source3: postgresql.init
+Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+Source6: README.rpm-dist
+Source8: http://jdbc.postgresql.org/download/pg73jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg73jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg73jdbc3.jar
+Source11: http://jdbc.postgresql.org/download/devpgjdbc1.jar
+Source12: http://jdbc.postgresql.org/download/devpgjdbc2.jar
+Source13: http://jdbc.postgresql.org/download/devpgjdbc3.jar
+Source15: postgresql-bashprofile
+Source16: filter-requires-perl-Pg.sh
+#Source17: postgresql-7.3.4-USpdfdocs.tar.gz
+Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4-pre021201.tgz
+Patch1: rpm-pgsql-%{version}.patch
+Patch2: rpm-multilib-%{version}.patch
+Patch3: postgresql-%{version}-tighten.patch
+Patch4: postgresql-ppc64.patch
+Patch5: postgresql-plperl.patch
+Patch6: postgresql-7.4-src-tutorial.patch
+Patch7: postgresql-7.3.4-s390-pic.patch
+Patch8: postgresql-7.4-com_err.patch
+Patch9: PyGreSQL-3.4-pre021201-bugfix.patch
+Patch10: postgresql-7.4-headers.patch
+Buildrequires: perl glibc-devel bison flex
+Prereq: /sbin/ldconfig initscripts
+%if %python
+BuildPrereq: python-devel
+%endif
+%if %tcl
+BuildPrereq: tcl
+Buildrequires: tcl-devel
+%endif
+%if %tkpkg
+BuildPrereq: tk
+%endif
+BuildPrereq: readline-devel
+BuildPrereq: zlib-devel >= 1.0.4
+%if %ssl
+BuildPrereq: openssl-devel
+%endif
+%if %kerberos
+BuildPrereq: krb5-devel
+BuildPrereq: e2fsprogs-devel
+%endif
+%if %nls
+BuildPrereq: gettext >= 0.10.35
+%endif
+
+%if %pam
+%if %non6xpamdeps
+BuildPrereq: pam-devel
+%endif
+%endif
+
+Url: http://www.postgresql.org/
+Obsoletes: postgresql-clients
+Obsoletes: postgresql-perl
+Obsoletes: postgresql-tk
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+
+# This is the PostgreSQL Global Development Group Official RPMset spec file,
+# or a derivative thereof.
+# Copyright 2003 Lamar Owen <lowen(a)pari.edu> <lamar.owen(a)wgcr.org>
+# and others listed.
+
+# Major Contributors:
+# ---------------
+# Lamar Owen
+# Trond Eivind Glomsrd <teg(a)redhat.com>
+# Thomas Lockhart
+# Reinhard Max
+# Karl DeBisschop
+# Peter Eisentraut
+# Joe Conway
+# Andrew Overholt
+# David Jee
+# Kaj J. Niemi
+# and others in the Changelog....
+
+# This spec file and ancilliary files are licensed in accordance with
+# The PostgreSQL license.
+
+# On top of this file you can find the default build package list macros. These can be overridden by defining
+# on the rpm command line:
+# rpm --define 'packagename 1' .... to force the package to build.
+# rpm --define 'packagename 0' .... to force the package NOT to build.
+# The base package, the lib package, the devel package, and the server package always get built.
+
+
+%description
+PostgreSQL is an advanced Object-Relational database management system
+(DBMS) that supports almost all SQL constructs (including
+transactions, subselects and user-defined types and functions). The
+postgresql package includes the client programs and libraries that
+you'll need to access a PostgreSQL DBMS server. These PostgreSQL
+client programs are programs that directly manipulate the internal
+structure of PostgreSQL databases on a PostgreSQL server. These client
+programs can be located on the same machine with the PostgreSQL
+server, or may be on a remote machine which accesses a PostgreSQL
+server over a network connection. This package contains the docs
+in HTML for the whole package, as well as command-line utilities for
+managing PostgreSQL databases on a PostgreSQL server.
+
+If you want to manipulate a PostgreSQL database on a remote PostgreSQL
+server, you need this package. You also need to install this package
+if you're installing the postgresql-server package.
+
+%package libs
+Summary: The shared libraries required for any PostgreSQL clients.
+Group: Applications/Databases
+Provides: libpq.so
+
+%description libs
+The postgresql-libs package provides the essential shared libraries for any
+PostgreSQL client program or interface. You will need to install this package
+to use any other PostgreSQL package or any clients that need to connect to a
+PostgreSQL server.
+
+%package server
+Summary: The programs needed to create and run a PostgreSQL server.
+Group: Applications/Databases
+Prereq: /usr/sbin/useradd /sbin/chkconfig
+Requires: postgresql = %{version} libpq.so
+Conflicts: postgresql < 7.3
+
+%description server
+The postgresql-server package includes the programs needed to create
+and run a PostgreSQL server, which will in turn allow you to create
+and maintain PostgreSQL databases. PostgreSQL is an advanced
+Object-Relational database management system (DBMS) that supports
+almost all SQL constructs (including transactions, subselects and
+user-defined types and functions). You should install
+postgresql-server if you want to create and maintain your own
+PostgreSQL databases and/or your own PostgreSQL server. You also need
+to install the postgresql package.
+
+
+%package docs
+Summary: Extra documentation for PostgreSQL
+Group: Applications/Databases
+%description docs
+The postgresql-docs package includes the SGML source for the documentation
+as well as the documentation in PDF format and some extra documentation.
+Install this package if you want to help with the PostgreSQL documentation
+project, or if you want to generate printed documentation.
+
+%package contrib
+Summary: Contributed source and binaries distributed with PostgreSQL
+Group: Applications/Databases
+Requires: postgresql = %{version}
+%description contrib
+The postgresql-contrib package contains contributed packages that are
+included in the PostgreSQL distribution.
+
+
+%package devel
+Summary: PostgreSQL development header files and libraries.
+Group: Development/Libraries
+Requires: postgresql-libs = %{version}
+
+%description devel
+The postgresql-devel package contains the header files and libraries
+needed to compile C or C++ applications which will directly interact
+with a PostgreSQL database management server and the ecpg Embedded C
+Postgres preprocessor. You need to install this package if you want to
+develop applications which will interact with a PostgreSQL server. If
+you're installing postgresql-server, you need to install this
+package.
+
+#------------
+%if %pls
+%package pl
+Summary: The PL procedural languages for PostgreSQL.
+Group: Applications/Databases
+Requires: postgresql = %{version}
+PreReq: postgresql-server = %{version}
+
+%description pl
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-pl package contains the the PL/Perl, PL/Tcl, and PL/Python
+procedural languages for the backend. PL/Pgsql is part of the core server package.
+%endif
+
+#------------
+%if %tcl
+%package tcl
+Summary: A Tcl client library for PostgreSQL.
+Group: Applications/Databases
+Requires: tcl >= 8.0
+
+%description tcl
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-tcl package contains the libpgtcl client library,
+the pg-enhanced pgtclsh,and the pg-enhanced tksh, if so configured at buildtime.
+%endif
+
+#------------
+%if %python
+%package python
+Summary: Development module for Python code to access a PostgreSQL DB.
+Group: Applications/Databases
+Requires: python mx
+Conflicts: python < %pyver, python >= %pynextver
+
+
+%description python
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-python package includes a module for
+developers to use when writing Python code for accessing a PostgreSQL
+database.
+%endif
+
+#----------
+%if %jdbc
+%package jdbc
+Summary: Files needed for Java programs to access a PostgreSQL database.
+Group: Applications/Databases
+
+%description jdbc
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-jdbc package includes the .jar file needed for
+Java programs to access a PostgreSQL database.
+%endif
+
+#------------
+%if %test
+%package test
+Summary: The test suite distributed with PostgreSQL.
+Group: Applications/Databases
+Requires: postgresql = %{version}
+PreReq: postgresql-server = %{version}
+
+%description test
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-test package includes the sources and pre-built
+binaries of various tests for the PostgreSQL database management
+system, including regression tests and benchmarks.
+%endif
+
+%define __perl_requires %{SOURCE16}
+
+%prep
+%setup -q
+pushd doc
+tar zxf postgres.tar.gz
+popd
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+# %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch10 -p1
+
+#call autoconf 2.53 or greater
+%aconfver
+
+pushd doc
+tar -zcf postgres.tar.gz *.html stylesheet.css
+rm -f *.html stylesheet.css
+popd
+
+#cp -p %{SOURCE17} .
+#tar zxf %{SOURCE17}
+
+%if %python
+ tar xzf %{SOURCE18}
+ patch -p0 < %{PATCH9}
+ PYGRESQLDIR=`basename %{SOURCE18} .tgz`
+ mv $PYGRESQLDIR PyGreSQL
+%endif
+
+%build
+
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
+%if %kerberos
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
+%endif
+
+# Strip out -ffast-math from CFLAGS....
+
+CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+export LIBNAME=%{_lib}
+%configure --disable-rpath \
+%if %beta
+ --enable-debug \
+ --enable-cassert \
+%endif
+%if %plperl
+ --with-perl \
+%endif
+%if %tcl
+ --with-tcl \
+ --with-tclconfig=%{_libdir} \
+%endif
+%if %tkpkg
+ --with-tkconfig=%{_libdir} \
+%else
+ --without-tk \
+%endif
+%if %python
+ --with-python \
+%endif
+%if %ssl
+ --with-openssl \
+%endif
+%if %pam
+ --with-pam \
+%endif
+%if %kerberos
+ %kerbdir \
+%endif
+%if %nls
+ --enable-nls \
+%endif
+%if %pgfts
+ --enable-thread-safety \
+%endif
+ --sysconfdir=/etc/sysconfig/pgsql \
+ --datadir=/usr/share/pgsql \
+ --with-docdir=%{_docdir}
+
+make all
+make -C contrib all
+
+%if %test
+ pushd src/test
+ make all
+ popd
+%endif
+
+%if %python
+ PYTHON=/usr/bin/python
+ python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
+ python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
+ python_includespec="-I${python_prefix}/include/python${python_version}"
+
+ pushd PyGreSQL
+
+ gcc $CFLAGS -fpic -shared -o _pgmodule.so ${python_includespec} -I../src/interfaces/libpq -I../src/include -L../src/interfaces/libpq -lpq pgmodule.c
+
+ popd
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+make -C contrib DESTDIR=$RPM_BUILD_ROOT install
+
+# install dev headers.
+
+make DESTDIR=$RPM_BUILD_ROOT install-all-headers
+
+# copy over Makefile.global to the include dir....
+install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
+
+%if %jdbc
+ # Java/JDBC
+ # Red Hat's standard place to put jarfiles is /usr/share/java
+
+ # JDBC jars
+ install -d $RPM_BUILD_ROOT/usr/share/java
+ install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
+ install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
+ install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
+ install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java
+ install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/usr/share/java
+ install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/usr/share/java
+
+%endif
+
+if [ -d /etc/rc.d/init.d ]
+then
+ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+fi
+
+
+# PGDATA needs removal of group and world permissions due to pg_pwd hole.
+install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
+
+# backups of data go here...
+install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
+
+# postgres' .bash_profile
+install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
+
+# Create the multiple postmaster startup directory
+install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
+
+
+%if %test
+ # tests. There are many files included here that are unnecessary, but include
+ # them anyway for completeness.
+ mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
+ cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
+ install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+ install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+ pushd $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress/
+ strip *.so
+ popd
+%endif
+
+# Fix some more documentation
+# gzip doc/internals.ps
+cp %{SOURCE6} README.rpm-dist
+mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql
+%if %tkpkg
+%else
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
+%endif
+
+%if %python
+ pushd PyGreSQL
+ install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+ install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+ install -m 0755 pg.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+ install -m 0755 pgdb.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+ popd
+%endif
+
+%find_lang libpq
+%find_lang pg_dump
+%find_lang postgres
+%find_lang psql
+%find_lang pg_resetxlog
+%find_lang pg_controldata
+%find_lang pgscripts
+
+cat libpq.lang > libpq.lst
+cat psql.lang pg_dump.lang pgscripts.lang > main.lst
+cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%pre server
+groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
+useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+ -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
+touch /var/log/pgsql
+chown postgres.postgres /var/log/pgsql
+chmod 0700 /var/log/pgsql
+
+%post server
+chkconfig --add postgresql
+/sbin/ldconfig
+
+%preun server
+if [ $1 = 0 ] ; then
+ chkconfig --del postgresql
+fi
+
+%postun server
+/sbin/ldconfig
+if [ $1 -ge 1 ]; then
+ /sbin/service postgresql condrestart >/dev/null 2>&1
+fi
+if [ $1 = 0 ] ; then
+ userdel postgres >/dev/null 2>&1 || :
+ groupdel postgres >/dev/null 2>&1 || :
+fi
+
+%if %tcl
+%post -p /sbin/ldconfig tcl
+%postun -p /sbin/ldconfig tcl
+%endif
+
+%if %pls
+%post -p /sbin/ldconfig pl
+%postun -p /sbin/ldconfig pl
+%endif
+
+%if %test
+%post test
+chown -R postgres.postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+# FILES section.
+
+%files -f main.lst
+%defattr(-,root,root)
+%doc doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
+%doc COPYRIGHT README HISTORY doc/bug.template
+%doc README.rpm-dist
+%doc doc/html
+%{_bindir}/clusterdb
+%{_bindir}/createdb
+%{_bindir}/createlang
+%{_bindir}/createuser
+%{_bindir}/dropdb
+%{_bindir}/droplang
+%{_bindir}/dropuser
+%{_bindir}/pg_dump
+%{_bindir}/pg_dumpall
+%{_bindir}/pg_encoding
+%{_bindir}/pg_id
+%{_bindir}/pg_restore
+%{_bindir}/psql
+%{_bindir}/vacuumdb
+%{_mandir}/man1/clusterdb.*
+%{_mandir}/man1/createdb.*
+%{_mandir}/man1/createlang.*
+%{_mandir}/man1/createuser.*
+%{_mandir}/man1/dropdb.*
+%{_mandir}/man1/droplang.*
+%{_mandir}/man1/dropuser.*
+%{_mandir}/man1/pg_dump.*
+%{_mandir}/man1/pg_dumpall.*
+%{_mandir}/man1/pg_restore.*
+%{_mandir}/man1/psql.*
+%{_mandir}/man1/vacuumdb.*
+%{_mandir}/man7/*
+
+%files docs
+%defattr(-,root,root)
+%doc doc/src/*
+#doc *-US.pdf
+%doc src/tutorial
+
+%files contrib
+%defattr(-,root,root)
+%{_libdir}/pgsql/_int.so
+%{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/btree_gist.so
+%{_libdir}/pgsql/chkpass.so
+%{_libdir}/pgsql/cube.so
+%{_libdir}/pgsql/dblink.so
+%{_libdir}/pgsql/dbsize.so
+%{_libdir}/pgsql/earthdistance.so
+%{_libdir}/pgsql/fti.so
+%{_libdir}/pgsql/fuzzystrmatch.so
+%{_libdir}/pgsql/insert_username.so
+%{_libdir}/pgsql/int_aggregate.so
+%{_libdir}/pgsql/isbn_issn.so
+%{_libdir}/pgsql/lo.so
+%{_libdir}/pgsql/ltree.so
+%{_libdir}/pgsql/misc_utils.so
+%{_libdir}/pgsql/moddatetime.so
+%{_libdir}/pgsql/noup.so
+%{_libdir}/pgsql/pending.so
+%{_libdir}/pgsql/pgcrypto.so
+%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/refint.so
+%{_libdir}/pgsql/rserv.so
+%{_libdir}/pgsql/rtree_gist.so
+%{_libdir}/pgsql/seg.so
+%{_libdir}/pgsql/string_io.so
+%{_libdir}/pgsql/tablefunc.so
+%{_libdir}/pgsql/timetravel.so
+%{_libdir}/pgsql/tsearch.so
+%{_libdir}/pgsql/tsearch2.so
+%{_libdir}/pgsql/user_locks.so
+%{_datadir}/pgsql/contrib/
+%{_bindir}/dbf2pg
+%{_bindir}/findoidjoins
+%{_bindir}/make_oidjoins_check
+%{_bindir}/fti.pl
+%{_bindir}/oid2name
+%{_bindir}/pg_dumplo
+%{_bindir}/pg_logger
+%{_bindir}/pgbench
+%{_bindir}/RservTest
+%{_bindir}/MasterInit
+%{_bindir}/MasterAddTable
+%{_bindir}/Replicate
+%{_bindir}/MasterSync
+%{_bindir}/CleanLog
+%{_bindir}/SlaveInit
+%{_bindir}/SlaveAddTable
+%{_bindir}/GetSyncID
+%{_bindir}/PrepareSnapshot
+%{_bindir}/ApplySnapshot
+%{_bindir}/InitRservTest
+%{_bindir}/vacuumlo
+%{_bindir}/pg_autovacuum
+%doc contrib/*/README.* contrib/spi/*.example
+
+%files libs -f libpq.lang
+%defattr(-,root,root)
+%{_libdir}/libpq.so.*
+%{_libdir}/libecpg.so.*
+%{_libdir}/libpgtypes.so.*
+%{_libdir}/libecpg_compat.so.*
+
+%files server -f server.lst
+%defattr(-,root,root)
+/etc/rc.d/init.d/postgresql
+%dir /etc/sysconfig/pgsql
+%{_bindir}/initdb
+%{_bindir}/initlocation
+%{_bindir}/ipcclean
+%{_bindir}/pg_controldata
+%{_bindir}/pg_ctl
+%{_bindir}/pg_resetxlog
+%{_bindir}/postgres
+%{_bindir}/postmaster
+%{_mandir}/man1/initdb.*
+%{_mandir}/man1/initlocation.*
+%{_mandir}/man1/ipcclean.*
+%{_mandir}/man1/pg_controldata.*
+%{_mandir}/man1/pg_ctl.*
+%{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/postgres.*
+%{_mandir}/man1/postmaster.*
+%{_datadir}/pgsql/postgres.bki
+%{_datadir}/pgsql/postgres.description
+%{_datadir}/pgsql/*.sample
+%{_libdir}/pgsql/plpgsql.so
+%dir %{_libdir}/pgsql
+%dir %{_datadir}/pgsql
+%attr(700,postgres,postgres) %dir /var/lib/pgsql
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
+%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
+%{_libdir}/pgsql/*_and_*.so
+%{_datadir}/pgsql/conversion_create.sql
+%{_datadir}/pgsql/information_schema.sql
+%{_datadir}/pgsql/sql_features.txt
+
+%files devel
+%defattr(-,root,root)
+/usr/include/*
+%{_bindir}/ecpg
+%{_bindir}/pg_config
+%{_libdir}/libpq.so
+%{_libdir}/libecpg.so
+%{_libdir}/libpq.a
+%{_libdir}/libecpg.a
+%if %tcl
+%{_libdir}/libpgtcl.a
+%endif
+%{_libdir}/libecpg_compat.so
+%{_libdir}/libecpg_compat.a
+%{_libdir}/libpgtypes.so
+%{_libdir}/libpgtypes.a
+%{_mandir}/man1/ecpg.*
+%{_mandir}/man1/pg_config.*
+
+%if %tcl
+%files tcl
+%defattr(-,root,root)
+%attr(755,root,root) %{_libdir}/libpgtcl.so.*
+# libpgtcl.so is not in devel because Tcl scripts may load it by that name.
+%{_libdir}/libpgtcl.so
+%{_bindir}/pgtclsh
+%{_mandir}/man1/pgtclsh.*
+%if %tkpkg
+%{_bindir}/pgtksh
+%{_mandir}/man1/pgtksh.*
+%endif
+%endif
+
+%if %pls
+%files pl
+%defattr(-,root,root)
+%if %plperl
+%{_libdir}/pgsql/plperl.so
+%endif
+%if %pltcl
+%{_libdir}/pgsql/pltcl.so
+%{_bindir}/pltcl_delmod
+%{_bindir}/pltcl_listmod
+%{_bindir}/pltcl_loadmod
+%{_datadir}/pgsql/unknown.pltcl
+%endif
+%{_libdir}/pgsql/plpython.so
+%endif
+
+%if %python
+%files python
+%defattr(-,root,root)
+%doc PyGreSQL/README PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog
+%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
+%{_libdir}/python%{pyver}/site-packages/*.py
+%endif
+
+%if %jdbc
+%files jdbc
+%defattr(-,root,root)
+%{_datadir}/java/pg73jdbc1.jar
+%{_datadir}/java/pg73jdbc2.jar
+%{_datadir}/java/pg73jdbc3.jar
+%{_datadir}/java/devpgjdbc1.jar
+%{_datadir}/java/devpgjdbc2.jar
+%{_datadir}/java/devpgjdbc3.jar
+%endif
+
+%if %test
+%files test
+%defattr(-,postgres,postgres)
+%attr(-,postgres,postgres) /usr/lib/pgsql/test/*
+%attr(-,postgres,postgres) %dir /usr/lib/pgsql/test
+%endif
+
+%changelog
+* Fri Dec 05 2003 David Jee <djee(a)redhat.com> 7.4-5
+- Rebuild for Perl 5.8.2.
+
+* Mon Dec 01 2003 David Jee <djee(a)redhat.com> 7.4-4
+- Add PyGreSQL patch for deprecated column pg_type.typprtlen [Bug #111263]
+- Add headers patch which moves ecpg headers to /usr/include/ecpg
+ [Bug #111195]
+
+* Fri Nov 28 2003 David Jee <djee(a)redhat.com> 7.4-3
+- uncomment buildrequires tcl-devel
+
+* Fri Nov 28 2003 David Jee <djee(a)redhat.com> 7.4-2
+- rebuild
+
+* Mon Nov 24 2003 David Jee <djee(a)redhat.com> 7.4-1
+- initial Red Hat build
+- move jars to /usr/share/java
+- fix rpm-multilib patch to use sysconfig
+
+* Fri Nov 21 2003 Lamar Owen <lowen(a)pari.edu> <lamar.owen(a)wgcr.org>
+- 7.4-0.1PGDG
+- Development JDBC jars in addition to the 7.3 jars; will replace the
+- 7.3 jars once 7.4 official jars are released.
+- Changed to use the bzip2 source to save a little size.
+- Removed some commented out portions of the specfile.
+- Removed the 7.3.4 PDF docs. Will replace with 7.4 PDF's once they
+- are ready.
+
+* Tue Nov 18 2003 Kaj J. Niemi <kajtzu(a)fi.basen.net> 7.4-0.1
+- 7.4
+- Fixed Patch #1 (now rpm-pgsql-7.4.patch)
+- Fixed Patch #2 (now rpm-multilib-7.4.patch):
+- Patch #4 is unnecessary (upstream)
+- Fixed Patch #6 (now postgresql-7.4-src-tutorial.patch)
+- Added Patch #8 (postgresql-7.4-com_err.patch) as com_err()
+ is provided by e2fsprogs and CPPFLAGS gets lost somewhere
+ inside configure (bad macro?)
+- No 7.4 PDF docs available yet (Source #17)
+- PyGreSQL is separated from the upstream distribution but
+ we include it as usual (Source #18)
+- Default to compiling libpq and ECPG as fully thread-safe
+
+- 7.4 Origin. See previous spec files for previous history. Adapted
+- from Red Hat and PGDG's 7.3.4 RPM, directly descended from
+- postgresql-7.3.4-2 as shipped in Fedora Core 1.
diff --git a/sources b/sources
index bc1f649..6bb80f6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2460b3c3fe5dadba3488e77419f975b5 postgresql-7.3.4-USpdfdocs.tar.gz
-82878d6d74c36384af3595d26ed38067 postgresql-7.3.4.tar.gz
+8448fa076c1c3724706dfa93f24efc51 PyGreSQL-3.4-pre021201.tgz
+9db7432c431d1570b1f605727daf27bc postgresql-7.4.tar.bz2
commit aacdfd84b2d5621adf28e7bc7c914fac04da44f2
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:44:02 2004 +0000
auto-import changelog data from postgresql-7.3.4-10.src.rpm
Wed Nov 19 2003 David Jee <djee(a)redhat.com> 7.3.4-RH-10
- rebuild for Fedora Core 1 (Note: This series of packages has formerly
been prefixed by 'rh-postgresql' and was a part of RHDB. It will now
replace the previous series of 'postgresql' packages in Fedora.)
- add conditional checks for whether we're building for Fedora
- import new JDBC driver with functionality improvements and bug fixes
- import new rh-pgsql.patch to reflect changes in JDBC driver
- fix rhdb.init to say "PostgreSQL - Red Hat Edition" upon startup
- replace obsolete URL with http://sources.redhat.com/rhdb/
diff --git a/postgresql.spec b/postgresql.spec
deleted file mode 100755
index 7c70622..0000000
--- a/postgresql.spec
+++ /dev/null
@@ -1,827 +0,0 @@
-# build6x usage: define to 1 to build for RHL6.x. Don't define at all for others.
-%{?build6x:%define kerberos 0}
-%{?build6x:%define nls 0}
-%{?build6x:%define ssl 0}
-#work around the undefined or defined to 1 build 6x interaction with the pam stuff
-%{!?build6x:%define non6xpamdeps 1}
-%{?build6x:%define non6xpamdeps 0}
-
-%define beta 0
-
-%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
-
-%{!?tcl:%define tcl 1}
-%{!?tkpkg:%define tkpkg 0}
-%{!?jdbc:%define jdbc 1}
-%{!?test:%define test 1}
-%{!?python:%define python 1}
-%{!?pltcl:%define pltcl 1}
-%{!?plperl:%define plperl 1}
-%{!?pls:%define pls 1}
-%{!?ssl:%define ssl 1}
-%{!?kerberos:%define kerberos 1}
-%{!?nls:%define nls 1}
-%{!?pam:%define pam 1}
-
-# Python major version.
-%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')}
-
-
-Summary: PostgreSQL client programs and libraries.
-Name: postgresql
-Version: 7.3.4
-
-# Conventions for PostgreSQL Global Development Group RPM releases:
-
-# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
-# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
-# test releases.
-
-# Pre-releases are those that are built from CVS snapshots or pre-release
-# tarballs from postgresql.org. Official beta releases are not
-# considered pre-releases, nor are release candidates, as their beta or
-# release candidate status is reflected in the version of the tarball. Pre-
-# releases' versions do not change -- the pre-release tarball of 7.0.3, for
-# example, has the same tarball version as the final official release of 7.0.3:
-# but the tarball is different.
-
-# Test releases are where PostgreSQL itself is not in beta, but certain parts of
-# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
-
-# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
-# -- only test releases or full releases should be.
-
-Release: 2
-License: BSD
-Group: Applications/Databases
-Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
-Source3: postgresql.init
-Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
-Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/pg73jdbc1.jar
-Source9: http://jdbc.postgresql.org/download/pg73jdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pg73jdbc3.jar
-Source15: postgresql-bashprofile
-Source16: filter-requires-perl-Pg.sh
-Source17: postgresql-7.3.4-USpdfdocs.tar.gz
-Patch1: rpm-pgsql-%{version}.patch
-Patch2: rpm-multilib-%{version}.patch
-Patch3: postgresql-%{version}-tighten.patch
-Patch4: postgresql-ppc64.patch
-Patch5: postgresql-plperl.patch
-Patch6: postgresql-7.3.4-src-tutorial.patch
-Patch7: postgresql-7.3.4-s390-pic.patch
-Buildrequires: perl glibc-devel bison flex
-Prereq: /sbin/ldconfig initscripts
-%if %python
-BuildPrereq: python-devel
-%endif
-%if %tcl
-BuildPrereq: tcl
-#Buildrequires: tcl-devel
-%endif
-%if %tkpkg
-BuildPrereq: tk
-%endif
-BuildPrereq: readline-devel
-BuildPrereq: zlib-devel >= 1.0.4
-%if %ssl
-BuildPrereq: openssl-devel
-%endif
-%if %kerberos
-BuildPrereq: krb5-devel
-%endif
-%if %nls
-BuildPrereq: gettext >= 0.10.35
-%endif
-
-%if %pam
-%if %non6xpamdeps
-BuildPrereq: pam-devel
-%endif
-%endif
-
-Url: http://www.postgresql.org/
-Obsoletes: postgresql-clients
-Obsoletes: postgresql-perl
-Obsoletes: postgresql-tk
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-
-# This is the PostgreSQL Global Development Group Official RPMset spec file,
-# or a derivative thereof.
-# Copyright 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-# and others listed.
-
-# Major Contributors:
-# ---------------
-# Lamar Owen
-# Trond Eivind Glomsrd <teg(a)redhat.com>
-# Thomas Lockhart
-# Reinhard Max
-# Karl DeBisschop
-# Peter Eisentraut
-# Joe Conway
-# and others in the Changelog....
-
-# This spec file and ancilliary files are licensed in accordance with
-# The PostgreSQL license.
-
-# On top of this file you can find the default build package list macros. These can be overridden by defining
-# on the rpm command line:
-# rpm --define 'packagename 1' .... to force the package to build.
-# rpm --define 'packagename 0' .... to force the package NOT to build.
-# The base package, the lib package, the devel package, and the server package always get built.
-
-
-%description
-PostgreSQL is an advanced Object-Relational database management system
-(DBMS) that supports almost all SQL constructs (including
-transactions, subselects and user-defined types and functions). The
-postgresql package includes the client programs and libraries that
-you'll need to access a PostgreSQL DBMS server. These PostgreSQL
-client programs are programs that directly manipulate the internal
-structure of PostgreSQL databases on a PostgreSQL server. These client
-programs can be located on the same machine with the PostgreSQL
-server, or may be on a remote machine which accesses a PostgreSQL
-server over a network connection. This package contains the docs
-in HTML for the whole package, as well as command-line utilities for
-managing PostgreSQL databases on a PostgreSQL server.
-
-If you want to manipulate a PostgreSQL database on a remote PostgreSQL
-server, you need this package. You also need to install this package
-if you're installing the postgresql-server package.
-
-%package libs
-Summary: The shared libraries required for any PostgreSQL clients.
-Group: Applications/Databases
-#XXX should not be needed:
-#Provides: libpq.so.3 libpq.so.3.0
-Provides: libpq.so
-
-%description libs
-The postgresql-libs package provides the essential shared libraries for any
-PostgreSQL client program or interface. You will need to install this package
-to use any other PostgreSQL package or any clients that need to connect to a
-PostgreSQL server.
-
-%package server
-Summary: The programs needed to create and run a PostgreSQL server.
-Group: Applications/Databases
-Prereq: /usr/sbin/useradd /sbin/chkconfig
-Requires: postgresql = %{version} libpq.so
-Conflicts: postgresql < 7.3
-
-%description server
-The postgresql-server package includes the programs needed to create
-and run a PostgreSQL server, which will in turn allow you to create
-and maintain PostgreSQL databases. PostgreSQL is an advanced
-Object-Relational database management system (DBMS) that supports
-almost all SQL constructs (including transactions, subselects and
-user-defined types and functions). You should install
-postgresql-server if you want to create and maintain your own
-PostgreSQL databases and/or your own PostgreSQL server. You also need
-to install the postgresql package.
-
-
-%package docs
-Summary: Extra documentation for PostgreSQL
-Group: Applications/Databases
-%description docs
-The postgresql-docs package includes the SGML source for the documentation
-as well as the documentation in PDF format and some extra documentation.
-Install this package if you want to help with the PostgreSQL documentation
-project, or if you want to generate printed documentation.
-
-%package contrib
-Summary: Contributed source and binaries distributed with PostgreSQL
-Group: Applications/Databases
-Requires: postgresql = %{version}
-%description contrib
-The postgresql-contrib package contains contributed packages that are
-included in the PostgreSQL distribution.
-
-
-%package devel
-Summary: PostgreSQL development header files and libraries.
-Group: Development/Libraries
-Requires: postgresql-libs = %{version}
-
-%description devel
-The postgresql-devel package contains the header files and libraries
-needed to compile C or C++ applications which will directly interact
-with a PostgreSQL database management server and the ecpg Embedded C
-Postgres preprocessor. You need to install this package if you want to
-develop applications which will interact with a PostgreSQL server. If
-you're installing postgresql-server, you need to install this
-package.
-
-#------------
-%if %pls
-%package pl
-Summary: The PL procedural languages for PostgreSQL.
-Group: Applications/Databases
-Requires: postgresql = %{version}
-PreReq: postgresql-server = %{version}
-
-%description pl
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-pl package contains the the PL/Perl, PL/Tcl, and PL/Python
-procedural languages for the backend. PL/Pgsql is part of the core server package.
-%endif
-
-#------------
-%if %tcl
-%package tcl
-Summary: A Tcl client library for PostgreSQL.
-Group: Applications/Databases
-Requires: tcl >= 8.0
-
-%description tcl
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-tcl package contains the libpgtcl client library,
-the pg-enhanced pgtclsh,and the pg-enhanced tksh, if so configured at buildtime.
-%endif
-
-#------------
-%if %python
-%package python
-Summary: Development module for Python code to access a PostgreSQL DB.
-Group: Applications/Databases
-Requires: python mx
-Conflicts: python < %pyver, python >= %pynextver
-
-
-%description python
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-python package includes a module for
-developers to use when writing Python code for accessing a PostgreSQL
-database.
-%endif
-
-#----------
-%if %jdbc
-%package jdbc
-Summary: Files needed for Java programs to access a PostgreSQL database.
-Group: Applications/Databases
-
-%description jdbc
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-jdbc package includes the .jar file needed for
-Java programs to access a PostgreSQL database.
-%endif
-
-#------------
-%if %test
-%package test
-Summary: The test suite distributed with PostgreSQL.
-Group: Applications/Databases
-Requires: postgresql = %{version}
-PreReq: postgresql-server = %{version}
-
-%description test
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-test package includes the sources and pre-built
-binaries of various tests for the PostgreSQL database management
-system, including regression tests and benchmarks.
-%endif
-
-%define __perl_requires %{SOURCE16}
-
-%prep
-%setup -q
-pushd doc
-tar zxf postgres.tar.gz
-popd
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-autoconf
-pushd doc
-tar -zcf postgres.tar.gz *.html catalogs.gif connections.gif stylesheet.css
-rm -f *.html catalogs.gif connections.gif stylesheet.css
-popd
-
-cp -p %{SOURCE17} .
-tar zxf %{SOURCE17}
-
-%build
-
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-%if %kerberos
-CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
-CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
-%endif
-
-# Strip out -ffast-math from CFLAGS....
-
-CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-export LIBNAME=%{_lib}
-%configure --disable-rpath \
-%if %beta
- --enable-debug \
- --enable-cassert \
-%endif
-%if %plperl
- --with-perl \
-%endif
-%if %tcl
- --with-tcl \
- --with-tclconfig=%{_libdir} \
-%endif
-%if %tkpkg
- --with-tkconfig=%{_libdir} \
-%else
- --without-tk \
-%endif
-%if %python
- --with-python \
-%endif
-%if %ssl
- --with-openssl \
-%endif
-%if %pam
- --with-pam \
-%endif
-%if %kerberos
- --with-krb5 \
-%endif
-%if %nls
- --enable-nls \
-%endif
- --sysconfdir=/etc/sysconfig/pgsql \
- --datadir=/usr/share/pgsql \
- --with-docdir=%{_docdir}
-
-make all
-make -C contrib all
-
-%if %test
- pushd src/test
- make all
- popd
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-make -C contrib DESTDIR=$RPM_BUILD_ROOT install
-
-# install dev headers.
-
-make DESTDIR=$RPM_BUILD_ROOT install-all-headers
-
-# copy over Makefile.global to the include dir....
-install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
-
-%if %jdbc
- # Java/JDBC
- # The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
-
- # JDBC jars
- install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/pgsql
- install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/pgsql
- install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/pgsql
-
-%endif
-
-if [ -d /etc/rc.d/init.d ]
-then
- install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
- install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
-fi
-
-
-# PGDATA needs removal of group and world permissions due to pg_pwd hole.
-install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
-
-# backups of data go here...
-install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
-
-# postgres' .bash_profile
-install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
-
-# Create the multiple postmaster startup directory
-install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
-
-
-%if %test
- # tests. There are many files included here that are unnecessary, but include
- # them anyway for completeness.
- mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
- cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
- install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
- install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
- pushd $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress/
- strip *.so
- popd
-%endif
-
-# Fix some more documentation
-# gzip doc/internals.ps
-cp %{SOURCE6} README.rpm-dist
-mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
-rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql
-%if %tkpkg
-%else
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
-%endif
-
-%find_lang libpq
-%find_lang pg_dump
-%find_lang postgres
-%find_lang psql
-%find_lang pg_resetxlog
-%find_lang pg_controldata
-
-cat libpq.lang > libpq.lst
-cat psql.lang pg_dump.lang > main.lst
-cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%pre server
-groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
- -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
-touch /var/log/pgsql
-chown postgres.postgres /var/log/pgsql
-chmod 0700 /var/log/pgsql
-
-%post server
-chkconfig --add postgresql
-/sbin/ldconfig
-
-%preun server
-if [ $1 = 0 ] ; then
- chkconfig --del postgresql
-fi
-
-%postun server
-/sbin/ldconfig
-if [ $1 -ge 1 ]; then
- /sbin/service postgresql condrestart >/dev/null 2>&1
-fi
-if [ $1 = 0 ] ; then
- userdel postgres >/dev/null 2>&1 || :
- groupdel postgres >/dev/null 2>&1 || :
-fi
-
-%if %tcl
-%post -p /sbin/ldconfig tcl
-%postun -p /sbin/ldconfig tcl
-%endif
-
-%if %pls
-%post -p /sbin/ldconfig pl
-%postun -p /sbin/ldconfig pl
-%endif
-
-%if %test
-%post test
-chown -R postgres.postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-# FILES section.
-
-%files -f main.lst
-%defattr(-,root,root)
-%doc doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
-%doc COPYRIGHT README HISTORY doc/bug.template
-%doc README.rpm-dist
-%doc doc/html
-%{_bindir}/clusterdb
-%{_bindir}/createdb
-%{_bindir}/createlang
-%{_bindir}/createuser
-%{_bindir}/dropdb
-%{_bindir}/droplang
-%{_bindir}/dropuser
-%{_bindir}/pg_dump
-%{_bindir}/pg_dumpall
-%{_bindir}/pg_encoding
-%{_bindir}/pg_id
-%{_bindir}/pg_restore
-%{_bindir}/psql
-%{_bindir}/vacuumdb
-%{_mandir}/man1/clusterdb.*
-%{_mandir}/man1/createdb.*
-%{_mandir}/man1/createlang.*
-%{_mandir}/man1/createuser.*
-%{_mandir}/man1/dropdb.*
-%{_mandir}/man1/droplang.*
-%{_mandir}/man1/dropuser.*
-%{_mandir}/man1/pg_dump.*
-%{_mandir}/man1/pg_dumpall.*
-%{_mandir}/man1/pg_restore.*
-%{_mandir}/man1/psql.*
-%{_mandir}/man1/vacuumdb.*
-%{_mandir}/man7/*
-
-%files docs
-%defattr(-,root,root)
-%doc doc/src/*
-%doc *-US.pdf
-%doc src/tutorial
-
-%files contrib
-%defattr(-,root,root)
-%{_libdir}/pgsql/_int.so
-%{_libdir}/pgsql/array_iterator.so
-%{_libdir}/pgsql/autoinc.so
-%{_libdir}/pgsql/btree_gist.so
-%{_libdir}/pgsql/chkpass.so
-%{_libdir}/pgsql/cube.so
-%{_libdir}/pgsql/dblink.so
-%{_libdir}/pgsql/dbsize.so
-%{_libdir}/pgsql/earthdistance.so
-%{_libdir}/pgsql/fti.so
-%{_libdir}/pgsql/fuzzystrmatch.so
-%{_libdir}/pgsql/insert_username.so
-%{_libdir}/pgsql/int_aggregate.so
-%{_libdir}/pgsql/isbn_issn.so
-%{_libdir}/pgsql/lo.so
-%{_libdir}/pgsql/ltree.so
-%{_libdir}/pgsql/misc_utils.so
-%{_libdir}/pgsql/moddatetime.so
-%{_libdir}/pgsql/noup.so
-%{_libdir}/pgsql/pending.so
-%{_libdir}/pgsql/pgcrypto.so
-%{_libdir}/pgsql/pgstattuple.so
-%{_libdir}/pgsql/refint.so
-%{_libdir}/pgsql/rserv.so
-%{_libdir}/pgsql/rtree_gist.so
-%{_libdir}/pgsql/seg.so
-%{_libdir}/pgsql/string_io.so
-%{_libdir}/pgsql/tablefunc.so
-%{_libdir}/pgsql/timetravel.so
-%{_libdir}/pgsql/tsearch.so
-%{_libdir}/pgsql/user_locks.so
-%{_datadir}/pgsql/contrib/
-%{_bindir}/dbf2pg
-%{_bindir}/findoidjoins
-%{_bindir}/make_oidjoins_check
-%{_bindir}/fti.pl
-%{_bindir}/oid2name
-%{_bindir}/pg_dumplo
-%{_bindir}/pg_logger
-%{_bindir}/pgbench
-%{_bindir}/RservTest
-%{_bindir}/MasterInit
-%{_bindir}/MasterAddTable
-%{_bindir}/Replicate
-%{_bindir}/MasterSync
-%{_bindir}/CleanLog
-%{_bindir}/SlaveInit
-%{_bindir}/SlaveAddTable
-%{_bindir}/GetSyncID
-%{_bindir}/PrepareSnapshot
-%{_bindir}/ApplySnapshot
-%{_bindir}/InitRservTest
-%{_bindir}/vacuumlo
-%doc contrib/*/README.* contrib/spi/*.example
-
-%files libs -f libpq.lang
-%defattr(-,root,root)
-%{_libdir}/libpq.so.*
-%{_libdir}/libecpg.so.*
-
-%files server -f server.lst
-%defattr(-,root,root)
-/etc/rc.d/init.d/postgresql
-%dir /etc/sysconfig/pgsql
-%{_bindir}/initdb
-%{_bindir}/initlocation
-%{_bindir}/ipcclean
-%{_bindir}/pg_controldata
-%{_bindir}/pg_ctl
-%{_bindir}/pg_resetxlog
-%{_bindir}/postgres
-%{_bindir}/postmaster
-%{_mandir}/man1/initdb.*
-%{_mandir}/man1/initlocation.*
-%{_mandir}/man1/ipcclean.*
-%{_mandir}/man1/pg_controldata.*
-%{_mandir}/man1/pg_ctl.*
-%{_mandir}/man1/pg_resetxlog.*
-%{_mandir}/man1/postgres.*
-%{_mandir}/man1/postmaster.*
-%{_datadir}/pgsql/postgres.bki
-%{_datadir}/pgsql/postgres.description
-%{_datadir}/pgsql/*.sample
-%{_libdir}/pgsql/plpgsql.so
-%dir %{_libdir}/pgsql
-%dir %{_datadir}/pgsql
-%attr(700,postgres,postgres) %dir /var/lib/pgsql
-%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
-%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
-%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
-%{_libdir}/pgsql/*_and_*.so
-%{_datadir}/pgsql/conversion_create.sql
-
-%files devel
-%defattr(-,root,root)
-/usr/include/*
-%{_bindir}/ecpg
-%{_bindir}/pg_config
-%{_libdir}/libpq.so
-%{_libdir}/libecpg.so
-%{_libdir}/libpq.a
-%{_libdir}/libecpg.a
-%if %tcl
-%{_libdir}/libpgtcl.a
-%endif
-%{_mandir}/man1/ecpg.*
-%{_mandir}/man1/pg_config.*
-
-%if %tcl
-%files tcl
-%defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/libpgtcl.so.*
-# libpgtcl.so is not in devel because Tcl scripts may load it by that name.
-%{_libdir}/libpgtcl.so
-%{_bindir}/pgtclsh
-%{_mandir}/man1/pgtclsh.*
-%if %tkpkg
-%{_bindir}/pgtksh
-%{_mandir}/man1/pgtksh.*
-%endif
-%endif
-
-%if %pls
-%files pl
-%defattr(-,root,root)
-%if %plperl
-%{_libdir}/pgsql/plperl.so
-%endif
-%if %pltcl
-%{_libdir}/pgsql/pltcl.so
-%{_bindir}/pltcl_delmod
-%{_bindir}/pltcl_listmod
-%{_bindir}/pltcl_loadmod
-%{_datadir}/pgsql/unknown.pltcl
-%endif
-%{_libdir}/pgsql/plpython.so
-%endif
-
-%if %python
-%files python
-%defattr(-,root,root)
-%doc src/interfaces/python/README src/interfaces/python/tutorial
-%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
-%{_libdir}/python%{pyver}/site-packages/*.py
-%endif
-
-%if %jdbc
-%files jdbc
-%defattr(-,root,root)
-%{_datadir}/pgsql/pg73jdbc1.jar
-%{_datadir}/pgsql/pg73jdbc2.jar
-%{_datadir}/pgsql/pg73jdbc3.jar
-%endif
-
-%if %test
-%files test
-%defattr(-,postgres,postgres)
-%attr(-,postgres,postgres) /usr/lib/pgsql/test/*
-%attr(-,postgres,postgres) %dir /usr/lib/pgsql/test
-%endif
-
-%changelog
-* Thu Sep 04 2003 David Jee <djee(a)redhat.com> 7.3.4-2
-- fix src-tutorial patch handling to include all files in the
- original postgres.tar.gz (*.html catalogs.gif connections.gif
- stylesheet.css)
-
-* Thu Jul 31 2003 David Jee <djee(a)redhat.com> 7.3.4-1
-- initial 7.3.4 build
-
-* Wed Jul 30 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-10
-- fix basename call in postgresql.init (courtesy E. Jay Berkenbilt)
-- fix x86_64 issues with /usr/lib64 and regression tests
-- backout previous lib64 change
-
-* Tue Jul 22 2003 Nalin Dahyabhai <nalin(a)redhat.com> 7.3.3-9
-- rebuild for updated krb5 1.3, which moves headers and libs to /usr
-- use -fPIC instead of -fpic on s390x to allow the plpython bits to link
-
-* Wed Jul 16 2003 Olga Rodimina <rodimina(a)redhat.com> 7.3.3-8
-- fix tutorial location
-- modify tutorial patch to be 7.3.3-specific
-
-* Mon Jul 14 2003 Chip Turner <cturner(a)redhat.com>
-- rebuild for new perl 5.8.1
-
-* Fri Jul 11 2003 Olga Rodimina <rodimina(a)redhat.com> 7.3.3-6
-- add src/tutorial to -docs package [Bug #54711]
-- add postgresql-src-tutorial.patch [Bug #54711]
-- postgresql-src-tutorial.patch builds src/tutorial before
- installing and corrects entry specifying path to tutorial in
- tutorial-sql.html
-
-* Mon Jul 07 2003 Kim Ho <kho(a)redhat.com> 7.3.3-5
-- add patch to use rpath when creating plperl [Bug #83000]
-- add Buildrequires: tcl-devel for libpgtcl --overholt
-
-* Fri Jun 13 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-4
-- add PDF docs to -docs package [Bug #91941]
-
-* Wed Jun 04 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-3
-- remove PGOPTS from init script [Bug #91943]
-- fix system startup 'S90postgresql' issue [Bug #91943]
-
-* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Mon May 26 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-1
-- initial 7.3.3 build
-
-* Thu May 22 2003 Florian La Roche <Florian.LaRoche(a)redhat.de>
-- remove libpq.so.2*
-
-* Wed Apr 16 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-4
-- Obsolete postgresql-perl and postgresql-tk [Bugzilla #79814]
-
-* Mon Feb 17 2003 Elliot Lee <sopwith(a)redhat.com> 7.3.2-4
-- Add ppc64 patch
-
-* Fri Feb 14 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-3
-- Remove pltcl.so from postgresql-tcl and plpython.so from postgresql-server.
- [Bugzilla #83906]
-
-* Wed Feb 12 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-2
-- Fix typo in pg_hba.conf tighten patch. [Bugzilla #81366]
-
-* Wed Feb 5 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-1
-- Initial 7.3.1 build.
-- Add bison and flex to BuildRequires line. [Bugzilla #83553]
-
-* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
-- rebuilt
-
-* Thu Jan 09 2003 Elliot Lee <sopwith(a)redhat.com> 7.3.1-5
-- Rebuild for newer libssl
-- Add patch4 (isblank.patch) to make it all build
-
-* Sat Jan 4 2003 Jeff Johnson <jbj(a)redhat.com> 7.3.1-4
-- use internal dep generator.
-
-* Fri Jan 3 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.1-3
-- Remove spurious PreReq line
-
-* Fri Jan 3 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.1-2
-- Rebuild with new 7.3.1 tarball
-- Remove obsoletes postgresql-perl line (should have been postgresql-plperl)
- as we did not have that package previously
-
-* Wed Dec 18 2002 Andrew Overholt <overholt(a)redhat.com> 7.3.1-1
-- Initial 7.3.1 build.
-
-* Tue Dec 17 2002 Nalin Dahyabhai <nalin(a)redhat.com> 7.3-6
-- Make postgresql-pl obsolete postgresql-perl, not postgresql-plperl
-
-* Fri Dec 13 2002 Andrew Overholt <overholt(a)redhat.com>
-- Remove perl(Pg) dependency
-- Bash profile PGDATA fix
-- Updated initscript to new community version
-
-* Tue Dec 10 2002 Andrew Overholt <overholt(a)redhat.com>
-- Upgrade to 7.3 community spec file.
-- Add patch to use with multilib.
-- Change explicit path names to use RPM macros (multilib).
-- Add security patch.
-
-* Thu Dec 05 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- 7.3-2PGDG
-- Fix typo in initscript. Argh!!
-
-* Wed Dec 04 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- 7.3-0.5PGDG
-- Jerk out all perl client stuff and kludgage
-- Rename plperl subpackage to a pl subpackage containing all but PL/Pgsql PL's
-- Eliminate locale and multibyte explicit enables -- they are both defaults now
-- Eliminate pgaccess code; it's not a part of the main tarball anymore
-- Eliminate ODBC stuff -- it's also separate now. Use unixODBC instead.
-- Eliminated separate tk client package -- rolled the tk client into the tcl client.
-- Moved pltcl into the pl subpackage.
-- Added plpython to the pl subpackage.
-- /etc/sysconfig/pgsql is sysconfdir for multiple postmaster startup.
-
-
-* Mon Dec 02 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- 7.3-0.1PGDG (not released)
-- Integrate 7.3 jar's courtesy Joe Conway
-- Integrate multi-postmaster initscript courtesy Karl DeBisschop
-- Some renames and restructures.
-- Stripped out the last dregs of the postgresql-dump migration script.
-- Conflicts with less than 7.3.
commit 3f053f53748fe88050a1030c1c851b3912a11b32
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:43:06 2004 +0000
auto-import postgresql-7.3.4-2 from postgresql-7.3.4-2.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index 8983d9f..7c70622 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@ Version: 7.3.4
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1.rhl9
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -349,7 +349,7 @@ export LIBNAME=%{_lib}
--with-pam \
%endif
%if %kerberos
- --with-krb5=/usr/kerberos \
+ --with-krb5 \
%endif
%if %nls
--enable-nls \
@@ -698,10 +698,6 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Fri Oct 31 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.4-1.rhl9
-- Erratum version for RHL 9.
-- Fix kerberos location (/usr/kerberos)
-
* Thu Sep 04 2003 David Jee <djee(a)redhat.com> 7.3.4-2
- fix src-tutorial patch handling to include all files in the
original postgres.tar.gz (*.html catalogs.gif connections.gif
commit c8cd9cbacd6ea183482b00cf7466161be17c4f3c
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:42:45 2004 +0000
auto-import postgresql-7.3.4-1.rhl9 from postgresql-7.3.4-1.rhl9.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 444a58e..0a35bc8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-postgresql-7.3.2.tar.gz
+postgresql-7.3.4-USpdfdocs.tar.gz
+postgresql-7.3.4.tar.gz
diff --git a/postgresql.init b/postgresql.init
index f8b3954..b9a236f 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -66,6 +66,11 @@ TYPESET=`typeset -f|grep "declare"`
# Find the name of the script
NAME=`basename $0`
+if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]
+then
+ NAME=${NAME:3}
+fi
+
# Set defaults for port and database directory
PGPORT=5432
@@ -81,7 +86,6 @@ fi
[ -f /etc/sysconfig/pgsql/${NAME} ] && . /etc/sysconfig/pgsql/${NAME}
export PGDATA
export PGPORT
-export PGOPTS
# Check that networking is up.
# Pretty much need it for postmaster.
diff --git a/postgresql.spec b/postgresql.spec
index 43057ee..8983d9f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -30,7 +30,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.3.2
+Version: 7.3.4
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -52,22 +52,26 @@ Version: 7.3.2
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 3
+Release: 1.rhl9
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
Source3: postgresql.init
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/pg73b1jdbc1.jar
-Source9: http://jdbc.postgresql.org/download/pg73b1jdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pg73b1jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/pg73jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg73jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg73jdbc3.jar
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
+Source17: postgresql-7.3.4-USpdfdocs.tar.gz
Patch1: rpm-pgsql-%{version}.patch
Patch2: rpm-multilib-%{version}.patch
Patch3: postgresql-%{version}-tighten.patch
-Patch4: postgresql-7.3.1-isblank.patch
+Patch4: postgresql-ppc64.patch
+Patch5: postgresql-plperl.patch
+Patch6: postgresql-7.3.4-src-tutorial.patch
+Patch7: postgresql-7.3.4-s390-pic.patch
Buildrequires: perl glibc-devel bison flex
Prereq: /sbin/ldconfig initscripts
%if %python
@@ -75,6 +79,7 @@ BuildPrereq: python-devel
%endif
%if %tcl
BuildPrereq: tcl
+#Buildrequires: tcl-devel
%endif
%if %tkpkg
BuildPrereq: tk
@@ -99,6 +104,8 @@ BuildPrereq: pam-devel
Url: http://www.postgresql.org/
Obsoletes: postgresql-clients
+Obsoletes: postgresql-perl
+Obsoletes: postgresql-tk
Buildroot: %{_tmppath}/%{name}-%{version}-root
# This is the PostgreSQL Global Development Group Official RPMset spec file,
@@ -148,7 +155,9 @@ if you're installing the postgresql-server package.
%package libs
Summary: The shared libraries required for any PostgreSQL clients.
Group: Applications/Databases
-Provides: libpq.so.2 libpq.so.2.0 libpq.so
+#XXX should not be needed:
+#Provides: libpq.so.3 libpq.so.3.0
+Provides: libpq.so
%description libs
The postgresql-libs package provides the essential shared libraries for any
@@ -180,7 +189,7 @@ Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
%description docs
The postgresql-docs package includes the SGML source for the documentation
-as well as the documentation in other formats, and some extra documentation.
+as well as the documentation in PDF format and some extra documentation.
Install this package if you want to help with the PostgreSQL documentation
project, or if you want to generate printed documentation.
@@ -281,17 +290,33 @@ system, including regression tests and benchmarks.
%prep
%setup -q
-
+pushd doc
+tar zxf postgres.tar.gz
+popd
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
autoconf
+pushd doc
+tar -zcf postgres.tar.gz *.html catalogs.gif connections.gif stylesheet.css
+rm -f *.html catalogs.gif connections.gif stylesheet.css
+popd
+
+cp -p %{SOURCE17} .
+tar zxf %{SOURCE17}
%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
+%if %kerberos
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
+%endif
# Strip out -ffast-math from CFLAGS....
@@ -402,20 +427,12 @@ install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
# gzip doc/internals.ps
cp %{SOURCE6} README.rpm-dist
mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
-
rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql
%if %tkpkg
%else
rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
%endif
-# Symlink libpq.so.2.0 to libpq.so.2 for backwards compatibility, until
-# -soname patches are the norm.
-pushd $RPM_BUILD_ROOT/usr/lib
-ln -s libpq.so.2 libpq.so.2.0
-popd
-
-
%find_lang libpq
%find_lang pg_dump
%find_lang postgres
@@ -438,7 +455,6 @@ touch /var/log/pgsql
chown postgres.postgres /var/log/pgsql
chmod 0700 /var/log/pgsql
-
%post server
chkconfig --add postgresql
/sbin/ldconfig
@@ -515,6 +531,8 @@ rm -rf $RPM_BUILD_ROOT
%files docs
%defattr(-,root,root)
%doc doc/src/*
+%doc *-US.pdf
+%doc src/tutorial
%files contrib
%defattr(-,root,root)
@@ -667,9 +685,9 @@ rm -rf $RPM_BUILD_ROOT
%if %jdbc
%files jdbc
%defattr(-,root,root)
-%{_datadir}/pgsql/pg73b1jdbc1.jar
-%{_datadir}/pgsql/pg73b1jdbc2.jar
-%{_datadir}/pgsql/pg73b1jdbc3.jar
+%{_datadir}/pgsql/pg73jdbc1.jar
+%{_datadir}/pgsql/pg73jdbc2.jar
+%{_datadir}/pgsql/pg73jdbc3.jar
%endif
%if %test
@@ -680,6 +698,67 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Oct 31 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.4-1.rhl9
+- Erratum version for RHL 9.
+- Fix kerberos location (/usr/kerberos)
+
+* Thu Sep 04 2003 David Jee <djee(a)redhat.com> 7.3.4-2
+- fix src-tutorial patch handling to include all files in the
+ original postgres.tar.gz (*.html catalogs.gif connections.gif
+ stylesheet.css)
+
+* Thu Jul 31 2003 David Jee <djee(a)redhat.com> 7.3.4-1
+- initial 7.3.4 build
+
+* Wed Jul 30 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-10
+- fix basename call in postgresql.init (courtesy E. Jay Berkenbilt)
+- fix x86_64 issues with /usr/lib64 and regression tests
+- backout previous lib64 change
+
+* Tue Jul 22 2003 Nalin Dahyabhai <nalin(a)redhat.com> 7.3.3-9
+- rebuild for updated krb5 1.3, which moves headers and libs to /usr
+- use -fPIC instead of -fpic on s390x to allow the plpython bits to link
+
+* Wed Jul 16 2003 Olga Rodimina <rodimina(a)redhat.com> 7.3.3-8
+- fix tutorial location
+- modify tutorial patch to be 7.3.3-specific
+
+* Mon Jul 14 2003 Chip Turner <cturner(a)redhat.com>
+- rebuild for new perl 5.8.1
+
+* Fri Jul 11 2003 Olga Rodimina <rodimina(a)redhat.com> 7.3.3-6
+- add src/tutorial to -docs package [Bug #54711]
+- add postgresql-src-tutorial.patch [Bug #54711]
+- postgresql-src-tutorial.patch builds src/tutorial before
+ installing and corrects entry specifying path to tutorial in
+ tutorial-sql.html
+
+* Mon Jul 07 2003 Kim Ho <kho(a)redhat.com> 7.3.3-5
+- add patch to use rpath when creating plperl [Bug #83000]
+- add Buildrequires: tcl-devel for libpgtcl --overholt
+
+* Fri Jun 13 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-4
+- add PDF docs to -docs package [Bug #91941]
+
+* Wed Jun 04 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-3
+- remove PGOPTS from init script [Bug #91943]
+- fix system startup 'S90postgresql' issue [Bug #91943]
+
+* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Mon May 26 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.3-1
+- initial 7.3.3 build
+
+* Thu May 22 2003 Florian La Roche <Florian.LaRoche(a)redhat.de>
+- remove libpq.so.2*
+
+* Wed Apr 16 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-4
+- Obsolete postgresql-perl and postgresql-tk [Bugzilla #79814]
+
+* Mon Feb 17 2003 Elliot Lee <sopwith(a)redhat.com> 7.3.2-4
+- Add ppc64 patch
+
* Fri Feb 14 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-3
- Remove pltcl.so from postgresql-tcl and plpython.so from postgresql-server.
[Bugzilla #83906]
diff --git a/sources b/sources
index ec98b20..bc1f649 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-23d2762571e8c5bb21eee08aab968ccb postgresql-7.3.2.tar.gz
+2460b3c3fe5dadba3488e77419f975b5 postgresql-7.3.4-USpdfdocs.tar.gz
+82878d6d74c36384af3595d26ed38067 postgresql-7.3.4.tar.gz
commit 06e8d17f1d18ae71142d7342ec781ea5d433fc8b
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:41:55 2004 +0000
auto-import postgresql-7.3.2-3 from postgresql-7.3.2-3.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 5d60585..444a58e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-migration-scripts.tar.gz
-postgresql-7.2.4.tar.gz
-postgresql-dump.1.gz
+postgresql-7.3.2.tar.gz
diff --git a/README.rpm-dist b/README.rpm-dist
index ecf543f..ce775d3 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,18 +1,14 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 4.1, for the PostgreSQL 7.2.1-2PGDG RPMset.
+Version 5.0, for the PostgreSQL 7.3-1PGDG RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
-
-DISCLAIMER: the following information is provided in the hope that it helps
-people install and use PostgreSQL. It is being provided without warranty of
-any kind, so, use at your own risk.
-----------------------------------------------------------------------------
Contents:
0.) Quick -i note.
1.) Introduction, QuickStart, and credits
2.) PostgreSQL RPM packages and rationale
- 3.) Upgrading. (Deprecated. Will be removed in a future README)
+ 3.) Starting multiple postmasters
4.) Regression Testing
5.) Starting postmaster automatically on startup
6.) Grand Unified Configuration(GUC) File.
@@ -31,35 +27,47 @@ recommended way to get '-i' functionality back.
INTRODUCTION
-----------------------------------------------------------------------------
-This document exists to explain the layout of the RPM's for PostgreSQL, to
-explain how to migrate from an older version, and to explain WHY it can be
-so difficult to upgrade PostgreSQL.
+This document exists to explain the layout of the RPM's for PostgreSQL,to
+describe various RPM specifics, and to document special features found
+in the RPMset.
-This document is written to be applicable to version 7.2.1 of PostgreSQL,
-which is the current version of the RPM's as of this writing.
+This document is written to be applicable to version 7.3 of PostgreSQL,
+which is the current version of the RPM's as of this writing. More to the
+point, versions prior to 7.3 are not documented here.
-Official PostgreSQL Global Development Group RPM's carry a 'PGDG' after the
-release number. Other RPMset's as distributed with Linux distributions may
-have a different release number and initials.
+Official PostgreSQL Global Development Group RPM's have from version 7.1.2
+on carried a 'PGDG' after the release number. Other RPMset's as distributed
+with Linux distributions may have a different release number and initials.
It is preferable for the distribution-specific set to be the one used, as
the PGDG set is intentionally generic. So, if your distro has a set of RPMs,
use them in preference. If you want to stay up-to-date on the PostgreSQL
core itself, use the PGDG generic set -- but understand that it is a
-GENERIC set. In particular, SuSE and RedHat users that use late-model
-distributions should definitely use their RPMs. Trond and Reinhard do a
-good job keeping them up to date. The Polish(ed) Linux Distribution also
-does an excellent job with the PLD RPM version.
+GENERIC set.
These RPMs are designed to be LSB-compliant -- if you find this not to be the
case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
list.
+These RPMs no longer support any sort of upgrading process other than that
+documented in the regular documentation. That is, you must dump, upgrade,
+initdb, and restore your data. The 7.2 to 7.3 migration can be quite
+difficult, even to the point of requiring hand-editing of the dumpfile.
+
+Thus, the 7.3 postgresql-server RPM specifically conflicts with prior
+versions. The old server subpackage must be removed first, the new package
+installed, and the data restored from dump.
+
+A new section on running multiple postmasters has replaced the old upgrade
+instructions.
+
QUICKSTART
-----------------------------------------------------------------------------
-If this is an upgrade, please go to section 3, UPGRADING.
-If this is a fresh installation, simply start the postmaster using:
- /etc/rc.d/init.d/postgresql start (on RedHat and TurboLinux)
+For a fresh installation on a recent Red Hat or similar system, a simple
+service postgresql start
+as root will prepare a new database (initdb), and start a postmaster that
+will listen on Unix socket 5432 only. Edit /var/lib/pgsql/data/postgresql.conf
+to enable TCP/IP -- see the section on '-i.'
The file /var/lib/pgsql/.bash_profile is now packaged to help with the
setting of environment variables. You may edit this file, and it won't be
@@ -77,7 +85,7 @@ CREDITS
Thomas Lockhart
Uncle George
Ryan Kirkpatrick
-Trond Eivind Glomsrd
+Trond Eivind Glomsrd
Mark Knox
Mike Mascari
Nicolas Huillard
@@ -86,42 +94,38 @@ Roger Luethi
Jeff Johnson
Reinhard Max
Peter Eisentraut
-
-A big THANK YOU to Trond, particularly. He has poured an amazing amount of
-work into this package, particularly in cleaning up my errors, as well as
-getting the contrib package to actually be useful.
+Joe Conway
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
-[This section has been edited. See prior versions for older history]
-
-PostgreSQL is a large, multifaceted program, with many clients and options
-that all users will not need. So, several subpackages are built. Here is
-the list of the current (7.2.1) packages:
+The RPMset is packaged in the following subpackages:
postgresql: Some clients and libraries, and documentation
postgresql-server: Server executables and data files
postgresql-devel: Client-side development libraries
-postgresql-perl: PERL client module
+postgresql-tcl: TCL/TK client libraries and docs
postgresql-python: The PygreSQL client library
-postgresql-odbc: Linux ODBC client (not required to use ODBC from Win95)
postgresql-jdbc: JAR of the JDBC client
postgresql-test: The regression tests and associated files.
-postgresql-tk: Tk client and pgaccess.
postgresql-tcl: Tcl client and PL ONLY.
postgresql-libs: client shared libraries.
postgresql-docs: extra documentation,such as the SGML doc sources.
postgresql-contrib: The contrib source tree, as well as selected binaries.
+postgresql-pl: PL/Perl (if possible on this dist), PL/Python, and PL/Tcl
+
+Note that there is no postgresql-perl, postgresql-odbc, postgresql-tk, or
+postgresql-plperl package any longer. This is due to these portions being
+removed from the PostgreSQL source tarball. The TK client package 'pgaccess'
+was the core of the -tk subpackage -- so the pgtksh client was rolled back
+into the -tcl package.
-The postgresql-libs package is required for all installations. Otherwise, a
-mix and match installation may be made. The devel package is required to
-do any compilation of a program that uses either the client libs or the
-server (SPI) interface.
+PostgreSQL is split up into multiple packages so that users can 'pick and
+choose' what pieces are needed, and what dependencies are required.
RPM FILE LOCATIONS.
-----------------------------------------------------------------------------
-In compliance with the LSB, the PostgreSQL RPM's install files in a manner
-not consistent with much of the PostgreSQL documentation. According to the
+In compliance with the Linux FHS, the PostgreSQL RPM's install files in a manner
+not consistent with most of the PostgreSQL documentation. According to the
standard PostgreSQL documentation, PostgreSQL is installed under the directory
/usr/local/pgsql, with executables, source, and data existing in various
subdirectories.
@@ -142,7 +146,6 @@ Data: /var/lib/pgsql/data
Backup area: /var/lib/pgsql/backup
Templates: /usr/share/pgsql
Procedural Languages: /usr/lib/pgsql
-TK client docs: /usr/share/doc/postgresql-tk-x.y.z
Development Headers: /usr/include/pgsql
Other shared data: /usr/share/pgsql
Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
@@ -161,123 +164,31 @@ for you.
These RPM's are meant to be LSB-compliant. If you find errors in them that
cause thembe be non-compliant, please let me know.
-UPGRADING.
------------------------------------------------------------------------------
-WARNING: This information is deprecated. Make sure to fully back up
-your database files BEFORE upgrading the RPM. Unfortunately, even then
-you may have problems -- so be ready to hand-edit dump files.
-
-A pg_upgrade utility is found in the contrib tree -- but it is not really
-production quality code. If this lack of easy upgrades bothers you, please
-let the developer list (pgsql-hackers(a)postgresql.org) know about it -- maybe
-seamless upgrades can be made a higher prioriy if enough users complain.
-
-Use the following information at your own risk.
-
-CAUTION: While a semi-automatic upgrade process has been implemented, it is
-STRONGLY recommended that a full dump of your database (using pg_dumpall) is
-performed BEFORE upgrading the RPMs! If you have already done the upgrade
-with the RPM, and want to return to your previous version to do the dump,
-find the old RPM's and use 'rpm -U --oldpackage' to downgrade.
-
-I cannot overemphasize this precaution.
-
-NOTE: moving your existing data from /var/lib/pgsql to /var/lib/pgsql/data is
-not currently automatic -- you will need to do this yourself at this release!
-This change occurred between 6.5.3 and 7.0, so upgrading from prior to 7.0 to
-7.0 or later might be difficult. The rh-dump script is provided to ease this,
-see below.
-
-The single biggest problem with upgrading PostgreSQL RPM's has been the lack
-of a reasonably automated upgrade process. PostgreSQL has the property of
-the binary on-disk database format changing between major versions (like
-between 6.3 and 6.4). However, a change from 6.5 to 6.5.3 does not change
-the on-disk format.
-
-This property (feature, misfeature, bug, whatever) has been a known property of
-PostgreSQL since before it was called PostgreSQL -- it has always been this
-way. However, the means by which an upgrade is performed is not readily
-performed in a fully automated fashion, as a "dump-initdb-restore" cycle has
-to be performed. This doesn't appear to be too difficult -- however, dumping
-the old database requires the old executables -- and, if you've already done
-an rpm -U postgresql* (or upgraded from an older version of RedHat and didn't
-specifically exclude the postgresql rpms), you no longer have the older
-executables to dump your data. And your data is useless (until you reinstall
-the old version, that is). All RPM's prior to late releases of version 6.5.
-1 have this upgrade issue.
-
-The newest RPM's for PostgreSQL attempt to make your job in upgrading a little
-easier. First, during the installation of the new RPM's, a copy is made of
-all the executable files and libraries necessary to make a backup of your data.
-Second, the initialization script in the new postgresql-server package detects
-the version of any database found -- if the version is old, then the startup
-of the new version is aborted. However, if no database is found, a new one
-is made.
-
-One thing must be remembered -- due to the restructuring of the PostgreSQL
-RPM's, you will have to manually select the postgresql-server package if you
-want the server -- it is not installed by default in an upgrade. You can either
-select it during the upgrade/install, or you can mount your RedHat CD and
-install manually with rpm -i.
-
-To facilitate upgrading, the postgresql-dump utility has been provided. Look
-at the man page for postgresql-dump to see its usage. All executables to
-restore the immediately prior version of the PostgreSQL database are placed in
-the directory /usr/lib/pgsql/backup, and are accessed by the postgresql-dump
-script. The directory /usr/lib/pgsql/backup is owned by the postgres user --
-you can use this directory to hold dump files and preserve directories.
-
-The basic sequence is:
-(as user postgres):
-postgresql-dump -t /var/lib/pgsql/backup/db.bak -p /var/lib/pgsql/backup/old -d
-(you can abort the ASCII dump with 'Q', as it uses more) Then, (as user root):
-
-***** NOTE ***** ***** NOTE *****
-
-The above script is broken. Use "rh-pgdump.sh targetfile" instead, remove the
-old databases (/var/lib/pgsql/base) (or safer - move them somewhere else first),
-start the database and follow the insert procedure described below.
-
-***** NOTE ***** ***** NOTE *****
-
-service postgresql start
-
-(which will automatically create a new database structure) And finally,
-
-(as user postgres):
-psql -e template1 </var/lib/pgsql/backup/db.bak
-
-Once you are satisfied that the data has been restored properly, you may remove
-the dump file (/var/lib/pgsql/backup/db.bak) and the preserve directory
-(/var/lib/pgsql/backup/old).
-
-EXPLANATION OF STEPS:
+MULTIPLE POSTMASTERS
-------------------------------------------------------------------------------
-postgresql-dump: dumps the old database structure out, using the postmaster and
-the backend saved during the rpm upgrade. This step MUST be done as user
-postgres.
-
-/etc/rc.d/init.d/postgresql start: initializes the new database structure that
-the data from your old version will be restored into, does some sanity
-checking, and starts the postmaster. Due to the nature of some of the tasks,
-this step must be done as root.
-
-psql -e: restores the old database into the new structure created by the
-previous step.
-
-NOTE:
--------------------------------------------------------------------------------
-If you have added tables, indices, or basically anything to the template1
-database which is the default administrative database this script will NOT
-upgrade your database. As a matter of fact you will lose your data included
-in the template1 database. Please look at www.postgresql.org for information
-on upgrading the template1 database. This is a known bug in the PostgreSQL
-pg_dump and pg_dumpall utilities.
-
-The above information is considered deprecated. The utilities it mentions
-are also considered deprecated and will be removed from a future release of
-the RPMset due to the difficulty involved with a dump-restore upgrade and the
-hand-editing of dumpfiles that are sometimes necessary.
+The postgresql-server RPM contains an 'initscript' that is used to start the
+postmaster. The current version of this script has logic to be able to start
+multiple postmasters, with different data areas, listening on different ports,
+etc. To use this functionality requires root access.
+
+As an example, let us create a secondary postmaster called, creatively enough,
+'secondary'. Here are the steps:
+1.) create a hard link in /etc/rc.d/init.d (or equivalent location)
+ to postgresql named 'secondary' : ln postgresql secondary Pick
+ a name not already used in /etc/rc.d/init.d!
+2.) create a file in /etc/sysconfig/pgsql named secondary. This file is
+ a shell script -- typically you would define PGDATA, PGPORT, and PGOPTS
+ here. Since $PGDATA/postgresql.conf will override many of these
+ settings, except PGDATA, you might be surprised on startup.
+3.) create the target PGDATA.
+4.) Initdb the targe PGDATA as documented in the main documentation.
+ Automatic initdb may or may not work for you, so a manual one is
+ preferred. This must be done as user 'postgres'
+5.) Edit postgresql.conf to change the port, address, tcpip settings, etc.
+6.) Start the postmaster with 'service secondary start'.
+
+Note that there may be problems with the standard symlink -- consider this
+support experimental at this point in time.
REGRESSION TESTING
-------------------------------------------------------------------------------
@@ -316,10 +227,10 @@ STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
RedHat Linux uses the System V Init package. A startup script for PostgreSQL
is provided in the server package, as /etc/rc.d/init.d/postgresql. To start
the postmaster, with sanity checking, as root, run
-/etc/rc.d/init.d/postgresql start
+service postgresql start
to shut postmaster down,
-/etc/rc.d/init.d/postgresql stop
-There are other parameters to this script -- /etc/rc.d/init.d/postgresql for a
+service postgresql stop
+There are other parameters to this script -- execute 'service postgresql' for a
listing.
To get this script to run at system startup or any time the system switches into
@@ -366,28 +277,22 @@ environment to rebuild the full RPM set.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
-build6x undef #build for RHL 6.x. Define to 1 to build for 6.x,
- # undefined otherwise.
- #currently, this disables the kerberos, nls, and ssl
- # builds, as well as correcting dependencies for 6.x
+build6x undef #don't build for Red Hat 6.x. Define it to cause
+ # other options to be tailored to 6.x.
beta 0 #build with cassert and do not strip the binaries
perl 1 #build the postgresql-perl package.
tcl 1 #build the postgresql-tcl package.
tkpkg 1 #build the postgresql-tk package.
-odbc 1 #build the postgresql-odbc package.
jdbc 1 #build the postgresql-jdbc package.
+pls 1 #build the postgresql-pl package.
test 1 #build the postgresql-test package.
python 1 #build the postgresql-python package.
-pltcl 1 #build the postgresql-pltcl package.
-forceplperl 0 #don't force a build of pl/perl over libperl.a
-plperl 0 #don't build the postgresql-plperl package.
+pltcl 1 #build the pltcl portion of the postgresql-pl package.
+plperl 1 #build the plperl portion of the postgresql-pl package.
ssl 1 #use OpenSSL support.
kerberos 1 #use Kerberos 5 support.
nls 1 #build with national language support.
-enable_mb 1 #enable multibyte encodings.
-pgaccess 1 #build the pgaccess client, part of postgresql-tk.
-newintarray 0 #substitute a newer intarray contrib.
-pam 1 #build --with-pam
+pam 1 #build with PAM support.
To use these defines, invoke a rebuild like this:
rpm --rebuild --define 'perl 0' --define 'tcl 0' --define 'tkpkg 0'\
@@ -401,9 +306,11 @@ More of these conditionals will be added in the future.
CONTRIB FILES
-------------------------------------------------------------------------------
The contents of the contrib tree are packaged into the -contrib subpackage
-and are compiled and placed into /usr/lib/pgsql/contrib with no further
-processing. Please see each directory under contrib for details on how to
-install and use.
+and are processed with make and make install. There is documentation in
+/usr/share/doc/postgresql-contrib-VERSION for these modules. Most of the
+modules are in /usr/lib/pgsql for loadable modules, and binaries are in
+/usr/bin. In the future these files may be split out, depending upon function
+and dependencies.
LOGGING SET UP
-------------------------------------------------------------------------------
diff --git a/filter-requires-perl-Pg.sh b/filter-requires-perl-Pg.sh
new file mode 100755
index 0000000..f37557f
--- /dev/null
+++ b/filter-requires-perl-Pg.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/lib/rpm/perl.req $* | grep -v 'perl(Pg'
diff --git a/postgresql.init b/postgresql.init
index 60ecb54..f8b3954 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -17,7 +17,7 @@
# Changed PGDATA.
#
-# Version 7.0.2 Trond Eivind Glomsrd <teg(a)redhat.com>
+# Version 7.0.2 Trond Eivind Glomsrd <teg(a)redhat.com>
# use functions, add conditional restart
# Version 7.0.3 Lamar Owen <lamar(a)postgresql.org>
@@ -28,7 +28,7 @@
# Version 7.1 Release Candidate Lamar Owen <lamar(a)postgresql.org>
# initdb parameters have changed.
-# Version 7.1.2 Trond Eivind Glomsrd <teg(a)redhat.com>
+# Version 7.1.2 Trond Eivind Glomsrd <teg(a)redhat.com>
# Specify shell for su
# Handle stop better - kill unwanted output, make it wait until the database is ready
# Handle locales slightly differently - always using "C" isn't a valid option
@@ -48,8 +48,11 @@
# Tested the $? return for the stop script -- it does in fact propagate.
# TODO: multiple postmasters.
-# PGVERSION is: (note that PGVERSION is the major: 7.2.1 -> PGVERSION 7.2)
-PGVERSION=7.2
+# VErsion 7.3 Lamar OWen <lamar.owen(a)ramifordistat.net>
+# Multiple postmasters, courtesy Karl DeBisschop
+
+# PGVERSION is:
+PGVERSION=7.3
# Source function library.
INITD=/etc/rc.d/init.d
@@ -61,30 +64,40 @@ TYPESET=`typeset -f|grep "declare"`
# Get config.
. /etc/sysconfig/network
+# Find the name of the script
+NAME=`basename $0`
+
+# Set defaults for port and database directory
+PGPORT=5432
+export PGDATA=/var/lib/pgsql
+if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base/template1 ]
+then
+ echo "Using old-style directory structure"
+else
+ export PGDATA=/var/lib/pgsql/data
+fi
+
+# Override defaults from /etc/sysconfig/pgsql if file is present
+[ -f /etc/sysconfig/pgsql/${NAME} ] && . /etc/sysconfig/pgsql/${NAME}
+export PGDATA
+export PGPORT
+export PGOPTS
+
# Check that networking is up.
# Pretty much need it for postmaster.
[ "${NETWORKING}" = "no" ] && exit 0
[ -f /usr/bin/postmaster ] || exit 0
-
start(){
- PSQL_START=$"Starting postgresql service: "
-
- # Check for older PGDATA location.
- if [ -f /var/lib/pgsql/PG_VERSION ] && [ -d /var/lib/pgsql/base/template1 ]
- then
- export PGDATA=/var/lib/pgsql
- else
- export PGDATA=/var/lib/pgsql/data
- fi
+ PSQL_START=$"Starting ${NAME} service: "
# Check for the PGDATA structure
if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base ]
then
# Check version of existing PGDATA
- if [ `cat $PGDATA/PG_VERSION` != '7.2' ]
+ if [ `cat $PGDATA/PG_VERSION` != '7.3' ]
then
SYSDOCDIR="(Your System's documentation directory)"
if [ -d /usr/doc/postgresql-$PGVERSION ]
@@ -125,6 +138,7 @@ start(){
then
mkdir -p $PGDATA
chown postgres.postgres $PGDATA
+ chmod go-rwx $PGDATA
fi
# Make sure the locale from the initdb is preserved for later startups...
[ -f /etc/sysconfig/i18n ] && cp /etc/sysconfig/i18n $PGDATA/../initdb.i18n
@@ -133,29 +147,31 @@ start(){
# Is expanded this early to be used in the command su runs
echo "export LANG LC_ALL LC_CTYPE LC_COLLATE LC_NUMERIC LC_CTYPE LC_TIME" >> $PGDATA/../initdb.i18n
# Initialize the database
- su -l postgres -s /bin/sh -c "/usr/bin/initdb --pgdata=/var/lib/pgsql/data > /dev/null 2>&1" < /dev/null
+ su -l postgres -s /bin/sh -c "/usr/bin/initdb --pgdata=$PGDATA > /dev/null 2>&1" < /dev/null
[ -f $PGDATA/PG_VERSION ] && echo_success
[ ! -f $PGDATA/PG_VERSION ] && echo_failure
echo
fi
# Check for postmaster already running...
- pid=`pidof -s postmaster`
- if [ $pid ]
+ # note that pg_ctl only looks at the data structures in PGDATA
+ # you really do need the pidof()
+ pid=`pidof -s /usr/bin/postmaster`
+ if [ $pid ] && /usr/bin/pg_ctl status -D $PGDATA > /dev/null 2>&1
then
echo $"Postmaster already running."
else
#all systems go -- remove any stale lock files
- rm -f /tmp/.s.PGSQL.* > /dev/null
+ rm -f /tmp/.s.PGSQL.${PGPORT} > /dev/null
echo -n "$PSQL_START"
- su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl -D $PGDATA -p /usr/bin/postmaster start > /dev/null 2>&1" < /dev/null
+ su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl -D $PGDATA -p /usr/bin/postmaster -o '-p ${PGPORT}' start > /dev/null 2>&1" < /dev/null
sleep 1
- pid=`pidof -s postmaster`
+ pid=`pidof -s /usr/bin/postmaster`
if [ $pid ]
then
success "$PSQL_START"
- touch /var/lock/subsys/postgresql
- echo $pid > /var/run/postmaster.pid
+ touch /var/lock/subsys/${NAME}
+ echo $pid > /var/run/postmaster.${PGPORT}.pid
echo
else
failure "$PSQL_START"
@@ -165,24 +181,18 @@ start(){
}
stop(){
- echo -n $"Stopping postgresql service: "
- # Check for older PGDATA location.
- if [ -f /var/lib/pgsql/PG_VERSION ] && [ -d /var/lib/pgsql/base/template1 ]
+ echo -n $"Stopping ${NAME} service: "
+ su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1
+ ret=$?
+ if [ $ret -eq 0 ]
then
- export PGDATA=/var/lib/pgsql
+ echo_success
else
- export PGDATA=/var/lib/pgsql/data
+ echo_failure
fi
- su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1
- ret=$?
- if [ $ret -eq 0 ]; then
- echo_success
- else
- echo_failure
- fi
echo
- rm -f /var/run/postmaster.pid
- rm -f /var/lock/subsys/postgresql
+ rm -f /var/run/postmaster.${PGPORT}.pid
+ rm -f /var/lock/subsys/${NAME}
}
restart(){
@@ -191,7 +201,7 @@ restart(){
}
condrestart(){
- [ -e /var/lock/subsys/postgresql ] && restart || :
+ [ -e /var/lock/subsys/${NAME} ] && restart
}
reload(){
diff --git a/postgresql.spec b/postgresql.spec
index 48ee43c..43057ee 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -9,26 +9,20 @@
%define beta 0
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
-%{!?perl:%define perl 1}
+
%{!?tcl:%define tcl 1}
-%{!?tkpkg:%define tkpkg 1}
-%{!?odbc:%define odbc 1}
+%{!?tkpkg:%define tkpkg 0}
%{!?jdbc:%define jdbc 1}
%{!?test:%define test 1}
%{!?python:%define python 1}
%{!?pltcl:%define pltcl 1}
-%{?forceplperl:%define plperl %{expand:forceplperl}}
-%{!?forceplperl:%define forceplperl 0}
-%{!?plperl:%define plperl 0}
+%{!?plperl:%define plperl 1}
+%{!?pls:%define pls 1}
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
%{!?pam:%define pam 1}
-# Utility feature defines.
-%{!?enable_mb:%define enable_mb 1}
-%{!?pgaccess:%define pgaccess 1}
-
# Python major version.
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')}
@@ -36,7 +30,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.2.4
+Version: 7.3.2
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -58,34 +52,27 @@ Version: 7.2.4
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 5.80
+Release: 3
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
-Source2: redhat-style-files.lst
Source3: postgresql.init
-Source4: suse-style-files.lst
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
-Source7: migration-scripts.tar.gz
-Source8: http://jdbc.postgresql.org/download/jdbc7.2dev-1.1.jar
-Source9: http://jdbc.postgresql.org/download/jdbc7.2dev-1.2.jar
-Source10: http://jdbc.postgresql.org/download/jdbc7.1-1.1.jar
-Source11: http://jdbc.postgresql.org/download/jdbc7.1-1.2.jar
-Source12: postgresql-dump.1.gz
-Source14: rh-pgdump.sh
+Source8: http://jdbc.postgresql.org/download/pg73b1jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg73b1jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg73b1jdbc3.jar
Source15: postgresql-bashprofile
+Source16: filter-requires-perl-Pg.sh
Patch1: rpm-pgsql-%{version}.patch
-Patch2: postgresql-%{version}-security.patch
+Patch2: rpm-multilib-%{version}.patch
Patch3: postgresql-%{version}-tighten.patch
-Buildrequires: perl glibc-devel
+Patch4: postgresql-7.3.1-isblank.patch
+Buildrequires: perl glibc-devel bison flex
Prereq: /sbin/ldconfig initscripts
%if %python
BuildPrereq: python-devel
%endif
-%if %perl
-BuildPrereq: perl
-%endif
%if %tcl
BuildPrereq: tcl
%endif
@@ -113,33 +100,6 @@ BuildPrereq: pam-devel
Url: http://www.postgresql.org/
Obsoletes: postgresql-clients
Buildroot: %{_tmppath}/%{name}-%{version}-root
-# Obsolete the packages we are not building...
-%if ! %{plperl}
-Obsoletes: postgresql-plperl
-%endif
-%if ! %{tcl}
-Obsoletes: postgresql-tcl
-%endif
-%if ! %{tkpkg}
-Obsoletes: postgresql-tk
-%endif
-%if ! %{odbc}
-Obsoletes: postgresql-odbc
-%endif
-%if ! %{perl}
-Obsoletes: postgresql-perl
-%endif
-%if ! %{python}
-Obsoletes: postgresql-python
-%endif
-%if ! %{jdbc}
-Obsoletes: postgresql-jdbc
-%endif
-%if ! %{test}
-Obsoletes: postgresql-test
-%endif
-
-
# This is the PostgreSQL Global Development Group Official RPMset spec file,
# or a derivative thereof.
@@ -149,11 +109,12 @@ Obsoletes: postgresql-test
# Major Contributors:
# ---------------
# Lamar Owen
-# Trond Eivind Glomsrd <teg(a)redhat.com>
+# Trond Eivind Glomsrd <teg(a)redhat.com>
# Thomas Lockhart
# Reinhard Max
# Karl DeBisschop
# Peter Eisentraut
+# Joe Conway
# and others in the Changelog....
# This spec file and ancilliary files are licensed in accordance with
@@ -200,7 +161,7 @@ Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
Requires: postgresql = %{version} libpq.so
-Conflicts: postgresql-server <= 7.1.3
+Conflicts: postgresql < 7.3
%description server
The postgresql-server package includes the programs needed to create
@@ -226,7 +187,7 @@ project, or if you want to generate printed documentation.
%package contrib
Summary: Contributed source and binaries distributed with PostgreSQL
Group: Applications/Databases
-Requires: postgresql = %{version} postgresql-perl postgresql-tcl tk
+Requires: postgresql = %{version}
%description contrib
The postgresql-contrib package contains contributed packages that are
included in the PostgreSQL distribution.
@@ -247,69 +208,30 @@ you're installing postgresql-server, you need to install this
package.
#------------
-%if %plperl
-%package plperl
-Summary: The PL/Perl procedural language for PostgreSQL.
+%if %pls
+%package pl
+Summary: The PL procedural languages for PostgreSQL.
Group: Applications/Databases
-Requires: perl, postgresql = %{version}
+Requires: postgresql = %{version}
+PreReq: postgresql-server = %{version}
-%description plperl
+%description pl
PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-plperl package contains the the PL/Perl
-procedural language for the backend.
+system. The postgresql-pl package contains the the PL/Perl, PL/Tcl, and PL/Python
+procedural languages for the backend. PL/Pgsql is part of the core server package.
%endif
#------------
%if %tcl
%package tcl
-Summary: A Tcl client library, and the PL/Tcl procedural language for PostgreSQL.
+Summary: A Tcl client library for PostgreSQL.
Group: Applications/Databases
Requires: tcl >= 8.0
%description tcl
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-tcl package contains the libpgtcl client library,
-the pg-enhanced pgtclsh, and the PL/Tcl procedural language for the backend.
-%endif
-
-#------------
-%if %tkpkg
-%package tk
-Summary: Tk shell and tk-based GUI for PostgreSQL.
-Group: Applications/Databases
-Requires: tcl >= 8.0, tk >= 8.0
-
-%description tk
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-tk package contains the pgaccess
-program. Pgaccess is a graphical front end, written in Tcl/Tk, for the
-psql and related PostgreSQL client programs.
-%endif
-
-#------------
-%if %odbc
-%package odbc
-Summary: The ODBC driver needed for accessing a PostgreSQL DB using ODBC.
-Group: Applications/Databases
-
-%description odbc
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-odbc package includes the ODBC (Open DataBase
-Connectivity) driver and sample configuration files needed for
-applications to access a PostgreSQL database using ODBC.
-%endif
-
-#------------
-%if %perl
-%package perl
-Summary: Development module needed for Perl code to access a PostgreSQL DB.
-Group: Applications/Databases
-Requires: perl >= 5.004-4
-
-%description perl
-PostgreSQL is an advanced Object-Relational database management
-system. The postgresql-perl package includes a module for developers
-to use when writing Perl code for accessing a PostgreSQL database.
+the pg-enhanced pgtclsh,and the pg-enhanced tksh, if so configured at buildtime.
%endif
#------------
@@ -346,6 +268,7 @@ Java programs to access a PostgreSQL database.
Summary: The test suite distributed with PostgreSQL.
Group: Applications/Databases
Requires: postgresql = %{version}
+PreReq: postgresql-server = %{version}
%description test
PostgreSQL is an advanced Object-Relational database management
@@ -354,50 +277,43 @@ binaries of various tests for the PostgreSQL database management
system, including regression tests and benchmarks.
%endif
+%define __perl_requires %{SOURCE16}
+
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
-
+%patch4 -p1
+autoconf
%build
-# Get file lists....
-#tar xzf %{SOURCE4}
-# Moved out of tarball.
-cp %{SOURCE2} %{SOURCE4} .
-
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-
-./configure --enable-locale --with-CXX --prefix=/usr --disable-rpath\
+export LIBNAME=%{_lib}
+%configure --disable-rpath \
%if %beta
--enable-debug \
--enable-cassert \
%endif
-%if %perl
+%if %plperl
--with-perl \
%endif
-%if %enable_mb
- --enable-multibyte \
-%endif
%if %tcl
--with-tcl \
+ --with-tclconfig=%{_libdir} \
%endif
%if %tkpkg
+ --with-tkconfig=%{_libdir} \
%else
--without-tk \
%endif
-%if %odbc
- --with-odbc \
-%endif
- --enable-syslog\
%if %python
--with-python \
%endif
@@ -413,11 +329,9 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
%if %nls
--enable-nls \
%endif
- --sysconfdir=/etc/pgsql \
- --mandir=%{_mandir} \
- --docdir=%{_docdir} \
- --includedir=%{_includedir} \
- --datadir=/usr/share/pgsql
+ --sysconfdir=/etc/sysconfig/pgsql \
+ --datadir=/usr/share/pgsql \
+ --with-docdir=%{_docdir}
make all
make -C contrib all
@@ -434,47 +348,6 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make -C contrib DESTDIR=$RPM_BUILD_ROOT install
-%if %perl
- make DESTDIR=$RPM_BUILD_ROOT -C src/interfaces/perl5 -f Makefile install
-
- # Get rid of the packing list generated by the perl Makefile, and build my own...
- find $RPM_BUILD_ROOT/usr/lib/perl5 -name .packlist -exec rm -f {} \;
- find $RPM_BUILD_ROOT/usr/lib/perl5 -type f -print | \
- sed -e "s|$RPM_BUILD_ROOT/|/|g" | \
- sed -e "s|.*/man/.*|&\*|" > perlfiles.list
- find $RPM_BUILD_ROOT/usr/lib/perl5 -type d -name Pg -print | \
- sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
-
- # check and fixup Pg manpage location....
- if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ]
- then
- mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
- cp src/interfaces/perl5/blib/man3/Pg.3pm $RPM_BUILD_ROOT%{_mandir}/man3
- fi
-
- pushd src/interfaces
- mkdir -p $RPM_BUILD_ROOT/usr/share/pgsql/perl5
- cp -a perl5/test.pl $RPM_BUILD_ROOT/usr/share/pgsql/perl5
- popd
- # remove perllocal.pod and Pg.bs from the file list - only occurs with 5.6
-
- perl -pi -e "s/^.*perllocal.pod$//" perlfiles.list
- perl -pi -e "s/^.*Pg.bs$//" perlfiles.list
- mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{_arch}-linux/auto/Pg
-
-%endif
-
-
-# man pages....
-# the postgresql-dump manpage.....
-pushd $RPM_BUILD_ROOT%{_mandir}
-cp %{SOURCE12} man1
-popd
-
-# install the dump script
-
-install -m755 %SOURCE14 $RPM_BUILD_ROOT/usr/bin/
-
# install dev headers.
make DESTDIR=$RPM_BUILD_ROOT install-all-headers
@@ -482,18 +355,6 @@ make DESTDIR=$RPM_BUILD_ROOT install-all-headers
# copy over Makefile.global to the include dir....
install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
-%if %pgaccess
- # pgaccess installation
- pushd src/bin
- install -m 755 pgaccess/pgaccess $RPM_BUILD_ROOT/usr/bin
- mkdir -p $RPM_BUILD_ROOT/usr/share/pgsql/pgaccess
- install -m 644 pgaccess/main.tcl $RPM_BUILD_ROOT/usr/share/pgsql/pgaccess
- tar cf - pgaccess/lib pgaccess/images | tar xf - -C $RPM_BUILD_ROOT/usr/share/pgsql
- cp -a pgaccess/doc/html ../../doc/pgaccess
- cp pgaccess/demo/*.sql ../../doc/pgaccess
- popd
-%endif
-
%if %jdbc
# Java/JDBC
# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
@@ -502,26 +363,13 @@ install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/pgsql
install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/pgsql
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/pgsql
- install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/pgsql
%endif
-# The initscripts....
-# Redhat-style....
if [ -d /etc/rc.d/init.d ]
then
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
- mv redhat-style-files.lst files.lst
-fi
-
-# SuSE-style....
-# NOTE: SuSE stuff not yet fully implemented -- this is likely to not work yet.
-# Putting SuSE-style stuff here
-if [ -d /sbin/init.d ]
-then
- # install the SuSE stuff...
- mv suse-style-files.lst files.lst
fi
@@ -534,6 +382,10 @@ install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
# postgres' .bash_profile
install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
+# Create the multiple postmaster startup directory
+install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
+
+
%if %test
# tests. There are many files included here that are unnecessary, but include
# them anyway for completeness.
@@ -546,22 +398,17 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
popd
%endif
-# Upgrade scripts.
-pushd $RPM_BUILD_ROOT
-tar xzf %{SOURCE7}
-popd
-
-# logrotate script removed until future release
-#logrotate script source (which needs WORK)
-#mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-#cp %{SOURCE8} $RPM_BUILD_ROOT/etc/logrotate.d/postgres
-#chmod 0644 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
-
# Fix some more documentation
# gzip doc/internals.ps
cp %{SOURCE6} README.rpm-dist
mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql
+%if %tkpkg
+%else
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
+%endif
+
# Symlink libpq.so.2.0 to libpq.so.2 for backwards compatibility, until
# -soname patches are the norm.
pushd $RPM_BUILD_ROOT/usr/lib
@@ -573,25 +420,12 @@ popd
%find_lang pg_dump
%find_lang postgres
%find_lang psql
+%find_lang pg_resetxlog
+%find_lang pg_controldata
+cat libpq.lang > libpq.lst
cat psql.lang pg_dump.lang > main.lst
-cat postgres.lang files.lst > server.lst
-
-%pre
-# Need to make backups of some executables if an upgrade
-# They will be needed to do a dump of the old version's database.
-# All output redirected to /dev/null.
-
-if [ $1 -gt 1 ]
-then
- mkdir -p /usr/lib/pgsql/backup > /dev/null
- pushd /usr/bin > /dev/null
- cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/share/pgsql/backup > /dev/null 2>&1 || :
- popd > /dev/null
- pushd /usr/lib > /dev/null
- cp -fp libpq.* /usr/share/pgsql/backup > /dev/null 2>&1 || :
- popd > /dev/null
-fi
+cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -624,19 +458,14 @@ if [ $1 = 0 ] ; then
groupdel postgres >/dev/null 2>&1 || :
fi
-%if %odbc
-%post -p /sbin/ldconfig odbc
-%postun -p /sbin/ldconfig odbc
-%endif
-
%if %tcl
%post -p /sbin/ldconfig tcl
%postun -p /sbin/ldconfig tcl
%endif
-%if %plperl
-%post -p /sbin/ldconfig plperl
-%postun -p /sbin/ldconfig plperl
+%if %pls
+%post -p /sbin/ldconfig pl
+%postun -p /sbin/ldconfig pl
%endif
%if %test
@@ -646,13 +475,8 @@ chown -R postgres.postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
%clean
rm -rf $RPM_BUILD_ROOT
-rm -f perlfiles.list
-
-# Ok, we are dynamically generating some filelists. These are by default
-# under the BUILD/postgresql-x.y.z tree.
-# Note that macros such as config are available in those lists.
-# The lists differentiate between RedHat, SuSE, and others.
+# FILES section.
%files -f main.lst
%defattr(-,root,root)
@@ -660,29 +484,32 @@ rm -f perlfiles.list
%doc COPYRIGHT README HISTORY doc/bug.template
%doc README.rpm-dist
%doc doc/html
-/usr/bin/createdb
-/usr/bin/createlang
-/usr/bin/createuser
-/usr/bin/dropdb
-/usr/bin/droplang
-/usr/bin/dropuser
-/usr/bin/pg_dump
-/usr/bin/pg_dumpall
-/usr/bin/pg_encoding
-/usr/bin/pg_id
-/usr/bin/pg_restore
-/usr/bin/psql
-/usr/bin/vacuumdb
-%{_mandir}/man1/createdb.1*
-%{_mandir}/man1/createlang.1*
-%{_mandir}/man1/createuser.1*
-%{_mandir}/man1/dropdb.1*
-%{_mandir}/man1/droplang.1*
-%{_mandir}/man1/dropuser.1*
-%{_mandir}/man1/pg_dump.1*
-%{_mandir}/man1/pg_dumpall.1*
-%{_mandir}/man1/psql.1*
-%{_mandir}/man1/vacuumdb.1*
+%{_bindir}/clusterdb
+%{_bindir}/createdb
+%{_bindir}/createlang
+%{_bindir}/createuser
+%{_bindir}/dropdb
+%{_bindir}/droplang
+%{_bindir}/dropuser
+%{_bindir}/pg_dump
+%{_bindir}/pg_dumpall
+%{_bindir}/pg_encoding
+%{_bindir}/pg_id
+%{_bindir}/pg_restore
+%{_bindir}/psql
+%{_bindir}/vacuumdb
+%{_mandir}/man1/clusterdb.*
+%{_mandir}/man1/createdb.*
+%{_mandir}/man1/createlang.*
+%{_mandir}/man1/createuser.*
+%{_mandir}/man1/dropdb.*
+%{_mandir}/man1/droplang.*
+%{_mandir}/man1/dropuser.*
+%{_mandir}/man1/pg_dump.*
+%{_mandir}/man1/pg_dumpall.*
+%{_mandir}/man1/pg_restore.*
+%{_mandir}/man1/psql.*
+%{_mandir}/man1/vacuumdb.*
%{_mandir}/man7/*
%files docs
@@ -691,188 +518,158 @@ rm -f perlfiles.list
%files contrib
%defattr(-,root,root)
-/usr/lib/pgsql/_int.so
-/usr/lib/pgsql/array_iterator.so
-/usr/lib/pgsql/autoinc.so
-/usr/lib/pgsql/btree_gist.so
-/usr/lib/pgsql/chkpass.so
-/usr/lib/pgsql/cube.so
-/usr/lib/pgsql/dblink.so
-/usr/lib/pgsql/earthdistance.so
-/usr/lib/pgsql/fti.so
-/usr/lib/pgsql/fuzzystrmatch.so
-/usr/lib/pgsql/insert_username.so
-/usr/lib/pgsql/isbn_issn.so
-/usr/lib/pgsql/lo.so
-/usr/lib/pgsql/misc_utils.so
-/usr/lib/pgsql/moddatetime.so
-/usr/lib/pgsql/noup.so
-/usr/lib/pgsql/pgcrypto.so
-/usr/lib/pgsql/pgstattuple.so
-/usr/lib/pgsql/refint.so
-/usr/lib/pgsql/rserv.so
-/usr/lib/pgsql/rtree_gist.so
-/usr/lib/pgsql/seg.so
-/usr/lib/pgsql/string_io.so
-/usr/lib/pgsql/timetravel.so
-/usr/lib/pgsql/tsearch.so
-/usr/lib/pgsql/user_locks.so
-/usr/share/pgsql/contrib/
-/usr/bin/dbf2pg
-/usr/bin/findoidjoins
-/usr/bin/make_oidjoins_check
-/usr/bin/fti.pl
-/usr/bin/oid2name
-/usr/bin/pg_controldata
-/usr/bin/pg_dumplo
-/usr/bin/pg_logger
-/usr/bin/pg_resetxlog
-/usr/bin/pgbench
-/usr/bin/RservTest
-/usr/bin/MasterInit
-/usr/bin/MasterAddTable
-/usr/bin/Replicate
-/usr/bin/MasterSync
-/usr/bin/CleanLog
-/usr/bin/SlaveInit
-/usr/bin/SlaveAddTable
-/usr/bin/GetSyncID
-/usr/bin/PrepareSnapshot
-/usr/bin/ApplySnapshot
-/usr/bin/InitRservTest
-/usr/bin/vacuumlo
-%doc %{_docdir}/postgresql/contrib/README.*
-%doc %{_docdir}/postgresql/contrib/*.example
+%{_libdir}/pgsql/_int.so
+%{_libdir}/pgsql/array_iterator.so
+%{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/btree_gist.so
+%{_libdir}/pgsql/chkpass.so
+%{_libdir}/pgsql/cube.so
+%{_libdir}/pgsql/dblink.so
+%{_libdir}/pgsql/dbsize.so
+%{_libdir}/pgsql/earthdistance.so
+%{_libdir}/pgsql/fti.so
+%{_libdir}/pgsql/fuzzystrmatch.so
+%{_libdir}/pgsql/insert_username.so
+%{_libdir}/pgsql/int_aggregate.so
+%{_libdir}/pgsql/isbn_issn.so
+%{_libdir}/pgsql/lo.so
+%{_libdir}/pgsql/ltree.so
+%{_libdir}/pgsql/misc_utils.so
+%{_libdir}/pgsql/moddatetime.so
+%{_libdir}/pgsql/noup.so
+%{_libdir}/pgsql/pending.so
+%{_libdir}/pgsql/pgcrypto.so
+%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/refint.so
+%{_libdir}/pgsql/rserv.so
+%{_libdir}/pgsql/rtree_gist.so
+%{_libdir}/pgsql/seg.so
+%{_libdir}/pgsql/string_io.so
+%{_libdir}/pgsql/tablefunc.so
+%{_libdir}/pgsql/timetravel.so
+%{_libdir}/pgsql/tsearch.so
+%{_libdir}/pgsql/user_locks.so
+%{_datadir}/pgsql/contrib/
+%{_bindir}/dbf2pg
+%{_bindir}/findoidjoins
+%{_bindir}/make_oidjoins_check
+%{_bindir}/fti.pl
+%{_bindir}/oid2name
+%{_bindir}/pg_dumplo
+%{_bindir}/pg_logger
+%{_bindir}/pgbench
+%{_bindir}/RservTest
+%{_bindir}/MasterInit
+%{_bindir}/MasterAddTable
+%{_bindir}/Replicate
+%{_bindir}/MasterSync
+%{_bindir}/CleanLog
+%{_bindir}/SlaveInit
+%{_bindir}/SlaveAddTable
+%{_bindir}/GetSyncID
+%{_bindir}/PrepareSnapshot
+%{_bindir}/ApplySnapshot
+%{_bindir}/InitRservTest
+%{_bindir}/vacuumlo
+%doc contrib/*/README.* contrib/spi/*.example
%files libs -f libpq.lang
%defattr(-,root,root)
-/usr/lib/libpq.so.*
-/usr/lib/libecpg.so.*
-/usr/lib/libpq++.so.*
-/usr/lib/libpgeasy.so.*
+%{_libdir}/libpq.so.*
+%{_libdir}/libecpg.so.*
%files server -f server.lst
%defattr(-,root,root)
-/usr/bin/initdb
-/usr/bin/initlocation
-/usr/bin/ipcclean
-/usr/bin/pg_ctl
-/usr/bin/pg_passwd
-/usr/bin/postgres
-/usr/bin/postgresql-dump
-/usr/bin/postmaster
-/usr/bin/rh-pgdump.sh
-%{_mandir}/man1/initdb.1*
-%{_mandir}/man1/initlocation.1*
-%{_mandir}/man1/ipcclean.1*
-%{_mandir}/man1/pg_ctl.1*
-%{_mandir}/man1/pg_passwd.1*
-%{_mandir}/man1/pg_restore.1*
-%{_mandir}/man1/postgres.1*
-%{_mandir}/man1/postmaster.1*
-%{_mandir}/man1/postgresql-dump.1*
-/usr/share/pgsql/postgres.bki
-/usr/share/pgsql/postgres.description
-/usr/share/pgsql/*.sample
-/usr/lib/pgsql/plpgsql.so
-%dir /usr/lib/pgsql
-%dir /usr/share/pgsql
-%attr(700,postgres,postgres) %dir /usr/share/pgsql/backup
-/usr/share/pgsql/backup/pg_dumpall_new
+/etc/rc.d/init.d/postgresql
+%dir /etc/sysconfig/pgsql
+%{_bindir}/initdb
+%{_bindir}/initlocation
+%{_bindir}/ipcclean
+%{_bindir}/pg_controldata
+%{_bindir}/pg_ctl
+%{_bindir}/pg_resetxlog
+%{_bindir}/postgres
+%{_bindir}/postmaster
+%{_mandir}/man1/initdb.*
+%{_mandir}/man1/initlocation.*
+%{_mandir}/man1/ipcclean.*
+%{_mandir}/man1/pg_controldata.*
+%{_mandir}/man1/pg_ctl.*
+%{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/postgres.*
+%{_mandir}/man1/postmaster.*
+%{_datadir}/pgsql/postgres.bki
+%{_datadir}/pgsql/postgres.description
+%{_datadir}/pgsql/*.sample
+%{_libdir}/pgsql/plpgsql.so
+%dir %{_libdir}/pgsql
+%dir %{_datadir}/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
+%{_libdir}/pgsql/*_and_*.so
+%{_datadir}/pgsql/conversion_create.sql
%files devel
%defattr(-,root,root)
/usr/include/*
-/usr/bin/ecpg
-/usr/bin/pg_config
-/usr/lib/libpq.so
-/usr/lib/libecpg.so
-/usr/lib/libpq++.so
-/usr/lib/libpgeasy.so
-/usr/lib/libpq.a
-/usr/lib/libecpg.a
-/usr/lib/libpq++.a
-/usr/lib/libpgeasy.a
-%if %odbc
-/usr/lib/libpsqlodbc.a
-%endif
+%{_bindir}/ecpg
+%{_bindir}/pg_config
+%{_libdir}/libpq.so
+%{_libdir}/libecpg.so
+%{_libdir}/libpq.a
+%{_libdir}/libecpg.a
%if %tcl
-/usr/lib/libpgtcl.a
+%{_libdir}/libpgtcl.a
%endif
-%{_mandir}/man1/ecpg.1*
-%{_mandir}/man1/pg_config.1*
+%{_mandir}/man1/ecpg.*
+%{_mandir}/man1/pg_config.*
%if %tcl
%files tcl
%defattr(-,root,root)
-%attr(755,root,root) /usr/lib/libpgtcl.so.*
+%attr(755,root,root) %{_libdir}/libpgtcl.so.*
# libpgtcl.so is not in devel because Tcl scripts may load it by that name.
-/usr/lib/libpgtcl.so
-/usr/bin/pgtclsh
-%{_mandir}/man1/pgtclsh.1*
-/usr/lib/pgsql/pltcl.so
-/usr/bin/pltcl_delmod
-/usr/bin/pltcl_listmod
-/usr/bin/pltcl_loadmod
-/usr/share/pgsql/unknown.pltcl
-%endif
-
+%{_libdir}/libpgtcl.so
+%{_bindir}/pgtclsh
+%{_mandir}/man1/pgtclsh.*
%if %tkpkg
-%files tk
-%defattr(-,root,root)
-/usr/bin/pgtksh
-%{_mandir}/man1/pgtksh.1*
+%{_bindir}/pgtksh
+%{_mandir}/man1/pgtksh.*
%endif
-
-%if %pgaccess
-%doc doc/pgaccess/*
-/usr/share/pgsql/pgaccess
-/usr/bin/pgaccess
-%{_mandir}/man1/pgaccess.1*
%endif
-%if %odbc
-%files odbc
+%if %pls
+%files pl
%defattr(-,root,root)
-%attr(755,root,root) /usr/lib/libpsqlodbc.so*
-/usr/share/pgsql/odbc.sql
-/usr/share/pgsql/odbc-drop.sql
+%if %plperl
+%{_libdir}/pgsql/plperl.so
%endif
-
-%if %perl
-%files -f perlfiles.list perl
-%defattr (-,root,root)
-%dir /usr/lib/perl5/site_perl/%{_arch}-linux/auto
-/usr/share/pgsql/perl5
-%{_mandir}/man3/Pg.*
+%if %pltcl
+%{_libdir}/pgsql/pltcl.so
+%{_bindir}/pltcl_delmod
+%{_bindir}/pltcl_listmod
+%{_bindir}/pltcl_loadmod
+%{_datadir}/pgsql/unknown.pltcl
%endif
-
-%if %plperl
-%files plperl
-%defattr(-,root,root)
-/usr/lib/pgsql/plperl.so
+%{_libdir}/pgsql/plpython.so
%endif
%if %python
%files python
%defattr(-,root,root)
%doc src/interfaces/python/README src/interfaces/python/tutorial
-/usr/lib/python%{pyver}/site-packages/_pgmodule.so
-/usr/lib/python%{pyver}/site-packages/*.py
-/usr/lib/pgsql/plpython.so
+%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
+%{_libdir}/python%{pyver}/site-packages/*.py
%endif
%if %jdbc
%files jdbc
%defattr(-,root,root)
-/usr/share/pgsql/jdbc7.1-1.1.jar
-/usr/share/pgsql/jdbc7.1-1.2.jar
-/usr/share/pgsql/jdbc7.2dev-1.1.jar
-/usr/share/pgsql/jdbc7.2dev-1.2.jar
+%{_datadir}/pgsql/pg73b1jdbc1.jar
+%{_datadir}/pgsql/pg73b1jdbc2.jar
+%{_datadir}/pgsql/pg73b1jdbc3.jar
%endif
%if %test
@@ -883,129 +680,73 @@ rm -f perlfiles.list
%endif
%changelog
-* Mon Nov 03 2003 David Jee <djee(a)redhat.com>
-- 7.2.4-4.(73,80) - rename the to_ascii() patch to a generic security
-patch, and add another security patch to it, which avoids running off
-the end of to_timestamp()'s input string when the input is shorter than
-the format string expects.
-- 7.2.4-5.(73,80) - fix the entry above to say to_timestamp(), not
-to_char()
-
-* Fri Oct 31 2003 David Jee <djee(a)redhat.com>
-- 7.2.4-2.(73,80) - merge changes from 7.2.4-2PGDG release: Fixed some
-missing files in devel, python, odbc, tcl, and contrib packages.
-- 7.2.4-3.(73,80) - include a patch for to_ascii() buffer overrun
-vulnerability.
-
-* Tue Oct 28 2003 David Jee <djee(a)redhat.com>
-- 7.2.4-1.(73,80) - initial Red Hat build.
-
-* Wed Dec 20 2002 Andrew Overholt <overholt(a)redhat.com>
-- 7.2.3-4.(73,80) - add buffer overrun patch for geo_ops
-- 7.2.3-5.(73,80) - add pg_hba.conf tightening patch
-
-* Thu Dec 19 2002 Andrew Overholt <overholt(a)redhat.com>
-- 7.2.3-3.(73,80) - correct init script success/failure messages.
-
-* Tue Dec 17 2002 Andrew Overholt <overholt(a)redhat.com>
-- 7.2.3-1 - initial Red Hat build.
-- 7.2.3-2.(73,80) - distribution-specific release tags to avoid upgrading
- issues.
-
-* Wed Oct 02 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- 7.2.3-1PGDG
-
-* Mon Aug 26 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- 7.2.2-1PGDG
-- Applied PeterE's contrib patch -- contrib is now completely restructured.
-- server conflicts with less than 7.2, as a warning to the upcoming
--- yank of the broken partial upgrade.
-
-* Thu Aug 22 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- 7.2.2 security fix.
-- deprecate postgresql-dump system.
-- 7.2.2-0.1PGDG PRERELEASE!
-
-* Fri Apr 12 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- Correct tcl conditionals -- especially for the devel package.
-- Corrected BuildPrereq conditionals.
-- Added a build6x conditional -- define it to build for RHL 6.x
-- Integrate a few of Trond's fixes from RawHide.
-- Pulled file-lists out of tarball for better maintainability.
-- Updated README.rpm-dist.
-- 6.x build can't buildprereq pam-devel, as 6.x has no pam-devel.
-
-* Tue Apr 09 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
-- Integrate DP's patch and stuff.
-
-* Fri Apr 05 2002 David B. Peterson <dave(a)toppledwagon.com>
-- hacked for 7.2.1 (made rpm-pgsql-7.2.1.patch from rpm-pgsql-7.2.patch)
-- changed gettext version to 0.10.35 (from 0.10.36, for RH62)
-- added BuildPrereq for tk
-
-* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-3
-- make postgresql-server and postgresql depend on postgresql-libs
-- store backups of old binaries in /usr/lib/pgsql/backup instead of /usr/share
-
-* Thu Mar 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-6
-- Move the libpgtcl.so symlink into the tcl subpackage from -devel
-- Enable pam support
-- Include the odbc plugin, not just the symlink to it
-
-* Tue Feb 04 2002 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.2 final.
-- 7.2-1PGDG RPM release.
-- Integrate NLS build per Peter E.
-- Clean up a few things; undef beta for final build.
-- Newer JDBC -- point to correct website and 7.2 dev.
-- postgresql.init changes.
-- NLS build does funky %defattr things; redhat-style-files.lst changed
--- for execute permission on /etc/rc.d/init.d/postgresql
-
-* Sun Jan 27 2002 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.2rc2-0.1PGDG
-
-* Thu Nov 29 2001 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.2b3-0.3PGDG
-- beta conditionals for debugging, assertion checking, and no strip.
-
-* Tue Nov 27 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Improve python version handling
-
-* Fri Nov 23 2001 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.2b3-0.2PGDG
-- second beta3 tarball.
-
-* Thu Nov 22 2001 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.2b3-0.1PGDG
-- Beta3
-- Docs changes --man pages back, internals.ps gone.
-- manl (letter 'ell') is now 'man7'.
-
-* Mon Nov 19 2001 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.2b2-0.1PGDG
-- --disable-rpath configure option.
-
-* Fri Oct 26 2001 Lamar Owen <lamar.owen(a)wgcr.org>
-- Actual PGDG 7.2b1.
-
-* Mon Oct 01 2001 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.2alpha-0.1PGDG
-- Merged some changes from Peter Eisentraut for7.2.
-- Cleaned up some legacy junk.
-- Prepare for 7.2 beta cycle.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+* Fri Feb 14 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-3
+- Remove pltcl.so from postgresql-tcl and plpython.so from postgresql-server.
+ [Bugzilla #83906]
+
+* Wed Feb 12 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-2
+- Fix typo in pg_hba.conf tighten patch. [Bugzilla #81366]
+
+* Wed Feb 5 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.2-1
+- Initial 7.3.1 build.
+- Add bison and flex to BuildRequires line. [Bugzilla #83553]
+
+* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
+- rebuilt
+
+* Thu Jan 09 2003 Elliot Lee <sopwith(a)redhat.com> 7.3.1-5
+- Rebuild for newer libssl
+- Add patch4 (isblank.patch) to make it all build
+
+* Sat Jan 4 2003 Jeff Johnson <jbj(a)redhat.com> 7.3.1-4
+- use internal dep generator.
+
+* Fri Jan 3 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.1-3
+- Remove spurious PreReq line
+
+* Fri Jan 3 2003 Andrew Overholt <overholt(a)redhat.com> 7.3.1-2
+- Rebuild with new 7.3.1 tarball
+- Remove obsoletes postgresql-perl line (should have been postgresql-plperl)
+ as we did not have that package previously
+
+* Wed Dec 18 2002 Andrew Overholt <overholt(a)redhat.com> 7.3.1-1
+- Initial 7.3.1 build.
+
+* Tue Dec 17 2002 Nalin Dahyabhai <nalin(a)redhat.com> 7.3-6
+- Make postgresql-pl obsolete postgresql-perl, not postgresql-plperl
+
+* Fri Dec 13 2002 Andrew Overholt <overholt(a)redhat.com>
+- Remove perl(Pg) dependency
+- Bash profile PGDATA fix
+- Updated initscript to new community version
+
+* Tue Dec 10 2002 Andrew Overholt <overholt(a)redhat.com>
+- Upgrade to 7.3 community spec file.
+- Add patch to use with multilib.
+- Change explicit path names to use RPM macros (multilib).
+- Add security patch.
+
+* Thu Dec 05 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- 7.3-2PGDG
+- Fix typo in initscript. Argh!!
+
+* Wed Dec 04 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- 7.3-0.5PGDG
+- Jerk out all perl client stuff and kludgage
+- Rename plperl subpackage to a pl subpackage containing all but PL/Pgsql PL's
+- Eliminate locale and multibyte explicit enables -- they are both defaults now
+- Eliminate pgaccess code; it's not a part of the main tarball anymore
+- Eliminate ODBC stuff -- it's also separate now. Use unixODBC instead.
+- Eliminated separate tk client package -- rolled the tk client into the tcl client.
+- Moved pltcl into the pl subpackage.
+- Added plpython to the pl subpackage.
+- /etc/sysconfig/pgsql is sysconfdir for multiple postmaster startup.
+
+
+* Mon Dec 02 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- 7.3-0.1PGDG (not released)
+- Integrate 7.3 jar's courtesy Joe Conway
+- Integrate multi-postmaster initscript courtesy Karl DeBisschop
+- Some renames and restructures.
+- Stripped out the last dregs of the postgresql-dump migration script.
+- Conflicts with less than 7.3.
diff --git a/sources b/sources
index ed4c8c9..ec98b20 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
-b767f204a91097f1b3a6d2b4c39eac7a postgresql-7.2.4.tar.gz
-3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
+23d2762571e8c5bb21eee08aab968ccb postgresql-7.3.2.tar.gz
commit 7fe3c310105200bc6fb2aa3946e06e8269613e39
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:41:46 2004 +0000
auto-import postgresql-7.2.4-5.80 from postgresql-7.2.4-5.80.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 8ffdcca..5d60585 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
migration-scripts.tar.gz
-postgresql-7.2.3.tar.gz
+postgresql-7.2.4.tar.gz
postgresql-dump.1.gz
diff --git a/postgresql.spec b/postgresql.spec
index 2827aac..48ee43c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -36,7 +36,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.2.3
+Version: 7.2.4
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -76,7 +76,7 @@ Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
Source15: postgresql-bashprofile
Patch1: rpm-pgsql-%{version}.patch
-Patch2: postgresql-%{version}-geo_ops.patch
+Patch2: postgresql-%{version}-security.patch
Patch3: postgresql-%{version}-tighten.patch
Buildrequires: perl glibc-devel
Prereq: /sbin/ldconfig initscripts
@@ -708,12 +708,14 @@ rm -f perlfiles.list
/usr/lib/pgsql/moddatetime.so
/usr/lib/pgsql/noup.so
/usr/lib/pgsql/pgcrypto.so
+/usr/lib/pgsql/pgstattuple.so
/usr/lib/pgsql/refint.so
/usr/lib/pgsql/rserv.so
/usr/lib/pgsql/rtree_gist.so
/usr/lib/pgsql/seg.so
/usr/lib/pgsql/string_io.so
/usr/lib/pgsql/timetravel.so
+/usr/lib/pgsql/tsearch.so
/usr/lib/pgsql/user_locks.so
/usr/share/pgsql/contrib/
/usr/bin/dbf2pg
@@ -739,7 +741,8 @@ rm -f perlfiles.list
/usr/bin/ApplySnapshot
/usr/bin/InitRservTest
/usr/bin/vacuumlo
-%doc contrib/*/README.* contrib/spi/*.example
+%doc %{_docdir}/postgresql/contrib/README.*
+%doc %{_docdir}/postgresql/contrib/*.example
%files libs -f libpq.lang
%defattr(-,root,root)
@@ -764,6 +767,7 @@ rm -f perlfiles.list
%{_mandir}/man1/ipcclean.1*
%{_mandir}/man1/pg_ctl.1*
%{_mandir}/man1/pg_passwd.1*
+%{_mandir}/man1/pg_restore.1*
%{_mandir}/man1/postgres.1*
%{_mandir}/man1/postmaster.1*
%{_mandir}/man1/postgresql-dump.1*
@@ -793,6 +797,9 @@ rm -f perlfiles.list
/usr/lib/libecpg.a
/usr/lib/libpq++.a
/usr/lib/libpgeasy.a
+%if %odbc
+/usr/lib/libpsqlodbc.a
+%endif
%if %tcl
/usr/lib/libpgtcl.a
%endif
@@ -808,6 +815,10 @@ rm -f perlfiles.list
/usr/bin/pgtclsh
%{_mandir}/man1/pgtclsh.1*
/usr/lib/pgsql/pltcl.so
+/usr/bin/pltcl_delmod
+/usr/bin/pltcl_listmod
+/usr/bin/pltcl_loadmod
+/usr/share/pgsql/unknown.pltcl
%endif
%if %tkpkg
@@ -829,6 +840,7 @@ rm -f perlfiles.list
%defattr(-,root,root)
%attr(755,root,root) /usr/lib/libpsqlodbc.so*
/usr/share/pgsql/odbc.sql
+/usr/share/pgsql/odbc-drop.sql
%endif
%if %perl
@@ -851,6 +863,7 @@ rm -f perlfiles.list
%doc src/interfaces/python/README src/interfaces/python/tutorial
/usr/lib/python%{pyver}/site-packages/_pgmodule.so
/usr/lib/python%{pyver}/site-packages/*.py
+/usr/lib/pgsql/plpython.so
%endif
%if %jdbc
@@ -870,6 +883,23 @@ rm -f perlfiles.list
%endif
%changelog
+* Mon Nov 03 2003 David Jee <djee(a)redhat.com>
+- 7.2.4-4.(73,80) - rename the to_ascii() patch to a generic security
+patch, and add another security patch to it, which avoids running off
+the end of to_timestamp()'s input string when the input is shorter than
+the format string expects.
+- 7.2.4-5.(73,80) - fix the entry above to say to_timestamp(), not
+to_char()
+
+* Fri Oct 31 2003 David Jee <djee(a)redhat.com>
+- 7.2.4-2.(73,80) - merge changes from 7.2.4-2PGDG release: Fixed some
+missing files in devel, python, odbc, tcl, and contrib packages.
+- 7.2.4-3.(73,80) - include a patch for to_ascii() buffer overrun
+vulnerability.
+
+* Tue Oct 28 2003 David Jee <djee(a)redhat.com>
+- 7.2.4-1.(73,80) - initial Red Hat build.
+
* Wed Dec 20 2002 Andrew Overholt <overholt(a)redhat.com>
- 7.2.3-4.(73,80) - add buffer overrun patch for geo_ops
- 7.2.3-5.(73,80) - add pg_hba.conf tightening patch
diff --git a/sources b/sources
index 3e6cc6c..ed4c8c9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
-cf665c93a08a60e4a99db3a6dfe7ba10 postgresql-7.2.3.tar.gz
+b767f204a91097f1b3a6d2b4c39eac7a postgresql-7.2.4.tar.gz
3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit 5a04de739604b61c44bedb9d4ed00f6701103b42
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:41:12 2004 +0000
auto-import postgresql-7.2.3-5.80 from postgresql-7.2.3-5.80.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 6d0669d..8ffdcca 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-file-lists.tar.gz
migration-scripts.tar.gz
-postgresql-7.2.2.tar.gz
+postgresql-7.2.3.tar.gz
+postgresql-dump.1.gz
diff --git a/README.rpm-dist b/README.rpm-dist
index 0dc9e58..ecf543f 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,14 +1,18 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 4.0, for the PostgreSQL 7.2-1PGDG RPMset.
+Version 4.1, for the PostgreSQL 7.2.1-2PGDG RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
-----------------------------------------------------------------------------
+
+DISCLAIMER: the following information is provided in the hope that it helps
+people install and use PostgreSQL. It is being provided without warranty of
+any kind, so, use at your own risk.
+-----------------------------------------------------------------------------
Contents:
0.) Quick -i note.
1.) Introduction, QuickStart, and credits
2.) PostgreSQL RPM packages and rationale
- 3.) Upgrading from an older version of PostgreSQL without losing data.
+ 3.) Upgrading. (Deprecated. Will be removed in a future README)
4.) Regression Testing
5.) Starting postmaster automatically on startup
6.) Grand Unified Configuration(GUC) File.
@@ -31,18 +35,21 @@ This document exists to explain the layout of the RPM's for PostgreSQL, to
explain how to migrate from an older version, and to explain WHY it can be
so difficult to upgrade PostgreSQL.
-This document is written to be applicable to version 7.2 of PostgreSQL,
+This document is written to be applicable to version 7.2.1 of PostgreSQL,
which is the current version of the RPM's as of this writing.
-Official PostgreSQL Global Development Group RPM's will from version 7.1.2
-on carry a 'PGDG' after the release number. Other RPMset's as distributed
-with Linux distributions may have a different release number and initials.
+Official PostgreSQL Global Development Group RPM's carry a 'PGDG' after the
+release number. Other RPMset's as distributed with Linux distributions may
+have a different release number and initials.
It is preferable for the distribution-specific set to be the one used, as
the PGDG set is intentionally generic. So, if your distro has a set of RPMs,
use them in preference. If you want to stay up-to-date on the PostgreSQL
core itself, use the PGDG generic set -- but understand that it is a
-GENERIC set.
+GENERIC set. In particular, SuSE and RedHat users that use late-model
+distributions should definitely use their RPMs. Trond and Reinhard do a
+good job keeping them up to date. The Polish(ed) Linux Distribution also
+does an excellent job with the PLD RPM version.
These RPMs are designed to be LSB-compliant -- if you find this not to be the
case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
@@ -80,69 +87,41 @@ Jeff Johnson
Reinhard Max
Peter Eisentraut
+A big THANK YOU to Trond, particularly. He has poured an amazing amount of
+work into this package, particularly in cleaning up my errors, as well as
+getting the contrib package to actually be useful.
+
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
-On RedHat Linux, prior to version 6.5, PostgreSQL was packaged in RPM form in
-three (or four) packages:
-
-postgresql: The server and documentation
-postgresql-clients: The client libraries, the cli, and the tcl interface
-postgresql-devel: Development libraries (for the client-side)
-postgresql-data: A sample database -- not shipped with the 6.4 RPMS.
+[This section has been edited. See prior versions for older history]
-However, it was decided that a different split would be more appropriate for
-users. The 7.0 splitup allows more flexibility in installation, as well as
-making the new clients into their own packages. The new packages are:
+PostgreSQL is a large, multifaceted program, with many clients and options
+that all users will not need. So, several subpackages are built. Here is
+the list of the current (7.2.1) packages:
postgresql: Some clients and libraries, and documentation
postgresql-server: Server executables and data files
postgresql-devel: Client-side development libraries
-postgresql-tcl: TCL/TK client libraries and the pgaccess client
postgresql-perl: PERL client module
postgresql-python: The PygreSQL client library
postgresql-odbc: Linux ODBC client (not required to use ODBC from Win95)
postgresql-jdbc: JAR of the JDBC client
postgresql-test: The regression tests and associated files.
-
-For version 7.0.x, another package is being shipped, and one package has been
-trimmed:
postgresql-tk: Tk client and pgaccess.
postgresql-tcl: Tcl client and PL ONLY.
-
-For version 7.1, more packages are being shipped:
postgresql-libs: client shared libraries.
postgresql-docs: extra documentation,such as the SGML doc sources.
postgresql-contrib: The contrib source tree, as well as selected binaries.
-For SuSE Linux <= 7.0, the packages are named differently, but with the same
-functionality. Here is a mapping:
-SuSE: RedHat:
------ -----------------
-postgres postgresql
-pg_serv postgresql-server
-pg_devel postgresql-devel
-pg_tcl postgresql-tcl
-pg_perl postgresql-perl
-pg_pyth postgresql-python
-pg_odbc postgresql-odbc
-pg_jdbc postgresql-jdbc
-pg_test postgresql-test
-
-There are other changes to the SuSE packages to make them conform to the
-SuSE packaging standards. SuSE Linux has been shipping their own packages.
-
-While the repackaging will initially cause some confusion, it makes it
-possible to set up a RedHat linux machine to be only a client -- the server
-is no longer required. The clients were split out -- after all, a person who
-needs the perl client may very well not need the tcl client, etc. And, the
-regression tests were added to give some confidence of the suitability of
-PostgreSQL, as well as the stability of the server machine. Additionally,
-the regression tests can be used to help find hardware errors.
+The postgresql-libs package is required for all installations. Otherwise, a
+mix and match installation may be made. The devel package is required to
+do any compilation of a program that uses either the client libs or the
+server (SPI) interface.
RPM FILE LOCATIONS.
-----------------------------------------------------------------------------
-In compliance with the Linux FHS, the PostgreSQL RPM's install files in a manner
-not consistent with most of the PostgreSQL documentation. According to the
+In compliance with the LSB, the PostgreSQL RPM's install files in a manner
+not consistent with much of the PostgreSQL documentation. According to the
standard PostgreSQL documentation, PostgreSQL is installed under the directory
/usr/local/pgsql, with executables, source, and data existing in various
subdirectories.
@@ -184,6 +163,17 @@ cause thembe be non-compliant, please let me know.
UPGRADING.
-----------------------------------------------------------------------------
+WARNING: This information is deprecated. Make sure to fully back up
+your database files BEFORE upgrading the RPM. Unfortunately, even then
+you may have problems -- so be ready to hand-edit dump files.
+
+A pg_upgrade utility is found in the contrib tree -- but it is not really
+production quality code. If this lack of easy upgrades bothers you, please
+let the developer list (pgsql-hackers(a)postgresql.org) know about it -- maybe
+seamless upgrades can be made a higher prioriy if enough users complain.
+
+Use the following information at your own risk.
+
CAUTION: While a semi-automatic upgrade process has been implemented, it is
STRONGLY recommended that a full dump of your database (using pg_dumpall) is
performed BEFORE upgrading the RPMs! If you have already done the upgrade
@@ -195,11 +185,8 @@ I cannot overemphasize this precaution.
NOTE: moving your existing data from /var/lib/pgsql to /var/lib/pgsql/data is
not currently automatic -- you will need to do this yourself at this release!
This change occurred between 6.5.3 and 7.0, so upgrading from prior to 7.0 to
-7.0 or later might be difficult.
-
-NOTE: This program is not included in the packages distributed with
-Red Hat Linux. The releasenotes specifies a dump before a system
-upgrade.
+7.0 or later might be difficult. The rh-dump script is provided to ease this,
+see below.
The single biggest problem with upgrading PostgreSQL RPM's has been the lack
of a reasonably automated upgrade process. PostgreSQL has the property of
@@ -245,6 +232,14 @@ The basic sequence is:
postgresql-dump -t /var/lib/pgsql/backup/db.bak -p /var/lib/pgsql/backup/old -d
(you can abort the ASCII dump with 'Q', as it uses more) Then, (as user root):
+***** NOTE ***** ***** NOTE *****
+
+The above script is broken. Use "rh-pgdump.sh targetfile" instead, remove the
+old databases (/var/lib/pgsql/base) (or safer - move them somewhere else first),
+start the database and follow the insert procedure described below.
+
+***** NOTE ***** ***** NOTE *****
+
service postgresql start
(which will automatically create a new database structure) And finally,
@@ -279,6 +274,11 @@ in the template1 database. Please look at www.postgresql.org for information
on upgrading the template1 database. This is a known bug in the PostgreSQL
pg_dump and pg_dumpall utilities.
+The above information is considered deprecated. The utilities it mentions
+are also considered deprecated and will be removed from a future release of
+the RPMset due to the difficulty involved with a dump-restore upgrade and the
+hand-editing of dumpfiles that are sometimes necessary.
+
REGRESSION TESTING
-------------------------------------------------------------------------------
One of the features of the newer RPM sets is the capability to perform the
@@ -366,6 +366,10 @@ environment to rebuild the full RPM set.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
+build6x undef #build for RHL 6.x. Define to 1 to build for 6.x,
+ # undefined otherwise.
+ #currently, this disables the kerberos, nls, and ssl
+ # builds, as well as correcting dependencies for 6.x
beta 0 #build with cassert and do not strip the binaries
perl 1 #build the postgresql-perl package.
tcl 1 #build the postgresql-tcl package.
@@ -383,6 +387,7 @@ nls 1 #build with national language support.
enable_mb 1 #enable multibyte encodings.
pgaccess 1 #build the pgaccess client, part of postgresql-tk.
newintarray 0 #substitute a newer intarray contrib.
+pam 1 #build --with-pam
To use these defines, invoke a rebuild like this:
rpm --rebuild --define 'perl 0' --define 'tcl 0' --define 'tkpkg 0'\
@@ -393,7 +398,6 @@ newer intarray code, and disable kerberos support.
More of these conditionals will be added in the future.
-
CONTRIB FILES
-------------------------------------------------------------------------------
The contents of the contrib tree are packaged into the -contrib subpackage
diff --git a/postgresql.init b/postgresql.init
index 29ed5de..60ecb54 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -48,7 +48,7 @@
# Tested the $? return for the stop script -- it does in fact propagate.
# TODO: multiple postmasters.
-# PGVERSION is:
+# PGVERSION is: (note that PGVERSION is the major: 7.2.1 -> PGVERSION 7.2)
PGVERSION=7.2
# Source function library.
@@ -104,7 +104,7 @@ start(){
SYSDOCDIR=/usr/share/doc/packages
fi
echo
- echo -e $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+ echo $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
exit 1
# This doesn't seem to do anything useful...
# else
@@ -153,12 +153,13 @@ start(){
pid=`pidof -s postmaster`
if [ $pid ]
then
- success "$PSQL_START"
- touch /var/lock/subsys/postgresql
- echo $pid > /var/run/postmaster.pid
- echo
+ success "$PSQL_START"
+ touch /var/lock/subsys/postgresql
+ echo $pid > /var/run/postmaster.pid
+ echo
else
- failure "$PSQL_START"
+ failure "$PSQL_START"
+ echo
fi
fi
}
diff --git a/postgresql.spec b/postgresql.spec
index fcb4d2e..2827aac 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,13 +1,20 @@
-# [for (x)emacs] -*- coding: utf-8 -*-
+# build6x usage: define to 1 to build for RHL6.x. Don't define at all for others.
+%{?build6x:%define kerberos 0}
+%{?build6x:%define nls 0}
+%{?build6x:%define ssl 0}
+#work around the undefined or defined to 1 build 6x interaction with the pam stuff
+%{!?build6x:%define non6xpamdeps 1}
+%{?build6x:%define non6xpamdeps 0}
+
%define beta 0
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
%{!?perl:%define perl 1}
%{!?tcl:%define tcl 1}
-%{!?tkpkg:%define tkpkg 0}
+%{!?tkpkg:%define tkpkg 1}
%{!?odbc:%define odbc 1}
%{!?jdbc:%define jdbc 1}
-%{!?test:%define test 0}
+%{!?test:%define test 1}
%{!?python:%define python 1}
%{!?pltcl:%define pltcl 1}
%{?forceplperl:%define plperl %{expand:forceplperl}}
@@ -17,20 +24,19 @@
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
%{!?pam:%define pam 1}
-%{!?sgmldocs:%define sgmldocs 0}
-
# Utility feature defines.
%{!?enable_mb:%define enable_mb 1}
-%{!?pgaccess:%define pgaccess 0}
+%{!?pgaccess:%define pgaccess 1}
# Python major version.
-%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')%{nil}}
-%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')%{nil}}
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')}
+
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.2.2
+Version: 7.2.3
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -52,31 +58,42 @@ Version: 7.2.2
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 5.80
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
+Source2: redhat-style-files.lst
Source3: postgresql.init
-Source4: file-lists.tar.gz
+Source4: suse-style-files.lst
+Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
Source7: migration-scripts.tar.gz
-Source8: http://jdbc.postgresql.org/download/devpgjdbc1.jar
-Source9: http://jdbc.postgresql.org/download/devpgjdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pgjdbc1.jar
-Source11: http://jdbc.postgresql.org/download/pgjdbc2.jar
+Source8: http://jdbc.postgresql.org/download/jdbc7.2dev-1.1.jar
+Source9: http://jdbc.postgresql.org/download/jdbc7.2dev-1.2.jar
+Source10: http://jdbc.postgresql.org/download/jdbc7.1-1.1.jar
+Source11: http://jdbc.postgresql.org/download/jdbc7.1-1.2.jar
+Source12: postgresql-dump.1.gz
+Source14: rh-pgdump.sh
Source15: postgresql-bashprofile
-Patch1: rpm-pgsql-7.2.patch
-Patch3: postgresql-7.2rc2-betterquote.patch
-Patch4: postgresql-7.2-tighten.patch
-Patch5: postgresql-7.2.1-mktime.patch
-Buildrequires: perl glibc-devel bison flex
+Patch1: rpm-pgsql-%{version}.patch
+Patch2: postgresql-%{version}-geo_ops.patch
+Patch3: postgresql-%{version}-tighten.patch
+Buildrequires: perl glibc-devel
Prereq: /sbin/ldconfig initscripts
+%if %python
+BuildPrereq: python-devel
+%endif
+%if %perl
BuildPrereq: perl
-BuildPrereq: readline-devel >= 4.0
+%endif
+%if %tcl
+BuildPrereq: tcl
+%endif
+%if %tkpkg
+BuildPrereq: tk
+%endif
+BuildPrereq: readline-devel
BuildPrereq: zlib-devel >= 1.0.4
-BuildPrereq: patch >= 2.5.4
-Url: http://www.postgresql.org/
-Requires: postgresql-libs = %{version}
%if %ssl
BuildPrereq: openssl-devel
%endif
@@ -84,17 +101,22 @@ BuildPrereq: openssl-devel
BuildPrereq: krb5-devel
%endif
%if %nls
-BuildPrereq: gettext >= 0.10.36
+BuildPrereq: gettext >= 0.10.35
%endif
+
+%if %pam
+%if %non6xpamdeps
+BuildPrereq: pam-devel
+%endif
+%endif
+
+Url: http://www.postgresql.org/
Obsoletes: postgresql-clients
Buildroot: %{_tmppath}/%{name}-%{version}-root
# Obsolete the packages we are not building...
%if ! %{plperl}
Obsoletes: postgresql-plperl
%endif
-%if %{tcl}
-Buildrequires: tcl
-%endif
%if ! %{tcl}
Obsoletes: postgresql-tcl
%endif
@@ -107,9 +129,6 @@ Obsoletes: postgresql-odbc
%if ! %{perl}
Obsoletes: postgresql-perl
%endif
-%if %{python}
-BuildRequires: python-devel
-%endif
%if ! %{python}
Obsoletes: postgresql-python
%endif
@@ -119,12 +138,6 @@ Obsoletes: postgresql-jdbc
%if ! %{test}
Obsoletes: postgresql-test
%endif
-%if ! %{sgmldocs}
-Obsoletes: postgresql-docs
-%endif
-%if %{pam}
-BuildRequires: pam-devel
-%endif
@@ -136,7 +149,7 @@ BuildRequires: pam-devel
# Major Contributors:
# ---------------
# Lamar Owen
-# Trond Eivind Glomsrd <teg(a)redhat.com>
+# Trond Eivind Glomsrd <teg(a)redhat.com>
# Thomas Lockhart
# Reinhard Max
# Karl DeBisschop
@@ -187,10 +200,20 @@ Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
Requires: postgresql = %{version} libpq.so
-Requires: postgresql-libs = %{version}
+Conflicts: postgresql-server <= 7.1.3
+
+%description server
+The postgresql-server package includes the programs needed to create
+and run a PostgreSQL server, which will in turn allow you to create
+and maintain PostgreSQL databases. PostgreSQL is an advanced
+Object-Relational database management system (DBMS) that supports
+almost all SQL constructs (including transactions, subselects and
+user-defined types and functions). You should install
+postgresql-server if you want to create and maintain your own
+PostgreSQL databases and/or your own PostgreSQL server. You also need
+to install the postgresql package.
+
-#------------
-%if %sgmldocs
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
@@ -199,27 +222,15 @@ The postgresql-docs package includes the SGML source for the documentation
as well as the documentation in other formats, and some extra documentation.
Install this package if you want to help with the PostgreSQL documentation
project, or if you want to generate printed documentation.
-%endif
-
%package contrib
Summary: Contributed source and binaries distributed with PostgreSQL
Group: Applications/Databases
-Requires: libpq.so postgresql = %{version}
+Requires: postgresql = %{version} postgresql-perl postgresql-tcl tk
%description contrib
-The postgresql-contrib package includes the contrib tree distributed with
-the PostgreSQL tarball. Selected contrib modules are prebuilt.
+The postgresql-contrib package contains contributed packages that are
+included in the PostgreSQL distribution.
-%description server
-The postgresql-server package includes the programs needed to create
-and run a PostgreSQL server, which will in turn allow you to create
-and maintain PostgreSQL databases. PostgreSQL is an advanced
-Object-Relational database management system (DBMS) that supports
-almost all SQL constructs (including transactions, subselects and
-user-defined types and functions). You should install
-postgresql-server if you want to create and maintain your own
-PostgreSQL databases and/or your own PostgreSQL server. You also need
-to install the postgresql package.
%package devel
Summary: PostgreSQL development header files and libraries.
@@ -347,25 +358,16 @@ system, including regression tests and benchmarks.
%setup -q
%patch1 -p1
-#patch2 -p1
-#patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch2 -p1
+%patch3 -p1
-#binary
-rm contrib/spi/preprocessor/step1.e
%build
# Get file lists....
-tar xzf %{SOURCE4}
-
-#Commented out for testing on other platforms for now.
-# If libtool installed, copy some files....
-#if [ -d /usr/share/libtool ]
-#then
-# cp /usr/share/libtool/config.* .
-#fi
+#tar xzf %{SOURCE4}
+# Moved out of tarball.
+cp %{SOURCE2} %{SOURCE4} .
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
@@ -415,11 +417,10 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
--mandir=%{_mandir} \
--docdir=%{_docdir} \
--includedir=%{_includedir} \
- --datadir=/usr/share/pgsql
-
+ --datadir=/usr/share/pgsql
make all
-
+make -C contrib all
%if %test
pushd src/test
@@ -431,6 +432,7 @@ make all
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+make -C contrib DESTDIR=$RPM_BUILD_ROOT install
%if %perl
make DESTDIR=$RPM_BUILD_ROOT -C src/interfaces/perl5 -f Makefile install
@@ -463,6 +465,16 @@ make DESTDIR=$RPM_BUILD_ROOT install
%endif
+# man pages....
+# the postgresql-dump manpage.....
+pushd $RPM_BUILD_ROOT%{_mandir}
+cp %{SOURCE12} man1
+popd
+
+# install the dump script
+
+install -m755 %SOURCE14 $RPM_BUILD_ROOT/usr/bin/
+
# install dev headers.
make DESTDIR=$RPM_BUILD_ROOT install-all-headers
@@ -550,158 +562,12 @@ popd
cp %{SOURCE6} README.rpm-dist
mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
-# Build contrib stuff....
-pushd contrib
-make clean
-make all
-popd
-# move the contrib tree to the right place after building....
-cp -r contrib $RPM_BUILD_ROOT/usr/lib/pgsql
-# We'll do more prep work in a later release.....
-
-#more massaging
-
-pushd $RPM_BUILD_ROOT/usr/lib/pgsql/contrib
-
-# Get rid of useless makefiles
-rm -f Makefile */Makefile
-
-# array
-pushd array
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/array|" *
-popd
-
-# btree_gist
-pushd btree_gist
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/btree_gist|" *.sql
-popd
-
-# chkpass
-pushd chkpass
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/chkpass|" *.sql
-popd
-
-# cube
-pushd cube
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/cube|" cube.sql
-popd
-
-# dblink
-pushd dblink
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/dblink|" dblink.sql
-popd
-
-# earthdistance
-pushd earthdistance
-perl -pi -e "s|/usr/share/pgsql/contrib|/usr/lib/pgsql/contrib/earthdistance|" *.sql
-popd
-
-# fulltext
-pushd fulltextindex
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/fulltextindex|" *.sql
-popd
-
-# fuzzystrmatch
-pushd fuzzystrmatch
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/fuzzystrmatch|" *.sql
-popd
-
-# intarray
-pushd intarray
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/intarray|" *.sql
-popd
-
-# isbn_issn
-pushd isbn_issn
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/isbn_issn|" *.sql
-popd
-
-# lo
-pushd lo
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/lo|" *.sql
-popd
-
-# miscutil
-pushd miscutil
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/miscutil|" *.sql
-popd
-
-# noupdate
-pushd noupdate
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/noupdate|" *.sql
-popd
-
-# pgcrypto
-pushd pgcrypto
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/pgcrypto|" *.sql
-perl -pi -e "s|/usr/lib/pgsql/contrib/pgcrypto/pgcrypto|/usr/lib/pgsql/contrib/pgcrypto/libpgcrypto|" *.sql
-rm -f *.in *.o
-popd
-
-# pgstattuple
-pushd pgstattuple
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/pgstattuple|" *.sql
-popd
-
-# rserv
-pushd rserv
-perl -pi -e "s|/usr/share/|/usr/lib/|" *
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib|" *
-perl -pi -e "s|/usr/bin|/usr/lib/pgsql/contrib/rserv|" *
-popd
-
-# rtree_gist
-pushd pgstattuple
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib|" *.sql
-popd
-
-# seg
-pushd seg
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib|" *.sql
-popd
-
-# spi
-pushd spi
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/spi|" *.sql
-popd
-
-# Don"t need these
-rm -fr startscripts
-
-# string
-pushd string
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/string|" *.sql
-popd
-
-# tsearch
-pushd tsearch
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/tsearch|" *.sql
-popd
-
-# userlock
-pushd userlock
-perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/userlock|" *.sql
-popd
-
-popd
-
-#more broken symlinks
-rm -f $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_controldata/pg_crc.c
-cp src/backend/utils/hash/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c
-ln $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_controldata/pg_crc.c
-
# Symlink libpq.so.2.0 to libpq.so.2 for backwards compatibility, until
# -soname patches are the norm.
pushd $RPM_BUILD_ROOT/usr/lib
ln -s libpq.so.2 libpq.so.2.0
popd
-# arch backups should go in /usr/lib, not /usr/share
-pushd $RPM_BUILD_ROOT
-mkdir -p usr/lib/pgsql/backup
-mv usr/share/pgsql/backup/pg_dumpall_new usr/lib/pgsql/backup/pg_dumpall_new
-popd
-
%find_lang libpq
%find_lang pg_dump
@@ -720,10 +586,10 @@ if [ $1 -gt 1 ]
then
mkdir -p /usr/lib/pgsql/backup > /dev/null
pushd /usr/bin > /dev/null
- cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/lib/pgsql/backup > /dev/null 2>&1 || :
+ cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/share/pgsql/backup > /dev/null 2>&1 || :
popd > /dev/null
pushd /usr/lib > /dev/null
- cp -fp libpq.* /usr/lib/pgsql/backup > /dev/null 2>&1 || :
+ cp -fp libpq.* /usr/share/pgsql/backup > /dev/null 2>&1 || :
popd > /dev/null
fi
@@ -817,19 +683,63 @@ rm -f perlfiles.list
%{_mandir}/man1/pg_dumpall.1*
%{_mandir}/man1/psql.1*
%{_mandir}/man1/vacuumdb.1*
-%{_mandir}/man1/pg_restore.1*
%{_mandir}/man7/*
-%if %sgmldocs
%files docs
%defattr(-,root,root)
%doc doc/src/*
-%endif
%files contrib
%defattr(-,root,root)
-%dir /usr/lib/pgsql/contrib/
-/usr/lib/pgsql/contrib/*
+/usr/lib/pgsql/_int.so
+/usr/lib/pgsql/array_iterator.so
+/usr/lib/pgsql/autoinc.so
+/usr/lib/pgsql/btree_gist.so
+/usr/lib/pgsql/chkpass.so
+/usr/lib/pgsql/cube.so
+/usr/lib/pgsql/dblink.so
+/usr/lib/pgsql/earthdistance.so
+/usr/lib/pgsql/fti.so
+/usr/lib/pgsql/fuzzystrmatch.so
+/usr/lib/pgsql/insert_username.so
+/usr/lib/pgsql/isbn_issn.so
+/usr/lib/pgsql/lo.so
+/usr/lib/pgsql/misc_utils.so
+/usr/lib/pgsql/moddatetime.so
+/usr/lib/pgsql/noup.so
+/usr/lib/pgsql/pgcrypto.so
+/usr/lib/pgsql/refint.so
+/usr/lib/pgsql/rserv.so
+/usr/lib/pgsql/rtree_gist.so
+/usr/lib/pgsql/seg.so
+/usr/lib/pgsql/string_io.so
+/usr/lib/pgsql/timetravel.so
+/usr/lib/pgsql/user_locks.so
+/usr/share/pgsql/contrib/
+/usr/bin/dbf2pg
+/usr/bin/findoidjoins
+/usr/bin/make_oidjoins_check
+/usr/bin/fti.pl
+/usr/bin/oid2name
+/usr/bin/pg_controldata
+/usr/bin/pg_dumplo
+/usr/bin/pg_logger
+/usr/bin/pg_resetxlog
+/usr/bin/pgbench
+/usr/bin/RservTest
+/usr/bin/MasterInit
+/usr/bin/MasterAddTable
+/usr/bin/Replicate
+/usr/bin/MasterSync
+/usr/bin/CleanLog
+/usr/bin/SlaveInit
+/usr/bin/SlaveAddTable
+/usr/bin/GetSyncID
+/usr/bin/PrepareSnapshot
+/usr/bin/ApplySnapshot
+/usr/bin/InitRservTest
+/usr/bin/vacuumlo
+%doc contrib/*/README.* contrib/spi/*.example
%files libs -f libpq.lang
%defattr(-,root,root)
@@ -846,7 +756,9 @@ rm -f perlfiles.list
/usr/bin/pg_ctl
/usr/bin/pg_passwd
/usr/bin/postgres
+/usr/bin/postgresql-dump
/usr/bin/postmaster
+/usr/bin/rh-pgdump.sh
%{_mandir}/man1/initdb.1*
%{_mandir}/man1/initlocation.1*
%{_mandir}/man1/ipcclean.1*
@@ -854,14 +766,15 @@ rm -f perlfiles.list
%{_mandir}/man1/pg_passwd.1*
%{_mandir}/man1/postgres.1*
%{_mandir}/man1/postmaster.1*
+%{_mandir}/man1/postgresql-dump.1*
/usr/share/pgsql/postgres.bki
/usr/share/pgsql/postgres.description
/usr/share/pgsql/*.sample
/usr/lib/pgsql/plpgsql.so
%dir /usr/lib/pgsql
%dir /usr/share/pgsql
-%attr(700,postgres,postgres) %dir /usr/lib/pgsql/backup
-/usr/lib/pgsql/backup/pg_dumpall_new
+%attr(700,postgres,postgres) %dir /usr/share/pgsql/backup
+/usr/share/pgsql/backup/pg_dumpall_new
%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
@@ -890,14 +803,11 @@ rm -f perlfiles.list
%files tcl
%defattr(-,root,root)
%attr(755,root,root) /usr/lib/libpgtcl.so.*
+# libpgtcl.so is not in devel because Tcl scripts may load it by that name.
/usr/lib/libpgtcl.so
/usr/bin/pgtclsh
-/usr/bin/pltcl_delmod
-/usr/bin/pltcl_listmod
-/usr/bin/pltcl_loadmod
%{_mandir}/man1/pgtclsh.1*
/usr/lib/pgsql/pltcl.so
-/usr/share/pgsql/unknown.pltcl
%endif
%if %tkpkg
@@ -927,7 +837,6 @@ rm -f perlfiles.list
%dir /usr/lib/perl5/site_perl/%{_arch}-linux/auto
/usr/share/pgsql/perl5
%{_mandir}/man3/Pg.*
-/usr/lib/pgsql/plperl.so
%endif
%if %plperl
@@ -942,13 +851,15 @@ rm -f perlfiles.list
%doc src/interfaces/python/README src/interfaces/python/tutorial
/usr/lib/python%{pyver}/site-packages/_pgmodule.so
/usr/lib/python%{pyver}/site-packages/*.py
-/usr/lib/pgsql/plpython.so
%endif
%if %jdbc
%files jdbc
%defattr(-,root,root)
-/usr/share/pgsql/*jar
+/usr/share/pgsql/jdbc7.1-1.1.jar
+/usr/share/pgsql/jdbc7.1-1.2.jar
+/usr/share/pgsql/jdbc7.2dev-1.1.jar
+/usr/share/pgsql/jdbc7.2dev-1.2.jar
%endif
%if %test
@@ -959,96 +870,57 @@ rm -f perlfiles.list
%endif
%changelog
-* Wed Sep 4 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.2-1
-- 7.2.2 - security update
-
-* Wed Aug 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-17
-- Add bison and flex to buildprereq (#71590)
-
-* Sat Aug 10 2002 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt with gcc-3.2 (we hope)
-
-* Fri Aug 9 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-15
-- Minor initscript tweak ( #71027)
-
-* Tue Jul 23 2002 Tim Powers <timp(a)redhat.com> 7.2.1-14
-- build using gcc-3.2-0.1
-
-* Thu Jul 11 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-13
-- Rebuild with new readline
-
-* Mon Jul 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-12
-- Update the jarfiles from jdbc.postgresql.org
-
-* Wed Jul 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-11
-- Make postgresql-docs conditional
-- don't ship it - it's just sgml sources for docs in the main package
- (#67818)
-
-* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Tue Jun 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-10
-- step1.e was distributed as a binary... make sure it's rebuilt (#66870)
-
-* Wed Jun 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-9
-- Make the perl parts build with new perl
-- Fix mktime() usage - don't use it before the epoch
-- Disable tk/pgaccess
-
-* Thu May 23 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Tue May 7 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-7
-- Rebuild
-
-* Mon Apr 22 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-6
-- Add a missing percent in a conditional (tcl, devel package)
-
-* Fri Apr 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-5
-- Fix conditional build dependencies... it required tcl
- and python-devel only when you didn't build the modules,
- not if you needed them
-
-* Wed Apr 10 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-4
-- Fix pgcrypto (#63073)
-- Remove postgresql-dump. Dump before upgrade, as we've documented many times
-
-* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-3
+* Wed Dec 20 2002 Andrew Overholt <overholt(a)redhat.com>
+- 7.2.3-4.(73,80) - add buffer overrun patch for geo_ops
+- 7.2.3-5.(73,80) - add pg_hba.conf tightening patch
+
+* Thu Dec 19 2002 Andrew Overholt <overholt(a)redhat.com>
+- 7.2.3-3.(73,80) - correct init script success/failure messages.
+
+* Tue Dec 17 2002 Andrew Overholt <overholt(a)redhat.com>
+- 7.2.3-1 - initial Red Hat build.
+- 7.2.3-2.(73,80) - distribution-specific release tags to avoid upgrading
+ issues.
+
+* Wed Oct 02 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- 7.2.3-1PGDG
+
+* Mon Aug 26 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- 7.2.2-1PGDG
+- Applied PeterE's contrib patch -- contrib is now completely restructured.
+- server conflicts with less than 7.2, as a warning to the upcoming
+-- yank of the broken partial upgrade.
+
+* Thu Aug 22 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- 7.2.2 security fix.
+- deprecate postgresql-dump system.
+- 7.2.2-0.1PGDG PRERELEASE!
+
+* Fri Apr 12 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- Correct tcl conditionals -- especially for the devel package.
+- Corrected BuildPrereq conditionals.
+- Added a build6x conditional -- define it to build for RHL 6.x
+- Integrate a few of Trond's fixes from RawHide.
+- Pulled file-lists out of tarball for better maintainability.
+- Updated README.rpm-dist.
+- 6.x build can't buildprereq pam-devel, as 6.x has no pam-devel.
+
+* Tue Apr 09 2002 Lamar Owen <lamar.owen(a)ramifordistat.net>
+- Integrate DP's patch and stuff.
+
+* Fri Apr 05 2002 David B. Peterson <dave(a)toppledwagon.com>
+- hacked for 7.2.1 (made rpm-pgsql-7.2.1.patch from rpm-pgsql-7.2.patch)
+- changed gettext version to 0.10.35 (from 0.10.36, for RH62)
+- added BuildPrereq for tk
+
+* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-3
- make postgresql-server and postgresql depend on postgresql-libs
- store backups of old binaries in /usr/lib/pgsql/backup instead of /usr/share
-* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-2
-- 7.2.1 again, but this time based on the newest 7.2 specfile
- and not an older one. oops.
-
-* Thu Mar 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-6
-- Move the libpgtcl.so symlink into the tcl subpackage from -devel (#61042)
-- Enable pam support (#59617)
-- Include the odbc plugin, not just the symlink to it (#61522)
-
-* Thu Feb 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-5
-- Disable python quote patch... it broke kerberos
-
-* Thu Feb 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-4
-- Rebuild
-
-* Mon Feb 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-3
-- Don't require tcl-devel, it's just tcl
-- Fix contrib. A lot. Again (last time in 7.1)
-- Add buildprereq of recent patch (#59910)
-- make the initscript 0755
-
-* Fri Feb 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-2
-- Sync
-- Fix output of backslash-ns from upgrade detection
-- Make the default config use socket credentials, not trust
-- Add patches for tsearch/gist from Oleg Bartunov <oleg(a)sai.msu.su>
-- Deprecate rh-pgdump script. Dump before upgrading, restore afterwards.
- And ask the developers to fix it.
-- Dependency and file inclusion enhancements for conditionals
-- escape previous changelog entry which didn't escape a macro
-- python quote enhancement patch added
+* Thu Mar 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-6
+- Move the libpgtcl.so symlink into the tcl subpackage from -devel
+- Enable pam support
+- Include the odbc plugin, not just the symlink to it
* Tue Feb 04 2002 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.2 final.
@@ -1057,7 +929,7 @@ rm -f perlfiles.list
- Clean up a few things; undef beta for final build.
- Newer JDBC -- point to correct website and 7.2 dev.
- postgresql.init changes.
-- NLS build does funky %%defattr things; redhat-style-files.lst changed
+- NLS build does funky %defattr things; redhat-style-files.lst changed
-- for execute permission on /etc/rc.d/init.d/postgresql
* Sun Jan 27 2002 Lamar Owen <lamar.owen(a)wgcr.org>
@@ -1067,7 +939,7 @@ rm -f perlfiles.list
- 7.2b3-0.3PGDG
- beta conditionals for debugging, assertion checking, and no strip.
-* Tue Nov 27 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+* Tue Nov 27 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
- Improve python version handling
* Fri Nov 23 2001 Lamar Owen <lamar.owen(a)wgcr.org>
@@ -1092,3 +964,18 @@ rm -f perlfiles.list
- Merged some changes from Peter Eisentraut for7.2.
- Cleaned up some legacy junk.
- Prepare for 7.2 beta cycle.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sources b/sources
index bb7be53..3e6cc6c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-75a05a4d34bceeb83d51f4cbde4d9952 file-lists.tar.gz
5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
-853bf330837b50a6c6e3edf540ad1792 postgresql-7.2.2.tar.gz
+cf665c93a08a60e4a99db3a6dfe7ba10 postgresql-7.2.3.tar.gz
+3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit 6b72880c1f645196832dc57f66666ade5cf1e82d
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:40:30 2004 +0000
auto-import postgresql-7.2.2-1 from postgresql-7.2.2-1.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 6f16872..6d0669d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,3 @@
file-lists.tar.gz
migration-scripts.tar.gz
-postgresql-7.2.1.tar.gz
-postgresql-dump.1.gz
+postgresql-7.2.2.tar.gz
diff --git a/postgresql.spec b/postgresql.spec
index 1f28776..fcb4d2e 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -30,7 +30,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.2.1
+Version: 7.2.2
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -52,20 +52,18 @@ Version: 7.2.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 17
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
Source3: postgresql.init
Source4: file-lists.tar.gz
-Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
Source7: migration-scripts.tar.gz
Source8: http://jdbc.postgresql.org/download/devpgjdbc1.jar
Source9: http://jdbc.postgresql.org/download/devpgjdbc2.jar
Source10: http://jdbc.postgresql.org/download/pgjdbc1.jar
Source11: http://jdbc.postgresql.org/download/pgjdbc2.jar
-Source12: postgresql-dump.1.gz
Source15: postgresql-bashprofile
Patch1: rpm-pgsql-7.2.patch
Patch3: postgresql-7.2rc2-betterquote.patch
@@ -465,12 +463,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
%endif
-# man pages....
-# the postgresql-dump manpage.....
-pushd $RPM_BUILD_ROOT%{_mandir}
-cp %{SOURCE12} man1
-popd
-
# install dev headers.
make DESTDIR=$RPM_BUILD_ROOT install-all-headers
@@ -825,9 +817,9 @@ rm -f perlfiles.list
%{_mandir}/man1/pg_dumpall.1*
%{_mandir}/man1/psql.1*
%{_mandir}/man1/vacuumdb.1*
+%{_mandir}/man1/pg_restore.1*
%{_mandir}/man7/*
-
%if %sgmldocs
%files docs
%defattr(-,root,root)
@@ -900,8 +892,12 @@ rm -f perlfiles.list
%attr(755,root,root) /usr/lib/libpgtcl.so.*
/usr/lib/libpgtcl.so
/usr/bin/pgtclsh
+/usr/bin/pltcl_delmod
+/usr/bin/pltcl_listmod
+/usr/bin/pltcl_loadmod
%{_mandir}/man1/pgtclsh.1*
/usr/lib/pgsql/pltcl.so
+/usr/share/pgsql/unknown.pltcl
%endif
%if %tkpkg
@@ -931,6 +927,7 @@ rm -f perlfiles.list
%dir /usr/lib/perl5/site_perl/%{_arch}-linux/auto
/usr/share/pgsql/perl5
%{_mandir}/man3/Pg.*
+/usr/lib/pgsql/plperl.so
%endif
%if %plperl
@@ -945,6 +942,7 @@ rm -f perlfiles.list
%doc src/interfaces/python/README src/interfaces/python/tutorial
/usr/lib/python%{pyver}/site-packages/_pgmodule.so
/usr/lib/python%{pyver}/site-packages/*.py
+/usr/lib/pgsql/plpython.so
%endif
%if %jdbc
@@ -961,6 +959,9 @@ rm -f perlfiles.list
%endif
%changelog
+* Wed Sep 4 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.2-1
+- 7.2.2 - security update
+
* Wed Aug 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-17
- Add bison and flex to buildprereq (#71590)
diff --git a/sources b/sources
index 9c45abc..bb7be53 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
75a05a4d34bceeb83d51f4cbde4d9952 file-lists.tar.gz
5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
-d075e9c49135899645dff57bc58d6233 postgresql-7.2.1.tar.gz
-3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
+853bf330837b50a6c6e3edf540ad1792 postgresql-7.2.2.tar.gz
commit ac23d4bfa20a2bd852be2fafdfa0e87f7ff9b580
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:40:25 2004 +0000
auto-import postgresql-7.2.1-17 from postgresql-7.2.1-17.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index dc41890..1f28776 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,3 +1,4 @@
+# [for (x)emacs] -*- coding: utf-8 -*-
%define beta 0
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
@@ -51,7 +52,7 @@ Version: 7.2.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 16
+Release: 17
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -70,7 +71,7 @@ Patch1: rpm-pgsql-7.2.patch
Patch3: postgresql-7.2rc2-betterquote.patch
Patch4: postgresql-7.2-tighten.patch
Patch5: postgresql-7.2.1-mktime.patch
-Buildrequires: perl glibc-devel
+Buildrequires: perl glibc-devel bison flex
Prereq: /sbin/ldconfig initscripts
BuildPrereq: perl
BuildPrereq: readline-devel >= 4.0
@@ -137,7 +138,7 @@ BuildRequires: pam-devel
# Major Contributors:
# ---------------
# Lamar Owen
-# Trond Eivind Glomsrd <teg(a)redhat.com>
+# Trond Eivind Glomsrd <teg(a)redhat.com>
# Thomas Lockhart
# Reinhard Max
# Karl DeBisschop
@@ -960,22 +961,25 @@ rm -f perlfiles.list
%endif
%changelog
+* Wed Aug 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-17
+- Add bison and flex to buildprereq (#71590)
+
* Sat Aug 10 2002 Elliot Lee <sopwith(a)redhat.com>
- rebuilt with gcc-3.2 (we hope)
-* Fri Aug 9 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-15
+* Fri Aug 9 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-15
- Minor initscript tweak ( #71027)
* Tue Jul 23 2002 Tim Powers <timp(a)redhat.com> 7.2.1-14
- build using gcc-3.2-0.1
-* Thu Jul 11 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-13
+* Thu Jul 11 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-13
- Rebuild with new readline
-* Mon Jul 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-12
+* Mon Jul 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-12
- Update the jarfiles from jdbc.postgresql.org
-* Wed Jul 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-11
+* Wed Jul 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-11
- Make postgresql-docs conditional
- don't ship it - it's just sgml sources for docs in the main package
(#67818)
@@ -983,10 +987,10 @@ rm -f perlfiles.list
* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com>
- automated rebuild
-* Tue Jun 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-10
+* Tue Jun 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-10
- step1.e was distributed as a binary... make sure it's rebuilt (#66870)
-* Wed Jun 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-9
+* Wed Jun 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-9
- Make the perl parts build with new perl
- Fix mktime() usage - don't use it before the epoch
- Disable tk/pgaccess
@@ -994,47 +998,47 @@ rm -f perlfiles.list
* Thu May 23 2002 Tim Powers <timp(a)redhat.com>
- automated rebuild
-* Tue May 7 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-7
+* Tue May 7 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-7
- Rebuild
-* Mon Apr 22 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-6
+* Mon Apr 22 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-6
- Add a missing percent in a conditional (tcl, devel package)
-* Fri Apr 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-5
+* Fri Apr 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-5
- Fix conditional build dependencies... it required tcl
and python-devel only when you didn't build the modules,
not if you needed them
-* Wed Apr 10 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-4
+* Wed Apr 10 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-4
- Fix pgcrypto (#63073)
- Remove postgresql-dump. Dump before upgrade, as we've documented many times
-* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-3
+* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-3
- make postgresql-server and postgresql depend on postgresql-libs
- store backups of old binaries in /usr/lib/pgsql/backup instead of /usr/share
-* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-2
+* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-2
- 7.2.1 again, but this time based on the newest 7.2 specfile
and not an older one. oops.
-* Thu Mar 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-6
+* Thu Mar 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-6
- Move the libpgtcl.so symlink into the tcl subpackage from -devel (#61042)
- Enable pam support (#59617)
- Include the odbc plugin, not just the symlink to it (#61522)
-* Thu Feb 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-5
+* Thu Feb 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-5
- Disable python quote patch... it broke kerberos
-* Thu Feb 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-4
+* Thu Feb 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-4
- Rebuild
-* Mon Feb 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-3
+* Mon Feb 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-3
- Don't require tcl-devel, it's just tcl
- Fix contrib. A lot. Again (last time in 7.1)
- Add buildprereq of recent patch (#59910)
- make the initscript 0755
-* Fri Feb 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-2
+* Fri Feb 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-2
- Sync
- Fix output of backslash-ns from upgrade detection
- Make the default config use socket credentials, not trust
@@ -1062,7 +1066,7 @@ rm -f perlfiles.list
- 7.2b3-0.3PGDG
- beta conditionals for debugging, assertion checking, and no strip.
-* Tue Nov 27 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+* Tue Nov 27 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
- Improve python version handling
* Fri Nov 23 2001 Lamar Owen <lamar.owen(a)wgcr.org>
commit 1958062af0e828f87d730546afe8b97c0393b13e
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:40:19 2004 +0000
auto-import postgresql-7.2.1-16 from postgresql-7.2.1-16.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index cc362bd..dc41890 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -51,7 +51,7 @@ Version: 7.2.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 15
+Release: 16
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -960,6 +960,9 @@ rm -f perlfiles.list
%endif
%changelog
+* Sat Aug 10 2002 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt with gcc-3.2 (we hope)
+
* Fri Aug 9 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-15
- Minor initscript tweak ( #71027)
commit 4914e6a2b1c1b8ac5100e2f1c939c297633bd941
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:40:11 2004 +0000
auto-import postgresql-7.2.1-15 from postgresql-7.2.1-15.src.rpm
diff --git a/postgresql.init b/postgresql.init
index 4beaefc..29ed5de 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -153,23 +153,12 @@ start(){
pid=`pidof -s postmaster`
if [ $pid ]
then
- if echo "$TYPESET"|grep "declare -f success ()" >/dev/null
- then
- success "$PSQL_START"
- else
- echo " [ OK ]"
- fi
- touch /var/lock/subsys/postgresql
- echo $pid > /var/run/postmaster.pid
- echo
+ success "$PSQL_START"
+ touch /var/lock/subsys/postgresql
+ echo $pid > /var/run/postmaster.pid
+ echo
else
- if echo "$TYPESET"|grep "declare -f failure ()" >/dev/null
- then
- failure "$PSQL_START"
- else
- echo " [ FAILED ]"
- fi
- echo
+ failure "$PSQL_START"
fi
fi
}
diff --git a/postgresql.spec b/postgresql.spec
index 99ee1b9..cc362bd 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -3,7 +3,7 @@
%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
%{!?perl:%define perl 1}
%{!?tcl:%define tcl 1}
-%{!?tkpkg:%define tkpkg 1}
+%{!?tkpkg:%define tkpkg 0}
%{!?odbc:%define odbc 1}
%{!?jdbc:%define jdbc 1}
%{!?test:%define test 0}
@@ -16,10 +16,12 @@
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
%{!?pam:%define pam 1}
+%{!?sgmldocs:%define sgmldocs 0}
+
# Utility feature defines.
%{!?enable_mb:%define enable_mb 1}
-%{!?pgaccess:%define pgaccess 1}
+%{!?pgaccess:%define pgaccess 0}
# Python major version.
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')%{nil}}
@@ -49,7 +51,7 @@ Version: 7.2.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 5
+Release: 15
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -58,15 +60,16 @@ Source4: file-lists.tar.gz
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
Source7: migration-scripts.tar.gz
-Source8: http://jdbc.postgresql.org/download/jdbc7.2dev-1.1.jar
-Source9: http://jdbc.postgresql.org/download/jdbc7.2dev-1.2.jar
-Source10: http://jdbc.postgresql.org/download/jdbc7.1-1.1.jar
-Source11: http://jdbc.postgresql.org/download/jdbc7.1-1.2.jar
+Source8: http://jdbc.postgresql.org/download/devpgjdbc1.jar
+Source9: http://jdbc.postgresql.org/download/devpgjdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pgjdbc1.jar
+Source11: http://jdbc.postgresql.org/download/pgjdbc2.jar
Source12: postgresql-dump.1.gz
Source15: postgresql-bashprofile
Patch1: rpm-pgsql-7.2.patch
Patch3: postgresql-7.2rc2-betterquote.patch
Patch4: postgresql-7.2-tighten.patch
+Patch5: postgresql-7.2.1-mktime.patch
Buildrequires: perl glibc-devel
Prereq: /sbin/ldconfig initscripts
BuildPrereq: perl
@@ -117,10 +120,15 @@ Obsoletes: postgresql-jdbc
%if ! %{test}
Obsoletes: postgresql-test
%endif
+%if ! %{sgmldocs}
+Obsoletes: postgresql-docs
+%endif
%if %{pam}
BuildRequires: pam-devel
%endif
+
+
# This is the PostgreSQL Global Development Group Official RPMset spec file,
# or a derivative thereof.
# Copyright 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
@@ -182,6 +190,8 @@ Prereq: /usr/sbin/useradd /sbin/chkconfig
Requires: postgresql = %{version} libpq.so
Requires: postgresql-libs = %{version}
+#------------
+%if %sgmldocs
%package docs
Summary: Extra documentation for PostgreSQL
Group: Applications/Databases
@@ -190,6 +200,8 @@ The postgresql-docs package includes the SGML source for the documentation
as well as the documentation in other formats, and some extra documentation.
Install this package if you want to help with the PostgreSQL documentation
project, or if you want to generate printed documentation.
+%endif
+
%package contrib
Summary: Contributed source and binaries distributed with PostgreSQL
@@ -339,6 +351,10 @@ system, including regression tests and benchmarks.
#patch2 -p1
#patch3 -p1
%patch4 -p1
+%patch5 -p1
+
+#binary
+rm contrib/spi/preprocessor/step1.e
%build
@@ -402,8 +418,10 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
--includedir=%{_includedir} \
--datadir=/usr/share/pgsql
+
make all
+
%if %test
pushd src/test
make all
@@ -416,7 +434,7 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%if %perl
- make PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 -f Makefile install
+ make DESTDIR=$RPM_BUILD_ROOT -C src/interfaces/perl5 -f Makefile install
# Get rid of the packing list generated by the perl Makefile, and build my own...
find $RPM_BUILD_ROOT/usr/lib/perl5 -name .packlist -exec rm -f {} \;
@@ -430,7 +448,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ]
then
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
- cp `find $RPM_BUILD_ROOT -name 'Pg.3*' -print` $RPM_BUILD_ROOT%{_mandir}/man3
+ cp src/interfaces/perl5/blib/man3/Pg.3pm $RPM_BUILD_ROOT%{_mandir}/man3
fi
pushd src/interfaces
@@ -808,9 +826,12 @@ rm -f perlfiles.list
%{_mandir}/man1/vacuumdb.1*
%{_mandir}/man7/*
+
+%if %sgmldocs
%files docs
%defattr(-,root,root)
%doc doc/src/*
+%endif
%files contrib
%defattr(-,root,root)
@@ -866,7 +887,7 @@ rm -f perlfiles.list
/usr/lib/libecpg.a
/usr/lib/libpq++.a
/usr/lib/libpgeasy.a
-%if tcl
+%if %tcl
/usr/lib/libpgtcl.a
%endif
%{_mandir}/man1/ecpg.1*
@@ -928,10 +949,7 @@ rm -f perlfiles.list
%if %jdbc
%files jdbc
%defattr(-,root,root)
-/usr/share/pgsql/jdbc7.1-1.1.jar
-/usr/share/pgsql/jdbc7.1-1.2.jar
-/usr/share/pgsql/jdbc7.2dev-1.1.jar
-/usr/share/pgsql/jdbc7.2dev-1.2.jar
+/usr/share/pgsql/*jar
%endif
%if %test
@@ -942,6 +960,43 @@ rm -f perlfiles.list
%endif
%changelog
+* Fri Aug 9 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-15
+- Minor initscript tweak ( #71027)
+
+* Tue Jul 23 2002 Tim Powers <timp(a)redhat.com> 7.2.1-14
+- build using gcc-3.2-0.1
+
+* Thu Jul 11 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-13
+- Rebuild with new readline
+
+* Mon Jul 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-12
+- Update the jarfiles from jdbc.postgresql.org
+
+* Wed Jul 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-11
+- Make postgresql-docs conditional
+- don't ship it - it's just sgml sources for docs in the main package
+ (#67818)
+
+* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com>
+- automated rebuild
+
+* Tue Jun 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-10
+- step1.e was distributed as a binary... make sure it's rebuilt (#66870)
+
+* Wed Jun 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-9
+- Make the perl parts build with new perl
+- Fix mktime() usage - don't use it before the epoch
+- Disable tk/pgaccess
+
+* Thu May 23 2002 Tim Powers <timp(a)redhat.com>
+- automated rebuild
+
+* Tue May 7 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-7
+- Rebuild
+
+* Mon Apr 22 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-6
+- Add a missing percent in a conditional (tcl, devel package)
+
* Fri Apr 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-5
- Fix conditional build dependencies... it required tcl
and python-devel only when you didn't build the modules,
commit 492b6648d6cc58b9218cd3df07506839817cd7e7
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:39:57 2004 +0000
auto-import postgresql-7.2.1-5 from postgresql-7.2.1-5.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index 1452ef8..99ee1b9 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -49,7 +49,7 @@ Version: 7.2.1
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 4
+Release: 5
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -73,6 +73,7 @@ BuildPrereq: perl
BuildPrereq: readline-devel >= 4.0
BuildPrereq: zlib-devel >= 1.0.4
BuildPrereq: patch >= 2.5.4
+Url: http://www.postgresql.org/
Requires: postgresql-libs = %{version}
%if %ssl
BuildPrereq: openssl-devel
@@ -83,16 +84,17 @@ BuildPrereq: krb5-devel
%if %nls
BuildPrereq: gettext >= 0.10.36
%endif
-Url: http://www.postgresql.org/
Obsoletes: postgresql-clients
Buildroot: %{_tmppath}/%{name}-%{version}-root
# Obsolete the packages we are not building...
%if ! %{plperl}
Obsoletes: postgresql-plperl
%endif
+%if %{tcl}
+Buildrequires: tcl
+%endif
%if ! %{tcl}
Obsoletes: postgresql-tcl
-Buildrequires: tcl
%endif
%if ! %{tkpkg}
Obsoletes: postgresql-tk
@@ -103,9 +105,11 @@ Obsoletes: postgresql-odbc
%if ! %{perl}
Obsoletes: postgresql-perl
%endif
+%if %{python}
+BuildRequires: python-devel
+%endif
%if ! %{python}
Obsoletes: postgresql-python
-BuildRequires: python-devel
%endif
%if ! %{jdbc}
Obsoletes: postgresql-jdbc
@@ -113,7 +117,7 @@ Obsoletes: postgresql-jdbc
%if ! %{test}
Obsoletes: postgresql-test
%endif
-%if ! %{pam}
+%if %{pam}
BuildRequires: pam-devel
%endif
@@ -938,6 +942,11 @@ rm -f perlfiles.list
%endif
%changelog
+* Fri Apr 12 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-5
+- Fix conditional build dependencies... it required tcl
+ and python-devel only when you didn't build the modules,
+ not if you needed them
+
* Wed Apr 10 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-4
- Fix pgcrypto (#63073)
- Remove postgresql-dump. Dump before upgrade, as we've documented many times
commit 9571e5dc1b328ed489c1e00a85498fa16e2d835e
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:39:39 2004 +0000
auto-import postgresql-7.2.1-4 from postgresql-7.2.1-4.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 3ed633e..6f16872 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
file-lists.tar.gz
migration-scripts.tar.gz
-postgresql-7.2.tar.gz
+postgresql-7.2.1.tar.gz
postgresql-dump.1.gz
diff --git a/README.rpm-dist b/README.rpm-dist
index 409c66e..0dc9e58 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -2,7 +2,7 @@ README.rpm-dist
-----------------------------------------------------------------------------
Version 4.0, for the PostgreSQL 7.2-1PGDG RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
------------------------------------------------------------------------------
+----------------------------------------------------------------------------
Contents:
0.) Quick -i note.
@@ -197,6 +197,10 @@ not currently automatic -- you will need to do this yourself at this release!
This change occurred between 6.5.3 and 7.0, so upgrading from prior to 7.0 to
7.0 or later might be difficult.
+NOTE: This program is not included in the packages distributed with
+Red Hat Linux. The releasenotes specifies a dump before a system
+upgrade.
+
The single biggest problem with upgrading PostgreSQL RPM's has been the lack
of a reasonably automated upgrade process. PostgreSQL has the property of
the binary on-disk database format changing between major versions (like
diff --git a/postgresql.spec b/postgresql.spec
index a28683b..1452ef8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -15,6 +15,7 @@
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
%{!?nls:%define nls 1}
+%{!?pam:%define pam 1}
# Utility feature defines.
%{!?enable_mb:%define enable_mb 1}
@@ -26,7 +27,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.2
+Version: 7.2.1
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -48,7 +49,7 @@ Version: 7.2
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 2.7
+Release: 4
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -64,7 +65,6 @@ Source11: http://jdbc.postgresql.org/download/jdbc7.1-1.2.jar
Source12: postgresql-dump.1.gz
Source15: postgresql-bashprofile
Patch1: rpm-pgsql-7.2.patch
-Patch2: postgresql-7.2-contribfixes.patch
Patch3: postgresql-7.2rc2-betterquote.patch
Patch4: postgresql-7.2-tighten.patch
Buildrequires: perl glibc-devel
@@ -73,6 +73,7 @@ BuildPrereq: perl
BuildPrereq: readline-devel >= 4.0
BuildPrereq: zlib-devel >= 1.0.4
BuildPrereq: patch >= 2.5.4
+Requires: postgresql-libs = %{version}
%if %ssl
BuildPrereq: openssl-devel
%endif
@@ -112,8 +113,9 @@ Obsoletes: postgresql-jdbc
%if ! %{test}
Obsoletes: postgresql-test
%endif
-
-
+%if ! %{pam}
+BuildRequires: pam-devel
+%endif
# This is the PostgreSQL Global Development Group Official RPMset spec file,
# or a derivative thereof.
@@ -174,6 +176,7 @@ Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
Prereq: /usr/sbin/useradd /sbin/chkconfig
Requires: postgresql = %{version} libpq.so
+Requires: postgresql-libs = %{version}
%package docs
Summary: Extra documentation for PostgreSQL
@@ -329,8 +332,8 @@ system, including regression tests and benchmarks.
%setup -q
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#patch2 -p1
+#patch3 -p1
%patch4 -p1
%build
@@ -380,6 +383,9 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
%if %ssl
--with-openssl \
%endif
+%if %pam
+ --with-pam \
+%endif
%if %kerberos
--with-krb5=/usr/kerberos \
%endif
@@ -390,7 +396,7 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
--mandir=%{_mandir} \
--docdir=%{_docdir} \
--includedir=%{_includedir} \
- --datadir=/usr/share/pgsql
+ --datadir=/usr/share/pgsql
make all
@@ -613,6 +619,8 @@ popd
# pgcrypto
pushd pgcrypto
perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/pgcrypto|" *.sql
+perl -pi -e "s|/usr/lib/pgsql/contrib/pgcrypto/pgcrypto|/usr/lib/pgsql/contrib/pgcrypto/libpgcrypto|" *.sql
+rm -f *.in *.o
popd
# pgstattuple
@@ -673,6 +681,12 @@ pushd $RPM_BUILD_ROOT/usr/lib
ln -s libpq.so.2 libpq.so.2.0
popd
+# arch backups should go in /usr/lib, not /usr/share
+pushd $RPM_BUILD_ROOT
+mkdir -p usr/lib/pgsql/backup
+mv usr/share/pgsql/backup/pg_dumpall_new usr/lib/pgsql/backup/pg_dumpall_new
+popd
+
%find_lang libpq
%find_lang pg_dump
@@ -691,10 +705,10 @@ if [ $1 -gt 1 ]
then
mkdir -p /usr/lib/pgsql/backup > /dev/null
pushd /usr/bin > /dev/null
- cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/share/pgsql/backup > /dev/null 2>&1 || :
+ cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/lib/pgsql/backup > /dev/null 2>&1 || :
popd > /dev/null
pushd /usr/lib > /dev/null
- cp -fp libpq.* /usr/share/pgsql/backup > /dev/null 2>&1 || :
+ cp -fp libpq.* /usr/lib/pgsql/backup > /dev/null 2>&1 || :
popd > /dev/null
fi
@@ -814,7 +828,6 @@ rm -f perlfiles.list
/usr/bin/pg_ctl
/usr/bin/pg_passwd
/usr/bin/postgres
-/usr/bin/postgresql-dump
/usr/bin/postmaster
%{_mandir}/man1/initdb.1*
%{_mandir}/man1/initlocation.1*
@@ -823,15 +836,14 @@ rm -f perlfiles.list
%{_mandir}/man1/pg_passwd.1*
%{_mandir}/man1/postgres.1*
%{_mandir}/man1/postmaster.1*
-%{_mandir}/man1/postgresql-dump.1*
/usr/share/pgsql/postgres.bki
/usr/share/pgsql/postgres.description
/usr/share/pgsql/*.sample
/usr/lib/pgsql/plpgsql.so
%dir /usr/lib/pgsql
%dir /usr/share/pgsql
-%attr(700,postgres,postgres) %dir /usr/share/pgsql/backup
-/usr/share/pgsql/backup/pg_dumpall_new
+%attr(700,postgres,postgres) %dir /usr/lib/pgsql/backup
+/usr/lib/pgsql/backup/pg_dumpall_new
%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
@@ -851,7 +863,6 @@ rm -f perlfiles.list
/usr/lib/libpq++.a
/usr/lib/libpgeasy.a
%if tcl
-/usr/lib/libpgtcl.so
/usr/lib/libpgtcl.a
%endif
%{_mandir}/man1/ecpg.1*
@@ -861,6 +872,7 @@ rm -f perlfiles.list
%files tcl
%defattr(-,root,root)
%attr(755,root,root) /usr/lib/libpgtcl.so.*
+/usr/lib/libpgtcl.so
/usr/bin/pgtclsh
%{_mandir}/man1/pgtclsh.1*
/usr/lib/pgsql/pltcl.so
@@ -883,7 +895,7 @@ rm -f perlfiles.list
%if %odbc
%files odbc
%defattr(-,root,root)
-%attr(755,root,root) /usr/lib/libpsqlodbc.so
+%attr(755,root,root) /usr/lib/libpsqlodbc.so*
/usr/share/pgsql/odbc.sql
%endif
@@ -926,6 +938,29 @@ rm -f perlfiles.list
%endif
%changelog
+* Wed Apr 10 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-4
+- Fix pgcrypto (#63073)
+- Remove postgresql-dump. Dump before upgrade, as we've documented many times
+
+* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-3
+- make postgresql-server and postgresql depend on postgresql-libs
+- store backups of old binaries in /usr/lib/pgsql/backup instead of /usr/share
+
+* Wed Apr 3 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2.1-2
+- 7.2.1 again, but this time based on the newest 7.2 specfile
+ and not an older one. oops.
+
+* Thu Mar 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-6
+- Move the libpgtcl.so symlink into the tcl subpackage from -devel (#61042)
+- Enable pam support (#59617)
+- Include the odbc plugin, not just the symlink to it (#61522)
+
+* Thu Feb 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-5
+- Disable python quote patch... it broke kerberos
+
+* Thu Feb 21 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-4
+- Rebuild
+
* Mon Feb 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-3
- Don't require tcl-devel, it's just tcl
- Fix contrib. A lot. Again (last time in 7.1)
diff --git a/sources b/sources
index 7c4347c..9c45abc 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
75a05a4d34bceeb83d51f4cbde4d9952 file-lists.tar.gz
5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
-4174777cd91f3cc96f91efb2e4e1bc7c postgresql-7.2.tar.gz
+d075e9c49135899645dff57bc58d6233 postgresql-7.2.1.tar.gz
3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit 9636c11b0d6049d23aaad24cf787c9c46500a322
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:39:06 2004 +0000
auto-import postgresql-7.2-2.7 from postgresql-7.2-2.7.src.rpm
diff --git a/README.rpm-dist b/README.rpm-dist
index f66e75e..409c66e 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,11 +1,11 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 3.99, for PostgreSQL 7.2 beta cycle.
+Version 4.0, for the PostgreSQL 7.2-1PGDG RPMset.
Lamar Owen <lamar.owen(a)wgcr.org>
-----------------------------------------------------------------------------
Contents:
- 0.) Quickie -i note.
+ 0.) Quick -i note.
1.) Introduction, QuickStart, and credits
2.) PostgreSQL RPM packages and rationale
3.) Upgrading from an older version of PostgreSQL without losing data.
@@ -17,7 +17,7 @@ Contents:
9.) Logging set up
10.) Further Information Resource
-QUICKIE '-i' NOTE
+QUICK '-i' NOTE
-----------------------------------------------------------------------------
The postmaster '-i' option is NOT used by default in the initscript shipped
with these RPMs. Please do NOT modify the initscript to add the '-i' back
@@ -31,7 +31,7 @@ This document exists to explain the layout of the RPM's for PostgreSQL, to
explain how to migrate from an older version, and to explain WHY it can be
so difficult to upgrade PostgreSQL.
-This document is written to be applicable to version 7.1.2 of PostgreSQL,
+This document is written to be applicable to version 7.2 of PostgreSQL,
which is the current version of the RPM's as of this writing.
Official PostgreSQL Global Development Group RPM's will from version 7.1.2
@@ -48,21 +48,12 @@ These RPMs are designed to be LSB-compliant -- if you find this not to be the
case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
list.
-NOTE:
-This RPMset is part of the PostgreSQL beta cycle. Beta means BETA -- there
-may be some rough edges. Testers are welcome; but please don't put this in
-production on a mission-critical system unless you know _exactly_ what you
-are doing. The first few 7.2beta RPMset's will likely have many problems --
-we will work through those as the cycle proceeds.
-
QUICKSTART
-----------------------------------------------------------------------------
If this is an upgrade, please go to section 3, UPGRADING.
If this is a fresh installation, simply start the postmaster using:
/etc/rc.d/init.d/postgresql start (on RedHat and TurboLinux)
-On SuSE, please see the file 'README.linux' in this directory.
-
The file /var/lib/pgsql/.bash_profile is now packaged to help with the
setting of environment variables. You may edit this file, and it won't be
overwritten during an upgrade. However, enhancements and bugfixes may be added
@@ -87,7 +78,7 @@ Karl DeBisschop
Roger Luethi
Jeff Johnson
Reinhard Max
-
+Peter Eisentraut
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
@@ -188,6 +179,9 @@ also seem like more work to keep track of where everything is -- but, that's
the beauty of RPM -- you don't have to keep track of the files, RPM does it
for you.
+These RPM's are meant to be LSB-compliant. If you find errors in them that
+cause thembe be non-compliant, please let me know.
+
UPGRADING.
-----------------------------------------------------------------------------
CAUTION: While a semi-automatic upgrade process has been implemented, it is
@@ -196,11 +190,12 @@ performed BEFORE upgrading the RPMs! If you have already done the upgrade
with the RPM, and want to return to your previous version to do the dump,
find the old RPM's and use 'rpm -U --oldpackage' to downgrade.
+I cannot overemphasize this precaution.
+
NOTE: moving your existing data from /var/lib/pgsql to /var/lib/pgsql/data is
not currently automatic -- you will need to do this yourself at this release!
-This change occurred between 6.5.3 and 7.0, so upgrading from priot to 7.0 to
-7.0 or later might be difficult. The rh-dump script is provided to ease this,
-see below.
+This change occurred between 6.5.3 and 7.0, so upgrading from prior to 7.0 to
+7.0 or later might be difficult.
The single biggest problem with upgrading PostgreSQL RPM's has been the lack
of a reasonably automated upgrade process. PostgreSQL has the property of
@@ -246,14 +241,6 @@ The basic sequence is:
postgresql-dump -t /var/lib/pgsql/backup/db.bak -p /var/lib/pgsql/backup/old -d
(you can abort the ASCII dump with 'Q', as it uses more) Then, (as user root):
-***** NOTE ***** ***** NOTE *****
-
-The above script is broken. Use "rh-pgdump.sh targetfile" instead, remove the
-old databases (/var/lib/pgsql/base) (or safer - move them somewhere else first),
-start the database and follow the insert procedure described below.
-
-***** NOTE ***** ***** NOTE *****
-
service postgresql start
(which will automatically create a new database structure) And finally,
@@ -332,13 +319,13 @@ There are other parameters to this script -- /etc/rc.d/init.d/postgresql for a
listing.
To get this script to run at system startup or any time the system switches into
-runlevels 4, 5, or 6, run 'chkconfig --add postgresql', and the proper symlinks
-will be created. Check the chkconfig man page for more information.
-
-This same script also works for TurboLinux, and any other distribution similar
-enough to RedHat. SuSE Linux uses a different approach, using a different
-location and a different script, found at either /sbin/init.d/postgres or
-/usr/sbin/rcpostgres. Please see the SuSE 'README.linux' for more information.
+runlevels 3, 4, or 5, run:
+chkconfig --add postgresql
+chkconfig --level 345 postgresql on
+and the proper symlinks will be created. Check the chkconfig man page for more
+information. Note that this is manual -- while the startup script can include
+tags to allow chkconfig to automatically perform the symlinking, this is not
+done at this time.
SuSE has maintained their own RPMset for some time -- their documentation
supercedes any found in this file.
@@ -375,6 +362,7 @@ environment to rebuild the full RPM set.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
+beta 0 #build with cassert and do not strip the binaries
perl 1 #build the postgresql-perl package.
tcl 1 #build the postgresql-tcl package.
tkpkg 1 #build the postgresql-tk package.
@@ -387,6 +375,7 @@ forceplperl 0 #don't force a build of pl/perl over libperl.a
plperl 0 #don't build the postgresql-plperl package.
ssl 1 #use OpenSSL support.
kerberos 1 #use Kerberos 5 support.
+nls 1 #build with national language support.
enable_mb 1 #enable multibyte encodings.
pgaccess 1 #build the pgaccess client, part of postgresql-tk.
newintarray 0 #substitute a newer intarray contrib.
@@ -437,9 +426,3 @@ I use automatic mail folder processing to put mail in the right place.
SuSE information is available at SuSE's website and information contacts.
-----------------------------------------------------------------------------
-
-
-
-
-
-
diff --git a/postgresql-bashprofile b/postgresql-bashprofile
index a2447db..b6c014d 100644
--- a/postgresql-bashprofile
+++ b/postgresql-bashprofile
@@ -1,5 +1,5 @@
-PGLIB=/usr/lib/pgsql
PGDATA=/var/lib/pgsql/data
[ -f $PGDATA/../initdb.i18n ] && source $PGDATA/../initdb.i18n
-export PGLIB PGDATA
+export PGDATA
+
diff --git a/postgresql.init b/postgresql.init
index 47d9cb5..4beaefc 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -42,6 +42,12 @@
# Version 7.2b2 Lamar Owen <lamar.owen(a)wgcr.org>
# version change.
+# Version 7.2 final. Lamar Owen <lamar.owen(a)wgcr.org>
+# reload from Peter E.
+# Eliminate the pidof postmaster test in stop -- we're using pg_ctl so we don't need pidof.
+# Tested the $? return for the stop script -- it does in fact propagate.
+# TODO: multiple postmasters.
+
# PGVERSION is:
PGVERSION=7.2
@@ -98,7 +104,7 @@ start(){
SYSDOCDIR=/usr/share/doc/packages
fi
echo
- echo $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+ echo -e $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
exit 1
# This doesn't seem to do anything useful...
# else
@@ -169,13 +175,6 @@ start(){
}
stop(){
- # Check for postmaster already running... exit if this happens
- pid=`pidof -s postmaster`
- if [ "$pid" == "" ]; then
- rm -f /var/run/postmaster.pid
- rm -f /var/lock/subsys/postgresql
- exit 0;
- fi
echo -n $"Stopping postgresql service: "
# Check for older PGDATA location.
if [ -f /var/lib/pgsql/PG_VERSION ] && [ -d /var/lib/pgsql/base/template1 ]
@@ -185,7 +184,7 @@ stop(){
export PGDATA=/var/lib/pgsql/data
fi
su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1
- ret=$? # This will always be 0, as the return code doesn't propagate... Fix that some day.
+ ret=$?
if [ $ret -eq 0 ]; then
echo_success
else
@@ -205,6 +204,9 @@ condrestart(){
[ -e /var/lock/subsys/postgresql ] && restart || :
}
+reload(){
+ su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl reload -D $PGDATA -s" > /dev/null 2>&1
+}
# This script is slightly unusual in that the name of the daemon (postmaster)
# is not the same as the name of the subsystem (postgresql)
@@ -226,11 +228,13 @@ case "$1" in
condrestart)
condrestart
;;
+ reload|force-reload)
+ reload
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
exit 1
esac
exit 0
-
diff --git a/postgresql.spec b/postgresql.spec
index e1c2e5c..a28683b 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,3 +1,6 @@
+%define beta 0
+
+%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
%{!?perl:%define perl 1}
%{!?tcl:%define tcl 1}
%{!?tkpkg:%define tkpkg 1}
@@ -8,18 +11,18 @@
%{!?pltcl:%define pltcl 1}
%{?forceplperl:%define plperl %{expand:forceplperl}}
%{!?forceplperl:%define forceplperl 0}
-%{!?plperl:%define plperl 1}
+%{!?plperl:%define plperl 0}
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
+%{!?nls:%define nls 1}
# Utility feature defines.
%{!?enable_mb:%define enable_mb 1}
%{!?pgaccess:%define pgaccess 1}
# Python major version.
-%define pyver 2.2
-%define pymainver 2
-%define pynextver 2.3
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')%{nil}}
+%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')%{nil}}
Summary: PostgreSQL client programs and libraries.
Name: postgresql
@@ -45,7 +48,7 @@ Version: 7.2
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 0.7.1
+Release: 2.7
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -54,24 +57,31 @@ Source4: file-lists.tar.gz
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source6: README.rpm-dist
Source7: migration-scripts.tar.gz
-Source10: http://www.retep.org.uk/postgres/jdbc7.0-1.1.jar
-Source11: jdbc7.1-1.2.jar
+Source8: http://jdbc.postgresql.org/download/jdbc7.2dev-1.1.jar
+Source9: http://jdbc.postgresql.org/download/jdbc7.2dev-1.2.jar
+Source10: http://jdbc.postgresql.org/download/jdbc7.1-1.1.jar
+Source11: http://jdbc.postgresql.org/download/jdbc7.1-1.2.jar
Source12: postgresql-dump.1.gz
-Source14: rh-pgdump.sh
Source15: postgresql-bashprofile
Patch1: rpm-pgsql-7.2.patch
-Patch2: postgresql-7.2rc2-betterquote.patch
-Buildrequires: perl glibc-devel autoconf
+Patch2: postgresql-7.2-contribfixes.patch
+Patch3: postgresql-7.2rc2-betterquote.patch
+Patch4: postgresql-7.2-tighten.patch
+Buildrequires: perl glibc-devel
Prereq: /sbin/ldconfig initscripts
-BuildPrereq: python%{?pymainver}-devel perl tcl
+BuildPrereq: perl
BuildPrereq: readline-devel >= 4.0
BuildPrereq: zlib-devel >= 1.0.4
+BuildPrereq: patch >= 2.5.4
%if %ssl
BuildPrereq: openssl-devel
%endif
%if %kerberos
BuildPrereq: krb5-devel
%endif
+%if %nls
+BuildPrereq: gettext >= 0.10.36
+%endif
Url: http://www.postgresql.org/
Obsoletes: postgresql-clients
Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -81,6 +91,7 @@ Obsoletes: postgresql-plperl
%endif
%if ! %{tcl}
Obsoletes: postgresql-tcl
+Buildrequires: tcl
%endif
%if ! %{tkpkg}
Obsoletes: postgresql-tk
@@ -93,6 +104,7 @@ Obsoletes: postgresql-perl
%endif
%if ! %{python}
Obsoletes: postgresql-python
+BuildRequires: python-devel
%endif
%if ! %{jdbc}
Obsoletes: postgresql-jdbc
@@ -276,8 +288,9 @@ to use when writing Perl code for accessing a PostgreSQL database.
%package python
Summary: Development module for Python code to access a PostgreSQL DB.
Group: Applications/Databases
-Requires: mx%{?pymainver}
-Requires: python%{?pymainver} >= %pyver, python < %pynextver
+Requires: python mx
+Conflicts: python < %pyver, python >= %pynextver
+
%description python
PostgreSQL is an advanced Object-Relational database management
@@ -317,6 +330,8 @@ system, including regression tests and benchmarks.
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
@@ -336,9 +351,12 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
# Strip out -ffast-math from CFLAGS....
CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-export PYTHON="/usr/bin/python%{pyver}"
./configure --enable-locale --with-CXX --prefix=/usr --disable-rpath\
+%if %beta
+ --enable-debug \
+ --enable-cassert \
+%endif
%if %perl
--with-perl \
%endif
@@ -365,13 +383,16 @@ export PYTHON="/usr/bin/python%{pyver}"
%if %kerberos
--with-krb5=/usr/kerberos \
%endif
+%if %nls
+ --enable-nls \
+%endif
--sysconfdir=/etc/pgsql \
--mandir=%{_mandir} \
--docdir=%{_docdir} \
--includedir=%{_includedir} \
--datadir=/usr/share/pgsql
-make %{?_smp_mflags} all
+make all
%if %test
pushd src/test
@@ -421,10 +442,6 @@ pushd $RPM_BUILD_ROOT%{_mandir}
cp %{SOURCE12} man1
popd
-# install the dump script
-
-install -m755 %SOURCE14 $RPM_BUILD_ROOT/usr/bin/
-
# install dev headers.
make DESTDIR=$RPM_BUILD_ROOT install-all-headers
@@ -448,7 +465,9 @@ install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
# Java/JDBC
# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
- # Install 7.0 JDBC jars
+ # JDBC jars
+ install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/pgsql
+ install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/pgsql
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/pgsql
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/pgsql
@@ -525,84 +544,120 @@ pushd $RPM_BUILD_ROOT/usr/lib/pgsql/contrib
# Get rid of useless makefiles
rm -f Makefile */Makefile
-# earthdistance
-pushd earthdistance
-perl -pi -e "s|/usr/share/pgsql/contrib|/usr/lib/pgsql/contrib/earthdistance|" *
-popd
# array
pushd array
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/array|" *
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/array|" *
+popd
+
+# btree_gist
+pushd btree_gist
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/btree_gist|" *.sql
+popd
+
+# chkpass
+pushd chkpass
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/chkpass|" *.sql
popd
# cube
pushd cube
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/cube|" cube.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/cube|" cube.sql
+popd
+
+# dblink
+pushd dblink
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/dblink|" dblink.sql
+popd
+
+# earthdistance
+pushd earthdistance
+perl -pi -e "s|/usr/share/pgsql/contrib|/usr/lib/pgsql/contrib/earthdistance|" *.sql
popd
# fulltext
pushd fulltextindex
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/fulltextindex|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/fulltextindex|" *.sql
+popd
+
+# fuzzystrmatch
+pushd fuzzystrmatch
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/fuzzystrmatch|" *.sql
popd
# intarray
pushd intarray
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/intarray|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/intarray|" *.sql
popd
# isbn_issn
pushd isbn_issn
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/isbn_issn|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/isbn_issn|" *.sql
popd
# lo
pushd lo
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/lo|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/lo|" *.sql
popd
# miscutil
pushd miscutil
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/miscutil|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/miscutil|" *.sql
popd
-# noup
+# noupdate
pushd noupdate
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/noupdate|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/noupdate|" *.sql
popd
# pgcrypto
pushd pgcrypto
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/pgcrypto|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/pgcrypto|" *.sql
popd
+# pgstattuple
+pushd pgstattuple
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/pgstattuple|" *.sql
+popd
# rserv
pushd rserv
perl -pi -e "s|/usr/share/|/usr/lib/|" *
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/rserv|" *
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib|" *
perl -pi -e "s|/usr/bin|/usr/lib/pgsql/contrib/rserv|" *
-perl -pi -e "s|/usr/lib/pgsql/contrib\"|/usr/lib/pgsql/contrib/rserv\"|" *
-perl -pi -e "s|/usr/lib/pgsql/contrib$|/usr/lib/pgsql/contrib/rserv|" *
+popd
+
+# rtree_gist
+pushd pgstattuple
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib|" *.sql
popd
# seg
pushd seg
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/seg|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib|" *.sql
popd
# spi
pushd spi
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/spi|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/spi|" *.sql
popd
+# Don"t need these
+rm -fr startscripts
+
# string
pushd string
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/string|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/string|" *.sql
+popd
+
+# tsearch
+pushd tsearch
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/tsearch|" *.sql
popd
# userlock
pushd userlock
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/userlock|" *.sql
+perl -pi -e "s|\\\$libdir|/usr/lib/pgsql/contrib/userlock|" *.sql
popd
popd
@@ -619,6 +674,14 @@ ln -s libpq.so.2 libpq.so.2.0
popd
+%find_lang libpq
+%find_lang pg_dump
+%find_lang postgres
+%find_lang psql
+
+cat psql.lang pg_dump.lang > main.lst
+cat postgres.lang files.lst > server.lst
+
%pre
# Need to make backups of some executables if an upgrade
# They will be needed to do a dump of the old version's database.
@@ -696,7 +759,7 @@ rm -f perlfiles.list
# Note that macros such as config are available in those lists.
# The lists differentiate between RedHat, SuSE, and others.
-%files
+%files -f main.lst
%defattr(-,root,root)
%doc doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
%doc COPYRIGHT README HISTORY doc/bug.template
@@ -736,14 +799,14 @@ rm -f perlfiles.list
%dir /usr/lib/pgsql/contrib/
/usr/lib/pgsql/contrib/*
-%files libs
+%files libs -f libpq.lang
%defattr(-,root,root)
/usr/lib/libpq.so.*
/usr/lib/libecpg.so.*
/usr/lib/libpq++.so.*
/usr/lib/libpgeasy.so.*
-%files server -f files.lst
+%files server -f server.lst
%defattr(-,root,root)
/usr/bin/initdb
/usr/bin/initlocation
@@ -753,7 +816,6 @@ rm -f perlfiles.list
/usr/bin/postgres
/usr/bin/postgresql-dump
/usr/bin/postmaster
-/usr/bin/rh-pgdump.sh
%{_mandir}/man1/initdb.1*
%{_mandir}/man1/initlocation.1*
%{_mandir}/man1/ipcclean.1*
@@ -784,12 +846,14 @@ rm -f perlfiles.list
/usr/lib/libecpg.so
/usr/lib/libpq++.so
/usr/lib/libpgeasy.so
-/usr/lib/libpgtcl.so
/usr/lib/libpq.a
/usr/lib/libecpg.a
/usr/lib/libpq++.a
/usr/lib/libpgeasy.a
+%if tcl
+/usr/lib/libpgtcl.so
/usr/lib/libpgtcl.a
+%endif
%{_mandir}/man1/ecpg.1*
%{_mandir}/man1/pg_config.1*
@@ -848,8 +912,10 @@ rm -f perlfiles.list
%if %jdbc
%files jdbc
%defattr(-,root,root)
-/usr/share/pgsql/jdbc7.0-1.1.jar
+/usr/share/pgsql/jdbc7.1-1.1.jar
/usr/share/pgsql/jdbc7.1-1.2.jar
+/usr/share/pgsql/jdbc7.2dev-1.1.jar
+/usr/share/pgsql/jdbc7.2dev-1.2.jar
%endif
%if %test
@@ -860,32 +926,39 @@ rm -f perlfiles.list
%endif
%changelog
-* Mon Feb 4 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-0.7
-- 7.2
-
-* Thu Jan 31 2002 Elliot Lee <sopwith(a)redhat.com> 7.2rc2-0.3
-- Fix python dependencies
-
-* Mon Jan 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc2-0.2
-- Added Elliot Lee's python quote enhancement patch
-
-* Fri Jan 25 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc2-0.1
-- 7.2rc2
-- Patches now included mainstream
-
-* Wed Jan 23 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc1-0.2
-- fix perl
-
-* Wed Jan 23 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc1-0.1
-- 7.2rc1
-- Disable perl for now, it doesn't build...
-- autoconf fixes
-
-* Thu Jan 17 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2b5-0.3
-- Work around buggy autoconf test (AC_PROG_CC_WORKS)
-
-* Tue Jan 15 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2b5-0.2
-- 7.2b5
+* Mon Feb 18 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-3
+- Don't require tcl-devel, it's just tcl
+- Fix contrib. A lot. Again (last time in 7.1)
+- Add buildprereq of recent patch (#59910)
+- make the initscript 0755
+
+* Fri Feb 8 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-2
+- Sync
+- Fix output of backslash-ns from upgrade detection
+- Make the default config use socket credentials, not trust
+- Add patches for tsearch/gist from Oleg Bartunov <oleg(a)sai.msu.su>
+- Deprecate rh-pgdump script. Dump before upgrading, restore afterwards.
+ And ask the developers to fix it.
+- Dependency and file inclusion enhancements for conditionals
+- escape previous changelog entry which didn't escape a macro
+- python quote enhancement patch added
+
+* Tue Feb 04 2002 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.2 final.
+- 7.2-1PGDG RPM release.
+- Integrate NLS build per Peter E.
+- Clean up a few things; undef beta for final build.
+- Newer JDBC -- point to correct website and 7.2 dev.
+- postgresql.init changes.
+- NLS build does funky %%defattr things; redhat-style-files.lst changed
+-- for execute permission on /etc/rc.d/init.d/postgresql
+
+* Sun Jan 27 2002 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.2rc2-0.1PGDG
+
+* Thu Nov 29 2001 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.2b3-0.3PGDG
+- beta conditionals for debugging, assertion checking, and no strip.
* Tue Nov 27 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
- Improve python version handling
diff --git a/sources b/sources
index 1cfe388..7c4347c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-57d69fb52be57f7caa91cccf7d24d199 file-lists.tar.gz
+75a05a4d34bceeb83d51f4cbde4d9952 file-lists.tar.gz
5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
4174777cd91f3cc96f91efb2e4e1bc7c postgresql-7.2.tar.gz
3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit 68d4798ff5f3820aac52a6f4bcd3b2062d6f2f18
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:38:47 2004 +0000
auto-import postgresql-7.2-0.7.1 from postgresql-7.2-0.7.1.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 3159d4b..3ed633e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,4 @@
-contrib-intarray.tar.gz
file-lists.tar.gz
migration-scripts.tar.gz
-postgresql-7.1.3.tar.gz
+postgresql-7.2.tar.gz
postgresql-dump.1.gz
diff --git a/README.rpm-dist b/README.rpm-dist
index 53779c7..f66e75e 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,8 +1,7 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 3.7, for PostgreSQL 7.1.3
+Version 3.99, for PostgreSQL 7.2 beta cycle.
Lamar Owen <lamar.owen(a)wgcr.org>
-Trond Eivind Glomsrd <teg(a)redhat.com>
-----------------------------------------------------------------------------
Contents:
@@ -49,11 +48,18 @@ These RPMs are designed to be LSB-compliant -- if you find this not to be the
case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
list.
+NOTE:
+This RPMset is part of the PostgreSQL beta cycle. Beta means BETA -- there
+may be some rough edges. Testers are welcome; but please don't put this in
+production on a mission-critical system unless you know _exactly_ what you
+are doing. The first few 7.2beta RPMset's will likely have many problems --
+we will work through those as the cycle proceeds.
+
QUICKSTART
-----------------------------------------------------------------------------
If this is an upgrade, please go to section 3, UPGRADING.
If this is a fresh installation, simply start the postmaster using:
- /etc/rc.d/init.d/postgresql start (on Red Hat Linux and TurboLinux)
+ /etc/rc.d/init.d/postgresql start (on RedHat and TurboLinux)
On SuSE, please see the file 'README.linux' in this directory.
@@ -73,19 +79,19 @@ CREDITS
Thomas Lockhart
Uncle George
Ryan Kirkpatrick
-Trond Eivind Glomsrd <teg(a)redhat.com>
+Trond Eivind Glomsrd
Mark Knox
Mike Mascari
Nicolas Huillard
Karl DeBisschop
Roger Luethi
-Jeff Johnson <jbj(a)redhat.com>
+Jeff Johnson
Reinhard Max
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
-On Red Hat Linux, prior to version 6.5, PostgreSQL was packaged in RPM form in
+On RedHat Linux, prior to version 6.5, PostgreSQL was packaged in RPM form in
three (or four) packages:
postgresql: The server and documentation
@@ -119,7 +125,7 @@ postgresql-contrib: The contrib source tree, as well as selected binaries.
For SuSE Linux <= 7.0, the packages are named differently, but with the same
functionality. Here is a mapping:
-SuSE: Red Hat Linux:
+SuSE: RedHat:
----- -----------------
postgres postgresql
pg_serv postgresql-server
@@ -135,13 +141,12 @@ There are other changes to the SuSE packages to make them conform to the
SuSE packaging standards. SuSE Linux has been shipping their own packages.
While the repackaging will initially cause some confusion, it makes it
-possible to set up a Red Hat Linux machine to be only a client -- the
-server is no longer required. The clients were split out -- after
-all, a person who needs the perl client may very well not need the tcl
-client, etc. And, the regression tests were added to give some
-confidence of the suitability of PostgreSQL, as well as the stability
-of the server machine. Additionally, the regression tests can be used
-to help find hardware errors.
+possible to set up a RedHat linux machine to be only a client -- the server
+is no longer required. The clients were split out -- after all, a person who
+needs the perl client may very well not need the tcl client, etc. And, the
+regression tests were added to give some confidence of the suitability of
+PostgreSQL, as well as the stability of the server machine. Additionally,
+the regression tests can be used to help find hardware errors.
RPM FILE LOCATIONS.
-----------------------------------------------------------------------------
@@ -154,7 +159,7 @@ subdirectories.
Different distributions have different ideas of some of these file locations.
In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
/usr/share/doc, /usr/share/doc/packages, or some other similar path. The
-Red Hat Linux 7 locations are listed below. On SuSE <7.1, substitute 'postgres' for
+RedHat 7 locations are listed below. On SuSE <7.1, substitute 'postgres' for
'postgresql' below, and 'pg_tk' for 'postgresql-tk' below.
However, the RPM's install the files like this:
@@ -173,7 +178,7 @@ Other shared data: /usr/share/pgsql
Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
Documentation SGML: /usr/share/doc/postgresql-docs-x.y.z
-The above list references the Red Hat Linux 7.x structure. These locations may
+The above list references the Red Hat 7.x structure. These locations may
change for other distributions. Use of 'rpm -ql' for each package is
recommended as the 'Official' location source.
@@ -203,41 +208,38 @@ the binary on-disk database format changing between major versions (like
between 6.3 and 6.4). However, a change from 6.5 to 6.5.3 does not change
the on-disk format.
-This property (feature, misfeature, bug, whatever) has been a known
-property of PostgreSQL since before it was called PostgreSQL -- it has
-always been this way. However, the means by which an upgrade is
-performed is not readily performed in a fully automated fashion, as a
-"dump-initdb-restore" cycle has to be performed. This doesn't appear
-to be too difficult -- however, dumping the old database requires the
-old executables -- and, if you've already done an rpm -U postgresql*
-(or upgraded from an older version of Red Hat Linux and didn't
-specifically exclude the postgresql rpms), you no longer have the
-older executables to dump your data. And your data is useless (until
-you reinstall the old version, that is). All RPM's prior to late
-releases of version 6.5. 1 have this upgrade issue.
-
-The newest RPM's for PostgreSQL attempt to make your job in upgrading
-a little easier. First, during the installation of the new RPM's, a
-copy is made of all the executable files and libraries necessary to
-make a backup of your data. Second, the initialization script in the
-new postgresql-server package detects the version of any database
-found -- if the version is old, then the startup of the new version is
-aborted. However, if no database is found, a new one is made.
-
-One thing must be remembered -- due to the restructuring of the
-PostgreSQL RPM's, you will have to manually select the
-postgresql-server package if you want the server -- it is not
-installed by default in an upgrade. You can either select it during
-the upgrade/install, or you can mount your Red Hat Linux CD and
+This property (feature, misfeature, bug, whatever) has been a known property of
+PostgreSQL since before it was called PostgreSQL -- it has always been this
+way. However, the means by which an upgrade is performed is not readily
+performed in a fully automated fashion, as a "dump-initdb-restore" cycle has
+to be performed. This doesn't appear to be too difficult -- however, dumping
+the old database requires the old executables -- and, if you've already done
+an rpm -U postgresql* (or upgraded from an older version of RedHat and didn't
+specifically exclude the postgresql rpms), you no longer have the older
+executables to dump your data. And your data is useless (until you reinstall
+the old version, that is). All RPM's prior to late releases of version 6.5.
+1 have this upgrade issue.
+
+The newest RPM's for PostgreSQL attempt to make your job in upgrading a little
+easier. First, during the installation of the new RPM's, a copy is made of
+all the executable files and libraries necessary to make a backup of your data.
+Second, the initialization script in the new postgresql-server package detects
+the version of any database found -- if the version is old, then the startup
+of the new version is aborted. However, if no database is found, a new one
+is made.
+
+One thing must be remembered -- due to the restructuring of the PostgreSQL
+RPM's, you will have to manually select the postgresql-server package if you
+want the server -- it is not installed by default in an upgrade. You can either
+select it during the upgrade/install, or you can mount your RedHat CD and
install manually with rpm -i.
-To facilitate upgrading, the postgresql-dump utility has been
-provided. Look at the man page for postgresql-dump to see its usage.
-All executables to restore the immediately prior version of the
-PostgreSQL database are placed in the directory /usr/lib/pgsql/backup,
-and are accessed by the postgresql-dump script. The directory
-/usr/lib/pgsql/backup is owned by the postgres user -- you can use
-this directory to hold dump files and preserve directories.
+To facilitate upgrading, the postgresql-dump utility has been provided. Look
+at the man page for postgresql-dump to see its usage. All executables to
+restore the immediately prior version of the PostgreSQL database are placed in
+the directory /usr/lib/pgsql/backup, and are accessed by the postgresql-dump
+script. The directory /usr/lib/pgsql/backup is owned by the postgres user --
+you can use this directory to hold dump files and preserve directories.
The basic sequence is:
(as user postgres):
@@ -306,40 +308,37 @@ If tests fail, please see the file regression.diffs in that directory. If
you need help interpreting that file, contact the pgsql-ports list on
postgresql.org.
-There are some tests that will almost always fail with Red Hat Linux
-5.x and 6.x installations. The geometry, float8, and on occassion the
-random test will fail. These failures are normal for Red Hat Linux
-5.2 and 6.1. For Red Hat Linux 6.1 with certain i18n settings, there
-will be other tests fail.
+There are some tests that will almost always fail with RedHat Linux 5.x and 6.x
+installations. The geometry, float8, and on occassion the random test will
+fail. These failures are normal for RedHat 5.2 and 6.1. For RedHat 6.1 with
+certain i18n settings, there will be other tests fail.
-For 7.1RC1, all 76 tests passed on Red Hat Linux 6.2 and RedHat
-7.0. This was accomplished by fiddling with the locale settings. In
-version 7.1.2 this capability was removed -- you need to set your
-locale to 'C' before executing the first postmaster startup, or many
-more regression tests will fail. With the locale set to 'C', all 76
-tests pass on Red Hat Linux 7.1.
+For 7.1RC1, all 76 tests passed on RedHat 6.2 and RedHat 7.0. This
+was accomplished by fiddling with the locale settings. In version 7.1.2 this
+capability was removed -- you need to set your locale to 'C' before executing
+the first postmaster startup, or many more regression tests will fail.
For interpretation of the regression tests, see the PostgreSQL documentation.
STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
-------------------------------------------------------------------------------
-Red Hat Linux uses the System V Init system. A startup script for PostgreSQL
+RedHat Linux uses the System V Init package. A startup script for PostgreSQL
is provided in the server package, as /etc/rc.d/init.d/postgresql. To start
-the postmaster, with sanity checking, as root, run "service postgresql start"
-to shut postmaster down, "service postgresql stop"
-
+the postmaster, with sanity checking, as root, run
+/etc/rc.d/init.d/postgresql start
+to shut postmaster down,
+/etc/rc.d/init.d/postgresql stop
There are other parameters to this script -- /etc/rc.d/init.d/postgresql for a
listing.
To get this script to run at system startup or any time the system switches into
-runlevels 3, 4, or 5, run 'chkconfig --add postgresql', and the proper symlinks
+runlevels 4, 5, or 6, run 'chkconfig --add postgresql', and the proper symlinks
will be created. Check the chkconfig man page for more information.
-This same script also works for TurboLinux, and any other distribution
-similar enough to Red Hat Linux. SuSE Linux uses a different
-approach, using a different location and a different script, found at
-either /sbin/init.d/postgres or /usr/sbin/rcpostgres. Please see the
-SuSE 'README.linux' for more information.
+This same script also works for TurboLinux, and any other distribution similar
+enough to RedHat. SuSE Linux uses a different approach, using a different
+location and a different script, found at either /sbin/init.d/postgres or
+/usr/sbin/rcpostgres. Please see the SuSE 'README.linux' for more information.
SuSE has maintained their own RPMset for some time -- their documentation
supercedes any found in this file.
@@ -369,9 +368,9 @@ you will need to rebuild from the source RPM. Download the .src.rpm for this
release. You will need to be root to rebuild, unless you have already set up
a non-root build environment.
-Install the source RPM with rpm -i, then CD to the rpm building area
-(on Red Hat Linux this is /usr/src/redhat by default). You will have
-to have a full development environment to rebuild the full RPM set.
+Install the source RPM with rpm -i, then CD to the rpm building area (on RedHat
+this is /usr/src/redhat by default). You will have to have a full development
+environment to rebuild the full RPM set.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
@@ -443,3 +442,4 @@ SuSE information is available at SuSE's website and information contacts.
+
diff --git a/postgresql.init b/postgresql.init
index 5d198eb..47d9cb5 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -39,8 +39,11 @@
# sync up.
# Karl's fixes for some quoting issues.
+# Version 7.2b2 Lamar Owen <lamar.owen(a)wgcr.org>
+# version change.
+
# PGVERSION is:
-PGVERSION=7.1.3
+PGVERSION=7.2
# Source function library.
INITD=/etc/rc.d/init.d
@@ -75,7 +78,7 @@ start(){
then
# Check version of existing PGDATA
- if [ `cat $PGDATA/PG_VERSION` != '7.1' ]
+ if [ `cat $PGDATA/PG_VERSION` != '7.2' ]
then
SYSDOCDIR="(Your System's documentation directory)"
if [ -d /usr/doc/postgresql-$PGVERSION ]
@@ -95,10 +98,17 @@ start(){
SYSDOCDIR=/usr/share/doc/packages
fi
echo
- echo $"An old version of the database format was found."
- echo $"You need to upgrade the data format before using PostgreSQL."
- echo $"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+ echo $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
exit 1
+# This doesn't seem to do anything useful...
+# else
+# if echo "$TYPESET"|grep "declare -f success ()" >/dev/null
+# then
+# success "$PSQL_CHECK"
+# else
+# echo " [ OK ]"
+# fi
+# echo
fi
# No existing PGDATA! Initdb it.
@@ -223,3 +233,4 @@ esac
exit 0
+
diff --git a/postgresql.spec b/postgresql.spec
index 6a57b72..e1c2e5c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -8,21 +8,22 @@
%{!?pltcl:%define pltcl 1}
%{?forceplperl:%define plperl %{expand:forceplperl}}
%{!?forceplperl:%define forceplperl 0}
-%{!?plperl:%define plperl 0}
+%{!?plperl:%define plperl 1}
%{!?ssl:%define ssl 1}
%{!?kerberos:%define kerberos 1}
# Utility feature defines.
%{!?enable_mb:%define enable_mb 1}
%{!?pgaccess:%define pgaccess 1}
-%{!?newintarray:%define newintarray 1}
# Python major version.
-%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%define pyver 2.2
+%define pymainver 2
+%define pynextver 2.3
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.1.3
+Version: 7.2
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -44,7 +45,7 @@ Version: 7.1.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 5.72
+Release: 0.7.1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -58,18 +59,17 @@ Source11: jdbc7.1-1.2.jar
Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
Source15: postgresql-bashprofile
-Source16: http://www.sai.msu.su/~megera/postgres/gist/code/7.1.2/contrib-intarray.t...
-Patch1: rpm-pgsql-7.1.patch
-Patch2: postgresql-7.1.plperl.patch
-Patch3: postgresql-7.1.s390x.patch
-Patch4: postgresql-7.1.3-security.patch
-Buildrequires: perl glibc-devel
+Patch1: rpm-pgsql-7.2.patch
+Patch2: postgresql-7.2rc2-betterquote.patch
+Buildrequires: perl glibc-devel autoconf
Prereq: /sbin/ldconfig initscripts
-BuildPrereq: python-devel perl tcl /lib/cpp
+BuildPrereq: python%{?pymainver}-devel perl tcl
+BuildPrereq: readline-devel >= 4.0
+BuildPrereq: zlib-devel >= 1.0.4
%if %ssl
BuildPrereq: openssl-devel
%endif
-%if %ssl
+%if %kerberos
BuildPrereq: krb5-devel
%endif
Url: http://www.postgresql.org/
@@ -103,7 +103,8 @@ Obsoletes: postgresql-test
-# This is the PostgreSQL Global Development Group Official RPMset spec file.
+# This is the PostgreSQL Global Development Group Official RPMset spec file,
+# or a derivative thereof.
# Copyright 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
# and others listed.
@@ -114,6 +115,7 @@ Obsoletes: postgresql-test
# Thomas Lockhart
# Reinhard Max
# Karl DeBisschop
+# Peter Eisentraut
# and others in the Changelog....
# This spec file and ancilliary files are licensed in accordance with
@@ -147,7 +149,7 @@ if you're installing the postgresql-server package.
%package libs
Summary: The shared libraries required for any PostgreSQL clients.
Group: Applications/Databases
-Provides: libpq.so.2.1 libpq.so.2.0 libpq.so
+Provides: libpq.so.2 libpq.so.2.0 libpq.so
%description libs
The postgresql-libs package provides the essential shared libraries for any
@@ -274,9 +276,8 @@ to use when writing Perl code for accessing a PostgreSQL database.
%package python
Summary: Development module for Python code to access a PostgreSQL DB.
Group: Applications/Databases
-Requires: python >= 1.5 mx
-Conflicts: python >= 1.6
-
+Requires: mx%{?pymainver}
+Requires: python%{?pymainver} >= %pyver, python < %pynextver
%description python
PostgreSQL is an advanced Object-Relational database management
@@ -315,34 +316,7 @@ system, including regression tests and benchmarks.
%setup -q
%patch1 -p1
-
-#PL/Perl stuff
%patch2 -p1
-%patch3 -p1
-
-#Backpatched security fixes
-%patch4 -p1
-
-
-%if %forceplperl
-FORCEPLPERL=--force
-%else
-FORCEPLPERL=
-%endif
-
-%if %plperl
- pushd src/pl/plperl
- EXTRA_INCLUDES=-I../../include plperl_installdir=$RPM_BUILD_ROOT/usr/lib perl Makefile.PL $FORCEPLPERL
- popd
-%endif
-
-# Add (optional) newer intarray with bugfixes over the included one
-%if %newintarray
- pushd contrib
- rm -fr intarray
- tar xvzf %{SOURCE16}
- popd
-%endif
%build
@@ -356,12 +330,15 @@ tar xzf %{SOURCE4}
# cp /usr/share/libtool/config.* .
#fi
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
+
# Strip out -ffast-math from CFLAGS....
-CFLAGS=`echo $RPM_OPT_FLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-export CXXFLAGS="$CFLAGS"
+CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+export PYTHON="/usr/bin/python%{pyver}"
-./configure --enable-locale --with-CXX --prefix=/usr\
+./configure --enable-locale --with-CXX --prefix=/usr --disable-rpath\
%if %perl
--with-perl \
%endif
@@ -391,28 +368,10 @@ export CXXFLAGS="$CFLAGS"
--sysconfdir=/etc/pgsql \
--mandir=%{_mandir} \
--docdir=%{_docdir} \
- --includedir=%{_includedir}/pgsql \
+ --includedir=%{_includedir} \
--datadir=/usr/share/pgsql
-make COPT="$CFLAGS" all
-
-%if %plperl
- pushd src/pl/plperl
- make INC=-I../../include
- popd
-%endif
-
-%if %python
- pushd src
- pushd interfaces/python
- cp /usr/lib/python%{pyver}/config/Makefile.pre.in .
- echo *shared* > Setup
- echo _pg pgmodule.c -I../../include -I../libpq -L../libpq -lpq -lcrypt >> Setup
- make -f Makefile.pre.in boot
- make
- popd
- popd
-%endif
+make %{?_smp_mflags} all
%if %test
pushd src/test
@@ -423,19 +382,9 @@ make COPT="$CFLAGS" all
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%if %plperl
-make DESTDIR=$RPM_BUILD_ROOT -C src/pl/plperl install
-#cp blib/arch/auto/plperl/plperl.so $RPM_BUILD_ROOT/usr/lib
-%endif
+make DESTDIR=$RPM_BUILD_ROOT install
%if %perl
- pushd src/interfaces/perl5
- perl -pi -e "s|LD_RUN_PATH=\".*PATH\)\"||" Makefile
- perl -pi -e "s|LD_RUN_PATH =.*$||" Makefile
- popd
-
make PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 -f Makefile install
# Get rid of the packing list generated by the perl Makefile, and build my own...
@@ -465,14 +414,10 @@ make DESTDIR=$RPM_BUILD_ROOT -C src/pl/plperl install
%endif
-make -C doc
-
# man pages....
-pushd $RPM_BUILD_ROOT%{_mandir}
-tar xzf $RPM_BUILD_DIR/postgresql-%{version}/doc/man.tar.gz
-
# the postgresql-dump manpage.....
+pushd $RPM_BUILD_ROOT%{_mandir}
cp %{SOURCE12} man1
popd
@@ -484,13 +429,6 @@ install -m755 %SOURCE14 $RPM_BUILD_ROOT/usr/bin/
make DESTDIR=$RPM_BUILD_ROOT install-all-headers
-#fixup directory permissions for SPI stuff...
-#pushd $RPM_BUILD_ROOT/usr/include/pgsql
-#chmod 755 access catalog executor nodes rewrite storage tcop utils
-#popd
-
-#popd
-
# copy over Makefile.global to the include dir....
install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
@@ -506,15 +444,6 @@ install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
popd
%endif
-%if %python
- # Python
- pushd src/interfaces/python
- # Makefile.pre.in doesn't yet support .py files anyway, so we stick to a manual installation
- mkdir -p $RPM_BUILD_ROOT/usr/lib/python%{pyver}/site-packages
- install -m 755 _pgmodule.so *.py $RPM_BUILD_ROOT/usr/lib/python%{pyver}/site-packages/
- popd
-%endif
-
%if %jdbc
# Java/JDBC
# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
@@ -525,10 +454,6 @@ install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
%endif
-# Fixup more permissions...
-chmod 644 $RPM_BUILD_ROOT%{_mandir}/*/*
-chmod +x $RPM_BUILD_ROOT/usr/lib/lib*.so.*
-
# The initscripts....
# Redhat-style....
if [ -d /etc/rc.d/init.d ]
@@ -554,10 +479,6 @@ install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
# backups of data go here...
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
-# Move the PL's to the right place
-mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql
-mv $RPM_BUILD_ROOT/usr/lib/pl*.so $RPM_BUILD_ROOT/usr/lib/pgsql
-
# postgres' .bash_profile
install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
@@ -566,7 +487,6 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
# them anyway for completeness.
mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
- install -m 0755 config/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
pushd $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress/
@@ -586,9 +506,7 @@ popd
#chmod 0644 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
# Fix some more documentation
-# no need for the OS2 client
-rm -rf contrib/os2client
-gzip doc/internals.ps
+# gzip doc/internals.ps
cp %{SOURCE6} README.rpm-dist
mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
@@ -672,11 +590,6 @@ pushd seg
perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/seg|" *.sql
popd
-# soundex
-pushd soundex
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/soundex|" *.sql
-popd
-
# spi
pushd spi
perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/spi|" *.sql
@@ -694,20 +607,15 @@ popd
popd
-# Fix a dangling symlink
-mkdir -p $RPM_BUILD_ROOT/usr/include/pgsql/port
-cp src/include/port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/port/
-ln -sf port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/os.h
-
#more broken symlinks
rm -f $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_controldata/pg_crc.c
cp src/backend/utils/hash/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c
ln $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_controldata/pg_crc.c
-# Symlink libpq.so.2.0 to libpq.so.2.1 for backwards compatibility, until
+# Symlink libpq.so.2.0 to libpq.so.2 for backwards compatibility, until
# -soname patches are the norm.
pushd $RPM_BUILD_ROOT/usr/lib
-ln -s libpq.so.2.1 libpq.so.2.0
+ln -s libpq.so.2 libpq.so.2.0
popd
@@ -802,6 +710,8 @@ rm -f perlfiles.list
/usr/bin/dropuser
/usr/bin/pg_dump
/usr/bin/pg_dumpall
+/usr/bin/pg_encoding
+/usr/bin/pg_id
/usr/bin/pg_restore
/usr/bin/psql
/usr/bin/vacuumdb
@@ -814,7 +724,8 @@ rm -f perlfiles.list
%{_mandir}/man1/pg_dump.1*
%{_mandir}/man1/pg_dumpall.1*
%{_mandir}/man1/psql.1*
-%{_mandir}/manl/*
+%{_mandir}/man1/vacuumdb.1*
+%{_mandir}/man7/*
%files docs
%defattr(-,root,root)
@@ -822,10 +733,9 @@ rm -f perlfiles.list
%files contrib
%defattr(-,root,root)
-%dir /usr/lib/pgsql/contrib
+%dir /usr/lib/pgsql/contrib/
/usr/lib/pgsql/contrib/*
-
%files libs
%defattr(-,root,root)
/usr/lib/libpq.so.*
@@ -839,8 +749,6 @@ rm -f perlfiles.list
/usr/bin/initlocation
/usr/bin/ipcclean
/usr/bin/pg_ctl
-/usr/bin/pg_encoding
-/usr/bin/pg_id
/usr/bin/pg_passwd
/usr/bin/postgres
/usr/bin/postgresql-dump
@@ -853,12 +761,9 @@ rm -f perlfiles.list
%{_mandir}/man1/pg_passwd.1*
%{_mandir}/man1/postgres.1*
%{_mandir}/man1/postmaster.1*
-%{_mandir}/man1/vacuumdb.1*
%{_mandir}/man1/postgresql-dump.1*
-/usr/share/pgsql/global.bki
-/usr/share/pgsql/global.description
-/usr/share/pgsql/template1.bki
-/usr/share/pgsql/template1.description
+/usr/share/pgsql/postgres.bki
+/usr/share/pgsql/postgres.description
/usr/share/pgsql/*.sample
/usr/lib/pgsql/plpgsql.so
%dir /usr/lib/pgsql
@@ -872,21 +777,26 @@ rm -f perlfiles.list
%files devel
%defattr(-,root,root)
-%dir /usr/include/pgsql
-/usr/include/pgsql/*
+/usr/include/*
/usr/bin/ecpg
-/usr/lib/lib*.a
/usr/bin/pg_config
/usr/lib/libpq.so
/usr/lib/libecpg.so
/usr/lib/libpq++.so
/usr/lib/libpgeasy.so
+/usr/lib/libpgtcl.so
+/usr/lib/libpq.a
+/usr/lib/libecpg.a
+/usr/lib/libpq++.a
+/usr/lib/libpgeasy.a
+/usr/lib/libpgtcl.a
%{_mandir}/man1/ecpg.1*
+%{_mandir}/man1/pg_config.1*
%if %tcl
%files tcl
%defattr(-,root,root)
-%attr(755,root,root) /usr/lib/libpgtcl.so*
+%attr(755,root,root) /usr/lib/libpgtcl.so.*
/usr/bin/pgtclsh
%{_mandir}/man1/pgtclsh.1*
/usr/lib/pgsql/pltcl.so
@@ -898,6 +808,7 @@ rm -f perlfiles.list
/usr/bin/pgtksh
%{_mandir}/man1/pgtksh.1*
%endif
+
%if %pgaccess
%doc doc/pgaccess/*
/usr/share/pgsql/pgaccess
@@ -908,8 +819,7 @@ rm -f perlfiles.list
%if %odbc
%files odbc
%defattr(-,root,root)
-%attr(755,root,root) /usr/lib/libpsqlodbc.so*
-%config(noreplace) /etc/pgsql/odbcinst.ini
+%attr(755,root,root) /usr/lib/libpsqlodbc.so
/usr/share/pgsql/odbc.sql
%endif
@@ -945,218 +855,60 @@ rm -f perlfiles.list
%if %test
%files test
%defattr(-,postgres,postgres)
-%dir /usr/lib/pgsql/test
-%attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
+%attr(-,postgres,postgres) /usr/lib/pgsql/test/*
%attr(-,postgres,postgres) %dir /usr/lib/pgsql/test
-%attr(-,postgres,postgres)/usr/lib/pgsql/test/*
%endif
%changelog
-* Tue Nov 04 2003 David Jee <djee(a)redhat.com> [7.1.3-5.72]
-- Add to the security patch a fix for to_ascii() buffer overrun.
-[Bug #108578]
-- Add to the security patch another fix that avoids running off
-the end of to_timestamp()'s input string when the input is shorter
-than the format string expects. [Bug #109067]
-
-* Wed Jan 9 2003 Andrew Overholt <overholt(a)redhat.com> [7.1.3-4bp.2]
-- Addition to security backpatch
-
-* Mon Dec 16 2002 Andrew Overholt <overholt(a)redhat.com> [7.1.3-4bp]
-- Add backpatching of security fixes from 7.2.2 and 7.3.
-
-* Mon Aug 20 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.3-2
-- Fix usage of "Red Hat Linux" in the README.rpm-dist, do other minor
- fixes to this file
-- Don't use newlines inside strings in the initscript
-
-* Mon Aug 20 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.3-1
-- Updated README.rpm-dist from Lamar.
-- Make sure "Red Hat" and "Red Hat Linux" are used properly in the README.rpm-dist
-- Work around the horror that is perl's Makefile generation
- (LD_RUN_PATH is not a good thing) (#51957)
-- 7.1.3, stable bugfix release. Remove patches from CVS as they are now included
-- Own more directories
-
-* Mon Aug 6 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.2-7
-- Add patches from 7.1-stable branch. This should fix #50799 and #50797
-- Enable kerberos authentication (#50644)
-- handle stop with stale pid file (#50499)
-- make the test subpackage (not built by default) own /usr/lib/pgsql/test
-
-* Mon Jul 9 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Make the -devel subpackage depend on -libs, not the main package
-
-* Tue Jun 19 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Make sure the python subpackage depends on mx - otherwise, you'd get an
- error when importing
-
-* Mon Jun 18 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
-- add changes for s390x
-
-* Fri Jun 15 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Many path fixes for contrib packages
-- Newer intarray
-- Don't use nested ifs for tkpkg/pgaccess
-- Turn off test package for Red Hat Linux - it makes most sense just to use
- this during development
-- One "pgacess" -> "pgaccess"
-
-* Wed Jun 13 2001 Lamar Owen <lamar.owen(a)wgcr.org> <lamar(a)postgresql.org>
-- -4PGDG
-- patchset update for pg_regress.sh
-- can the dot in the release -- confused too many people and some programs.
-- -3.PGDG
-- updated README.rpm-dist
-- updated patch to 7.1.2, fixing some places where /usr/share/pgsql
- was still being used where /usr/lib/pgsql was intended.
-- PGLIB now set to /usr/lib/pgsql -- initdb doesn't use it to find the bki's.
-
-* Tue Jun 12 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- sync
-- Run chkconfig --add on server install
-- Move the prereqs on useradd on chkconfig to the server package
-- don't disable the %%clean section
-
-* Sat Jun 09 2001 Lamar Owen <lamar.owen(a)wgcr.org>
-- Sync up with Trond Eivind's set.
-
-* Thu Jun 7 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Don't create postgres' .bashrc from the server post script: include it instead
-- Move the test packages from /usr/share/pgsql to /usr/lib/pgsql
-- Move the symlinks libpq.so, libecpg.so, libpq++.so and libpgeasy.so to the devel subpackage from
- libs
-- Source the i18n data from the .bashrc instead of in the initscript
-
-* Mon May 28 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Handle i18n for database startup - backend needs to have the same locale everytime,
- but this certainly can't be hardcoded to C either
-- Fix stop, restart in initscript (#42217)
-- Make database init _much_ less verbose
-- other minor fixes to the initscript
-
-* Fri May 25 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- 7.1.2
-
-* Thu May 24 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- 7.1.2-0.1.1.PGDG PRERELEASE
-- Changed versioning and release numbering a little for better flexibility,
--- particularly for distribution packagers.
-- Release numbering comment at top of spec, where it's more useful.
-- Trimmed changelog to 7.1.x. See the last 7.0.3's specfile for the 7.0
- changlog, and the last 6.5.3's specfile for the changelog prior to
- 7.0.
-
-* Sun May 20 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- 7.1.1-4.PGDG
-- _really_ got Python version agnosticism working.
-
-* Sat May 19 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- 7.1.1-3.PGDG Release
-- Python version agnosticism.....
-
-* Tue May 15 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Use openssl
-- Make it obsolete subpackages if they aren't built
-
-* Mon May 14 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- 7.1.1-2.PGDG Release.
-- Appended .PGDG to release string to differentiate our RPM set from the others.
-- /bin/sh fix in initscript
-- README.rpm-dist updates.
-
-* Mon May 14 2001 Bernhard Rosenkraenzer <bero(a)redhat.com> 7.1.1-0.7
-- Rebuild with new readline
-
-* Thu May 10 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Initial 7.1.1
-
-* Mon May 7 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- Specify shell when running commands through su in the initscript, to avoid problems
- when people switch the postgres user to use tcsh
-
-* Thu Apr 19 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- JDBC driver for Postgresql 7.1
-
-* Sun Apr 15 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- slightly different versioning scheming, will go back to the official
- later when I'm sure the package is ready to use
-
-* Fri Apr 13 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- 7.1 RELEASE
-- 7.1-1 RPM RELEASE
-- Change to COPTS -- strip out -ffastmath -- Considered Harmful.
-- Back to old versioning scheme, kept teg's other fixes.
-- README.rpm-dist updated.
-- PGVERSION updated all-around (hopefully!)
-- Couple of fixes from Peter E.
-- Rearrange dependencies -- only the -libs subpackage is required for most stuff
-- Removed broken and confusing logrotate script.
-
-* Mon Apr 9 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- chown considered harmful - removed
-- fix dangling symlimks (pg_crc.c)
-- libpq.so changes for maximum compatiblity
-- different versioning scheme, to avoid trouble later
-- remove temporary perl file from the file list
-- fix spelling error in tcl description
-- mark odbcinst.ini as a config file
-- use %%defattr on packages which didn't have it
-
-* Sat Apr 07 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- Integrated the PL/Perl stuff from Karl DeBisschop --conditional.
-- Packaging reorg: added contrib and docs subpackages.
-- Removed sgml source docs from main package --> docs subpackage.
-- Removed contrib tree from main package --> contrib subpackage.
-- Contrib tree is now prebuilt -- HOWEVER, very little install work is
- currently done with this.
-
-* Fri Apr 06 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- Quickie RC3. There will be a 7.1RC3-2 shortly with other stuff.
-
-* Tue Apr 03 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- RC2
-- eliminate versioning information for ancilliary files in prep for CVS.
-- Fix docs mixup.
-
-* Tue Mar 27 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
-- RC1 quickie.
-
-* Tue Mar 20 2001 Lamar Owen <lamar(a)postgresql.org>
-- Beta 6 initial build.
-- Use make install-all-headers instead of cpio hack for devel headers.
-- Split out the libs into the libs subpackage.
-- Updated initscript to use pg_ctl to stop
-- Updated initscript to initdb and start postmaster with LC_ALL=C to
- prevent index corruption.
-
-
-* Sun Jan 28 2001 Lamar Owen <lamar(a)postgresql.org>
-- Beta4
-- Return to 'pgsql' directories instead of 'postgresql'
-- Better perl patches.
-
-* Mon Jan 15 2001 Lamar Owen <lamar(a)postgresql.org>
-- Edit patches to get rid of some cruft.
-- Eliminate some more pre-7.1 specfile baggage that is no longer necessary.
-- Moved pg_id to server
-- added Makefile.global and pg_config to devel
-- Corrected /usr/include/pgsql to /usr/include/postgresql
-- Fixed some configure options. Will be trying the configure macro next release
-- Since it is terminally ill in this version pg_upgrade is _gone_.
-- Thanks to Peter E for a good review.
-
-* Sun Jan 14 2001 Lamar Owen <lamar(a)postgresql.org>
-- Running regression. 1 on the release-o-meter.
-- Minor patches to get regression running right.
-- Initscript tweaking -- the old test for a database structure fails with 7.1's new structure.
-
-* Sat Jan 13 2001 Lamar Owen <lamar(a)postgresql.org>
-- Perl 5 needs to be built with PREFIX set on the Makefile, not GNUmakefile....
-- The 7.1 build is different from the 7.0 build -- see the configure line.
-- NOTE: many files that used to be in /usr/share/postgresql are now in /usr/share/postgresql!
-- by request, conditional packages are now supported. See the top of the spec.
-- Fixed the server postinstall problems.
-
-* Mon Jan 08 2001 Lamar Owen <lamar(a)postgresql.org>
-- First 7.1 beta test-build
+* Mon Feb 4 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2-0.7
+- 7.2
+
+* Thu Jan 31 2002 Elliot Lee <sopwith(a)redhat.com> 7.2rc2-0.3
+- Fix python dependencies
+
+* Mon Jan 28 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc2-0.2
+- Added Elliot Lee's python quote enhancement patch
+
+* Fri Jan 25 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc2-0.1
+- 7.2rc2
+- Patches now included mainstream
+
+* Wed Jan 23 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc1-0.2
+- fix perl
+
+* Wed Jan 23 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2rc1-0.1
+- 7.2rc1
+- Disable perl for now, it doesn't build...
+- autoconf fixes
+
+* Thu Jan 17 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2b5-0.3
+- Work around buggy autoconf test (AC_PROG_CC_WORKS)
+
+* Tue Jan 15 2002 Trond Eivind Glomsrd <teg(a)redhat.com> 7.2b5-0.2
+- 7.2b5
+
+* Tue Nov 27 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Improve python version handling
+
+* Fri Nov 23 2001 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.2b3-0.2PGDG
+- second beta3 tarball.
+
+* Thu Nov 22 2001 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.2b3-0.1PGDG
+- Beta3
+- Docs changes --man pages back, internals.ps gone.
+- manl (letter 'ell') is now 'man7'.
+
+* Mon Nov 19 2001 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.2b2-0.1PGDG
+- --disable-rpath configure option.
+
+* Fri Oct 26 2001 Lamar Owen <lamar.owen(a)wgcr.org>
+- Actual PGDG 7.2b1.
+
+* Mon Oct 01 2001 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.2alpha-0.1PGDG
+- Merged some changes from Peter Eisentraut for7.2.
+- Cleaned up some legacy junk.
+- Prepare for 7.2 beta cycle.
diff --git a/sources b/sources
index 6c4f126..1cfe388 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
-85e9b43217c22ca22a45b3a831f7df4a contrib-intarray.tar.gz
57d69fb52be57f7caa91cccf7d24d199 file-lists.tar.gz
5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
-a92c77092034fb35c7b3bb82beebd54b postgresql-7.1.3.tar.gz
+4174777cd91f3cc96f91efb2e4e1bc7c postgresql-7.2.tar.gz
3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit 4fcf7007a779f3187a68ff023f361517e55707d7
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:38:30 2004 +0000
auto-import changelog data from postgresql-7.1.3-5.72.src.rpm
Tue Nov 04 2003 David Jee <djee(a)redhat.com> [7.1.3-5.72]
- Add to the security patch a fix for to_ascii() buffer overrun. [Bug
#108578]
- Add to the security patch another fix that avoids running off the end of
to_timestamp()'s input string when the input is shorter than the format
string expects. [Bug #109067]
diff --git a/postgresql.spec b/postgresql.spec
index c791d5f..6a57b72 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -44,7 +44,7 @@ Version: 7.1.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 4bp.2
+Release: 5.72
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -952,6 +952,13 @@ rm -f perlfiles.list
%endif
%changelog
+* Tue Nov 04 2003 David Jee <djee(a)redhat.com> [7.1.3-5.72]
+- Add to the security patch a fix for to_ascii() buffer overrun.
+[Bug #108578]
+- Add to the security patch another fix that avoids running off
+the end of to_timestamp()'s input string when the input is shorter
+than the format string expects. [Bug #109067]
+
* Wed Jan 9 2003 Andrew Overholt <overholt(a)redhat.com> [7.1.3-4bp.2]
- Addition to security backpatch
commit 04df73802b27eb36454cc05a362bf62cee126a32
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:38:15 2004 +0000
auto-import postgresql-7.1.3-4bp.2 from postgresql-7.1.3-4bp.2.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index 529b044..c791d5f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -44,7 +44,7 @@ Version: 7.1.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 3
+Release: 4bp.2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -62,6 +62,7 @@ Source16: http://www.sai.msu.su/~megera/postgres/gist/code/7.1.2/contrib-intarra
Patch1: rpm-pgsql-7.1.patch
Patch2: postgresql-7.1.plperl.patch
Patch3: postgresql-7.1.s390x.patch
+Patch4: postgresql-7.1.3-security.patch
Buildrequires: perl glibc-devel
Prereq: /sbin/ldconfig initscripts
BuildPrereq: python-devel perl tcl /lib/cpp
@@ -319,6 +320,9 @@ system, including regression tests and benchmarks.
%patch2 -p1
%patch3 -p1
+#Backpatched security fixes
+%patch4 -p1
+
%if %forceplperl
FORCEPLPERL=--force
@@ -948,8 +952,11 @@ rm -f perlfiles.list
%endif
%changelog
-* Wed Sep 12 2001 Tim Powers <timp(a)redhat.com>
-- rebuild with new gcc and binutils
+* Wed Jan 9 2003 Andrew Overholt <overholt(a)redhat.com> [7.1.3-4bp.2]
+- Addition to security backpatch
+
+* Mon Dec 16 2002 Andrew Overholt <overholt(a)redhat.com> [7.1.3-4bp]
+- Add backpatching of security fixes from 7.2.2 and 7.3.
* Mon Aug 20 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.3-2
- Fix usage of "Red Hat Linux" in the README.rpm-dist, do other minor
commit 48d7a1429d78edbd84d1b747d64cd44cd617ea8f
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:37:36 2004 +0000
auto-import postgresql-7.1.3-3 from postgresql-7.1.3-3.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index f886a30..529b044 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -44,7 +44,7 @@ Version: 7.1.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 2
+Release: 3
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -948,6 +948,9 @@ rm -f perlfiles.list
%endif
%changelog
+* Wed Sep 12 2001 Tim Powers <timp(a)redhat.com>
+- rebuild with new gcc and binutils
+
* Mon Aug 20 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.3-2
- Fix usage of "Red Hat Linux" in the README.rpm-dist, do other minor
fixes to this file
commit 4b041776e8929c37ca4e0715ecbc6ea888f860be
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:37:12 2004 +0000
auto-import postgresql-7.1.3-2 from postgresql-7.1.3-2.src.rpm
diff --git a/README.rpm-dist b/README.rpm-dist
index 507f74b..53779c7 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,7 +1,8 @@
README.rpm-dist
-----------------------------------------------------------------------------
-Version 3.6, for PostgreSQL 7.1.3
+Version 3.7, for PostgreSQL 7.1.3
Lamar Owen <lamar.owen(a)wgcr.org>
+Trond Eivind Glomsrd <teg(a)redhat.com>
-----------------------------------------------------------------------------
Contents:
@@ -52,7 +53,7 @@ QUICKSTART
-----------------------------------------------------------------------------
If this is an upgrade, please go to section 3, UPGRADING.
If this is a fresh installation, simply start the postmaster using:
- /etc/rc.d/init.d/postgresql start (on RedHat and TurboLinux)
+ /etc/rc.d/init.d/postgresql start (on Red Hat Linux and TurboLinux)
On SuSE, please see the file 'README.linux' in this directory.
@@ -72,19 +73,19 @@ CREDITS
Thomas Lockhart
Uncle George
Ryan Kirkpatrick
-Trond Eivind Glomsrd
+Trond Eivind Glomsrd <teg(a)redhat.com>
Mark Knox
Mike Mascari
Nicolas Huillard
Karl DeBisschop
Roger Luethi
-Jeff Johnson
+Jeff Johnson <jbj(a)redhat.com>
Reinhard Max
POSTGRESQL RPM PACKAGES AND RATIONALE.
-----------------------------------------------------------------------------
-On RedHat Linux, prior to version 6.5, PostgreSQL was packaged in RPM form in
+On Red Hat Linux, prior to version 6.5, PostgreSQL was packaged in RPM form in
three (or four) packages:
postgresql: The server and documentation
@@ -118,7 +119,7 @@ postgresql-contrib: The contrib source tree, as well as selected binaries.
For SuSE Linux <= 7.0, the packages are named differently, but with the same
functionality. Here is a mapping:
-SuSE: RedHat:
+SuSE: Red Hat Linux:
----- -----------------
postgres postgresql
pg_serv postgresql-server
@@ -134,12 +135,13 @@ There are other changes to the SuSE packages to make them conform to the
SuSE packaging standards. SuSE Linux has been shipping their own packages.
While the repackaging will initially cause some confusion, it makes it
-possible to set up a RedHat linux machine to be only a client -- the server
-is no longer required. The clients were split out -- after all, a person who
-needs the perl client may very well not need the tcl client, etc. And, the
-regression tests were added to give some confidence of the suitability of
-PostgreSQL, as well as the stability of the server machine. Additionally,
-the regression tests can be used to help find hardware errors.
+possible to set up a Red Hat Linux machine to be only a client -- the
+server is no longer required. The clients were split out -- after
+all, a person who needs the perl client may very well not need the tcl
+client, etc. And, the regression tests were added to give some
+confidence of the suitability of PostgreSQL, as well as the stability
+of the server machine. Additionally, the regression tests can be used
+to help find hardware errors.
RPM FILE LOCATIONS.
-----------------------------------------------------------------------------
@@ -152,7 +154,7 @@ subdirectories.
Different distributions have different ideas of some of these file locations.
In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
/usr/share/doc, /usr/share/doc/packages, or some other similar path. The
-RedHat 7 locations are listed below. On SuSE <7.1, substitute 'postgres' for
+Red Hat Linux 7 locations are listed below. On SuSE <7.1, substitute 'postgres' for
'postgresql' below, and 'pg_tk' for 'postgresql-tk' below.
However, the RPM's install the files like this:
@@ -171,7 +173,7 @@ Other shared data: /usr/share/pgsql
Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
Documentation SGML: /usr/share/doc/postgresql-docs-x.y.z
-The above list references the Red Hat 7.x structure. These locations may
+The above list references the Red Hat Linux 7.x structure. These locations may
change for other distributions. Use of 'rpm -ql' for each package is
recommended as the 'Official' location source.
@@ -201,38 +203,41 @@ the binary on-disk database format changing between major versions (like
between 6.3 and 6.4). However, a change from 6.5 to 6.5.3 does not change
the on-disk format.
-This property (feature, misfeature, bug, whatever) has been a known property of
-PostgreSQL since before it was called PostgreSQL -- it has always been this
-way. However, the means by which an upgrade is performed is not readily
-performed in a fully automated fashion, as a "dump-initdb-restore" cycle has
-to be performed. This doesn't appear to be too difficult -- however, dumping
-the old database requires the old executables -- and, if you've already done
-an rpm -U postgresql* (or upgraded from an older version of RedHat and didn't
-specifically exclude the postgresql rpms), you no longer have the older
-executables to dump your data. And your data is useless (until you reinstall
-the old version, that is). All RPM's prior to late releases of version 6.5.
-1 have this upgrade issue.
-
-The newest RPM's for PostgreSQL attempt to make your job in upgrading a little
-easier. First, during the installation of the new RPM's, a copy is made of
-all the executable files and libraries necessary to make a backup of your data.
-Second, the initialization script in the new postgresql-server package detects
-the version of any database found -- if the version is old, then the startup
-of the new version is aborted. However, if no database is found, a new one
-is made.
-
-One thing must be remembered -- due to the restructuring of the PostgreSQL
-RPM's, you will have to manually select the postgresql-server package if you
-want the server -- it is not installed by default in an upgrade. You can either
-select it during the upgrade/install, or you can mount your RedHat CD and
+This property (feature, misfeature, bug, whatever) has been a known
+property of PostgreSQL since before it was called PostgreSQL -- it has
+always been this way. However, the means by which an upgrade is
+performed is not readily performed in a fully automated fashion, as a
+"dump-initdb-restore" cycle has to be performed. This doesn't appear
+to be too difficult -- however, dumping the old database requires the
+old executables -- and, if you've already done an rpm -U postgresql*
+(or upgraded from an older version of Red Hat Linux and didn't
+specifically exclude the postgresql rpms), you no longer have the
+older executables to dump your data. And your data is useless (until
+you reinstall the old version, that is). All RPM's prior to late
+releases of version 6.5. 1 have this upgrade issue.
+
+The newest RPM's for PostgreSQL attempt to make your job in upgrading
+a little easier. First, during the installation of the new RPM's, a
+copy is made of all the executable files and libraries necessary to
+make a backup of your data. Second, the initialization script in the
+new postgresql-server package detects the version of any database
+found -- if the version is old, then the startup of the new version is
+aborted. However, if no database is found, a new one is made.
+
+One thing must be remembered -- due to the restructuring of the
+PostgreSQL RPM's, you will have to manually select the
+postgresql-server package if you want the server -- it is not
+installed by default in an upgrade. You can either select it during
+the upgrade/install, or you can mount your Red Hat Linux CD and
install manually with rpm -i.
-To facilitate upgrading, the postgresql-dump utility has been provided. Look
-at the man page for postgresql-dump to see its usage. All executables to
-restore the immediately prior version of the PostgreSQL database are placed in
-the directory /usr/lib/pgsql/backup, and are accessed by the postgresql-dump
-script. The directory /usr/lib/pgsql/backup is owned by the postgres user --
-you can use this directory to hold dump files and preserve directories.
+To facilitate upgrading, the postgresql-dump utility has been
+provided. Look at the man page for postgresql-dump to see its usage.
+All executables to restore the immediately prior version of the
+PostgreSQL database are placed in the directory /usr/lib/pgsql/backup,
+and are accessed by the postgresql-dump script. The directory
+/usr/lib/pgsql/backup is owned by the postgres user -- you can use
+this directory to hold dump files and preserve directories.
The basic sequence is:
(as user postgres):
@@ -301,37 +306,40 @@ If tests fail, please see the file regression.diffs in that directory. If
you need help interpreting that file, contact the pgsql-ports list on
postgresql.org.
-There are some tests that will almost always fail with RedHat Linux 5.x and 6.x
-installations. The geometry, float8, and on occassion the random test will
-fail. These failures are normal for RedHat 5.2 and 6.1. For RedHat 6.1 with
-certain i18n settings, there will be other tests fail.
+There are some tests that will almost always fail with Red Hat Linux
+5.x and 6.x installations. The geometry, float8, and on occassion the
+random test will fail. These failures are normal for Red Hat Linux
+5.2 and 6.1. For Red Hat Linux 6.1 with certain i18n settings, there
+will be other tests fail.
-For 7.1RC1, all 76 tests passed on RedHat 6.2 and RedHat 7.0. This
-was accomplished by fiddling with the locale settings. In version 7.1.2 this
-capability was removed -- you need to set your locale to 'C' before executing
-the first postmaster startup, or many more regression tests will fail.
+For 7.1RC1, all 76 tests passed on Red Hat Linux 6.2 and RedHat
+7.0. This was accomplished by fiddling with the locale settings. In
+version 7.1.2 this capability was removed -- you need to set your
+locale to 'C' before executing the first postmaster startup, or many
+more regression tests will fail. With the locale set to 'C', all 76
+tests pass on Red Hat Linux 7.1.
For interpretation of the regression tests, see the PostgreSQL documentation.
STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
-------------------------------------------------------------------------------
-RedHat Linux uses the System V Init package. A startup script for PostgreSQL
+Red Hat Linux uses the System V Init system. A startup script for PostgreSQL
is provided in the server package, as /etc/rc.d/init.d/postgresql. To start
-the postmaster, with sanity checking, as root, run
-/etc/rc.d/init.d/postgresql start
-to shut postmaster down,
-/etc/rc.d/init.d/postgresql stop
+the postmaster, with sanity checking, as root, run "service postgresql start"
+to shut postmaster down, "service postgresql stop"
+
There are other parameters to this script -- /etc/rc.d/init.d/postgresql for a
listing.
To get this script to run at system startup or any time the system switches into
-runlevels 4, 5, or 6, run 'chkconfig --add postgresql', and the proper symlinks
+runlevels 3, 4, or 5, run 'chkconfig --add postgresql', and the proper symlinks
will be created. Check the chkconfig man page for more information.
-This same script also works for TurboLinux, and any other distribution similar
-enough to RedHat. SuSE Linux uses a different approach, using a different
-location and a different script, found at either /sbin/init.d/postgres or
-/usr/sbin/rcpostgres. Please see the SuSE 'README.linux' for more information.
+This same script also works for TurboLinux, and any other distribution
+similar enough to Red Hat Linux. SuSE Linux uses a different
+approach, using a different location and a different script, found at
+either /sbin/init.d/postgres or /usr/sbin/rcpostgres. Please see the
+SuSE 'README.linux' for more information.
SuSE has maintained their own RPMset for some time -- their documentation
supercedes any found in this file.
@@ -361,9 +369,9 @@ you will need to rebuild from the source RPM. Download the .src.rpm for this
release. You will need to be root to rebuild, unless you have already set up
a non-root build environment.
-Install the source RPM with rpm -i, then CD to the rpm building area (on RedHat
-this is /usr/src/redhat by default). You will have to have a full development
-environment to rebuild the full RPM set.
+Install the source RPM with rpm -i, then CD to the rpm building area
+(on Red Hat Linux this is /usr/src/redhat by default). You will have
+to have a full development environment to rebuild the full RPM set.
This release of the RPMset includes the ability to conditionally build
sets of packages. The parameters, their defaults, and the meanings are:
diff --git a/postgresql.init b/postgresql.init
index c704b6e..5d198eb 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -40,7 +40,7 @@
# Karl's fixes for some quoting issues.
# PGVERSION is:
-PGVERSION=7.1.2
+PGVERSION=7.1.3
# Source function library.
INITD=/etc/rc.d/init.d
@@ -95,17 +95,10 @@ start(){
SYSDOCDIR=/usr/share/doc/packages
fi
echo
- echo $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+ echo $"An old version of the database format was found."
+ echo $"You need to upgrade the data format before using PostgreSQL."
+ echo $"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
exit 1
-# This doesn't seem to do anything useful...
-# else
-# if echo "$TYPESET"|grep "declare -f success ()" >/dev/null
-# then
-# success "$PSQL_CHECK"
-# else
-# echo " [ OK ]"
-# fi
-# echo
fi
# No existing PGDATA! Initdb it.
diff --git a/postgresql.spec b/postgresql.spec
index cf57244..f886a30 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -15,7 +15,7 @@
# Utility feature defines.
%{!?enable_mb:%define enable_mb 1}
%{!?pgaccess:%define pgaccess 1}
-%{!?newintarray:%define newintarray 0}
+%{!?newintarray:%define newintarray 1}
# Python major version.
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
@@ -44,7 +44,7 @@ Version: 7.1.3
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -948,8 +948,14 @@ rm -f perlfiles.list
%endif
%changelog
+* Mon Aug 20 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.3-2
+- Fix usage of "Red Hat Linux" in the README.rpm-dist, do other minor
+ fixes to this file
+- Don't use newlines inside strings in the initscript
+
* Mon Aug 20 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.3-1
-- Updated README.rpm-dist from Lamar
+- Updated README.rpm-dist from Lamar.
+- Make sure "Red Hat" and "Red Hat Linux" are used properly in the README.rpm-dist
- Work around the horror that is perl's Makefile generation
(LD_RUN_PATH is not a good thing) (#51957)
- 7.1.3, stable bugfix release. Remove patches from CVS as they are now included
commit 6f2c3a9b148c44c7f4bc45268ec81116b368d20e
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:37:06 2004 +0000
auto-import postgresql-7.1.3-1 from postgresql-7.1.3-1.src.rpm
diff --git a/.cvsignore b/.cvsignore
index bb7c60c..3159d4b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-file-lists-pgsql-7.0.3.tar.gz
-pg-migration-scripts-7.0.3.tar.gz
-postgresql-7.0.3-alpha.patch.gz
-postgresql-7.0.3.tar.bz2
+contrib-intarray.tar.gz
+file-lists.tar.gz
+migration-scripts.tar.gz
+postgresql-7.1.3.tar.gz
postgresql-dump.1.gz
diff --git a/README.rpm-dist b/README.rpm-dist
new file mode 100644
index 0000000..507f74b
--- /dev/null
+++ b/README.rpm-dist
@@ -0,0 +1,437 @@
+README.rpm-dist
+-----------------------------------------------------------------------------
+Version 3.6, for PostgreSQL 7.1.3
+Lamar Owen <lamar.owen(a)wgcr.org>
+-----------------------------------------------------------------------------
+
+Contents:
+ 0.) Quickie -i note.
+ 1.) Introduction, QuickStart, and credits
+ 2.) PostgreSQL RPM packages and rationale
+ 3.) Upgrading from an older version of PostgreSQL without losing data.
+ 4.) Regression Testing
+ 5.) Starting postmaster automatically on startup
+ 6.) Grand Unified Configuration(GUC) File.
+ 7.) Rebuilding the source RPM.
+ 8.) Contrib files.
+ 9.) Logging set up
+10.) Further Information Resource
+
+QUICKIE '-i' NOTE
+-----------------------------------------------------------------------------
+The postmaster '-i' option is NOT used by default in the initscript shipped
+with these RPMs. Please do NOT modify the initscript to add the '-i' back
+in -- it will get overwritten on the next package upgrade. Rather, see the
+section below on the Grand Unified Configuration file, which includes the
+recommended way to get '-i' functionality back.
+
+INTRODUCTION
+-----------------------------------------------------------------------------
+This document exists to explain the layout of the RPM's for PostgreSQL, to
+explain how to migrate from an older version, and to explain WHY it can be
+so difficult to upgrade PostgreSQL.
+
+This document is written to be applicable to version 7.1.2 of PostgreSQL,
+which is the current version of the RPM's as of this writing.
+
+Official PostgreSQL Global Development Group RPM's will from version 7.1.2
+on carry a 'PGDG' after the release number. Other RPMset's as distributed
+with Linux distributions may have a different release number and initials.
+
+It is preferable for the distribution-specific set to be the one used, as
+the PGDG set is intentionally generic. So, if your distro has a set of RPMs,
+use them in preference. If you want to stay up-to-date on the PostgreSQL
+core itself, use the PGDG generic set -- but understand that it is a
+GENERIC set.
+
+These RPMs are designed to be LSB-compliant -- if you find this not to be the
+case, please let me know by way of the pgsql-ports(a)postgresql.org mailing
+list.
+
+QUICKSTART
+-----------------------------------------------------------------------------
+If this is an upgrade, please go to section 3, UPGRADING.
+If this is a fresh installation, simply start the postmaster using:
+ /etc/rc.d/init.d/postgresql start (on RedHat and TurboLinux)
+
+On SuSE, please see the file 'README.linux' in this directory.
+
+The file /var/lib/pgsql/.bash_profile is now packaged to help with the
+setting of environment variables. You may edit this file, and it won't be
+overwritten during an upgrade. However, enhancements and bugfixes may be added
+to this file, so be sure to check .bash_profile.rpmnew after upgrading.
+
+The user 'postgres' is created during installation of the server subpackage.
+This user by default is UID and GID 26. The user has the default shell set to
+bash, and the home directory set to /var/lib/pgsql. This user also has no
+default password -- in order to be able to su to from a non-root account
+or login as 'postgres' you will need to set a password using passwd.
+
+CREDITS
+-----------------------------------------------------------------------------
+Thomas Lockhart
+Uncle George
+Ryan Kirkpatrick
+Trond Eivind Glomsrd
+Mark Knox
+Mike Mascari
+Nicolas Huillard
+Karl DeBisschop
+Roger Luethi
+Jeff Johnson
+Reinhard Max
+
+
+POSTGRESQL RPM PACKAGES AND RATIONALE.
+-----------------------------------------------------------------------------
+On RedHat Linux, prior to version 6.5, PostgreSQL was packaged in RPM form in
+three (or four) packages:
+
+postgresql: The server and documentation
+postgresql-clients: The client libraries, the cli, and the tcl interface
+postgresql-devel: Development libraries (for the client-side)
+postgresql-data: A sample database -- not shipped with the 6.4 RPMS.
+
+However, it was decided that a different split would be more appropriate for
+users. The 7.0 splitup allows more flexibility in installation, as well as
+making the new clients into their own packages. The new packages are:
+
+postgresql: Some clients and libraries, and documentation
+postgresql-server: Server executables and data files
+postgresql-devel: Client-side development libraries
+postgresql-tcl: TCL/TK client libraries and the pgaccess client
+postgresql-perl: PERL client module
+postgresql-python: The PygreSQL client library
+postgresql-odbc: Linux ODBC client (not required to use ODBC from Win95)
+postgresql-jdbc: JAR of the JDBC client
+postgresql-test: The regression tests and associated files.
+
+For version 7.0.x, another package is being shipped, and one package has been
+trimmed:
+postgresql-tk: Tk client and pgaccess.
+postgresql-tcl: Tcl client and PL ONLY.
+
+For version 7.1, more packages are being shipped:
+postgresql-libs: client shared libraries.
+postgresql-docs: extra documentation,such as the SGML doc sources.
+postgresql-contrib: The contrib source tree, as well as selected binaries.
+
+For SuSE Linux <= 7.0, the packages are named differently, but with the same
+functionality. Here is a mapping:
+SuSE: RedHat:
+----- -----------------
+postgres postgresql
+pg_serv postgresql-server
+pg_devel postgresql-devel
+pg_tcl postgresql-tcl
+pg_perl postgresql-perl
+pg_pyth postgresql-python
+pg_odbc postgresql-odbc
+pg_jdbc postgresql-jdbc
+pg_test postgresql-test
+
+There are other changes to the SuSE packages to make them conform to the
+SuSE packaging standards. SuSE Linux has been shipping their own packages.
+
+While the repackaging will initially cause some confusion, it makes it
+possible to set up a RedHat linux machine to be only a client -- the server
+is no longer required. The clients were split out -- after all, a person who
+needs the perl client may very well not need the tcl client, etc. And, the
+regression tests were added to give some confidence of the suitability of
+PostgreSQL, as well as the stability of the server machine. Additionally,
+the regression tests can be used to help find hardware errors.
+
+RPM FILE LOCATIONS.
+-----------------------------------------------------------------------------
+In compliance with the Linux FHS, the PostgreSQL RPM's install files in a manner
+not consistent with most of the PostgreSQL documentation. According to the
+standard PostgreSQL documentation, PostgreSQL is installed under the directory
+/usr/local/pgsql, with executables, source, and data existing in various
+subdirectories.
+
+Different distributions have different ideas of some of these file locations.
+In particular, the documentation directory can be /usr/doc, /usr/doc/packages,
+/usr/share/doc, /usr/share/doc/packages, or some other similar path. The
+RedHat 7 locations are listed below. On SuSE <7.1, substitute 'postgres' for
+'postgresql' below, and 'pg_tk' for 'postgresql-tk' below.
+
+However, the RPM's install the files like this:
+Executables: /usr/bin
+Libaries: /usr/lib
+Documentation: /usr/share/doc/postgresql-x.y.z
+Contrib: /usr/share/doc/postgresql-x.y.z/contrib
+Source: not installed
+Data: /var/lib/pgsql/data
+Backup area: /var/lib/pgsql/backup
+Templates: /usr/share/pgsql
+Procedural Languages: /usr/lib/pgsql
+TK client docs: /usr/share/doc/postgresql-tk-x.y.z
+Development Headers: /usr/include/pgsql
+Other shared data: /usr/share/pgsql
+Regression tests: /usr/lib/pgsql/test/regress (in the -test package)
+Documentation SGML: /usr/share/doc/postgresql-docs-x.y.z
+
+The above list references the Red Hat 7.x structure. These locations may
+change for other distributions. Use of 'rpm -ql' for each package is
+recommended as the 'Official' location source.
+
+While it may seem gratuitous to place these files in different locations, the
+FHS requires it -- distributions should not ever touch /usr/local. It may
+also seem like more work to keep track of where everything is -- but, that's
+the beauty of RPM -- you don't have to keep track of the files, RPM does it
+for you.
+
+UPGRADING.
+-----------------------------------------------------------------------------
+CAUTION: While a semi-automatic upgrade process has been implemented, it is
+STRONGLY recommended that a full dump of your database (using pg_dumpall) is
+performed BEFORE upgrading the RPMs! If you have already done the upgrade
+with the RPM, and want to return to your previous version to do the dump,
+find the old RPM's and use 'rpm -U --oldpackage' to downgrade.
+
+NOTE: moving your existing data from /var/lib/pgsql to /var/lib/pgsql/data is
+not currently automatic -- you will need to do this yourself at this release!
+This change occurred between 6.5.3 and 7.0, so upgrading from priot to 7.0 to
+7.0 or later might be difficult. The rh-dump script is provided to ease this,
+see below.
+
+The single biggest problem with upgrading PostgreSQL RPM's has been the lack
+of a reasonably automated upgrade process. PostgreSQL has the property of
+the binary on-disk database format changing between major versions (like
+between 6.3 and 6.4). However, a change from 6.5 to 6.5.3 does not change
+the on-disk format.
+
+This property (feature, misfeature, bug, whatever) has been a known property of
+PostgreSQL since before it was called PostgreSQL -- it has always been this
+way. However, the means by which an upgrade is performed is not readily
+performed in a fully automated fashion, as a "dump-initdb-restore" cycle has
+to be performed. This doesn't appear to be too difficult -- however, dumping
+the old database requires the old executables -- and, if you've already done
+an rpm -U postgresql* (or upgraded from an older version of RedHat and didn't
+specifically exclude the postgresql rpms), you no longer have the older
+executables to dump your data. And your data is useless (until you reinstall
+the old version, that is). All RPM's prior to late releases of version 6.5.
+1 have this upgrade issue.
+
+The newest RPM's for PostgreSQL attempt to make your job in upgrading a little
+easier. First, during the installation of the new RPM's, a copy is made of
+all the executable files and libraries necessary to make a backup of your data.
+Second, the initialization script in the new postgresql-server package detects
+the version of any database found -- if the version is old, then the startup
+of the new version is aborted. However, if no database is found, a new one
+is made.
+
+One thing must be remembered -- due to the restructuring of the PostgreSQL
+RPM's, you will have to manually select the postgresql-server package if you
+want the server -- it is not installed by default in an upgrade. You can either
+select it during the upgrade/install, or you can mount your RedHat CD and
+install manually with rpm -i.
+
+To facilitate upgrading, the postgresql-dump utility has been provided. Look
+at the man page for postgresql-dump to see its usage. All executables to
+restore the immediately prior version of the PostgreSQL database are placed in
+the directory /usr/lib/pgsql/backup, and are accessed by the postgresql-dump
+script. The directory /usr/lib/pgsql/backup is owned by the postgres user --
+you can use this directory to hold dump files and preserve directories.
+
+The basic sequence is:
+(as user postgres):
+postgresql-dump -t /var/lib/pgsql/backup/db.bak -p /var/lib/pgsql/backup/old -d
+(you can abort the ASCII dump with 'Q', as it uses more) Then, (as user root):
+
+***** NOTE ***** ***** NOTE *****
+
+The above script is broken. Use "rh-pgdump.sh targetfile" instead, remove the
+old databases (/var/lib/pgsql/base) (or safer - move them somewhere else first),
+start the database and follow the insert procedure described below.
+
+***** NOTE ***** ***** NOTE *****
+
+service postgresql start
+
+(which will automatically create a new database structure) And finally,
+
+(as user postgres):
+psql -e template1 </var/lib/pgsql/backup/db.bak
+
+Once you are satisfied that the data has been restored properly, you may remove
+the dump file (/var/lib/pgsql/backup/db.bak) and the preserve directory
+(/var/lib/pgsql/backup/old).
+
+EXPLANATION OF STEPS:
+-------------------------------------------------------------------------------
+postgresql-dump: dumps the old database structure out, using the postmaster and
+the backend saved during the rpm upgrade. This step MUST be done as user
+postgres.
+
+/etc/rc.d/init.d/postgresql start: initializes the new database structure that
+the data from your old version will be restored into, does some sanity
+checking, and starts the postmaster. Due to the nature of some of the tasks,
+this step must be done as root.
+
+psql -e: restores the old database into the new structure created by the
+previous step.
+
+NOTE:
+-------------------------------------------------------------------------------
+If you have added tables, indices, or basically anything to the template1
+database which is the default administrative database this script will NOT
+upgrade your database. As a matter of fact you will lose your data included
+in the template1 database. Please look at www.postgresql.org for information
+on upgrading the template1 database. This is a known bug in the PostgreSQL
+pg_dump and pg_dumpall utilities.
+
+REGRESSION TESTING
+-------------------------------------------------------------------------------
+One of the features of the newer RPM sets is the capability to perform the
+regression tests. These tests stress your database installation and produce
+results that give you assurances that the installation is complete, and that
+your database machine is up to the task.
+
+To run the regression tests under the RPM installation, make sure that
+postmaster has been started (if not, su to root and execute the
+'/etc/rc.d/init.d/postgresql start' init script), cd to
+/usr/lib/pgsql/test/regress, su to postgres, and execute the command line:
+time ./pg_regress.sh --schedule=parallel_schedule
+This command line will start the regression tests and will both show the
+results to the screen and store the results in the file regress.out.
+It will also give you a crude benchmark of how fast your machine performs.
+
+If tests fail, please see the file regression.diffs in that directory. If
+you need help interpreting that file, contact the pgsql-ports list on
+postgresql.org.
+
+There are some tests that will almost always fail with RedHat Linux 5.x and 6.x
+installations. The geometry, float8, and on occassion the random test will
+fail. These failures are normal for RedHat 5.2 and 6.1. For RedHat 6.1 with
+certain i18n settings, there will be other tests fail.
+
+For 7.1RC1, all 76 tests passed on RedHat 6.2 and RedHat 7.0. This
+was accomplished by fiddling with the locale settings. In version 7.1.2 this
+capability was removed -- you need to set your locale to 'C' before executing
+the first postmaster startup, or many more regression tests will fail.
+
+For interpretation of the regression tests, see the PostgreSQL documentation.
+
+STARTING POSTMASTER AUTOMATICALLY AT SYSTEM STARTUP
+-------------------------------------------------------------------------------
+RedHat Linux uses the System V Init package. A startup script for PostgreSQL
+is provided in the server package, as /etc/rc.d/init.d/postgresql. To start
+the postmaster, with sanity checking, as root, run
+/etc/rc.d/init.d/postgresql start
+to shut postmaster down,
+/etc/rc.d/init.d/postgresql stop
+There are other parameters to this script -- /etc/rc.d/init.d/postgresql for a
+listing.
+
+To get this script to run at system startup or any time the system switches into
+runlevels 4, 5, or 6, run 'chkconfig --add postgresql', and the proper symlinks
+will be created. Check the chkconfig man page for more information.
+
+This same script also works for TurboLinux, and any other distribution similar
+enough to RedHat. SuSE Linux uses a different approach, using a different
+location and a different script, found at either /sbin/init.d/postgres or
+/usr/sbin/rcpostgres. Please see the SuSE 'README.linux' for more information.
+
+SuSE has maintained their own RPMset for some time -- their documentation
+supercedes any found in this file.
+
+GRAND UNIFIED CONFIGURATION (GUC) FILE
+-------------------------------------------------------------------------------
+The PostgreSQL server has many tunable parameters -- the file
+/var/lib/pgsql/data/postgresql.conf is the master configuration file for the
+whole system.
+
+The RPM ships with the default file -- you will need to tune the
+parameters for your installation. In particular, you might want to allow
+TCP/IP socket connections -- in order to allow these, you will need to edit
+the postgresql.conf file. The line in question contains the string
+'tcpip_socket' --want to both uncomment the line and set the parameter to true
+in order to get the TCP/IP socket to open.
+
+This is the same behavior the -i command line switch provides. It is
+preferable to use the postgresql.conf file, however, as future versions
+of the RPMset will allow multiple postmaster instances -- and that will only
+be possible thanks to the decoupling of settings out to each datadir.
+
+REBUILDING FROM SOURCE RPM
+-------------------------------------------------------------------------------
+If your distribution is not supported by the binary RPM's from PostgreSQL.org,
+you will need to rebuild from the source RPM. Download the .src.rpm for this
+release. You will need to be root to rebuild, unless you have already set up
+a non-root build environment.
+
+Install the source RPM with rpm -i, then CD to the rpm building area (on RedHat
+this is /usr/src/redhat by default). You will have to have a full development
+environment to rebuild the full RPM set.
+
+This release of the RPMset includes the ability to conditionally build
+sets of packages. The parameters, their defaults, and the meanings are:
+
+perl 1 #build the postgresql-perl package.
+tcl 1 #build the postgresql-tcl package.
+tkpkg 1 #build the postgresql-tk package.
+odbc 1 #build the postgresql-odbc package.
+jdbc 1 #build the postgresql-jdbc package.
+test 1 #build the postgresql-test package.
+python 1 #build the postgresql-python package.
+pltcl 1 #build the postgresql-pltcl package.
+forceplperl 0 #don't force a build of pl/perl over libperl.a
+plperl 0 #don't build the postgresql-plperl package.
+ssl 1 #use OpenSSL support.
+kerberos 1 #use Kerberos 5 support.
+enable_mb 1 #enable multibyte encodings.
+pgaccess 1 #build the pgaccess client, part of postgresql-tk.
+newintarray 0 #substitute a newer intarray contrib.
+
+To use these defines, invoke a rebuild like this:
+rpm --rebuild --define 'perl 0' --define 'tcl 0' --define 'tkpkg 0'\
+ --define 'test 0' --define 'newintarray 1' --define 'kerberos 0' \
+ postgresql-7.1.3-1PGDG.src.rpm
+This line would disable the perl, tcl, tk, and test subpackages, enable the
+newer intarray code, and disable kerberos support.
+
+More of these conditionals will be added in the future.
+
+
+CONTRIB FILES
+-------------------------------------------------------------------------------
+The contents of the contrib tree are packaged into the -contrib subpackage
+and are compiled and placed into /usr/lib/pgsql/contrib with no further
+processing. Please see each directory under contrib for details on how to
+install and use.
+
+LOGGING SET UP
+-------------------------------------------------------------------------------
+To get rollable syslog set up, see the documentation for the file
+postgresql.conf, by default in the directory /var/lib/pgsql/data, as relates to
+the syslog options. Then, add a line to /etc/syslog.conf, using the man page
+for syslog.conf as a source. Example:
+If postgresql.conf has the following lines for the syslog settings:
+syslog = 1 # range 0-2
+syslog_facility = 'LOCAL0'
+syslog_ident = 'postgres'
+
+Then you need to add the line to /etc/syslog.conf:
+local0.* /var/log/postgresql
+
+Then set up an entry in /etc/logrotate.d to roll postgresql the way you want it
+rolled.
+
+MORE INFORMATION
+-------------------------------------------------------------------------------
+You can get more information at http://www.postgresql.org
+
+Please help make this packaging better -- let me know if you find problems, or
+better ways of doing things. You can reach me by e-mail at
+pgsql-ports(a)postgresql.org -- please include an [RPM] string in the subject, as
+I use automatic mail folder processing to put mail in the right place.
+
+SuSE information is available at SuSE's website and information contacts.
+-----------------------------------------------------------------------------
+
+
+
+
+
+
diff --git a/postgresql-bashprofile b/postgresql-bashprofile
new file mode 100644
index 0000000..a2447db
--- /dev/null
+++ b/postgresql-bashprofile
@@ -0,0 +1,5 @@
+PGLIB=/usr/lib/pgsql
+PGDATA=/var/lib/pgsql/data
+[ -f $PGDATA/../initdb.i18n ] && source $PGDATA/../initdb.i18n
+export PGLIB PGDATA
+
diff --git a/postgresql.init b/postgresql.init
new file mode 100644
index 0000000..c704b6e
--- /dev/null
+++ b/postgresql.init
@@ -0,0 +1,232 @@
+#! /bin/sh
+# postgresql This is the init script for starting up the PostgreSQL
+# server
+#
+# chkconfig: - 85 15
+# description: Starts and stops the PostgreSQL backend daemon that handles \
+# all database requests.
+# processname: postmaster
+# pidfile: /var/run/postmaster.pid
+
+# Version 6.5.3-2 Lamar Owen
+# Added code to determine if PGDATA exists, whether it is current version
+# or not, and initdb if no PGDATA (initdb will not overwrite a database).
+
+# Version 7.0 Lamar Owen
+# Added logging code
+# Changed PGDATA.
+#
+
+# Version 7.0.2 Trond Eivind Glomsrd <teg(a)redhat.com>
+# use functions, add conditional restart
+
+# Version 7.0.3 Lamar Owen <lamar(a)postgresql.org>
+# Check for the existence of functions before blindly using them
+# in particular -- check for success () and failure () before using.
+# More Cross-distribution support -- PGVERSION variable, and docdir checks.
+
+# Version 7.1 Release Candidate Lamar Owen <lamar(a)postgresql.org>
+# initdb parameters have changed.
+
+# Version 7.1.2 Trond Eivind Glomsrd <teg(a)redhat.com>
+# Specify shell for su
+# Handle stop better - kill unwanted output, make it wait until the database is ready
+# Handle locales slightly differently - always using "C" isn't a valid option
+# Kill output from database initialization
+# Mark messages for translation
+
+# Version 7.1.2-2.PGDG Lamar Owen <lamar.owen(a)wgcr.org>
+# sync up.
+# Karl's fixes for some quoting issues.
+
+# PGVERSION is:
+PGVERSION=7.1.2
+
+# Source function library.
+INITD=/etc/rc.d/init.d
+. $INITD/functions
+
+# Get function listing for cross-distribution logic.
+TYPESET=`typeset -f|grep "declare"`
+
+# Get config.
+. /etc/sysconfig/network
+
+# Check that networking is up.
+# Pretty much need it for postmaster.
+[ "${NETWORKING}" = "no" ] && exit 0
+
+[ -f /usr/bin/postmaster ] || exit 0
+
+
+start(){
+ PSQL_START=$"Starting postgresql service: "
+
+ # Check for older PGDATA location.
+ if [ -f /var/lib/pgsql/PG_VERSION ] && [ -d /var/lib/pgsql/base/template1 ]
+ then
+ export PGDATA=/var/lib/pgsql
+ else
+ export PGDATA=/var/lib/pgsql/data
+ fi
+
+ # Check for the PGDATA structure
+ if [ -f $PGDATA/PG_VERSION ] && [ -d $PGDATA/base ]
+ then
+ # Check version of existing PGDATA
+
+ if [ `cat $PGDATA/PG_VERSION` != '7.1' ]
+ then
+ SYSDOCDIR="(Your System's documentation directory)"
+ if [ -d /usr/doc/postgresql-$PGVERSION ]
+ then
+ SYSDOCDIR=/usr/doc
+ fi
+ if [ -d /usr/share/doc/postgresql-$PGVERSION ]
+ then
+ SYSDOCDIR=/usr/share/doc
+ fi
+ if [ -d /usr/doc/packages/postgresql-$PGVERSION ]
+ then
+ SYSDOCDIR=/usr/doc/packages
+ fi
+ if [ -d /usr/share/doc/packages/postgresql-$PGVERSION ]
+ then
+ SYSDOCDIR=/usr/share/doc/packages
+ fi
+ echo
+ echo $"An old version of the database format was found.\nYou need to upgrade the data format before using PostgreSQL.\nSee $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+ exit 1
+# This doesn't seem to do anything useful...
+# else
+# if echo "$TYPESET"|grep "declare -f success ()" >/dev/null
+# then
+# success "$PSQL_CHECK"
+# else
+# echo " [ OK ]"
+# fi
+# echo
+ fi
+
+ # No existing PGDATA! Initdb it.
+
+ else
+ echo -n $"Initializing database: "
+ if [ ! -d $PGDATA ]
+ then
+ mkdir -p $PGDATA
+ chown postgres.postgres $PGDATA
+ fi
+ # Make sure the locale from the initdb is preserved for later startups...
+ [ -f /etc/sysconfig/i18n ] && cp /etc/sysconfig/i18n $PGDATA/../initdb.i18n
+ # Just in case no locale was set, use en_US
+ [ ! -f /etc/sysconfig/i18n ] && echo "LANG=en_US" > $PGDATA/../initdb.i18n
+ # Is expanded this early to be used in the command su runs
+ echo "export LANG LC_ALL LC_CTYPE LC_COLLATE LC_NUMERIC LC_CTYPE LC_TIME" >> $PGDATA/../initdb.i18n
+ # Initialize the database
+ su -l postgres -s /bin/sh -c "/usr/bin/initdb --pgdata=/var/lib/pgsql/data > /dev/null 2>&1" < /dev/null
+ [ -f $PGDATA/PG_VERSION ] && echo_success
+ [ ! -f $PGDATA/PG_VERSION ] && echo_failure
+ echo
+ fi
+
+ # Check for postmaster already running...
+ pid=`pidof -s postmaster`
+ if [ $pid ]
+ then
+ echo $"Postmaster already running."
+ else
+ #all systems go -- remove any stale lock files
+ rm -f /tmp/.s.PGSQL.* > /dev/null
+ echo -n "$PSQL_START"
+ su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl -D $PGDATA -p /usr/bin/postmaster start > /dev/null 2>&1" < /dev/null
+ sleep 1
+ pid=`pidof -s postmaster`
+ if [ $pid ]
+ then
+ if echo "$TYPESET"|grep "declare -f success ()" >/dev/null
+ then
+ success "$PSQL_START"
+ else
+ echo " [ OK ]"
+ fi
+ touch /var/lock/subsys/postgresql
+ echo $pid > /var/run/postmaster.pid
+ echo
+ else
+ if echo "$TYPESET"|grep "declare -f failure ()" >/dev/null
+ then
+ failure "$PSQL_START"
+ else
+ echo " [ FAILED ]"
+ fi
+ echo
+ fi
+ fi
+}
+
+stop(){
+ # Check for postmaster already running... exit if this happens
+ pid=`pidof -s postmaster`
+ if [ "$pid" == "" ]; then
+ rm -f /var/run/postmaster.pid
+ rm -f /var/lock/subsys/postgresql
+ exit 0;
+ fi
+ echo -n $"Stopping postgresql service: "
+ # Check for older PGDATA location.
+ if [ -f /var/lib/pgsql/PG_VERSION ] && [ -d /var/lib/pgsql/base/template1 ]
+ then
+ export PGDATA=/var/lib/pgsql
+ else
+ export PGDATA=/var/lib/pgsql/data
+ fi
+ su -l postgres -s /bin/sh -c "/usr/bin/pg_ctl stop -D $PGDATA -s -m fast" > /dev/null 2>&1
+ ret=$? # This will always be 0, as the return code doesn't propagate... Fix that some day.
+ if [ $ret -eq 0 ]; then
+ echo_success
+ else
+ echo_failure
+ fi
+ echo
+ rm -f /var/run/postmaster.pid
+ rm -f /var/lock/subsys/postgresql
+}
+
+restart(){
+ stop
+ start
+}
+
+condrestart(){
+ [ -e /var/lock/subsys/postgresql ] && restart || :
+}
+
+
+# This script is slightly unusual in that the name of the daemon (postmaster)
+# is not the same as the name of the subsystem (postgresql)
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status postmaster
+ ;;
+ restart)
+ restart
+ ;;
+ condrestart)
+ condrestart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+ exit 1
+esac
+
+exit 0
+
diff --git a/postgresql.spec b/postgresql.spec
index ae30aa6..cf57244 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,49 +1,109 @@
-# Do we want to build the postgresql-test package ? (1=yes 0=no)
-%define build_testpackage 0
+%{!?perl:%define perl 1}
+%{!?tcl:%define tcl 1}
+%{!?tkpkg:%define tkpkg 1}
+%{!?odbc:%define odbc 1}
+%{!?jdbc:%define jdbc 1}
+%{!?test:%define test 0}
+%{!?python:%define python 1}
+%{!?pltcl:%define pltcl 1}
+%{?forceplperl:%define plperl %{expand:forceplperl}}
+%{!?forceplperl:%define forceplperl 0}
+%{!?plperl:%define plperl 0}
+%{!?ssl:%define ssl 1}
+%{!?kerberos:%define kerberos 1}
+
+# Utility feature defines.
+%{!?enable_mb:%define enable_mb 1}
+%{!?pgaccess:%define pgaccess 1}
+%{!?newintarray:%define newintarray 0}
+
+# Python major version.
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.0.3
-Release: 9.2
+Version: 7.1.3
+
+# Conventions for PostgreSQL Global Development Group RPM releases:
+
+# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
+# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
+# test releases.
+
+# Pre-releases are those that are built from CVS snapshots or pre-release
+# tarballs from postgresql.org. Official beta releases are not
+# considered pre-releases, nor are release candidates, as their beta or
+# release candidate status is reflected in the version of the tarball. Pre-
+# releases' versions do not change -- the pre-release tarball of 7.0.3, for
+# example, has the same tarball version as the final official release of 7.0.3:
+# but the tarball is different.
+
+# Test releases are where PostgreSQL itself is not in beta, but certain parts of
+# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
+
+# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
+# -- only test releases or full releases should be.
+
+Release: 1
License: BSD
Group: Applications/Databases
-# originally .gz
-Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
-Source3: postgresql.init-%{version}
-Source4: file-lists-pgsql-%{version}.tar.gz
+Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
+Source3: postgresql.init
+Source4: file-lists.tar.gz
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
-Source6: README.rpm-dist.postgresql-%{version}
-Source7: pg-migration-scripts-%{version}.tar.gz
-Source8: logrotate.postgresql-%{version}
-Source9: pg_options-%{version}
-Source10: http://jdbc.postgresql.org/download/jdbc7.0-1.1.jar
-Source11: http://jdbc.postgresql.org/download/jdbc7.0-1.2.jar
+Source6: README.rpm-dist
+Source7: migration-scripts.tar.gz
+Source10: http://www.retep.org.uk/postgres/jdbc7.0-1.1.jar
+Source11: jdbc7.1-1.2.jar
Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
-Source15: pg_dumpall.1
-Patch0: postgresql-%{version}-alpha.patch.gz
-Patch1: rpm-pgsql-%{version}.patch
-Patch2: postgresql-7.0.3-ia64-2.patch
-Patch3: postgresql-7.0.3-mkstemp.patch
-Patch4: postgresql-%{version}-security.patch
-Patch10: postgresql-7.0.2-s390.patch
-Requires: perl
-Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd initscripts
-BuildPrereq: /lib/cpp
-BuildPrereq: python-devel perl tcl tk
+Source15: postgresql-bashprofile
+Source16: http://www.sai.msu.su/~megera/postgres/gist/code/7.1.2/contrib-intarray.t...
+Patch1: rpm-pgsql-7.1.patch
+Patch2: postgresql-7.1.plperl.patch
+Patch3: postgresql-7.1.s390x.patch
+Buildrequires: perl glibc-devel
+Prereq: /sbin/ldconfig initscripts
+BuildPrereq: python-devel perl tcl /lib/cpp
+%if %ssl
+BuildPrereq: openssl-devel
+%endif
+%if %ssl
+BuildPrereq: krb5-devel
+%endif
Url: http://www.postgresql.org/
Obsoletes: postgresql-clients
-%if %{build_testpackage}
-%else
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+# Obsolete the packages we are not building...
+%if ! %{plperl}
+Obsoletes: postgresql-plperl
+%endif
+%if ! %{tcl}
+Obsoletes: postgresql-tcl
+%endif
+%if ! %{tkpkg}
+Obsoletes: postgresql-tk
+%endif
+%if ! %{odbc}
+Obsoletes: postgresql-odbc
+%endif
+%if ! %{perl}
+Obsoletes: postgresql-perl
+%endif
+%if ! %{python}
+Obsoletes: postgresql-python
+%endif
+%if ! %{jdbc}
+Obsoletes: postgresql-jdbc
+%endif
+%if ! %{test}
Obsoletes: postgresql-test
%endif
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-
# This is the PostgreSQL Global Development Group Official RPMset spec file.
-# Copyright 2000 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+# Copyright 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
# and others listed.
# Major Contributors:
@@ -51,10 +111,20 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root
# Lamar Owen
# Trond Eivind Glomsrd <teg(a)redhat.com>
# Thomas Lockhart
+# Reinhard Max
+# Karl DeBisschop
+# and others in the Changelog....
# This spec file and ancilliary files are licensed in accordance with
# The PostgreSQL license.
+# On top of this file you can find the default build package list macros. These can be overridden by defining
+# on the rpm command line:
+# rpm --define 'packagename 1' .... to force the package to build.
+# rpm --define 'packagename 0' .... to force the package NOT to build.
+# The base package, the lib package, the devel package, and the server package always get built.
+
+
%description
PostgreSQL is an advanced Object-Relational database management system
(DBMS) that supports almost all SQL constructs (including
@@ -65,19 +135,47 @@ client programs are programs that directly manipulate the internal
structure of PostgreSQL databases on a PostgreSQL server. These client
programs can be located on the same machine with the PostgreSQL
server, or may be on a remote machine which accesses a PostgreSQL
-server over a network connection. This package contains the client
-libraries for C and C++, as well as command-line utilities for
+server over a network connection. This package contains the docs
+in HTML for the whole package, as well as command-line utilities for
managing PostgreSQL databases on a PostgreSQL server.
If you want to manipulate a PostgreSQL database on a remote PostgreSQL
server, you need this package. You also need to install this package
if you're installing the postgresql-server package.
+%package libs
+Summary: The shared libraries required for any PostgreSQL clients.
+Group: Applications/Databases
+Provides: libpq.so.2.1 libpq.so.2.0 libpq.so
+
+%description libs
+The postgresql-libs package provides the essential shared libraries for any
+PostgreSQL client program or interface. You will need to install this package
+to use any other PostgreSQL package or any clients that need to connect to a
+PostgreSQL server.
+
%package server
Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
-Prereq: /usr/sbin/useradd
-Requires: postgresql = %{version} , bash >= 2
+Prereq: /usr/sbin/useradd /sbin/chkconfig
+Requires: postgresql = %{version} libpq.so
+
+%package docs
+Summary: Extra documentation for PostgreSQL
+Group: Applications/Databases
+%description docs
+The postgresql-docs package includes the SGML source for the documentation
+as well as the documentation in other formats, and some extra documentation.
+Install this package if you want to help with the PostgreSQL documentation
+project, or if you want to generate printed documentation.
+
+%package contrib
+Summary: Contributed source and binaries distributed with PostgreSQL
+Group: Applications/Databases
+Requires: libpq.so postgresql = %{version}
+%description contrib
+The postgresql-contrib package includes the contrib tree distributed with
+the PostgreSQL tarball. Selected contrib modules are prebuilt.
%description server
The postgresql-server package includes the programs needed to create
@@ -93,7 +191,7 @@ to install the postgresql package.
%package devel
Summary: PostgreSQL development header files and libraries.
Group: Development/Libraries
-Requires: postgresql = %{version}
+Requires: postgresql-libs = %{version}
%description devel
The postgresql-devel package contains the header files and libraries
@@ -104,70 +202,102 @@ develop applications which will interact with a PostgreSQL server. If
you're installing postgresql-server, you need to install this
package.
+#------------
+%if %plperl
+%package plperl
+Summary: The PL/Perl procedural language for PostgreSQL.
+Group: Applications/Databases
+Requires: perl, postgresql = %{version}
+
+%description plperl
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-plperl package contains the the PL/Perl
+procedural language for the backend.
+%endif
+
+#------------
+%if %tcl
%package tcl
Summary: A Tcl client library, and the PL/Tcl procedural language for PostgreSQL.
Group: Applications/Databases
-Requires: tcl >= 8.0, postgresql = %{version}
+Requires: tcl >= 8.0
%description tcl
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-tcl package contains the libpgtcl client library,
the pg-enhanced pgtclsh, and the PL/Tcl procedural language for the backend.
+%endif
+#------------
+%if %tkpkg
%package tk
Summary: Tk shell and tk-based GUI for PostgreSQL.
Group: Applications/Databases
-Requires: tcl >= 8.0, tk >= 8.0, postgresql = %{version}
+Requires: tcl >= 8.0, tk >= 8.0
%description tk
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-tk package contains the pgaccess
program. Pgaccess is a graphical front end, written in Tcl/Tk, for the
psql and related PostgreSQL client programs.
+%endif
+#------------
+%if %odbc
%package odbc
Summary: The ODBC driver needed for accessing a PostgreSQL DB using ODBC.
Group: Applications/Databases
-Requires: postgresql = %{version}
%description odbc
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-odbc package includes the ODBC (Open DataBase
Connectivity) driver and sample configuration files needed for
applications to access a PostgreSQL database using ODBC.
+%endif
+#------------
+%if %perl
%package perl
Summary: Development module needed for Perl code to access a PostgreSQL DB.
Group: Applications/Databases
-Requires: perl >= 5.004-4, postgresql = %{version}
+Requires: perl >= 5.004-4
%description perl
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-perl package includes a module for developers
to use when writing Perl code for accessing a PostgreSQL database.
+%endif
+#------------
+%if %python
%package python
Summary: Development module for Python code to access a PostgreSQL DB.
Group: Applications/Databases
-Requires: python >= 1.5, postgresql = %{version}
+Requires: python >= 1.5 mx
+Conflicts: python >= 1.6
+
%description python
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-python package includes a module for
developers to use when writing Python code for accessing a PostgreSQL
database.
+%endif
+#----------
+%if %jdbc
%package jdbc
Summary: Files needed for Java programs to access a PostgreSQL database.
Group: Applications/Databases
-Requires: postgresql = %{version}
%description jdbc
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-jdbc package includes the .jar file needed for
Java programs to access a PostgreSQL database.
+%endif
-%if %{build_testpackage}
+#------------
+%if %test
%package test
Summary: The test suite distributed with PostgreSQL.
Group: Applications/Databases
@@ -183,29 +313,31 @@ system, including regression tests and benchmarks.
%prep
%setup -q
-# The alpha patches are not trivial, so wrap in ifarch-endif block
-#
-%ifarch alpha
-%patch0 -p1
-%endif
-
%patch1 -p1
-%ifarch ia64
+#PL/Perl stuff
%patch2 -p1
-%endif
-
%patch3 -p1
-%patch4 -p1
-%ifarch s390
-%patch10 -p1 -b .s390
+
+%if %forceplperl
+FORCEPLPERL=--force
+%else
+FORCEPLPERL=
%endif
-# Seems to work just fine
+%if %plperl
+ pushd src/pl/plperl
+ EXTRA_INCLUDES=-I../../include plperl_installdir=$RPM_BUILD_ROOT/usr/lib perl Makefile.PL $FORCEPLPERL
+ popd
+%endif
-%ifarch ia64
-ln -s linux_i386 src/template/linux
+# Add (optional) newer intarray with bugfixes over the included one
+%if %newintarray
+ pushd contrib
+ rm -fr intarray
+ tar xvzf %{SOURCE16}
+ popd
%endif
%build
@@ -213,73 +345,128 @@ ln -s linux_i386 src/template/linux
# Get file lists....
tar xzf %{SOURCE4}
-pushd src
-
+#Commented out for testing on other platforms for now.
# If libtool installed, copy some files....
-if [ -d /usr/share/libtool ]
-then
- cp /usr/share/libtool/config.* .
-fi
+#if [ -d /usr/share/libtool ]
+#then
+# cp /usr/share/libtool/config.* .
+#fi
-CFLAGS="$RPM_OPT_FLAGS"
+# Strip out -ffast-math from CFLAGS....
-./configure --enable-hba --enable-locale --prefix=/usr\
- --with-perl --enable-multibyte \
- --with-tcl --with-tk --with-x \
- --with-odbc --with-java --enable-syslog\
-%ifarch alpha
- --with-template=linux_alpha \
-%endif
- --with-python
-
-make COPT="$RPM_OPT_FLAGS" all
+CFLAGS=`echo $RPM_OPT_FLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+export CXXFLAGS="$CFLAGS"
-pushd interfaces/python
-cp /usr/lib/python1.5/config/Makefile.pre.in .
-echo *shared* > Setup
-echo _pg pgmodule.c -I../../include -I../libpq -L../libpq -lpq -lcrypt >> Setup
-make -f Makefile.pre.in boot
-make
-popd
-popd
+./configure --enable-locale --with-CXX --prefix=/usr\
+%if %perl
+ --with-perl \
+%endif
+%if %enable_mb
+ --enable-multibyte \
+%endif
+%if %tcl
+ --with-tcl \
+%endif
+%if %tkpkg
+%else
+ --without-tk \
+%endif
+%if %odbc
+ --with-odbc \
+%endif
+ --enable-syslog\
+%if %python
+ --with-python \
+%endif
+%if %ssl
+ --with-openssl \
+%endif
+%if %kerberos
+ --with-krb5=/usr/kerberos \
+%endif
+ --sysconfdir=/etc/pgsql \
+ --mandir=%{_mandir} \
+ --docdir=%{_docdir} \
+ --includedir=%{_includedir}/pgsql \
+ --datadir=/usr/share/pgsql
+
+make COPT="$CFLAGS" all
+
+%if %plperl
+ pushd src/pl/plperl
+ make INC=-I../../include
+ popd
+%endif
-make all PGDOCS=unpacked -C doc
+%if %python
+ pushd src
+ pushd interfaces/python
+ cp /usr/lib/python%{pyver}/config/Makefile.pre.in .
+ echo *shared* > Setup
+ echo _pg pgmodule.c -I../../include -I../libpq -L../libpq -lpq -lcrypt >> Setup
+ make -f Makefile.pre.in boot
+ make
+ popd
+ popd
+%endif
-pushd src/test
-make all
-popd
+%if %test
+ pushd src/test
+ make all
+ popd
+%endif
%install
-eval `perl '-V:installarchlib'`
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{include/pgsql,lib,bin}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-mkdir -p $RPM_BUILD_ROOT/$installarchlib
-make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src install
-make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 install
-
-# Get rid of the packing list generated by the perl Makefile, and build my own...
-find $RPM_BUILD_ROOT/usr/lib/perl5 -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT/usr/lib/perl5 -type f -print | \
- sed -e "s|$RPM_BUILD_ROOT/|/|g" | \
- sed -e "s|.*/man/.*|&\*|" | grep -v -E "(Pg.bs|perllocal.pod)" > perlfiles.list
-find $RPM_BUILD_ROOT/usr/lib/perl5 -type d -name Pg -print | \
- sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
-
-
-# check and fixup Pg manpage location....
-if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ]
-then
- mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
- cp `find $RPM_BUILD_ROOT -name 'Pg.3*' -print` $RPM_BUILD_ROOT%{_mandir}/man3
-fi
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%if %plperl
+make DESTDIR=$RPM_BUILD_ROOT -C src/pl/plperl install
+#cp blib/arch/auto/plperl/plperl.so $RPM_BUILD_ROOT/usr/lib
+%endif
+
+%if %perl
+ pushd src/interfaces/perl5
+ perl -pi -e "s|LD_RUN_PATH=\".*PATH\)\"||" Makefile
+ perl -pi -e "s|LD_RUN_PATH =.*$||" Makefile
+ popd
+
+ make PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 -f Makefile install
+
+ # Get rid of the packing list generated by the perl Makefile, and build my own...
+ find $RPM_BUILD_ROOT/usr/lib/perl5 -name .packlist -exec rm -f {} \;
+ find $RPM_BUILD_ROOT/usr/lib/perl5 -type f -print | \
+ sed -e "s|$RPM_BUILD_ROOT/|/|g" | \
+ sed -e "s|.*/man/.*|&\*|" > perlfiles.list
+ find $RPM_BUILD_ROOT/usr/lib/perl5 -type d -name Pg -print | \
+ sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
+
+ # check and fixup Pg manpage location....
+ if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ]
+ then
+ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
+ cp `find $RPM_BUILD_ROOT -name 'Pg.3*' -print` $RPM_BUILD_ROOT%{_mandir}/man3
+ fi
+
+ pushd src/interfaces
+ mkdir -p $RPM_BUILD_ROOT/usr/share/pgsql/perl5
+ cp -a perl5/test.pl $RPM_BUILD_ROOT/usr/share/pgsql/perl5
+ popd
+ # remove perllocal.pod and Pg.bs from the file list - only occurs with 5.6
+
+ perl -pi -e "s/^.*perllocal.pod$//" perlfiles.list
+ perl -pi -e "s/^.*Pg.bs$//" perlfiles.list
+ mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{_arch}-linux/auto/Pg
+
+%endif
make -C doc
+
# man pages....
pushd $RPM_BUILD_ROOT%{_mandir}
tar xzf $RPM_BUILD_DIR/postgresql-%{version}/doc/man.tar.gz
-install -m 644 %SOURCE15 $RPM_BUILD_ROOT/%{_mandir}/man1
# the postgresql-dump manpage.....
cp %{SOURCE12} man1
@@ -289,63 +476,50 @@ popd
install -m755 %SOURCE14 $RPM_BUILD_ROOT/usr/bin/
-# Move all includes beneath /usr/include/pgsql.
-pushd $RPM_BUILD_ROOT/usr/include
-rm -rf pgsql/*
-for f in *.h access commands executor iodbc lib libpq libpq++ port utils ; do
- mv $f pgsql
-done
-popd
+# install dev headers.
-# copy over the includes needed for SPI development.
-pushd src/include
-/lib/cpp -M -I. -I../backend executor/spi.h |xargs -n 1|grep \\W|grep -v ^/|grep -v spi.o |grep -v spi.h | sort |cpio -pdu $RPM_BUILD_ROOT/usr/include/pgsql
-# thank you, cpio....
+make DESTDIR=$RPM_BUILD_ROOT install-all-headers
#fixup directory permissions for SPI stuff...
-pushd $RPM_BUILD_ROOT/usr/include/pgsql
-chmod 755 access catalog executor lib nodes parser rewrite storage tcop utils
-popd
-
-popd
-
-# Move all templates/examples beneath /usr/lib/pgsql
-pushd $RPM_BUILD_ROOT/usr/lib
- mkdir -p pgsql
- mv *.source *.sample *.description pgsql
-popd
+#pushd $RPM_BUILD_ROOT/usr/include/pgsql
+#chmod 755 access catalog executor nodes rewrite storage tcop utils
+#popd
+
+#popd
+
+# copy over Makefile.global to the include dir....
+install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
+
+%if %pgaccess
+ # pgaccess installation
+ pushd src/bin
+ install -m 755 pgaccess/pgaccess $RPM_BUILD_ROOT/usr/bin
+ mkdir -p $RPM_BUILD_ROOT/usr/share/pgsql/pgaccess
+ install -m 644 pgaccess/main.tcl $RPM_BUILD_ROOT/usr/share/pgsql/pgaccess
+ tar cf - pgaccess/lib pgaccess/images | tar xf - -C $RPM_BUILD_ROOT/usr/share/pgsql
+ cp -a pgaccess/doc/html ../../doc/pgaccess
+ cp pgaccess/demo/*.sql ../../doc/pgaccess
+ popd
+%endif
-# Get interface-specific tests and examples, and stuff under /usr/lib/pgsql
-pushd src/interfaces
-mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/perl5
-cp -a perl5/test.pl perl5/eg $RPM_BUILD_ROOT/usr/lib/pgsql/perl5
-popd
+%if %python
+ # Python
+ pushd src/interfaces/python
+ # Makefile.pre.in doesn't yet support .py files anyway, so we stick to a manual installation
+ mkdir -p $RPM_BUILD_ROOT/usr/lib/python%{pyver}/site-packages
+ install -m 755 _pgmodule.so *.py $RPM_BUILD_ROOT/usr/lib/python%{pyver}/site-packages/
+ popd
+%endif
-# Get example odbcinst.ini and put in /usr/lib/pgsql
-mv $RPM_BUILD_ROOT/usr/odbcinst.ini $RPM_BUILD_ROOT/usr/lib/pgsql
-
-# pgaccess installation
-pushd src/bin
-install -m 755 pgaccess/pgaccess $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/pgaccess
-install -m 644 pgaccess/main.tcl $RPM_BUILD_ROOT/usr/lib/pgsql/pgaccess
-tar cf - pgaccess/lib pgaccess/images | tar xf - -C $RPM_BUILD_ROOT/usr/lib/pgsql
-cp -a pgaccess/doc/html ../../doc/pgaccess
-cp pgaccess/demo/*.sql ../../doc/pgaccess
-popd
+%if %jdbc
+ # Java/JDBC
+ # The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
-# Python
-pushd src/interfaces/python
-# Makefile.pre.in doesn't yet support .py files anyway, so we stick to a manual installation
- mkdir -p $RPM_BUILD_ROOT/usr/lib/python1.5/site-packages
- install -m 755 _pgmodule.so *.py $RPM_BUILD_ROOT/usr/lib/python1.5/site-packages/
-popd
+ # Install 7.0 JDBC jars
+ install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/pgsql
+ install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/pgsql
-# Java/JDBC
-# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
-# Install 7.0 JDBC jars -- no longer include the 6.5 versions
-install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/pgsql
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/lib/pgsql
+%endif
# Fixup more permissions...
chmod 644 $RPM_BUILD_ROOT%{_mandir}/*/*
@@ -370,53 +544,162 @@ then
fi
-# Move the PL's to the right place
-mv $RPM_BUILD_ROOT/usr/lib/pl*.so $RPM_BUILD_ROOT/usr/lib/pgsql
-
# PGDATA needs removal of group and world permissions due to pg_pwd hole.
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
-# Initial pg_options
-install -m 700 %{SOURCE9} $RPM_BUILD_ROOT/var/lib/pgsql/data/pg_options
-
# backups of data go here...
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
-# tests. There are many files included here that are unnecessary, but include
-# them anyway for completeness.
-mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
-cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
-install -m 0755 src/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
-install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
-install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+# Move the PL's to the right place
+mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql
+mv $RPM_BUILD_ROOT/usr/lib/pl*.so $RPM_BUILD_ROOT/usr/lib/pgsql
+
+# postgres' .bash_profile
+install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
+
+%if %test
+ # tests. There are many files included here that are unnecessary, but include
+ # them anyway for completeness.
+ mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
+ cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
+ install -m 0755 config/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
+ install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+ install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+ pushd $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress/
+ strip *.so
+ popd
+%endif
# Upgrade scripts.
pushd $RPM_BUILD_ROOT
tar xzf %{SOURCE7}
popd
+# logrotate script removed until future release
#logrotate script source (which needs WORK)
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-cp %{SOURCE8} $RPM_BUILD_ROOT/etc/logrotate.d/postgres
-chmod 0644 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
-
+#mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+#cp %{SOURCE8} $RPM_BUILD_ROOT/etc/logrotate.d/postgres
+#chmod 0644 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
# Fix some more documentation
# no need for the OS2 client
rm -rf contrib/os2client
gzip doc/internals.ps
cp %{SOURCE6} README.rpm-dist
+mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
+
+# Build contrib stuff....
+pushd contrib
+make clean
+make all
+popd
+# move the contrib tree to the right place after building....
+cp -r contrib $RPM_BUILD_ROOT/usr/lib/pgsql
+# We'll do more prep work in a later release.....
+
+#more massaging
-# remove the binaries from contrib
+pushd $RPM_BUILD_ROOT/usr/lib/pgsql/contrib
-rm -f `find contrib -name "*.so"`
-rm -f contrib/spi/preprocessor/step1.e
+# Get rid of useless makefiles
+rm -f Makefile */Makefile
+# earthdistance
+pushd earthdistance
+perl -pi -e "s|/usr/share/pgsql/contrib|/usr/lib/pgsql/contrib/earthdistance|" *
+popd
+
+# array
+pushd array
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/array|" *
+popd
+
+# cube
+pushd cube
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/cube|" cube.sql
+popd
+
+# fulltext
+pushd fulltextindex
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/fulltextindex|" *.sql
+popd
+
+# intarray
+pushd intarray
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/intarray|" *.sql
+popd
+
+# isbn_issn
+pushd isbn_issn
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/isbn_issn|" *.sql
+popd
+
+# lo
+pushd lo
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/lo|" *.sql
+popd
+
+# miscutil
+pushd miscutil
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/miscutil|" *.sql
+popd
+
+# noup
+pushd noupdate
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/noupdate|" *.sql
+popd
+
+# pgcrypto
+pushd pgcrypto
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/pgcrypto|" *.sql
+popd
+
+
+# rserv
+pushd rserv
+perl -pi -e "s|/usr/share/|/usr/lib/|" *
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/rserv|" *
+perl -pi -e "s|/usr/bin|/usr/lib/pgsql/contrib/rserv|" *
+perl -pi -e "s|/usr/lib/pgsql/contrib\"|/usr/lib/pgsql/contrib/rserv\"|" *
+perl -pi -e "s|/usr/lib/pgsql/contrib$|/usr/lib/pgsql/contrib/rserv|" *
+popd
+
+# seg
+pushd seg
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/seg|" *.sql
+popd
+
+# soundex
+pushd soundex
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/soundex|" *.sql
+popd
+
+# spi
+pushd spi
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/spi|" *.sql
+popd
+
+# string
+pushd string
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/string|" *.sql
+popd
+
+# userlock
+pushd userlock
+perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/userlock|" *.sql
+popd
+
+popd
# Fix a dangling symlink
mkdir -p $RPM_BUILD_ROOT/usr/include/pgsql/port
cp src/include/port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/port/
ln -sf port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/os.h
+#more broken symlinks
+rm -f $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_controldata/pg_crc.c
+cp src/backend/utils/hash/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c
+ln $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_controldata/pg_crc.c
+
# Symlink libpq.so.2.0 to libpq.so.2.1 for backwards compatibility, until
# -soname patches are the norm.
pushd $RPM_BUILD_ROOT/usr/lib
@@ -433,27 +716,28 @@ if [ $1 -gt 1 ]
then
mkdir -p /usr/lib/pgsql/backup > /dev/null
pushd /usr/bin > /dev/null
- cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/lib/pgsql/backup > /dev/null 2>&1 || :
+ cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/share/pgsql/backup > /dev/null 2>&1 || :
popd > /dev/null
pushd /usr/lib > /dev/null
- cp -fp libpq.* /usr/lib/pgsql/backup > /dev/null 2>&1 || :
+ cp -fp libpq.* /usr/share/pgsql/backup > /dev/null 2>&1 || :
popd > /dev/null
fi
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%pre server
-groupadd -g 26 postgres >/dev/null 2>&1 || :
+groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
+touch /var/log/pgsql
+chown postgres.postgres /var/log/pgsql
+chmod 0700 /var/log/pgsql
-%post server
+
+%post server
+chkconfig --add postgresql
/sbin/ldconfig
-echo PGLIB=/usr/lib/pgsql >> ~postgres/.bash_profile
-echo PGDATA=/var/lib/pgsql/data >> ~postgres/.bash_profile
-echo export PGLIB PGDATA >> ~postgres/.bash_profile
-/sbin/chkconfig --add postgresql
%preun server
if [ $1 = 0 ] ; then
@@ -470,15 +754,24 @@ if [ $1 = 0 ] ; then
groupdel postgres >/dev/null 2>&1 || :
fi
+%if %odbc
%post -p /sbin/ldconfig odbc
%postun -p /sbin/ldconfig odbc
+%endif
+%if %tcl
%post -p /sbin/ldconfig tcl
%postun -p /sbin/ldconfig tcl
+%endif
-%if %{build_testpackage}
+%if %plperl
+%post -p /sbin/ldconfig plperl
+%postun -p /sbin/ldconfig plperl
+%endif
+
+%if %test
%post test
-chown -R postgres.postgres /usr/lib/pgsql/test >/dev/null 2>&1 || :
+chown -R postgres.postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
%endif
%clean
@@ -493,14 +786,10 @@ rm -f perlfiles.list
%files
%defattr(-,root,root)
-%doc doc/FAQ doc/FAQ_Linux doc/README*
-%doc COPYRIGHT README HISTORY doc/bug.template doc/FAQ_Linux
-%doc contrib doc/unpacked/*
+%doc doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README*
+%doc COPYRIGHT README HISTORY doc/bug.template
%doc README.rpm-dist
-/usr/lib/libpq.so*
-/usr/lib/libecpg.so*
-/usr/lib/libpq++.so*
-/usr/lib/libpgeasy.so*
+%doc doc/html
/usr/bin/createdb
/usr/bin/createlang
/usr/bin/createuser
@@ -509,7 +798,7 @@ rm -f perlfiles.list
/usr/bin/dropuser
/usr/bin/pg_dump
/usr/bin/pg_dumpall
-/usr/bin/pg_id
+/usr/bin/pg_restore
/usr/bin/psql
/usr/bin/vacuumdb
%{_mandir}/man1/createdb.1*
@@ -523,6 +812,23 @@ rm -f perlfiles.list
%{_mandir}/man1/psql.1*
%{_mandir}/manl/*
+%files docs
+%defattr(-,root,root)
+%doc doc/src/*
+
+%files contrib
+%defattr(-,root,root)
+%dir /usr/lib/pgsql/contrib
+/usr/lib/pgsql/contrib/*
+
+
+%files libs
+%defattr(-,root,root)
+/usr/lib/libpq.so.*
+/usr/lib/libecpg.so.*
+/usr/lib/libpq++.so.*
+/usr/lib/libpgeasy.so.*
+
%files server -f files.lst
%defattr(-,root,root)
/usr/bin/initdb
@@ -530,9 +836,8 @@ rm -f perlfiles.list
/usr/bin/ipcclean
/usr/bin/pg_ctl
/usr/bin/pg_encoding
+/usr/bin/pg_id
/usr/bin/pg_passwd
-/usr/bin/pg_upgrade
-/usr/bin/pg_version
/usr/bin/postgres
/usr/bin/postgresql-dump
/usr/bin/postmaster
@@ -541,405 +846,294 @@ rm -f perlfiles.list
%{_mandir}/man1/initlocation.1*
%{_mandir}/man1/ipcclean.1*
%{_mandir}/man1/pg_ctl.1*
-%{_mandir}/man1/pgadmin.1*
%{_mandir}/man1/pg_passwd.1*
%{_mandir}/man1/postgres.1*
%{_mandir}/man1/postmaster.1*
-%{_mandir}/man1/pg_upgrade.1*
%{_mandir}/man1/vacuumdb.1*
%{_mandir}/man1/postgresql-dump.1*
-/usr/lib/pgsql/global1.bki.source
-/usr/lib/pgsql/global1.description
-/usr/lib/pgsql/local1_template1.bki.source
-/usr/lib/pgsql/local1_template1.description
-/usr/lib/pgsql/*.sample
+/usr/share/pgsql/global.bki
+/usr/share/pgsql/global.description
+/usr/share/pgsql/template1.bki
+/usr/share/pgsql/template1.description
+/usr/share/pgsql/*.sample
/usr/lib/pgsql/plpgsql.so
-%attr(700,postgres,postgres) %dir /usr/lib/pgsql/backup
-/usr/lib/pgsql/backup/pg_dumpall_new
+%dir /usr/lib/pgsql
+%dir /usr/share/pgsql
+%attr(700,postgres,postgres) %dir /usr/share/pgsql/backup
+/usr/share/pgsql/backup/pg_dumpall_new
+%attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
-%attr(700,postgres,postgres) /var/lib/pgsql/data/pg_options
%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
+%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
%files devel
%defattr(-,root,root)
-/usr/include/pgsql
+%dir /usr/include/pgsql
+/usr/include/pgsql/*
/usr/bin/ecpg
/usr/lib/lib*.a
+/usr/bin/pg_config
+/usr/lib/libpq.so
+/usr/lib/libecpg.so
+/usr/lib/libpq++.so
+/usr/lib/libpgeasy.so
%{_mandir}/man1/ecpg.1*
+%if %tcl
%files tcl
%defattr(-,root,root)
%attr(755,root,root) /usr/lib/libpgtcl.so*
/usr/bin/pgtclsh
%{_mandir}/man1/pgtclsh.1*
/usr/lib/pgsql/pltcl.so
+%endif
+%if %tkpkg
%files tk
%defattr(-,root,root)
+/usr/bin/pgtksh
+%{_mandir}/man1/pgtksh.1*
+%endif
+%if %pgaccess
%doc doc/pgaccess/*
-/usr/lib/pgsql/pgaccess
+/usr/share/pgsql/pgaccess
/usr/bin/pgaccess
-/usr/bin/pgtksh
%{_mandir}/man1/pgaccess.1*
-%{_mandir}/man1/pgtksh.1*
+%endif
+%if %odbc
%files odbc
%defattr(-,root,root)
%attr(755,root,root) /usr/lib/libpsqlodbc.so*
-/usr/lib/pgsql/odbcinst.ini
+%config(noreplace) /etc/pgsql/odbcinst.ini
+/usr/share/pgsql/odbc.sql
+%endif
+%if %perl
%files -f perlfiles.list perl
%defattr (-,root,root)
-/usr/lib/pgsql/perl5
+%dir /usr/lib/perl5/site_perl/%{_arch}-linux/auto
+/usr/share/pgsql/perl5
%{_mandir}/man3/Pg.*
+%endif
+%if %plperl
+%files plperl
+%defattr(-,root,root)
+/usr/lib/pgsql/plperl.so
+%endif
+
+%if %python
%files python
%defattr(-,root,root)
%doc src/interfaces/python/README src/interfaces/python/tutorial
-/usr/lib/python1.5/site-packages/_pgmodule.so
-/usr/lib/python1.5/site-packages/*.py
+/usr/lib/python%{pyver}/site-packages/_pgmodule.so
+/usr/lib/python%{pyver}/site-packages/*.py
+%endif
+%if %jdbc
%files jdbc
%defattr(-,root,root)
-/usr/lib/pgsql/jdbc7.0-1.1.jar
-/usr/lib/pgsql/jdbc7.0-1.2.jar
+/usr/share/pgsql/jdbc7.0-1.1.jar
+/usr/share/pgsql/jdbc7.1-1.2.jar
+%endif
-%if %{build_testpackage}
+%if %test
%files test
%defattr(-,postgres,postgres)
+%dir /usr/lib/pgsql/test
%attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
-%attr(-,postgres,postgres)/usr/lib/pgsql/test/regress/*
+%attr(-,postgres,postgres) %dir /usr/lib/pgsql/test
+%attr(-,postgres,postgres)/usr/lib/pgsql/test/*
%endif
-# Conventions for PostgreSQL RPM releases:
-# Pre-releases are those that are built from CVS snapshots or pre-release
-# tarballs from postgresql.org. Pre-releases should have a fractional release
-# number to show their pre-release status. Official beta releases are not
-# considered pre-releases, nor are release candidates, as their beta or
-# release candidate status is reflected in the version of the tarball. Pre-
-# releases' versions do not change -- the pre-release tarball of 7.0.3, for
-# example, has the same tarball version as the final official release of 7.0.3:
-# but the tarball is different.
-
-# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
-# -- only full integer releases should be.
-
-# Start changelog proper below this comment
-
-
%changelog
-* Wed Jan 9 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.3-9.2]
-- addition to security backpatch
-
-* Tue Jan 7 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.3-9]
-- add security backpatch from more recent versions (~#74505)
-
-* Thu Mar 22 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- obsolete postgresql-test when not building it (#32640)
-- make /lib/cpp a buildprereq, not a standard prereq
-- remove the /var/log/postgresql and /etc/logrotate.d
- files - I don't see a way to enable it currently...
- (#31165). The logrotate file is still included in the SRPM,
- so make it easier to add logging later.
-- remove mentions of "-u" from pg_dumpall, as it doesn't seem
- to work
-
-
-* Tue Jan 23 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- improve gettextization
-
-* Wed Jan 17 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- gettextize
-- turn off by default
-
-* Fri Jan 12 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- use mkstemp for creating the file used by \e in the psql
- client (problem from #23695, patch made from scratch)
-- increase sleep interval in init script (#23870)
-- don't include JDBC jars for 6.5 anymore
-- add a conditional for building test subpackage
-- misc cleanups
-
-* Thu Jan 11 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- add tk as a buildprereq (#23693)
-
-* Mon Jan 01 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
-- bzip sources
-- remove test package
-
-* Mon Dec 11 2000 Oliver Paukstadt <oliver.paukstadt(a)millenux.com>
-- ported to s390
-
-* Fri Dec 01 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- changes to the logrotate script
-- fix spelling error in postgresql-tcl description
-
-* Tue Nov 14 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- made a template for IA64 (symlink to i386)
-
-* Mon Nov 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- add patch for IA64 (I got one from Lamar and modified it)
-
-* Mon Nov 13 2000 Lamar Owen <lamar(a)postgresql.org>
-- RELEASE: 7.0.3-1
-- Minor edits to initscript.
-- PRE-RELEASE: 7.0.3-0.6 (final test)
-- Final 7.0.3 tarball.
-- Cross-dist changes to RedHat initscript for better portability.
-- changed README.rpm name to README.rpm-dist (the .rpm extension confused
---some GUI file managers, as RealPlayer also uses that extension).
-- Edited README.rpm-dist to reflect cross-distribution packaging.
-- NOTE: SuSE cross-compatibility is not yet complete SuSE RPM's for 7.0.3
---that are tailored for SuSE will be made available.
-- Fixed stupid dependency -- the main .so's were in the devel package (Arggh)
-
-* Sat Nov 11 2000 Lamar Owen <lamar(a)postgresql.org>
-- PRE-RELEASE: 7.0.3-0.5
-- Framework for better distribution-independent build
-- Conditional around libtool conf stuff copy (For RedHat 6.1 and such).
-- Conditional around RedHat-style initscript stuff.
-- Comments at top of spec file now list copyright and license for spec file,
---as the license and copyright for the spec file itself has not previously
---been stated.
-- Envvars for postgres home dir login in .bash_profile.
-- initscript now checks for success and failure functions using:
---typeset -f|grep "declare -f function_name" construct.
-
-* Fri Nov 10 2000 Lamar Owen <lamar(a)postgresql.org>
-- PRE-RELEASE: 7.0.3-0.4
-- Directory ownership on /usr/lib/pgsql/test/regress was root.root.
-- Patch Makefile.shlib to not use -soname for RPM's.
-- Newer prerelease 7.0.3 tarball.
-
-* Thu Nov 09 2000 Lamar Owen <lamar(a)postgresql.org>
-- PRE-RELEASE: 7.0.3-0.3
-- Don't bother copying the test stuff I'm not packaging.
-- Fix group add/del stuff in server subpackage post and postun scriptlets.
-- symlink /usr/lib/libpq.so.2.0 -> libpq.so.2.1
-
-* Mon Nov 06 2000 Lamar Owen <lamar(a)postgresql.org>
-- PRE-RELEASE: 7.0.3-0.2
-- preliminary 7.0.3 distribution tarball -- reinstated man pages, etc.
-
-* Sat Nov 04 2000 Lamar Owen <lamar(a)postgresql.org>
-- PRE-RELEASE: 7.0.3-0.1.
-- Improved test subpackage -- only package regression.
-- Latest pre-7.0.3 snapshot.
-- Split out SuSE and Caldera spec files. Caldera COL eServer 2.3 requires
--- RPM 2.5.5-compatible spec files. SuSE is just too different from the others
--- for the spec file to cope, for now.
-- TODO: man pages and documentation.
-
-* Mon Oct 30 2000 Lamar Owen <lamar(a)postgresql.org>
-- pre-7.0.3
-
-* Mon Oct 30 2000 Lamar Owen <lamar(a)postgresql.org>
-- Reenabled the test subpackage for ftp.postgresql.org dist.
-- Backported to RH 6.2 -- involved the Pg man page, doesn't appear to require
--- other stuff to be done.
-
-
-* Sun Oct 22 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- make /etc/logrotate.d/postgres 0644 instead of 0700 (#19520)
-
-
-* Thu Oct 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- rebuild with new glibc which has semaphore fixes for Alpha
-
-* Tue Sep 05 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- add documention for python interface (#17261)
-- move the python interface tutorial to the %%doc section
-
-* Thu Aug 24 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- the old dump script didn't work - added rh-pgdump.sh
- to handle this. Point docs at it, and tell how it is to be used.
-
-* Mon Aug 21 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- fix the initscript so it points you at the 7.0.2 directory
- in /usr/share/doc, not 7.0 (#16163). Also, remove statement
- it was built on a 6.2 system.
-- prereq /lib/cpp and initscripts
-- fix backups of existing files (#16706)
-- fix conditional restart
-
-* Sat Aug 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- fix README.rpm to it points at /usr/share/doc, not /usr/doc
- (part of #16416)
-
-* Wed Aug 16 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- don't build test package anymore, it's broken. These
- tests should be run by pgsql developers and not
- by db-developers, so it's not a big loss (#16165).
- Obsolete it in the main package, so it doesn't get left over
-
-* Mon Aug 14 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- reference docs in /usr/share/doc, not /usr/doc (#16163)
-- add python-devel, perl and tcl as build prereqs
-- use /dev/null as STDIN for su commands in initscripts,
- to avoid error messages from not being able to read from
- tty
-
-* Sat Aug 05 2000 Bill Nottingham <notting(a)redhat.com>
-- condrestart fixes
-
-* Mon Jul 31 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- remove all plperl references, to avoid confusing post install scripts
-- cleanups
-
-* Mon Jul 17 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- remove the symlink from libpq.so.2.0 to libpq.so.2.1
-- remove some binaries from docs
-- fix dangling symlink os.h
-- use /sbin/service
-
-* Thu Jul 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- don't strip manually
-- fixes to init script so they look more like the rest
- (#13749, from giulioo(a)pobox.com)
-- use /etc/rc.d/init.d again (sigh)
-
-* Wed Jul 12 2000 Prospector <bugzilla(a)redhat.com>
-- automatic rebuild
-
-* Thu Jul 06 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- "Prereq:", not "Requires:" for /etc/init.d
-
-* Thu Jul 06 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- require /etc/init.d
-
-* Wed Jun 21 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- remove perl kludge as perl 5.6 is now fixed
-- include the man page for the perl module
-- fix the init script and spec file to handle conditional
- restart
-- move the init file to /etc/init.d
-- use License instead of Copyright
-
-* Mon Jun 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- rebuild
-
-* Tue Jun 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- use %%defattr on postgresql-perl
-- use %%{_tmppath}
-- Don't use release number in patch
-- Don't build on ia64 yet
-
-* Mon Jun 12 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0.2-2
-- Corrected misreporting of version.
-- Corrected for non-root build clean script.
-
-* Mon Jun 05 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0.2
-- Postgresql-dump manpage to man1, and to separate source file to facilitate
--- _mandir macro expansion correctness.
-- NOTE: The PostScript documentation is no longer being included in the
--- PostgreSQL tarball. If demand is such, I will pull together a
--- postgresql-ps-docs subpackage or pull in the PostScript docs into the
--- main package.
-- RPM patchset has release number, now, to prevent patchfile confusion :-(.
-
-
-* Sat Jun 03 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- Incorporate most of Trond's changes (reenabled the alpha
--- patches, as it was a packaging error on my part).
-- Trimmed changelog history to Version 7.0beta1 on. To see the
--- previous changelog, grab the 6.5.3 RPM from RedHat 6.2 and pull the spec.
-- Rev to 7.0.1 (which incorporates the syslog patch, which has
--- been removed from rpm-pgsql-7.0.1-1.patch)
-
-* Fri May 26 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- disable the alpha patch, as it doesn't apply cleanly
-- removed distribution, packager, vendor
-- renamed spec file
-- don't build pl-perl
-- use %%{_mandir}
-- now includes vacuumdb.1*
-
-* Thu May 25 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0-3
-- Incorporated Tatsuo's syslog segmentation patches
-- Incorporated some of Trond's changes (see below)
--- Fixed some Perl 5.6 oddness in Rawhide
-- Incorporated some of Karl's changes (see below)
--- PL/Perl should now work.
-- Fixed missing /usr/bin/pg_passwd.
-
-* Mon May 22 2000 Karl DeBisschop <kdebisschop(a)infoplease.com>
-- 7.0-2.1
-- make plperl module (works for linux i386, your guess for other platforms)
-- use "make COPT=" because postgreSQL configusre script ignores CFLAGS
-
-* Sat May 20 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0-2
-- pg_options default values changed.
-- SPI headers (again!) fixed in a permanent manner -- hopefully!
-- Alpha patches!
-
-* Wed May 17 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- changed bug in including man pages
-
-* Tue May 16 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- changed buildroot, removed packager, vendor, distribution
--- [Left all but buildroot as-is for PostgreSQL.org RPMS. LRO]
-- don't strip in package [strip in PostgreSQL.org RPMS]
-- fix perl weirdnesses (man page in bad location, remove
- perllocal.pod from file list)
-
-* Mon May 15 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0 final -1
-- Man pages restructured
-- Changed README.rpm notices about BETA
-- incorporated minor changes from testing
-- still no 7.0 final alpha patches -- for -2 or -3, I guess.
-- 7.0 JDBC jars!
-
-* Sat May 06 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0RC5-0.5
-- UserID of 26 to conform to RedHat Standard, instead of 40. This only
--- is for new installs -- upgrades will use what was already there.
-- Waiting on built jar's of JDBC. If none are forthcoming by release,
--- I'm going to have to bite the bullet and install the jdk....
-
-* Mon May 01 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0RC2-0.5
-- Fixed /usr/src/redhat/BUILD path to $RPM_BUILD_DIR for portability
--- and so that RPM's can be built by non-root.
-- Minor update to README.rpm
-
-* Tue Apr 18 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 0.6
-- Fixed patchset: wasn't patching pgaccess or -i in postmaster.opts.default
-- minor update to README.rpm
-
-* Mon Apr 17 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0RC1-0.5 (release candidate 1.)
-- Fixed SPI header directories' permisssions.
-- Removed packaging of Alpha patches until Ryan releases RC1-tested set.
-
-* Mon Apr 10 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0beta5-0.1 (released instead of the release candidate)
-
-* Sat Apr 08 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0beta4-0.2 (pre-release-candidate CVS checkout)
-- Alpha patches!
-- pg_options.sample
-
-* Fri Mar 24 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- 7.0beta3-0.1
-
-* Mon Feb 28 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- Release 0.3
-- Fixed stderr redir problem in init script
-- Init script now uses pg_ctl to start postmaster
-- Packaged inital pg_options for good logging
-- built with timestamped logging.
-
-* Tue Feb 22 2000 Lamar Owen <lamar.owen(a)wgcr.org>
-- Initial 7.0beta1 build
-- Moved PGDATA to /var/lib/pgsql/data
-- First stab at logging and logrotate functionality -- test carefully!
-- -tcl subpackage split -- tcl client and pltcl lang separated from
--- the Tk stuff. PgAccess and the tk client are now in the -tk subpackage.
-- No patches for Alpha as yet.
-
+* Mon Aug 20 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.3-1
+- Updated README.rpm-dist from Lamar
+- Work around the horror that is perl's Makefile generation
+ (LD_RUN_PATH is not a good thing) (#51957)
+- 7.1.3, stable bugfix release. Remove patches from CVS as they are now included
+- Own more directories
+
+* Mon Aug 6 2001 Trond Eivind Glomsrd <teg(a)redhat.com> 7.1.2-7
+- Add patches from 7.1-stable branch. This should fix #50799 and #50797
+- Enable kerberos authentication (#50644)
+- handle stop with stale pid file (#50499)
+- make the test subpackage (not built by default) own /usr/lib/pgsql/test
+
+* Mon Jul 9 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Make the -devel subpackage depend on -libs, not the main package
+
+* Tue Jun 19 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Make sure the python subpackage depends on mx - otherwise, you'd get an
+ error when importing
+
+* Mon Jun 18 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
+- add changes for s390x
+
+* Fri Jun 15 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Many path fixes for contrib packages
+- Newer intarray
+- Don't use nested ifs for tkpkg/pgaccess
+- Turn off test package for Red Hat Linux - it makes most sense just to use
+ this during development
+- One "pgacess" -> "pgaccess"
+
+* Wed Jun 13 2001 Lamar Owen <lamar.owen(a)wgcr.org> <lamar(a)postgresql.org>
+- -4PGDG
+- patchset update for pg_regress.sh
+- can the dot in the release -- confused too many people and some programs.
+- -3.PGDG
+- updated README.rpm-dist
+- updated patch to 7.1.2, fixing some places where /usr/share/pgsql
+ was still being used where /usr/lib/pgsql was intended.
+- PGLIB now set to /usr/lib/pgsql -- initdb doesn't use it to find the bki's.
+
+* Tue Jun 12 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- sync
+- Run chkconfig --add on server install
+- Move the prereqs on useradd on chkconfig to the server package
+- don't disable the %%clean section
+
+* Sat Jun 09 2001 Lamar Owen <lamar.owen(a)wgcr.org>
+- Sync up with Trond Eivind's set.
+
+* Thu Jun 7 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Don't create postgres' .bashrc from the server post script: include it instead
+- Move the test packages from /usr/share/pgsql to /usr/lib/pgsql
+- Move the symlinks libpq.so, libecpg.so, libpq++.so and libpgeasy.so to the devel subpackage from
+ libs
+- Source the i18n data from the .bashrc instead of in the initscript
+
+* Mon May 28 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Handle i18n for database startup - backend needs to have the same locale everytime,
+ but this certainly can't be hardcoded to C either
+- Fix stop, restart in initscript (#42217)
+- Make database init _much_ less verbose
+- other minor fixes to the initscript
+
+* Fri May 25 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- 7.1.2
+
+* Thu May 24 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- 7.1.2-0.1.1.PGDG PRERELEASE
+- Changed versioning and release numbering a little for better flexibility,
+-- particularly for distribution packagers.
+- Release numbering comment at top of spec, where it's more useful.
+- Trimmed changelog to 7.1.x. See the last 7.0.3's specfile for the 7.0
+ changlog, and the last 6.5.3's specfile for the changelog prior to
+ 7.0.
+
+* Sun May 20 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- 7.1.1-4.PGDG
+- _really_ got Python version agnosticism working.
+
+* Sat May 19 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- 7.1.1-3.PGDG Release
+- Python version agnosticism.....
+
+* Tue May 15 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Use openssl
+- Make it obsolete subpackages if they aren't built
+
+* Mon May 14 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- 7.1.1-2.PGDG Release.
+- Appended .PGDG to release string to differentiate our RPM set from the others.
+- /bin/sh fix in initscript
+- README.rpm-dist updates.
+
+* Mon May 14 2001 Bernhard Rosenkraenzer <bero(a)redhat.com> 7.1.1-0.7
+- Rebuild with new readline
+
+* Thu May 10 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Initial 7.1.1
+
+* Mon May 7 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- Specify shell when running commands through su in the initscript, to avoid problems
+ when people switch the postgres user to use tcsh
+
+* Thu Apr 19 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- JDBC driver for Postgresql 7.1
+
+* Sun Apr 15 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- slightly different versioning scheming, will go back to the official
+ later when I'm sure the package is ready to use
+
+* Fri Apr 13 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- 7.1 RELEASE
+- 7.1-1 RPM RELEASE
+- Change to COPTS -- strip out -ffastmath -- Considered Harmful.
+- Back to old versioning scheme, kept teg's other fixes.
+- README.rpm-dist updated.
+- PGVERSION updated all-around (hopefully!)
+- Couple of fixes from Peter E.
+- Rearrange dependencies -- only the -libs subpackage is required for most stuff
+- Removed broken and confusing logrotate script.
+
+* Mon Apr 9 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- chown considered harmful - removed
+- fix dangling symlimks (pg_crc.c)
+- libpq.so changes for maximum compatiblity
+- different versioning scheme, to avoid trouble later
+- remove temporary perl file from the file list
+- fix spelling error in tcl description
+- mark odbcinst.ini as a config file
+- use %%defattr on packages which didn't have it
+
+* Sat Apr 07 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- Integrated the PL/Perl stuff from Karl DeBisschop --conditional.
+- Packaging reorg: added contrib and docs subpackages.
+- Removed sgml source docs from main package --> docs subpackage.
+- Removed contrib tree from main package --> contrib subpackage.
+- Contrib tree is now prebuilt -- HOWEVER, very little install work is
+ currently done with this.
+
+* Fri Apr 06 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- Quickie RC3. There will be a 7.1RC3-2 shortly with other stuff.
+
+* Tue Apr 03 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- RC2
+- eliminate versioning information for ancilliary files in prep for CVS.
+- Fix docs mixup.
+
+* Tue Mar 27 2001 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+- RC1 quickie.
+
+* Tue Mar 20 2001 Lamar Owen <lamar(a)postgresql.org>
+- Beta 6 initial build.
+- Use make install-all-headers instead of cpio hack for devel headers.
+- Split out the libs into the libs subpackage.
+- Updated initscript to use pg_ctl to stop
+- Updated initscript to initdb and start postmaster with LC_ALL=C to
+ prevent index corruption.
+
+
+* Sun Jan 28 2001 Lamar Owen <lamar(a)postgresql.org>
+- Beta4
+- Return to 'pgsql' directories instead of 'postgresql'
+- Better perl patches.
+
+* Mon Jan 15 2001 Lamar Owen <lamar(a)postgresql.org>
+- Edit patches to get rid of some cruft.
+- Eliminate some more pre-7.1 specfile baggage that is no longer necessary.
+- Moved pg_id to server
+- added Makefile.global and pg_config to devel
+- Corrected /usr/include/pgsql to /usr/include/postgresql
+- Fixed some configure options. Will be trying the configure macro next release
+- Since it is terminally ill in this version pg_upgrade is _gone_.
+- Thanks to Peter E for a good review.
+
+* Sun Jan 14 2001 Lamar Owen <lamar(a)postgresql.org>
+- Running regression. 1 on the release-o-meter.
+- Minor patches to get regression running right.
+- Initscript tweaking -- the old test for a database structure fails with 7.1's new structure.
+
+* Sat Jan 13 2001 Lamar Owen <lamar(a)postgresql.org>
+- Perl 5 needs to be built with PREFIX set on the Makefile, not GNUmakefile....
+- The 7.1 build is different from the 7.0 build -- see the configure line.
+- NOTE: many files that used to be in /usr/share/postgresql are now in /usr/share/postgresql!
+- by request, conditional packages are now supported. See the top of the spec.
+- Fixed the server postinstall problems.
+
+* Mon Jan 08 2001 Lamar Owen <lamar(a)postgresql.org>
+- First 7.1 beta test-build
diff --git a/sources b/sources
index 6196653..6c4f126 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-57d69fb52be57f7caa91cccf7d24d199 file-lists-pgsql-7.0.3.tar.gz
-baae3796a93a2aaac512cc05abfebc89 pg-migration-scripts-7.0.3.tar.gz
-c139d0716a459622c463bab8c438e3cc postgresql-7.0.3-alpha.patch.gz
-498790137935e5a957170100a30d5489 postgresql-7.0.3.tar.bz2
+85e9b43217c22ca22a45b3a831f7df4a contrib-intarray.tar.gz
+57d69fb52be57f7caa91cccf7d24d199 file-lists.tar.gz
+5e9beca9c039be1ded2e51a0edcd9fba migration-scripts.tar.gz
+a92c77092034fb35c7b3bb82beebd54b postgresql-7.1.3.tar.gz
3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit ab668a0e7fb7b58f67527c5a5f2cf6f8ec897ed8
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:36:45 2004 +0000
auto-import changelog data from postgresql-7.0.3-9.2.src.rpm
Thu Jan 09 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.3-9.2]
- addition to security backpatch
diff --git a/postgresql.spec b/postgresql.spec
index 7d0736c..ae30aa6 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -4,7 +4,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 7.0.3
-Release: 8a
+Release: 9.2
License: BSD
Group: Applications/Databases
# originally .gz
@@ -16,8 +16,8 @@ Source6: README.rpm-dist.postgresql-%{version}
Source7: pg-migration-scripts-%{version}.tar.gz
Source8: logrotate.postgresql-%{version}
Source9: pg_options-%{version}
-Source10: http://www.retep.org.uk/postgres/jdbc7.0-1.1.jar
-Source11: http://www.retep.org.uk/postgres/jdbc7.0-1.2.jar
+Source10: http://jdbc.postgresql.org/download/jdbc7.0-1.1.jar
+Source11: http://jdbc.postgresql.org/download/jdbc7.0-1.2.jar
Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
Source15: pg_dumpall.1
@@ -25,7 +25,8 @@ Patch0: postgresql-%{version}-alpha.patch.gz
Patch1: rpm-pgsql-%{version}.patch
Patch2: postgresql-7.0.3-ia64-2.patch
Patch3: postgresql-7.0.3-mkstemp.patch
-Patch10: postgresql-7.0.2-s390x.patch
+Patch4: postgresql-%{version}-security.patch
+Patch10: postgresql-7.0.2-s390.patch
Requires: perl
Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd initscripts
BuildPrereq: /lib/cpp
@@ -195,8 +196,9 @@ system, including regression tests and benchmarks.
%endif
%patch3 -p1
+%patch4 -p1
-%ifarch s390 s390x
+%ifarch s390
%patch10 -p1 -b .s390
%endif
@@ -626,6 +628,12 @@ rm -f perlfiles.list
%changelog
+* Wed Jan 9 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.3-9.2]
+- addition to security backpatch
+
+* Tue Jan 7 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.3-9]
+- add security backpatch from more recent versions (~#74505)
+
* Thu Mar 22 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
- obsolete postgresql-test when not building it (#32640)
- make /lib/cpp a buildprereq, not a standard prereq
commit b410c1490e7921e9d52f78317856b3d2bf2f7a7c
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:36:18 2004 +0000
auto-import postgresql-7.0.3-8a from postgresql-7.0.3-8a.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index 2b6af2e..7d0736c 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -4,7 +4,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 7.0.3
-Release: 8
+Release: 8a
License: BSD
Group: Applications/Databases
# originally .gz
@@ -25,7 +25,7 @@ Patch0: postgresql-%{version}-alpha.patch.gz
Patch1: rpm-pgsql-%{version}.patch
Patch2: postgresql-7.0.3-ia64-2.patch
Patch3: postgresql-7.0.3-mkstemp.patch
-Patch10: postgresql-7.0.2-s390.patch
+Patch10: postgresql-7.0.2-s390x.patch
Requires: perl
Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd initscripts
BuildPrereq: /lib/cpp
@@ -196,7 +196,7 @@ system, including regression tests and benchmarks.
%patch3 -p1
-%ifarch s390
+%ifarch s390 s390x
%patch10 -p1 -b .s390
%endif
commit d6c16ca0d836bb7ff5231927f8fa5ce7be20aed0
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:36:14 2004 +0000
auto-import postgresql-7.0.3-8 from postgresql-7.0.3-8.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 90dcc67..bb7c60c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
file-lists-pgsql-7.0.3.tar.gz
pg-migration-scripts-7.0.3.tar.gz
postgresql-7.0.3-alpha.patch.gz
-postgresql-7.0.3.tar.gz
+postgresql-7.0.3.tar.bz2
postgresql-dump.1.gz
diff --git a/postgresql.spec b/postgresql.spec
index 2bbf166..2b6af2e 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,12 +1,14 @@
+# Do we want to build the postgresql-test package ? (1=yes 0=no)
+%define build_testpackage 0
+
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 7.0.3
-Release: 0.4
+Release: 8
License: BSD
Group: Applications/Databases
-Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
-Source1: http://www.retep.org.uk/postgres/jdbc6.5-1.1.jar
-Source2: http://www.retep.org.uk/postgres/jdbc6.5-1.2.jar
+# originally .gz
+Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
Source3: postgresql.init-%{version}
Source4: file-lists-pgsql-%{version}.tar.gz
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -18,16 +20,26 @@ Source10: http://www.retep.org.uk/postgres/jdbc7.0-1.1.jar
Source11: http://www.retep.org.uk/postgres/jdbc7.0-1.2.jar
Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
+Source15: pg_dumpall.1
Patch0: postgresql-%{version}-alpha.patch.gz
Patch1: rpm-pgsql-%{version}.patch
Patch2: postgresql-7.0.3-ia64-2.patch
+Patch3: postgresql-7.0.3-mkstemp.patch
+Patch10: postgresql-7.0.2-s390.patch
Requires: perl
Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd initscripts
-BuildPrereq: python-devel perl tcl /lib/cpp
+BuildPrereq: /lib/cpp
+BuildPrereq: python-devel perl tcl tk
Url: http://www.postgresql.org/
Obsoletes: postgresql-clients
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+%if %{build_testpackage}
+%else
+Obsoletes: postgresql-test
+%endif
+
+
+Buildroot: %{_tmppath}/%{name}-%{version}-root
# This is the PostgreSQL Global Development Group Official RPMset spec file.
# Copyright 2000 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
@@ -64,7 +76,7 @@ if you're installing the postgresql-server package.
Summary: The programs needed to create and run a PostgreSQL server.
Group: Applications/Databases
Prereq: /usr/sbin/useradd
-Requires: postgresql = %{version}
+Requires: postgresql = %{version} , bash >= 2
%description server
The postgresql-server package includes the programs needed to create
@@ -99,7 +111,7 @@ Requires: tcl >= 8.0, postgresql = %{version}
%description tcl
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-tcl package contains the libpgtcl client library,
-the pg-enchanced pgtclsh, and the PL/Tcl procedural language for the backend.
+the pg-enhanced pgtclsh, and the PL/Tcl procedural language for the backend.
%package tk
Summary: Tk shell and tk-based GUI for PostgreSQL.
@@ -112,7 +124,6 @@ system. The postgresql-tk package contains the pgaccess
program. Pgaccess is a graphical front end, written in Tcl/Tk, for the
psql and related PostgreSQL client programs.
-
%package odbc
Summary: The ODBC driver needed for accessing a PostgreSQL DB using ODBC.
Group: Applications/Databases
@@ -155,6 +166,7 @@ PostgreSQL is an advanced Object-Relational database management
system. The postgresql-jdbc package includes the .jar file needed for
Java programs to access a PostgreSQL database.
+%if %{build_testpackage}
%package test
Summary: The test suite distributed with PostgreSQL.
Group: Applications/Databases
@@ -165,6 +177,7 @@ PostgreSQL is an advanced Object-Relational database management
system. The postgresql-test package includes the sources and pre-built
binaries of various tests for the PostgreSQL database management
system, including regression tests and benchmarks.
+%endif
%prep
%setup -q
@@ -181,8 +194,13 @@ system, including regression tests and benchmarks.
%patch2 -p1
%endif
+%patch3 -p1
+
+%ifarch s390
+%patch10 -p1 -b .s390
+%endif
-# I hope this works....
+# Seems to work just fine
%ifarch ia64
ln -s linux_i386 src/template/linux
@@ -193,7 +211,6 @@ ln -s linux_i386 src/template/linux
# Get file lists....
tar xzf %{SOURCE4}
-
pushd src
# If libtool installed, copy some files....
@@ -231,10 +248,11 @@ make all
popd
%install
+eval `perl '-V:installarchlib'`
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/{include/pgsql,lib,bin}
mkdir -p $RPM_BUILD_ROOT%{_mandir}
-mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{_arch}-linux/auto/Pg
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src install
make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 install
@@ -242,10 +260,11 @@ make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/interface
find $RPM_BUILD_ROOT/usr/lib/perl5 -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT/usr/lib/perl5 -type f -print | \
sed -e "s|$RPM_BUILD_ROOT/|/|g" | \
- sed -e "s|.*/man/.*|&\*|" > perlfiles.list
+ sed -e "s|.*/man/.*|&\*|" | grep -v -E "(Pg.bs|perllocal.pod)" > perlfiles.list
find $RPM_BUILD_ROOT/usr/lib/perl5 -type d -name Pg -print | \
sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
+
# check and fixup Pg manpage location....
if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ]
then
@@ -258,6 +277,7 @@ make -C doc
# man pages....
pushd $RPM_BUILD_ROOT%{_mandir}
tar xzf $RPM_BUILD_DIR/postgresql-%{version}/doc/man.tar.gz
+install -m 644 %SOURCE15 $RPM_BUILD_ROOT/%{_mandir}/man1
# the postgresql-dump manpage.....
cp %{SOURCE12} man1
@@ -321,10 +341,7 @@ popd
# Java/JDBC
# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
-# Install 6.5 JDBC jars for now.
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/pgsql
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/pgsql
-# Install 7.0 JDBC jars -- in addition to, not replacing 6.5 stuff yet.
+# Install 7.0 JDBC jars -- no longer include the 6.5 versions
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/pgsql
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/lib/pgsql
@@ -398,10 +415,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/include/pgsql/port
cp src/include/port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/port/
ln -sf port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/os.h
-# remove perllocal.pod from the file list - only occurs with 5.6
-
-perl -pi -e "s/^.*perllocal.pod$//" perlfiles.list
-
# Symlink libpq.so.2.0 to libpq.so.2.1 for backwards compatibility, until
# -soname patches are the norm.
pushd $RPM_BUILD_ROOT/usr/lib
@@ -432,15 +445,13 @@ fi
groupadd -g 26 postgres >/dev/null 2>&1 || :
useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
-touch /var/log/postgresql
-chown postgres.postgres /var/log/postgresql
-chmod 0700 /var/log/postgresql
-
-%post -p /sbin/ldconfig server
+%post server
+/sbin/ldconfig
echo PGLIB=/usr/lib/pgsql >> ~postgres/.bash_profile
echo PGDATA=/var/lib/pgsql/data >> ~postgres/.bash_profile
echo export PGLIB PGDATA >> ~postgres/.bash_profile
+/sbin/chkconfig --add postgresql
%preun server
if [ $1 = 0 ] ; then
@@ -463,8 +474,10 @@ fi
%post -p /sbin/ldconfig tcl
%postun -p /sbin/ldconfig tcl
+%if %{build_testpackage}
%post test
chown -R postgres.postgres /usr/lib/pgsql/test >/dev/null 2>&1 || :
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -510,7 +523,6 @@ rm -f perlfiles.list
%files server -f files.lst
%defattr(-,root,root)
-/etc/logrotate.d/postgres
/usr/bin/initdb
/usr/bin/initlocation
/usr/bin/ipcclean
@@ -576,7 +588,6 @@ rm -f perlfiles.list
%files -f perlfiles.list perl
%defattr (-,root,root)
-%dir /usr/lib/perl5/site_perl/%{_arch}-linux/auto
/usr/lib/pgsql/perl5
%{_mandir}/man3/Pg.*
@@ -588,15 +599,15 @@ rm -f perlfiles.list
%files jdbc
%defattr(-,root,root)
-/usr/lib/pgsql/jdbc6.5-1.1.jar
-/usr/lib/pgsql/jdbc6.5-1.2.jar
/usr/lib/pgsql/jdbc7.0-1.1.jar
/usr/lib/pgsql/jdbc7.0-1.2.jar
+%if %{build_testpackage}
%files test
%defattr(-,postgres,postgres)
%attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
%attr(-,postgres,postgres)/usr/lib/pgsql/test/regress/*
+%endif
# Conventions for PostgreSQL RPM releases:
# Pre-releases are those that are built from CVS snapshots or pre-release
@@ -612,9 +623,48 @@ rm -f perlfiles.list
# -- only full integer releases should be.
# Start changelog proper below this comment
+
+
%changelog
-* Wed Nov 15 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
-- move /lib/cpp from Prereq to BuildPrereq
+* Thu Mar 22 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- obsolete postgresql-test when not building it (#32640)
+- make /lib/cpp a buildprereq, not a standard prereq
+- remove the /var/log/postgresql and /etc/logrotate.d
+ files - I don't see a way to enable it currently...
+ (#31165). The logrotate file is still included in the SRPM,
+ so make it easier to add logging later.
+- remove mentions of "-u" from pg_dumpall, as it doesn't seem
+ to work
+
+
+* Tue Jan 23 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- improve gettextization
+
+* Wed Jan 17 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- gettextize
+- turn off by default
+
+* Fri Jan 12 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- use mkstemp for creating the file used by \e in the psql
+ client (problem from #23695, patch made from scratch)
+- increase sleep interval in init script (#23870)
+- don't include JDBC jars for 6.5 anymore
+- add a conditional for building test subpackage
+- misc cleanups
+
+* Thu Jan 11 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- add tk as a buildprereq (#23693)
+
+* Mon Jan 01 2001 Trond Eivind Glomsrd <teg(a)redhat.com>
+- bzip sources
+- remove test package
+
+* Mon Dec 11 2000 Oliver Paukstadt <oliver.paukstadt(a)millenux.com>
+- ported to s390
+
+* Fri Dec 01 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- changes to the logrotate script
+- fix spelling error in postgresql-tcl description
* Tue Nov 14 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- made a template for IA64 (symlink to i386)
diff --git a/sources b/sources
index 4321e13..6196653 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
57d69fb52be57f7caa91cccf7d24d199 file-lists-pgsql-7.0.3.tar.gz
baae3796a93a2aaac512cc05abfebc89 pg-migration-scripts-7.0.3.tar.gz
c139d0716a459622c463bab8c438e3cc postgresql-7.0.3-alpha.patch.gz
-b416c04e6c91967160dfde866293ee6f postgresql-7.0.3.tar.gz
+498790137935e5a957170100a30d5489 postgresql-7.0.3.tar.bz2
3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit a4660cb968502fd87175cb059d98418f8d093755
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:35:59 2004 +0000
auto-import postgresql-7.0.3-0.4 from postgresql-7.0.3-0.4.src.rpm
diff --git a/.cvsignore b/.cvsignore
index 38b58e0..90dcc67 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,5 @@
-pg-migration-scripts-7.0.2.tar.gz
-postgresql-7.0.2-alpha.patch.gz
-postgresql-7.0.2.tar.gz
+file-lists-pgsql-7.0.3.tar.gz
+pg-migration-scripts-7.0.3.tar.gz
+postgresql-7.0.3-alpha.patch.gz
+postgresql-7.0.3.tar.gz
postgresql-dump.1.gz
diff --git a/postgresql.spec b/postgresql.spec
index 1ba1621..2bbf166 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,15 +1,16 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.0.2
-Release: 19
+Version: 7.0.3
+Release: 0.4
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
Source1: http://www.retep.org.uk/postgres/jdbc6.5-1.1.jar
Source2: http://www.retep.org.uk/postgres/jdbc6.5-1.2.jar
Source3: postgresql.init-%{version}
-Source6: README.rpm.postgresql-%{version}
+Source4: file-lists-pgsql-%{version}.tar.gz
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+Source6: README.rpm-dist.postgresql-%{version}
Source7: pg-migration-scripts-%{version}.tar.gz
Source8: logrotate.postgresql-%{version}
Source9: pg_options-%{version}
@@ -19,13 +20,27 @@ Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
Patch0: postgresql-%{version}-alpha.patch.gz
Patch1: rpm-pgsql-%{version}.patch
+Patch2: postgresql-7.0.3-ia64-2.patch
Requires: perl
-Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd /lib/cpp initscripts
-BuildPrereq: python-devel perl tcl
+Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd initscripts
+BuildPrereq: python-devel perl tcl /lib/cpp
Url: http://www.postgresql.org/
-Obsoletes: postgresql-clients postgresql-test
+Obsoletes: postgresql-clients
Buildroot: %{_tmppath}/%{name}-%{version}-root
-ExcludeArch: ia64
+
+
+# This is the PostgreSQL Global Development Group Official RPMset spec file.
+# Copyright 2000 Lamar Owen <lamar(a)postgresql.org> <lamar.owen(a)wgcr.org>
+# and others listed.
+
+# Major Contributors:
+# ---------------
+# Lamar Owen
+# Trond Eivind Glomsrd <teg(a)redhat.com>
+# Thomas Lockhart
+
+# This spec file and ancilliary files are licensed in accordance with
+# The PostgreSQL license.
%description
PostgreSQL is an advanced Object-Relational database management system
@@ -60,7 +75,7 @@ almost all SQL constructs (including transactions, subselects and
user-defined types and functions). You should install
postgresql-server if you want to create and maintain your own
PostgreSQL databases and/or your own PostgreSQL server. You also need
-to install the postgresql and postgresql-devel packages.
+to install the postgresql package.
%package devel
Summary: PostgreSQL development header files and libraries.
@@ -140,16 +155,16 @@ PostgreSQL is an advanced Object-Relational database management
system. The postgresql-jdbc package includes the .jar file needed for
Java programs to access a PostgreSQL database.
-#package test
-#Summary: The test suite distributed with PostgreSQL.
-#Group: Applications/Databases
-#Requires: postgresql = %{version}
+%package test
+Summary: The test suite distributed with PostgreSQL.
+Group: Applications/Databases
+Requires: postgresql = %{version}
-#description test
-#PostgreSQL is an advanced Object-Relational database management
-#system. The postgresql-test package includes the sources and pre-built
-#binaries of various tests for the PostgreSQL database management
-#system, including regression tests and benchmarks.
+%description test
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-test package includes the sources and pre-built
+binaries of various tests for the PostgreSQL database management
+system, including regression tests and benchmarks.
%prep
%setup -q
@@ -162,25 +177,41 @@ Java programs to access a PostgreSQL database.
%patch1 -p1
+%ifarch ia64
+%patch2 -p1
+%endif
+
+
+# I hope this works....
+
+%ifarch ia64
+ln -s linux_i386 src/template/linux
+%endif
+
%build
+
+# Get file lists....
+tar xzf %{SOURCE4}
+
+
pushd src
-cp /usr/share/libtool/config.* .
+# If libtool installed, copy some files....
+if [ -d /usr/share/libtool ]
+then
+ cp /usr/share/libtool/config.* .
+fi
+
CFLAGS="$RPM_OPT_FLAGS"
-%ifarch alpha
- ./configure --enable-hba --enable-locale --prefix=/usr\
- --with-perl --enable-multibyte\
- --with-tcl --with-tk --with-x \
- --with-odbc --with-java \
- --with-python --with-template=linux_alpha
-%else
./configure --enable-hba --enable-locale --prefix=/usr\
--with-perl --enable-multibyte \
--with-tcl --with-tk --with-x \
- --with-odbc --with-java \
- --with-python
+ --with-odbc --with-java --enable-syslog\
+%ifarch alpha
+ --with-template=linux_alpha \
%endif
+ --with-python
make COPT="$RPM_OPT_FLAGS" all
@@ -205,7 +236,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/{include/pgsql,lib,bin}
mkdir -p $RPM_BUILD_ROOT%{_mandir}
mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{_arch}-linux/auto/Pg
make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src install
-#make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/man install
make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 install
# Get rid of the packing list generated by the perl Makefile, and build my own...
@@ -215,9 +245,17 @@ find $RPM_BUILD_ROOT/usr/lib/perl5 -type f -print | \
sed -e "s|.*/man/.*|&\*|" > perlfiles.list
find $RPM_BUILD_ROOT/usr/lib/perl5 -type d -name Pg -print | \
sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
+
+# check and fixup Pg manpage location....
+if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ]
+then
+ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
+ cp `find $RPM_BUILD_ROOT -name 'Pg.3*' -print` $RPM_BUILD_ROOT%{_mandir}/man3
+fi
+
make -C doc
-#make -C doc man
-# Newer man pages from Thomas Lockhart
+
+# man pages....
pushd $RPM_BUILD_ROOT%{_mandir}
tar xzf $RPM_BUILD_DIR/postgresql-%{version}/doc/man.tar.gz
@@ -282,8 +320,6 @@ pushd src/interfaces/python
popd
# Java/JDBC
-# We know that JDK1.2 is pre-beta at this time, so install the JDK1.1-compatible driver
-# as well as the JDK1.2 compatible driver.
# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
# Install 6.5 JDBC jars for now.
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/pgsql
@@ -292,10 +328,28 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/pgsql
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/pgsql
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/lib/pgsql
+# Fixup more permissions...
chmod 644 $RPM_BUILD_ROOT%{_mandir}/*/*
chmod +x $RPM_BUILD_ROOT/usr/lib/lib*.so.*
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+
+# The initscripts....
+# Redhat-style....
+if [ -d /etc/rc.d/init.d ]
+then
+ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+ mv redhat-style-files.lst files.lst
+fi
+
+# SuSE-style....
+# NOTE: SuSE stuff not yet fully implemented -- this is likely to not work yet.
+# Putting SuSE-style stuff here
+if [ -d /sbin/init.d ]
+then
+ # install the SuSE stuff...
+ mv suse-style-files.lst files.lst
+fi
+
# Move the PL's to the right place
mv $RPM_BUILD_ROOT/usr/lib/pl*.so $RPM_BUILD_ROOT/usr/lib/pgsql
@@ -309,14 +363,13 @@ install -m 700 %{SOURCE9} $RPM_BUILD_ROOT/var/lib/pgsql/data/pg_options
# backups of data go here...
install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
-
# tests. There are many files included here that are unnecessary, but include
# them anyway for completeness.
-
-#cp -a src/test $RPM_BUILD_ROOT/usr/lib/pgsql
-#install -m 0755 src/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
-#install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
-#install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
+cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
+install -m 0755 src/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
+install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
# Upgrade scripts.
pushd $RPM_BUILD_ROOT
@@ -326,14 +379,14 @@ popd
#logrotate script source (which needs WORK)
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
cp %{SOURCE8} $RPM_BUILD_ROOT/etc/logrotate.d/postgres
-chmod 0700 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
+chmod 0644 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
# Fix some more documentation
# no need for the OS2 client
rm -rf contrib/os2client
gzip doc/internals.ps
-cp %{SOURCE6} README.rpm
+cp %{SOURCE6} README.rpm-dist
# remove the binaries from contrib
@@ -349,6 +402,13 @@ ln -sf port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/os.h
perl -pi -e "s/^.*perllocal.pod$//" perlfiles.list
+# Symlink libpq.so.2.0 to libpq.so.2.1 for backwards compatibility, until
+# -soname patches are the norm.
+pushd $RPM_BUILD_ROOT/usr/lib
+ln -s libpq.so.2.1 libpq.so.2.0
+popd
+
+
%pre
# Need to make backups of some executables if an upgrade
# They will be needed to do a dump of the old version's database.
@@ -369,13 +429,18 @@ fi
%postun -p /sbin/ldconfig
%pre server
-useradd -M -o -r -d /var/lib/pgsql -s /bin/bash \
+groupadd -g 26 postgres >/dev/null 2>&1 || :
+useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
touch /var/log/postgresql
chown postgres.postgres /var/log/postgresql
chmod 0700 /var/log/postgresql
+
%post -p /sbin/ldconfig server
+echo PGLIB=/usr/lib/pgsql >> ~postgres/.bash_profile
+echo PGDATA=/var/lib/pgsql/data >> ~postgres/.bash_profile
+echo export PGLIB PGDATA >> ~postgres/.bash_profile
%preun server
if [ $1 = 0 ] ; then
@@ -388,7 +453,8 @@ if [ $1 -ge 1 ]; then
/sbin/service postgresql condrestart >/dev/null 2>&1
fi
if [ $1 = 0 ] ; then
- userdel postgres >/dev/null 2>&1 || :
+ userdel postgres >/dev/null 2>&1 || :
+ groupdel postgres >/dev/null 2>&1 || :
fi
%post -p /sbin/ldconfig odbc
@@ -397,20 +463,29 @@ fi
%post -p /sbin/ldconfig tcl
%postun -p /sbin/ldconfig tcl
+%post test
+chown -R postgres.postgres /usr/lib/pgsql/test >/dev/null 2>&1 || :
+
%clean
rm -rf $RPM_BUILD_ROOT
rm -f perlfiles.list
+# Ok, we are dynamically generating some filelists. These are by default
+# under the BUILD/postgresql-x.y.z tree.
+
+# Note that macros such as config are available in those lists.
+# The lists differentiate between RedHat, SuSE, and others.
+
%files
%defattr(-,root,root)
%doc doc/FAQ doc/FAQ_Linux doc/README*
%doc COPYRIGHT README HISTORY doc/bug.template doc/FAQ_Linux
%doc contrib doc/unpacked/*
-%doc README.rpm
-/usr/lib/libpq.so.*
-/usr/lib/libecpg.so.*
-/usr/lib/libpq++.so.*
-/usr/lib/libpgeasy.so.*
+%doc README.rpm-dist
+/usr/lib/libpq.so*
+/usr/lib/libecpg.so*
+/usr/lib/libpq++.so*
+/usr/lib/libpgeasy.so*
/usr/bin/createdb
/usr/bin/createlang
/usr/bin/createuser
@@ -433,9 +508,8 @@ rm -f perlfiles.list
%{_mandir}/man1/psql.1*
%{_mandir}/manl/*
-%files server
+%files server -f files.lst
%defattr(-,root,root)
-%config /etc/rc.d/init.d/postgresql
/etc/logrotate.d/postgres
/usr/bin/initdb
/usr/bin/initlocation
@@ -449,7 +523,6 @@ rm -f perlfiles.list
/usr/bin/postgresql-dump
/usr/bin/postmaster
/usr/bin/rh-pgdump.sh
-
%{_mandir}/man1/initdb.1*
%{_mandir}/man1/initlocation.1*
%{_mandir}/man1/ipcclean.1*
@@ -478,10 +551,6 @@ rm -f perlfiles.list
/usr/include/pgsql
/usr/bin/ecpg
/usr/lib/lib*.a
-/usr/lib/libpq.so
-/usr/lib/libecpg.so
-/usr/lib/libpq++.so
-/usr/lib/libpgeasy.so
%{_mandir}/man1/ecpg.1*
%files tcl
@@ -524,12 +593,98 @@ rm -f perlfiles.list
/usr/lib/pgsql/jdbc7.0-1.1.jar
/usr/lib/pgsql/jdbc7.0-1.2.jar
-#files test
-#defattr(-,postgres,postgres)
-#attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
-#/usr/lib/pgsql/test/*
-
+%files test
+%defattr(-,postgres,postgres)
+%attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
+%attr(-,postgres,postgres)/usr/lib/pgsql/test/regress/*
+
+# Conventions for PostgreSQL RPM releases:
+# Pre-releases are those that are built from CVS snapshots or pre-release
+# tarballs from postgresql.org. Pre-releases should have a fractional release
+# number to show their pre-release status. Official beta releases are not
+# considered pre-releases, nor are release candidates, as their beta or
+# release candidate status is reflected in the version of the tarball. Pre-
+# releases' versions do not change -- the pre-release tarball of 7.0.3, for
+# example, has the same tarball version as the final official release of 7.0.3:
+# but the tarball is different.
+
+# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
+# -- only full integer releases should be.
+
+# Start changelog proper below this comment
%changelog
+* Wed Nov 15 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- move /lib/cpp from Prereq to BuildPrereq
+
+* Tue Nov 14 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- made a template for IA64 (symlink to i386)
+
+* Mon Nov 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- add patch for IA64 (I got one from Lamar and modified it)
+
+* Mon Nov 13 2000 Lamar Owen <lamar(a)postgresql.org>
+- RELEASE: 7.0.3-1
+- Minor edits to initscript.
+- PRE-RELEASE: 7.0.3-0.6 (final test)
+- Final 7.0.3 tarball.
+- Cross-dist changes to RedHat initscript for better portability.
+- changed README.rpm name to README.rpm-dist (the .rpm extension confused
+--some GUI file managers, as RealPlayer also uses that extension).
+- Edited README.rpm-dist to reflect cross-distribution packaging.
+- NOTE: SuSE cross-compatibility is not yet complete SuSE RPM's for 7.0.3
+--that are tailored for SuSE will be made available.
+- Fixed stupid dependency -- the main .so's were in the devel package (Arggh)
+
+* Sat Nov 11 2000 Lamar Owen <lamar(a)postgresql.org>
+- PRE-RELEASE: 7.0.3-0.5
+- Framework for better distribution-independent build
+- Conditional around libtool conf stuff copy (For RedHat 6.1 and such).
+- Conditional around RedHat-style initscript stuff.
+- Comments at top of spec file now list copyright and license for spec file,
+--as the license and copyright for the spec file itself has not previously
+--been stated.
+- Envvars for postgres home dir login in .bash_profile.
+- initscript now checks for success and failure functions using:
+--typeset -f|grep "declare -f function_name" construct.
+
+* Fri Nov 10 2000 Lamar Owen <lamar(a)postgresql.org>
+- PRE-RELEASE: 7.0.3-0.4
+- Directory ownership on /usr/lib/pgsql/test/regress was root.root.
+- Patch Makefile.shlib to not use -soname for RPM's.
+- Newer prerelease 7.0.3 tarball.
+
+* Thu Nov 09 2000 Lamar Owen <lamar(a)postgresql.org>
+- PRE-RELEASE: 7.0.3-0.3
+- Don't bother copying the test stuff I'm not packaging.
+- Fix group add/del stuff in server subpackage post and postun scriptlets.
+- symlink /usr/lib/libpq.so.2.0 -> libpq.so.2.1
+
+* Mon Nov 06 2000 Lamar Owen <lamar(a)postgresql.org>
+- PRE-RELEASE: 7.0.3-0.2
+- preliminary 7.0.3 distribution tarball -- reinstated man pages, etc.
+
+* Sat Nov 04 2000 Lamar Owen <lamar(a)postgresql.org>
+- PRE-RELEASE: 7.0.3-0.1.
+- Improved test subpackage -- only package regression.
+- Latest pre-7.0.3 snapshot.
+- Split out SuSE and Caldera spec files. Caldera COL eServer 2.3 requires
+-- RPM 2.5.5-compatible spec files. SuSE is just too different from the others
+-- for the spec file to cope, for now.
+- TODO: man pages and documentation.
+
+* Mon Oct 30 2000 Lamar Owen <lamar(a)postgresql.org>
+- pre-7.0.3
+
+* Mon Oct 30 2000 Lamar Owen <lamar(a)postgresql.org>
+- Reenabled the test subpackage for ftp.postgresql.org dist.
+- Backported to RH 6.2 -- involved the Pg man page, doesn't appear to require
+-- other stuff to be done.
+
+
+* Sun Oct 22 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- make /etc/logrotate.d/postgres 0644 instead of 0700 (#19520)
+
+
* Thu Oct 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- rebuild with new glibc which has semaphore fixes for Alpha
diff --git a/sources b/sources
index 5d6e592..4321e13 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
-baae3796a93a2aaac512cc05abfebc89 pg-migration-scripts-7.0.2.tar.gz
-c139d0716a459622c463bab8c438e3cc postgresql-7.0.2-alpha.patch.gz
-fc512e38394256e2749299fdd69a937e postgresql-7.0.2.tar.gz
+57d69fb52be57f7caa91cccf7d24d199 file-lists-pgsql-7.0.3.tar.gz
+baae3796a93a2aaac512cc05abfebc89 pg-migration-scripts-7.0.3.tar.gz
+c139d0716a459622c463bab8c438e3cc postgresql-7.0.3-alpha.patch.gz
+b416c04e6c91967160dfde866293ee6f postgresql-7.0.3.tar.gz
3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit 716a2b3c02a31f31be2b8db42a6a920fa34aa0cb
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:35:53 2004 +0000
auto-import postgresql-7.0.2-19 from postgresql-7.0.2-19.src.rpm
diff --git a/postgresql.spec b/postgresql.spec
index 065aa48..1ba1621 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,12 +1,12 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 7.0.2
-Release: 18.2
+Release: 19
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
-Source1: http://jdbc.postgresql.org/download/jdbc6.5-1.1.jar
-Source2: http://jdbc.postgresql.org/download/jdbc6.5-1.2.jar
+Source1: http://www.retep.org.uk/postgres/jdbc6.5-1.1.jar
+Source2: http://www.retep.org.uk/postgres/jdbc6.5-1.2.jar
Source3: postgresql.init-%{version}
Source6: README.rpm.postgresql-%{version}
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -19,7 +19,6 @@ Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
Patch0: postgresql-%{version}-alpha.patch.gz
Patch1: rpm-pgsql-%{version}.patch
-Patch2: postgresql-%{version}-security.patch
Requires: perl
Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd /lib/cpp initscripts
BuildPrereq: python-devel perl tcl
@@ -162,15 +161,11 @@ Java programs to access a PostgreSQL database.
%endif
%patch1 -p1
-%patch2 -p1
%build
pushd src
-# XXX libtoolize dinna work
-# WHAT is 'libtoolize???' LRO
-# a program distributed with the libtool package
-#cp /usr/share/libtool/config.* .
+cp /usr/share/libtool/config.* .
CFLAGS="$RPM_OPT_FLAGS"
%ifarch alpha
./configure --enable-hba --enable-locale --prefix=/usr\
@@ -264,8 +259,6 @@ popd
pushd src/interfaces
mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/perl5
cp -a perl5/test.pl perl5/eg $RPM_BUILD_ROOT/usr/lib/pgsql/perl5
-mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/python
-cp -a python/tutorial $RPM_BUILD_ROOT/usr/lib/pgsql/python
popd
# Get example odbcinst.ini and put in /usr/lib/pgsql
@@ -520,9 +513,9 @@ rm -f perlfiles.list
%files python
%defattr(-,root,root)
+%doc src/interfaces/python/README src/interfaces/python/tutorial
/usr/lib/python1.5/site-packages/_pgmodule.so
/usr/lib/python1.5/site-packages/*.py
-/usr/lib/pgsql/python
%files jdbc
%defattr(-,root,root)
@@ -537,11 +530,12 @@ rm -f perlfiles.list
#/usr/lib/pgsql/test/*
%changelog
-* Tue Jan 7 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.2-18.2]
-- addition to security backpatch
+* Thu Oct 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- rebuild with new glibc which has semaphore fixes for Alpha
-* Tue Jan 7 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.2-18]
-- add security backpatch from more recent versions (~#74505)
+* Tue Sep 05 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- add documention for python interface (#17261)
+- move the python interface tutorial to the %%doc section
* Thu Aug 24 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- the old dump script didn't work - added rh-pgdump.sh
commit d9e131880dff728d4bafabf31e792c576f26680d
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:35:44 2004 +0000
auto-import changelog data from postgresql-7.0.2-18.2.src.rpm
Tue Jan 07 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.2-18.2]
- addition to security backpatch
Tue Jan 07 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.2-18]
- add security backpatch from more recent versions (~#74505)
diff --git a/postgresql.spec b/postgresql.spec
index 8383910..065aa48 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,12 +1,12 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 7.0.2
-Release: 17
+Release: 18.2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
-Source1: http://www.retep.org.uk/postgres/jdbc6.5-1.1.jar
-Source2: http://www.retep.org.uk/postgres/jdbc6.5-1.2.jar
+Source1: http://jdbc.postgresql.org/download/jdbc6.5-1.1.jar
+Source2: http://jdbc.postgresql.org/download/jdbc6.5-1.2.jar
Source3: postgresql.init-%{version}
Source6: README.rpm.postgresql-%{version}
Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
@@ -19,6 +19,7 @@ Source12: postgresql-dump.1.gz
Source14: rh-pgdump.sh
Patch0: postgresql-%{version}-alpha.patch.gz
Patch1: rpm-pgsql-%{version}.patch
+Patch2: postgresql-%{version}-security.patch
Requires: perl
Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd /lib/cpp initscripts
BuildPrereq: python-devel perl tcl
@@ -161,6 +162,7 @@ Java programs to access a PostgreSQL database.
%endif
%patch1 -p1
+%patch2 -p1
%build
pushd src
@@ -535,6 +537,12 @@ rm -f perlfiles.list
#/usr/lib/pgsql/test/*
%changelog
+* Tue Jan 7 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.2-18.2]
+- addition to security backpatch
+
+* Tue Jan 7 2003 Andrew Overholt <overholt(a)redhat.com> [7.0.2-18]
+- add security backpatch from more recent versions (~#74505)
+
* Thu Aug 24 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- the old dump script didn't work - added rh-pgdump.sh
to handle this. Point docs at it, and tell how it is to be used.
commit 973e21f257e7057297bfac841c3f5c32a38a69bc
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:35:39 2004 +0000
auto-import changelog data from postgresql-7.0.2-17.src.rpm
Thu Aug 24 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- the old dump script didn't work - added rh-pgdump.sh to handle this.
Point docs at it, and tell how it is to be used.
Mon Aug 21 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- fix the initscript so it points you at the 7.0.2 directory in
/usr/share/doc, not 7.0 (#16163). Also, remove statement it was built
on a 6.2 system.
- prereq /lib/cpp and initscripts
- fix backups of existing files (#16706)
- fix conditional restart
Sat Aug 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- fix README.rpm to it points at /usr/share/doc, not /usr/doc (part of
#16416)
Wed Aug 16 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- don't build test package anymore, it's broken. These tests should be run
by pgsql developers and not by db-developers, so it's not a big loss
(#16165). Obsolete it in the main package, so it doesn't get left over
Mon Aug 14 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- reference docs in /usr/share/doc, not /usr/doc (#16163)
- add python-devel, perl and tcl as build prereqs
- use /dev/null as STDIN for su commands in initscripts, to avoid error
messages from not being able to read from tty
Sat Aug 05 2000 Bill Nottingham <notting(a)redhat.com>
- condrestart fixes
Mon Jul 31 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- remove all plperl references, to avoid confusing post install scripts
- cleanups
Mon Jul 17 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- remove the symlink from libpq.so.2.0 to libpq.so.2.1
- remove some binaries from docs
- fix dangling symlink os.h
- use /sbin/service
Thu Jul 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- don't strip manually
- fixes to init script so they look more like the rest (#13749, from
giulioo(a)pobox.com)
- use /etc/rc.d/init.d again (sigh)
Wed Jul 12 2000 Prospector <bugzilla(a)redhat.com>
- automatic rebuild
Thu Jul 06 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- "Prereq:", not "Requires:" for /etc/init.d
Thu Jul 06 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- require /etc/init.d
Wed Jun 21 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- remove perl kludge as perl 5.6 is now fixed
- include the man page for the perl module
- fix the init script and spec file to handle conditional restart
- move the init file to /etc/init.d
- use License instead of Copyright
Mon Jun 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- rebuild
Tue Jun 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- use %defattr on postgresql-perl
- use %{_tmppath}
- Don't use release number in patch
- Don't build on ia64 yet
Mon Jun 12 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0.2-2
- Corrected misreporting of version.
- Corrected for non-root build clean script.
Mon Jun 05 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0.2
- Postgresql-dump manpage to man1, and to separate source file to
facilitate
-- _mandir macro expansion correctness.
- NOTE: The PostScript documentation is no longer being included in the
-- PostgreSQL tarball. If demand is such, I will pull together a
-- postgresql-ps-docs subpackage or pull in the PostScript docs into the
-- main package.
- RPM patchset has release number, now, to prevent patchfile confusion :-(.
Sat Jun 03 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- Incorporate most of Trond's changes (reenabled the alpha
-- patches, as it was a packaging error on my part).
- Trimmed changelog history to Version 7.0beta1 on. To see the
-- previous changelog, grab the 6.5.3 RPM from RedHat 6.2 and pull the
spec.
- Rev to 7.0.1 (which incorporates the syslog patch, which has
-- been removed from rpm-pgsql-7.0.1-1.patch)
Fri May 26 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- disable the alpha patch, as it doesn't apply cleanly
- removed distribution, packager, vendor
- renamed spec file
- don't build pl-perl
- use %{_mandir}
- now includes vacuumdb.1*
Thu May 25 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0-3
- Incorporated Tatsuo's syslog segmentation patches
- Incorporated some of Trond's changes (see below)
-- Fixed some Perl 5.6 oddness in Rawhide
- Incorporated some of Karl's changes (see below)
-- PL/Perl should now work.
- Fixed missing /usr/bin/pg_passwd.
Mon May 22 2000 Karl DeBisschop <kdebisschop(a)infoplease.com>
- 7.0-2.1
- make plperl module (works for linux i386, your guess for other platforms)
- use "make COPT=" because postgreSQL configusre script ignores CFLAGS
Sat May 20 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0-2
- pg_options default values changed.
- SPI headers (again!) fixed in a permanent manner -- hopefully!
- Alpha patches!
Wed May 17 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- changed bug in including man pages
Tue May 16 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
- changed buildroot, removed packager, vendor, distribution
-- [Left all but buildroot as-is for PostgreSQL.org RPMS. LRO]
- don't strip in package [strip in PostgreSQL.org RPMS]
- fix perl weirdnesses (man page in bad location, remove perllocal.pod from
file list)
Mon May 15 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0 final -1
- Man pages restructured
- Changed README.rpm notices about BETA
- incorporated minor changes from testing
- still no 7.0 final alpha patches -- for -2 or -3, I guess.
- 7.0 JDBC jars!
Sat May 06 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0RC5-0.5
- UserID of 26 to conform to RedHat Standard, instead of 40. This only
-- is for new installs -- upgrades will use what was already there.
- Waiting on built jar's of JDBC. If none are forthcoming by release,
-- I'm going to have to bite the bullet and install the jdk....
Mon May 01 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0RC2-0.5
- Fixed /usr/src/redhat/BUILD path to $RPM_BUILD_DIR for portability
-- and so that RPM's can be built by non-root.
- Minor update to README.rpm
Tue Apr 18 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 0.6
- Fixed patchset: wasn't patching pgaccess or -i in postmaster.opts.default
- minor update to README.rpm
Mon Apr 17 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0RC1-0.5 (release candidate 1.)
- Fixed SPI header directories' permisssions.
- Removed packaging of Alpha patches until Ryan releases RC1-tested set.
Mon Apr 10 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0beta5-0.1 (released instead of the release candidate)
Sat Apr 08 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0beta4-0.2 (pre-release-candidate CVS checkout)
- Alpha patches!
- pg_options.sample
Fri Mar 24 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- 7.0beta3-0.1
Mon Feb 28 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- Release 0.3
- Fixed stderr redir problem in init script
- Init script now uses pg_ctl to start postmaster
- Packaged inital pg_options for good logging
- built with timestamped logging.
Tue Feb 22 2000 Lamar Owen <lamar.owen(a)wgcr.org>
- Initial 7.0beta1 build
- Moved PGDATA to /var/lib/pgsql/data
- First stab at logging and logrotate functionality -- test carefully!
- -tcl subpackage split -- tcl client and pltcl lang separated from
-- the Tk stuff. PgAccess and the tk client are now in the -tk subpackage.
- No patches for Alpha as yet.
diff --git a/.cvsignore b/.cvsignore
index e69de29..38b58e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,4 @@
+pg-migration-scripts-7.0.2.tar.gz
+postgresql-7.0.2-alpha.patch.gz
+postgresql-7.0.2.tar.gz
+postgresql-dump.1.gz
diff --git a/postgresql.spec b/postgresql.spec
new file mode 100755
index 0000000..8383910
--- /dev/null
+++ b/postgresql.spec
@@ -0,0 +1,730 @@
+Summary: PostgreSQL client programs and libraries.
+Name: postgresql
+Version: 7.0.2
+Release: 17
+License: BSD
+Group: Applications/Databases
+Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
+Source1: http://www.retep.org.uk/postgres/jdbc6.5-1.1.jar
+Source2: http://www.retep.org.uk/postgres/jdbc6.5-1.2.jar
+Source3: postgresql.init-%{version}
+Source6: README.rpm.postgresql-%{version}
+Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar...
+Source7: pg-migration-scripts-%{version}.tar.gz
+Source8: logrotate.postgresql-%{version}
+Source9: pg_options-%{version}
+Source10: http://www.retep.org.uk/postgres/jdbc7.0-1.1.jar
+Source11: http://www.retep.org.uk/postgres/jdbc7.0-1.2.jar
+Source12: postgresql-dump.1.gz
+Source14: rh-pgdump.sh
+Patch0: postgresql-%{version}-alpha.patch.gz
+Patch1: rpm-pgsql-%{version}.patch
+Requires: perl
+Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd /lib/cpp initscripts
+BuildPrereq: python-devel perl tcl
+Url: http://www.postgresql.org/
+Obsoletes: postgresql-clients postgresql-test
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+ExcludeArch: ia64
+
+%description
+PostgreSQL is an advanced Object-Relational database management system
+(DBMS) that supports almost all SQL constructs (including
+transactions, subselects and user-defined types and functions). The
+postgresql package includes the client programs and libraries that
+you'll need to access a PostgreSQL DBMS server. These PostgreSQL
+client programs are programs that directly manipulate the internal
+structure of PostgreSQL databases on a PostgreSQL server. These client
+programs can be located on the same machine with the PostgreSQL
+server, or may be on a remote machine which accesses a PostgreSQL
+server over a network connection. This package contains the client
+libraries for C and C++, as well as command-line utilities for
+managing PostgreSQL databases on a PostgreSQL server.
+
+If you want to manipulate a PostgreSQL database on a remote PostgreSQL
+server, you need this package. You also need to install this package
+if you're installing the postgresql-server package.
+
+%package server
+Summary: The programs needed to create and run a PostgreSQL server.
+Group: Applications/Databases
+Prereq: /usr/sbin/useradd
+Requires: postgresql = %{version}
+
+%description server
+The postgresql-server package includes the programs needed to create
+and run a PostgreSQL server, which will in turn allow you to create
+and maintain PostgreSQL databases. PostgreSQL is an advanced
+Object-Relational database management system (DBMS) that supports
+almost all SQL constructs (including transactions, subselects and
+user-defined types and functions). You should install
+postgresql-server if you want to create and maintain your own
+PostgreSQL databases and/or your own PostgreSQL server. You also need
+to install the postgresql and postgresql-devel packages.
+
+%package devel
+Summary: PostgreSQL development header files and libraries.
+Group: Development/Libraries
+Requires: postgresql = %{version}
+
+%description devel
+The postgresql-devel package contains the header files and libraries
+needed to compile C or C++ applications which will directly interact
+with a PostgreSQL database management server and the ecpg Embedded C
+Postgres preprocessor. You need to install this package if you want to
+develop applications which will interact with a PostgreSQL server. If
+you're installing postgresql-server, you need to install this
+package.
+
+%package tcl
+Summary: A Tcl client library, and the PL/Tcl procedural language for PostgreSQL.
+Group: Applications/Databases
+Requires: tcl >= 8.0, postgresql = %{version}
+
+%description tcl
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-tcl package contains the libpgtcl client library,
+the pg-enchanced pgtclsh, and the PL/Tcl procedural language for the backend.
+
+%package tk
+Summary: Tk shell and tk-based GUI for PostgreSQL.
+Group: Applications/Databases
+Requires: tcl >= 8.0, tk >= 8.0, postgresql = %{version}
+
+%description tk
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-tk package contains the pgaccess
+program. Pgaccess is a graphical front end, written in Tcl/Tk, for the
+psql and related PostgreSQL client programs.
+
+
+%package odbc
+Summary: The ODBC driver needed for accessing a PostgreSQL DB using ODBC.
+Group: Applications/Databases
+Requires: postgresql = %{version}
+
+%description odbc
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-odbc package includes the ODBC (Open DataBase
+Connectivity) driver and sample configuration files needed for
+applications to access a PostgreSQL database using ODBC.
+
+%package perl
+Summary: Development module needed for Perl code to access a PostgreSQL DB.
+Group: Applications/Databases
+Requires: perl >= 5.004-4, postgresql = %{version}
+
+%description perl
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-perl package includes a module for developers
+to use when writing Perl code for accessing a PostgreSQL database.
+
+%package python
+Summary: Development module for Python code to access a PostgreSQL DB.
+Group: Applications/Databases
+Requires: python >= 1.5, postgresql = %{version}
+
+%description python
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-python package includes a module for
+developers to use when writing Python code for accessing a PostgreSQL
+database.
+
+%package jdbc
+Summary: Files needed for Java programs to access a PostgreSQL database.
+Group: Applications/Databases
+Requires: postgresql = %{version}
+
+%description jdbc
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-jdbc package includes the .jar file needed for
+Java programs to access a PostgreSQL database.
+
+#package test
+#Summary: The test suite distributed with PostgreSQL.
+#Group: Applications/Databases
+#Requires: postgresql = %{version}
+
+#description test
+#PostgreSQL is an advanced Object-Relational database management
+#system. The postgresql-test package includes the sources and pre-built
+#binaries of various tests for the PostgreSQL database management
+#system, including regression tests and benchmarks.
+
+%prep
+%setup -q
+
+# The alpha patches are not trivial, so wrap in ifarch-endif block
+#
+%ifarch alpha
+%patch0 -p1
+%endif
+
+%patch1 -p1
+
+%build
+pushd src
+# XXX libtoolize dinna work
+# WHAT is 'libtoolize???' LRO
+# a program distributed with the libtool package
+
+#cp /usr/share/libtool/config.* .
+CFLAGS="$RPM_OPT_FLAGS"
+%ifarch alpha
+ ./configure --enable-hba --enable-locale --prefix=/usr\
+ --with-perl --enable-multibyte\
+ --with-tcl --with-tk --with-x \
+ --with-odbc --with-java \
+ --with-python --with-template=linux_alpha
+%else
+
+./configure --enable-hba --enable-locale --prefix=/usr\
+ --with-perl --enable-multibyte \
+ --with-tcl --with-tk --with-x \
+ --with-odbc --with-java \
+ --with-python
+%endif
+
+make COPT="$RPM_OPT_FLAGS" all
+
+pushd interfaces/python
+cp /usr/lib/python1.5/config/Makefile.pre.in .
+echo *shared* > Setup
+echo _pg pgmodule.c -I../../include -I../libpq -L../libpq -lpq -lcrypt >> Setup
+make -f Makefile.pre.in boot
+make
+popd
+popd
+
+make all PGDOCS=unpacked -C doc
+
+pushd src/test
+make all
+popd
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/{include/pgsql,lib,bin}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{_arch}-linux/auto/Pg
+make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src install
+#make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/man install
+make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 install
+
+# Get rid of the packing list generated by the perl Makefile, and build my own...
+find $RPM_BUILD_ROOT/usr/lib/perl5 -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT/usr/lib/perl5 -type f -print | \
+ sed -e "s|$RPM_BUILD_ROOT/|/|g" | \
+ sed -e "s|.*/man/.*|&\*|" > perlfiles.list
+find $RPM_BUILD_ROOT/usr/lib/perl5 -type d -name Pg -print | \
+ sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
+make -C doc
+#make -C doc man
+# Newer man pages from Thomas Lockhart
+pushd $RPM_BUILD_ROOT%{_mandir}
+tar xzf $RPM_BUILD_DIR/postgresql-%{version}/doc/man.tar.gz
+
+# the postgresql-dump manpage.....
+cp %{SOURCE12} man1
+popd
+
+# install the dump script
+
+install -m755 %SOURCE14 $RPM_BUILD_ROOT/usr/bin/
+
+# Move all includes beneath /usr/include/pgsql.
+pushd $RPM_BUILD_ROOT/usr/include
+rm -rf pgsql/*
+for f in *.h access commands executor iodbc lib libpq libpq++ port utils ; do
+ mv $f pgsql
+done
+popd
+
+# copy over the includes needed for SPI development.
+pushd src/include
+/lib/cpp -M -I. -I../backend executor/spi.h |xargs -n 1|grep \\W|grep -v ^/|grep -v spi.o |grep -v spi.h | sort |cpio -pdu $RPM_BUILD_ROOT/usr/include/pgsql
+# thank you, cpio....
+
+#fixup directory permissions for SPI stuff...
+pushd $RPM_BUILD_ROOT/usr/include/pgsql
+chmod 755 access catalog executor lib nodes parser rewrite storage tcop utils
+popd
+
+popd
+
+# Move all templates/examples beneath /usr/lib/pgsql
+pushd $RPM_BUILD_ROOT/usr/lib
+ mkdir -p pgsql
+ mv *.source *.sample *.description pgsql
+popd
+
+# Get interface-specific tests and examples, and stuff under /usr/lib/pgsql
+pushd src/interfaces
+mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/perl5
+cp -a perl5/test.pl perl5/eg $RPM_BUILD_ROOT/usr/lib/pgsql/perl5
+mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/python
+cp -a python/tutorial $RPM_BUILD_ROOT/usr/lib/pgsql/python
+popd
+
+# Get example odbcinst.ini and put in /usr/lib/pgsql
+mv $RPM_BUILD_ROOT/usr/odbcinst.ini $RPM_BUILD_ROOT/usr/lib/pgsql
+
+# pgaccess installation
+pushd src/bin
+install -m 755 pgaccess/pgaccess $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/pgaccess
+install -m 644 pgaccess/main.tcl $RPM_BUILD_ROOT/usr/lib/pgsql/pgaccess
+tar cf - pgaccess/lib pgaccess/images | tar xf - -C $RPM_BUILD_ROOT/usr/lib/pgsql
+cp -a pgaccess/doc/html ../../doc/pgaccess
+cp pgaccess/demo/*.sql ../../doc/pgaccess
+popd
+
+# Python
+pushd src/interfaces/python
+# Makefile.pre.in doesn't yet support .py files anyway, so we stick to a manual installation
+ mkdir -p $RPM_BUILD_ROOT/usr/lib/python1.5/site-packages
+ install -m 755 _pgmodule.so *.py $RPM_BUILD_ROOT/usr/lib/python1.5/site-packages/
+popd
+
+# Java/JDBC
+# We know that JDK1.2 is pre-beta at this time, so install the JDK1.1-compatible driver
+# as well as the JDK1.2 compatible driver.
+# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
+# Install 6.5 JDBC jars for now.
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/pgsql
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/pgsql
+# Install 7.0 JDBC jars -- in addition to, not replacing 6.5 stuff yet.
+install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/pgsql
+install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/lib/pgsql
+
+chmod 644 $RPM_BUILD_ROOT%{_mandir}/*/*
+chmod +x $RPM_BUILD_ROOT/usr/lib/lib*.so.*
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+
+# Move the PL's to the right place
+mv $RPM_BUILD_ROOT/usr/lib/pl*.so $RPM_BUILD_ROOT/usr/lib/pgsql
+
+# PGDATA needs removal of group and world permissions due to pg_pwd hole.
+install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
+
+# Initial pg_options
+install -m 700 %{SOURCE9} $RPM_BUILD_ROOT/var/lib/pgsql/data/pg_options
+
+# backups of data go here...
+install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
+
+
+# tests. There are many files included here that are unnecessary, but include
+# them anyway for completeness.
+
+#cp -a src/test $RPM_BUILD_ROOT/usr/lib/pgsql
+#install -m 0755 src/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
+#install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+#install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+
+# Upgrade scripts.
+pushd $RPM_BUILD_ROOT
+tar xzf %{SOURCE7}
+popd
+
+#logrotate script source (which needs WORK)
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+cp %{SOURCE8} $RPM_BUILD_ROOT/etc/logrotate.d/postgres
+chmod 0700 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
+
+
+# Fix some more documentation
+# no need for the OS2 client
+rm -rf contrib/os2client
+gzip doc/internals.ps
+cp %{SOURCE6} README.rpm
+
+# remove the binaries from contrib
+
+rm -f `find contrib -name "*.so"`
+rm -f contrib/spi/preprocessor/step1.e
+
+# Fix a dangling symlink
+mkdir -p $RPM_BUILD_ROOT/usr/include/pgsql/port
+cp src/include/port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/port/
+ln -sf port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/os.h
+
+# remove perllocal.pod from the file list - only occurs with 5.6
+
+perl -pi -e "s/^.*perllocal.pod$//" perlfiles.list
+
+%pre
+# Need to make backups of some executables if an upgrade
+# They will be needed to do a dump of the old version's database.
+# All output redirected to /dev/null.
+
+if [ $1 -gt 1 ]
+then
+ mkdir -p /usr/lib/pgsql/backup > /dev/null
+ pushd /usr/bin > /dev/null
+ cp -fp postmaster postgres pg_dump pg_dumpall psql /usr/lib/pgsql/backup > /dev/null 2>&1 || :
+ popd > /dev/null
+ pushd /usr/lib > /dev/null
+ cp -fp libpq.* /usr/lib/pgsql/backup > /dev/null 2>&1 || :
+ popd > /dev/null
+fi
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%pre server
+useradd -M -o -r -d /var/lib/pgsql -s /bin/bash \
+ -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
+touch /var/log/postgresql
+chown postgres.postgres /var/log/postgresql
+chmod 0700 /var/log/postgresql
+
+%post -p /sbin/ldconfig server
+
+%preun server
+if [ $1 = 0 ] ; then
+ chkconfig --del postgresql
+fi
+
+%postun server
+/sbin/ldconfig
+if [ $1 -ge 1 ]; then
+ /sbin/service postgresql condrestart >/dev/null 2>&1
+fi
+if [ $1 = 0 ] ; then
+ userdel postgres >/dev/null 2>&1 || :
+fi
+
+%post -p /sbin/ldconfig odbc
+%postun -p /sbin/ldconfig odbc
+
+%post -p /sbin/ldconfig tcl
+%postun -p /sbin/ldconfig tcl
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -f perlfiles.list
+
+%files
+%defattr(-,root,root)
+%doc doc/FAQ doc/FAQ_Linux doc/README*
+%doc COPYRIGHT README HISTORY doc/bug.template doc/FAQ_Linux
+%doc contrib doc/unpacked/*
+%doc README.rpm
+/usr/lib/libpq.so.*
+/usr/lib/libecpg.so.*
+/usr/lib/libpq++.so.*
+/usr/lib/libpgeasy.so.*
+/usr/bin/createdb
+/usr/bin/createlang
+/usr/bin/createuser
+/usr/bin/dropdb
+/usr/bin/droplang
+/usr/bin/dropuser
+/usr/bin/pg_dump
+/usr/bin/pg_dumpall
+/usr/bin/pg_id
+/usr/bin/psql
+/usr/bin/vacuumdb
+%{_mandir}/man1/createdb.1*
+%{_mandir}/man1/createlang.1*
+%{_mandir}/man1/createuser.1*
+%{_mandir}/man1/dropdb.1*
+%{_mandir}/man1/droplang.1*
+%{_mandir}/man1/dropuser.1*
+%{_mandir}/man1/pg_dump.1*
+%{_mandir}/man1/pg_dumpall.1*
+%{_mandir}/man1/psql.1*
+%{_mandir}/manl/*
+
+%files server
+%defattr(-,root,root)
+%config /etc/rc.d/init.d/postgresql
+/etc/logrotate.d/postgres
+/usr/bin/initdb
+/usr/bin/initlocation
+/usr/bin/ipcclean
+/usr/bin/pg_ctl
+/usr/bin/pg_encoding
+/usr/bin/pg_passwd
+/usr/bin/pg_upgrade
+/usr/bin/pg_version
+/usr/bin/postgres
+/usr/bin/postgresql-dump
+/usr/bin/postmaster
+/usr/bin/rh-pgdump.sh
+
+%{_mandir}/man1/initdb.1*
+%{_mandir}/man1/initlocation.1*
+%{_mandir}/man1/ipcclean.1*
+%{_mandir}/man1/pg_ctl.1*
+%{_mandir}/man1/pgadmin.1*
+%{_mandir}/man1/pg_passwd.1*
+%{_mandir}/man1/postgres.1*
+%{_mandir}/man1/postmaster.1*
+%{_mandir}/man1/pg_upgrade.1*
+%{_mandir}/man1/vacuumdb.1*
+%{_mandir}/man1/postgresql-dump.1*
+/usr/lib/pgsql/global1.bki.source
+/usr/lib/pgsql/global1.description
+/usr/lib/pgsql/local1_template1.bki.source
+/usr/lib/pgsql/local1_template1.description
+/usr/lib/pgsql/*.sample
+/usr/lib/pgsql/plpgsql.so
+%attr(700,postgres,postgres) %dir /usr/lib/pgsql/backup
+/usr/lib/pgsql/backup/pg_dumpall_new
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
+%attr(700,postgres,postgres) /var/lib/pgsql/data/pg_options
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
+
+%files devel
+%defattr(-,root,root)
+/usr/include/pgsql
+/usr/bin/ecpg
+/usr/lib/lib*.a
+/usr/lib/libpq.so
+/usr/lib/libecpg.so
+/usr/lib/libpq++.so
+/usr/lib/libpgeasy.so
+%{_mandir}/man1/ecpg.1*
+
+%files tcl
+%defattr(-,root,root)
+%attr(755,root,root) /usr/lib/libpgtcl.so*
+/usr/bin/pgtclsh
+%{_mandir}/man1/pgtclsh.1*
+/usr/lib/pgsql/pltcl.so
+
+%files tk
+%defattr(-,root,root)
+%doc doc/pgaccess/*
+/usr/lib/pgsql/pgaccess
+/usr/bin/pgaccess
+/usr/bin/pgtksh
+%{_mandir}/man1/pgaccess.1*
+%{_mandir}/man1/pgtksh.1*
+
+%files odbc
+%defattr(-,root,root)
+%attr(755,root,root) /usr/lib/libpsqlodbc.so*
+/usr/lib/pgsql/odbcinst.ini
+
+%files -f perlfiles.list perl
+%defattr (-,root,root)
+%dir /usr/lib/perl5/site_perl/%{_arch}-linux/auto
+/usr/lib/pgsql/perl5
+%{_mandir}/man3/Pg.*
+
+%files python
+%defattr(-,root,root)
+/usr/lib/python1.5/site-packages/_pgmodule.so
+/usr/lib/python1.5/site-packages/*.py
+/usr/lib/pgsql/python
+
+%files jdbc
+%defattr(-,root,root)
+/usr/lib/pgsql/jdbc6.5-1.1.jar
+/usr/lib/pgsql/jdbc6.5-1.2.jar
+/usr/lib/pgsql/jdbc7.0-1.1.jar
+/usr/lib/pgsql/jdbc7.0-1.2.jar
+
+#files test
+#defattr(-,postgres,postgres)
+#attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
+#/usr/lib/pgsql/test/*
+
+%changelog
+* Thu Aug 24 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- the old dump script didn't work - added rh-pgdump.sh
+ to handle this. Point docs at it, and tell how it is to be used.
+
+* Mon Aug 21 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- fix the initscript so it points you at the 7.0.2 directory
+ in /usr/share/doc, not 7.0 (#16163). Also, remove statement
+ it was built on a 6.2 system.
+- prereq /lib/cpp and initscripts
+- fix backups of existing files (#16706)
+- fix conditional restart
+
+* Sat Aug 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- fix README.rpm to it points at /usr/share/doc, not /usr/doc
+ (part of #16416)
+
+* Wed Aug 16 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- don't build test package anymore, it's broken. These
+ tests should be run by pgsql developers and not
+ by db-developers, so it's not a big loss (#16165).
+ Obsolete it in the main package, so it doesn't get left over
+
+* Mon Aug 14 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- reference docs in /usr/share/doc, not /usr/doc (#16163)
+- add python-devel, perl and tcl as build prereqs
+- use /dev/null as STDIN for su commands in initscripts,
+ to avoid error messages from not being able to read from
+ tty
+
+* Sat Aug 05 2000 Bill Nottingham <notting(a)redhat.com>
+- condrestart fixes
+
+* Mon Jul 31 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- remove all plperl references, to avoid confusing post install scripts
+- cleanups
+
+* Mon Jul 17 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- remove the symlink from libpq.so.2.0 to libpq.so.2.1
+- remove some binaries from docs
+- fix dangling symlink os.h
+- use /sbin/service
+
+* Thu Jul 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- don't strip manually
+- fixes to init script so they look more like the rest
+ (#13749, from giulioo(a)pobox.com)
+- use /etc/rc.d/init.d again (sigh)
+
+* Wed Jul 12 2000 Prospector <bugzilla(a)redhat.com>
+- automatic rebuild
+
+* Thu Jul 06 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- "Prereq:", not "Requires:" for /etc/init.d
+
+* Thu Jul 06 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- require /etc/init.d
+
+* Wed Jun 21 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- remove perl kludge as perl 5.6 is now fixed
+- include the man page for the perl module
+- fix the init script and spec file to handle conditional
+ restart
+- move the init file to /etc/init.d
+- use License instead of Copyright
+
+* Mon Jun 19 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- rebuild
+
+* Tue Jun 13 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- use %%defattr on postgresql-perl
+- use %%{_tmppath}
+- Don't use release number in patch
+- Don't build on ia64 yet
+
+* Mon Jun 12 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0.2-2
+- Corrected misreporting of version.
+- Corrected for non-root build clean script.
+
+* Mon Jun 05 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0.2
+- Postgresql-dump manpage to man1, and to separate source file to facilitate
+-- _mandir macro expansion correctness.
+- NOTE: The PostScript documentation is no longer being included in the
+-- PostgreSQL tarball. If demand is such, I will pull together a
+-- postgresql-ps-docs subpackage or pull in the PostScript docs into the
+-- main package.
+- RPM patchset has release number, now, to prevent patchfile confusion :-(.
+
+
+* Sat Jun 03 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- Incorporate most of Trond's changes (reenabled the alpha
+-- patches, as it was a packaging error on my part).
+- Trimmed changelog history to Version 7.0beta1 on. To see the
+-- previous changelog, grab the 6.5.3 RPM from RedHat 6.2 and pull the spec.
+- Rev to 7.0.1 (which incorporates the syslog patch, which has
+-- been removed from rpm-pgsql-7.0.1-1.patch)
+
+* Fri May 26 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- disable the alpha patch, as it doesn't apply cleanly
+- removed distribution, packager, vendor
+- renamed spec file
+- don't build pl-perl
+- use %%{_mandir}
+- now includes vacuumdb.1*
+
+* Thu May 25 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0-3
+- Incorporated Tatsuo's syslog segmentation patches
+- Incorporated some of Trond's changes (see below)
+-- Fixed some Perl 5.6 oddness in Rawhide
+- Incorporated some of Karl's changes (see below)
+-- PL/Perl should now work.
+- Fixed missing /usr/bin/pg_passwd.
+
+* Mon May 22 2000 Karl DeBisschop <kdebisschop(a)infoplease.com>
+- 7.0-2.1
+- make plperl module (works for linux i386, your guess for other platforms)
+- use "make COPT=" because postgreSQL configusre script ignores CFLAGS
+
+* Sat May 20 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0-2
+- pg_options default values changed.
+- SPI headers (again!) fixed in a permanent manner -- hopefully!
+- Alpha patches!
+
+* Wed May 17 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- changed bug in including man pages
+
+* Tue May 16 2000 Trond Eivind Glomsrd <teg(a)redhat.com>
+- changed buildroot, removed packager, vendor, distribution
+-- [Left all but buildroot as-is for PostgreSQL.org RPMS. LRO]
+- don't strip in package [strip in PostgreSQL.org RPMS]
+- fix perl weirdnesses (man page in bad location, remove
+ perllocal.pod from file list)
+
+* Mon May 15 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0 final -1
+- Man pages restructured
+- Changed README.rpm notices about BETA
+- incorporated minor changes from testing
+- still no 7.0 final alpha patches -- for -2 or -3, I guess.
+- 7.0 JDBC jars!
+
+* Sat May 06 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0RC5-0.5
+- UserID of 26 to conform to RedHat Standard, instead of 40. This only
+-- is for new installs -- upgrades will use what was already there.
+- Waiting on built jar's of JDBC. If none are forthcoming by release,
+-- I'm going to have to bite the bullet and install the jdk....
+
+* Mon May 01 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0RC2-0.5
+- Fixed /usr/src/redhat/BUILD path to $RPM_BUILD_DIR for portability
+-- and so that RPM's can be built by non-root.
+- Minor update to README.rpm
+
+* Tue Apr 18 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 0.6
+- Fixed patchset: wasn't patching pgaccess or -i in postmaster.opts.default
+- minor update to README.rpm
+
+* Mon Apr 17 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0RC1-0.5 (release candidate 1.)
+- Fixed SPI header directories' permisssions.
+- Removed packaging of Alpha patches until Ryan releases RC1-tested set.
+
+* Mon Apr 10 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0beta5-0.1 (released instead of the release candidate)
+
+* Sat Apr 08 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0beta4-0.2 (pre-release-candidate CVS checkout)
+- Alpha patches!
+- pg_options.sample
+
+* Fri Mar 24 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- 7.0beta3-0.1
+
+* Mon Feb 28 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- Release 0.3
+- Fixed stderr redir problem in init script
+- Init script now uses pg_ctl to start postmaster
+- Packaged inital pg_options for good logging
+- built with timestamped logging.
+
+* Tue Feb 22 2000 Lamar Owen <lamar.owen(a)wgcr.org>
+- Initial 7.0beta1 build
+- Moved PGDATA to /var/lib/pgsql/data
+- First stab at logging and logrotate functionality -- test carefully!
+- -tcl subpackage split -- tcl client and pltcl lang separated from
+-- the Tk stuff. PgAccess and the tk client are now in the -tk subpackage.
+- No patches for Alpha as yet.
+
diff --git a/sources b/sources
index e69de29..5d6e592 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,4 @@
+baae3796a93a2aaac512cc05abfebc89 pg-migration-scripts-7.0.2.tar.gz
+c139d0716a459622c463bab8c438e3cc postgresql-7.0.2-alpha.patch.gz
+fc512e38394256e2749299fdd69a937e postgresql-7.0.2.tar.gz
+3d2e8223f6bb715659cbecedeae81ccc postgresql-dump.1.gz
commit 349da8ea43243fa23005c7738b0a4a207111e908
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 10:35:35 2004 +0000
Setup of module postgresql
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..2f82951
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+# Makefile for source rpm: postgresql
+# $Id$
+NAME := postgresql
+SPECFILE = $(firstword $(wildcard *.spec))
+
+include ../common/Makefile.common
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29
5 years, 10 months
[Report] Packages Restricting Arches
by root
New package excluding arches (1)
============================
- rust-varlink_stdinterfaces
ExclusiveArch: %{rust_arches}
Package no longer excluding arches (1)
==================================
- python-ovirt-register
List of packages currently excluding arches (2631)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- LuxRender
ExclusiveArch: x86_64
- OpenTK
ExclusiveArch: %mono_arches
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GPRbuild_arches}
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: x86_64 %{ix86} %{arm}
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- atomic
ExclusiveArch: %{go_arches}
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- banshee
ExclusiveArch: %{mono_arches}
- banshee-community-extensions
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
- bareftp
ExclusiveArch: %{mono_arches}
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64}
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- beignet
ExclusiveArch: x86_64 %{ix86}
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- boo
ExclusiveArch: %{mono_arches}
- buildah
ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x
- bwa
ExclusiveArch: x86_64
- caddy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}
- cadvisor
ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64
- carto
ExclusiveArch: %{nodejs_arches} noarch
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- compat-gcc-296
ExclusiveArch: %{ix86} ia64 ppc
- consul
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- containerd
ExclusiveArch: %{go_arches}
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-api
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-dbus-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-gir-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- derelict
ExclusiveArch: %{ldc_arches}
- direnv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: %ix86 x86_64 aarch64
- docco
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- docker
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-anaconda-addon
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- docker-latest
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- dolphin-emu
ExclusiveArch: x86_64 armv7l aarch64
- douceur
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dustmite
ExclusiveArch: %{ldc_arches}
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc ppc64
- e3
ExclusiveArch: %{ix86} x86_64
- edac-utils
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- edb
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elasticdump
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- embree
ExclusiveArch: x86_64
- embree2
ExclusiveArch: x86_64
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- exciting
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- exercism
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- expresso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fedora-gnat-project-common
ExclusiveArch: noarch %{GNAT_arches}
- fence-virt
ExclusiveArch: i686 x86_64
- fes
ExclusiveArch: x86_64
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluxcapacitor
ExclusiveArch: %{ix86} x86_64 %{arm}
- fpc
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
- freshmaker
ExclusiveArch: %{ix86} x86_64
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fst
ExclusiveArch: i686
- fwts
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64}
- fwupdate
ExclusiveArch: %{efi}
- ga
ExclusiveArch: %{ix86} x86_64
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gela-asis
ExclusiveArch: %GPRbuild_arches
- ghdl
ExclusiveArch: %{GNAT_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-lfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- gl3n
ExclusiveArch: %{ldc_arches}
- glibc32
ExclusiveArch: x86_64 ppc64 s390x
- glusterd2
ExclusiveArch: %{go_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %GPRbuild_arches
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- gnu-smalltalk
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-i18n
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godotenv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gofed
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- golang
ExclusiveArch: %{golang_arches}
- golang-bitbucket-kardianos-osext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-deepin-dbus-factory
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-deepin-go-lib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-10gen-openssl
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- golang-github-AudriusButkevicius-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-go-nat-pmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-pfilter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-BurntSushi-freetype-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-graphics-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-toml-test
ExclusiveArch: %{go_arches}
- golang-github-BurntSushi-xgb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-xgbutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Jeffail-gabs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-goquery
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-purell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-urlesc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-RangelReale-osin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-RangelReale-osincli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-SeanDolphin-bqschema
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-SermoDigital-jose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-Shopify-sarama
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Shopify-toxiproxy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-assert
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-chroma
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-alecthomas-colour
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-kingpin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-repr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-template
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-units
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-andybalholm-cascadia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-armon-go-proxyproto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-asaskevich-govalidator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-auth0-go-jwt-middleware
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-axgle-mahonia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bep-gitmap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bep-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bgentry-go-netrc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bkaradzic-go-lz4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-boombuler-barcode
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-buger-jsonparser
ExclusiveArch: %{go_arches} noarch
- golang-github-calmh-du
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-luhn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ccding-go-stun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cespare-xxhash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chaseadamsio-goorgeous
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cheekybits-is
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-chmduquesne-rollinghash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chrismalek-oktasdk-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-client9-gospell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cockroachdb-cockroach-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codahale-aesnicheck
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codegangsta-negroni
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-etcd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cryptix-wav
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cznic-b
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-fileutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-golex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-internal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lexer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lldb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-mathutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-ql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-sortutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-strutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-zappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-d4l3k-messagediff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-danwakefield-fnmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-cssmin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-siphash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-disintegration-imaging
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-dlclark-regexp2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-docker-libkv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docopt-docopt-go
ExclusiveArch: %{go_arches}
- golang-github-duosecurity-duo_api_golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-edsrzf-mmap-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-eknkc-amber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-endophage-gotuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-color
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-structs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-flynn-go-shlex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fortytw2-leaktest
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsnotify-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsouza-go-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fullsailor-pkcs7
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-git-lfs-wildmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-glacjay-goini
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-errors-errors
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-macaron-inject
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-go-mgo-mgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-tomb-tomb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gobuffalo-envy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gobwas-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gocql-gocql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-cmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-goraft-raft
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-css
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gosexy-gettext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hailocab-go-hostpool
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-hclog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-plugin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-rootcerts
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-howeyc-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-inconshreveable-go-vhost
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-influxdb-influxdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jackpal-gateway
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-prose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-syllables
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jefferai-jsonx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-justinas-alice
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-cpuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-knieriem-markdown
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kyokomi-emoji
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-linuxdeepin-go-x11-client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lpabon-godbc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-markbates-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-colorable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-ansi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-logxi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-michaelklishin-rabbit-hole
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-miekg-mmark
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-milochristiansen-axis2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-lua
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-minio-sha256-simd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-go-testing-interface
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-goamz
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-montanaflynn-stats
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-msteinert-pam
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-muesli-smartcrop
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mvo5-goconfigparser
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mvo5-uboot-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-neurosnap-sentences
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-nfnt-resize
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-noahdesu-go-ceph
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ojii-gettext.go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-opencontainers-specs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-openshift-go-json-rest
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-go-systemd
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-openshift-sdn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-oschwald-geoip2-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-oschwald-maxminddb-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-patrickmn-go-cache
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-paulrosania-go-charset
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-petermattis-goid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pquerna-otp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-prometheus-prometheus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rackspace-gophercloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rakyll-globalconf
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rakyll-pb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-rakyll-statik
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rasky-go-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-remeh-sizedwaitgroup
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-remyoudompheng-bigfft
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-ryanuber-go-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-samuel-go-zookeeper
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-sasha-s-go-deadlock
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-seccomp-libseccomp-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sergi-go-diff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sethgrid-pester
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shiena-ansicolor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shogo82148-go-shuffle
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shurcooL-sanitized_anchor_name
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-skarademir-naturalsort
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skratchdot-open-golang
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skynetservices-skydns
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-assertions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-smartystreets-go-aws-auth
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-goconvey
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spacejam-loghisto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spacemonkeygo-openssl
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x}
- golang-github-spaolacci-murmur3
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-afero
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-fsync
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-nitro
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sstarcher-go-okta
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stathat-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-stevvooe-resumable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-streadway-amqp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stretchr-objx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-syndtr-gocapability
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-goleveldb
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-gosnappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-templexxx-cpufeat
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-xor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tent-http-link-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-thejerf-suture
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tjfoc-gmsm
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tonnerre-golang-pretty
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-urfave-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vaughan0-go-ini
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-vbatts-tar-split
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vishvananda-netlink
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}}
- golang-github-vishvananda-netns
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vitrun-qart
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vjeantet-asn1-ber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vmware-govcloudair
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-wsxiaoys-terminal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonpointer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonreference
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonschema
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xiang90-probing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-xrash-smetrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-smux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-ace
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-gohtml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yvasiyarov-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-gorelic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-newrelic_platform_go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-zillode-notify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gcfg
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-go-decimal-inf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-go-exp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-googlecode-log4go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-sqlite
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-uuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-go-check-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-go-macaroon-macaroon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-retry-v1
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-torproject-pluggable-transports-goptlib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golint
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotags
ExclusiveArch: %{go_arches}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- gsf-sharp
ExclusiveArch: %mono_arches
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- heketi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- hsakmt
ExclusiveArch: x86_64 aarch64
- hub
ExclusiveArch: %{go_arches}
- hugo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- icaro
ExclusiveArch: %{ix86} %{arm} x86_64 noarch
- ignition
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- ikarus
ExclusiveArch: %{ix86}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- insect
ExclusiveArch: %{nodejs_arches} noarch
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- ioport
ExclusiveArch: %{ix86} x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: %{arm} %{ix86} x86_64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iwyu
ExclusiveArch: %{ix86} x86_64
- ixpdimm_sw
ExclusiveArch: x86_64
- jake
ExclusiveArch: %{nodejs_arches} noarch
- jasmine-node
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- josm
ExclusiveArch: %{ix86} x86_64
- julia
ExclusiveArch: %{ix86} x86_64
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kosmtik
ExclusiveArch: %{nodejs_arches} noarch
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- latrace
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- lazarus
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libflatarray
ExclusiveArch: %{ix86} x86_64
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libmfx
ExclusiveArch: %{ix86} x86_64
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- librtas
ExclusiveArch: %{power64}
- libseccomp
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lldb
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- lodash
ExclusiveArch: %{nodejs_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maven-eclipse-plugin
ExclusiveArch: %{ix86} x86_64
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mnemosyne
ExclusiveArch: noarch %{qt5_qtwebengine_arches}
- mocha
ExclusiveArch: %{nodejs_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mongo-tools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- mongodb
ExclusiveArch: %{upstream_arches}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-debugger
ExclusiveArch: %ix86 x86_64
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nacl-arm-binutils
ExclusiveArch: x86_64
- nacl-binutils
ExclusiveArch: x86_64
- nacl-gcc
ExclusiveArch: x86_64
- nacl-newlib
ExclusiveArch: x86_64
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nim
ExclusiveArch: %{nim_arches}
- nini
ExclusiveArch: %{mono_arches}
- node-gyp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-Base64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-abbrev
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-accepts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-acorn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-acorn-dynamic-import
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-acorn-jsx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-add-stream
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-after
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-agent-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-agentkeepalive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ain2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-align-text
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-alter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgcyan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bggreen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgmagenta
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgwhite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgyellow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-black
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-blue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bold
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-cyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-dim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-escapes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-font
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-gray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-green
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-grey
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-hidden
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-inverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-italic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-magenta
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-red
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-reset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-strikethrough
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-styles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-underline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-white
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-wrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-yellow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansicolors
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansidiff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansistyles
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-any-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-any-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-field
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aproba
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-are-we-there-yet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-argparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-argsparser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-exclude
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-union
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-buffer-from-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-differ
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-find
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-find-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-foreach
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-ify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-uniq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-unique
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arraybuffer-dot-slice
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arraybuffer-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arrify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-as-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ascii-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ascli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-asn1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assert-plus
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assertion-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assume
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ast-traverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ast-types
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-astral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-angular-annotate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-pass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-async-arrays
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-limiter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-queue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-some
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asynckit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-atob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-auto-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-autoresolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ava-init
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aws-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws-sign2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws4
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-code-frame
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-messages
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-plugin-syntax-async-functions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-plugin-syntax-async-generators
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-runtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-babylon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-backoff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-balanced-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-option
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-plugins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base32-encode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-arraybuffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64id
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-basic-auth-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-batch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bcrypt
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-bcryptjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-beeper
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-benchmark
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-than-before
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bignumber-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bind-obj-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bindings
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bit-mask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-blob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-block-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bluebird
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-body-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boolbase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-brace-expansion
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-braces
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-breakable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-browser-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-browser-stdout
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buf-compare
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-crc32
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-shims
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffer-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffertools
ExclusiveArch: %{nodejs_arches}
- nodejs-bufferutil
ExclusiveArch: %{nodejs_arches}
- nodejs-builtin-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-builtins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bundle-dependencies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-burrito
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-busboy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-byline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cache-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caching-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-call-delayed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-matcher
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-me-maybe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-callback-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsites
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camel-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caniuse-db
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-capture-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-carrier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caseless
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-center-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-as-promised
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-cheerio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-connect-middleware
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-json-schema
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-oauth2orize-grant
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-spies-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainsaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chalk
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-change-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-char-spinner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-character-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charenc
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-check-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cheerio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-child-process-close
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chmodr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chownr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chroma-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chrono
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ci-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-circular-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjson
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-class-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clean-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clean-yaml-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clear-require
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-spinner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cliui
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-stats
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-closure-compiler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-co-with-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-code-point-at
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-coffee-coverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-collection-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-collections
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-color-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colour
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-columnify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-combined-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commander
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-common-path-prefix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commondir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-commoner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commonmark
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compare-func
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compare-versions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-inherit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compress-commons
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compressible
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compression
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-map
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-config-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-livereload
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-console-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-console-dot-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-console-group
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-consolemd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constant-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constantinople
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-disposition
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-conventional-changelog-angular
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-atom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-core
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-conventional-changelog-ember
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-eslint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-express
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jquery
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jscs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-preset-loader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-filter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-recommended-bump
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-hex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-jar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookiejar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-copy-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-core-assert
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-util-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-couch-login
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coveralls
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-crc
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crc32-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-create-error-class
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cross-spawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cross-spawn-async
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crypt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cryptiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csrf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-select
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-what
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csscomb-core
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cssom
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csurf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-generate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-spectrum
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ctype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-currently-unhandled
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cycle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cyclist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-d
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dargs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dashdash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-data-uri-to-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-date-now
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dateformat
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-death
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-debug-fabulous
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debuglog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-decamelize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decamelize-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decimal-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decompress-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dedent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-eql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deep-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-default-require-extensions
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-default-resolution
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defaults
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defence
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defence-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-properties
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defined
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-degenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-del
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delayed-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-delegates
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delete
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dep-graph
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-depd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deprecated
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-newline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detective
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dezalgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dirty-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-docopt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-doctrine
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dom-serializer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domelementtype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domutils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-prop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dotfile-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dreamopt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dryice
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dtree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-duplexer3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duration
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ebnf-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-echomd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ecstatic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-editor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ee-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-emojione
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-empty-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encodeurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encoding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-end-of-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-entities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-ex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errorhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-abstract
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-to-primitive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es5-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es5-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-iterator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-promisify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-set
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escallmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-html
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-regexp-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escape-string-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escodegen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escope
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower-location-detector
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-fb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-harmony-jscs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espurify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esrecurse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse-fb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estree-walker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esutils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-etag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-event-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-event-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eventemitter2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-eventemitter3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-everything-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-execa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-exit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-brackets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-tilde
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extended-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extsprintf
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eyes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fake
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fancy-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-far
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fast-levenshtein
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fastfall
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-faucet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-faye-websocket
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fd-slicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fg-lodash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-figures
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-file-entry-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-sync-cmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-uri-to-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-filed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filelist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filename-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fileset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fill-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fill-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-finalhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-find-cache-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-find-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-findup-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-first-chunk-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flagged-respawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flat-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-flush-write-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fmix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-dot-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow-redirects
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-for-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-for-in
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-for-own
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-foreach
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-foreground-child
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forever-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-form-data
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-formatio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-formidable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forwarded
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fragment-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-freetree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fresh
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-from2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-dot-notify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-cached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fs-ext
ExclusiveArch: %{nodejs_arches}
- nodejs-fs-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-temp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-vacuum
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-write-stream-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-ignore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-npm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ftp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-function-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-function-loop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gauge
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gaze
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gdal
ExclusiveArch: %{nodejs_arches}
- nodejs-generate-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generate-object-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-pkg-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stdin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-uri
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-getobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gettext-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-dummy-commit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-raw-commits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-remote-origin-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-semver-tags
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-tails
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gitconfiglocal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-username-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-expand
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-parent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-global-modules
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-global-prefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globby
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globule
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glogg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gnode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gonzales-pe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-got
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-readlink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-growl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-angular-templates
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-banner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-cli
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-compare-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-clean
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-concat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-cssmin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-htmlmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-internal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-less
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-requirejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-uglify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-watch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-git-authors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-html-validation
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-init
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-known-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-lib-contrib
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-sed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-simple-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-process
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulp-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulp-ng-classify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulp-util
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gzip-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-handle-thing
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-handlebars
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-har-validator
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-flag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-unicode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-yarn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hash_file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hawk
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-he
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-heap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hex-to-array-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-highlight-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-historic-readline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hoek
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-homedir-polyfill
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hook-std
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hooker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hosted-git-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hsluv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-html-minifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-htmlparser2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-deceiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-errors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-signature
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-https-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-humanize-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-i18n-transform
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i2c
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv-lite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-iferr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ignore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-immutable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-import-local
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-imul
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-imurmurhash
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-indent-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-infinity-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inflight
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-info-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-inherits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherits1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ini
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-init-package-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inline-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-install
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-int64-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-intercept-require
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-interpret
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-into-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-invert-kv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ip
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ipaddr-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-irc-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-irregular-plurals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-accessor-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrayish
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-boolean-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-builtin-module
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-callable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-data-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-date-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-dotfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-equal-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-extendable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-finite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-fullwidth-code-point
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-generator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-module
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-my-json-valid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-negated-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-number
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-number-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-odd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-path-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-in-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-inside
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-plain-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-plain-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-primitive
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-redirect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-registered
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-relative
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-retry-allowed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-subset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-text-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-typedarray
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-unc-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-valid-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-valid-instance
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-windows
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-isexe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-iso8601
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isodate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-coverage
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-hook
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-report
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-source-maps
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-reports
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jade
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-growl-reporter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-reporters
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jest-mock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison-lex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jju
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joose
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-namespace-depended
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-simplerequest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-base64
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-string-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-js-tokens
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-yaml
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jschardet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jscoverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-localizer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-better-errors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-helpfulerror
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stable-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stringify-safe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer-dot-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonselect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jwt-simple
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keep-alive-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-keygrip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keypress
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-kind-of
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-klaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-kuler2gpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-latest-version
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazy-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazystream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lcid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lcov-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-leaflet
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-formbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-hash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leche
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-left-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-levn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lex-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-libpq
ExclusiveArch: %{nodejs_arches}
- nodejs-libxmljs
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-line-numbers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-line-reader
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linkify-it
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-grunt-tasks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-locate-character
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-locate-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lockfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-log-driver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-ok
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-symbols
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lolex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-longest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loophole
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loud-rejection
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lower-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lowercase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ltx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-magic-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-make-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-generator-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makeerror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik
ExclusiveArch: %{nodejs_arches}
- nodejs-mapnik-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik-vector-tile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-markdown
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-markdown-it-testgen
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-matched
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-max-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-maxmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mbtiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-md5
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-hex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-o-matic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mdn-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mdurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-media-typer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoizee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-memwatch-next
ExclusiveArch: %{nodejs_arches}
- nodejs-meow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-merge-descriptors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-merge-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-metascript
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-method-override
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-micromatch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-millstone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mime-db
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mimeparse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mimic-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimalistic-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-minimist-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minipass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minstache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkdirp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkfiletree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-bin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-modify-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-module-not-found-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-moment
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-moment-timezone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb-core
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-monocle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-morgan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-muffin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-multimatch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiparty
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multipipe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-murmur-32
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mustache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mutate-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mute-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mysql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mz
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nan0
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nanomatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nanoseconds
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-native-or-bluebird
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ncp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-needle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-negotiator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nested-error-stacks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-net-browserify-alt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-netmask
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-next-tick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ng-classify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-dot-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-expat
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-node-int64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-print
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-static
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-status-codes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-stringprep
ExclusiveArch: %{nodejs_arches}
- nodejs-node-uuid
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nomnom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-noncharacters
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt-usage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-noptify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-normalize-git-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-package-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-cache-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-install-checks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-package-arg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-run-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-user-validate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npmlog
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-api
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-audit-shrinkwrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nth-check
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-number-is-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-numeral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth2orize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-assign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-dot-entries
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-omit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-pick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-observable-to-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-obuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-okay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-finished
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-headers
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-once
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-onetime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-only-shallow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opal-runtime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opener
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opn
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optionator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-orchestrator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ordered-read-streams
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-os-homedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-locale
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-tmpdir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-osenv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-output-file-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-own-or
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-own-or-env
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-finally
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-locate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pac-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pac-resolver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packet-reader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pad-left
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-paperboy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parallel-transform
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-param-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-github-repo-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parse-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-passwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parsejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseqs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parserlib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parseuri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pascal-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pascalcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-http-bearer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2-client-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-array
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-dirname
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-exists
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-inside
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-key
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pathval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pause
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pause-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pbkdf2-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pedding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pegjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pem
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-connection-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-cursor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-int8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-native
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pgpass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkg-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkginfo
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-platform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-plur
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portfinder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-posix-character-classes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-posix-getopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-bytea
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-date
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-interval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-precond
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-prelude-ls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prepend-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-preserve
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-hrtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pretty-time
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-private
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-process-nextick-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proclaim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promises-aplus-tests
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-prompt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promzard
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-propagate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-propget
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proto-list
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy-addr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxyquire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pruddy-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pseudomap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pubcontrol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pump
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pumpify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-q
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-q-io
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qtdatastream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-queue-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-quick-lru
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qunit-extras
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qunitjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rainbowsocks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-random-bytes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-random-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-randomatic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-range-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-raw-body
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rc
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-re-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-all-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-dir-files
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-installed
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-json-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-tree
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readable-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-readdir-enhanced
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdir-scoped-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdirp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-realize-package-specifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-recast
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rechoir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-redent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reduce-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-regex-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regex-not
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-registry-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-relateurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-remove-trailing-separator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repeat-element
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeat-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeating
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-requestretry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-cs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-require-directory
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-inject
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-main-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-relative
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-uncached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-yaml
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requirejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requires-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-cwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-pkg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-response-time
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resumer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ret
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-retry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reusify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-revalidator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rewire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rfile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rhea
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-right-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rimraf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rndm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rollup
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rollup-plugin-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-commonjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-node-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-plugin-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rollup-pluginutils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ronn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-run-parallel-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-runforcover
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safe-json-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safecb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-samsam
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sauce-tunnel
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sax
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-scmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-secure-random
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seedrandom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-select-hose
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-semver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-send
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sentence-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sentiment
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sequencify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serialize-error
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-static
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-server-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-blocking
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-getter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-set-immediate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-immediate-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-setimmediate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-setprototypeof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sha
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shallow-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-command
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shelljs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-shelljs-nodecli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-format
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-showdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sigmund
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-signal-exit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-silent-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-asyncify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-fmt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-single-line-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon-chai
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sinon-restore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slash
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sliced
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slide
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-smart-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-snake-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture-set
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snockets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sntp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-socket-dot-io-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-socks-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-socks-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sort-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sorted-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-fixtures
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sparkles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-spawn-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spawn-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-correct
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-exceptions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-expression-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-license-ids
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spec
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spec-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-speedometer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sqlite3
ExclusiveArch: %{nodejs_arches}
- nodejs-srs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ssri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-st
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-utils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-static-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-static-favicon
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-statuses
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-std-mocks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-combiner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-consume
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-counter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-pair
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-reduce
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-replace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-shift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-spigot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-streamsearch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamsink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamtest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-repeat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-trim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string-width
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string_decoder
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringmap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-ansi
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-bom-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-color
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-eof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-json-comments
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strong-log-transformer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strscanner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stylus
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-success-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent-proxy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-supertest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supports-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-suspend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-swap-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-symbol-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-mocha-reporter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-out
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-spec
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tapes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-pack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp-write
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tempfile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temporary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-cordovajs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-liferay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-terst
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-test
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-test-exclude
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testdata-w3c-json-form
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testswarm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testutil
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-extensions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-thenify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thenify-all
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-through2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through2-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thunkify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tildify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tilejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive-mapnik
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tiletype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-diff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-stamp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-timed-out
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timekeeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timers-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tiny-lr-fork
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tippex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-title-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tlds
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-absolute-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-object-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-regex-range
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-touch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tough-cookie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tracejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-transformers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-traverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-treeify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tressa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-trim-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim-off-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trivial-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-try-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-try-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tryor
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tsame
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tslib
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tsscmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ttembed-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tunnel-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tv4
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-check
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-type-detect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-name
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-typeahead.js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typedarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uc-dot-micro
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uglify-to-browserify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uid-safe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ultron
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-umask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unc-path-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore-dot-logger
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unicode-length
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unique-filename
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-slug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unpipe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unset-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uri-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-urix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-join
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-parse-lax
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-use
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-user-home
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utfx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-deprecate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utilities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utils-merge
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uuid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vali-date
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-validate-npm-package-license
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-validate-npm-package-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vasync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-verror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vhost
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vinyl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vlq
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vow-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vows
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-w3cjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walkdir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walker
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ware
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-warning-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-watchit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-watershed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wbuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wcwidth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-websocket-driver
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-when
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-whet-dot-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-which
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-win-spawn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-window-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-winston
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-with
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wolfy87-eventemitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-woothee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wordwrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrap-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wrap-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrappy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-write-file-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ws
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xdg-basedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xml2js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmldom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlhttprequest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlhttprequest-ssl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xregexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-xtend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-y18n
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yallist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yapool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yargs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yargs-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yarn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yauzl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yeast
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zip-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zipfile
ExclusiveArch: %{nodejs_arches}
- nodejs-zlib-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zlibjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: %{ix86} x86_64
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64
- nwchem
ExclusiveArch: x86_64 %{ix86}
- obfs4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-kvm-hook
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-register-machine
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- ocitools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- odcs
ExclusiveArch: %{ix86} x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-powerd
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- onedrive
ExclusiveArch: %{ldc_arches}
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: %{ix86} x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openmx
ExclusiveArch: x86_64 %{ix86}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openssl-ibmca
ExclusiveArch: s390 s390x
- openvswitch
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- paflib
ExclusiveArch: ppc %{power64}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdfmod
ExclusiveArch: %mono_arches
- peripety
ExclusiveArch: %{rust_arches}
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: i686 x86_64 ia64 aarch64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plv8
ExclusiveArch: %v8_arches
- pocl
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- podman
ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- publican-jboss
ExclusiveArch: i686 x86_64
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- python-afl
ExclusiveArch: %{ix86} x86_64
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: %{openblas_arches}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- reg
ExclusiveArch: x86_64
- renderdoc
ExclusiveArch: %{ix86} x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rkt
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- rocm-runtime
ExclusiveArch: x86_64 aarch64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-antidote
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-backtrace-sys
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitflags0.9
ExclusiveArch: %{rust_arches}
- rust-brev
ExclusiveArch: %{rust_arches}
- rust-bufstream
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes0.3
ExclusiveArch: %{rust_arches}
- rust-c_vec
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-cargo
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-chan
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-coco
ExclusiveArch: %{rust_arches}
- rust-config
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-crates-io
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-csv
ExclusiveArch: %{rust_arches}
- rust-csv-core
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-deque
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-encoding_rs_io
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fake_clock
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flame
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-fuse
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-async-runtime
ExclusiveArch: %{rust_arches}
- rust-futures-channel
ExclusiveArch: %{rust_arches}
- rust-futures-core
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-futures-executor
ExclusiveArch: %{rust_arches}
- rust-futures-io
ExclusiveArch: %{rust_arches}
- rust-futures-macro-async
ExclusiveArch: %{rust_arches}
- rust-futures-macro-await
ExclusiveArch: %{rust_arches}
- rust-futures-sink
ExclusiveArch: %{rust_arches}
- rust-futures-stable
ExclusiveArch: %{rust_arches}
- rust-futures-timer
ExclusiveArch: %{rust_arches}
- rust-futures-util
ExclusiveArch: %{rust_arches}
- rust-futures0.1
ExclusiveArch: %{rust_arches}
- rust-gcsf
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-git2-curl
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-google-drive3-fork
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-rs-lgpl-docs
ExclusiveArch: %{rust_arches}
- rust-gtk-source-sys
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-h2
ExclusiveArch: %{rust_arches}
- rust-hamcrest
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-hyper-native-tls
ExclusiveArch: %{rust_arches}
- rust-hyper-tls
ExclusiveArch: %{rust_arches}
- rust-hyper0.10
ExclusiveArch: %{rust_arches}
- rust-id_tree
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy-init
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libmount
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lru_time_cache
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-metadeps
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-mime-sniffer
ExclusiveArch: %{rust_arches}
- rust-mime0.2
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-extras
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-native-tls
ExclusiveArch: %{rust_arches}
- rust-native-tls0.1
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-nom3
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches} noarch
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-pangocairo
ExclusiveArch: %{rust_arches}
- rust-pangocairo-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-peg
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-proc-macro2-0.3
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-quote0.3
ExclusiveArch: %{rust_arches}
- rust-quote0.5
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rand0.4
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rust-ini
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde0.8
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_json0.8
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slab0.3
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-snowflake
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-sourceview
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-string
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-syn0.11
ExclusiveArch: %{rust_arches}
- rust-syn0.13
ExclusiveArch: %{rust_arches}
- rust-synom
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-synstructure0.6
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-take_mut
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread-scoped
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-codec
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-current-thread
ExclusiveArch: %{rust_arches}
- rust-tokio-executor
ExclusiveArch: %{rust_arches}
- rust-tokio-fs
ExclusiveArch: %{rust_arches}
- rust-tokio-io
ExclusiveArch: %{rust_arches}
- rust-tokio-mockstream
ExclusiveArch: %{rust_arches}
- rust-tokio-process
ExclusiveArch: %{rust_arches}
- rust-tokio-proto
ExclusiveArch: %{rust_arches}
- rust-tokio-reactor
ExclusiveArch: %{rust_arches}
- rust-tokio-service
ExclusiveArch: %{rust_arches}
- rust-tokio-signal
ExclusiveArch: %{rust_arches}
- rust-tokio-tcp
ExclusiveArch: %{rust_arches}
- rust-tokio-threadpool
ExclusiveArch: %{rust_arches}
- rust-tokio-timer
ExclusiveArch: %{rust_arches}
- rust-tokio-udp
ExclusiveArch: %{rust_arches}
- rust-toml
ExclusiveArch: %{rust_arches}
- rust-traitobject
ExclusiveArch: %{rust_arches}
- rust-try-lock
ExclusiveArch: %{rust_arches}
- rust-typeable
ExclusiveArch: %{rust_arches}
- rust-typed-arena
ExclusiveArch: %{rust_arches}
- rust-ucd-util
ExclusiveArch: %{rust_arches}
- rust-unicase
ExclusiveArch: %{rust_arches}
- rust-unicase1
ExclusiveArch: %{rust_arches}
- rust-unicode-bidi
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-segmentation
ExclusiveArch: %{rust_arches}
- rust-unicode-width
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-unindent
ExclusiveArch: %{rust_arches}
- rust-unix_socket
ExclusiveArch: %{rust_arches}
- rust-unreachable
ExclusiveArch: %{rust_arches}
- rust-unsafe-any
ExclusiveArch: %{rust_arches}
- rust-untrusted
ExclusiveArch: %{rust_arches}
- rust-url
ExclusiveArch: %{rust_arches}
- rust-users
ExclusiveArch: %{rust_arches}
- rust-utf8-ranges
ExclusiveArch: %{rust_arches}
- rust-uuid
ExclusiveArch: %{rust_arches}
- rust-varlink
ExclusiveArch: %{rust_arches}
- rust-varlink-cli
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-varlink_stdinterfaces
ExclusiveArch: %{rust_arches}
- rust-vec_map
ExclusiveArch: %{rust_arches}
- rust-version-sync
ExclusiveArch: %{rust_arches}
- rust-version_check
ExclusiveArch: %{rust_arches}
- rust-void
ExclusiveArch: %{rust_arches}
- rust-wait-timeout
ExclusiveArch: %{rust_arches}
- rust-walkdir
ExclusiveArch: %{rust_arches}
- rust-want
ExclusiveArch: %{rust_arches}
- rust-which
ExclusiveArch: %{rust_arches}
- rust-xattr
ExclusiveArch: %{rust_arches}
- rust-xdg
ExclusiveArch: %{rust_arches}
- rust-xz2
ExclusiveArch: %{rust_arches}
- rust-yaml-rust
ExclusiveArch: %{rust_arches}
- rust-yaml-rust0.3
ExclusiveArch: %{rust_arches}
- rust-yubibomb
ExclusiveArch: %{rust_arches}
- rust-yup-oauth2
ExclusiveArch: %{rust_arches}
- rust-zoneinfo_compiled
ExclusiveArch: %{rust_arches}
- s390utils
ExclusiveArch: s390 s390x
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- sagemath
ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- seabios
ExclusiveArch: x86_64
- seamonkey
ExclusiveArch: %{ix86} x86_64
- servicelog
ExclusiveArch: ppc %{power64}
- sgabios
ExclusiveArch: %{ix86} x86_64
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- smuxi
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- source-to-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spring
ExclusiveArch: %{ix86} x86_64
- springlobby
ExclusiveArch: %{ix86} x86_64
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supermin
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64
- syncthing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64
- tboot
ExclusiveArch: %{ix86} x86_64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- thunderbird-enigmail
ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch
- tilix
ExclusiveArch: %{ldc_arches}
- tmux-top
ExclusiveArch: %{go_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- ugene
ExclusiveArch: %{ix86} x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- uglify-js1
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- v8
ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{valgrind_arches}
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vdsm
ExclusiveArch: x86_64 %{power64} aarch64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- virtualplanet
ExclusiveArch: %{fpc_arches}
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit-sharp
ExclusiveArch: %mono_arches
- webkit2-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} %{arm}
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wiredtiger
ExclusiveArch: x86_64 aarch64 ppc64le
- wraplinux
ExclusiveArch: %{ix86} x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86info
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-geode
ExclusiveArch: %{ix86}
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64 ia64
- xorg-x11-drv-omap
ExclusiveArch: %{arm}
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-opentegra
ExclusiveArch: %{arm}
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xsupplicant
ExclusiveArch: %{ix86} x86_64 ppc %{power64}
- ycssmin
ExclusiveArch: %{nodejs_arches} noarch
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
5 years, 10 months
Architecture specific change in rpms/infiniband-diags.git
by githook-noreply@fedoraproject.org
The package rpms/infiniband-diags.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/infiniband-diags.git/commit/?id=1....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 13bdf23c0af88d6541ef1080384365098352071f
Author: Honggang Li <honli(a)redhat.com>
Date: Tue Aug 7 20:41:19 2018 -0400
Rebase to latest upstream release v2.1.0
Resolves: bz1613594
Signed-off-by: Honggang Li <honli(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index b8f9046..8ceeffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/infiniband-diags-1.*.tar.gz
/infiniband-diags-2.0.0.tar.gz
+/infiniband-diags-2.1.0.tar.gz
diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index b6b365b..4cd846d 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -1,7 +1,7 @@
Name: infiniband-diags
Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
# Upstream allows either license to be used
License: GPLv2 or BSD
Url: https://github.com/linux-rdma/infiniband-diags
@@ -18,6 +18,9 @@ Obsoletes: openib-diags < 1.3
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
ExcludeArch: s390 %{arm}
+%if 0%{?rhel} > 7
+ExcludeArch: s390x
+%endif
# Find the correct directory to install the perl module into.
%global _perldir %(perl -e 'use Config; print $Config{installvendorarch};')
@@ -196,6 +199,10 @@ find ${RPM_BUILD_ROOT} -type f -name '*.la' -print -delete
%{_libdir}/*.a
%changelog
+* Tue Aug 7 2018 Honggang Li <honli(a)redhat.com> - 2.1.0-1
+- Rebase to latest upstream release v2.1.0
+- Resolves: bz1613594
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 9965ab8..9e1248f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (infiniband-diags-2.0.0.tar.gz) = 2cbefb75cd09d29891fb4955fed6d22ef62b680a624d90650b85fb5c28e823e8983f763d3dd52cecfefd956993857df64428dbff74c136856f4d08819872188c
+SHA512 (infiniband-diags-2.1.0.tar.gz) = 11e68276ad2a32498a1da363df540ea4cffd901e6b48b861c10a1bf5fbc85974f6541ab76c657579e0d79cd20b768dfd40d8ffdf5640ac77234326e430179e78
commit 3ec76f3327c1ff4c93fb6a50180405ecb6dd7b8d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 05:43:06 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index 90ca990..b6b365b 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -1,7 +1,7 @@
Name: infiniband-diags
Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
Version: 2.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
# Upstream allows either license to be used
License: GPLv2 or BSD
Url: https://github.com/linux-rdma/infiniband-diags
@@ -196,6 +196,9 @@ find ${RPM_BUILD_ROOT} -type f -name '*.la' -print -delete
%{_libdir}/*.a
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 9542cfbb511b26c41835a596c3ebbd5a0a64fd68
Author: Igor Gnatenko <ignatenko(a)redhat.com>
Date: Mon Jul 9 19:06:46 2018 +0200
add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index 27da19e..90ca990 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -7,6 +7,7 @@ License: GPLv2 or BSD
Url: https://github.com/linux-rdma/infiniband-diags
Source0: https://github.com/linux-rdma/%{name}/releases/download/%{version}/%{name...
+BuildRequires: gcc
BuildRequires: glib2-devel
BuildRequires: libibumad-devel
BuildRequires: opensm-devel
5 years, 10 months
Architecture specific change in rpms/infiniband-diags.git
by githook-noreply@fedoraproject.org
The package rpms/infiniband-diags.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/infiniband-diags.git/commit/?id=1....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 13bdf23c0af88d6541ef1080384365098352071f
Author: Honggang Li <honli(a)redhat.com>
Date: Tue Aug 7 20:41:19 2018 -0400
Rebase to latest upstream release v2.1.0
Resolves: bz1613594
Signed-off-by: Honggang Li <honli(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index b8f9046..8ceeffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/infiniband-diags-1.*.tar.gz
/infiniband-diags-2.0.0.tar.gz
+/infiniband-diags-2.1.0.tar.gz
diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index b6b365b..4cd846d 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -1,7 +1,7 @@
Name: infiniband-diags
Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
# Upstream allows either license to be used
License: GPLv2 or BSD
Url: https://github.com/linux-rdma/infiniband-diags
@@ -18,6 +18,9 @@ Obsoletes: openib-diags < 1.3
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
ExcludeArch: s390 %{arm}
+%if 0%{?rhel} > 7
+ExcludeArch: s390x
+%endif
# Find the correct directory to install the perl module into.
%global _perldir %(perl -e 'use Config; print $Config{installvendorarch};')
@@ -196,6 +199,10 @@ find ${RPM_BUILD_ROOT} -type f -name '*.la' -print -delete
%{_libdir}/*.a
%changelog
+* Tue Aug 7 2018 Honggang Li <honli(a)redhat.com> - 2.1.0-1
+- Rebase to latest upstream release v2.1.0
+- Resolves: bz1613594
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 9965ab8..9e1248f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (infiniband-diags-2.0.0.tar.gz) = 2cbefb75cd09d29891fb4955fed6d22ef62b680a624d90650b85fb5c28e823e8983f763d3dd52cecfefd956993857df64428dbff74c136856f4d08819872188c
+SHA512 (infiniband-diags-2.1.0.tar.gz) = 11e68276ad2a32498a1da363df540ea4cffd901e6b48b861c10a1bf5fbc85974f6541ab76c657579e0d79cd20b768dfd40d8ffdf5640ac77234326e430179e78
5 years, 10 months
Architecture specific change in rpms/jbuilder.git
by githook-noreply@fedoraproject.org
The package rpms/jbuilder.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/jbuilder.git/commit/?id=75574239a....
Change:
+%ifnarch i686 armv7hl
Thanks.
Full change:
============
commit 75574239ab836342854e9be9146c69f079cb44dd
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Tue Aug 7 16:01:25 2018 -0400
This merlin unit test requires special handling on 32-bit arches, apparently.
diff --git a/jbuilder.spec b/jbuilder.spec
index 4a400ef..15d417f 100644
--- a/jbuilder.spec
+++ b/jbuilder.spec
@@ -102,10 +102,17 @@ git config --global user.email you(a)example.com
# Also, need to fix something in one of the results files...?
# This is incredibly fragile, but I really don't want to write a patch.
+# Okay, so this fix only works on 64-bit arches. I... am not sure why.
+%ifnarch i686 armv7hl
sed "s,\$LIB_PREFIX/lib,%{_libdir}/ocaml,g" -i test/blackbox-tests/test-cases/merlin-tests/run.t
sed "s,%{_libdir}/ocaml/bytes,%{_libdir}/ocaml,g" -i test/blackbox-tests/test-cases/merlin-tests/run.t
sed "s,%{_libdir}/ocaml/findlib,%{_libdir}/ocaml/bytes,g" -i test/blackbox-tests/test-cases/merlin-tests/run.t
sed "s,%{_libdir}/ocaml/ocaml,%{_libdir}/ocaml/findlib,g" -i test/blackbox-tests/test-cases/merlin-tests/run.t
+%else
+sed "s,\$LIB_PREFIX/lib/ocaml,\$LIB_PREFIX/lib/ocaml/findlib,g" -i test/blackbox-tests/test-cases/merlin-tests/run.t
+sed "s,\$LIB_PREFIX/lib/findlib,\$LIB_PREFIX/lib/ocaml/bytes,g" -i test/blackbox-tests/test-cases/merlin-tests/run.t
+sed "s,\$LIB_PREFIX/lib/bytes,\$LIB_PREFIX/lib/ocaml,g" -i test/blackbox-tests/test-cases/merlin-tests/run.t
+%endif
./_build/default/bin/main_dune.exe build @runtest-no-deps
5 years, 10 months
Architecture specific change in rpms/wpewebkit.git
by githook-noreply@fedoraproject.org
The package rpms/wpewebkit.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/wpewebkit.git/commit/?id=389e4ae7....
Change:
+%ifarch s390 s390x ppc %{power64}
Thanks.
Full change:
============
commit 389e4ae7b9cc1d0a5b955fc70465c1518a95cac4
Author: Chris King <bunnyapoc(a)gmail.com>
Date: Tue Aug 7 12:44:01 2018 -0500
Changing filenames and fixing typos
diff --git a/README.md b/README.md
index f4cec19..6274646 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
# wpewebkit
-WPE allows embedders to create simple and performant systems based on Web platform technologies. It is designed with hardware acceleration inmind, leveraging common 3D graphics APIs for best performance.
\ No newline at end of file
+WPE allows embedders to create simple and performant systems based on Web platform technologies. It is designed with hardware acceleration in mind, leveraging common 3D graphics APIs for best performance.
diff --git a/wpewebkit-rawhide.spec b/wpewebkit-rawhide.spec
deleted file mode 100644
index df76342..0000000
--- a/wpewebkit-rawhide.spec
+++ /dev/null
@@ -1,166 +0,0 @@
-## NOTE: Lots of files in various subdirectories have the same name (such as
-## "LICENSE") so this short macro allows us to distinguish them by using their
-## directory names (from the source tree) as prefixes for the files.
-%global add_to_license_files() \
- mkdir -p _license_files ; \
-cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
-
-Name: wpewebkit
-Version: 2.21.2
-Release: 1%{?dist}
-Summary: A WebKit port optimized for low-end devices
-
-License: LGPLv2 and BSD
-URL: http://www.%{name}.org/
-Source0: http://wpewebkit.org/releases/%{name}-%{version}.tar.xz
-
-# https://bugs.webkit.org/show_bug.cgi?id=158785
-Patch0: fedora-crypto-policy.patch
-# Explicitly specify python2 over python to avoid build fails
-Patch1: python2.patch
-
-
-BuildRequires: bison
-BuildRequires: cairo-devel
-BuildRequires: cmake
-BuildRequires: wpebackend-devel
-BuildRequires: flex
-BuildRequires: gcc-c++
-BuildRequires: gnutls-devel
-BuildRequires: gperf
-BuildRequires: gstreamer1-devel
-BuildRequires: gstreamer1-plugins-base-devel
-BuildRequires: gstreamer1-plugins-bad-free-devel
-BuildRequires: harfbuzz-devel
-BuildRequires: libicu-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: libsoup-devel
-BuildRequires: libwebp-devel
-BuildRequires: libxslt-devel
-BuildRequires: libwayland-client-devel
-BuildRequires: libwayland-egl-devel
-BuildRequires: libwayland-server-devel
-BuildRequires: mesa-libEGL-devel
-BuildRequires: perl-File-Copy-Recursive
-BuildRequires: perl-JSON-PP
-BuildRequires: perl-Switch
-BuildRequires: python2
-BuildRequires: ruby
-BuildRequires: rubygems
-BuildRequires: sqlite-devel
-BuildRequires: woff2-devel
-BuildRequires: libepoxy-devel
-
-%description
-WPE allows embedders to create simple and performant systems based on
-Web platform technologies. It is designed with hardware acceleration in
-mind, leveraging common 3D graphics APIs for best performance.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries, build data, and header
-files for developing applications that use %{name}
-
-%prep
-%autosetup -p1 -n wpewebkit-%{version}
-
-%build
-# Increase the DIE limit so our debuginfo packages could be size optimized.
-# Decreases the size for x86_64 from ~5G to ~1.1G.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
-%global _dwz_max_die_limit 250000000
-
-# The _dwz_max_die_limit is being overridden by the arch specific ones from the
-# redhat-rpm-config so we need to set the arch specific ones as well - now it
-# is only needed for x86_64.
-%global _dwz_max_die_limit_x86_64 250000000
-
-%ifarch s390 aarch64
-# Use linker flags to reduce memory consumption - on other arches the ld.gold is
-# used and also it doesn't have the --reduce-memory-overheads option
-%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-%endif
-
-# Decrease debuginfo even on ix86 because of:
-# https://bugs.webkit.org/show_bug.cgi?id=140176
-%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips}
-# Decrease debuginfo verbosity to reduce memory consumption even more
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
-%endif
-
-%ifarch ppc
-# Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled
-%global optflags %{optflags} -Wl,-relax
-%endif
-
-# Disable ld.gold on s390 as it does not have it.
-# Also for aarch64 as the support is in upstream, but not packaged in Fedora.
-# FIXME: Ideally the CMAKE_EXE_LINKER_FLAGS would not be necessary, but builds seem to be failing otherwise.
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%cmake \
- -DPORT=WPE \
- -DCMAKE_BUILD_TYPE=Release \
- -DENABLE_MINIBROWSER=ON \
- -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS} -lrt" \
-%ifarch s390 aarch64
- -DUSE_LD_GOLD=OFF \
-%endif
-%ifarch s390 s390x ppc %{power64}
- -DENABLE_JIT=OFF \
- -DUSE_SYSTEM_MALLOC=ON \
-%endif
-..
-popd
-
-%make_build -C %{_target_platform}
-
-%install
-%make_install -C %{_target_platform}
-
-# Finally, copy over and rename various files for %license inclusion
-%add_to_license_files Source/JavaScriptCore/COPYING.LIB
-%add_to_license_files Source/JavaScriptCore/icu/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
-%add_to_license_files Source/WebCore/icu/LICENSE
-%add_to_license_files Source/WebCore/LICENSE-APPLE
-%add_to_license_files Source/WebCore/LICENSE-LGPL-2
-%add_to_license_files Source/WebCore/LICENSE-LGPL-2.1
-%add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE
-%add_to_license_files Source/WebInspectorUI/UserInterface/External/ESLint/LICENSE
-%add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE
-%add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE
-%add_to_license_files Source/WTF/icu/LICENSE
-%add_to_license_files Source/WTF/wtf/dtoa/COPYING
-%add_to_license_files Source/WTF/wtf/dtoa/LICENSE
-
-%files
-%{_bindir}/WPEWebDriver
-%{_libdir}/libWPEWebKit-0.1.so.2
-%{_libdir}/libWPEWebKit-0.1.so.2.*
-%{_libexecdir}/wpe-webkit-0.1
-%{_libdir}/wpe-webkit-0.1
-%doc NEWS
-%license _license_files/*ThirdParty*
-%license _license_files/*WebCore*
-%license _license_files/*WebInspectorUI*
-%license _license_files/*WTF*
-%license _license_files/*JavaScriptCore*
-
-%files devel
-%{_includedir}/wpe-webkit-0.1
-%{_libdir}/libWPEWebKit-0.1.so
-%{_libdir}/pkgconfig/*.pc
-
-
-%changelog
-
-* Tue Jul 17 2018 Chris King <bunnyapocalypse(a)fedoraproject.org> - 2.21.2-1
-- Initial RPM package.
diff --git a/wpewebkit.spec b/wpewebkit.spec
new file mode 100644
index 0000000..ec69c6b
--- /dev/null
+++ b/wpewebkit.spec
@@ -0,0 +1,166 @@
+## NOTE: Lots of files in various subdirectories have the same name (such as
+## "LICENSE") so this short macro allows us to distinguish them by using their
+## directory names (from the source tree) as prefixes for the files.
+%global add_to_license_files() \
+ mkdir -p _license_files ; \
+cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
+
+Name: wpewebkit
+Version: 2.21.2
+Release: 1%{?dist}
+Summary: A WebKit port optimized for low-end devices
+
+License: LGPLv2 and BSD
+URL: http://www.%{name}.org/
+Source0: http://wpewebkit.org/releases/%{name}-%{version}.tar.xz
+
+# https://bugs.webkit.org/show_bug.cgi?id=158785
+Patch0: fedora-crypto-policy.patch
+# Explicitly specify python2 over python to avoid build fails
+Patch1: python2.patch
+
+
+BuildRequires: bison
+BuildRequires: cairo-devel
+BuildRequires: cmake
+BuildRequires: wpebackend-devel
+BuildRequires: flex
+BuildRequires: gcc-c++
+BuildRequires: gnutls-devel
+BuildRequires: gperf
+BuildRequires: gstreamer1-devel
+BuildRequires: gstreamer1-plugins-base-devel
+BuildRequires: gstreamer1-plugins-bad-free-devel
+BuildRequires: harfbuzz-devel
+BuildRequires: libicu-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libsoup-devel
+BuildRequires: libwebp-devel
+BuildRequires: libxslt-devel
+BuildRequires: libwayland-client-devel
+BuildRequires: libwayland-egl-devel
+BuildRequires: libwayland-server-devel
+BuildRequires: mesa-libEGL-devel
+BuildRequires: perl-File-Copy-Recursive
+BuildRequires: perl-JSON-PP
+BuildRequires: perl-Switch
+BuildRequires: python2
+BuildRequires: ruby
+BuildRequires: rubygems
+BuildRequires: sqlite-devel
+BuildRequires: woff2-devel
+BuildRequires: libepoxy-devel
+
+%description
+WPE allows embedders to create simple and performant systems based on
+Web platform technologies. It is designed with hardware acceleration
+in mind, leveraging common 3D graphics APIs for best performance.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries, build data, and header
+files for developing applications that use %{name}
+
+%prep
+%autosetup -p1 -n wpewebkit-%{version}
+
+%build
+# Increase the DIE limit so our debuginfo packages could be size optimized.
+# Decreases the size for x86_64 from ~5G to ~1.1G.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
+%global _dwz_max_die_limit 250000000
+
+# The _dwz_max_die_limit is being overridden by the arch specific ones from the
+# redhat-rpm-config so we need to set the arch specific ones as well - now it
+# is only needed for x86_64.
+%global _dwz_max_die_limit_x86_64 250000000
+
+%ifarch s390 aarch64
+# Use linker flags to reduce memory consumption - on other arches the ld.gold is
+# used and also it doesn't have the --reduce-memory-overheads option
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+%endif
+
+# Decrease debuginfo even on ix86 because of:
+# https://bugs.webkit.org/show_bug.cgi?id=140176
+%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips}
+# Decrease debuginfo verbosity to reduce memory consumption even more
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
+
+%ifarch ppc
+# Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled
+%global optflags %{optflags} -Wl,-relax
+%endif
+
+# Disable ld.gold on s390 as it does not have it.
+# Also for aarch64 as the support is in upstream, but not packaged in Fedora.
+# FIXME: Ideally the CMAKE_EXE_LINKER_FLAGS would not be necessary, but builds seem to be failing otherwise.
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+ -DPORT=WPE \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DENABLE_MINIBROWSER=ON \
+ -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS} -lrt" \
+%ifarch s390 aarch64
+ -DUSE_LD_GOLD=OFF \
+%endif
+%ifarch s390 s390x ppc %{power64}
+ -DENABLE_JIT=OFF \
+ -DUSE_SYSTEM_MALLOC=ON \
+%endif
+..
+popd
+
+%make_build -C %{_target_platform}
+
+%install
+%make_install -C %{_target_platform}
+
+# Finally, copy over and rename various files for %license inclusion
+%add_to_license_files Source/JavaScriptCore/COPYING.LIB
+%add_to_license_files Source/JavaScriptCore/icu/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
+%add_to_license_files Source/WebCore/icu/LICENSE
+%add_to_license_files Source/WebCore/LICENSE-APPLE
+%add_to_license_files Source/WebCore/LICENSE-LGPL-2
+%add_to_license_files Source/WebCore/LICENSE-LGPL-2.1
+%add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE
+%add_to_license_files Source/WebInspectorUI/UserInterface/External/ESLint/LICENSE
+%add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE
+%add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE
+%add_to_license_files Source/WTF/icu/LICENSE
+%add_to_license_files Source/WTF/wtf/dtoa/COPYING
+%add_to_license_files Source/WTF/wtf/dtoa/LICENSE
+
+%files
+%{_bindir}/WPEWebDriver
+%{_libdir}/libWPEWebKit-0.1.so.2
+%{_libdir}/libWPEWebKit-0.1.so.2.*
+%{_libexecdir}/wpe-webkit-0.1
+%{_libdir}/wpe-webkit-0.1
+%doc NEWS
+%license _license_files/*ThirdParty*
+%license _license_files/*WebCore*
+%license _license_files/*WebInspectorUI*
+%license _license_files/*WTF*
+%license _license_files/*JavaScriptCore*
+
+%files devel
+%{_includedir}/wpe-webkit-0.1
+%{_libdir}/libWPEWebKit-0.1.so
+%{_libdir}/pkgconfig/*.pc
+
+
+%changelog
+
+* Tue Jul 17 2018 Chris King <bunnyapocalypse(a)fedoraproject.org> - 2.21.2-1
+- Initial RPM package.
5 years, 10 months
Architecture specific change in rpms/python-ovirt-register.git
by githook-noreply@fedoraproject.org
The package rpms/python-ovirt-register.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-ovirt-register.git/commit/....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit 3f63adc44a3dbf4636d3f3ff0d11fe73feebe78d
Author: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Date: Tue Aug 7 13:28:00 2018 -0400
Project deprecated
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index cab5e89..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/python-ovirt-register-1.0.tar.gz
-/python-ovirt-register-1.0.0_master.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3f3a22c
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Project deprecated
diff --git a/python-ovirt-register.spec b/python-ovirt-register.spec
deleted file mode 100644
index c6af4b8..0000000
--- a/python-ovirt-register.spec
+++ /dev/null
@@ -1,203 +0,0 @@
-%global package_version 1.0.0_master
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%global with_systemd 1
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global with_python3 1
-%else
-%global with_python2 1
-%endif
-
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib2: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-
-# Default to skipping autoreconf. Distros can change just this one line
-# (or provide a command-line override) if they backport any patches that
-# touch configure.ac or Makefile.am.
-%{!?enable_autotools:%global enable_autotools 0}
-
-%global modname ovirt_register
-
-Name: python-ovirt-register
-Version: 1.0.0
-Release: 20%{?release_suffix}%{?dist}
-Summary: A python module and tool for registering nodes to oVirt Engine
-License: GPLv2+
-Group: System Environment/Libraries
-URL: http://www.ovirt.org
-Source0: http://resources.ovirt.org/pub/src/%{name}/%{name}-%{package_version}.tar.gz
-
-BuildArch: noarch
-
-# dmidecode is not available in ppc/arm
-ExclusiveArch: %{ix86} x86_64
-
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
-BuildRequires: python2-pep8
-BuildRequires: python2-pyflakes
-
-# Autotools BuildRequires
-%if 0%{?enable_autotools}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gettext-devel
-BuildRequires: libtool
-%endif
-
-%if 0%{?with_python3}
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-BuildRequires: python3-pyflakes
-BuildRequires: python3-pep8
-%endif
-
-Requires: python2-pyOpenSSL
-Requires: dmidecode
-Requires: python2-requests
-Requires: python2-libselinux
-%if 0%{?with_systemd}
-Requires: python2-systemd
-%endif
-
-%{!?_licensedir:%global license %%doc}
-
-%description
-python ovirt register is a python 2 library for registering hosts
-to oVirt Engine via HTTPs protocol. It supports Engine 3.3 or superior.
-This package also contains the command line tool ovirt-register to
-trigger the registration.
-
-%if 0%{?with_python3}
-%package -n python3-ovirt-register
-Summary: A python 3 module and tool for registering nodes to oVirt Engine
-Requires: dmidecode
-Requires: python3-pyOpenSSL
-Requires: python3-requests
-Requires: systemd-python3
-Requires: libselinux-python3
-
-%description -n python3-ovirt-register
-python ovirt register is a python 3 library for registering hosts
-to oVirt Engine via HTTPs protocol. It supports Engine 3.3 or superior.
-This package also contains the command line tool ovirt-register to
-trigger the registration.
-%endif
-
-%prep
-%setup -q -n %{name}-%{package_version}
-
-%build
-%if 0%{?enable_autotools}
-autoreconf -if
-%endif
-
-%if 0%{?with_python3}
-%configure
-%endif
-
-%if 0%{?with_python2}
-%configure --without-python3
-%endif
-
-make %{?_smp_mflags}
-
-%install
-make %{?_smp_mflags} install DESTDIR="%{buildroot}"
-
-%if 0%{?with_python3}
-sed -i 's!/usr/bin/python!/usr/bin/python3!' %{buildroot}%{_bindir}/ovirt-register
-%endif
-
-%if 0%{?with_python2}
-%files
-%{_bindir}/ovirt-register
-%{_mandir}/man1/ovirt-register.1.gz
-%doc AUTHORS docs/PROTOCOL README
-%license COPYING
-%dir %{python2_sitelib}/%{modname}
-%{python2_sitelib}/%{modname}/*
-%endif
-
-%if 0%{?with_python3}
-%files -n python3-ovirt-register
-%{_bindir}/ovirt-register
-%{_mandir}/man1/ovirt-register.1.gz
-%doc AUTHORS docs/PROTOCOL README
-%license COPYING
-%dir %{python3_sitelib}/%{modname}
-%{python3_sitelib}/%{modname}/*
-%endif
-
-%changelog
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 1.0.0-19
-- Rebuilt for Python 3.7
-
-* Tue Feb 27 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 1.0.0-18
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Mar 03 2017 Douglas Schilling Landgraf <dougsland(a)redhat.com> - 1.0.0-15
-- x86 platform only
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hronok <mhroncok(a)redhat.com> - 1.0.0-13
-- Rebuild for Python 3.6
-
-* Tue Nov 08 2016 Douglas Schilling Landgraf <dougsland(a)redhat.com> - 1.0.0-12
-- Exclusive arch as dmidecode is not available in ppc64 and arm
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.0-11
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Sat Nov 7 2015 Toshio Kuratomi <toshio(a)fedoraproject.org> - 1.0.0-8
-- Modify the script shebang so that the python3 package won't require python2
-
-* Sat Oct 31 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-7
-- Increase Release
-
-* Sat Oct 31 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-6
-- Added ExcludeArch
-
-* Sun Jul 05 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-5
-- Replace distutils packing for autotools
-
-* Fri Jul 03 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-4
-- chmod/chown should be outside of with
-
-* Thu Jul 02 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-3
-- Improve uuid API handling
-- improve spec
-- try/except to syslog
-
-* Thu Jul 02 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-2
-- Improvements in docstring, persist_uuid and pki module
-
-* Wed Jun 24 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-1
-- Support registration for Engine 3.3 or higher
-- Split package for python2 and python3
-- Improve persist/unpersist handling
-- Improve uuid handling
-- Improve logging
-
-* Thu May 07 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-0
-- Initial take
diff --git a/sources b/sources
deleted file mode 100644
index 544c84b..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-049ec215b1612d3b1c5d0f8f062b7050 python-ovirt-register-1.0.0_master.tar.gz
5 years, 10 months
Architecture specific change in rpms/python-ovirt-register.git
by githook-noreply@fedoraproject.org
The package rpms/python-ovirt-register.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-ovirt-register.git/commit/....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit b4b23e0ee234c9c463fa380750b2664a1caa87b6
Author: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Date: Tue Aug 7 13:27:45 2018 -0400
Project deprecated
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index cab5e89..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/python-ovirt-register-1.0.tar.gz
-/python-ovirt-register-1.0.0_master.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3f3a22c
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Project deprecated
diff --git a/python-ovirt-register.spec b/python-ovirt-register.spec
deleted file mode 100644
index 756f3e7..0000000
--- a/python-ovirt-register.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-%global package_version 1.0.0_master
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%global with_systemd 1
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global with_python3 1
-%else
-%global with_python2 1
-%endif
-
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib2: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-
-# Default to skipping autoreconf. Distros can change just this one line
-# (or provide a command-line override) if they backport any patches that
-# touch configure.ac or Makefile.am.
-%{!?enable_autotools:%global enable_autotools 0}
-
-%global modname ovirt_register
-
-Name: python-ovirt-register
-Version: 1.0.0
-Release: 17%{?release_suffix}%{?dist}
-Summary: A python module and tool for registering nodes to oVirt Engine
-License: GPLv2+
-Group: System Environment/Libraries
-URL: http://www.ovirt.org
-Source0: http://resources.ovirt.org/pub/src/%{name}/%{name}-%{package_version}.tar.gz
-
-BuildArch: noarch
-
-# dmidecode is not available in ppc/arm
-ExclusiveArch: %{ix86} x86_64
-
-BuildRequires: python2-devel
-BuildRequires: python-setuptools
-BuildRequires: python-pep8
-BuildRequires: pyflakes
-
-# Autotools BuildRequires
-%if 0%{?enable_autotools}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gettext-devel
-BuildRequires: libtool
-%endif
-
-%if 0%{?with_python3}
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-BuildRequires: python3-pyflakes
-BuildRequires: python3-pep8
-%endif
-
-Requires: pyOpenSSL
-Requires: dmidecode
-Requires: python-requests
-Requires: libselinux-python
-%if 0%{?with_systemd}
-Requires: systemd-python
-%endif
-
-%{!?_licensedir:%global license %%doc}
-
-%description
-python ovirt register is a python 2 library for registering hosts
-to oVirt Engine via HTTPs protocol. It supports Engine 3.3 or superior.
-This package also contains the command line tool ovirt-register to
-trigger the registration.
-
-%if 0%{?with_python3}
-%package -n python3-ovirt-register
-Summary: A python 3 module and tool for registering nodes to oVirt Engine
-Requires: dmidecode
-Requires: python3-pyOpenSSL
-Requires: python3-requests
-Requires: systemd-python3
-Requires: libselinux-python3
-
-%description -n python3-ovirt-register
-python ovirt register is a python 3 library for registering hosts
-to oVirt Engine via HTTPs protocol. It supports Engine 3.3 or superior.
-This package also contains the command line tool ovirt-register to
-trigger the registration.
-%endif
-
-%prep
-%setup -q -n %{name}-%{package_version}
-
-%build
-%if 0%{?enable_autotools}
-autoreconf -if
-%endif
-
-%if 0%{?with_python3}
-%configure
-%endif
-
-%if 0%{?with_python2}
-%configure --without-python3
-%endif
-
-make %{?_smp_mflags}
-
-%install
-make %{?_smp_mflags} install DESTDIR="%{buildroot}"
-
-%if 0%{?with_python3}
-sed -i 's!/usr/bin/python!/usr/bin/python3!' %{buildroot}%{_bindir}/ovirt-register
-%endif
-
-%if 0%{?with_python2}
-%files
-%{_bindir}/ovirt-register
-%{_mandir}/man1/ovirt-register.1.gz
-%doc AUTHORS docs/PROTOCOL README
-%license COPYING
-%dir %{python2_sitelib}/%{modname}
-%{python2_sitelib}/%{modname}/*
-%endif
-
-%if 0%{?with_python3}
-%files -n python3-ovirt-register
-%{_bindir}/ovirt-register
-%{_mandir}/man1/ovirt-register.1.gz
-%doc AUTHORS docs/PROTOCOL README
-%license COPYING
-%dir %{python3_sitelib}/%{modname}
-%{python3_sitelib}/%{modname}/*
-%endif
-
-%changelog
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Mar 03 2017 Douglas Schilling Landgraf <dougsland(a)redhat.com> - 1.0.0-15
-- x86 platform only
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hronok <mhroncok(a)redhat.com> - 1.0.0-13
-- Rebuild for Python 3.6
-
-* Tue Nov 08 2016 Douglas Schilling Landgraf <dougsland(a)redhat.com> - 1.0.0-12
-- Exclusive arch as dmidecode is not available in ppc64 and arm
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.0-11
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Sat Nov 7 2015 Toshio Kuratomi <toshio(a)fedoraproject.org> - 1.0.0-8
-- Modify the script shebang so that the python3 package won't require python2
-
-* Sat Oct 31 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-7
-- Increase Release
-
-* Sat Oct 31 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-6
-- Added ExcludeArch
-
-* Sun Jul 05 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-5
-- Replace distutils packing for autotools
-
-* Fri Jul 03 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-4
-- chmod/chown should be outside of with
-
-* Thu Jul 02 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-3
-- Improve uuid API handling
-- improve spec
-- try/except to syslog
-
-* Thu Jul 02 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-2
-- Improvements in docstring, persist_uuid and pki module
-
-* Wed Jun 24 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-1
-- Support registration for Engine 3.3 or higher
-- Split package for python2 and python3
-- Improve persist/unpersist handling
-- Improve uuid handling
-- Improve logging
-
-* Thu May 07 2015 Douglas Schilling Landgraf <dougsland(a)redhat.com> 1.0-0
-- Initial take
diff --git a/sources b/sources
deleted file mode 100644
index 544c84b..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-049ec215b1612d3b1c5d0f8f062b7050 python-ovirt-register-1.0.0_master.tar.gz
5 years, 10 months