diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/ardour/PKGBUILD | 46 | ||||
| -rw-r--r-- | extra/jack/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/nspr/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/postgresql-old-upgrade/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/postgresql/PKGBUILD | 95 | ||||
| -rwxr-xr-x | extra/postgresql/postgresql | 66 | ||||
| -rw-r--r-- | extra/postgresql/postgresql.confd | 16 | ||||
| -rw-r--r-- | extra/postgresql/postgresql.install | 10 | ||||
| -rw-r--r-- | extra/rsync/PKGBUILD | 11 |
9 files changed, 133 insertions, 150 deletions
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 0add64a1f..3f0574d4e 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135177 2011-08-10 20:28:08Z schiv $ +# $Id: PKGBUILD 138815 2011-09-28 12:33:40Z schiv $ # Maintainer: tobias <tobias@archlinux.org> # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -8,65 +8,45 @@ # for fixed dependencies speaking in terms of versions pkgname=ardour -pkgver=2.8.11 -pkgrel=6 +pkgver=2.8.12 +pkgrel=1 pkgdesc="A multichannel hard disk recorder and digital audio workstation" arch=('i686' 'x86_64') url="http://ardour.org/" license=('GPL') -depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat' - 'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6') - # -rubberband -libgnomecanvas(+libgnomecanvasmm) +depends=('liblrdf>=0.4.0-8' 'liblo' 'libusb-compat' + 'libgnomecanvas' 'aubio' 'slv2>=0.6.6-6') + # -libgnomecanvas(+libgnomecanvasmm) # +soundtouch (these +/- changes are for SYSLIBS) # liblrdf versioned for https://bugs.archlinux.org/task/25005 # slv2 versioned for https://bugs.archlinux.org/task/25060 -makedepends=('scons' 'boost' 'pkg-config' 'cwiid') +makedepends=('scons' 'boost' 'cwiid') optdepends=('cwiid: Wiimote support') changelog=${pkgname}.changelog source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 - ${pkgname}.desktop - gcc46.patch - raptor2.patch) -md5sums=('f451a8d0abc133a1700c3932e07a5612' - '8aeaf433ebf781733db48e5a16b0c4da' - 'd709add59911d099c813162448e4db99' - 'a26a9bec0968fa0630c70f70c54f67de') + ${pkgname}.desktop) +md5sums=('7c031892f53aeacf08a750fc320c79c5' + '8aeaf433ebf781733db48e5a16b0c4da') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # gcc 4.6 compatibility - # http://tracker.ardour.org/view.php?id=3771 - patch -Np1 -i "$srcdir/gcc46.patch" - - # raptor2 compatibility - # https://bugs.archlinux.org/task/25060 - # http://tracker.ardour.org/view.php?id=4179 - patch -Np0 -i "$srcdir/raptor2.patch" - sed -i '/-O3/d' SConstruct - # use syslibs until internal sigc++ issue w/ latest gcc (?) resolves - # TODO: report upstream - scons ${MAKEFLAGS} ARCH="${CFLAGS}" \ + scons ${MAKEFLAGS} ARCH="${CFLAGS} -O3" \ PREFIX="/usr" \ DIST_LIBDIR="lib" \ FREEDESKTOP=0 \ FREESOUND=1 \ WIIMOTE=1 \ - SYSLIBS=1 \ + SYSLIBS=0 \ DESTDIR="${pkgdir}" } package() { cd "${srcdir}/${pkgname}-${pkgver}" - scons PREFIX="/usr" \ - FREEDESKTOP=0 \ - FREESOUND=1 \ - WIIMOTE=1 \ - SYSLIBS=1 \ - DESTDIR="${pkgdir}" install + scons DESTDIR="${pkgdir}" install # install some freedesktop.org compatibility install -Dm644 "${srcdir}/${pkgname}.desktop" \ diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD index 3e335f779..77cad996c 100644 --- a/extra/jack/PKGBUILD +++ b/extra/jack/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 133558 2011-07-29 12:20:37Z schiv $ +# $Id: PKGBUILD 138822 2011-09-28 16:36:05Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=jack _longname=jack-audio-connection-kit -pkgver=0.121.2 -pkgrel=2 +pkgver=0.121.3 +pkgrel=1 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') depends=('libsamplerate' 'readline') -makedepends=('doxygen' 'libffado' 'celt-0.7') +makedepends=('doxygen' 'libffado' 'celt') optdepends=('libffado: FireWire support' - 'celt-0.7: NetJACK driver') + 'celt: NetJACK driver') url="http://jackaudio.org/" options=('!libtool') provides=("$_longname=$pkgver") +conflicts=("$_longname") replaces=("$_longname") changelog=$pkgname.changelog source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz") -md5sums=('06c080349455afd4d217d6a8f9393e01') +md5sums=('35f470f7422c37b33eb965033f7a42e8') build() { cd "$srcdir/$_longname-$pkgver" diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 808c0885b..f025b013f 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136177 2011-08-23 18:46:06Z ibiru $ +# $Id: PKGBUILD 138817 2011-09-28 12:59:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr pkgver=4.8.9 -pkgrel=1 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) url="http://www.mozilla.org/projects/nspr/" @@ -23,8 +23,10 @@ build() { else confflags="" fi - unset CFLAGS - unset CXXFLAGS + + sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + -i mozilla/nsprpub/config/rules.mk + ./mozilla/nsprpub/configure \ --prefix=/usr \ --libdir=/usr/lib \ diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index aeceaaaa6..68e03e16d 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 128097 2011-06-21 19:32:41Z dan $ +# $Id: PKGBUILD 139088 2011-09-28 20:46:54Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=8.4.8 +pkgver=9.0.5 _majorver=${pkgver%.*} pkgrel=1 pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade" @@ -10,15 +10,11 @@ arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 - build.patch) +source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) build() { cd "${srcdir}/postgresql-${pkgver}" - # patch to remove regress/test make target (won't build with it present) - patch -Np1 -i ../build.patch - ./configure --prefix=/opt/pgsql-${_majorver} \ --with-libxml --with-openssl --without-perl \ --without-python --with-pam --without-readline \ @@ -41,7 +37,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('4603e8ea30cee97189b62b39022f2043' - '4d74f4227dc5e12bf95b3490758d86c9') -sha256sums=('3e90ef2a86a9f4831e21ff4a574fbfb8e1b8c097af637c93ec43c64c684a0938' - '1f020ae1d921a6f47e4889c2026c5ef69879d204e14aeac9330f89b7e6088348') +md5sums=('86816eb8a8513532957b96045abdfef9') +sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index d5a887585..c5809af93 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,64 +1,49 @@ -# $Id: PKGBUILD 125329 2011-05-25 22:33:15Z dan $ +# $Id: PKGBUILD 139090 2011-09-28 20:46:57Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.0.4 -pkgrel=4 +pkgver=9.1.1 +_majorver=${pkgver%.*} +pkgrel=2 arch=('i686' 'x86_64') -url="http://www.postgresql.org" +url="http://www.postgresql.org/" license=('custom:PostgreSQL') -makedepends=('libxml2' 'python2' 'perl') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \ - postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate - perl-5.14-fix.patch) -install=postgresql.install +makedepends=('libxml2' 'python2' 'perl' 'openssl>=1.0.0') +source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql postgresql.confd postgresql.pam postgresql.logrotate) build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/postgresql-${pkgver}" - # patch to remove regress/test make target (won't build with it present) - patch -Np1 -i ../build.patch - # fix for perl 5.14 - patch -Np1 -i ../perl-5.14-fix.patch - - # configure - ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \ - --with-openssl --with-perl \ + ./configure --prefix=/usr --mandir=/usr/share/man \ + --datadir=/usr/share/postgresql \ + --with-libxml --with-openssl --with-perl \ --with-python PYTHON=/usr/bin/python2 --with-pam \ --with-system-tzdata=/usr/share/zoneinfo --enable-nls \ - --datadir=/usr/share/postgresql --enable-thread-safety - - sed -i -e '/interfaces/d' src/Makefile + --enable-thread-safety - # build make world - - # build libs - for dir in src/interfaces src/bin/pg_config; do - pushd ${dir} - make - popd - done } package_postgresql-libs() { pkgdesc="Libraries for use with PostgreSQL" - depends=('openssl>=1.0.0') + depends=('openssl>=1.0.0' 'readline>=6.0') + provides=('postgresql-client') + conflicts=('postgresql-client') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/postgresql-${pkgver}" # install license install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" # install libs - for dir in src/interfaces src/bin/pg_config; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd + for dir in src/interfaces src/bin/pg_config src/bin/psql; 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/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" cd src/include @@ -82,33 +67,41 @@ package_postgresql-docs() { pkgdesc="HTML documentation for PostgreSQL" options=(docs) - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/postgresql-${pkgver}" # install license install -D -m644 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/" + + # clean up + rmdir "${pkgdir}"/usr/share/man/man{1,3,7} + rmdir "${pkgdir}"/usr/share/man } package_postgresql() { pkgdesc="A sophisticated object-relational DBMS" backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') - depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0') + depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') optdepends=('python2: for PL/Python support' - 'perl: for PL/Perl support') - provides=('postgresql-client') - conflicts=('postgresql-client') + 'perl: for PL/Perl support' + 'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade') + install=postgresql.install - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/postgresql-${pkgver}" # install make DESTDIR="${pkgdir}" install make -C contrib DESTDIR="${pkgdir}" install make -C doc/src/sgml DESTDIR="${pkgdir}" install-man - # we don't want this, it is in the -libs package - make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall + + # we don't want these, they are in the -libs package + for dir in src/interfaces src/bin/pg_config src/bin/psql; do + make -C ${dir} DESTDIR="${pkgdir}" uninstall + done rm "${pkgdir}/usr/share/man/man1/pg_config.1" + rm "${pkgdir}/usr/share/man/man1/psql.1" # install license install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" @@ -117,6 +110,7 @@ package_postgresql() { rm -rf "${pkgdir}/usr/include/postgresql/internal" rm -rf "${pkgdir}/usr/include/libpq" find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} + + rmdir "${pkgdir}/usr/share/doc/postgresql/html" # install launch script install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql" @@ -132,10 +126,13 @@ package_postgresql() { "${pkgdir}/etc/logrotate.d/postgresql" } -md5sums=('80390514d568a7af5ab61db1cda27e29' - 'eacf91f987d230f2dc2d040618ea1817' - 'd63a05943cf0a2726aa2070f3033c569' - '4d74f4227dc5e12bf95b3490758d86c9' +md5sums=('061a9f17323117c9358ed60f33ecff78' + '4a6e9b63f2aa50195735f2b46aba040b' + '2bef962971bac882022c41a72efabb96' '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137' - '6606e4279d91fc617b5c4dae0d76c603') + 'd28e443f9f65a5712c52018b84e27137') +sha256sums=('c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2' + 'b2931d7a719e765f14811b9109310b2418d3064bfcedef699573fc25854a2201' + '92fe999c34824a9b8fe4b7212d58f60247e3d0514dd38807758eac64c4198190' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e') diff --git a/extra/postgresql/postgresql b/extra/postgresql/postgresql index 0fbe94036..2ff845f73 100755 --- a/extra/postgresql/postgresql +++ b/extra/postgresql/postgresql @@ -6,67 +6,67 @@ # Default PGROOT if it wasn't defined in the conf.d file PGROOT=${PGROOT:-/var/lib/postgres} -PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w" +PGLOG=${PGLOG:-/var/log/postgresql.log} +PGCTL_BIN=/usr/bin/pg_ctl +PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w) +[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS") postgres_init() { # initialization - if [ ! -d $PGROOT/data ]; then - mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT - su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data" + if [[ ! -d "$PGROOT/data" ]]; then + mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT" + su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'" fi - if [ ! -e /var/log/postgresql.log ]; then - touch /var/log/postgresql.log - chown postgres /var/log/postgresql.log + if [[ ! -e "$PGLOG" ]]; then + touch "$PGLOG" + chown postgres "$PGLOG" fi } -case "$1" in +do_postgres() { + su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}") $@" +} + +case $1 in start) postgres_init stat_busy "Starting PostgreSQL" - su - postgres -c \ - "$PG_CTL start" - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else + if do_postgres start; then add_daemon postgresql stat_done + else + stat_fail + exit 1 fi ;; stop) stat_busy "Stopping PostgreSQL" - su - postgres -c \ - "$PG_CTL stop -m fast" - if [ $? -gt 0 ]; then - stat_fail - else + if do_postgres stop -m fast; then rm_daemon postgresql stat_done + else + stat_fail + exit 1 fi ;; reload) stat_busy "Reloading PostgreSQL" - su - postgres -c \ - "$PG_CTL reload" - if [ $? -gt 0 ]; then + if do_postgres reload; then + stat_done + else stat_fail exit 1 - else - stat_done fi ;; restart) - postgres_init + postgres_init stat_busy "Restarting PostgreSQL" - su - postgres -c \ - "$PG_CTL restart -m fast" - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else + if do_postgres restart -m fast; then add_daemon postgresql stat_done + else + stat_fail + exit 1 fi ;; status) @@ -74,6 +74,6 @@ case "$1" in ck_status postgresql ;; *) - echo "usage: $0 {start|stop|reload|restart|status}" + echo "usage: $0 {start|stop|reload|restart|status}" + exit 1 esac -exit 0 diff --git a/extra/postgresql/postgresql.confd b/extra/postgresql/postgresql.confd index 5f8fa034c..2d68f2772 100644 --- a/extra/postgresql/postgresql.confd +++ b/extra/postgresql/postgresql.confd @@ -1,5 +1,11 @@ -# -# Parameters to be passed to postgresql -# -PGROOT="/var/lib/postgres" -INITOPTS="--locale $LANG" +## +## Parameters to be passed to postgresql +## +## Default data directory location +#PGROOT="/var/lib/postgres" +## Passed to initdb if necessary +#INITOPTS="--locale $LANG" +## Default log file location +#PGLOG="/var/log/postgresql.log" +## Additional options to pass via pg_ctl's '-o' option +#PGOPTS="" diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index d65bb6a7f..c52432271 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -12,11 +12,15 @@ post_upgrade() { # FS#23858, fix postgres user shell issue postgres_shell=$(getent passwd postgres | cut -d: -f7) if [ "$postgres_shell" = "/sbin/nologin" ]; then - chsh -s /bin/bash postgres + chsh -s /bin/bash postgres fi } post_remove() { - getent passwd postgres >/dev/null && userdel postgres - getent group postgres >/dev/null && groupdel postgres + if getent passwd postgres >/dev/null; then + userdel postgres + fi + if getent group postgres >/dev/null; then + groupdel postgres + fi } diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index f807c430a..afba29ff2 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124256 2011-05-18 05:08:59Z angvp $ +# $Id: PKGBUILD 138832 2011-09-28 19:15:53Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rsync -pkgver=3.0.8 -pkgrel=2 +pkgver=3.0.9 +pkgrel=1 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') url="http://samba.anu.edu.au/rsync/" @@ -15,11 +15,11 @@ backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') changelog=ChangeLog source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \ rsyncd.conf rsyncd rsync.xinetd) -md5sums=('0ee8346ce16bdfe4c88a236e94c752b4' +md5sums=('5ee72266fe2c1822333c407e1761b92b' '4395c0591638349b1a7aeaaa4da1f03a' '7a9ce3b5de97f3aae29b906f93e1d157' 'ea3e9277dc908bc51f9eddc0f6b935c1') -sha1sums=('10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d' +sha1sums=('c64c8341984aea647506eb504496999fd968ddfc' '48be09294134dfed888818872fe552a59c29147a' 'eda623c31d9def454cf8e3e88dcf63de4ca5c08b' 'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1') @@ -39,4 +39,3 @@ package() { install -Dm644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf install -Dm644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync } - |