diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
| commit | dec82423b45179c362a4727cc3d63fb2349af369 (patch) | |
| tree | 552f0832ffe5dab6305382ea0c0e4a42da17063a /core | |
| parent | a0f85906119bcb8e7269dee701076946b3ec45ea (diff) | |
| parent | ef815a5d80eecd4ba0679a376386741c374e0d1b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dzen2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
core/openldap/PKGBUILD
extra/geeqie/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libksane/PKGBUILD
extra/moc/PKGBUILD
extra/strigi/PKGBUILD
extra/vice/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/bison/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/flex/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/openldap/PKGBUILD | 18 | ||||
| -rwxr-xr-x | core/openldap/slapd | 2 |
4 files changed, 16 insertions, 18 deletions
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index c4d5267ec..e62c98df5 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164386 2012-08-01 01:21:23Z allan $ +# $Id: PKGBUILD 164809 2012-08-06 13:29:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('1fc1b9bc689e7fc5622d32c93cce746f' - '44d571e9b271fbcf283c1795c28f70aa') +md5sums=('dea291996f98c34c3fd8e389a9cf6ea1' + 'e6d78e6423e9e29f3b6c5deee839b41c') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD index 967356836..2afb4187b 100644 --- a/core/flex/PKGBUILD +++ b/core/flex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163938 2012-07-22 12:56:35Z allan $ +# $Id: PKGBUILD 164810 2012-08-06 13:29:17Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=flex -pkgver=2.5.36 +pkgver=2.5.37 pkgrel=1 pkgdesc="A tool for generating text-scanning programs" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('glibc' 'm4' 'sh') install=flex.install source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 lex.sh) -md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5' +md5sums=('c75940e1fc25108f2a7b3ef42abdae06' 'f725259ec23a9e87ee29e2ef82eda9a5') build() { diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 041b69d8b..21b04e4a1 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,30 +1,28 @@ -# $Id: PKGBUILD 162887 2012-07-02 18:03:02Z eric $ +# $Id: PKGBUILD 164817 2012-08-06 19:23:29Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.31 -pkgrel=4 +pkgver=2.4.32 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') +options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd slapd.default slapd.service slapd.tmpfiles - ntlm.patch - mutex-end-of-struct-sigsegv.patch) -sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' - 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' + ntlm.patch) +sha1sums=('294d5e9711bcb6850188ed895eeb986d43b62664' + 'b684038a7f5bc7d2ba470b2d16ee47b5aae64c65' 'd89b8a533045123f1ab46c9c430cf132d58a20a4' 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' 'f86a82e35ebe15026980467c9dee4007e686b795' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' - '694269dad78c7a806649c2d7f57bb7e503df3af1') + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') build() { cd "${srcdir}"/${pkgbase}-${pkgver} patch -Np1 -i "${srcdir}"/ntlm.patch - patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h diff --git a/core/openldap/slapd b/core/openldap/slapd index 4f212da66..604f6b275 100755 --- a/core/openldap/slapd +++ b/core/openldap/slapd @@ -19,9 +19,9 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else + add_daemon slapd stat_done fi - add_daemon slapd else stat_fail fi |