From 9ddf3e5a94b0848cdf9e6ffcc586576bb614bc13 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 25 Sep 2012 00:23:17 -0700 Subject: Tue Sep 25 00:23:14 PDT 2012 --- extra/gtk2/PKGBUILD | 6 ++-- extra/libsigc++/PKGBUILD | 10 +++---- extra/mutt/1a4c43138685.patch | 12 ++++++++ extra/mutt/PKGBUILD | 11 ++++--- extra/postgresql-old-upgrade/PKGBUILD | 28 ++++++++++++------ extra/postgresql/PKGBUILD | 38 +++++++++++++++---------- extra/postgresql/postgresql-check-db-dir | 49 ++++++++++++++++++++++++++++++++ extra/postgresql/postgresql.install | 10 +++++-- extra/postgresql/postgresql.service | 26 +++++++++++++++++ extra/scim-uim/PKGBUILD | 8 +++--- extra/scim-uim/fix-gcc43-build.patch | 10 +++++++ extra/xdelta3/PKGBUILD | 41 +++++++++----------------- 12 files changed, 178 insertions(+), 71 deletions(-) create mode 100644 extra/mutt/1a4c43138685.patch create mode 100755 extra/postgresql/postgresql-check-db-dir create mode 100644 extra/postgresql/postgresql.service create mode 100644 extra/scim-uim/fix-gcc43-build.patch (limited to 'extra') diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 4a8b500a8..6ef84fdbb 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166579 2012-09-12 17:20:44Z jgc $ +# $Id: PKGBUILD 166992 2012-09-24 15:54:53Z jgc $ # Maintainer: Jan de Groot pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.12 +pkgver=2.24.13 pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808' +sha256sums=('35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD index 308b99e4f..f40723b17 100644 --- a/extra/libsigc++/PKGBUILD +++ b/extra/libsigc++/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151408 2012-02-26 10:35:06Z pierre $ +# $Id: PKGBUILD 166999 2012-09-24 17:45:03Z jgc $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=libsigc++ pkgname=('libsigc++' 'libsigc++-docs') -pkgver=2.2.10 -pkgrel=2 +pkgver=2.2.11 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') url="http://libsigc.sourceforge.net/" makedepends=('gcc-libs') options=('!libtool' '!emptydirs') -source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2") -sha256sums=('d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c') +source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.xz") +sha256sums=('9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/mutt/1a4c43138685.patch b/extra/mutt/1a4c43138685.patch new file mode 100644 index 000000000..ec1bc198a --- /dev/null +++ b/extra/mutt/1a4c43138685.patch @@ -0,0 +1,12 @@ +Index: muttlib.c +=================================================================== +--- muttlib.c (revision 6128:eff500f87889) ++++ muttlib.c (revision 6161:1a4c43138685) +@@ -1961,5 +1961,6 @@ + char *p = safe_strdup (src); + int rc = mutt_convert_string (&p, Charset, "utf-8", 0); +- strfcpy (dest, rc == 0 ? p : src, dlen); ++ /* `src' may be NULL, such as when called from the pop3 driver. */ ++ strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen); + FREE (&p); + } diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index 9b97bf170..f1da74622 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143812 2011-11-29 13:33:33Z stephane $ +# $Id: PKGBUILD 166981 2012-09-24 06:32:03Z bisson $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson pkgname=mutt pkgver=1.5.21 -pkgrel=6 +pkgrel=7 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') @@ -12,13 +12,16 @@ backup=('etc/Muttrc') arch=('i686' 'x86_64') optdepends=('smtp-forwarder: to send mail') depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') -source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') +source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz" + '1a4c43138685.patch') +sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9' + '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -i ../1a4c43138685.patch # FS#31536 ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 4221491b7..b2499c72f 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,34 +1,44 @@ -# $Id: PKGBUILD 165415 2012-08-18 15:08:12Z dan $ +# $Id: PKGBUILD 166985 2012-09-24 14:37:09Z dan $ # Maintainer: Dan McGee pkgname=postgresql-old-upgrade -pkgver=9.0.9 +pkgver=9.1.6 _majorver=${pkgver%.*} pkgrel=1 -pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade" +pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0') +makedepends=('krb5' 'python2' 'perl' 'tcl') source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) build() { cd "${srcdir}/postgresql-${pkgver}" ./configure --prefix=/opt/pgsql-${_majorver} \ - --with-libxml --with-openssl --without-perl \ - --without-python --with-pam --without-readline \ - --with-system-tzdata=/usr/share/zoneinfo --disable-nls \ + --with-krb5 \ + --with-libxml \ + --with-openssl \ + --with-perl \ + --with-python PYTHON=/usr/bin/python2 \ + --with-tcl \ + --with-pam \ + --without-readline \ + --with-system-tzdata=/usr/share/zoneinfo \ + --disable-nls \ --enable-thread-safety make -C src all + make -C contrib all } package() { cd "${srcdir}/postgresql-${pkgver}" # install - make DESTDIR="${pkgdir}" -C src install + make -C src DESTDIR="${pkgdir}" install + make -C contrib DESTDIR="${pkgdir}" install # install license install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" @@ -37,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('284303098b161240fd13df7c251822a5') -sha256sums=('87417d181a0f534fa96ba1d315a62b721f5bc22b7bb70af3f674bc1a68a5da8a') +md5sums=('000755f66c0de58bbd4cd2b89b45b8e2') +sha256sums=('6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index a00160c6b..3813f64e2 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,17 +1,32 @@ -# $Id: PKGBUILD 160730 2012-06-04 17:58:05Z dan $ +# $Id: PKGBUILD 166983 2012-09-24 14:35:11Z dan $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.1.4 +pkgver=9.2.1 _majorver=${pkgver%.*} pkgrel=1 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 - postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate) +source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate + postgresql.service postgresql-check-db-dir) +md5sums=('c0b4799ea9850eae3ead14f0a60e9418' + '1ddd1df8010549f237e7983bb326025e' + 'a54d09a20ab1672adf08f037df188d53' + '96f82c38f3f540b53f3e5144900acf17' + 'd28e443f9f65a5712c52018b84e27137' + '89b48774b0dae7c37fbb0e907c3c1db8' + '505e0e4abfc746cae9558584d471a03c') +sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461' + '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' + '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' + 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' + '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') build() { cd "${srcdir}/postgresql-${pkgver}" @@ -122,6 +137,10 @@ package_postgresql() { # install launch script install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" + install -D -m644 "${srcdir}/postgresql.service" \ + "${pkgdir}/usr/lib/systemd/system/postgresql.service" + install -D -m755 "${srcdir}/postgresql-check-db-dir" \ + "${pkgdir}/usr/bin/postgresql-check-db-dir" # install conf file install -D -m644 ${srcdir}/postgresql.confd \ @@ -133,14 +152,3 @@ package_postgresql() { install -D -m644 ${srcdir}/postgresql.logrotate \ "${pkgdir}/etc/logrotate.d/postgresql" } - -md5sums=('a8035688dba988b782725ac1aec60186' - '1ddd1df8010549f237e7983bb326025e' - 'a54d09a20ab1672adf08f037df188d53' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137') -sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712' - '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' - '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e') diff --git a/extra/postgresql/postgresql-check-db-dir b/extra/postgresql/postgresql-check-db-dir new file mode 100755 index 000000000..542c82209 --- /dev/null +++ b/extra/postgresql/postgresql-check-db-dir @@ -0,0 +1,49 @@ +#!/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 + +# PGMAJORVERSION is major version +PGMAJORVERSION=9.2 +# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades +PREVMAJORVERSION=9.1 + +# 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 $"See https://wiki.archlinux.org/index.php/PostgreSQL#Upgrading_PostgreSQL" + 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 http://www.postgresql.org/docs/9.2/static/upgrading.html" + exit 1 + fi +else + # No existing PGDATA! Warn the user to initdb it. + echo $"\"$PGDATA\" is missing or empty. Use a command like" + echo $" su - postgres -c \"initdb --locale en_US.UTF-8 -D '$PGDATA'\"" + echo $"with relevant options, to initialize the database cluster." + exit 1 +fi + +exit 0 diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index c52432271..7b73f6fa9 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -2,9 +2,13 @@ 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 } post_upgrade() { diff --git a/extra/postgresql/postgresql.service b/extra/postgresql/postgresql.service new file mode 100644 index 000000000..294b66e8f --- /dev/null +++ b/extra/postgresql/postgresql.service @@ -0,0 +1,26 @@ +[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 + +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, so adjust it downward +OOMScoreAdjust=-200 + +[Install] +WantedBy=multi-user.target diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD index 8d87455fa..0edb9b433 100644 --- a/extra/scim-uim/PKGBUILD +++ b/extra/scim-uim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149050 2012-02-05 15:34:14Z bisson $ +# $Id: PKGBUILD 166977 2012-09-24 04:57:10Z bisson $ # Contributor: damir # Maintainer: Gaetan Bisson + #endif + ++#include + #include + #include "scim_uim_imengine.h" + #include diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD index 05cabed7d..0908f9288 100644 --- a/extra/xdelta3/PKGBUILD +++ b/extra/xdelta3/PKGBUILD @@ -1,46 +1,31 @@ -# $Id: PKGBUILD 145279 2011-12-21 02:07:07Z allan $ +# $Id: PKGBUILD 167057 2012-09-25 00:09:23Z eric $ # Maintainer: Allan McRae # Contributor: Eduard "bekks" Warkentin # Contributor: Henning Garus pkgname=xdelta3 -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.4 +pkgrel=1 pkgdesc="A diff utility which works with binary files" arch=('i686' 'x86_64') url="http://xdelta.org/" license=('GPL') -makedepends=('python2') -optdepends=('python2: for python modules') -source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz - xdelta3-makefile.patch) -md5sums=('5fe038be3a266d2a7913e10d1cec6d88' - 'fa5973870faf7523043c4858ab7c3bdb') +depends=('xz') +source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('c04f7fd9da45741a0095438cfe527b89') build() { - cd $srcdir/xdelta$pkgver - - patch -Np1 -i $srcdir/xdelta3-makefile.patch - sed -i "/PYVER = /s/2.6/2.7/" Makefile - - make xdelta3 - make xdelta3module.so - - # for testsuite - make xdelta3-debug + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } check() { - cd $srcdir/xdelta$pkgver - - make test + cd "$srcdir/$pkgname-$pkgver" + ./xdelta3 test } package() { - cd $srcdir/xdelta$pkgver - - install -D xdelta3 $pkgdir/usr/bin/xdelta3 - python2 ./setup.py install --root ${pkgdir} - install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.7/site-packages + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install } - -- cgit v1.2.3-54-g00ecf