From 50e996e69c236c243576465e0172d871f0c38dc9 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 31 Jan 2014 12:49:19 +0000 Subject: [PATCH 01/14] libpurple: 2.10.8 --- libpurple/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpurple/PKGBUILD b/libpurple/PKGBUILD index bb43f77ee..4e8d0329f 100644 --- a/libpurple/PKGBUILD +++ b/libpurple/PKGBUILD @@ -2,7 +2,7 @@ _pkgbase='pidgin' pkgname='libpurple' -pkgver=2.10.7 +pkgver=2.10.8 pkgrel=1 pkgdesc="IM library extracted from Pidgin" arch=('x86_64') @@ -14,7 +14,7 @@ depends=('farstream' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' 'cyrus-sasl-plug optdepends=('dbus-python: for purple-remote and purple-url-handler') options=('!libtool') source=(http://downloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2) -md5sums=('ea88976b9952e80b702b030489f94393') +md5sums=('384be5689e62a9d4d42320e4ca90433d') build() { cd "${srcdir}/${_pkgbase}-${pkgver}" From c5cb8e0e9276bc61735eb40f7a13ea06f6e0b5f2 Mon Sep 17 00:00:00 2001 From: Bruce Liu Date: Thu, 6 Feb 2014 08:36:01 +0000 Subject: [PATCH 02/14] libbluray: update to 0.5.0 --- libbluray/PKGBUILD | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libbluray/PKGBUILD b/libbluray/PKGBUILD index 10ed37714..0eec541c1 100644 --- a/libbluray/PKGBUILD +++ b/libbluray/PKGBUILD @@ -1,20 +1,17 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# # maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa pkgname=libbluray -pkgver=0.4.0 +pkgver=0.5.0 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.videolan.org/developers/libbluray.html" license=('LGPL2.1') -depends=('libxml2') +depends=('libxml2' 'freetype2') options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('7f9a7c017c400b7d4290635860a8440110a91dcf21966fd0352ecc212b9ff579d6a5c7a8adc729904540120916c249b90f58adee023416c60c210434dff73df5') +sha512sums=('bd709a01689bbb03ac291a2544eee93b47d72e065c8ccf825f9fb568ddb339a75a18c721b3c59fd4a8214a0f9b652cbd845bccd9de08248dd4cf61616a77e1dd') build() { cd "$srcdir/$pkgname-$pkgver" From b227096aa7f407c2306928ea14d06f98e40cbca6 Mon Sep 17 00:00:00 2001 From: Bruce Liu Date: Thu, 6 Feb 2014 08:36:20 +0000 Subject: [PATCH 03/14] vlc: update to 2.1.3 --- vlc/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vlc/PKGBUILD b/vlc/PKGBUILD index 8816b1183..863911f50 100644 --- a/vlc/PKGBUILD +++ b/vlc/PKGBUILD @@ -5,7 +5,7 @@ # Contributions from ArchLinux: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/vlc pkgname=vlc -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 arch=('x86_64') url="http://www.videolan.org/vlc/" @@ -50,7 +50,7 @@ categories=('multimedia') options=('!libtool' '!emptydirs') install="vlc.install" source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz") -sha1sums=('2b0ef3a3767c56d64a2815c772c8b3f865018e70') +sha1sums=('de3e0b027bbb2dc2451992c428f2bed824128039') screenshot='http://images1.videolan.org/vlc/screenshots/0.9.2/screenshot-kde4.jpg' prepare() { From 3156015f085f3cd0ca1b6d26b13ec3b1d1d7f62f Mon Sep 17 00:00:00 2001 From: AlmAck Date: Thu, 6 Feb 2014 21:39:47 +0100 Subject: [PATCH 04/14] nss 3.15.4 --- nss/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nss/PKGBUILD b/nss/PKGBUILD index cf0a97741..a07ad8c00 100644 --- a/nss/PKGBUILD +++ b/nss/PKGBUILD @@ -2,13 +2,13 @@ # Contributor: Jan de Groot pkgname=nss -pkgver=3.15.1 +pkgver=3.15.4 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=('x86_64') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.10 +_nsprver=4.10.2 depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') makedepends=('perl') options=('!strip' '!makeflags') @@ -18,7 +18,7 @@ source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/ 'add_spi+cacert_ca_certs.patch' 'ssl-renegotiate-transitional.patch') -md5sums=('fb68f4d210ac9397dd0d3c39c4f938eb' +md5sums=('74738d89615665e3547dc2c0602ab0e6' 'c547b030c57fe1ed8b77c73bf52b3ded' '46bee81908f1e5b26d6a7a2e14c64d9f' 'effe53b5de35e2efecef9f2c0893d54f' From 7ee2d1f7e891d741c9393c27d9d0c9e43797330e Mon Sep 17 00:00:00 2001 From: AlmAck Date: Thu, 6 Feb 2014 21:40:05 +0100 Subject: [PATCH 05/14] libmwaw 0.2.0 --- libmwaw/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libmwaw/PKGBUILD b/libmwaw/PKGBUILD index 5a53d91d3..e3945cc0e 100644 --- a/libmwaw/PKGBUILD +++ b/libmwaw/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Fabian Kosmale pkgname=libmwaw -pkgver=0.1.11 +pkgver=0.2.0 pkgrel=1 pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet." -arch=('i686' 'x86_64') -depends=("libwpd") +arch=('x86_64') +depends=('libwpd') license=('LGPLv2') source=(http://downloads.sourceforge.net/libmwaw/${pkgname}-${pkgver}.tar.bz2) -md5sums=('828dd03510791fbe037081a2b4a1a8ff') +md5sums=('d794625f156a9fb1c53b3f8a8aa13b5e') build() { cd "${srcdir}/${pkgname}-${pkgver}" From 0d565ad4c0377fec9d48496916652fa0c285a851 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Thu, 6 Feb 2014 21:40:13 +0100 Subject: [PATCH 06/14] libodfgen 0.0.4 --- libodfgen/PKGBUILD | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/libodfgen/PKGBUILD b/libodfgen/PKGBUILD index 78d045f89..0423d24c3 100644 --- a/libodfgen/PKGBUILD +++ b/libodfgen/PKGBUILD @@ -1,24 +1,23 @@ # Maintainer: Fabian Kosmale <0inkane@googlemail.com> pkgname=libodfgen -pkgver=0.0.2 +pkgver=0.0.4 pkgrel=1 -pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet." -arch=('i686' 'x86_64') -url="https://www.gaia-gis.it/fossil/freexl/index" -depends=("libwpd" "libwpg") -makedepends=("boost-libs") -license=('LGPL 2.1') -source=(http://prdownloads.sourceforge.net/libwpd/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8473296c671b6e3dd8197f4145e0854b') +pkgdesc='Library for generating documents in Open Document Format' +arch=('x86_64') +url='http://sf.net/p/libwpd/libodfgen/' +license=('MPL') +depends=('libwpd' 'zlib') +makedepends=('boost' 'libwpg' 'libetonyek') +source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.bz2) +md5sums=('e5483d1f0b71e64c367c1194b54b0f53') build() { - cd "$srcdir/${pkgname}-$pkgver" - ./configure --prefix=/usr - make + cd $pkgname-$pkgver + ./configure --prefix=/usr + make } package() { - cd "$srcdir/${pkgname}-$pkgver" - make DESTDIR="$pkgdir/" install -} - + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} \ No newline at end of file From 953cec97003bfa365b15c89dadf8f03bb1922ec5 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Thu, 6 Feb 2014 20:51:47 +0000 Subject: [PATCH 07/14] libpurple: 2.10.9 --- libpurple/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpurple/PKGBUILD b/libpurple/PKGBUILD index 4e8d0329f..a7c0c2c08 100644 --- a/libpurple/PKGBUILD +++ b/libpurple/PKGBUILD @@ -2,7 +2,7 @@ _pkgbase='pidgin' pkgname='libpurple' -pkgver=2.10.8 +pkgver=2.10.9 pkgrel=1 pkgdesc="IM library extracted from Pidgin" arch=('x86_64') @@ -14,7 +14,7 @@ depends=('farstream' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' 'cyrus-sasl-plug optdepends=('dbus-python: for purple-remote and purple-url-handler') options=('!libtool') source=(http://downloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2) -md5sums=('384be5689e62a9d4d42320e4ca90433d') +md5sums=('10a4a69d077893f6dd3438cd8af94e81') build() { cd "${srcdir}/${_pkgbase}-${pkgver}" From ac03d313c7513f738837240f5e913494458e24ba Mon Sep 17 00:00:00 2001 From: Neophytos Date: Thu, 6 Feb 2014 21:11:19 +0000 Subject: [PATCH 08/14] ffmpeg-compat: 0.10.11 --- ffmpeg-compat/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg-compat/PKGBUILD b/ffmpeg-compat/PKGBUILD index 4d46a5224..3efb5da1a 100644 --- a/ffmpeg-compat/PKGBUILD +++ b/ffmpeg-compat/PKGBUILD @@ -2,7 +2,7 @@ #contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/ffmpeg-compat pkgname=ffmpeg-compat -pkgver=0.10.9 +pkgver=0.10.11 pkgrel=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('x86_64') @@ -14,7 +14,7 @@ depends=('alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' 'v4l-utils' 'x264' 'xvidcore' 'zlib') makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) -sha256sums=('1d0cc2dd539faefe47554935ea4e4f6aa779d0896b3e722d595aa5abe2304cf9') +sha256sums=('99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0') build() { cd ffmpeg-$pkgver From ca35bb492c004250bc70c83fba408d05668769e7 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Thu, 6 Feb 2014 21:35:28 +0000 Subject: [PATCH 09/14] intel-ucode: 20140122 --- intel-ucode/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/intel-ucode/PKGBUILD b/intel-ucode/PKGBUILD index 23bfea7a4..7de6c25f4 100644 --- a/intel-ucode/PKGBUILD +++ b/intel-ucode/PKGBUILD @@ -1,9 +1,9 @@ -# Contributor: abveritas@chakra-project.org -# Contributor from Arch: Thomas Bächler +# Maintainer: Neophytos Kolokotronis +# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/intel-ucode pkgname=intel-ucode -pkgver=20130906 -_code=23166 +pkgver=20140122 +_code=23574 pkgrel=1 pkgdesc="Microcode update files for Intel CPUs" arch=('any') @@ -13,7 +13,7 @@ license=('custom') source=("http://downloadmirror.intel.com/${_code}/eng/microcode-${pkgver}.tgz" LICENSE intel-microcode2ucode.c) -md5sums=('40008cd2a18a96bf04d3290e8faad812' +md5sums=('dd18cd7d039711b27a2b3348a7acc405' 'b0f489ae4b3e36dc8827dc53a76047aa' '0efc5f6c74a4d7e61ca22683c93c98cf') From a5734d26444c9e455527fc162f36f758e0620fe1 Mon Sep 17 00:00:00 2001 From: Francesco Date: Thu, 6 Feb 2014 22:29:28 +0000 Subject: [PATCH 10/14] libtxc_dxtn 1.0.1 added --- libtxc_dxtn/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 libtxc_dxtn/PKGBUILD diff --git a/libtxc_dxtn/PKGBUILD b/libtxc_dxtn/PKGBUILD new file mode 100644 index 000000000..9e4aa22e5 --- /dev/null +++ b/libtxc_dxtn/PKGBUILD @@ -0,0 +1,34 @@ +# +# Part of chakra-project.org +# +# Maintainer: Francesco Marinucci + +pkgname=libtxc_dxtn +pkgver=1.0.1 +pkgrel=3 +arch=('x86_64') +pkgdesc="Texture compression library for Mesa" +url="http://dri.freedesktop.org/wiki/S3TC" +license=(custom:BSD) +depends=(mesa) +options=(!libtool) +source=(http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('7105107f07ac49753f4b61ba9d0c79c5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # License + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" + sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ + > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} From 2dee2116d0ca9e00b5f35a2b8361aa89b87c9207 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Thu, 6 Feb 2014 23:01:39 +0000 Subject: [PATCH 11/14] cronie: rebuild to fix a /usr/bin/anacron bug --- cronie/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronie/PKGBUILD b/cronie/PKGBUILD index 31b4327f2..e60d94e0a 100644 --- a/cronie/PKGBUILD +++ b/cronie/PKGBUILD @@ -1,6 +1,6 @@ pkgname="cronie" pkgver=1.4.9 -pkgrel=4 +pkgrel=5 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') From 44b5fe92d4719c7c1faab339011a34dd0c151c4e Mon Sep 17 00:00:00 2001 From: Francesco Date: Thu, 6 Feb 2014 23:14:59 +0000 Subject: [PATCH 12/14] libtxc-dxtn 1.0.1 added --- libtxc-dxtn/PKGBUILD | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 libtxc-dxtn/PKGBUILD diff --git a/libtxc-dxtn/PKGBUILD b/libtxc-dxtn/PKGBUILD new file mode 100644 index 000000000..483dab49f --- /dev/null +++ b/libtxc-dxtn/PKGBUILD @@ -0,0 +1,35 @@ +# +# Part of chakra-project.org +# +# Maintainer: Francesco Marinucci + +pkgname=libtxc-dxtn +_pkgname=libtxc_dxtn +pkgver=1.0.1 +pkgrel=3 +arch=('x86_64') +pkgdesc="Texture compression library for Mesa" +url="http://dri.freedesktop.org/wiki/S3TC" +license=(custom:BSD) +depends=(mesa) +options=(!libtool) +source=(http://people.freedesktop.org/~cbrill/$_pkgname/$_pkgname-$pkgver.tar.bz2) +md5sums=('7105107f07ac49753f4b61ba9d0c79c5') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # License + mkdir -p "$pkgdir/usr/share/licenses/$_pkgname" + sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ + > "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" +} From 850517922970d1cfb0cbc56aa9c9f62d1604feff Mon Sep 17 00:00:00 2001 From: AlmAck Date: Mon, 10 Feb 2014 23:32:15 +0100 Subject: [PATCH 13/14] pcre group update (left php on this list) --- apache/PKGBUILD | 49 +++++++++++----------------------------- apache2-mpm-itk/PKGBUILD | 34 ++++++++++++++++++++++++++++ cups-filters/PKGBUILD | 4 ++-- nginx/PKGBUILD | 4 ++-- postfix/PKGBUILD | 4 ++-- qpdf/PKGBUILD | 13 +++++++---- r/PKGBUILD | 6 ++--- sord/PKGBUILD | 2 +- 8 files changed, 65 insertions(+), 51 deletions(-) create mode 100644 apache2-mpm-itk/PKGBUILD diff --git a/apache/PKGBUILD b/apache/PKGBUILD index fefd13745..fc057f960 100644 --- a/apache/PKGBUILD +++ b/apache/PKGBUILD @@ -1,12 +1,11 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer : abveritas[at]chakra-project[dog]org> # maintainer : Manuel Tortosa pkgname=apache -pkgver=2.4.4 -pkgrel=2 +pkgver=2.4.7 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('x86_64') options=('!libtool') @@ -22,28 +21,23 @@ optdepends=('lynx: apachectl status') install=${pkgname}.install source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2" "http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc" - "http://mpm-itk.sesse.net/apache2.4-mpm-itk-2.4.2-01.patch" 'apache.conf.d' 'httpd.logrotate' 'chakra.layout' 'httpd.service' 'httpd-tmpfile.conf') -md5sums=('0e712ee2119cd798c8ae39d5f11a9206' - '0e652e521f4f4f0f206e72a7b3c92dad' - '7b5fb06ba65d80d40f19e32f95426486' +md5sums=('170d7fb6fe5f28b87d1878020a9ab94e' + 'SKIP' '08b3c875f6260644f2f52b4056d656b0' '6382331e9700ed9e8cc78ea51887b537' '9404bc261cffce7ad88850f0569e9067' '4af19522704050f98ba13e40d3eaca0b' '110a056408252de4356be7f53872b11d') + build() { cd "${srcdir}/httpd-${pkgver}" - # apply the monolithic ITK patch - # see http://mpm-itk.sesse.net/ - patch -p1 -i "${srcdir}/apache2.4-mpm-itk-2.4.2-01.patch" - # set default user sed -e 's#User daemon#User http#' \ -e 's#Group daemon#Group http#' \ @@ -51,16 +45,8 @@ build() { cat "${srcdir}/chakra.layout" >> config.layout - for mpm in prefork worker itk; do - if [ "${mpm}" = 'itk' ]; then - mkdir -p server/mpm/experimental/itk - cp -r server/mpm/prefork/* server/mpm/experimental/itk/ - mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c - autoconf - fi - - mkdir -p "build-${mpm}" - pushd "build-${mpm}" + mkdir -p "build" + pushd "build" "${srcdir}/httpd-${pkgver}/configure" \ --enable-layout=Chakra \ @@ -82,30 +68,21 @@ build() { --enable-dbd \ --with-apr=/usr/bin/apr-1-config \ --with-apr-util=/usr/bin/apu-1-config \ - --with-pcre=/usr \ - --with-mpm="${mpm}" + --with-pcre=/usr + #--with-mpm="${mpm}" make popd >/dev/null - done } package() { cd "${srcdir}/httpd-${pkgver}" - for mpm in prefork worker itk; do - pushd "build-${mpm}" >/dev/null - - if [ "${mpm}" = 'prefork' ]; then - make DESTDIR="${pkgdir}" install - else - install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}" - fi - - popd >/dev/null - done - + cd build + make DESTDIR="${pkgdir}" install + cd .. + install -D -m644 "${srcdir}/httpd.logrotate" \ "${pkgdir}/etc/logrotate.d/httpd" diff --git a/apache2-mpm-itk/PKGBUILD b/apache2-mpm-itk/PKGBUILD new file mode 100644 index 000000000..052bf4b4b --- /dev/null +++ b/apache2-mpm-itk/PKGBUILD @@ -0,0 +1,34 @@ +# +# Platform Packages for Chakra, part of chakra-project.org +# +# Maintainer: AlmAck + +pkgname=apache2-mpm-itk +_pkgname=mpm-itk +pkgver=2.4.7 +_pkgver=${pkgver}-01 +pkgrel=1 +pkgdesc="Utility library to help manage common tasks with OpenAL applications." +arch=('x86_64') +url="http://kcat.strangesoft.net/alure.html" +license=('') +depends=('apache') +makedepends=() +optdepends=() +source=(http://mpm-itk.sesse.net/mpm-itk-${_pkgver}.tar.gz) +md5sums=('3d7a14aef93bb5c1eb1c01081585c4bc') + +build() { + cd $srcdir/$_pkgname-$_pkgver + + ./configure --with-apxs=/usr/bin/apxs + make +} + +package() { + cd $srcdir/$_pkgname-$_pkgver + #make DESTDIR=$pkgdir install --> DESTDIR not implemented + + install -D -m644 ".libs/mpm_itk.so" \ + "${pkgdir}/usr/lib/httpd/modules/mpm_itk.so" +} diff --git a/cups-filters/PKGBUILD b/cups-filters/PKGBUILD index 80463fea3..0032bd47d 100644 --- a/cups-filters/PKGBUILD +++ b/cups-filters/PKGBUILD @@ -2,12 +2,12 @@ pkgname=cups-filters pkgver=1.0.37 -pkgrel=1 +pkgrel=2 pkgdesc="OpenPrinting CUPS Filters" arch=('x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler' 'qpdf>=4.0.0') +depends=('lcms2' 'poppler' 'qpdf') makedepends=('ghostscript' 'ttf-dejavu') optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' diff --git a/nginx/PKGBUILD b/nginx/PKGBUILD index f2eef4dda..822bd052e 100644 --- a/nginx/PKGBUILD +++ b/nginx/PKGBUILD @@ -10,7 +10,7 @@ _user=http _group=http pkgname=nginx -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="small, but very powerful and efficient web server and mail proxy" arch=('x86_64') @@ -31,7 +31,7 @@ backup=("etc/nginx/conf/fastcgi.conf" "etc/conf.d/nginx") source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'nginx.service') -md5sums=('4740dad2f0ed7f5fa16e8caaa8a9438e' +md5sums=('5dfaba1cbeae9087f3949860a02caa9f' '62d494d23aef31d0b867161f9fffa6eb') build() { diff --git a/postfix/PKGBUILD b/postfix/PKGBUILD index 60177b5dc..ba819eef5 100644 --- a/postfix/PKGBUILD +++ b/postfix/PKGBUILD @@ -4,7 +4,7 @@ # maintainer abveritas[at]chakra-project[dot]org> pkgname=postfix -pkgver=2.10.0 +pkgver=2.11.0 pkgrel=1 pkgdesc='Secure, fast, easy to administer alternative to Sendmail' url='http://www.postfix.org/' @@ -19,7 +19,7 @@ install=$pkgname.install source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" 'aliases.patch' 'postfix.service') -md5sums=('b2a563b2d5c53462952886e6fc4e4b7b' +md5sums=('25fe7dd05f81cc0755131beecee046fd' '9cc2ee3c72e134c2da5a895abaa56f30' '24af169de13c34dac03d787c3e607ec5') diff --git a/qpdf/PKGBUILD b/qpdf/PKGBUILD index 692cb914a..a40dcefb4 100644 --- a/qpdf/PKGBUILD +++ b/qpdf/PKGBUILD @@ -5,7 +5,7 @@ # contributor: Nuno Araujo pkgname=qpdf -pkgver=4.0.1 +pkgver=5.1.1 pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('x86_64') @@ -13,20 +13,23 @@ url="http://qpdf.sourceforge.net/" license=('custom:Artistic-2.0') depends=('pcre' 'perl') makedepends=('make') -options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('093baece867a0a7e07774bd4008156b3') +md5sums=('378bfd1c2ee15d7815f2f4b1a50fa6e0') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make } +check() { + cd $pkgname-$pkgver + make check # passes all +} package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install diff --git a/r/PKGBUILD b/r/PKGBUILD index 7f56ea16c..8034e5823 100644 --- a/r/PKGBUILD +++ b/r/PKGBUILD @@ -4,8 +4,8 @@ # maintainer: Manuel Tortosa pkgname=r -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('x86_64') license=('GPL') @@ -20,7 +20,7 @@ source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz" 'r.desktop' 'r.png' 'R.conf') -sha1sums=('5cc65476837926fdf04105954ea94efa53ac85ce' +sha1sums=('f5d9daef00e09d36a465ff7b0bf4cab136bea227' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978' '43668da6cfd1b4455a99f23e79e2059294dddac9') diff --git a/sord/PKGBUILD b/sord/PKGBUILD index c8bec4c4e..0309d12e9 100644 --- a/sord/PKGBUILD +++ b/sord/PKGBUILD @@ -1,6 +1,6 @@ pkgname=sord pkgver=0.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight C library for storing RDF data in memory." arch=('x86_64') url="http://drobilla.net/software/$pkgname/" From e234d6cdaf295a531df5b1cc5ad48f193b45b7a0 Mon Sep 17 00:00:00 2001 From: totte Date: Tue, 11 Feb 2014 14:26:21 +0000 Subject: [PATCH 14/14] postgresql: Fix systemd issue --- postgresql/PKGBUILD | 108 ++++++++++++++++------------------ postgresql/postgresql-initdb | 33 ----------- postgresql/postgresql.install | 30 ++++++---- postgresql/postgresql.service | 18 ++++-- 4 files changed, 81 insertions(+), 108 deletions(-) delete mode 100644 postgresql/postgresql-initdb diff --git a/postgresql/PKGBUILD b/postgresql/PKGBUILD index 96c08ee39..4db1a365a 100644 --- a/postgresql/PKGBUILD +++ b/postgresql/PKGBUILD @@ -8,53 +8,50 @@ pkgname=('postgresql-libs' 'postgresql') pkgver=9.3.2 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://www.postgresql.org/' license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' - 'python3' + 'openssl>=1.0.0' 'perl' - 'tcl>=8.6.0' - 'openssl>=1.0.0') + 'python3' + 'tcl>=8.6.0') source=("ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2" - 'postgresql.confd' - 'postgresql.pam' - 'postgresql.logrotate' - 'postgresql.service' - 'postgresql-run-socket.patch' - 'postgresql.tmpfiles.conf' 'postgresql-check-db-dir' - 'postgresql-initdb') + 'postgresql-run-socket.patch' + 'postgresql.confd' + 'postgresql.logrotate' + 'postgresql.pam' + 'postgresql.service' + 'postgresql.tmpfiles.conf') sha512sums=('53f6b2b491d1bff4cddd22387f882be3f96affb656a08a93fc757d117d922d0fe211dba6db0d718ed4eca88ed988eaec8ef3aac079b69da9782b42d658c9396f' - 'a60faeca09e6a4e8b2ada06b16768a8f4db39710af4c47aab82842a085b80d6be4252c8d030de90e3d8f2b2a0c8317bcb1b891316358079d807501544745a4cf' - '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67' - '9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8' - '6c0f9e817306b7f3882e8483c94305cf6de707b3d30469f71314d5668a316ab0f54e33f8b93f2517ef01a0b58d6f54f3cb4f02bac9c12b36e2a57423b7cff742' - '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7' - '583f4add381b6d076237f9b1f3a8d095340621d6ba75222dbabb8af71a96efa5b1a69b75cc3c60f27c258c5be6e3de94fe258dc9d523e306f1e8cb60885e7242' '464073b8745dafa2ab222cb827068cb33bee3d597e43097e619396d4ed40218af9366cf61e1d8a4cfe0f8079d5df10126a34acc2deced8778c2ba80617b40c97' - 'dc507e4ceb928967186003e43a9dc005f3a48dcd21e54a949fa4aa149f2e410119275d50486dae818b13c572768c6995f28ef8cb0708c9997ce2ddb6de8b336d') + '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7' + 'a60faeca09e6a4e8b2ada06b16768a8f4db39710af4c47aab82842a085b80d6be4252c8d030de90e3d8f2b2a0c8317bcb1b891316358079d807501544745a4cf' + '9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8' + '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67' + 'c59846579b91e3b04776a83e7f59acb482db2abecf31b33a451dd07df2afa426e69c5188ab19d09b7ad87df81fec1778f6f4b35a8073dbe8055b4e0a1af5020a' + '583f4add381b6d076237f9b1f3a8d095340621d6ba75222dbabb8af71a96efa5b1a69b75cc3c60f27c258c5be6e3de94fe258dc9d523e306f1e8cb60885e7242') build() { cd "${srcdir}/postgresql-${pkgver}" - patch -Np1 < ../postgresql-run-socket.patch - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --datadir=/usr/share/postgresql \ - --with-krb5 \ - --with-libxml \ - --with-openssl \ - --with-perl \ - --with-python PYTHON=/usr/bin/python3 \ - --with-tcl \ - --with-pam \ - --with-system-tzdata=/usr/share/zoneinfo \ - --enable-nls \ - --enable-thread-safety + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --datadir=/usr/share/postgresql \ + --with-krb5 \ + --with-libxml \ + --with-openssl \ + --with-perl \ + --with-python PYTHON=/usr/bin/python3 \ + --with-tcl \ + --with-pam \ + --with-system-tzdata=/usr/share/zoneinfo \ + --enable-nls \ + --enable-thread-safety make world } @@ -69,18 +66,18 @@ package_postgresql-libs() { cd "${srcdir}/postgresql-${pkgver}" # Install license - install -Dm0644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" - # Install libs + # Install libraries for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do make -C ${dir} DESTDIR="${pkgdir}" install done - install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" - install -D -m644 doc/src/sgml/man1/pg_dump.1 "${pkgdir}/usr/share/man/man1/pg_dump.1" - install -D -m644 doc/src/sgml/man1/pg_dumpall.1 "${pkgdir}/usr/share/man/man1/pg_dumpall.1" - install -D -m644 doc/src/sgml/man1/pg_restore.1 "${pkgdir}/usr/share/man/man1/pg_restore.1" - install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" + install -Dm644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" + install -Dm644 doc/src/sgml/man1/pg_dump.1 "${pkgdir}/usr/share/man/man1/pg_dump.1" + install -Dm644 doc/src/sgml/man1/pg_dumpall.1 "${pkgdir}/usr/share/man/man1/pg_dumpall.1" + install -Dm644 doc/src/sgml/man1/pg_restore.1 "${pkgdir}/usr/share/man/man1/pg_restore.1" + install -Dm644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" cd src/include @@ -108,7 +105,7 @@ package_postgresql-docs() { cd "${srcdir}/postgresql-${pkgver}" # Install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE" make -C doc/src/sgml DESTDIR="${pkgdir}" install-html chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/" @@ -120,14 +117,13 @@ package_postgresql-docs() { package_postgresql() { pkgdesc="A sophisticated object-relational DBMS" - backup=('etc/conf.d/postgresql' - 'etc/pam.d/postgresql' + backup=('etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' - 'readline>=6.0' - 'openssl>=1.0.0') + 'openssl>=1.0.0' + 'readline>=6.0') optdepends=('python3: for PL/Python support' 'perl: for PL/Perl support' 'tcl: for PL/Tcl support' @@ -154,7 +150,7 @@ package_postgresql() { rm "${pkgdir}/usr/share/man/man1/psql.1" # Install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" # Remove unneeded installed items rm -rf "${pkgdir}/usr/include/postgresql/internal" @@ -163,26 +159,24 @@ package_postgresql() { rmdir "${pkgdir}/usr/share/doc/postgresql/html" # Install conf file - install -D -m644 "${srcdir}/postgresql.confd" \ - "${pkgdir}/etc/conf.d/postgresql" + #install -Dm644 "${srcdir}/postgresql.confd" \ + # "${pkgdir}/etc/conf.d/postgresql" + install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \ + "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf" # Install pam file - install -D -m644 "${srcdir}/postgresql.pam" \ + install -Dm644 "${srcdir}/postgresql.pam" \ "${pkgdir}/etc/pam.d/postgresql" # Install logrotate file - install -D -m644 "${srcdir}/postgresql.logrotate" \ + install -Dm644 "${srcdir}/postgresql.logrotate" \ "${pkgdir}/etc/logrotate.d/postgresql" # Install systemd unit - install -D -m644 "${srcdir}/postgresql.service" \ + install -Dm644 "${srcdir}/postgresql.service" \ "${pkgdir}/usr/lib/systemd/system/postgresql.service" - install -D -m755 "$srcdir/postgresql-initdb" \ - "$pkgdir/usr/lib/systemd/scripts/postgresql-initdb" # ? - #install -D -m755 "${srcdir}/postgresql-check-db-dir" \ - # "${pkgdir}/usr/bin/postgresql-check-db-dir" - #install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \ - # "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf" + install -Dm755 "${srcdir}/postgresql-check-db-dir" \ + "${pkgdir}/usr/bin/postgresql-check-db-dir" } diff --git a/postgresql/postgresql-initdb b/postgresql/postgresql-initdb deleted file mode 100644 index a691a83ff..000000000 --- a/postgresql/postgresql-initdb +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -. /etc/conf.d/postgresql - -# 2nd clause is necessary to prevent symlinking the directory to itself when it -# doesn't exist yet -if [ ! /var/lib/postgres -ef "$PGROOT" ] && [ /var/lib/postgres != "$PGROOT" ]; then - echo "Creating symlink /var/lib/postgres -> $PGROOT" - - # Remove /var/lib/postgres if empty dir, but not if symlink - if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then - rmdir /var/lib/postgres - fi - - ln -sf "$PGROOT" /var/lib/postgres -fi - -PGDATA="$PGROOT/data" - -if [ ! -d "$PGDATA" ]; then - echo "Initializing database in $PGDATA" - - mkdir -p "$PGDATA" - chown -R postgres:postgres "$PGDATA" - - su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null - - if [ -f /etc/postgresql/postgresql.conf ]; then - ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf" - fi -fi diff --git a/postgresql/postgresql.install b/postgresql/postgresql.install index f4f91a509..699efe692 100644 --- a/postgresql/postgresql.install +++ b/postgresql/postgresql.install @@ -2,32 +2,38 @@ post_install() { if [ ! -d '/var/lib/postgres' ]; then mkdir -p '/var/lib/postgres' fi - - getent group postgres >/dev/null || groupadd -g 88 postgres - getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres - passwd -l postgres >/dev/null + if ! getent group postgres >/dev/null; then + groupadd -g 88 postgres + fi + if ! getent passwd postgres >/dev/null; then + useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres + passwd -l postgres >/dev/null + fi + systemd-tmpfiles --create postgresql.conf + if [ ! -d '/var/lib/postgres/data' ]; then + mkdir -p '/var/lib/postgres/data' + chown postgres:postgres '/var/lib/postgres/data' + fi } post_upgrade() { post_install $1 # FS#23858, fix postgres user shell issue - postgres_shell="$(getent passwd postgres | cut -d: -f7)" - if [ "${postgres_shell}" = "/sbin/nologin" ]; then + postgres_shell=$(getent passwd postgres | cut -d: -f7) + if [ "$postgres_shell" = "/sbin/nologin" ]; then chsh -s /bin/bash postgres fi - echo ">>> Please edit the file /etc/conf.d/postgresql" - echo ">>> and remove the trailing hash sign in front of" - echo '>>> PGROOT="/var/lib/postgres"' + if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then + echo "Note: The Unix domain socket location has changed; be sure to" + echo " restart any local applications using libpq.so." + fi } post_remove() { if getent passwd postgres >/dev/null; then userdel postgres fi - if getent group postgres >/dev/null; then groupdel postgres fi } - -# vim:set ts=2 sw=2 et: diff --git a/postgresql/postgresql.service b/postgresql/postgresql.service index 2fcd3e93d..294b66e8f 100644 --- a/postgresql/postgresql.service +++ b/postgresql/postgresql.service @@ -1,19 +1,25 @@ [Unit] Description=PostgreSQL database server +After=network.target [Service] Type=forking +TimeoutSec=120 +User=postgres +Group=postgres + +Environment=PGROOT=/var/lib/postgres + SyslogIdentifier=postgres PIDFile=/var/lib/postgres/data/postmaster.pid -# initdb script takes care for symlinking $PGROOT to /var/lib/postgres -ExecStartPre=/usr/lib/systemd/scripts/postgresql-initdb -ExecStart= /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data start" -ExecReload=/bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data reload" -ExecStop= /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data stop -m fast" +ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGROOT}/data +ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 +ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload +ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast # Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in -# killing Postgres +# killing Postgres, so adjust it downward OOMScoreAdjust=-200 [Install]