diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
| commit | 7cd4823a20b85a5e516ae51fc04a4d1b72b5d0b9 (patch) | |
| tree | 31c86c3a5284a8b8a7f1720d27ce9e5dbf09fee4 /core | |
| parent | d17a0ec458b03b0ed38eff13d399567f36156a73 (diff) | |
| parent | 1f567a9d58d16b76320168f0624aa55bd6320284 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cairo-clock/PKGBUILD
community/flashrom/PKGBUILD
community/kmess/PKGBUILD
core/tzdata/PKGBUILD
extra/gc/PKGBUILD
extra/libsigc++/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdmcp/PKGBUILD
extra/libxevie/PKGBUILD
extra/libxext/PKGBUILD
extra/libxinerama/PKGBUILD
extra/libxkbfile/PKGBUILD
extra/libxpm/PKGBUILD
extra/libxres/PKGBUILD
extra/libxss/PKGBUILD
extra/libxt/PKGBUILD
extra/libxtst/PKGBUILD
extra/libxv/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/pdns-recursor/PKGBUILD
extra/pdns/PKGBUILD
extra/procmail/PKGBUILD
extra/ptlib/PKGBUILD
extra/pycrypto/PKGBUILD
extra/pyorbit/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/libcap/PKGBUILD | 4 | ||||
| -rw-r--r-- | core/tzdata/PKGBUILD | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 6fc8cb8eb..5cbe23582 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,4 +1,4 @@ -#$Id: PKGBUILD 142211 2011-11-06 08:56:56Z allan $ +#$Id: PKGBUILD 151511 2012-02-27 01:00:35Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://sites.google.com/site/fullycapable/" license=('GPL2') depends=('glibc' 'attr') -source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz{,.asc}) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) md5sums=('b4896816b626bea445f0b3849bdd4077' '9d0983e25e5a251d098507f9561d2b27') diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD index a1b8601c0..d7f807591 100644 --- a/core/tzdata/PKGBUILD +++ b/core/tzdata/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141939 2011-11-03 11:23:47Z andyrtr $ +# $Id: PKGBUILD 151481 2012-02-26 16:59:16Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=tzdata @@ -8,15 +8,14 @@ _tzcode=2011i _tzdata=2011n pkgdesc="Sources for time zone and daylight saving time data" arch=('i686' 'x86_64' 'mips64el') -url="http://www.twinsun.com/tz/tz-link.htm" +url="hhttp://www.iana.org/time-zones" license=('GPL') depends=() makedepends=() optdepends=('bash: required by tzselect') options=('!emptydirs') -source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ - ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz - #ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ +source=(http://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz + http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz Makefile.patch) md5sums=('cf7f4335b7c8682899fa2814e711c1b2' '20dbfb28efa008ddbf6dd34601ea40fa' |