diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/db/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/openldap/PKGBUILD | 4 | ||||
| -rw-r--r-- | core/perl/PKGBUILD | 22 | ||||
| -rw-r--r-- | core/perl/provides.pl | 31 |
4 files changed, 35 insertions, 32 deletions
diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index c86b2f44a..937e1f924 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146445 2012-01-11 15:20:54Z stephane $ +# $Id: PKGBUILD 160636 2012-06-02 22:25:49Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db -pkgver=5.3.15 +pkgver=5.3.21 pkgrel=1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64') @@ -14,17 +14,17 @@ depends=('gcc-libs' 'sh') options=('!libtool') install=db.install source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('7683b632a01ff3543c379a120809a942ec457738') +sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') build() { - cd "${srcdir}/$pkgname-${pkgver}/build_unix" + cd "${srcdir}"/$pkgname-${pkgver}/build_unix ../dist/configure --prefix=/usr --enable-compat185 \ --enable-shared --enable-static --enable-cxx --enable-dbm make LIBSO_LIBS=-lpthread } package() { - cd "${srcdir}/$pkgname-${pkgver}/build_unix" + cd "${srcdir}"/$pkgname-${pkgver}/build_unix make DESTDIR="${pkgdir}" install rm -r "${pkgdir}"/usr/docs install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 191b43974..f084b2ea5 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158014 2012-05-01 02:11:44Z eric $ +# $Id: PKGBUILD 160638 2012-06-02 22:26:01Z allan $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.31 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 94d9c623f..58b94e7fb 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159280 2012-05-20 20:41:32Z bluewind $ +# $Id: PKGBUILD 160587 2012-06-02 10:54:59Z bluewind $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.14.2 -pkgrel=7 +pkgver=5.16.0 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -16,17 +16,13 @@ changelog=ChangeLog source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh perlbin.csh -provides.pl -digest_eval_hole.diff -0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) +provides.pl) install=perl.install options=('makeflags' '!purge') -md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26' +md5sums=('15a2f95fb27231e10998240f13acf961' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' - '31fc0b5bb4935414394c5cfbec2cb8e5' - '490852b3d77c3b3866d0d75f5fbf5c5d' - 'c25d86206d649046538c3daab7874564') + '999c3eea6464860704abbb055a0f0896') # workaround to let the integrity check find the correct provides array if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then @@ -44,8 +40,6 @@ build() { arch_opts="" fi - patch -Np1 -i $srcdir/digest_eval_hole.diff - ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ @@ -60,7 +54,6 @@ build() { -Dinc_version_list=none \ -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" - patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } @@ -120,7 +113,4 @@ package() { done find $pkgdir/usr/lib -name *.pod -delete find $pkgdir -name .packlist -delete - # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) - install -dv ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf } diff --git a/core/perl/provides.pl b/core/perl/provides.pl index 3bf369577..d2cdc762e 100644 --- a/core/perl/provides.pl +++ b/core/perl/provides.pl @@ -1,9 +1,16 @@ # provides.pl ## # Script for printing out a provides list of every CPAN distribution -# that is bundled with perl. +# that is bundled with perl. You can run it before building perl +# or you can run it after building perl. Required modules are in core +# for perl 5.13 and above. It might be nice if this didn't require +# HTTP::Tiny and maybe just used wget or curl. # -# Justin Davis <jrcd83@gmail.com> +# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at +# cpanmetadb.plackperl.org to cross-reference module files to their +# providing CPAN distribution. Thank you Miyagawa! +# +# - Justin "juster" Davis <jrcd83@gmail.com> use warnings 'FATAL' => 'all'; use strict; @@ -13,21 +20,26 @@ package Common; sub evalver { my ($path, $mod) = @_; - $mod ||= ""; open my $fh, '<', $path or die "open $path: $!"; - while (<$fh>) { - next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/; - my $ver = eval $1; + my $m = ($mod + ? qr/(?:\$${mod}::VERSION|\$VERSION)/ + : qr/\$VERSION/); + + while (my $ln = <$fh>) { + next unless $ln =~ /\s*$m\s*=\s*.+/; + chomp $ln; + my $ver = do { no strict; eval $ln }; return $ver unless $@; - warn qq{$path:$. bad version string "$ver"\n}; + die qq{$path:$. bad version string in "$ln"\n}; } close $fh; return undef; } + #----------------------------------------------------------------------------- package Dists; @@ -143,7 +155,7 @@ use File::stat; sub cpan_provider { my ($module) = @_; - my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module"; + my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module"; my $http = HTTP::Tiny->new; my $resp = $http->get($url); return undef unless $resp->{'success'}; @@ -169,6 +181,7 @@ sub find my @modfiles; my $finder = sub { return unless /[.]pm\z/; + return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules push @modfiles, $_; }; findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir); @@ -194,7 +207,7 @@ sub find $mod =~ s{\A$libdir}{}; $mod =~ s{/}{::}g; - my $ver = Common::evalver($path) || q{}; + my $ver = Common::evalver($path, $mod) || q{}; push @mods, [ $mod, $ver ]; } |