summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkreon2015-08-29 05:04:55 +0300
committerkreon2015-08-29 05:04:55 +0300
commitb03782acb6b27472b5babb148e49dde1818f9f55 (patch)
tree5be5b97aad2c83589977fc66ad62c0ba6975db91
parenta4220005a370089e1711eaa96be40a7d53d14bc0 (diff)
downloadaur-b03782acb6b27472b5babb148e49dde1818f9f55.tar.gz
fixes of build files
-rw-r--r--PKGBUILD34
-rw-r--r--postgresql.service12
2 files changed, 19 insertions, 27 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 908d7f70d18..3e78a0a7b18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,31 +17,29 @@ source=("http://v8.1c.ru/overview/postgresql_patches/9-4-2/postgresql94-9.4.2-1.
"postgresql.conf" "postgresql.service" "postgresql.install")
md5sums=('1b673a15fed9df8ca058bb8674dfd88a'
'7a510b5bcd4a5acb394a5dbf4286bb41'
- '9baf4f9dd1a5283b1577de5c4970f728'
+ '285c8d5ad993b5ec5c1383251cccf262'
'febdfca7e698211aa1ecf529e9a3140c')
install=postgresql.install
prepare() {
-#tar xfj "postgresql-9.4.2.tar.bz2"
-#cd "postgresql-9.4.2"
-#patch -p1 < ../1c_FULL_94-0.23
-#patch -p1 < ../applock-1c-9.4.patch
-#patch -p1 < ../online_analyze-9.4.patch
-#patch -p1 < ../plantuner.patch
-#patch -p1 < ../postgresql-1c-9.4.patch
-#patch -p1 < ../postgresql-logging.patch
-#patch -p1 < ../postgresql-perl-rpath.patch
-#patch -p1 < ../postgresql-prefer-ncurses.patch
-#patch -p1 < ../rpm-pgsql.patch
-echo "ok"
+ tar xfj "postgresql-9.4.2.tar.bz2"
+ cd "postgresql-9.4.2"
+ patch -p1 < ../1c_FULL_94-0.23
+ patch -p1 < ../applock-1c-9.4.patch
+ patch -p1 < ../online_analyze-9.4.patch
+ patch -p1 < ../plantuner.patch
+ patch -p1 < ../postgresql-1c-9.4.patch
+ patch -p1 < ../postgresql-logging.patch
+ patch -p1 < ../postgresql-perl-rpath.patch
+ patch -p1 < ../postgresql-prefer-ncurses.patch
+ patch -p1 < ../rpm-pgsql.patch
}
build() {
-#cd "postgresql-9.4.2"
-#./configure --disable-rpath --prefix=/usr --libdir=/usr/lib/postgresql/ --with-openssl --with-libxml --with-libxslt --enable-nls
-#make all
-#make -C contrib all
-echo "ok"
+ cd "postgresql-9.4.2"
+ ./configure --disable-rpath --prefix=/usr --libdir=/usr/lib/postgresql/ --with-openssl --with-libxml --with-libxslt --enable-nls
+ make all
+ make -C contrib all
}
package() {
diff --git a/postgresql.service b/postgresql.service
index 76f6dd2f499..f2eaa51f4eb 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -3,7 +3,7 @@ Description=PostgreSQL-1C database server
After=network.target
[Service]
-Type=forking
+Type=simple
TimeoutSec=120
User=postgres
Group=postgres
@@ -12,14 +12,8 @@ Environment=PGROOT=/var/lib/postgres
SyslogIdentifier=postgres
PIDFile=/var/lib/postgres/postmaster.pid
-
-#ExecStartPre=/usr/bin/bin/postgresql-check-db-dir ${PGROOT}/data
-ExecStart=/usr/bin/pg_ctl -D ${PGROOT}/data start
-ExecReload=/usr/bin/pg_ctl -D ${PGROOT}/data reload
-ExecStop=/usr/bin/pg_ctl -D ${PGROOT}/data stop
-
-# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
-# killing Postgres, so adjust it downward
+ExecStart=/usr/bin/postgres -D ${PGROOT}/data
+PrivateTmp=yes
OOMScoreAdjust=-200
[Install]