Commit ad85c794 authored by philm's avatar philm

Merge branch 'testing' of gitorious.org:chakra-packages/core into testing

parents b5715d1a c603884a
......@@ -8,7 +8,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=b43-fwcutter
pkgver=013
pkgver=014
pkgrel=1
pkgdesc="firmware extractor for the bcm43xx kernel module"
url="http://linuxwireless.org/en/users/Drivers/b43"
......@@ -16,13 +16,16 @@ depends=('glibc')
license=('GPL')
arch=('i686' 'x86_64')
source=(http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2)
md5sums=('3547ec6c474ac1bc2c4a5bb765b791a4')
md5sums=('dd63f9149510bd6e01b89314e955083b')
build()
{
cd $startdir/src/$pkgname-$pkgver
make || return 1
install -D -m755 b43-fwcutter $startdir/pkg/usr/bin/b43-fwcutter || return 1
install -D -m644 b43-fwcutter.1 $startdir/pkg/usr/share/man/man1/b43-fwcutter.1 || return 1
build() {
cd $srcdir/$pkgname-$pkgver
make
}
package() {
cd $srcdir/$pkgname-$pkgver
install -D -m755 b43-fwcutter $pkgdir/usr/bin/b43-fwcutter
install -D -m644 b43-fwcutter.1 $pkgdir/usr/share/man/man1/b43-fwcutter.1
}
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=bc
pkgver=1.06
pkgrel=7
pkgrel=8
pkgdesc="An arbitrary precision calculator language"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/bc/"
......
# $Id: PKGBUILD 76085 2010-04-07 18:00:10Z tpowa $
# Maintainer: 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=cpio
pkgver=2.11
pkgrel=2
pkgrel=3
pkgdesc="A tool to copy files into or out of a cpio or tar archive"
arch=(i686 x86_64)
license=('GPL')
......
# $Id: PKGBUILD 67245 2010-02-05 22:53:48Z thomas $
# Maintainer: Thomas Bächler <thomas@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=cryptsetup
pkgver=1.1.0
pkgrel=2
pkgver=1.3.1
pkgrel=1
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
arch=(i686 x86_64)
license=('GPL')
url="http://code.google.com/p/cryptsetup/"
groups=('base')
depends=('device-mapper' 'libgcrypt' 'popt' 'e2fsprogs')
depends=('device-mapper' 'libgcrypt' 'popt')
conflicts=('mkinitcpio<0.5.99')
options=('!libtool' '!emptydirs')
source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
encrypt_hook
encrypt_install)
sha256sums=('b343fa6bf3c48b633e68da25e44aebd6a32a3dc21c10604acd6faa04e41f58f3'
sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a'
'64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc'
'8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a')
md5sums=('8177f1833f4d6aaacc5812046d2010b6'
'1b25c0aca2cfd0306dd70de1888cb5b8'
'69af34d82690ce8204ce2d249c24be7a')
'07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa')
build() {
cd $srcdir/$pkgname-${pkgver}
./configure --prefix=/usr --disable-static
make || return 1
make DESTDIR=$pkgdir install
# include a static cryptsetup binary for initrd setups
make clean
./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
make
}
package() {
cd $srcdir/$pkgname-${pkgver}
./configure --prefix=/usr --enable-static
make || return 1
install -D -m755 src/cryptsetup $pkgdir/sbin/cryptsetup.static || return 1
make DESTDIR=$pkgdir install
# install hook
install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt || return 1
install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt || return 1
install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt
install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt
# Fix pkgconfig location
install -d -m755 $pkgdir/usr/lib
mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/
}
......@@ -16,6 +16,7 @@ install ()
add_file "/lib/udev/rules.d/10-dm.rules"
add_file "/lib/udev/rules.d/13-dm-disk.rules"
add_file "/lib/udev/rules.d/95-dm-notify.rules"
add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
}
help ()
......
......@@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=dhcpcd
pkgver=5.2.8
pkgver=5.2.12
pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/dhcpcd/"
......@@ -17,7 +17,7 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
'dhcpcd.conf.d')
sha1sums=('3a7ffc6d3599fd4146791853b083dc577d8dd9c0'
sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
'b67b9ce6a2faaca75fea356966a16be2283b7db0')
build() {
......
# $Id: PKGBUILD 79537 2010-05-04 12:05:07Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
#
# Chakra 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>
pkgname=diffutils
pkgver=3.0
pkgrel=1
pkgrel=2
pkgdesc="Utility programs used for creating patch files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/diffutils"
......
# $Id: PKGBUILD 65356 2010-01-28 04:43:43Z 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=file
pkgver=5.04
pkgrel=2
pkgver=5.07
pkgrel=1
pkgdesc="File type identification utility"
arch=('i686' 'x86_64')
license=('custom')
......@@ -12,14 +17,27 @@ groups=('base')
url="http://www.darwinsys.com/file/"
depends=('glibc' 'zlib')
options=('!libtool')
source=(ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz)
md5sums=('accade81ff1cc774904b47c72c8aeea0')
source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz
file-5.05-zip64.patch
file-5.07-zip-detect.patch)
md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
'385f020467debd98bd2d8df6143f93d0'
'bcbf2e152f38003a2736298bbd0f37f8')
build() {
cd ${srcdir}/$pkgname-$pkgver
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
# identify zip64 files
patch -Np1 -i ${srcdir}/file-5.05-zip64.patch
patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
./configure --prefix=/usr --datadir=/usr/share/file
make || return 1
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
......
diff -Naur file-5.05-old//magic/Magdir/archive file-5.05/magic/Magdir/archive
--- file-5.05-old//magic/Magdir/archive 2011-01-08 06:24:25.000000000 +1000
+++ file-5.05/magic/Magdir/archive 2011-01-19 14:37:47.766673895 +1000
@@ -688,6 +688,7 @@
>>4 byte 0x0b \b, at least v1.1 to extract
>>0x161 string WINZIP \b, WinZIP self-extracting
>>4 byte 0x14 \b, at least v2.0 to extract
+>>4 byte 0x2d \b, at least v3.0 to extract
# Zoo archiver
20 lelong 0xfdc4a7dc Zoo archive data
--- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200
+++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200
@@ -654,6 +654,10 @@
>>>>78 string -template Template
!:mime application/vnd.oasis.opendocument.image-template
+>26 byte x Zip archive data
+
+
+
# StarView Metafile
# From Pierre Ducroquet <pinaraf@pinaraf.info>
0 string VCLMTF StarView MetaFile
......@@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=iasl
pkgver=20101013
pkgver=20110527
pkgrel=1
pkgdesc="Intel ACPI Source Language compiler"
arch=('i686' 'x86_64')
......@@ -15,13 +15,14 @@ depends=('glibc')
makedepends=('flex' 'bison')
options=('!makeflags')
install=iasl.install
source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz LICENSE)
md5sums=('9bed41223562c3d8f84b69d28df945ed'
'8615526144f69ea4e870d9bc37df9b29')
source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz LICENSE iaslcompileparse.patch)
md5sums=('82c507fec0dba78dc8562a019aaf6e23'
'8615526144f69ea4e870d9bc37df9b29'
'e2aa959b3da50ebd2146de9b47d9ecd6')
build() {
cd "${srcdir}/acpica-unix-${pkgver}/compiler"
patch -Np1 -i ${srcdir}/iaslcompileparse.patch
make
install -D -m755 iasl "${pkgdir}/usr/bin/iasl"
......
--- acpica-unix-20110527/compiler/aslcompiler.h.orig 2011-05-27
17:25:04.000000000 +0200
+++ acpica-unix-20110527/compiler/aslcompiler.h 2011-05-27 21:47:40.338767397
+0200
@@ -361,7 +361,7 @@
int
AslCompilererror(
- char *s);
+ const char *s);
void
AslCommonError (
--- acpica-unix-20110527/compiler/aslerror.c.orig 2011-05-27
17:25:04.000000000 +0200
+++ acpica-unix-20110527/compiler/aslerror.c 2011-05-27 21:47:26.495147836
+0200
@@ -692,7 +692,7 @@
int
AslCompilererror (
- char *CompilerMessage)
+ const char *CompilerMessage)
{
AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, Gbl_CurrentLineNumber,
\ No newline at end of file
# $Id: PKGBUILD 71573 2010-03-07 19:09:56Z paul $
# Maintainer: tobias [ tobias at 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=vi
pkgver=050325
pkgrel=3
pkgrel=4
pkgdesc='The original ex/vi text editor.'
arch=('i686' 'x86_64')
url='http://ex-vi.sourceforge.net/'
......@@ -12,29 +18,29 @@ depends=('ncurses')
groups=('base')
options=(force strip !libtool emptydirs)
source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
navkeys.patch increase-tube.patch exrc.sample)
navkeys.patch increase-tube.patch exrc.sample preserve_dir.patch)
md5sums=('e668595254233e4d96811083a3e4e2f3' 'aac133930047eafa4f28736cfaf976b3'
'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668')
'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668'
'419a8755e0dd16e95542bc107e6d2b24')
build() {
cd ${srcdir}/ex-${pkgver} || return 1
cd "${srcdir}/ex-${pkgver}"
# apply patches
patch -Np1 -i ../navkeys.patch || return 1
patch -Np0 -i ../increase-tube.patch || return 1
# correct paths in manpages
sed -i -e 's/^\.B \/usr\/libexec/.B \/usr\/lib\/ex/' vi.1 \
|| return 1
sed -i -e 's/^\.B \/var\/preserve$/.B \/var\/lib\/ex/' vi.1 \
|| return 1
patch -Np1 -i ../navkeys.patch
patch -Np0 -i ../increase-tube.patch
# FS#20653
patch -Np1 -i ../preserve_dir.patch
make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses \
|| return 1
'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
}
package() {
cd "${srcdir}/ex-${pkgver}"
make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \
"DESTDIR=$pkgdir" install || return 1
DESTDIR="$pkgdir" install
install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE \
|| return 1
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
--- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500
+++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500
@@ -1950,7 +1950,7 @@
.B /var/tmp/Rx\fInnnnnnnnnn\fP
named buffer temporary
.TP
-.B /var/preserve
+.B /var/lib/ex
preservation directory
.SH DOCUMENTATION
The document
diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
--- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500
+++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500
@@ -272,7 +272,7 @@
#ifdef notdef
char pattern[] = "/usr/preserve/Exaa`XXXXX";
#else
-char pattern[] = "/var/preserve/Exa`XXXXXXXXXX";
+char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX";
#endif
/*
@@ -296,7 +296,7 @@
timestamp = ctime(&time);
timestamp[16] = 0; /* blast from seconds on */
putenv("MAILRC=/dev/null");
- sprintf(cmd, "/bin/mail %s", pp->pw_name);
+ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
setuid(getuid());
mf = popen(cmd, "w");
if (mf == NULL)
diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
--- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500
+++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500
@@ -167,7 +167,7 @@
#ifdef notdef
char mydir[] = "/usr/preserve";
#else
-char mydir[] = "/var/preserve";
+char mydir[] = "/var/lib/ex";
#endif
/*
diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec
--- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500
+++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500
@@ -20,7 +20,7 @@
%define libexecdir %{prefix}/5lib
%define mandir %{prefix}/share/man/5man
-%define preservedir /var/preserve
+%define preservedir /var/lib/ex
# install command
%define ucbinstall install
diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
+++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
@@ -83,7 +83,7 @@
BINDIR = $(PREFIX)/bin
LIBEXECDIR = $(PREFIX)/libexec
MANDIR = $(PREFIX)/share/man
-PRESERVEDIR = /var/preserve
+PRESERVEDIR = /var/lib/ex
#
# DESTDIR is prepended to the installation paths. It is mostly useful
diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
--- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500
+++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500
@@ -979,7 +979,7 @@
.B /var/tmp/Rx\fInnnnnnnnnn\fP
named buffer temporary
.TP
-.B /var/preserve
+.B /var/lib/ex
preservation directory
.SH SEE ALSO
ex(1),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment