summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/expat/PKGBUILD2
-rw-r--r--core/gmp/PKGBUILD2
-rw-r--r--core/keyutils/PKGBUILD12
-rw-r--r--core/libgcrypt/PKGBUILD16
-rw-r--r--core/libgpg-error/PKGBUILD9
-rw-r--r--core/openssl/PKGBUILD28
-rw-r--r--core/openssl/openssl-1.0.1a_cpu.patch15
-rw-r--r--core/openssl/vpaes.patch69
-rw-r--r--core/pkg-config/PKGBUILD2
-rw-r--r--core/popt/PKGBUILD16
-rw-r--r--core/readline/PKGBUILD15
-rw-r--r--core/rfkill/PKGBUILD7
-rw-r--r--core/xfsprogs/PKGBUILD6
13 files changed, 123 insertions, 76 deletions
diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD
index 9a06455d7..a57f076ff 100644
--- a/core/expat/PKGBUILD
+++ b/core/expat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155403 2012-04-03 11:10:06Z allan $
+# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index fdf85819b..e2ddd4af4 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150226 2012-02-15 09:53:48Z allan $
+# $Id: PKGBUILD 156203 2012-04-16 03:46:32Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD
index 5a9db6545..65d6a8718 100644
--- a/core/keyutils/PKGBUILD
+++ b/core/keyutils/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 144590 2011-12-07 12:54:45Z stephane $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 156455 2012-04-18 12:20:44Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=keyutils
pkgver=1.5.5
-pkgrel=1
+pkgrel=2
pkgdesc="Linux Key Management Utilities"
arch=(i686 x86_64 'mips64el')
url="http://www.kernel.org"
@@ -10,15 +11,14 @@ license=('GPL2' 'LGPL2.1')
depends=('glibc' 'sh')
backup=(etc/request-key.conf)
source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9e8ab5164bc8f84be148761cc89e9d6f')
+md5sums=('d759680b2f23c99af95938f5026f25fb')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i "s|/lib64|/lib|g" Makefile
make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install
}
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index ec4077548..84aa8284c 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $
+# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=libgcrypt
pkgver=1.5.0
-pkgrel=1
+pkgrel=3
pkgdesc="a general purpose crypto library based on the code used"
arch=(i686 x86_64 'mips64el')
url="http://www.gnupg.org"
license=('LGPL')
-depends=('libgpg-error>=1.9')
+depends=('libgpg-error>=1.10-2')
options=('!libtool' '!emptydirs')
install=$pkgname.install
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2
@@ -18,24 +18,18 @@ sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support"
./configure --prefix=/usr \
--disable-static \
- --disable-padlock-support $EXTRAFLAGS
+ --disable-padlock-support #$EXTRAFLAGS
make
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
- make -k check
+ make check
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-
- # Move dynamic libraries to /lib
- install -d -m755 "${pkgdir}"/lib/
- mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/
- ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so
}
diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD
index d24c58623..382465a09 100644
--- a/core/libgpg-error/PKGBUILD
+++ b/core/libgpg-error/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132298 2011-07-22 15:47:59Z andyrtr $
+# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=libgpg-error
pkgver=1.10
-pkgrel=1
+pkgrel=2
pkgdesc="Support library for libgcrypt"
arch=(i686 x86_64 'mips64el')
url="http://www.gnupg.org"
@@ -29,9 +29,4 @@ check() {
package() {
cd "${srcdir}"/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}/" install
-
- # Move dynamic libraries to /lib
- install -d -m755 "${pkgdir}"/lib/
- mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/
- ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so
}
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 4835d5941..64fc2220d 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $
+# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl
-_ver=1.0.1
+_ver=1.0.1a
# use a pacman compatible version scheme
-# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgver=$_ver
-pkgrel=2
+pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+#pkgver=$_ver
+pkgrel=1
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64' 'mips64el')
url='https://www.openssl.org'
@@ -18,15 +18,13 @@ backup=('etc/ssl/openssl.cnf')
source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
'fix-manpages.patch'
'no-rpath.patch'
- 'gnu-linux-mips64el-gcc.patch'
'ca-dir.patch'
- 'disable-tls12-client.patch')
-md5sums=('134f168bc2a8333f19f81d684841710b'
+ 'openssl-1.0.1a_cpu.patch')
+md5sums=('a0104320c0997cd33e18b8ea798609d1'
'5bbc0655bda2af95bc8eb568963ce8ba'
'dc78d3d06baffc16217519242ce92478'
- 'd7115f0cc44df346d7b68c681819f94b'
'3bf51be3a1bbd262be46dc619f92aa90'
- '26432b9d7af63c63828b6405c9185400')
+ '8edaef3ee595707c18fcbd7dafae940f')
build() {
cd $srcdir/$pkgname-$_ver
@@ -38,10 +36,9 @@ build() {
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
- # workaround for PR#2771
- patch -p1 -i $srcdir/disable-tls12-client.patch
-
-# patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch
+ # fix building on non-x86
+ # see http://rt.openssl.org/Ticket/Display.html?id=2795&user=guest&pass=guest
+ patch -p1 -i $srcdir/openssl-1.0.1a_cpu.patch
case "${CARCH}" in
'x86_64')
@@ -50,9 +47,6 @@ build() {
'i686')
openssltarget='linux-elf' ;;
'mips64el')
-# ./config
- # Broken.
- # openssltarget='gnu-linux-mips64el-gcc' ;;
openssltarget='linux-generic32' ;;
esac
diff --git a/core/openssl/openssl-1.0.1a_cpu.patch b/core/openssl/openssl-1.0.1a_cpu.patch
new file mode 100644
index 000000000..a6b85988a
--- /dev/null
+++ b/core/openssl/openssl-1.0.1a_cpu.patch
@@ -0,0 +1,15 @@
+--- openssl-1.0.1a/crypto/evp/e_rc4_hmac_md5.c Wed Apr 18 17:51:33 2012
++++ /tmp/e_rc4_hmac_md5.c Thu Apr 19 14:28:41 2012
+@@ -289,8 +289,12 @@
+
+ const EVP_CIPHER *EVP_rc4_hmac_md5(void)
+ {
++#if defined(STITCHED_CALL)
+ extern unsigned int OPENSSL_ia32cap_P[];
+ /* RC4_CHAR flag ------------vvvvv */
+ return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher);
++#else
++ return(&r4_hmac_md5_cipher);
++#endif
+ }
+ #endif
diff --git a/core/openssl/vpaes.patch b/core/openssl/vpaes.patch
new file mode 100644
index 000000000..2688b0c0a
--- /dev/null
+++ b/core/openssl/vpaes.patch
@@ -0,0 +1,69 @@
+Index: openssl/crypto/aes/asm/vpaes-x86.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
+rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null
+--- vpaes-x86.pl 2011/12/15 22:20:26 1.5.4.4
++++ vpaes-x86.pl 2012/03/31 16:55:18 1.5.4.5
+@@ -843,6 +843,8 @@
+ &mov ($out,&wparam(1)); # out
+ &mov ($round,&wparam(2)); # len
+ &mov ($key,&wparam(3)); # key
++ &sub ($round,16);
++ &jc (&label("cbc_abort"));
+ &lea ($base,&DWP(-56,"esp"));
+ &mov ($const,&wparam(4)); # ivp
+ &and ($base,-16);
+@@ -853,7 +855,6 @@
+ &mov (&DWP(48,"esp"),$base);
+
+ &mov (&DWP(0,"esp"),$out); # save out
+- &sub ($round,16);
+ &mov (&DWP(4,"esp"),$key) # save key
+ &mov (&DWP(8,"esp"),$const); # save ivp
+ &mov ($out,$round); # $out works as $len
+@@ -896,6 +897,7 @@
+ &mov ($base,&DWP(8,"esp")); # restore ivp
+ &mov ("esp",&DWP(48,"esp"));
+ &movdqu (&QWP(0,$base),"xmm1"); # write IV
++&set_label("cbc_abort");
+ &function_end("${PREFIX}_cbc_encrypt");
+
+ &asm_finish();
+Index: openssl/crypto/aes/asm/vpaes-x86_64.pl
+RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v
+rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null
+--- vpaes-x86_64.pl 2011/11/14 21:01:17 1.4.4.2
++++ vpaes-x86_64.pl 2012/03/31 16:55:18 1.4.4.3
+@@ -263,7 +263,7 @@
+ pshufb %xmm2, %xmm4 # 4 = sbou
+ pxor %xmm0, %xmm4 # 4 = sb1u + k
+ movdqa 0x70(%r10), %xmm0 # 0 : sbot
+- movdqa .Lk_sr-.Lk_dsbd(%r11), %xmm2
++ movdqa -0x160(%r11), %xmm2 # .Lk_sr-.Lk_dsbd=-0x160
+ pshufb %xmm3, %xmm0 # 0 = sb1t
+ pxor %xmm4, %xmm0 # 0 = A
+ pshufb %xmm2, %xmm0
+@@ -869,6 +869,8 @@
+ ___
+ ($len,$key)=($key,$len);
+ $code.=<<___;
++ sub \$16,$len
++ jc .Lcbc_abort
+ ___
+ $code.=<<___ if ($win64);
+ lea -0xb8(%rsp),%rsp
+@@ -887,7 +889,6 @@
+ $code.=<<___;
+ movdqu ($ivp),%xmm6 # load IV
+ sub $inp,$out
+- sub \$16,$len
+ call _vpaes_preheat
+ cmp \$0,${enc}d
+ je .Lcbc_dec_loop
+@@ -932,6 +933,7 @@
+ .Lcbc_epilogue:
+ ___
+ $code.=<<___;
++.Lcbc_abort:
+ ret
+ .size ${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt
+ ___
diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD
index ed96f3380..edaaa0a5e 100644
--- a/core/pkg-config/PKGBUILD
+++ b/core/pkg-config/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142076 2011-11-04 23:36:11Z allan $
+# $Id: PKGBUILD 156205 2012-04-16 03:57:28Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD
index 09ec1ca1a..504665858 100644
--- a/core/popt/PKGBUILD
+++ b/core/popt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142191 2011-11-06 02:28:05Z stephane $
+# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=popt
pkgver=1.16
-pkgrel=4
+pkgrel=5
pkgdesc="A commandline option parser"
arch=('i686' 'x86_64' 'mips64el')
url="http://rpm5.org"
@@ -15,7 +15,7 @@ license=('custom')
depends=('glibc')
options=('!libtool')
source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3743beefa3dd6247a73f8f7a32c14c33')
+sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,15 +28,5 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- # move libs in /lib
- install -Dm755 "${pkgdir}"/usr/lib/libpopt.so.0.0.0 \
- ${pkgdir}/lib/libpopt.so.0.0.0
-
- rm "${pkgdir}"/usr/lib/libpopt.so*
- ln -sf /lib/libpopt.so "${pkgdir}"/usr/lib/libpopt.so
- ln -sf libpopt.so.0 "${pkgdir}"/lib/libpopt.so
- ln -sf libpopt.so.0.0.0 "${pkgdir}"/lib/libpopt.so.0
-
- # install license
install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD
index e86d50fcb..b2f59ddbc 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143254 2011-11-24 01:36:28Z allan $
+# $Id: PKGBUILD 156214 2012-04-16 06:12:04Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
@@ -6,7 +6,7 @@ pkgname=readline
_basever=6.2
_patchlevel=002 #prepare for some patches
pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=2
pkgdesc="GNU readline library"
arch=('i686' 'x86_64' 'mips64el')
url="http://tiswww.case.edu/php/chet/readline/rltop.html"
@@ -43,7 +43,7 @@ build() {
# build with -fPIC for x86_64 (FS#15634)
[ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
- ./configure --prefix=/usr --libdir=/lib
+ ./configure --prefix=/usr
make SHLIB_LIBS=-lncurses
}
@@ -52,13 +52,4 @@ package() {
make DESTDIR=${pkgdir} install
install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
-
- # FHS recommends only shared libs in /lib
- install -dm755 $pkgdir/usr/lib
- mv $pkgdir/lib/*.a $pkgdir/usr/lib
-
- # to make the linker find the shared lib and fix compile issues
- cd ${pkgdir}/usr/lib
- ln -sv /lib/libreadline.so .
- ln -sv /lib/libhistory.so .
}
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 040eef5b6..611229827 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 142840 2011-11-16 20:25:37Z dan $
+# $Id: PKGBUILD 156346 2012-04-17 15:19:00Z bisson $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=rfkill
pkgver=0.4
-pkgrel=3
+pkgrel=4
pkgdesc="A tool for enabling and disabling wireless devices"
arch=('i686' 'x86_64' 'mips64el')
url="http://linuxwireless.org/en/users/Documentation/rfkill"
license=('custom')
-depends=('glibc' 'filesystem>=2010.01')
source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
60-rfkill.rules
rfkill.conf.d
@@ -31,7 +30,7 @@ package() {
# License
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
# Udev rule
- install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules"
+ install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
# Init script
install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill"
install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill"
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index e4fcf373b..f3b848d07 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 142968 2011-11-19 08:45:36Z tpowa $
+# $Id: PKGBUILD 156218 2012-04-16 08:21:43Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
pkgname=xfsprogs
-pkgver=3.1.7
+pkgver=3.1.8
pkgrel=1
pkgdesc="XFS filesystem utilities"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('util-linux-ng>=2.16')
options=('!makeflags' '!libtool')
# We mirror the sources as upstream tends to move them once a new release is out
source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
-md5sums=('049cf9873794ea49d0bb3f12d45748a4')
+md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-17 10:24:49 +0000