continued glibc update, large group of db & e2fsprogs

2025-02-03 02:27:14 +08:00 · 2011-05-28 22:42:14 +00:00 · 2011-05-28 22:42:14 +00:00 · 31ba4f6f0f
commit 31ba4f6f0f
parent 899f7817d3
18 changed files with 285 additions and 41 deletions
--- a/apr-util/PKGBUILD
+++ b/apr-util/PKGBUILD
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=apr-util
 pkgver=1.3.11
-pkgrel=1
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/"
--- a/cvs/PKGBUILD
+++ b/cvs/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=cvs
 pkgver=1.11.23
-pkgrel=1
+pkgrel=6
 pkgdesc="Concurrent Versions System - a source control system"
 arch=(i686 x86_64)
 url="http://cvs.nongnu.org"
--- a/db/PKGBUILD
+++ b/db/PKGBUILD
@ -1,27 +1,32 @@
-# $Id: PKGBUILD 76949 2010-04-09 08:14:30Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=db
-pkgver=4.8.26
-_basever=4.8.26
-pkgrel=2
+pkgver=4.8.30
+_basever=4.8.30
+pkgrel=1
 pkgdesc="The Berkeley DB embedded database system"
 arch=('i686' 'x86_64')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
 license=('custom')
 depends=('gcc-libs' 'sh')
 conflicts=('db4')
-options=('!libtool' 'force')
+options=('!libtool')
 install=db.install
 source=(http://download-uk.oracle.com/berkeley-db/db-${_basever}.tar.gz)
-md5sums=('3476bac9ec0f3c40729c8a404151d5e3')
+md5sums=('f80022099c5742cd179343556179aa8c')

 build() {
  cd ${srcdir}/$pkgname-${_basever}/build_unix
  ../dist/configure --prefix=/usr --enable-compat185 \
-    --enable-shared --enable-static --enable-cxx
-  make LIBSO_LIBS=-lpthread || return 1
+    --enable-shared --enable-static --enable-cxx --enable-dbm
+  make LIBSO_LIBS=-lpthread
 }

 package() {
--- a/db/db.install
+++ b/db/db.install
@ -1,5 +1,5 @@
 post_upgrade() {
-  if [ "$(vercmp $2 4.8)" -lt 0 ]; then
+  if [ "$(vercmp $2 5.1)" -lt 0 ]; then
    echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases."
  fi
 }
--- a/e2fsprogs/PKGBUILD
+++ b/e2fsprogs/PKGBUILD
@ -1,23 +1,28 @@
-# $Id: PKGBUILD 73063 2010-03-22 08:28:27Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org> 
-# Contributor: judd <jvinet@zeroflux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=e2fsprogs
-pkgver=1.41.11
+pkgver=1.41.14
 pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'MIT')
 url="http://e2fsprogs.sourceforge.net"
 groups=('base')
-depends=('sh' 'util-linux-ng>=2.16')
+depends=('sh' 'util-linux-ng')
 makedepends=('bc')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
        'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
 install=${pkgname}.install
-md5sums=('fb507a40c2706bc38306f150d069e345'
-         '035b7c69b7a2cecf996a4708c262245e')
+sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5'
+          'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
@ -35,6 +40,10 @@ build() {
  
  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1

+  # remove references to build directory
+  sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
+  sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
+
  # install MIT license
  install -Dm644 "${srcdir}/MIT-LICENSE" \
    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1
--- a/expat/PKGBUILD
+++ b/expat/PKGBUILD
@ -1,10 +1,15 @@
-# $Id: PKGBUILD 62836 2010-01-12 23:27:10Z allan $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=expat
 pkgver=2.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="An XML Parser library written in C"
 arch=('i686' 'x86_64')
 url="http://expat.sourceforge.net/"
--- a/heimdal/PKGBUILD
+++ b/heimdal/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=heimdal
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="http://www.h5l.org/"
--- a/keyutils/PKGBUILD
+++ b/keyutils/PKGBUILD
@ -0,0 +1,31 @@
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=keyutils
+pkgver=1.4
+pkgrel=1
+pkgdesc="Linux Key Management Utilities"
+arch=(i686 x86_64)
+url="http://www.kernel.org"
+license=('GPL2' 'LGPL2.1')
+depends=('glibc' 'sh')
+backup=(etc/request-key.conf)
+source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile
+  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b')
--- a/krb5/PKGBUILD
+++ b/krb5/PKGBUILD
@ -0,0 +1,69 @@
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=krb5
+pkgver=1.9.1
+pkgrel=1
+pkgdesc="The Kerberos network authentication system"
+arch=('i686' 'x86_64')
+url="http://web.mit.edu/kerberos/"
+license=('custom')
+depends=('e2fsprogs' 'libldap' 'keyutils')
+makedepends=('perl')
+provides=('heimdal')
+replaces=('heimdal')
+backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf')
+source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
+        kadmind.rc
+        krb5-kdc.rc)
+sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
+          '640e3046c6558313d2be81cf2252afc8622892b0'
+          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
+options=('!emptydirs')
+
+build() {
+   tar zxvf ${pkgname}-${pkgver}.tar.gz
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+
+   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
+   export CPPFLAGS+=" -I/usr/include/et"
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/krb5 \
+               --mandir=/usr/share/man \
+               --localstatedir=/var/lib \
+               --enable-shared \
+               --with-system-et \
+               --with-system-ss \
+               --disable-rpath \
+               --without-tcl \
+               --enable-dns-for-realm \
+               --with-ldap
+
+   make
+}
+
+check() {
+   # We can't do this in the build directory.
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make -C src check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
+
+   install -D -m 644 config-files/kdc.conf "${pkgdir}"/etc/krb5/kdc.conf
+   install -D -m 644 config-files/krb5.conf "${pkgdir}"/etc/krb5/krb5.conf
+
+   install -d -m 755 "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kdc.rc "${pkgdir}"/etc/rc.d
+   install -m 755 ../../kadmind.rc "${pkgdir}"/etc/rc.d
+
+   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
--- a/krb5/kadmind.rc
+++ b/krb5/kadmind.rc
@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/kadmind`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Admin Daemon"
+        if [ -z "$PID" ]; then
+           /usr/sbin/kadmind
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon kadmind
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Admin Daemon"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon kadmind
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
--- a/krb5/krb5-kdc.rc
+++ b/krb5/krb5-kdc.rc
@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/krb5kdc`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Authentication"
+        if [ -z "$PID" ]; then
+           /usr/sbin/krb5kdc
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Authentication"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
--- a/libldap/PKGBUILD
+++ b/libldap/PKGBUILD
@ -1,9 +1,14 @@
-# $Id: PKGBUILD 75196 2010-04-01 02:08:56Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=libldap
-pkgver=2.4.23
+pkgver=2.4.24
 pkgrel=1
 pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
 arch=('i686' 'x86_64')
@ -15,7 +20,7 @@ makedepends=('tcp_wrappers')
 options=('!libtool')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz
        ntlm.patch)
-md5sums=('90150b8c0d0192e10b30157e68844ddf'
+md5sums=('116fe1e23a7b67686d5e62274367e6c0'
         'dfa9eb6f2fd9d0a3dab0e1860923489e')

 build() {
--- a/libsasl/PKGBUILD
+++ b/libsasl/PKGBUILD
@ -1,9 +1,15 @@
-# $Id: PKGBUILD 78109 2010-04-19 11:02:50Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
@ -12,16 +18,16 @@ depends=('db>=4.8')
 optdepends=('cyrus-sasl: saslauthd'
            'cyrus-sasl-plugins: authentication plugins other than sasldb')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-	cyrus-sasl-2.1.19-checkpw.c.patch db-4.7.patch)
+	cyrus-sasl-2.1.19-checkpw.c.patch cyrus-sasl-db.patch)
 options=('!makeflags')
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
         'e27ddff076342e7a3041c4759817d04b'
-         '71a3b7454f4d7cc2966b347bdf03f2fc')
+         '0658201497aad359c0d66b0ab8032859')

 build() {
  cd "${srcdir}/cyrus-sasl-${pkgver}"
  patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch || return 1
-  patch -Np0 -i ${srcdir}/db-4.7.patch || return 1
+  patch -Np0 -i ${srcdir}/cyrus-sasl-db.patch || return 1
  ./configure --prefix=/usr \
  	--sysconfdir=/etc \
  	--localstatedir=/var \
--- a/libsasl/cyrus-sasl-db.patch
+++ b/libsasl/cyrus-sasl-db.patch
@ -0,0 +1,34 @@
+diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4
+--- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2005-04-26 21:14:07.000000000 +0200
+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2006-10-02 20:36:17.137852392 +0200
+@@ -213,7 +213,7 @@
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+           do
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    AC_TRY_LINK([#include <db.h>],
+--- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig	2009-04-28 17:09:18.000000000 +0200
+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2010-05-18 21:02:20.418940098 +0200
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig	2003-02-13 20:56:17.000000000 +0100
+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2010-05-18 21:11:09.982932556 +0200
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
--- a/pam/PKGBUILD
+++ b/pam/PKGBUILD
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=pam
 pkgver=1.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
--- a/perl/PKGBUILD
+++ b/perl/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=perl
 pkgver=5.12.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
--- a/python/PKGBUILD
+++ b/python/PKGBUILD
@ -6,13 +6,13 @@

 pkgname=python
 pkgver=2.7.1
-pkgrel=5
+pkgrel=6
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
 license=('PSF')
 url="http://www.python.org"
-depends=('db>=4.8' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3')
+depends=('db>=4.8' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
 makedepends=('tk')
 provides=('python2' 'python-elementtree' 'python-ctypes')
 replaces=('python-elementtree' 'python-ctypes')
--- a/ruby/PKGBUILD
+++ b/ruby/PKGBUILD
@ -9,7 +9,7 @@
 pkgname=('ruby' 'ruby-docs')
 pkgver=1.9.2_p180
 _pkgver=1.9.2-p180
-pkgrel=1
+pkgrel=2
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 url="http://www.ruby-lang.org/en/"