diff options
25 files changed, 1049 insertions, 154 deletions
diff --git a/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch new file mode 100644 index 000000000..572ca97fd --- /dev/null +++ b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch @@ -0,0 +1,206 @@ +From e467755fac27630730be25c4b41e5d0cfcd89c67 Mon Sep 17 00:00:00 2001 +From: Ian Kent <raven@themaw.net> +Date: Tue, 10 Aug 2010 15:48:21 +0800 +Subject: [PATCH 1/2] autofs-5.0.5 - include krb5 library + +Since the Cyrus SASL module calls Kerberos directly we should be +linking against the Kerberos librarys. +--- + Makefile.conf.in | 2 + + aclocal.m4 | 19 +++++++++++++++ + configure | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++- + configure.in | 5 +++- + modules/Makefile | 4 +- + 5 files changed, 93 insertions(+), 4 deletions(-) + +diff --git a/Makefile.conf.in b/Makefile.conf.in +index f0287c3..a9bcf8c 100644 +--- a/Makefile.conf.in ++++ b/Makefile.conf.in +@@ -31,6 +31,8 @@ XML_FLAGS = @XML_FLAGS@ + SASL = @HAVE_SASL@ + LIBSASL= @LIBSASL@ + SASL_FLAGS = @SASL_FLAGS@ ++KRB5_LIBS=@KRB5_LIBS@ ++KRB5_FLAGS=@KRB5_FLAGS@ + + # NIS+ support: yes (1) no (0) + NISPLUS = @HAVE_NISPLUS@ +diff --git a/aclocal.m4 b/aclocal.m4 +index e7f1a30..750a159 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -215,6 +215,25 @@ else + fi]) + + dnl -------------------------------------------------------------------------- ++dnl AF_CHECK_KRB5 ++dnl ++dnl Check for Kerberos 5 ++dnl -------------------------------------------------------------------------- ++AC_DEFUN([AF_CHECK_KRB5], ++[AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no) ++AC_MSG_CHECKING(for Kerberos library) ++if test "$KRB5_CONFIG" = "no" ++then ++ AC_MSG_RESULT(no) ++ HAVE_KRB5=0 ++else ++ AC_MSG_RESULT(yes) ++ HAVE_KRB5=1 ++ KRB5_LIBS=`$KRB5_CONFIG --libs` ++ KRB5_FLAGS=`$KRB5_CONFIG --cflags` ++fi]) ++ ++dnl -------------------------------------------------------------------------- + dnl AF_CHECK_LIBHESIOD + dnl + dnl Check for lib hesiod +diff --git a/configure b/configure +index 159f25f..500411c 100755 +--- a/configure ++++ b/configure +@@ -640,6 +640,8 @@ ac_subst_vars='LTLIBOBJS + LIBOBJS + DAEMON_LDFLAGS + DAEMON_CFLAGS ++KRB5_FLAGS ++KRB5_LIBS + LIBSASL + HAVE_SASL + SASL_FLAGS +@@ -657,6 +659,7 @@ LIBHESIOD + HAVE_HESIOD + LIBRESOLV + LIBNSL ++KRB5_CONFIG + XML_CONFIG + PATH_RPCGEN + RPCGEN +@@ -3723,7 +3726,7 @@ $as_echo "no" >&6; } + fi + fi + +-# LDAP SASL auth need libxml ++# LDAP SASL auth needs libxml and Kerberos + for ac_prog in xml2-config + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -3801,6 +3804,66 @@ _ACEOF + fi + fi + fi ++for ac_prog in krb5-config ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ case $KRB5_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG ++if test -n "$KRB5_CONFIG"; then ++ { $as_echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5 ++$as_echo "$KRB5_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$KRB5_CONFIG" && break ++done ++test -n "$KRB5_CONFIG" || KRB5_CONFIG="no" ++ ++{ $as_echo "$as_me:$LINENO: checking for Kerberos library" >&5 ++$as_echo_n "checking for Kerberos library... " >&6; } ++if test "$KRB5_CONFIG" = "no" ++then ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ HAVE_KRB5=0 ++else ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ HAVE_KRB5=1 ++ KRB5_LIBS=`$KRB5_CONFIG --libs` ++ KRB5_FLAGS=`$KRB5_CONFIG --cflags` ++fi + + # + # glibc/libc 6 new libraries +@@ -5178,6 +5241,8 @@ fi + + + ++ ++ + LDFLAGS="${AF_tmp_ldflags}" + + # +diff --git a/configure.in b/configure.in +index f649a58..70b45e8 100644 +--- a/configure.in ++++ b/configure.in +@@ -144,8 +144,9 @@ AF_CHECK_PROG(RPCGEN, rpcgen, , $searchpath) + # + AF_SLOPPY_MOUNT() + +-# LDAP SASL auth need libxml ++# LDAP SASL auth needs libxml and Kerberos + AF_CHECK_LIBXML() ++AF_CHECK_KRB5() + + # + # glibc/libc 6 new libraries +@@ -274,6 +275,8 @@ AC_SUBST(XML_LIBS) + AC_SUBST(SASL_FLAGS) + AC_SUBST(HAVE_SASL) + AC_SUBST(LIBSASL) ++AC_SUBST(KRB5_LIBS) ++AC_SUBST(KRB5_FLAGS) + LDFLAGS="${AF_tmp_ldflags}" + + # +diff --git a/modules/Makefile b/modules/Makefile +index 13b3bd8..2389196 100644 +--- a/modules/Makefile ++++ b/modules/Makefile +@@ -42,8 +42,8 @@ ifeq ($(LDAP), 1) + MODS += lookup_ldap.so + ifeq ($(SASL), 1) + SASL_OBJ = cyrus-sasl.o +- LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE +- LIBLDAP += $(LIBSASL) $(XML_LIBS) ++ LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) $(KRB5_FLAGS) -DLDAP_THREAD_SAFE ++ LIBLDAP += $(LIBSASL) $(XML_LIBS) $(KRB5_LIBS) + endif + endif + +-- +1.7.5.1 + diff --git a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch new file mode 100644 index 000000000..e4e480e82 --- /dev/null +++ b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch @@ -0,0 +1,59 @@ +From 205c305922cdbded91ff8fadbaad7959bdb497bc Mon Sep 17 00:00:00 2001 +From: Ian Kent <raven@themaw.net> +Date: Wed, 11 Aug 2010 09:33:09 +0800 +Subject: [PATCH 2/2] autofs-5.0.5 - remove ERR_remove_state() openssl call + +autofs should never have had to use ERR_remove_state() so remove that call. + +Lukas: Resolve a conflict in "CHANGELOG" that occured due to cherry +picking Kerberos related patches from the 5.0.6 development branch. + +Conflicts: + + CHANGELOG + +Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> +--- + CHANGELOG | 4 ++++ + modules/lookup_ldap.c | 12 +----------- + 2 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index e734cb3..1a20a81 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++??/??/20?? autofs-5.0.6 ++----------------------- ++- remove ERR_remove_state() openssl call. ++ + 03/09/2009 autofs-5.0.5 + ----------------------- + - fix dumb libxml2 check +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index 2ecf5fe..1221c2c 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -168,18 +168,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c + int rv; + + #ifdef WITH_SASL +- /* +- * The OpenSSL library can't handle having its message and error +- * string database loaded multiple times and segfaults if the +- * TLS environment is not reset at the right times. As there +- * is no ldap_stop_tls call in the openldap library we have +- * to do the job ourselves, here and in lookup_done when the +- * module is closed. +- */ +- if (ctxt->use_tls == LDAP_TLS_RELEASE) { +- ERR_remove_state(0); ++ if (ctxt->use_tls == LDAP_TLS_RELEASE) + ctxt->use_tls = LDAP_TLS_INIT; +- } + autofs_sasl_unbind(ctxt); + #endif + +-- +1.7.5.1 + diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 11ac57ec1..6516f9736 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $ +# $Id: PKGBUILD 47057 2011-05-15 17:16:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=autofs pkgver=5.0.5 -pkgrel=6 +pkgrel=7 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') url='http://freshmeat.net/projects/autofs' @@ -18,11 +18,15 @@ backup=('etc/autofs/auto.master' options=(!makeflags) install='autofs.install' source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" + "0001-${pkgname}-5.0.5-include-krb5-library.patch" + "0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch" 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc') md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' + '478737b8e3e79365a0e183aa95aab307' + 'e347999e5dffe142e7e57b067d3d9e9f' 'e307bf6d2638e46eeb916cf42fe029b2' '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' @@ -34,6 +38,9 @@ build() { sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ Makefile.rules + patch -p1 -i "../0001-${pkgname}-5.0.5-include-krb5-library.patch" + patch -p1 -i "../0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch" + ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ --enable-ignore-busy make diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index 091830228..2aee17a20 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44211 2011-04-04 13:30:46Z lfleischer $ +# $Id: PKGBUILD 47062 2011-05-15 17:37:33Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif pkgver=1.0.4 -pkgrel=2 +pkgrel=3 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64') url='http://minbif.im/' @@ -24,7 +24,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ - ENABLE_VIDEO=ON ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF + ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF } package() { diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD new file mode 100644 index 000000000..828951df8 --- /dev/null +++ b/community/mplayer2/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 46583 2011-05-09 18:34:40Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Bartek Piotrowski <barthalion@gmail.com> + +pkgname=mplayer2 +pkgver=2.0 +pkgrel=12 +pkgdesc="A movie player" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.mplayer2.org/" +depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' + 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123') +makedepends=('live-media' 'mesa' 'unzip' 'yasm') +backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') +provides=('mplayer') +conflicts=('mplayer') +source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz + mplayer2-remove-mp3lib.patch) +sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' + 'c55128a99406a5e01ab077555b7b24aa7b54110c') +options=('!emptydirs') + +build() { + # Custom CFLAGS break the mplayer build + unset CFLAGS LDFLAGS + + cd "${srcdir}/${pkgname}-${pkgver}" + + # Drop internal mp3lib (FS#24149) + # Default decoder for mp3 will be mpg123 + rm -fr mp3lib + patch -Np1 -i ../mplayer2-remove-mp3lib.patch + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-arts \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --enable-xvmc \ + --language=all \ + --enable-translation \ + --confdir=/etc/mplayer + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ + install -dm755 "${pkgdir}"/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf +} diff --git a/community/mplayer2/mplayer2-remove-mp3lib.patch b/community/mplayer2/mplayer2-remove-mp3lib.patch new file mode 100644 index 000000000..057a91295 --- /dev/null +++ b/community/mplayer2/mplayer2-remove-mp3lib.patch @@ -0,0 +1,297 @@ +diff -Naur mplayer2-2.0.ori/configure mplayer2-2.0/configure +--- mplayer2-2.0.ori/configure 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/configure 2011-05-09 14:11:10.717630210 -0400 +@@ -376,7 +376,6 @@ + --disable-mad disable libmad (MPEG audio) support [autodetect] + --enable-xmms enable XMMS input plugin support [disabled] + --enable-libdca enable libdca support [autodetect] +- --disable-mp3lib disable builtin mp3lib [autodetect] + --disable-liba52 disable liba52 [autodetect] + --enable-musepack enable libmpcdec support (deprecated, libavcodec + Musepack decoder is preferred) [disabled] +@@ -610,7 +609,6 @@ + _speex=auto + _theora=auto + _mpg123=auto +-_mp3lib=auto + _liba52=auto + _libdca=auto + _faad=auto +@@ -965,8 +963,6 @@ + --disable-theora) _theora=no ;; + --enable-mpg123) _mpg123=yes ;; + --disable-mpg123) _mpg123=no ;; +- --enable-mp3lib) _mp3lib=yes ;; +- --disable-mp3lib) _mp3lib=no ;; + --enable-liba52) _liba52=yes ;; + --disable-liba52) _liba52=no ;; + --enable-libdca) _libdca=yes ;; +@@ -5731,19 +5727,6 @@ + fi + echores "$_theora" + +-echocheck "mp3lib support" +-if test "$_mp3lib" = auto ; then +- test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes +-fi +-if test "$_mp3lib" = yes ; then +- def_mp3lib='#define CONFIG_MP3LIB 1' +- codecmodules="mp3lib(internal) $codecmodules" +-else +- def_mp3lib='#undef CONFIG_MP3LIB' +- nocodecmodules="mp3lib(internal) $nocodecmodules" +-fi +-echores "$_mp3lib" +- + # Any version of libmpg123 shall be fine. + echocheck "mpg123 support" + def_mpg123='#undef CONFIG_MPG123' +@@ -6823,7 +6806,6 @@ + MD5SUM = $_md5sum + MGA = $_mga + MNG = $_mng +-MP3LIB = $_mp3lib + MPG123 = $_mpg123 + MUSEPACK = $_musepack + NAS = $_nas +@@ -7084,7 +7066,6 @@ + $def_libdca + $def_libdv + $def_mad +-$def_mp3lib + $def_mpg123 + $def_musepack + $def_speex +diff -Naur mplayer2-2.0.ori/etc/codecs.conf mplayer2-2.0/etc/codecs.conf +--- mplayer2-2.0.ori/etc/codecs.conf 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/etc/codecs.conf 2011-05-09 14:11:10.717630210 -0400 +@@ -4220,23 +4220,6 @@ + driver ffmpeg + dll "sonic" + +-audiocodec mp3 +- ; this is preferred over ffmp2/ffmp3 since it is faster due to using +- ; floating point and there are even broken mkv files where the audio +- ; needs to be parsed, making this codec work more reliably +- info "mp3lib MPEG layer-2, layer-3" +- status working +- comment "Optimized to MMX/SSE/3Dnow!" +- format 0x50 ; layer-1 && layer-2 +- format 0x55 ; layer-3 +- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) +- format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) +- format 0x55005354 ; broken file +- fourcc ".mp3" ; CBR/VBR MP3 (MOV files) +- fourcc "MP3 " ; used in .nsv files +- fourcc "LAME" ; used in mythtv .nuv files +- driver mp3lib +- + audiocodec mpg123 + ; this is preferred over ffmp2/ffmp3 since it is faster, generally + info "MPEG 1.0/2.0/2.5 layers I, II, III" +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad.c mplayer2-2.0/libmpcodecs/ad.c +--- mplayer2-2.0.ori/libmpcodecs/ad.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad.c 2011-05-09 14:11:10.717630210 -0400 +@@ -32,7 +32,6 @@ + /* Missed vorbis, mad, dshow */ + + extern const ad_functions_t mpcodecs_ad_mpg123; +-extern const ad_functions_t mpcodecs_ad_mp3lib; + extern const ad_functions_t mpcodecs_ad_ffmpeg; + extern const ad_functions_t mpcodecs_ad_liba52; + extern const ad_functions_t mpcodecs_ad_hwac3; +@@ -63,9 +62,6 @@ + #ifdef CONFIG_MPG123 + &mpcodecs_ad_mpg123, + #endif +-#ifdef CONFIG_MP3LIB +- &mpcodecs_ad_mp3lib, +-#endif + #ifdef CONFIG_LIBA52 + &mpcodecs_ad_liba52, + #endif +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c mplayer2-2.0/libmpcodecs/ad_mp3lib.c +--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.c 2011-05-09 14:11:10.717630210 -0400 +@@ -1,100 +0,0 @@ +-/* +- * This file is part of MPlayer. +- * +- * MPlayer is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * MPlayer is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with MPlayer; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +- +-#include "config.h" +- +-#include "ad_internal.h" +-#include "ad_mp3lib.h" +- +-static const ad_info_t info = +-{ +- "MPEG layer-2, layer-3", +- "mp3lib", +- "Nick Kurshev", +- "mpg123", +- "Optimized to MMX/SSE/3Dnow!" +-}; +- +-LIBAD_EXTERN(mp3lib) +- +-#include "mp3lib/mp3.h" +- +-extern int fakemono; +- +-static sh_audio_t* dec_audio_sh=NULL; +- +-// MP3 decoder buffer callback: +-int mplayer_audio_read(char *buf,int size){ +- return demux_read_data(dec_audio_sh->ds,buf,size); +-} +- +-static int preinit(sh_audio_t *sh) +-{ +- sh->audio_out_minsize=32*36*2*2; //4608; +- return 1; +-} +- +-static int init(sh_audio_t *sh) +-{ +- // MPEG Audio: +- dec_audio_sh=sh; // save sh_audio for the callback: +-// MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!! +-#ifdef CONFIG_FAKE_MONO +- MP3_Init(fakemono); +-#else +- MP3_Init(); +-#endif +- MP3_samplerate=MP3_channels=0; +- sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1); +- if(!sh->a_buffer_len) return 0; // unsupported layer/format +- sh->channels=2; // hack +- sh->samplesize=2; +- sh->samplerate=MP3_samplerate; +- sh->i_bps=MP3_bitrate*(1000/8); +- MP3_PrintHeader(); +- return 1; +-} +- +-static void uninit(sh_audio_t *sh) +-{ +-} +- +-static int control(sh_audio_t *sh,int cmd,void* arg, ...) +-{ +- switch(cmd) +- { +- case ADCTRL_RESYNC_STREAM: +- MP3_DecodeFrame(NULL,-2); // resync +- MP3_DecodeFrame(NULL,-2); // resync +- MP3_DecodeFrame(NULL,-2); // resync +- return CONTROL_TRUE; +- case ADCTRL_SKIP_FRAME: +- MP3_DecodeFrame(NULL,-2); // skip MPEG frame +- return CONTROL_TRUE; +- } +- return CONTROL_UNKNOWN; +-} +- +-static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) +-{ +- return MP3_DecodeFrame(buf,-1); +-} +diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h mplayer2-2.0/libmpcodecs/ad_mp3lib.h +--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.h 2011-05-09 14:11:10.717630210 -0400 +@@ -1,24 +0,0 @@ +-/* +- * This file is part of MPlayer. +- * +- * MPlayer is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * MPlayer is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with MPlayer; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#ifndef MPLAYER_AD_MP3LIB_H +-#define MPLAYER_AD_MP3LIB_H +- +-int mplayer_audio_read(char *buf, int size); +- +-#endif /* MPLAYER_AD_MP3LIB_H */ +diff -Naur mplayer2-2.0.ori/Makefile mplayer2-2.0/Makefile +--- mplayer2-2.0.ori/Makefile 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/Makefile 2011-05-09 14:11:10.714296876 -0400 +@@ -122,21 +122,6 @@ + SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c + SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c + +-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \ +- mp3lib/dct64_3dnow.c +-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ +- mp3lib/dct64_k7.c +-SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c +-SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \ +- $(SRCS_MP3LIB-X86-yes) +-SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c +-SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c +-SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c +-SRCS_MP3LIB += mp3lib/sr1.c \ +- $(SRCS_MP3LIB-yes) +-SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \ +- $(SRCS_MP3LIB) +- + SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ + libmpdemux/demux_mpc.c + SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ +@@ -578,7 +563,6 @@ + loader/dshow \ + loader/dmo \ + loader/wine \ +- mp3lib \ + osdep \ + stream \ + stream/freesdp \ +@@ -675,8 +659,6 @@ + #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT + loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) + +-mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer +- + stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS) + + +@@ -767,9 +749,7 @@ + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g + loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) + +-mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) +- +-TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2 ++TESTS = codecs2html codec-cfg-test libvo/aspecttest + + ifdef ARCH_X86 + TESTS += loader/qtx/list loader/qtx/qtxload diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD new file mode 100644 index 000000000..8e1810f9f --- /dev/null +++ b/core/keyutils/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=keyutils +pkgver=1.4 +pkgrel=1 +pkgdesc="Linux Key Management Utilities" +arch=(i686 x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=('glibc' 'sh') +backup=(etc/request-key.conf) +source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} +md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b') diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index b559d2c54..371393099 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122962 2011-05-07 14:45:29Z bisson $ +# $Id: PKGBUILD 123947 2011-05-14 15:17:07Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -8,7 +8,7 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. pkgver=9.8.0.P1 _pkgver=9.8.0-P1 -pkgrel=1 +pkgrel=2 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ backup=('etc/logrotate.d/named' 'etc/conf.d/named' 'etc/named.conf' 'etc/rndc.key') -depends=('openssl' 'libxml2') +depends=('openssl' 'krb5' 'libxml2') options=('!makeflags' '!libtool') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" 'ftp://ftp.rs.internic.net/domain/db.cache' @@ -51,9 +51,17 @@ build() { patch -p1 -i "${srcdir}"/notools.patch ./configure \ - --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-libtool --enable-static=no --disable-linux-caps \ - --with-openssl=yes --with-libxml2=yes + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-gssapi \ + --with-libxml2 \ + --with-libtool \ + --with-dlz-dlopen \ + make } diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index b3edbdf36..72ce404fc 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,38 +1,38 @@ -# $Id: PKGBUILD 123056 2011-05-07 20:58:12Z eric $ +# $Id: PKGBUILD 124019 2011-05-16 00:31:31Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glsof -pkgver=1.0.0 +pkgver=1.5 +_fmver=1.5 +_qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" arch=('i686' 'x86_64') url="http://glsof.sourceforge.net/" license=('GPL3') -depends=('java-runtime' 'lsof') +depends=('sh' 'java-runtime' 'lsof') +source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}.tar.gz) if [ "$CARCH" = "i686" ]; then - source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux32.tar.gz \ - http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux32.tar.gz \ + source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('7a541ee8c432b78f9bfd36dd1707fb8d' - '895bcec79edea97ebde36d7f5eaa3ee9' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' + '895bcec79edea97ebde36d7f5eaa3ee9' + '7e43c1120e15e65bd1a12d6f188be4a0' + '980da4b39e1e3f4fbed08018dfd3be7b') elif [ "$CARCH" = "x86_64" ]; then - source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux64.tar.gz \ - http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux64.tar.gz \ + source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('9a6043b0b90fbc6de4db36967647dab0' - 'ed96ee2105428aa8b038f5fe13b8cd1d' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' + 'ed96ee2105428aa8b038f5fe13b8cd1d' + '7e43c1120e15e65bd1a12d6f188be4a0' + '980da4b39e1e3f4fbed08018dfd3be7b') fi package() { cd "${srcdir}" install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor" install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries" - install -D -m644 filemonitor_linux??/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" - install -D -m644 filemonitor_linux??/filemonitor.pdf "${pkgdir}/usr/share/doc/glsof/filemonitor.pdf" + install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar" install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf" } diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 667c3f6dc..6843a2881 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123242 2011-05-09 13:33:46Z bisson $ +# $Id: PKGBUILD 123813 2011-05-13 12:45:42Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix pkgver=2.8.3 -pkgrel=1 +pkgrel=2 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64') @@ -28,23 +28,23 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - make makefiles CCARGS=' \ - -DUSE_SASL_AUTH -I/usr/include/sasl \ - -DUSE_CYRUS_SASL \ + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ -DHAS_LDAP \ -DUSE_TLS \ -DHAS_MYSQL -I/usr/include/mysql \ -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_SQLITE \ ' AUXLIBS=' \ - -lsasl2 -lssl -lcrypto \ + -lsasl2 \ -lldap -llber \ + -lssl -lcrypto \ -lmysqlclient -lz -lm \ -lpq \ -lsqlite3 -lpthread \ - ' + ' OPT="${CFLAGS} ${LDFLAGS}" - make OPT="${CFLAGS}" + make } package() { diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index 2a177d64d..769dd0f00 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120807 2011-04-26 15:59:24Z ibiru $ +# $Id: PKGBUILD 123992 2011-05-15 17:48:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.9 +pkgver=0.1.10 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64') @@ -13,15 +13,11 @@ license=('LGPL') depends=('telepathy-glib' 'openssl') makedepends=('libxslt' 'python2') install=telepathy-idle.install -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - python27.patch) -md5sums=('423f2cc0481bdb32facb850eaf586ff2' - '03661efde8f768417e224720e1346d7b') +source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('570a431e3e28ca6ebf3f0c84198f0b9a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/python27.patch" - autoreconf -fi ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy make diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index bb3be2eb4..d3c7b0fd5 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106274 2011-01-16 13:41:19Z giovanni $ +# $Id: PKGBUILD 124014 2011-05-15 23:09:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('gnutls') makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') options=('!libtool') -source=(http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2) -md5sums=('79207fea567548462fe36397e633d287') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,11 +23,11 @@ build() { cd build cmake .. -DPREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so || return 1 + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so } package() { cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}/" install || return 1 + make DESTDIR="${pkgdir}/" install } diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD index f220bf14d..c367ccfc8 100644 --- a/kde-unstable/kdepim-runtime/PKGBUILD +++ b/kde-unstable/kdepim-runtime/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.5.95 +pkgver=4.5.96 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64') @@ -15,12 +15,12 @@ install=${pkgname}.install #source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") source=("http://download.kde.org/unstable/kdepim/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'disable-l10n.patch') -sha1sums=('0607224f725ee161d16d41a44bd02bacb8245434' +sha1sums=('fd1cf58d5b62c647a7920dfc1d79126843750b1e' '991d81435205185dcb2285a6e728f7756ae92b0d') build() { cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/disable-l10n.patch + patch -Np0 -i "${srcdir}"/disable-l10n.patch cd "${srcdir}" mkdir build @@ -33,6 +33,6 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$pkgdir install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index 908acca52..53c4696c0 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121977 2011-05-01 00:22:38Z andrea $ +# $Id: PKGBUILD 123823 2011-05-13 18:23:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.5.95 +pkgver=4.5.96 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -31,7 +31,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' #source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") source=("http://download.kde.org/unstable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2" 'disable-l10n.patch') -sha1sums=('5227ac466247f043643bb9eaa7568e8b936edafe' +sha1sums=('f425f143fe3381be2bb018bab92d89fd112595f0' '25e36f160ced051268e59fad6ed2de33a9c7657a') build() { @@ -52,10 +52,10 @@ build() { package_kdepim-akonadiconsole() { pkgdesc='Akonadi Management and Debugging Console' depends=('kdepim-libkdepim') - url='http://pim.kde.org' + url='http://pim.kde.org' install='kdepim.install' - cd $srcdir/build/akonadiconsole - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install } package_kdepim-akregator() { @@ -63,12 +63,12 @@ package_kdepim-akregator() { depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/akregator/" install='kdepim.install' - cd $srcdir/build/akregator - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/akregator - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/akregator - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install } package_kdepim-blogilo() { @@ -78,19 +78,19 @@ package_kdepim-blogilo() { replaces=('blogilo') conflicts=('blogilo') install='kdepim.install' - cd $srcdir/build/blogilo - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/blogilo - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install } package_kdepim-console() { pkgdesc='Command line tool for accessing calendar files' depends=('kdepim-runtime') - url='http://pim.kde.org' + url='http://pim.kde.org' install='kdepim.install' - cd $srcdir/build/console - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install } package_kdepim-kaddressbook() { @@ -98,12 +98,12 @@ package_kdepim-kaddressbook() { depends=('kdepim-libkdepim') url="http://kde.org/applications/office/kaddressbook/" install='kdepim.install' - cd $srcdir/build/kaddressbook - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/kaddressbook - make DESTDIR=$pkgdir install - cd $srcdir/build/plugins/kaddressbook - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install } package_kdepim-kalarm() { @@ -111,10 +111,10 @@ package_kdepim-kalarm() { depends=('kdepim-libkdepim') url="http://kde.org/applications/utilities/kalarm/" install='kdepim.install' - cd $srcdir/build/kalarm - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalarm - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install } package_kdepim-kjots() { @@ -122,22 +122,22 @@ package_kdepim-kjots() { depends=('kdepim-libkdepim') url="http://kde.org/applications/utilities/kjots/" install='kdepim.install' - cd $srcdir/build/kjots - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kjots - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/kjots - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install } package_kdepim-kleopatra() { pkgdesc='Certificate Manager and Unified Crypto GUI' depends=('kdepim-libkdepim') url="http://kde.org/applications/utilities/kleopatra/" - cd $srcdir/build/kleopatra - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kleopatra - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install } package_kdepim-kmail() { @@ -149,11 +149,11 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') - optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') + optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ - nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install + nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } @@ -162,12 +162,12 @@ package_kdepim-knode() { depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/knode/" install='kdepim.install' - cd $srcdir/build/knode - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knode - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/knode - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install } package_kdepim-knotes() { @@ -175,12 +175,12 @@ package_kdepim-knotes() { depends=('kdepim-libkdepim') url="http://kde.org/applications/utilities/knotes/" install='kdepim.install' - cd $srcdir/build/knotes - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knotes - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/knotes - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install } package_kdepim-kontact() { @@ -192,8 +192,8 @@ package_kdepim-kontact() { replaces=('kdepim-kontactinterfaces') for i in kontact/src doc/kontact \ kontact/plugins/summary kontact/plugins/specialdates; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } @@ -202,20 +202,20 @@ package_kdepim-korganizer() { depends=('kdepim-libkdepim') url="http://kde.org/applications/office/korganizer" install='kdepim.install' - cd $srcdir/build/korganizer - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/korganizer - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/korganizer - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/korganizer + make DESTDIR="${pkgdir}" install } package_kdepim-kresources() { pkgdesc='KDE PIM resources' depends=('kdepim-libkdepim') - url='http://pim.kde.org' - cd $srcdir/build/kresources - make DESTDIR=$pkgdir install + url='http://pim.kde.org' + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install } package_kdepim-ktimetracker() { @@ -223,36 +223,36 @@ package_kdepim-ktimetracker() { depends=('kdepim-kresources') url="http://kde.org/applications/utilities/ktimetracker/" install='kdepim.install' - cd $srcdir/build/ktimetracker - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktimetracker - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/ktimetracker - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install } package_kdepim-libkdepim() { pkgdesc='Library for KDE PIM' groups=() depends=('kde-agent' 'kdepim-runtime') - url='http://pim.kde.org' + url='http://pim.kde.org' conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ - messagecomposer messagecore messagelist messageviewer icons \ - strigi-analyzer plugins/messageviewer plugins/ktexteditor; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install + messagecomposer messagecore messagelist messageviewer icons \ + strigi-analyzer plugins/messageviewer plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } package_kdepim-wizards() { pkgdesc='KDE Groupware Wizard' depends=('kdepim-kresources') - url='http://pim.kde.org' - cd $srcdir/build/wizards - make DESTDIR=$pkgdir install + url='http://pim.kde.org' + cd "${srcdir}"/build/wizards + make DESTDIR="${pkgdir}" install } diff --git a/testing/acpid/PKGBUILD b/testing/acpid/PKGBUILD new file mode 100644 index 000000000..a8bfa9018 --- /dev/null +++ b/testing/acpid/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 123979 2011-05-15 11:10:08Z andrea $ +# Maintainer: +# Contributor: xduugu +# Contributor: Manolis Tzanidakis +# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us + +pkgname=acpid +pkgver=2.0.9 +pkgrel=2 +pkgdesc="A daemon for delivering ACPI power management events with netlink support" +arch=('i686' 'x86_64') +url="http://tedfelix.com/linux/acpid-netlink.html" +license=('GPL') +depends=('bash') +source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" + 'acpid' + 'anything' + 'handler.sh' + 'acpid.conf.d') +backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install + + install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid" + install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything" + install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh" + install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid" + + chmod 755 "${pkgdir}"/usr/sbin/acpid +} +md5sums=('8b30aa1b31f607161745a4ac7a19699b' + '955490c4db5233ec44461db694b873a4' + '2d37b98d6e74bab815604b8b48c6cfd4' + '7b2e4c299af5eb87e1a81c07b6916c97' + '929c6d2e91295c22ed9ec6212d7eabef') diff --git a/testing/acpid/acpid b/testing/acpid/acpid new file mode 100644 index 000000000..9177c8207 --- /dev/null +++ b/testing/acpid/acpid @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid + +PID=`pidof -o %PPID /usr/sbin/acpid` +case "$1" in + start) + stat_busy "Starting acpid" + [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon acpid + stat_done + fi + ;; + stop) + stat_busy "Stopping acpid" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon acpid + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/acpid/acpid.conf.d b/testing/acpid/acpid.conf.d new file mode 100644 index 000000000..b60103a2d --- /dev/null +++ b/testing/acpid/acpid.conf.d @@ -0,0 +1,5 @@ +# +# Arguments to be passed to the acpid daemon +# + +ACPID_ARGS="" diff --git a/testing/acpid/anything b/testing/acpid/anything new file mode 100644 index 000000000..d1828989b --- /dev/null +++ b/testing/acpid/anything @@ -0,0 +1,3 @@ +# Pass all events to our one handler script +event=.* +action=/etc/acpi/handler.sh %e diff --git a/testing/acpid/handler.sh b/testing/acpid/handler.sh new file mode 100644 index 000000000..518a62dea --- /dev/null +++ b/testing/acpid/handler.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Default acpi script that takes an entry for all actions + +# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to +# modify it to not use /sys + +minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` +maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` +setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" + +set $* + +case "$1" in + button/power) + #echo "PowerButton pressed!">/dev/tty5 + case "$2" in + PWRF) logger "PowerButton pressed: $2" ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/sleep) + case "$2" in + SLPB) echo -n mem >/sys/power/state ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + ac_adapter) + case "$2" in + AC|ACAD|ADP0) + case "$4" in + 00000000) + echo -n $minspeed >$setspeed + #/etc/laptop-mode/laptop-mode start + ;; + 00000001) + echo -n $maxspeed >$setspeed + #/etc/laptop-mode/laptop-mode stop + ;; + esac + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + battery) + case "$2" in + BAT0) + case "$4" in + 00000000) #echo "offline" >/dev/tty5 + ;; + 00000001) #echo "online" >/dev/tty5 + ;; + esac + ;; + CPU0) + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/lid) + #echo "LID switched!">/dev/tty5 + ;; + *) + logger "ACPI group/action undefined: $1 / $2" + ;; +esac diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD index 2c8035c77..d59222745 100644 --- a/testing/archboot/PKGBUILD +++ b/testing/archboot/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 110605 2011-02-20 16:37:56Z tpowa $ +# $Id: PKGBUILD 124008 2011-05-15 21:19:33Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=archboot -pkgver=2011.02 -pkgrel=2 +pkgver=2011.05 +pkgrel=1 pkgdesc="Advanced, modular arch boot/install image creation utility" arch=(i686 x86_64) license=('GPL') url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.6.8-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.02.1-1' 'subversion>=1.6.15-1' 'wget>=1.12-4' 'bash>=4.2-1' 'coreutils>=8.10-1' 'cryptsetup>=1.2.0-1' 'dialog>=1.1_20110118-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=436-2' 'lvm2>=2.02.84-1' 'mdadm>=3.1.4-1' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.7-4' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2.0.0-4' 'pcmciautils>=017-1' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.2-1' 'sysvinit>=2.88-2' 'tar>=1.25-1' 'util-linux-ng>=2.18-4' 'which>=2.20-4' 'kbd>=1.15.2-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.4-1' 'dnsutils>=9.7.2.P3-1' 'hdparm>=9.36-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p1-1' 'hwdetect>=2010.08-1' 'shadow>=4.1.4.2-4' 'bridge-utils>=1.4-3' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.10-1' 'glibc>=2.13-4' 'linux-api-headers>=2.6.37-1' 'kernel26>=2.6.37.1-1' 'kernel26-lts>=2.6.32.29-2' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-5' 'lilo>=23.1-2' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.1.15-1' 'pciutils>=3.1.7-3' 'usbutils>=001-2' 'vpnc>=0.5.3-3' 'openvpn>=2.1.4-1' 'b43-fwcutter>=013-2' 'wpa_supplicant>=0.7.3-1' 'rsync>=3.0.7-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.84-1' 'screen>=4.0.3-10' 'elfutils>=0.151-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.2-6' 'nfsidmap>=0.24-1' 'readline>=6.2-1' 'acl>=2.2.49-2' 'attr>=2.4.44-2' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.125-1' 'lzo2>=2.04-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.10-1' 'gcc-libs>=4.5.2-6' 'sdparm>=1.06-1' 'licenses>=2.6-1' 'pptpclient>=1.7.2-3' 'ndiswrapper>=1.56-7' 'ndiswrapper-utils>=1.56-2' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.6-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.10-1' 'openssl>=1.0.0.d-1' 'git>=1.7.4.1-1' 'dmraid>=1.0.0.rc16+CVS-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'tiacx>=20080210-19' 'tiacx-firmware>=2-3' 'parted>=2.3-1' 'tzdata>=2011b-1' 'ntp>=4.2.6.p3-1' 'libgcrypt>=1.4.6-1' 'iw>=0.9.20-1' 'crda>=1.1.1-1' 'libnl>=1.1-2' 'iproute2>=2.6.37-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.9-11' 'dhclient>=4.2.0.2-1' 'syslinux>=4.03-2' 'mtools>=4.0.15-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.1-1' 'libtirpc>=0.2.1-2' 'librpcsecgss>=0.19-4' 'rpcbind>=0.2.0-3' 'testdisk>=6.11.3-3' 'wipe>=2.3.1-1' 'clamav>=0.97-1' 'ddrescue>=1.14-1' 'udev>=166-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-1' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-3' 'mkinitcpio-nfs-utils>=0.2-1' 'gdisk>=0.6.14-1' 'nilfs-utils>=2.0.21-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'ndiswrapper-lts>=1.56-3' 'nouveau-drm-lts>=0.0.16_20100313-4' 'linux-firmware>=20110201-1' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1') +depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'ndiswrapper>=1.56-9' 'ndiswrapper-utils>=1.56-2' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'tiacx>=20080210-21' 'tiacx-firmware>=2-3' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'ndiswrapper-lts>=1.56-5' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') optdepends=('grub2-bios: for grub2 support' - 'grub2-efi-i386:for grub2 support' + 'grub2-efi-i386: for grub2 support' 'grub2-efi-x86_64: for grub2 support' 'efibootmgr: for grub2 support' + 'clamav: for clamav support' ) source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c) backup=('etc/archboot/allinone.conf' @@ -44,5 +45,5 @@ build() gcc -o vmware-detect vmware-detect.c install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect } -md5sums=('608c6e8f30c159f345c08eee6842f17c' +md5sums=('5ea2090ddc56a6b4716961f53584328a' '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD index 609b27e47..9869a976c 100644 --- a/testing/file/PKGBUILD +++ b/testing/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123900 2011-05-14 09:18:32Z tpowa $ +# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file pkgver=5.07 -pkgrel=2 +pkgrel=3 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -17,7 +17,7 @@ source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz file-5.07-zip-detect.patch) md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' '385f020467debd98bd2d8df6143f93d0' - 'fe52877b2a812b5a1e6276f4c55003cc') + 'bcbf2e152f38003a2736298bbd0f37f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/file/file-5.07-zip-detect.patch b/testing/file/file-5.07-zip-detect.patch index accaf8385..3e8f128d8 100644 --- a/testing/file/file-5.07-zip-detect.patch +++ b/testing/file/file-5.07-zip-detect.patch @@ -1,12 +1,13 @@ ---- file-5.07-orig/magic/Magdir/archive 2011-05-14 04:28:25.918516697 +0300 -+++ file-5.07/magic/Magdir/archive 2011-05-14 04:29:14.351587647 +0300 -@@ -565,6 +565,9 @@ - 0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract - !:mime application/zip +--- 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 -+# Zip archiver (Archlinux bugfix: detect generic zip archives) -+0 string PK\003\004 Zip archive data ++>26 byte x Zip archive data + - # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) - 0 string PK\003\004 - ++ ++ + # StarView Metafile + # From Pierre Ducroquet <pinaraf@pinaraf.info> + 0 string VCLMTF StarView MetaFile diff --git a/testing/kbd/PKGBUILD b/testing/kbd/PKGBUILD new file mode 100644 index 000000000..c1643ec9a --- /dev/null +++ b/testing/kbd/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 123997 2011-05-15 19:12:02Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=kbd +pkgver=1.15.3 +pkgrel=1 +pkgdesc="Keytable files and keyboard utilities" +arch=('i686' 'x86_64') +url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" +license=('GPL') +depends=('glibc') +source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz + fix-es.po.patch) +md5sums=('8143e179a0f3c25646ce5085e8777200') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ../fix-es.po.patch + # rename keymap files with the same names + # this is needed because when only name of keymap is specified + # loadkeys loads the first keymap it can find, which is bad (see FS#13837) + # this should be removed when upstream adopts the change + mv data/keymaps/i386/qwertz/cz{,-qwertz}.map + mv data/keymaps/i386/olpc/es{,-olpc}.map + mv data/keymaps/i386/olpc/pt{,-olpc}.map + mv data/keymaps/i386/dvorak/no{,-dvorak}.map + mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map + + ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man + make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install + + # this is needed because initscripts call /bin/loadkeys + # remove this when next versions of kbd + # and initscripts with /usr/bin/loadkeys usage will be released + mkdir ${pkgdir}/bin + ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys +} +md5sums=('8143e179a0f3c25646ce5085e8777200' + '4ded3edb50fb7a3277bae6a870cee812') diff --git a/testing/kbd/fix-es.po.patch b/testing/kbd/fix-es.po.patch new file mode 100644 index 000000000..578f0a7b7 --- /dev/null +++ b/testing/kbd/fix-es.po.patch @@ -0,0 +1,11 @@ +--- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 ++++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200 +@@ -1363,7 +1363,7 @@ + #: src/setfont.c:682 + #, c-format + msgid "Saved %d-char %dx%d font file on %s\n" +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" + + #: src/setkeycodes.c:21 + #, c-format diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD new file mode 100644 index 000000000..06eb95726 --- /dev/null +++ b/testing/php-apc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 123989 2011-05-15 16:00:20Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=php-apc +pkgver=3.1.9 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' +url='http://pecl.php.net/package/APC' +depends=('php') +license="PHP" +source=("http://pecl.php.net/get/APC-${pkgver}.tgz") +backup=('etc/php/conf.d/apc.ini') +md5sums=('a2cf7fbf6f3a87f190d897a53260ddaa') + +build() { + cd $srcdir/APC-$pkgver + phpize + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/APC-$pkgver + make INSTALL_ROOT=$pkgdir install + echo ';extension=apc.so' > apc.ini + install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini + install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php + install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt +} |