From 36e3117f0b1b9f7853457f362ebd918a85f326e8 Mon Sep 17 00:00:00 2001 From: abveritas Date: Mon, 28 Nov 2011 02:24:11 +0000 Subject: [PATCH] start of the gdbm/sqlite3 update, apr-util, perl, python, ruby, unixdbc --- apr-util/PKGBUILD | 2 +- gdbm/PKGBUILD | 68 ++++++------ gdbm/gdbm-1.10-zeroheaders.patch | 33 ++++++ gdbm/gdbm-1.8.3-fhs.patch | 138 ------------------------- gdbm/gdbm-1.8.3-zeroheaders.patch | 44 -------- perl/PKGBUILD | 2 +- python/PKGBUILD | 64 ++++++++---- python/gdbm-magic-values.patch | 13 +++ python/linux2.patch | 23 +++++ python/python-2.6-db-4.8.patch | 123 ---------------------- python/python-2.6-internal-expat.patch | 33 ------ python/python-2.7-db51.diff | 42 -------- ruby/PKGBUILD | 2 +- sqlite3/PKGBUILD | 107 ++++++++++--------- unixodbc/PKGBUILD | 19 ++-- 15 files changed, 219 insertions(+), 494 deletions(-) create mode 100644 gdbm/gdbm-1.10-zeroheaders.patch delete mode 100644 gdbm/gdbm-1.8.3-fhs.patch delete mode 100644 gdbm/gdbm-1.8.3-zeroheaders.patch create mode 100644 python/gdbm-magic-values.patch create mode 100644 python/linux2.patch delete mode 100644 python/python-2.6-db-4.8.patch delete mode 100644 python/python-2.6-internal-expat.patch delete mode 100644 python/python-2.7-db51.diff diff --git a/apr-util/PKGBUILD b/apr-util/PKGBUILD index 7e95efb8e..f358ad56c 100644 --- 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.12 -pkgrel=2 +pkgrel=3 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" diff --git a/gdbm/PKGBUILD b/gdbm/PKGBUILD index 303c2e859..c0f4365ff 100644 --- a/gdbm/PKGBUILD +++ b/gdbm/PKGBUILD @@ -4,44 +4,54 @@ # maintainer (x86_64): Manuel Tortosa pkgname=gdbm -pkgver=1.8.3 -pkgrel=9 +pkgver=1.10 +pkgrel=1 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" license=('GPL') arch=('i686' 'x86_64') depends=('glibc' 'sh') -source=(ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz - gdbm-1.8.3-zeroheaders.patch - gdbm-1.8.3-fhs.patch) +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz + gdbm-1.10-zeroheaders.patch) options=('!libtool' '!makeflags') install=gdbm.install -md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1' - 'a2ed344be9258775bd718074cf2e4ec6' - '66a7c235416c136dc89efc7d03352514') - +md5sums=('88770493c2559dc80b561293e39d3570' + '2a5979910c338dabda6935263b3d8af9') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../gdbm-1.8.3-zeroheaders.patch - patch -Np1 -i $srcdir/gdbm-1.8.3-fhs.patch - - libtoolize --force --copy - aclocal - autoconf - - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + cd "${srcdir}/${pkgname}-${pkgver}" - # https://bugzilla.redhat.com/show_bug.cgi?id=477300 - echo "/* We use fcntl locking (POSIX) instead of flock (BSD) */" >> autoconf.h - echo "#undef HAVE_FLOCK" >> autoconf.h + # Prevent gdbm from storing uninitialized memory content + # to database files. This patch improves security, as the + # uninitialized memory might contain sensitive informations + # from other applications. + # https://bugzilla.redhat.com/show_bug.cgi?id=4457 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 + patch -Np1 -i ../gdbm-1.10-zeroheaders.patch - make prefix=/usr || return 1 + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-libgdbm-compat - make prefix=$pkgdir/usr \ - manprefix=$pkgdir/usr/share/man \ - man3dir=$pkgdir/usr/share/man/man3 \ - infodir=$pkgdir/usr/share/info \ - install install-compat - - ln -sf gdbm/gdbm.h $pkgdir/usr/include + make prefix=/usr +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}"/usr \ + manprefix="${pkgdir}"/usr/share/man \ + man3dir="${pkgdir}"/usr/share/man/man3 \ + infodir="${pkgdir}"/usr/share/info \ + install + + # create symlinks for compatibility + install -dm755 "${pkgdir}"/usr/include/gdbm + ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h + ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h + ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h } diff --git a/gdbm/gdbm-1.10-zeroheaders.patch b/gdbm/gdbm-1.10-zeroheaders.patch new file mode 100644 index 000000000..28f070c44 --- /dev/null +++ b/gdbm/gdbm-1.10-zeroheaders.patch @@ -0,0 +1,33 @@ +diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c +--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100 ++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100 +@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf) + + + /* Split the header block. */ +- temp = (avail_block *) malloc (av_size); ++ temp = (avail_block *) calloc (1, av_size); + if (temp == NULL) _gdbm_fatal (dbf, _("malloc error")); + /* Set the size to be correct AFTER the pop_avail_block. */ + temp->size = dbf->header->avail.size; +diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c +--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100 ++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100 +@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s + (dbf->header->block_size - sizeof (hash_bucket)) + / sizeof (bucket_element) + 1; + dbf->header->bucket_size = dbf->header->block_size; +- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); ++ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if (dbf->bucket == NULL) + { + gdbm_close (dbf); +@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s + for(index = 0; index < size; index++) + { + (dbf->bucket_cache[index]).ca_bucket +- = (hash_bucket *) malloc (dbf->header->bucket_size); ++ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if ((dbf->bucket_cache[index]).ca_bucket == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/gdbm/gdbm-1.8.3-fhs.patch b/gdbm/gdbm-1.8.3-fhs.patch deleted file mode 100644 index 58ce4de0b..000000000 --- a/gdbm/gdbm-1.8.3-fhs.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in ---- gdbm-1.8.3/Makefile.in.fhs 2002-10-08 18:09:12.000000000 +0200 -+++ gdbm-1.8.3/Makefile.in 2010-03-10 15:41:01.516025096 +0100 -@@ -1,7 +1,7 @@ - #### Start of system configuration section. #### - - srcdir = @srcdir@ --top_builddir = . -+top_builddir = @top_builddir@ - VPATH = @srcdir@ - - CC = @CC@ -@@ -14,17 +14,13 @@ INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - --# File ownership and group --BINOWN = bin --BINGRP = bin -- - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi - --DEFS = -+DEFS = @DEFS@ - - # Where the system [n]dbm routines are... --LIBS = @LIBS@ -lc -+LIBS = @LIBS@ - - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ -@@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@ - # Common prefix for installation directories - prefix = @prefix@ - exec_prefix = @exec_prefix@ --binprefix = $(exec_prefix) --manprefix = $(prefix) -+datarootdir = @datarootdir@ - - # Directory in which to put libgdbm.a. - libdir = @libdir@ - # The include directory for gdbm.h and dbm.h. - includedir = @includedir@ -+pkgincludedir = $(includedir)/gdbm - # Info and man directories. - infodir = @infodir@ --man3dir = @mandir@/man3 -+mandir = @mandir@ -+man3dir = $(mandir)/man3 - manext = 3 - - #### End of system configuration section. #### -@@ -57,7 +54,7 @@ manext = 3 - - SHELL = /bin/sh - --PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm -+PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm - - DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c - -@@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la - progs: $(PROGS) - - install: libgdbm.la gdbm.h gdbm.info -- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ -- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ -- $(INSTALL_ROOT)$(infodir) -- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -- $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -- $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -- $(INSTALL_ROOT)$(infodir)/gdbm.info -+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir) -+ $(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la -+ $(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 -+ $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info - - install-compat: -- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ -- $(INSTALL_ROOT)$(includedir) -- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ -- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -- $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -- $(INSTALL_ROOT)$(includedir)/ndbm.h -+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) -+ $(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la -+ $(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h -+ $(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h - # rm -f libgdbm.a -@@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h - libgdbm_compat.la: $(C_LOBJS) gdbm.h - rm -f libgdbm_compat.la - $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ -- -version-info $(SHLIB_VER) $(C_LOBJS) -+ -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm - - gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 - rm -f gdbm.h -@@ -172,10 +160,10 @@ gdbm.h: gdbm.proto gdbmerrno.h gdbm.prot - chmod -w gdbm.h - - testgdbm: testgdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ - - testdbm: testdbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la - - tdbm: testdbm.o - $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS) -@@ -184,7 +172,7 @@ testndbm.o: testndbm.c - $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c - - testndbm: testndbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la - - tndbm.o: testndbm.c - cp $(srcdir)/testndbm.c ./tndbm.c -@@ -195,7 +183,7 @@ tndbm: tndbm.o - $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS) - - conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@ - - lintgdbm: - lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c diff --git a/gdbm/gdbm-1.8.3-zeroheaders.patch b/gdbm/gdbm-1.8.3-zeroheaders.patch deleted file mode 100644 index 088956aef..000000000 --- a/gdbm/gdbm-1.8.3-zeroheaders.patch +++ /dev/null @@ -1,44 +0,0 @@ -02_zero-headers.patch by Jeff Johnson and Colin Watson - -diff -urNad a/falloc.c b/falloc.c ---- a/falloc.c 2001-02-28 06:52:33.000000000 +0000 -+++ b/falloc.c 2003-09-08 23:58:43.000000000 +0100 -@@ -272,7 +272,7 @@ - - - /* Split the header block. */ -- temp = (avail_block *) malloc (av_size); -+ temp = (avail_block *) calloc (1, av_size); - if (temp == NULL) _gdbm_fatal (dbf, "malloc error"); - /* Set the size to be correct AFTER the pop_avail_block. */ - temp->size = dbf->header->avail.size; -diff -urNad a/gdbmopen.c b/gdbmopen.c ---- a/gdbmopen.c 2003-09-08 23:58:01.000000000 +0100 -+++ b/gdbmopen.c 2003-09-08 23:58:43.000000000 +0100 -@@ -212,7 +212,7 @@ - file_block_size = block_size; - - /* Get space for the file header. */ -- dbf->header = (gdbm_file_header *) malloc (file_block_size); -+ dbf->header = (gdbm_file_header *) calloc (1, file_block_size); - if (dbf->header == NULL) - { - gdbm_close (dbf); -@@ -256,7 +256,7 @@ - (dbf->header->block_size - sizeof (hash_bucket)) - / sizeof (bucket_element) + 1; - dbf->header->bucket_size = dbf->header->block_size; -- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); -+ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); - if (dbf->bucket == NULL) - { - gdbm_close (dbf); -@@ -420,7 +420,7 @@ - for(index = 0; index < size; index++) - { - (dbf->bucket_cache[index]).ca_bucket -- = (hash_bucket *) malloc (dbf->header->bucket_size); -+ = (hash_bucket *) calloc (1, dbf->header->bucket_size); - if ((dbf->bucket_cache[index]).ca_bucket == NULL) - { - gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/perl/PKGBUILD b/perl/PKGBUILD index eb2b8a0b8..8a05bb1b6 100644 --- a/perl/PKGBUILD +++ b/perl/PKGBUILD @@ -6,7 +6,7 @@ pkgname=perl pkgver=5.12.3 -pkgrel=3 +pkgrel=4 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') diff --git a/python/PKGBUILD b/python/PKGBUILD index 80ac03658..782003ba5 100644 --- a/python/PKGBUILD +++ b/python/PKGBUILD @@ -5,8 +5,8 @@ # maintainer (x86_64): Manuel Tortosa pkgname=python -pkgver=2.7.1 -pkgrel=7 +pkgver=2.7.2 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') @@ -17,14 +17,25 @@ makedepends=('tk') provides=('python2' 'python-elementtree' 'python-ctypes') replaces=('python-elementtree' 'python-ctypes') source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2 - python-2.7-db51.diff) -md5sums=('aa27bc25725137ba155910bd8e5ddc4f' - 'd9b8161568ce17a305c1b71e61ccd4b5') + linux2.patch) +md5sums=('ba7b2f11ffdbf195ee0d111b9455a5bd' + '6099a7c1aed80cf04943ee4affa84b5c') build() { cd ${srcdir}/Python-${pkgver} - patch -Np1 -i ../python-2.7-db51.diff + # See http://bugs.python.org/issue10835 for upstream report + sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c + + # Enable built-in SQLite3 module to load extensions + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + + # Make sure sys.platform is set to linux2, even on kernel 3.X + # cf http://bugs.python.org/issue12326 + patch -Np1 -i ../linux2.patch # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball @@ -36,25 +47,38 @@ build() { ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ --enable-unicode=ucs4 --with-system-expat --with-system-ffi - make || return 1 - make DESTDIR=${pkgdir} install + make +} - rm ${pkgdir}/usr/bin/python - ln -sf python${_pybasever} ${pkgdir}/usr/bin/python - ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2 +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" altinstall maninstall + + ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" + ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" ln -sf ../../libpython${_pybasever}.so \ - ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so + "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" - # Install the tools - #gettext - install -m755 Tools/i18n/pygettext.py ${pkgdir}/usr/bin/ - install -m755 Tools/i18n/msgfmt.py ${pkgdir}/usr/bin/ + mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" - mkdir -p ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts - install -m644 Tools/scripts/README ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/ - install -m755 Tools/scripts/*py ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/ + # some useful "stuff" + install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} + install -m755 Tools/i18n/{msgfmt,pygettext}.py \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" + install -m755 Tools/scripts/{README,*py} \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" + + # clean up #!s + find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ + xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # clean-up reference to build directory + sed -i "s#${srcdir}/Python-${pkgver}:##" \ + "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" # license - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + \ No newline at end of file diff --git a/python/gdbm-magic-values.patch b/python/gdbm-magic-values.patch new file mode 100644 index 000000000..acaff879e --- /dev/null +++ b/python/gdbm-magic-values.patch @@ -0,0 +1,13 @@ +diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py +--- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Lib/whichdb.py 2011-09-30 15:45:21.778872290 -0400 +@@ -91,7 +91,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "gdbm" + + # Check for old Berkeley db hash file format v2 +diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS diff --git a/python/linux2.patch b/python/linux2.patch new file mode 100644 index 000000000..670510fde --- /dev/null +++ b/python/linux2.patch @@ -0,0 +1,23 @@ +http://hg.python.org/cpython/rev/c816479f6aaf/ +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -2995,6 +2995,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -293,6 +293,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; diff --git a/python/python-2.6-db-4.8.patch b/python/python-2.6-db-4.8.patch deleted file mode 100644 index 2032f924c..000000000 --- a/python/python-2.6-db-4.8.patch +++ /dev/null @@ -1,123 +0,0 @@ -Index: setup.py -=================================================================== ---- setup.py (revision 74955) -+++ setup.py (working copy) -@@ -695,7 +695,7 @@ - # a release. Most open source OSes come with one or more - # versions of BerkeleyDB already installed. - -- max_db_ver = (4, 7) -+ max_db_ver = (4, 8) - min_db_ver = (3, 3) - db_setup_debug = False # verbose debug prints from this script? - -Index: Modules/_bsddb.c -=================================================================== ---- Modules/_bsddb.c (revision 74955) -+++ Modules/_bsddb.c (working copy) -@@ -215,7 +215,11 @@ - #define DB_BUFFER_SMALL ENOMEM - #endif - -+#if (DBVER < 48) -+#define DB_GID_SIZE DB_XIDDATASIZE -+#endif - -+ - /* --------------------------------------------------------------------- */ - /* Structure definitions */ - -@@ -4501,7 +4505,11 @@ - DBTxnObject *txn; - #define PREPLIST_LEN 16 - DB_PREPLIST preplist[PREPLIST_LEN]; -+#if (DBVER < 48) - long retp; -+#else -+ u_int32_t retp; -+#endif - - CHECK_ENV_NOT_CLOSED(self); - -@@ -4522,7 +4530,7 @@ - flags=DB_NEXT; /* Prepare for next loop pass */ - for (i=0; i= 42) - {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS}, -@@ -7089,6 +7101,7 @@ - ADD_INT(d, DB_MAX_PAGES); - ADD_INT(d, DB_MAX_RECORDS); - -+#if (DBVER < 48) - #if (DBVER >= 42) - ADD_INT(d, DB_RPCCLIENT); - #else -@@ -7096,7 +7109,11 @@ - /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */ - _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT); - #endif -+#endif -+ -+#if (DBVER < 48) - ADD_INT(d, DB_XA_CREATE); -+#endif - - ADD_INT(d, DB_CREATE); - ADD_INT(d, DB_NOMMAP); -@@ -7113,7 +7130,13 @@ - ADD_INT(d, DB_INIT_TXN); - ADD_INT(d, DB_JOINENV); - -+#if (DBVER >= 48) -+ ADD_INT(d, DB_GID_SIZE); -+#else - ADD_INT(d, DB_XIDDATASIZE); -+ /* Allow new code to work in old BDB releases */ -+ _addIntToDict(d, "DB_GID_SIZE", DB_XIDDATASIZE); -+#endif - - ADD_INT(d, DB_RECOVER); - ADD_INT(d, DB_RECOVER_FATAL); diff --git a/python/python-2.6-internal-expat.patch b/python/python-2.6-internal-expat.patch deleted file mode 100644 index 86252abef..000000000 --- a/python/python-2.6-internal-expat.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- setup.py 2008-04-22 12:12:24.613554757 +0300 -+++ setup.py 2008-04-22 12:13:09.276544063 +0300 -@@ -1035,18 +1035,15 @@ - # - # More information on Expat can be found at www.libexpat.org. - # -- expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat') -- define_macros = [ -- ('HAVE_EXPAT_CONFIG_H', '1'), -- ] -+ # Use system expat -+ expatinc = '/usr/include' -+ define_macros = [] - - exts.append(Extension('pyexpat', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['pyexpat.c', -- 'expat/xmlparse.c', -- 'expat/xmlrole.c', -- 'expat/xmltok.c', - ], - )) - -@@ -1058,6 +1055,7 @@ - exts.append(Extension('_elementtree', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['_elementtree.c'], - )) - diff --git a/python/python-2.7-db51.diff b/python/python-2.7-db51.diff deleted file mode 100644 index 2da95c375..000000000 --- a/python/python-2.7-db51.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c ---- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000 -+++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000 -@@ -9765,8 +9765,11 @@ - - ADD_INT(d, DB_REP_PERMANENT); - --#if (DBVER >= 44) -+#if (DBVER >= 44) && (DBVER <= 48) - ADD_INT(d, DB_REP_CONF_NOAUTOINIT); -+#endif -+ -+#if (DBVER >= 44) - ADD_INT(d, DB_REP_CONF_DELAYCLIENT); - ADD_INT(d, DB_REP_CONF_BULK); - ADD_INT(d, DB_REP_CONF_NOWAIT); -diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py ---- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000 -+++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000 -@@ -765,7 +765,7 @@ - # a release. Most open source OSes come with one or more - # versions of BerkeleyDB already installed. - -- max_db_ver = (4, 8) -+ max_db_ver = (5, 1) - min_db_ver = (4, 1) - db_setup_debug = False # verbose debug prints from this script? - -@@ -787,8 +787,12 @@ - return True - - def gen_db_minor_ver_nums(major): -- if major == 4: -+ if major == 5: - for x in range(max_db_ver[1]+1): -+ if allow_db_ver((5, x)): -+ yield x -+ if major == 4: -+ for x in range(9): - if allow_db_ver((4, x)): - yield x - elif major == 3: diff --git a/ruby/PKGBUILD b/ruby/PKGBUILD index 7eb24bd20..f49d81ca8 100644 --- 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=3 +pkgrel=4 pkgdesc="An object-oriented language for quick and easy programming" arch=('i686' 'x86_64') url="http://www.ruby-lang.org/en/" diff --git a/sqlite3/PKGBUILD b/sqlite3/PKGBUILD index 4d4b77576..5acad6b1f 100644 --- a/sqlite3/PKGBUILD +++ b/sqlite3/PKGBUILD @@ -6,86 +6,85 @@ pkgbase="sqlite3" pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') -_amalgamationver=3070500 -_amalgamationver2="${_amalgamationver/00/}" -_docver=${_amalgamationver} -pkgver="${_amalgamationver2//0/.}" -pkgrel=4 - -pkgdesc="A C library that implements an SQL database engine." +_amalgamationver=3070900 +_amalgamationver2=${_amalgamationver/00/} +_docver=${_amalgamationver} #3070700 +pkgver=${_amalgamationver2//0/.} +pkgrel=1 +pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') license=('custom') url="http://www.sqlite.org/" -makedepends=('tcl' 'readline>=6.0.00' 'icu') -options=('!libtool' '!emptydirs') - -source=("http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz" # tarball containing the amalgamation for SQLite 3.7.5 together with an configure script and makefile for building it. - "http://www.sqlite.org/sqlite-tea-${_amalgamationver}.tar.gz" # tarball of the amalgamation together with a Tcl Extension Architecture (TEA) compatible configure script and makefile - "http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip + http://www.sqlite.org/sqlite-doc-${_docver}.zip license.txt) -md5sums=('a9604a82613ade2e7f4c303f233e477f' - '3413e8cfb7990e39260bf45dca017bf0' - '74f9b304143a76e3da8c0063888770ee' +options=('!libtool' '!emptydirs') +md5sums=('dce303524736fe89a76b8ed29d566352' + 'c48c231dd43d3b74f1d00c36424d87f4' 'c1cdbc5544034d9012e421e75a5e4890') build() { - export CFLAGS="${CFLAGS} -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_ICU=1 $(icu-config --cflags)" - export LDFLAGS="${LDFLAGS} $(icu-config --ldflags)" + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - # build sqlite - cd "${srcdir}/sqlite-autoconf-${_amalgamationver}" - ./configure --prefix=/usr \ - --disable-static - make + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make - # build the tcl extension - cd "${srcdir}/sqlite-tea-${_amalgamationver}" - ./configure --prefix=/usr \ - --with-system-sqlite - make + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + } package_sqlite3() { - pkgdesc="A C library that implements an SQL database engine." - depends=('readline>=6.0.00' 'icu') - conflicts=('sqlite') - replaces=('sqlite') + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite') + replaces=('sqlite') - cd "${srcdir}/sqlite-autoconf-${_amalgamationver}" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install - # license - install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt } package_sqlite3-tcl() { - pkgdesc="Sqlite Tcl Extension Architecture (TEA)." - depends=('sqlite3>=3.7.5') + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') - cd "${srcdir}/sqlite-tea-${_amalgamationver}" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install } package_sqlite3-doc() { + pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" + #arch=('any') - not yet supported - pkgdesc="Most of the static HTML files that comprise the Sqlite website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation." - - cd ${srcdir}/sqlite-doc-${_docver} - mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} - cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ + #cd ${srcdir}/sqlite-doc-${_amalgamationver} + cd ${srcdir}/sqlite-doc-${_docver} + mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} + cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ - # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605 - find ${pkgdir} -type f -perm 755 -exec ls -lha {} \; - find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \; + # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605 + find ${pkgdir} -type f -perm 755 -exec ls -lha {} \; + find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \; - find ${pkgdir} -type f -name '*~' -exec ls -lha {} \; - find ${pkgdir} -type d -name '*~' -exec ls -lha {} \; - find ${pkgdir} -name '*~' -exec rm -f {} \; + find ${pkgdir} -type f -name '*~' -exec ls -lha {} \; + find ${pkgdir} -type d -name '*~' -exec ls -lha {} \; + find ${pkgdir} -name '*~' -exec rm -f {} \; - find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg# - find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \; - find ${pkgdir} -name '.~*' -exec rm -f {} \; + find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg# + find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \; + find ${pkgdir} -name '.~*' -exec rm -f {} \; } diff --git a/unixodbc/PKGBUILD b/unixodbc/PKGBUILD index db2107c62..c7df29ff2 100644 --- a/unixodbc/PKGBUILD +++ b/unixodbc/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 78429 2010-04-23 18:51:55Z andyrtr $ -# Maintainer: AndyRTR +# +# Core Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa -# Contributor: Judd Vinet -# Contributor: Tom Newsom +# include global config +source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=unixodbc pkgver=2.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" arch=(i686 x86_64) license=('GPL2' 'LGPL2.1') url="http://www.unixodbc.org/" backup=('etc/odbc.ini' 'etc/odbcinst.ini') -depends=('readline>=6.0' 'libtool') +depends=('readline>=6.0' 'libltdl') options=('!libtool') source=(http://www.unixodbc.org/unixODBC-$pkgver.tar.gz) md5sums=('f2ad22cbdffe836c58987ed2332c2e99') @@ -20,10 +23,10 @@ md5sums=('f2ad22cbdffe836c58987ed2332c2e99') build() { cd ${srcdir}/unixODBC-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } package() { cd ${srcdir}/unixODBC-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install }