diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-29 11:08:24 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-29 11:08:24 +0100 |
commit | bf57d1e5a2a6f53ec61f15f32571940a9eb56ac7 (patch) | |
tree | b38e9c719501ca5196d4d7911cdef911c2fff54b /core | |
parent | 7d9481bb12f77bde4df2e923b4e932773b8d74f9 (diff) | |
parent | 2cb7f65fb24926493d457f6931e421e27aa629da (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/fcron/PKGBUILD
community/glob2/PKGBUILD
community/gnash/PKGBUILD
core/file/PKGBUILD
core/findutils/PKGBUILD
core/texinfo/PKGBUILD
core/which/PKGBUILD
extra/boost/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/samba/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r-- | core/bash/PKGBUILD | 4 | ||||
-rw-r--r-- | core/bash/bash.install | 6 | ||||
-rw-r--r-- | core/file/PKGBUILD | 11 | ||||
-rw-r--r-- | core/findutils/PKGBUILD | 11 | ||||
-rw-r--r-- | core/glibc/PKGBUILD | 6 | ||||
-rw-r--r-- | core/grep/PKGBUILD | 6 | ||||
-rw-r--r-- | core/gzip/PKGBUILD | 6 | ||||
-rw-r--r-- | core/pkg-config/PKGBUILD | 6 | ||||
-rw-r--r-- | core/sed/PKGBUILD | 6 | ||||
-rw-r--r-- | core/shadow/PKGBUILD | 13 | ||||
-rw-r--r-- | core/shadow/lastlog.tmpfiles | 1 | ||||
-rw-r--r-- | core/texinfo/PKGBUILD | 8 | ||||
-rw-r--r-- | core/which/PKGBUILD | 6 |
13 files changed, 44 insertions, 46 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 631b28523..35d003961 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176041 2013-01-26 23:37:21Z allan $ +# $Id: PKGBUILD 176240 2013-01-28 00:29:18Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=042 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/core/bash/bash.install b/core/bash/bash.install index bc75e9b6a..a10e6e909 100644 --- a/core/bash/bash.install +++ b/core/bash/bash.install @@ -1,17 +1,13 @@ info_dir=usr/share/info info_files=(bash.info) -post_install() { +post_upgrade() { [ -x usr/bin/install-info ] || return 0 for f in ${info_files[@]}; do usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null done } -post_upgrade() { - post_install $1 -} - pre_remove() { [ -x usr/bin/install-info ] || return 0 for f in ${info_files[@]}; do diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 7a31a4078..717eec9a9 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 150976 2012-02-24 12:10:49Z allan $ +# $Id: PKGBUILD 176241 2013-01-28 00:29:18Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file pkgver=5.11 -pkgrel=1.1 +pkgrel=2 pkgdesc="File type identification utility" arch=('i686' 'x86_64' 'mips64el') license=('custom') -groups=('base') +groups=('base' 'base-devel') url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') @@ -17,18 +17,13 @@ md5sums=('16a407bd66d6c7a832f3a5c0d609c27b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#\$(datadir)/misc#\$(datadir)#' configure - ./configure --prefix=/usr --datadir=/usr/share/file make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/usr/share/misc - ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/core/findutils/PKGBUILD b/core/findutils/PKGBUILD index 30ba8883e..9a598efb0 100644 --- a/core/findutils/PKGBUILD +++ b/core/findutils/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 142108 2011-11-05 10:13:34Z tpowa $ +# $Id: PKGBUILD 176243 2013-01-28 00:29:21Z allan $ # Maintainer: pkgname=findutils pkgver=4.4.2 -pkgrel=4.2 +pkgrel=5 pkgdesc="GNU utilities to locate files" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -groups=('base') +groups=('base' 'base-devel') depends=('glibc' 'sh') url="http://www.gnu.org/software/findutils" -source=(ftp://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.gz) +source=(ftp://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.gz{,.sig}) install=findutils.install -sha1sums=('e8dd88fa2cc58abffd0bfc1eddab9020231bb024') +sha1sums=('e8dd88fa2cc58abffd0bfc1eddab9020231bb024' + '77d9585d9feea0814752a31bf109fe287f528243') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 425763386..4d767ff8b 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176038 2013-01-26 23:37:18Z allan $ +# $Id: PKGBUILD 176244 2013-01-28 00:29:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,13 +6,13 @@ pkgname=glibc pkgver=2.17 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.7' 'tzdata') +depends=('linux-api-headers>=3.7' 'tzdata' 'filesystem>=2013.01') makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 360d71c80..5c37c9bd7 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165540 2012-08-23 11:37:14Z allan $ +# $Id: PKGBUILD 176245 2013-01-28 00:29:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep pkgver=2.14 -pkgrel=1 +pkgrel=2 pkgdesc="A string search utility" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://www.gnu.org/software/grep/grep.html" -groups=('base') +groups=('base' 'base-devel') depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index 917c1facf..dc19ffa81 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 162088 2012-06-19 15:43:54Z allan $ +# $Id: PKGBUILD 176246 2013-01-28 00:29:24Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="GNU compression utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gzip/" license=('GPL3') -groups=('base') +groups=('base' 'base-devel') depends=('glibc' 'bash') install=gzip.install source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig}) diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD index c11e18966..a803d7e6a 100644 --- a/core/pkg-config/PKGBUILD +++ b/core/pkg-config/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165722 2012-08-29 10:30:07Z allan $ +# $Id: PKGBUILD 176247 2013-01-28 00:29:25Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=pkg-config -pkgver=0.27.1 +pkgver=0.28 pkgrel=1 pkgdesc="A system for managing library compile/link flags" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ provides=("pkgconfig=${pkgver}") conflicts=('pkgconfig') replaces=('pkgconfig') source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('5392b4e3372879c5bf856173b418d6a2') +md5sums=('aa3c86e67551adc3ac865160e34a2a0d') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index bbc9a1078..4dcccd0e8 100644 --- a/core/sed/PKGBUILD +++ b/core/sed/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 173887 2012-12-27 05:05:41Z allan $ +# $Id: PKGBUILD 176248 2013-01-28 00:29:26Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed pkgver=4.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNU stream editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/sed" license=('GPL3') -groups=('base') +groups=('base' 'base-devel') depends=('acl' 'sh') makedepends=('gettext') install=sed.install diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 7b9a5cab9..ce03fa0b1 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175159 2013-01-15 17:39:52Z dreisner $ +# $Id: PKGBUILD 176249 2013-01-28 00:29:28Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.5.1 -pkgrel=3 +pkgrel=4 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64' 'mips64el') url='http://pkg-shadow.alioth.debian.org/' @@ -29,7 +29,8 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{ shadow.cron.daily useradd.defaults xstrdup.patch - shadow-strncpy-usage.patch) + shadow-strncpy-usage.patch + lastlog.tmpfiles) sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' '126570e2939bf3b57f28df5197ab9309747a6b5c' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' @@ -42,7 +43,8 @@ sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' '6010fffeed1fc6673ad9875492e1193b1a847b53' - '21e12966a6befb25ec123b403cd9b5c492fe5b16') + '21e12966a6befb25ec123b403cd9b5c492fe5b16' + '87fa02bd73b774dfb6df3fd79e49efe5f48978dd') build() { cd "$pkgname-$pkgver" @@ -101,6 +103,9 @@ package() { install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" done + # lastlog log file creation + install -Dm644 "$srcdir/lastlog.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/lastlog.conf" + # Remove evil/broken tools rm "$pkgdir"/usr/sbin/logoutd diff --git a/core/shadow/lastlog.tmpfiles b/core/shadow/lastlog.tmpfiles new file mode 100644 index 000000000..d1602a729 --- /dev/null +++ b/core/shadow/lastlog.tmpfiles @@ -0,0 +1 @@ +f /var/log/lastlog diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD index a92e6661e..b46429998 100644 --- a/core/texinfo/PKGBUILD +++ b/core/texinfo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 145004 2011-12-13 23:40:32Z allan $ +# $Id: PKGBUILD 176250 2013-01-28 00:29:28Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=texinfo pkgver=4.13a -pkgrel=7.1 +pkgrel=8 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/texinfo/" license=('GPL3') -groups=('base') -depends=('ncurses' 'findutils' 'gzip') +groups=('base' 'base-devel') +depends=('ncurses' 'findutils' 'gzip' 'sh') install=texinfo.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} texinfo-4.13a-data_types.patch) diff --git a/core/which/PKGBUILD b/core/which/PKGBUILD index 3179d2058..ffa451e89 100644 --- a/core/which/PKGBUILD +++ b/core/which/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 142082 2011-11-04 23:36:20Z allan $ +# $Id: PKGBUILD 176251 2013-01-28 00:29:29Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=which pkgver=2.20 -pkgrel=5.1 +pkgrel=6 pkgdesc="A utility to show the full path of commands" arch=('i686' 'x86_64' 'mips64el') url="http://www.xs4all.nl/~carlo17/which" license=('GPL3') -groups=('base') +groups=('base' 'base-devel') depends=('glibc' 'sh') install=which.install source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz) |