[arch-commits] Commit in mime-types/trunk (PKGBUILD archlinux.patch mime.types)
Date: Wednesday, August 3, 2011 @ 02:03:06
Author: bisson
Revision: 134361
upstream update, PKGBUILD cleanup
Added:
mime-types/trunk/archlinux.patch
Modified:
mime-types/trunk/PKGBUILD
Deleted:
mime-types/trunk/mime.types
-+
PKGBUILD| 30 +-
archlinux.patch |7
mime.types | 758 --
3 files changed, 22 insertions(+), 773 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 02:27:41 UTC (rev 134360)
+++ PKGBUILD2011-08-03 06:03:06 UTC (rev 134361)
@@ -1,23 +1,23 @@
# $Id$
-# Contributer: Jan de Groot j...@archlinux.org
-# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Maintainer: Gaetan Bisson bis...@archlinux.org
pkgname=mime-types
-pkgver=1.0
-pkgrel=3
-pkgdesc=Provides /etc/mime.types
+pkgver=8
+pkgrel=1
+pkgdesc='Provides /etc/mime.types'
+url='http://www.archlinux.org/'
+license=('GPL2')
arch=('any')
-url=http://www.archlinux.org/;
-license=('GPL2')
backup=('etc/mime.types')
-source=(mime.types)
-md5sums=('aa90248272ba2e9dca0a243746686739')
+source=(http://mirrors.kernel.org/gentoo/distfiles/${pkgname}-${pkgver}.tar.bz2;
+'archlinux.patch')
+sha1sums=('01682b0ad3111a6cf65e6c9db0c18ddd7523c593'
+ '2fc3e867317e7144bbf38359f3791c3f8899198a')
build() {
- /bin/true
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i ../archlinux.patch
+ install -Dm644 mime.types ${pkgdir}/etc/mime.types
}
-
-package() {
- cd ${srcdir}
- install -Dm644 mime.types ${pkgdir}/etc/mime.types || return 1
-}
Added: archlinux.patch
===
--- archlinux.patch (rev 0)
+++ archlinux.patch 2011-08-03 06:03:06 UTC (rev 134361)
@@ -0,0 +1,7 @@
+diff -au0r old/mime.types new/mime.types
+--- old/mime.types 2009-10-15 07:51:24.0 -0700
new/mime.types 2011-08-02 22:49:14.962241561 -0700
+@@ -2 +2,2 @@
+-# distributed as the app-misc/mime-types package.
++# distributed in Arch Linux as the mime-types package, which is based on
++# Gentoo's app-misc/mime-types package.
Deleted: mime.types
===
--- mime.types 2011-08-03 02:27:41 UTC (rev 134360)
+++ mime.types 2011-08-03 06:03:06 UTC (rev 134361)
@@ -1,758 +0,0 @@
-###
-#
-# MIME-TYPES and the extensions that represent them
-#
-# This file is part of the mime-types package, which is based on
-# gentoo's app-misc/mime-types. If you would like new types and/or
-# extensions to be added here, please file a bug on http://bugs.archlinux.org
-#
-# The reason that all types are managed by the mime-support package instead
-# allowing individual packages to install types in much the same way as they
-# add entries in to the mailcap file is so these types can be referenced by
-# other programs (such as a web server) even if the specific support package
-# for that type is not installed.
-#
-# Users can add their own types if they wish by creating a .mime.types
-# file in their home directory. Definitions included there will take
-# precedence over those listed here.
-#
-# Note: Compression schemes like gzip, bzip, and compress are not
-# actually mime-types. They are encodings and hence must _not_ have
-# entries in this file to map their extensions. The mime-type of an
-# encoded file refers to the type of data that has been encoded, not the
-# type of encoding.
-#
-###
-
-
-application/activemessage
-application/andrew-inset ez
-application/applefile
-application/atomicmail
-application/batch-SMTP
-application/beep+xml
-application/cals-1840
-application/commonground
-application/cu-seeme cu
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/docbook+xml
-application/dsptypetsp
-application/dvcs
-application/edi-consent
-application/edi-x12
-application/edifact
-application/eshop
-application/font-tdpfr
-application/futuresplash spl
-application/ghostview
-application/htahta
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/java-archive jar
-application/java-serialized-object ser
-application/java-vmclass
-application/mac-binhex40 hqx
-application/mac-compactpro
[arch-commits] Commit in mime-types/repos (testing-any)
Date: Wednesday, August 3, 2011 @ 02:03:20 Author: bisson Revision: 134362 archrelease: copy trunk to testing-any Added: mime-types/repos/testing-any/
[arch-commits] Commit in mdadm/trunk (PKGBUILD linux-3.0.patch)
Date: Wednesday, August 3, 2011 @ 02:56:40
Author: tpowa
Revision: 134363
upgpkg: mdadm 3.2.2-3
add linux-3.0 compat patch
Added:
mdadm/trunk/linux-3.0.patch
Modified:
mdadm/trunk/PKGBUILD
-+
PKGBUILD| 11 +++
linux-3.0.patch | 45 +
2 files changed, 52 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 06:03:20 UTC (rev 134362)
+++ PKGBUILD2011-08-03 06:56:40 UTC (rev 134363)
@@ -3,7 +3,7 @@
# Contributor: Judd Vinet jvi...@zeroflux.org
pkgname=mdadm
pkgver=3.2.2
-pkgrel=2
+pkgrel=3
pkgdesc=A tool for managing/monitoring Linux md device arrays, also known as
Software RAID
arch=(i686 x86_64)
license=('GPL')
@@ -17,7 +17,8 @@
mdadm.conf
mdadm_install
mdadm_hook
-disable-werror.patch)
+disable-werror.patch
+linux-3.0.patch)
install=mdadm.install
replaces=('raidtools')
md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
@@ -25,12 +26,14 @@
'00cbed931db4f15b6ce49e3e7d433966'
'4bb000166fb13e82ceaa2422fdfaac7e'
'36f7cc564ed3267888d90208e0eb7adc'
- '4ad87b74a4bc9a34621280abe0e0c3e4')
+ '4ad87b74a4bc9a34621280abe0e0c3e4'
+ 'c499b3edbf2c400c8a1984e18c7ce7fa')
build() {
cd $srcdir/$pkgname-$pkgver
patch -Np0 -i ../disable-werror.patch
- make CXFLAGS=$CFLAGS
+ patch -Np1 -i ../linux-3.0.patch
+ make CXiFLAGS=$CFLAGS
}
package() {
Added: linux-3.0.patch
===
--- linux-3.0.patch (rev 0)
+++ linux-3.0.patch 2011-08-03 06:56:40 UTC (rev 134363)
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown ne...@suse.de
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0. If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim namhy...@gmail.com
+Reported-by: Milan Broz mb...@redhat.com
+Signed-off-by: NeilBrown ne...@suse.de
+---
+ util.c | 10 +-
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+ struct utsname name;
+ char *cp;
+- int a,b,c;
++ int a = 0, b = 0,c = 0;
+ if (uname(name) 0)
+ return -1;
+
+ cp = name.release;
+ a = strtoul(cp, cp, 10);
+- if (*cp != '.') return -1;
+- b = strtoul(cp+1, cp, 10);
+- if (*cp != '.') return -1;
+- c = strtoul(cp+1, NULL, 10);
++ if (*cp == '.')
++ b = strtoul(cp+1, cp, 10);
++ if (*cp == '.')
++ c = strtoul(cp+1, cp, 10);
+
+ return (a*100)+(b*1000)+c;
+ }
+--
+1.7.2.3
+
[arch-commits] Commit in mdadm/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 02:56:58 Author: tpowa Revision: 134364 archrelease: copy trunk to testing-i686 Added: mdadm/repos/testing-i686/
[arch-commits] Commit in mdadm/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 02:57:12 Author: tpowa Revision: 134365 archrelease: copy trunk to testing-x86_64 Added: mdadm/repos/testing-x86_64/
[arch-commits] Commit in libmpeg2/trunk (PKGBUILD libmpeg2-0.5.1-gcc4.6.patch)
Date: Wednesday, August 3, 2011 @ 03:11:36
Author: jgc
Revision: 134366
upgpkg: libmpeg2 0.5.1-3
Fix build with gcc 4.6:
https://bugs.archlinux.org/task/25370
https://qa.mandriva.com/show_bug.cgi?id=63279
Added:
libmpeg2/trunk/libmpeg2-0.5.1-gcc4.6.patch
Modified:
libmpeg2/trunk/PKGBUILD
-+
PKGBUILD| 10 ++-
libmpeg2-0.5.1-gcc4.6.patch | 128 ++
2 files changed, 135 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 06:57:12 UTC (rev 134365)
+++ PKGBUILD2011-08-03 07:11:36 UTC (rev 134366)
@@ -4,7 +4,7 @@
pkgname=libmpeg2
pkgver=0.5.1
-pkgrel=2
+pkgrel=3
pkgdesc=Library for decoding MPEG-1 and MPEG-2 video streams.
arch=('i686' 'x86_64')
url=http://libmpeg2.sourceforge.net/;
@@ -12,14 +12,18 @@
makedepends=('sdl' 'libxv')
optdepends=('sdl: requiered for mpeg2dec'
'libxv:requiered for mpeg2dec')
-source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz)
+source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz
+libmpeg2-0.5.1-gcc4.6.patch)
license=('GPL2')
options=(!libtool)
provides=('mpeg2dec')
-md5sums=('0f92c7454e58379b4a5a378485bbd8ef')
+md5sums=('0f92c7454e58379b4a5a378485bbd8ef'
+ '8b36660297e6ffde6aa9733136bff405')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/libmpeg2-0.5.1-gcc4.6.patch
+
sed '/AC_PATH_XTRA/d' -i configure.ac
autoreconf --force --install
Added: libmpeg2-0.5.1-gcc4.6.patch
===
--- libmpeg2-0.5.1-gcc4.6.patch (rev 0)
+++ libmpeg2-0.5.1-gcc4.6.patch 2011-08-03 07:11:36 UTC (rev 134366)
@@ -0,0 +1,128 @@
+--- libmpeg2-0.5.1/libmpeg2/idct_mmx.c.orig2011-05-13 09:23:02.557758717
-0300
libmpeg2-0.5.1/libmpeg2/idct_mmx.c 2011-05-13 09:23:06.346778580 -0300
+@@ -39,7 +39,6 @@
+ #define rounder(bias) {round (bias), round (bias)}
+ #define rounder_sse2(bias) {round (bias), round (bias), round (bias), round
(bias)}
+
+-
+ #if 0
+ /* C row IDCT - it is just here to document the MMXEXT and MMX versions */
+ static inline void idct_row (int16_t * row, int offset,
+@@ -464,10 +463,10 @@ static inline void sse2_idct_col (int16_
+ /* Almost identical to mmxext version: */
+ /* just do both 4x8 columns in paraller */
+
+-static const short t1_vector[] ATTR_ALIGN(16) = {T1,T1,T1,T1,T1,T1,T1,T1};
+-static const short t2_vector[] ATTR_ALIGN(16) = {T2,T2,T2,T2,T2,T2,T2,T2};
+-static const short t3_vector[] ATTR_ALIGN(16) = {T3,T3,T3,T3,T3,T3,T3,T3};
+-static const short c4_vector[] ATTR_ALIGN(16) = {C4,C4,C4,C4,C4,C4,C4,C4};
++static/* const*/ short t1_vector[] ATTR_ALIGN(16) =
{T1,T1,T1,T1,T1,T1,T1,T1};
++static/* const*/ short t2_vector[] ATTR_ALIGN(16) =
{T2,T2,T2,T2,T2,T2,T2,T2};
++static/* const*/ short t3_vector[] ATTR_ALIGN(16) =
{T3,T3,T3,T3,T3,T3,T3,T3};
++static/* const*/ short c4_vector[] ATTR_ALIGN(16) =
{C4,C4,C4,C4,C4,C4,C4,C4};
+
+ #if defined(__x86_64__)
+
+@@ -710,10 +709,10 @@ static inline void sse2_idct_col (int16_
+ /* MMX column IDCT */
+ static inline void idct_col (int16_t * const col, const int offset)
+ {
+-static const short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
+-static const short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
+-static const short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
+-static const short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
++static/* const*/ short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
++static/* const*/ short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
++static/* const*/ short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
++static/* const*/ short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
+
+ /* column code adapted from peter gubanov */
+ /* http://www.elecard.com/peter/idct.shtml */
+@@ -847,33 +846,33 @@ static inline void idct_col (int16_t * c
+ }
+
+
+-static const int32_t rounder0[] ATTR_ALIGN(8) =
++static/* const*/ int32_t rounder0[] ATTR_ALIGN(8) =
+ rounder ((1 (COL_SHIFT - 1)) - 0.5);
+-static const int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
+-static const int32_t rounder1[] ATTR_ALIGN(8) =
++static/* const*/ int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
++static/* const*/ int32_t rounder1[] ATTR_ALIGN(8) =
+ rounder (1.25683487303); /* C1*(C1/C4+C1+C7)/2 */
+-static const int32_t rounder7[] ATTR_ALIGN(8) =
++static/* const*/ int32_t rounder7[] ATTR_ALIGN(8) =
+ rounder (-0.25); /* C1*(C7/C4+C7-C1)/2 */
+-static const int32_t rounder2[] ATTR_ALIGN(8) =
++static/* const*/ int32_t rounder2[] ATTR_ALIGN(8) =
+ rounder (0.60355339059); /* C2 * (C6+C2)/2 */
+-static const int32_t rounder6[] ATTR_ALIGN(8) =
++static/* const*/ int32_t rounder6[] ATTR_ALIGN(8) =
+ rounder (-0.25); /* C2
[arch-commits] Commit in libmpeg2/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 03:11:39 Author: jgc Revision: 134367 archrelease: remove extra-i686 Deleted: libmpeg2/repos/extra-i686/
[arch-commits] Commit in libmpeg2/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 03:11:52 Author: jgc Revision: 134368 archrelease: copy trunk to extra-i686 Added: libmpeg2/repos/extra-i686/
[arch-commits] Commit in libmpeg2/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 03:11:55 Author: jgc Revision: 134369 archrelease: remove extra-x86_64 Deleted: libmpeg2/repos/extra-x86_64/
[arch-commits] Commit in libmpeg2/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 03:12:06 Author: jgc Revision: 134370 archrelease: copy trunk to extra-x86_64 Added: libmpeg2/repos/extra-x86_64/
[arch-commits] Commit in modemmanager/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 04:01:01
Author: ibiru
Revision: 134371
update to 0.5
Modified:
modemmanager/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 07:12:06 UTC (rev 134370)
+++ PKGBUILD2011-08-03 08:01:01 UTC (rev 134371)
@@ -2,7 +2,7 @@
# Maintainer: Ionut Biru ib...@archlinux.org
pkgname=modemmanager
_realname=ModemManager
-pkgver=0.4.998
+pkgver=0.5
pkgrel=1
pkgdesc=Mobile broadband modem management service
arch=('i686' 'x86_64')
@@ -11,9 +11,9 @@
depends=('dbus-glib' 'udev' 'ppp')
makedepends=('intltool')
options=('!libtool')
-source=(http://download.gnome.org/sources/${_realname}/0.4/${_realname}-${pkgver}.tar.xz)
+source=(http://download.gnome.org/sources/${_realname}/0.5/${_realname}-${pkgver}.tar.xz)
optdepends=('usb_modeswitch: install if your modem shows up as a storage
drive')
-sha256sums=('a0d96d0f9e06f1542b4c32d114833114b330682f93eea16fda8cdba289ceadf5')
+sha256sums=('e7c7aed7c1484adee22f04dac358c1f971985f8413096c4d412d084aa2cd7c7f')
build() {
cd $srcdir/${_realname}-${pkgver}
[arch-commits] Commit in modemmanager/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 04:03:44 Author: ibiru Revision: 134372 archrelease: remove extra-i686 Deleted: modemmanager/repos/extra-i686/
[arch-commits] Commit in modemmanager/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 04:03:58 Author: ibiru Revision: 134373 archrelease: copy trunk to extra-i686 Added: modemmanager/repos/extra-i686/
[arch-commits] Commit in modemmanager/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 04:04:03 Author: ibiru Revision: 134374 archrelease: remove extra-x86_64 Deleted: modemmanager/repos/extra-x86_64/
[arch-commits] Commit in modemmanager/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 04:04:18 Author: ibiru Revision: 134375 archrelease: copy trunk to extra-x86_64 Added: modemmanager/repos/extra-x86_64/
[arch-commits] Commit in dbus/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 07:19:50
Author: ibiru
Revision: 134376
update to 1.4.14
Modified:
dbus/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 08:04:18 UTC (rev 134375)
+++ PKGBUILD2011-08-03 11:19:50 UTC (rev 134376)
@@ -3,7 +3,7 @@
# Contributor: Link Dupont l...@subpop.net
#
pkgname=dbus
-pkgver=1.4.12
+pkgver=1.4.14
pkgrel=1
pkgdesc=Freedesktop.org message bus system
url=http://www.freedesktop.org/Software/dbus;
@@ -12,7 +12,7 @@
depends=(dbus-core=${pkgver} 'libx11')
source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
30-dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+md5sums=('ae6de2562a57516cfabaf56903375ba9'
'd14e59575f04e55d21a04907b6fd9f3c')
build() {
[arch-commits] Commit in dbus-core/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 07:19:59
Author: ibiru
Revision: 134377
update to 1.4.14
Modified:
dbus-core/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 11:19:50 UTC (rev 134376)
+++ PKGBUILD2011-08-03 11:19:59 UTC (rev 134377)
@@ -3,7 +3,7 @@
# Contributor: Link Dupont l...@subpop.net
#
pkgname=dbus-core
-pkgver=1.4.12
+pkgver=1.4.14
pkgrel=1
pkgdesc=Freedesktop.org message bus system
url=http://www.freedesktop.org/Software/dbus;
@@ -16,7 +16,7 @@
install=dbus.install
source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+md5sums=('ae6de2562a57516cfabaf56903375ba9'
'08f93dd19cffd1b45ab05c1fd4efb560')
build() {
[arch-commits] Commit in dbus-core/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 07:20:50 Author: ibiru Revision: 134378 archrelease: copy trunk to testing-i686 Added: dbus-core/repos/testing-i686/ Property changes on: dbus-core/repos/testing-i686 ___ Added: svn:mergeinfo +
[arch-commits] Commit in dbus-core/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 07:21:04 Author: ibiru Revision: 134379 archrelease: copy trunk to testing-x86_64 Added: dbus-core/repos/testing-x86_64/ Property changes on: dbus-core/repos/testing-x86_64 ___ Added: svn:mergeinfo +
[arch-commits] Commit in dbus/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 07:21:36 Author: ibiru Revision: 134380 archrelease: copy trunk to testing-i686 Added: dbus/repos/testing-i686/
[arch-commits] Commit in dbus/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 07:21:50 Author: ibiru Revision: 134381 archrelease: copy trunk to testing-x86_64 Added: dbus/repos/testing-x86_64/
[arch-commits] Commit in udev/repos (core-i686)
Date: Wednesday, August 3, 2011 @ 08:09:29 Author: tomegun Revision: 134382 db-move: udev removed by tomegun for move to [core] (i686) Deleted: udev/repos/core-i686/
[arch-commits] Commit in udev/repos (core-i686 testing-i686)
Date: Wednesday, August 3, 2011 @ 08:09:30 Author: tomegun Revision: 134383 db-move: moved udev from [testing] to [core] (i686) Added: udev/repos/core-i686/ Deleted: udev/repos/testing-i686/
[arch-commits] Commit in udev/repos (core-x86_64)
Date: Wednesday, August 3, 2011 @ 08:09:31 Author: tomegun Revision: 134384 db-move: udev removed by tomegun for move to [core] (x86_64) Deleted: udev/repos/core-x86_64/
[arch-commits] Commit in udev/repos (core-x86_64 testing-x86_64)
Date: Wednesday, August 3, 2011 @ 08:09:31 Author: tomegun Revision: 134385 db-move: moved udev from [testing] to [core] (x86_64) Added: udev/repos/core-x86_64/ Deleted: udev/repos/testing-x86_64/
[arch-commits] Commit in bluez/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 10:41:00
Author: andrea
Revision: 134386
Enable wiimote plugin (FS#25382)
Modified:
bluez/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 12:09:31 UTC (rev 134385)
+++ PKGBUILD2011-08-03 14:41:00 UTC (rev 134386)
@@ -4,7 +4,7 @@
pkgname=bluez
pkgver=4.96
-pkgrel=1
+pkgrel=2
pkgdesc=Libraries and tools for the Bluetooth protocol stack
url=http://www.bluez.org/;
arch=('i686' 'x86_64')
@@ -50,7 +50,8 @@
--enable-dund \
--enable-cups \
--enable-udevrules \
---enable-configfiles
+--enable-configfiles \
+--enable-wiimote
make
}
[arch-commits] Commit in system-config-printer/trunk (PKGBUILD no-packagekit.patch)
Date: Wednesday, August 3, 2011 @ 10:53:04
Author: andrea
Revision: 134387
upgpkg: system-config-printer 1.3.5-2
remove packagekit support (FS#25363)
Added:
system-config-printer/trunk/no-packagekit.patch
Modified:
system-config-printer/trunk/PKGBUILD
-+
PKGBUILD| 10 +++---
no-packagekit.patch | 36
2 files changed, 43 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 14:41:00 UTC (rev 134386)
+++ PKGBUILD2011-08-03 14:53:04 UTC (rev 134387)
@@ -5,17 +5,21 @@
pkgname=('system-config-printer-common'
'system-config-printer-gnome')
pkgver=1.3.5
-pkgrel=1
+pkgrel=2
pkgdesc=A CUPS printer configuration tool and status applet
url=http://cyberelk.net/tim/software/system-config-printer/;
arch=('i686' 'x86_64')
license=('GPL')
makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils'
'libcups' 'libxml2')
-source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz;)
-md5sums=('9d806643f17dc65a492a1d4e8a60f2ec')
+source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz;
+'no-packagekit.patch')
+md5sums=('9d806643f17dc65a492a1d4e8a60f2ec'
+ 'e70a274c3cced39db1668e2a748e068f')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
+
+ patch -p1 -i ${srcdir}/no-packagekit.patch
sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
Added: no-packagekit.patch
===
--- no-packagekit.patch (rev 0)
+++ no-packagekit.patch 2011-08-03 14:53:04 UTC (rev 134387)
@@ -0,0 +1,36 @@
+--- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01
10:47:11.614519332 +0100
system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02
15:45:33.807623959 +0100
+@@ -21,7 +21,6 @@
+
+ import cups, pprint, os, tempfile, re, string
+ import locale
+-import packagekit.client, packagekit.enums
+ from . import _debugprint
+
+ class Printer:
+@@ -829,24 +828,7 @@
+ missing executables
+
+ executables = missingExecutables(ppd)
+-packages = []
+-if executables:
+-unresolved_executables = []
+-client = packagekit.client.PackageKitClient ()
+-for executable in executables:
+-if not executable.startswith (/):
+-executable = /usr/bin/ + executable
+-
+-result = client.search_file ([executable],
+-
packagekit.enums.FILTER_NOT_INSTALLED)
+-if result:
+-packages.extend (set (map (lambda x: x.name, result)))
+-else:
+-unresolved_executables.append (executable)
+-
+-executables = unresolved_executables
+-
+-return (packages, executables)
++return ([], executables)
+
+ def _main():
+ c = cups.Connection()
[arch-commits] Commit in system-config-printer/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 10:53:08 Author: andrea Revision: 134388 archrelease: remove extra-i686 Deleted: system-config-printer/repos/extra-i686/
[arch-commits] Commit in system-config-printer/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 10:53:25 Author: andrea Revision: 134389 archrelease: copy trunk to extra-i686 Added: system-config-printer/repos/extra-i686/
[arch-commits] Commit in system-config-printer/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 10:53:29 Author: andrea Revision: 134390 archrelease: remove extra-x86_64 Deleted: system-config-printer/repos/extra-x86_64/
[arch-commits] Commit in system-config-printer/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 10:53:53 Author: andrea Revision: 134391 archrelease: copy trunk to extra-x86_64 Added: system-config-printer/repos/extra-x86_64/
[arch-commits] Commit in cyrus-sasl/trunk (20 files)
Date: Wednesday, August 3, 2011 @ 11:05:47 Author: jgc Revision: 134392 Initial work on a better SASL Added: cyrus-sasl/trunk/0003_saslauthd_mdoc.patch cyrus-sasl/trunk/0010_maintainer_mode.patch cyrus-sasl/trunk/0012_xopen_crypt_prototype.patch cyrus-sasl/trunk/0016_pid_file_lock_creation_mask.patch cyrus-sasl/trunk/0018_auth_rimap_quotes.patch cyrus-sasl/trunk/0019_ldap_deprecated.patch cyrus-sasl/trunk/0022_gcc4.4_preprocessor_syntax.patch cyrus-sasl/trunk/0025_ld_as_needed.patch cyrus-sasl/trunk/0026_drop_krb5support_dependency.patch cyrus-sasl/trunk/0027_db5_support.patch cyrus-sasl/trunk/0030-dont_use_la_files_for_opening_plugins.patch cyrus-sasl/trunk/cyrus-sasl-2.1.19-checkpw.c.patch cyrus-sasl/trunk/cyrus-sasl-2.1.22-as-needed.patch cyrus-sasl/trunk/cyrus-sasl-2.1.22-automake-1.10.patch cyrus-sasl/trunk/cyrus-sasl-2.1.22-crypt.patch cyrus-sasl/trunk/cyrus-sasl-2.1.22-qa.patch cyrus-sasl/trunk/cyrus-sasl-2.1.23-authd-fix.patch Modified: cyrus-sasl/trunk/PKGBUILD Deleted: cyrus-sasl/trunk/cyrus-sasl-2.1.23+db-5.0.patch cyrus-sasl/trunk/cyrus-sasl-2.1.23-gcc4.patch --+ 0003_saslauthd_mdoc.patch| 35 0010_maintainer_mode.patch | 19 ++ 0012_xopen_crypt_prototype.patch | 20 ++ 0016_pid_file_lock_creation_mask.patch | 27 +++ 0018_auth_rimap_quotes.patch | 35 0019_ldap_deprecated.patch | 22 ++ 0022_gcc4.4_preprocessor_syntax.patch| 26 +++ 0025_ld_as_needed.patch | 27 +++ 0026_drop_krb5support_dependency.patch | 14 + 0027_db5_support.patch | 24 ++ 0030-dont_use_la_files_for_opening_plugins.patch | 134 +++ PKGBUILD | 181 + cyrus-sasl-2.1.19-checkpw.c.patch| 170 +++ cyrus-sasl-2.1.22-as-needed.patch| 11 + cyrus-sasl-2.1.22-automake-1.10.patch| 94 ++ cyrus-sasl-2.1.22-crypt.patch| 71 cyrus-sasl-2.1.22-qa.patch | 22 ++ cyrus-sasl-2.1.23+db-5.0.patch | 24 -- cyrus-sasl-2.1.23-authd-fix.patch| 28 +++ cyrus-sasl-2.1.23-gcc4.patch | 21 -- 20 files changed, 926 insertions(+), 79 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 134391:134392 to see the changes.
[arch-commits] Commit in mercurial/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 11:08:59
Author: giovanni
Revision: 134393
upgpkg: mercurial 1.9.1-1
upstream release
Modified:
mercurial/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 15:05:47 UTC (rev 134392)
+++ PKGBUILD2011-08-03 15:08:59 UTC (rev 134393)
@@ -3,18 +3,18 @@
# Contributor: Douglas Soares de Andrade doug...@archlinux.org
pkgname=mercurial
-pkgver=1.9
-pkgrel=2
+pkgver=1.9.1
+pkgrel=1
pkgdesc=A scalable distributed SCM tool
arch=('i686' 'x86_64')
-url=http://www.selenic.com/mercurial;
+url=http://mercurial.selenic.com/;
license=('GPL')
depends=('python2')
optdepends=('tk: for the hgk GUI')
backup=('etc/mercurial/hgrc')
-source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz
+source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz
mercurial.profile)
-md5sums=('d4842129fa2732eb6ed1180467bc32e2'
+md5sums=('601990cc58af8316af4e1ea63e19d1be'
'43e1d36564d4c7fbe9a091d3ea370a44')
package() {
[arch-commits] Commit in mercurial/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 11:09:02 Author: giovanni Revision: 134394 archrelease: remove extra-i686 Deleted: mercurial/repos/extra-i686/
[arch-commits] Commit in mercurial/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 11:09:17 Author: giovanni Revision: 134395 archrelease: copy trunk to extra-i686 Added: mercurial/repos/extra-i686/
[arch-commits] Commit in mercurial/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 11:09:19 Author: giovanni Revision: 134396 archrelease: remove extra-x86_64 Deleted: mercurial/repos/extra-x86_64/
[arch-commits] Commit in mercurial/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 11:09:31 Author: giovanni Revision: 134397 archrelease: copy trunk to extra-x86_64 Added: mercurial/repos/extra-x86_64/
[arch-commits] Commit in udev/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 11:11:31
Author: tomegun
Revision: 134398
no need for libxslt as man pages are included
Modified:
udev/trunk/PKGBUILD
--+
PKGBUILD |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 15:09:31 UTC (rev 134397)
+++ PKGBUILD2011-08-03 15:11:31 UTC (rev 134398)
@@ -13,15 +13,17 @@
license=('GPL')
groups=('base')
options=(!makeflags !libtool)
-makedepends=('gobject-introspection' 'gperf' 'libxslt')
+makedepends=('gobject-introspection' 'gperf')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
bluetooth.patch
81-arch.rules)
build() {
cd $srcdir/$pkgbase-$pkgver
+
# fix https://bugs.archlinux.org/task/25356 (submitted upstream)
patch -Np1 -i ../bluetooth.patch
+
./configure --sysconfdir=/etc\
--with-rootlibdir=/lib\
--libexecdir=/lib/udev\
@@ -29,6 +31,7 @@
--with-systemdsystemunitdir=/lib/systemd/system\
--disable-rule-generator\
--enable-udev_acl
+
make
}
[arch-commits] Commit in cyrus-sasl/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 11:52:24
Author: jgc
Revision: 134399
add makedepends, make dependencies on subpackages versioned
Modified:
cyrus-sasl/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 15:11:31 UTC (rev 134398)
+++ PKGBUILD2011-08-03 15:52:24 UTC (rev 134399)
@@ -12,6 +12,7 @@
url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
license=('custom')
options=('!makeflags' '!libtool')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
cyrus-sasl-2.1.19-checkpw.c.patch
cyrus-sasl-2.1.22-crypt.patch
@@ -118,7 +119,6 @@
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
--sysconfdir=/etc \
--with-devrandom=/dev/urandom
-
make
}
@@ -147,7 +147,7 @@
}
package_cyrus-sasl() {
- depends=('libsasl-gssapi')
+ depends=(libsasl-gssapi=${pkgver}-${pkgrel})
cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
make DESTDIR=${pkgdir} install
@@ -157,7 +157,7 @@
}
package_cyrus-sasl-sql() {
- depends=('libsasl-gssapi' 'libmysqlclient' 'postgresql-libs')
+ depends=(libsasl-gssapi=${pkgver}-${pkgrel} 'libmysqlclient'
'postgresql-libs')
replaces=('cyrus-sasl-plugins')
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
[arch-commits] Commit in pcmciautils/trunk (60-pcmcia.rules PKGBUILD)
Date: Wednesday, August 3, 2011 @ 12:55:02
Author: tomegun
Revision: 134400
upgpkg: pcmciautils 018-1
upstream update and remove custom udev rules
Modified:
pcmciautils/trunk/PKGBUILD
Deleted:
pcmciautils/trunk/60-pcmcia.rules
-+
60-pcmcia.rules | 30 --
PKGBUILD| 17 ++---
2 files changed, 6 insertions(+), 41 deletions(-)
Deleted: 60-pcmcia.rules
===
--- 60-pcmcia.rules 2011-08-03 15:52:24 UTC (rev 134399)
+++ 60-pcmcia.rules 2011-08-03 16:55:02 UTC (rev 134400)
@@ -1,30 +0,0 @@
-# PCMCIA devices:
-#
-ACTION!=add, GOTO=pcmciautils_end
-# modprobe $env{MODALIAS} loads all possibly appropriate modules
-SUBSYSTEM==pcmcia, ENV{MODALIAS}==?*, \
- RUN+=/lib/udev/load-modules.sh $env{MODALIAS}
-
-# Very few CIS firmware entries (which we use for matching)
-# are so broken that we need to read out random bytes of it
-# instead of the manufactor, card or product ID. Then the
-# matching is done in userspace.
-SUBSYSTEM==pcmcia, ENV{MODALIAS}==?*, \
- RUN+=/lib/udev/pcmcia-check-broken-cis
-
-# However, the weak matching by func_id is only allowed _after_ modprobe
-# returns, so that strong matches have a higher priority.
-SUBSYSTEM==pcmcia, ENV{MODALIAS}==?*, ATTR{allow_func_id_match}=1
-
-# PCMCIA sockets:
-#
-# modprobe the pcmcia bus module so that 16-bit PCMCIA devices work
-SUBSYSTEM==pcmcia_socket, \
- RUN+=/lib/udev/load-modules.sh pcmcia
-
-# if this is a PCMCIA socket which needs a resource database,
-# pcmcia-socket-startup sets it up
-SUBSYSTEM==pcmcia_socket, \
- RUN+=/lib/udev/pcmcia-socket-startup
-
-LABEL=pcmciautils_end
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 15:52:24 UTC (rev 134399)
+++ PKGBUILD2011-08-03 16:55:02 UTC (rev 134400)
@@ -1,20 +1,18 @@
# $Id$
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=pcmciautils
-pkgver=017
-pkgrel=2
+pkgver=018
+pkgrel=1
pkgdesc=Utilities for inserting and removing PCMCIA cards
arch=(i686 x86_64)
url=http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html;
license=('GPL')
groups=('base')
-depends=('glibc' 'sysfsutils' 'module-init-tools=3.2pre9')
+# sysfsutils will not be required in the next release
+depends=('udev' 'sysfsutils')
conflicts=('pcmcia-cs')
-source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2
-60-pcmcia.rules)
+source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2)
options=(!makeflags)
-md5sums=('5245af28eeba57ec0606a874d44d10f7'
- 'f88ac464ab9c75fe1565af551e6553a2')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -25,8 +23,5 @@
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
- # fix lspcmcia symlink
- ln -sf pccardctl ${pkgdir}/sbin/lspcmcia
- # add fixed rules file
- install -D -m644 ${srcdir}/60-pcmcia.rules ${pkgdir}/lib/udev/rules.d/
}
+md5sums=('5d85669b3440baa4532363da6caaf1b4')
[arch-commits] Commit in pcmciautils/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 12:55:16 Author: tomegun Revision: 134401 archrelease: copy trunk to testing-i686 Added: pcmciautils/repos/testing-i686/
[arch-commits] Commit in pcmciautils/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 12:55:32 Author: tomegun Revision: 134402 archrelease: copy trunk to testing-x86_64 Added: pcmciautils/repos/testing-x86_64/
[arch-commits] Commit in pcmciautils/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 12:56:40 Author: tomegun Revision: 134403 archrelease: remove testing-i686 Deleted: pcmciautils/repos/testing-i686/
[arch-commits] Commit in pcmciautils/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 12:56:56 Author: tomegun Revision: 134404 archrelease: copy trunk to testing-i686 Added: pcmciautils/repos/testing-i686/
[arch-commits] Commit in pcmciautils/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 12:57:00 Author: tomegun Revision: 134405 archrelease: remove testing-x86_64 Deleted: pcmciautils/repos/testing-x86_64/
[arch-commits] Commit in pcmciautils/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 12:57:15 Author: tomegun Revision: 134406 archrelease: copy trunk to testing-x86_64 Added: pcmciautils/repos/testing-x86_64/
[arch-commits] Commit in grub/trunk (PKGBUILD install-grub)
Date: Wednesday, August 3, 2011 @ 14:23:55
Author: ronald
Revision: 134407
compile fixes; handle new naming scheme in install-grub script
Modified:
grub/trunk/PKGBUILD
grub/trunk/install-grub
--+
PKGBUILD | 62 +++-
install-grub | 285 ++---
2 files changed, 189 insertions(+), 158 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 16:57:15 UTC (rev 134406)
+++ PKGBUILD2011-08-03 18:23:55 UTC (rev 134407)
@@ -3,7 +3,7 @@
pkgname=grub
pkgver=0.97
-pkgrel=17
+pkgrel=18
pkgdesc=A GNU multiboot boot loader
arch=('i686' 'x86_64')
license=('GPL')
@@ -20,20 +20,22 @@
more-raid.patch
intelmac.patch
grub-inode-size.patch
- ext4.patch)
+ ext4.patch
+ grub-0.97-ldflags-objcopy-remove-build-id.patch)
backup=('boot/grub/menu.lst')
install=grub.install
-md5sums=('cd3f3eb54446be6003156158d51f4884'
- 'a2098dc41fc3cb13e53179de2979d088'
- '3182c4ae4963a16930bc772bba89dacf'
- 'eb9d69c46af3a0667c1f651817d7f075'
- 'ccd2d757e79e3a03dc19ede7391ed328'
- '826fdbf446067f9861baf9f6a69a4583'
- '49f6d4bcced0bc8bbcff273f3254bbfa'
- 'f41f702014a064918d7afc6fc23baa6e'
- '175dc6b9f4ab94e8056c3afb3e34460a'
- '69c648d2b8d0965df70a74014424f31c'
- '39e0f9a05b7e04aceb24fc7bc4893e3d')
+sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
+ '734fa37ebe1657bf1f8f74ee4866953ff96f2604'
+ '5479f098c71817ac86d0059cf1c77ca169a6fd93'
+ '157b81dbad3576536b08642242accfa1aeb093a9'
+ 'adbb4685c98797ffb4dc83561ec75698991dddbd'
+ 'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
+ 'c5e2c94ed0e759590b9eb38c9d979f075d19d7c0'
+ '45fe668a3779664fb292591f426976b6c784d6c8'
+ '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
+ '0436aa6fa0b6f768289172f983a3f4b69384629e'
+ 'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
+ '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -43,26 +45,38 @@
DESTARCH=x86_64
# optimizations break the build -- disable them
# adding special devices to grub, patches are from fedora
- patch -Np1 -i ../special-devices.patch || return 1
- patch -Np1 -i ../i2o.patch || return 1
- patch -Np1 -i ../more-raid.patch || return 1
- patch -Np1 -i ../intelmac.patch || return 1
+ patch -Np1 -i ../special-devices.patch
+ patch -Np1 -i ../i2o.patch
+ patch -Np1 -i ../more-raid.patch
+ patch -Np1 -i ../intelmac.patch
# Add support for bigger inode size to e2fs_stage1_5
- patch -Np1 -i ../grub-inode-size.patch || return 1
+ patch -Np1 -i ../grub-inode-size.patch
# Add ext4 support
# http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html
- patch -Np1 -i ../ext4.patch || return 1
+ patch -Np1 -i ../ext4.patch
+ # binutils fix
+ patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
+ sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i
${srcdir}/${pkgname}-${pkgver}/configure.ac
+ sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i
${srcdir}/${pkgname}-${pkgver}/configure.ac
+
+ ## recreate ./configure script with the required changes in LDFLAGS and
objcopy
+ aclocal
+ autoconf
+ autoreconf
+ automake
+
#arch64 fixes for static build
- if [ $CARCH = x86_64 ]; then
+ if [ $CARCH = x86_64 ]; then ## correcting problems for new wersion of
autotools
+
echo this package has to be built on i686, won't compile on x86_64
sleep 5
else
if [ $DESTARCH = x86_64 ]; then
# patch from gentoo for fixing a segfault
- patch -Np1 -i ../040_all_grub-0.96-nxstack.patch || return 1
+ patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
# patch from frugalware to make it boot when more than 2GB ram installed
- patch -Np1 -i ../05-grub-0.97-initrdaddr.diff || return 1
+ patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
CFLAGS=-static ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin
\
--mandir=/usr/share/man --infodir=/usr/share/info
else
@@ -71,8 +85,8 @@
fi
fi
- CFLAGS= make || return 1
- make DESTDIR=$pkgdir install || return 1
+ CFLAGS= make
+ make DESTDIR=$pkgdir install
install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
install -D -m755 ../install-grub $pkgdir/sbin/install-grub
Modified: install-grub
===
--- install-grub2011-08-03 16:57:15 UTC (rev 134406)
+++ install-grub2011-08-03 18:23:55 UTC (rev 134407)
@@ -12,8 +12,8 @@
#
# Then start up the 'grub' shell and run something like the following:
#
-#grub root(hd0,0)
-#grub setup(hd0)
+#grub root (hd0,0)
+#grub setup (hd0)
#
# The root line should point to the partition your kernel is located on,
# /boot if you have a separate boot partition,
[arch-commits] Commit in grub/trunk (grub-0.97-ldflags-objcopy-remove-build-id.patch)
Date: Wednesday, August 3, 2011 @ 14:31:05
Author: ronald
Revision: 134408
compile patch
Added:
grub/trunk/grub-0.97-ldflags-objcopy-remove-build-id.patch
-+
grub-0.97-ldflags-objcopy-remove-build-id.patch | 196 ++
1 file changed, 196 insertions(+)
Added: grub-0.97-ldflags-objcopy-remove-build-id.patch
===
--- grub-0.97-ldflags-objcopy-remove-build-id.patch
(rev 0)
+++ grub-0.97-ldflags-objcopy-remove-build-id.patch 2011-08-03 18:31:05 UTC
(rev 134408)
@@ -0,0 +1,196 @@
+diff --git a/Makefile.in b/Makefile.in
+index 6652366..ba058eb 100644
+--- a/Makefile.in
b/Makefile.in
+@@ -112,6 +112,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+diff --git a/acinclude.m4 b/acinclude.m4
+index 368839c..32b3fa6 100644
+--- a/acinclude.m4
b/acinclude.m4
+@@ -57,7 +57,7 @@ else
+ fi
+ grub_cv_prog_objcopy_absolute=yes
+ for link_addr in 2000 8000 7C00; do
+- if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext
-Wl,$link_addr conftest.o -o conftest.exec]); then :
++ if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext
-Wl,$link_addr -Wl,--build-id=none conftest.o -o conftest.exec]); then :
+ else
+ AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
+ fi
+diff --git a/configure.ac b/configure.ac
+index bb9e1d9..9ac5c9f 100644
+--- a/configure.ac
b/configure.ac
+@@ -115,6 +115,9 @@ if test x$ac_cv_prog_gcc = xyes; then
+ fi
+ fi
+
++LOADER_LDFLAGS=-Wl,--build-id=none
++AC_SUBST(LOADER_LDFLAGS)
++
+ AC_SUBST(STAGE1_CFLAGS)
+ AC_SUBST(STAGE2_CFLAGS)
+ AC_SUBST(GRUB_CFLAGS)
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index 3e2de4b..7b2c94d 100644
+--- a/docs/Makefile.in
b/docs/Makefile.in
+@@ -131,6 +131,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+diff --git a/grub/Makefile.in b/grub/Makefile.in
+index 136c38f..7c23ebe 100644
+--- a/grub/Makefile.in
b/grub/Makefile.in
+@@ -108,6 +108,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index 3dae206..449e126 100644
+--- a/lib/Makefile.in
b/lib/Makefile.in
+@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+diff --git a/netboot/Makefile.in b/netboot/Makefile.in
+index 75ac299..0275768 100644
+--- a/netboot/Makefile.in
b/netboot/Makefile.in
+@@ -108,6 +108,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+diff --git a/stage1/Makefile.am b/stage1/Makefile.am
+index 0afc285..3d83356 100644
+--- a/stage1/Makefile.am
b/stage1/Makefile.am
+@@ -5,7 +5,7 @@ CLEANFILES = $(nodist_pkglib_DATA)
+
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+-LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
++LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
+
+ noinst_PROGRAMS = stage1.exec
+ stage1_exec_SOURCES = stage1.S stage1.h
+diff --git a/stage1/Makefile.in b/stage1/Makefile.in
+index 7134bdf..ee4477f 100644
+--- a/stage1/Makefile.in
b/stage1/Makefile.in
+@@ -110,9 +110,10 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
++LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LOADER_LDFLAGS = @LOADER_LDFLAGS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+diff --git a/stage2/Makefile.am b/stage2/Makefile.am
+index f8e6d42..ff6f347 100644
+--- a/stage2/Makefile.am
b/stage2/Makefile.am
+@@ -55,11 +55,11 @@ noinst_PROGRAMS = pre_stage2.exec start.exec
start_eltorito.exec \
+ endif
+ MOSTLYCLEANFILES = $(noinst_PROGRAMS)
+
+-PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
+-START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
+-NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
+-PXELOADER_LINK =
[arch-commits] Commit in bmp/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 14:32:37
Author: angvp
Revision: 134409
upgpkg: bmp 0.9.7.1-6
rebuilt without esound
Modified:
bmp/trunk/PKGBUILD
--+
PKGBUILD | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 18:31:05 UTC (rev 134408)
+++ PKGBUILD2011-08-03 18:32:37 UTC (rev 134409)
@@ -4,24 +4,29 @@
pkgname=bmp
pkgver=0.9.7.1
-pkgrel=5
+pkgrel=6
pkgdesc=gtk2 port of xmms
arch=(i686 x86_64)
url=http://sourceforge.net/projects/beepmp/;
license=('GPL')
-depends=('esound' 'id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip')
+depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip')
makedepends=('libxt')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz
${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
-md5sums=('c25d5a8d49cc5851d13d525a20023c4c' 'fa1bdf5a8d03e8539a6bed5caa471176'\
+md5sums=('c25d5a8d49cc5851d13d525a20023c4c'
+ 'fa1bdf5a8d03e8539a6bed5caa471176'
'42ad4109ddb66024d4c6d1f3e572ab86')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i ../${pkgver}-visualization.patch || return 1
- patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch || return 1
- ./configure --prefix=/usr --mandir=/usr/share/man || return 1
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ patch -p0 -i ../${pkgver}-visualization.patch
+ patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
# vim: ts=2 sw=2 et ft=sh
[arch-commits] Commit in bmp/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 14:33:04 Author: angvp Revision: 134410 archrelease: remove extra-i686 Deleted: bmp/repos/extra-i686/
[arch-commits] Commit in bmp/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 14:33:13 Author: angvp Revision: 134411 archrelease: copy trunk to extra-i686 Added: bmp/repos/extra-i686/
[arch-commits] Commit in bmp/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 14:33:37 Author: angvp Revision: 134412 archrelease: remove extra-x86_64 Deleted: bmp/repos/extra-x86_64/
[arch-commits] Commit in bmp/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 14:33:46 Author: angvp Revision: 134413 archrelease: copy trunk to extra-x86_64 Added: bmp/repos/extra-x86_64/
[arch-commits] Commit in grub/trunk (PKGBUILD install-grub)
Date: Wednesday, August 3, 2011 @ 15:21:09
Author: ronald
Revision: 134414
upgpkg: grub 0.97-18
fix compile issues; handle new kernel naming scheme in install-grub script;
make install-grub script slightly smarter (though still not very smart)
Modified:
grub/trunk/PKGBUILD
grub/trunk/install-grub
--+
PKGBUILD | 15 +++
install-grub | 12 ++--
2 files changed, 17 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 18:33:46 UTC (rev 134413)
+++ PKGBUILD2011-08-03 19:21:09 UTC (rev 134414)
@@ -26,7 +26,7 @@
install=grub.install
sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
'734fa37ebe1657bf1f8f74ee4866953ff96f2604'
- '5479f098c71817ac86d0059cf1c77ca169a6fd93'
+ 'e88a68204c9c9d4bd0b50fa11cab789df4ac55f8'
'157b81dbad3576536b08642242accfa1aeb093a9'
'adbb4685c98797ffb4dc83561ec75698991dddbd'
'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
@@ -37,12 +37,15 @@
'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
'61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
+
+#set destination architecture here
+#DESTARCH=i686
+DESTARCH=x86_64
+
+
build() {
cd $srcdir/$pkgname-$pkgver
- #set destination architecture here
- #DESTARCH=i686
- DESTARCH=x86_64
# optimizations break the build -- disable them
# adding special devices to grub, patches are from fedora
patch -Np1 -i ../special-devices.patch
@@ -84,7 +87,11 @@
--mandir=/usr/share/man --infodir=/usr/share/info
fi
fi
+}
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
CFLAGS= make
make DESTDIR=$pkgdir install
install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
Modified: install-grub
===
--- install-grub2011-08-03 18:33:46 UTC (rev 134413)
+++ install-grub2011-08-03 19:21:09 UTC (rev 134414)
@@ -114,15 +114,15 @@
head -n $(cat /tmp/.menu.lst | grep -n '#-\*' | cut -d: -f 1)
/tmp/.menu.lst /boot/grub/menu.lst
rm -f /tmp/.menu.lst
- for kernel in /boot/vmlinuz-linux* /boot/vmlinuz26*; do
- if [ ${kernel} == /boot/vmlinuz-linux* ] || [ ${kernel} ==
/boot/vmlinuz26* ] ; then
+ for kernel in /boot/vmlinuz-linux* /boot/vmlinuz26-*; do
+ if [ ${kernel} == /boot/vmlinuz-linux* ] || [ ${kernel} ==
/boot/vmlinuz26-* ] ; then
echo /dev/null
else
VMLINUZ=$( echo ${kernel} | cut -c 7- )
- if [ $( echo ${VMLINUZ} | cut -c -13 ) = vmlinuz-linux ]; then #
new naming scheme for linux 3.0
+ if [ $( echo ${VMLINUZ} | cut -c -13 ) = vmlinuz-linux ]; then #
new naming scheme for linux 3.0
extension=$( echo ${VMLINUZ} | cut -c 14- )
- INITRAMFS_BASENAME = initramfs-linux${extension}
+ INITRAMFS_BASENAME=initramfs-linux${extension}
else # old naming scheme for lts kernel
extension=$( echo ${VMLINUZ} | cut -c 10- )
INITRAMFS_BASENAME=kernel26${extension}
@@ -130,7 +130,7 @@
echo /boot/grub/menu.lst
echo # (0) Arch Linux /boot/grub/menu.lst
- echo title Arch Linux /boot/grub/menu.lst
+ echo title Arch Linux - ${VMLINUZ} /boot/grub/menu.lst
subdir=
if [ ${bootdev} != ]; then
grubdev=$(mapdev ${bootdev})
@@ -144,7 +144,7 @@
# adding fallback/full image
echo # (1) Arch Linux /boot/grub/menu.lst
- echo title Arch Linux Fallback /boot/grub/menu.lst
+ echo title Arch Linux Fallback - ${VMLINUZ} /boot/grub/menu.lst
echo root ${grubdev} /boot/grub/menu.lst
echo kernel ${subdir}/${VMLINUZ} root=${PART_ROOT} ro
/boot/grub/menu.lst
echo initrd ${subdir}/${INITRAMFS_BASENAME}-fallback.img
/boot/grub/menu.lst
[arch-commits] Commit in grub/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 15:21:26 Author: ronald Revision: 134415 archrelease: copy trunk to testing-x86_64 Added: grub/repos/testing-x86_64/
[arch-commits] Commit in grub/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 15:24:00
Author: ronald
Revision: 134416
upgpkg: grub 0.97-18
fix compile issues; handle new kernel naming scheme in install-grub script;
make install-grub script slightly smarter (though still not very smart)
Modified:
grub/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 19:21:26 UTC (rev 134415)
+++ PKGBUILD2011-08-03 19:24:00 UTC (rev 134416)
@@ -39,8 +39,8 @@
#set destination architecture here
-#DESTARCH=i686
-DESTARCH=x86_64
+DESTARCH=i686
+#DESTARCH=x86_64
build() {
[arch-commits] Commit in cyrus-sasl/trunk (saslauthd)
Date: Wednesday, August 3, 2011 @ 15:32:29 Author: jgc Revision: 134418 Improve init script a bit Modified: cyrus-sasl/trunk/saslauthd ---+ saslauthd | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) Modified: saslauthd === --- saslauthd 2011-08-03 19:24:16 UTC (rev 134417) +++ saslauthd 2011-08-03 19:32:29 UTC (rev 134418) @@ -8,33 +8,32 @@ DAEMON_NAME=saslauthd SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN` +SASLAUTHD_RUN=/var/run/saslauthd +SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid case $1 in start) stat_busy Starting $DAEMON_NAME -[ -z $SASLAUTHD_PID ] $SASLAUTHD_BIN $SASLAUTHD_OPTS -if [ $? -gt 0 ]; then +[ ! -d /var/run/saslauthd ] install -d /var/run/saslauthd +if $SASLAUTHD_BIN $SASLAUTHD_OPTS /dev/null; then + add_daemon $DAEMON_NAME + stat_done +else stat_fail exit 1 -else - echo `pidof -o %PPID $SASLAUTHD_BIN` /var/run/$DAEMON_NAME.pid fi -add_daemon $DAEMON_NAME -stat_done ;; stop) stat_busy Stopping $DAEMON_NAME -[ ! -z $SASLAUTHD_PID ] kill $SASLAUTHD_PID /dev/null +[ -f $SASLAUTHD_PID ] kill `cat $SASLAUTHD_PID` /dev/null if [ $? -gt 0 ]; then stat_fail exit 1 else - rm /var/run/$DAEMON_NAME.pid /dev/null + rm_daemon $DAEMON_NAME + stat_done fi -rm_daemon $DAEMON_NAME -stat_done ;; restart)
[arch-commits] Commit in cyrus-sasl/trunk (saslauthd.conf.d)
Date: Wednesday, August 3, 2011 @ 15:33:55 Author: jgc Revision: 134419 No need to include default rundir Modified: cyrus-sasl/trunk/saslauthd.conf.d --+ saslauthd.conf.d |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: saslauthd.conf.d === --- saslauthd.conf.d2011-08-03 19:32:29 UTC (rev 134418) +++ saslauthd.conf.d2011-08-03 19:33:55 UTC (rev 134419) @@ -1 +1 @@ -SASLAUTHD_OPTS=-m /var/run/saslauthd -a pam +SASLAUTHD_OPTS=-a pam
[arch-commits] Commit in xine-lib/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 15:34:12
Author: eric
Revision: 134420
upgpkg: xine-lib 1.1.19-3
Remove esound support, Add xinerama and modplug support, Replace gtk2
optdepends by gdk-pixbuf2, Move several depends to optdepends, Clean up
depends, makedepends and configure command, Add fix for latest v4l-utils
Modified:
xine-lib/trunk/PKGBUILD
--+
PKGBUILD | 44 ++--
1 file changed, 26 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 19:33:55 UTC (rev 134419)
+++ PKGBUILD2011-08-03 19:34:12 UTC (rev 134420)
@@ -1,45 +1,53 @@
# $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
+# Maintainer: Eric Bélanger e...@archlinux.org
pkgname=xine-lib
pkgver=1.1.19
-pkgrel=2
+pkgrel=3
pkgdesc=A multimedia playback engine
arch=('i686' 'x86_64')
url=http://www.xine-project.org;
license=('LGPL' 'GPL')
-depends=('libgl' 'libxvmc' 'esound' 'flac' 'libvorbis' 'sdl' 'libmng'
'libtheora'
- 'libxcb' 'wavpack' 'ffmpeg' 'faad2')
-makedepends=('pkg-config' 'libtool' 'imagemagick' 'smbclient' 'mesa'
'alsa-lib'
- 'vcdimager' 'jack' 'gtk2' 'libpulse' 'speex' 'aalib')
-optdepends=('imagemagick: for using the imagemagick plugin' 'smbclient: for
using the smb plugin' \
-'jack: for using the jack plugin' 'vcdimager: for using the vcd
plugin' \
-'gtk2: for using the gdk-pixbuf plugin' 'mesa: for using the
opengl plugin' \
-'libpulse: for using the pulseaudio plugin' 'speex: for using the
speex plugin' \
+depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
'libmodplug'
+ 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex'
'aalib')
+optdepends=('imagemagick: for using the imagemagick plugin' \
+'smbclient: for using the smb plugin' \
+'jack: for using the jack plugin' \
+'vcdimager: for using the vcd plugin' \
+'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
+'mesa: for using the opengl plugin' \
+'libpulse: for using the pulseaudio plugin' \
+'speex: for using the speex plugin' \
+'libmodplug: for using the modplug plugin' \
+'v4l-utils: for using the v4l plugin' \
+'wavpack: for using the wavpack plugin' \
+'faad2: for using the faad plugin' \
+'libmng: for using the mng plugin' \
'aalib: for using the aalib plugin')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
xine-lib-1.1.1-configure-no-mcpu-march.patch
xine-lib-1.1.19-xvmc.patch)
-md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' '9776df4eb54d2f1f68d8268adbc3b5c2'\
+md5sums=('a410a0f0617e1d6309f0cbe907f73f8a'
+ '9776df4eb54d2f1f68d8268adbc3b5c2'
'8662fb124870b1dd7effe4ff5e2a2e3d')
-sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0'
'121a8358d7919b2e51067412373f52848290338a'\
- '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
+sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0'
+ '121a8358d7919b2e51067412373f52848290338a'
+ '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p0 ../xine-lib-1.1.1-configure-no-mcpu-march.patch
patch -p0 ../xine-lib-1.1.19-xvmc.patch
+ sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
+configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
libtoolize --force --copy
aclocal -I m4
autoconf
automake --add-missing
- ./configure --prefix=/usr --with-w32-path=/usr/lib/codecs \
---with-xv-path=/usr/lib --with-xxmc-path=/usr/lib
--with-xvmc-path=/usr/lib \
---with-libflac --with-wavpack --with-xcb --with-jack --with-speex \
---disable-gnomevfs --with-pulseaudio --enable-aalib --disable-modplug \
---with-external-ffmpeg
+ ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg
--with-external-libfaad
make
}
[arch-commits] Commit in xine-lib/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 15:34:24 Author: eric Revision: 134421 archrelease: remove extra-i686 Deleted: xine-lib/repos/extra-i686/
[arch-commits] Commit in xine-lib/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 15:34:33 Author: eric Revision: 134422 archrelease: copy trunk to extra-i686 Added: xine-lib/repos/extra-i686/
[arch-commits] Commit in xine-lib/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 15:34:36 Author: eric Revision: 134423 archrelease: remove extra-x86_64 Deleted: xine-lib/repos/extra-x86_64/
[arch-commits] Commit in xine-lib/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 15:34:48 Author: eric Revision: 134424 archrelease: copy trunk to extra-x86_64 Added: xine-lib/repos/extra-x86_64/
[arch-commits] Commit in cyrus-sasl/trunk (2 files)
Date: Wednesday, August 3, 2011 @ 16:15:12
Author: jgc
Revision: 134425
Final package layout.
Add forgotten patch
Add back SASL configuration
Add correct provides/conflicts/replaces lines, this should be a clean upgrade
for everyone
Add information about libsasl/cyrus-sasl packaging
Added:
cyrus-sasl/trunk/0011_saslauthd_ac_prog_libtool.patch
Modified:
cyrus-sasl/trunk/PKGBUILD
--+
0011_saslauthd_ac_prog_libtool.patch | 15
PKGBUILD | 58 ++---
2 files changed, 55 insertions(+), 18 deletions(-)
Added: 0011_saslauthd_ac_prog_libtool.patch
===
--- 0011_saslauthd_ac_prog_libtool.patch(rev 0)
+++ 0011_saslauthd_ac_prog_libtool.patch2011-08-03 20:15:12 UTC (rev
134425)
@@ -0,0 +1,15 @@
+0011_saslauthd_ac_prog_libtool.dpatch by fa...@debian.org
+
+Enable libtool use.
+
+diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
+--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.0 +0300
trunk/saslauthd/configure.in 2006-11-01 23:41:51.0 +0200
+@@ -25,6 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+
+ dnl Checks for build foo
+ CMU_C___ATTRIBUTE__
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 19:34:48 UTC (rev 134424)
+++ PKGBUILD2011-08-03 20:15:12 UTC (rev 134425)
@@ -1,10 +1,12 @@
# $Id$
# Maintainer: Jan de Groot j...@archlinux.org
+# This package spans multiple repositories.
+# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
+
pkgbase=('cyrus-sasl')
-#pkgname=('libsasl' 'libsasl-gssapi')
-#pkgname=('cyrus-sasl' 'cyrus-sasl-sql')
-pkgname=('libsasl' 'libsasl-gssapi' 'cyrus-sasl' 'cyrus-sasl-sql')
+pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
+#pkgname=libsasl
pkgver=2.1.23
pkgrel=7
pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
@@ -21,7 +23,7 @@
cyrus-sasl-2.1.23-authd-fix.patch
0003_saslauthd_mdoc.patch
0010_maintainer_mode.patch
-0011_saslauthd_ac_prog_libtool
+0011_saslauthd_ac_prog_libtool.patch
0012_xopen_crypt_prototype.patch
0016_pid_file_lock_creation_mask.patch
0018_auth_rimap_quotes.patch
@@ -30,7 +32,9 @@
0025_ld_as_needed.patch
0026_drop_krb5support_dependency.patch
0027_db5_support.patch
-0030-dont_use_la_files_for_opening_plugins.patch)
+0030-dont_use_la_files_for_opening_plugins.patch
+saslauthd.conf.d
+saslauthd)
md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
'e27ddff076342e7a3041c4759817d04b'
'd7e6886e88af04d05f3dec7f0a59ccf7'
@@ -48,7 +52,9 @@
'62bf892fe4d1df41ff748e91a1afaf67'
'b7848957357e7c02d6490102be496bf9'
'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
- '8e7106f32e495e9ade69014fd1b3352a')
+ '8e7106f32e495e9ade69014fd1b3352a'
+ '49219af5641150edec288a3fdb65e7c1'
+ '75542f613185d5a90520ad0d7d926a20')
build() {
cd ${srcdir}/cyrus-sasl-${pkgver}
@@ -59,7 +65,7 @@
patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch
patch -Np1 -i ${srcdir}/0003_saslauthd_mdoc.patch
patch -Np1 -i ${srcdir}/0010_maintainer_mode.patch
- patch -Np1 -i ${srcdir}/0011_saslauthd_ac_prog_libtool
+ patch -Np1 -i ${srcdir}/0011_saslauthd_ac_prog_libtool.patch
patch -Np1 -i ${srcdir}/0012_xopen_crypt_prototype.patch
patch -Np1 -i ${srcdir}/0016_pid_file_lock_creation_mask.patch
patch -Np1 -i ${srcdir}/0018_auth_rimap_quotes.patch
@@ -99,7 +105,7 @@
--enable-checkapop \
--enable-cram \
--enable-digest \
- --enable-otp \
+ --disable-otp \
--disable-srp \
--disable-srp-setpass \
--disable-krb4 \
@@ -114,7 +120,7 @@
--enable-ldapdb \
--disable-macos-framework \
--with-pam \
- --with-saslauthd=/run/saslauthd \
+ --with-saslauthd=/var/run/saslauthd \
--with-ldap \
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
--sysconfdir=/etc \
@@ -123,7 +129,10 @@
}
package_libsasl() {
+ pkgdesc=Cyrus Simple Authentication Service Layer (SASL) Library
depends=('openssl')
+ provides=('cyrus-sasl-plugins')
+ conflicts=('cyrus-sasl-plugins')
cd ${srcdir}/cyrus-sasl-${pkgver}
for dir in include lib sasldb plugins utils; do
@@ -136,28 +145,41 @@
rm -f ${pkgdir}/usr/lib/sasl2/libldapdb.so*
}
-package_libsasl-gssapi() {
- depends=('krb5' libsasl=${pkgver}-${pkgrel})
+package_cyrus-sasl() {
+ depends=('libsasl')
+ pkgdesc=Cyrus saslauthd SASL authentication daemon
+
+ cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
+ make DESTDIR=${pkgdir} install
+ install -m755 -d ${pkgdir}/etc/rc.d
+ install -m755 -d ${pkgdir}/etc/conf.d
+
[arch-commits] Commit in cyrus-sasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:16:06 Author: jgc Revision: 134426 archrelease: copy trunk to testing-i686 Added: cyrus-sasl/repos/testing-i686/
[arch-commits] Commit in cyrus-sasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:16:18 Author: jgc Revision: 134427 archrelease: copy trunk to testing-x86_64 Added: cyrus-sasl/repos/testing-x86_64/
[arch-commits] Commit in libsasl (trunk)
Date: Wednesday, August 3, 2011 @ 16:18:25 Author: jgc Revision: 134428 Delete trunk to prepare for copying from cyrus-sasl Deleted: libsasl/trunk/
[arch-commits] Commit in libsasl (8 files)
Date: Wednesday, August 3, 2011 @ 16:20:28
Author: jgc
Revision: 134429
Copy from cyrus-sasl, change pkgname to libsasl, comment pkgbase
Added:
libsasl/trunk/
libsasl/trunk/0011_saslauthd_ac_prog_libtool.patch
(from rev 134425, cyrus-sasl/trunk/0011_saslauthd_ac_prog_libtool.patch)
libsasl/trunk/PKGBUILD
(from rev 134425, cyrus-sasl/trunk/PKGBUILD)
libsasl/trunk/saslauthd
(from rev 134418, cyrus-sasl/trunk/saslauthd)
libsasl/trunk/saslauthd.conf.d
(from rev 134419, cyrus-sasl/trunk/saslauthd.conf.d)
Deleted:
libsasl/trunk/PKGBUILD
libsasl/trunk/saslauthd
libsasl/trunk/saslauthd.conf.d
--+
0011_saslauthd_ac_prog_libtool.patch | 15 +
PKGBUILD | 354 +
saslauthd| 99 -
saslauthd.conf.d |2
4 files changed, 253 insertions(+), 217 deletions(-)
Copied: libsasl/trunk/0011_saslauthd_ac_prog_libtool.patch (from rev 134425,
cyrus-sasl/trunk/0011_saslauthd_ac_prog_libtool.patch)
===
--- trunk/0011_saslauthd_ac_prog_libtool.patch (rev 0)
+++ trunk/0011_saslauthd_ac_prog_libtool.patch 2011-08-03 20:20:28 UTC (rev
134429)
@@ -0,0 +1,15 @@
+0011_saslauthd_ac_prog_libtool.dpatch by fa...@debian.org
+
+Enable libtool use.
+
+diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
+--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.0 +0300
trunk/saslauthd/configure.in 2006-11-01 23:41:51.0 +0200
+@@ -25,6 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+
+ dnl Checks for build foo
+ CMU_C___ATTRIBUTE__
Deleted: trunk/PKGBUILD
===
--- cyrus-sasl/trunk/PKGBUILD 2011-08-03 15:52:24 UTC (rev 134399)
+++ trunk/PKGBUILD 2011-08-03 20:20:28 UTC (rev 134429)
@@ -1,166 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-pkgbase=('cyrus-sasl')
-#pkgname=('libsasl' 'libsasl-gssapi')
-#pkgname=('cyrus-sasl' 'cyrus-sasl-sql')
-pkgname=('libsasl' 'libsasl-gssapi' 'cyrus-sasl' 'cyrus-sasl-sql')
-pkgver=2.1.23
-pkgrel=7
-pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
-arch=('i686' 'x86_64')
-url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
-license=('custom')
-options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
-source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-cyrus-sasl-2.1.19-checkpw.c.patch
-cyrus-sasl-2.1.22-crypt.patch
-cyrus-sasl-2.1.22-qa.patch
-cyrus-sasl-2.1.22-automake-1.10.patch
-cyrus-sasl-2.1.23-authd-fix.patch
-0003_saslauthd_mdoc.patch
-0010_maintainer_mode.patch
-0011_saslauthd_ac_prog_libtool
-0012_xopen_crypt_prototype.patch
-0016_pid_file_lock_creation_mask.patch
-0018_auth_rimap_quotes.patch
-0019_ldap_deprecated.patch
-0022_gcc4.4_preprocessor_syntax.patch
-0025_ld_as_needed.patch
-0026_drop_krb5support_dependency.patch
-0027_db5_support.patch
-0030-dont_use_la_files_for_opening_plugins.patch)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
- 'e27ddff076342e7a3041c4759817d04b'
- 'd7e6886e88af04d05f3dec7f0a59ccf7'
- '79b8a5e8689989e2afd4b7bda595a7b1'
- 'f4131b077ddb5240b375d749162f1b7a'
- 'c7ad2c70c1ef814eb4b119f316c064f2'
- 'caeeac3feba19cbbd36e7345cc805600'
- 'f45d8b60e8f74dd7f7c2ec1665fa602a'
- '9d93880514cb5ff5da969f1ceb64a661'
- 'dfdc052a7e678db9f687482c5d52f34e'
- '4a09f6b24b91f8450892a78e378860da'
- '213abe7c5dfe0d7f446992787da1e780'
- '5a0321177ad30cb5518c8b6812e3961a'
- '0c965748970eea29fa295524821d43f0'
- '62bf892fe4d1df41ff748e91a1afaf67'
- 'b7848957357e7c02d6490102be496bf9'
- 'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
- '8e7106f32e495e9ade69014fd1b3352a')
-
-build() {
- cd ${srcdir}/cyrus-sasl-${pkgver}
- patch -Np1 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch
- patch -Np1 -i ${srcdir}/cyrus-sasl-2.1.22-crypt.patch
- patch -Np1 -i ${srcdir}/cyrus-sasl-2.1.22-qa.patch
- patch -Np1 -i ${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch
- patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch
- patch -Np1 -i ${srcdir}/0003_saslauthd_mdoc.patch
- patch -Np1 -i ${srcdir}/0010_maintainer_mode.patch
- patch -Np1 -i ${srcdir}/0011_saslauthd_ac_prog_libtool
- patch -Np1 -i ${srcdir}/0012_xopen_crypt_prototype.patch
- patch -Np1 -i ${srcdir}/0016_pid_file_lock_creation_mask.patch
- patch -Np1 -i ${srcdir}/0018_auth_rimap_quotes.patch
- patch -Np1 -i ${srcdir}/0019_ldap_deprecated.patch
- patch -Np1 -i ${srcdir}/0022_gcc4.4_preprocessor_syntax.patch
- patch -Np1 -i
[arch-commits] Commit in libsasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:22:02 Author: jgc Revision: 134430 archrelease: copy trunk to testing-i686 Added: libsasl/repos/testing-i686/
[arch-commits] Commit in libsasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:22:14 Author: jgc Revision: 134431 archrelease: copy trunk to testing-x86_64 Added: libsasl/repos/testing-x86_64/
[arch-commits] Commit in grub2/trunk (PKGBUILD archlinux_grub2_mkconfig_fixes.patch)
Date: Wednesday, August 3, 2011 @ 16:29:18
Author: ronald
Revision: 134432
upgpkg: grub2 1.99-4
update to new kernel naming scheme
Modified:
grub2/trunk/PKGBUILD
grub2/trunk/archlinux_grub2_mkconfig_fixes.patch
--+
PKGBUILD |4 +--
archlinux_grub2_mkconfig_fixes.patch | 44 -
2 files changed, 19 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:22:14 UTC (rev 134431)
+++ PKGBUILD2011-08-03 20:29:18 UTC (rev 134432)
@@ -13,7 +13,7 @@
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase=grub2
pkgver='1.99'
-pkgrel=3
+pkgrel=4
url=http://www.gnu.org/software/grub/;
arch=('i686' 'x86_64')
license=('GPL3')
@@ -43,7 +43,7 @@
'b04994c005910b4bf123f034b30109d5c8d6fd86'
'e0c1a97770cc23226cf4535c029ef50b17f67974'
'8bcaed545956bb33581e1b97ac96a2c3717ec793'
- '2bd3673db5616ff528ede82df62023e79b86c1cc'
+ 'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de'
'e1477db3700b27b5e5ad3d8fa43028555204759b'
'8948d89537c12a4202df7c001e65a77030bbe5a3'
'82a27eca5277218cf57c6c5767e0b17a72f62229'
Modified: archlinux_grub2_mkconfig_fixes.patch
===
--- archlinux_grub2_mkconfig_fixes.patch2011-08-03 20:22:14 UTC (rev
134431)
+++ archlinux_grub2_mkconfig_fixes.patch2011-08-03 20:29:18 UTC (rev
134432)
@@ -1,6 +1,6 @@
diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in
--- a/util/grub.d/00_header.in 2011-04-06 13:14:27.0 +0200
-+++ b/util/grub.d/00_header.in 2011-04-26 09:23:02.371574484 +0200
b/util/grub.d/00_header.in 2011-08-01 15:19:57.919100452 +0200
@@ -100,6 +100,14 @@
EOF
@@ -17,8 +17,8 @@
gfxterm=0;
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
a/util/grub.d/10_linux.in 2011-04-18 23:18:49.0 +0200
-+++ b/util/grub.d/10_linux.in 2011-04-26 10:16:54.397538449 +0200
+--- a/util/grub.d/10_linux.in 2011-05-14 22:36:49.0 +0200
b/util/grub.d/10_linux.in 2011-08-01 15:56:53.324779083 +0200
@@ -31,8 +31,8 @@
if [ x${GRUB_DISTRIBUTOR} = x ] ; then
OS=GNU/Linux
@@ -30,15 +30,6 @@
fi
# loop-AES arranges things so that /dev/loop/X can be our root device, but
-@@ -48,7 +48,7 @@
- || uses_abstraction ${GRUB_DEVICE} lvm; then
- LINUX_ROOT_DEVICE=${GRUB_DEVICE}
- else
-- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
-+ LINUX_ROOT_DEVICE=/dev/disk/by-uuid/${GRUB_DEVICE_UUID}
- fi
-
- if [ x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2/dev/null ||
true` = xbtrfs ]; then
@@ -65,7 +65,9 @@
version=$2
recovery=$3
@@ -50,21 +41,16 @@
title=$(gettext_quoted %s, with Linux %s (recovery mode))
else
title=$(gettext_quoted %s, with Linux %s)
-@@ -121,11 +123,11 @@
+@@ -132,7 +134,7 @@
case x`uname -m` in
xi?86 | xx86_64)
- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
-+ list=`for i in /boot/vmlinuz* /vmlinuz* /boot/kernel-* ; do
++ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-*
/boot/vmlinuz26-* ; do
if grub_file_is_not_garbage $i ; then echo -n $i ; fi
done` ;;
*)
-- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-*
/boot/kernel-* ; do
-+ list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux*
/boot/kernel-* ; do
- if grub_file_is_not_garbage $i ; then echo -n $i ; fi
-done` ;;
- esac
-@@ -148,7 +150,8 @@
+@@ -160,7 +162,8 @@
initrd.img-${alt_version} initrd-${alt_version}.img \
initrd-${alt_version} initramfs-${alt_version}.img \
initramfs-genkernel-${version} \
@@ -74,21 +60,25 @@
if test -e ${dirname}/${i} ; then
initrd=$i
break
-@@ -178,6 +181,11 @@
+@@ -190,6 +193,15 @@
linux_entry ${OS} ${version} false \
${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}
-+ if test -e ${dirname}/${basename/vmlinuz/kernel}-fallback.img; then
-+initrd=${basename/vmlinuz/kernel}-fallback.img
-+linux_entry ${OS} ${version} true \
-+ ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} Fallback
-+ fi
++ for i in initramfs-${version}-fallback.img \
++ ${basename/vmlinuz/kernel}-fallback.img; do
++if test -e ${dirname}/${i}; then
++ initrd=$i
++ linux_entry ${OS} ${version} true \
++${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} Fallback
++ break
++fi
++ done
if [ x${GRUB_DISABLE_RECOVERY} != xtrue ]; then
linux_entry ${OS} ${version} true \
single ${GRUB_CMDLINE_LINUX}
diff -Nur a/util/grub-mkconfig.in b/util/grub-mkconfig.in
--- a/util/grub-mkconfig.in2011-04-06
[arch-commits] Commit in grub2/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:29:35 Author: ronald Revision: 134433 archrelease: copy trunk to testing-i686 Added: grub2/repos/testing-i686/
[arch-commits] Commit in grub2/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:29:51 Author: ronald Revision: 134434 archrelease: copy trunk to testing-x86_64 Added: grub2/repos/testing-x86_64/
[arch-commits] Commit in cyrus-sasl/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 16:30:12
Author: jgc
Revision: 134435
Fix saslauthd configuration file, add license files
Modified:
cyrus-sasl/trunk/PKGBUILD
--+
PKGBUILD | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:29:51 UTC (rev 134434)
+++ PKGBUILD2011-08-03 20:30:12 UTC (rev 134435)
@@ -143,10 +143,12 @@
rm -f ${pkgdir}/usr/lib/sasl2/libsql.so*
rm -f ${pkgdir}/usr/lib/sasl2/libgssapiv2.so*
rm -f ${pkgdir}/usr/lib/sasl2/libldapdb.so*
+ install -m755 -d ${pkgdir}/usr/share/licenses/libsasl
+ install -m644 COPYING ${pkgdir}/usr/share/licenses/libsasl/
}
package_cyrus-sasl() {
- depends=('libsasl')
+ depends=(libsasl=${pkgver}-${pkgrel})
pkgdesc=Cyrus saslauthd SASL authentication daemon
cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
@@ -154,7 +156,10 @@
install -m755 -d ${pkgdir}/etc/rc.d
install -m755 -d ${pkgdir}/etc/conf.d
install -m755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/
- install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/
+ install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/
}
package_cyrus-sasl-gssapi() {
@@ -165,6 +170,10 @@
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
install -m755 -d ${pkgdir}/usr/lib/sasl2
cp -a .libs/libgssapiv2.so* ${pkgdir}/usr/lib/sasl2/
+ install -m755 -d ${pkgdir}/usr/share/licenses/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/
}
package_cyrus-sasl-ldap() {
@@ -175,6 +184,9 @@
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
install -m755 -d ${pkgdir}/usr/lib/sasl2
cp -a .libs/libldapdb.so* ${pkgdir}/usr/lib/sasl2/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/
}
package_cyrus-sasl-sql() {
@@ -185,4 +197,7 @@
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
install -m755 -d ${pkgdir}/usr/lib/sasl2
cp -a .libs/libsql.so* ${pkgdir}/usr/lib/sasl2/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-sql
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-sql/
}
[arch-commits] Commit in cyrus-sasl/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 16:33:18
Author: jgc
Revision: 134436
Remove invalid and incomplete license installation line
Modified:
cyrus-sasl/trunk/PKGBUILD
--+
PKGBUILD |1 -
1 file changed, 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:30:12 UTC (rev 134435)
+++ PKGBUILD2011-08-03 20:33:18 UTC (rev 134436)
@@ -170,7 +170,6 @@
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
install -m755 -d ${pkgdir}/usr/lib/sasl2
cp -a .libs/libgssapiv2.so* ${pkgdir}/usr/lib/sasl2/
- install -m755 -d ${pkgdir}/usr/share/licenses/
install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi
ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/
[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD)
Date: Wednesday, August 3, 2011 @ 16:35:03
Author: jgc
Revision: 134437
Merge changes from cyrus-sasl
Modified:
libsasl/trunk/(properties)
libsasl/trunk/PKGBUILD
--+
PKGBUILD | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
Property changes on: libsasl/trunk
___
Added: svn:mergeinfo
+ /cyrus-sasl/trunk:134435-134436
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD 2011-08-03 20:33:18 UTC (rev 134436)
+++ trunk/PKGBUILD 2011-08-03 20:35:03 UTC (rev 134437)
@@ -143,10 +143,12 @@
rm -f ${pkgdir}/usr/lib/sasl2/libsql.so*
rm -f ${pkgdir}/usr/lib/sasl2/libgssapiv2.so*
rm -f ${pkgdir}/usr/lib/sasl2/libldapdb.so*
+ install -m755 -d ${pkgdir}/usr/share/licenses/libsasl
+ install -m644 COPYING ${pkgdir}/usr/share/licenses/libsasl/
}
package_cyrus-sasl() {
- depends=('libsasl')
+ depends=(libsasl=${pkgver}-${pkgrel})
pkgdesc=Cyrus saslauthd SASL authentication daemon
cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
@@ -154,7 +156,10 @@
install -m755 -d ${pkgdir}/etc/rc.d
install -m755 -d ${pkgdir}/etc/conf.d
install -m755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/
- install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/
+ install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/
}
package_cyrus-sasl-gssapi() {
@@ -165,6 +170,9 @@
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
install -m755 -d ${pkgdir}/usr/lib/sasl2
cp -a .libs/libgssapiv2.so* ${pkgdir}/usr/lib/sasl2/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/
}
package_cyrus-sasl-ldap() {
@@ -175,6 +183,9 @@
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
install -m755 -d ${pkgdir}/usr/lib/sasl2
cp -a .libs/libldapdb.so* ${pkgdir}/usr/lib/sasl2/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/
}
package_cyrus-sasl-sql() {
@@ -185,4 +196,7 @@
cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
install -m755 -d ${pkgdir}/usr/lib/sasl2
cp -a .libs/libsql.so* ${pkgdir}/usr/lib/sasl2/
+
+ install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-sql
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-sql/
}
[arch-commits] Commit in libsasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:36:10 Author: jgc Revision: 134438 archrelease: remove testing-i686 Deleted: libsasl/repos/testing-i686/
[arch-commits] Commit in libsasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:36:28 Author: jgc Revision: 134440 archrelease: remove testing-x86_64 Deleted: libsasl/repos/testing-x86_64/
[arch-commits] Commit in libsasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:36:23 Author: jgc Revision: 134439 archrelease: copy trunk to testing-i686 Added: libsasl/repos/testing-i686/
[arch-commits] Commit in libsasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:36:41 Author: jgc Revision: 134441 archrelease: copy trunk to testing-x86_64 Added: libsasl/repos/testing-x86_64/
[arch-commits] Commit in cyrus-sasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:38:56 Author: jgc Revision: 134442 archrelease: remove testing-i686 Deleted: cyrus-sasl/repos/testing-i686/
[arch-commits] Commit in cyrus-sasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:39:10 Author: jgc Revision: 134443 archrelease: copy trunk to testing-i686 Added: cyrus-sasl/repos/testing-i686/
[arch-commits] Commit in cyrus-sasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:39:13 Author: jgc Revision: 13 archrelease: remove testing-x86_64 Deleted: cyrus-sasl/repos/testing-x86_64/
[arch-commits] Commit in cyrus-sasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:39:25 Author: jgc Revision: 134445 archrelease: copy trunk to testing-x86_64 Added: cyrus-sasl/repos/testing-x86_64/
[arch-commits] Commit in cyrus-sasl/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 16:43:28
Author: jgc
Revision: 134446
Add backup entry for saslauthd config file
Modified:
cyrus-sasl/trunk/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:39:25 UTC (rev 134445)
+++ PKGBUILD2011-08-03 20:43:28 UTC (rev 134446)
@@ -150,6 +150,7 @@
package_cyrus-sasl() {
depends=(libsasl=${pkgver}-${pkgrel})
pkgdesc=Cyrus saslauthd SASL authentication daemon
+ backup=('etc/conf.d/saslauthd')
cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
make DESTDIR=${pkgdir} install
[arch-commits] Commit in cyrus-sasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:46:49 Author: jgc Revision: 134447 archrelease: remove testing-i686 Deleted: cyrus-sasl/repos/testing-i686/
[arch-commits] Commit in cyrus-sasl/repos (testing-i686)
Date: Wednesday, August 3, 2011 @ 16:47:02 Author: jgc Revision: 134448 archrelease: copy trunk to testing-i686 Added: cyrus-sasl/repos/testing-i686/
[arch-commits] Commit in cyrus-sasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:47:17 Author: jgc Revision: 134450 archrelease: copy trunk to testing-x86_64 Added: cyrus-sasl/repos/testing-x86_64/
[arch-commits] Commit in cyrus-sasl/repos (testing-x86_64)
Date: Wednesday, August 3, 2011 @ 16:47:05 Author: jgc Revision: 134449 archrelease: remove testing-x86_64 Deleted: cyrus-sasl/repos/testing-x86_64/
[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD)
Date: Wednesday, August 3, 2011 @ 16:49:15
Author: jgc
Revision: 134451
Sync with cyrus-sasl
Modified:
libsasl/trunk/(properties)
libsasl/trunk/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
- /cyrus-sasl/trunk:134435-134436
+ /cyrus-sasl/trunk:134435-134446
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD 2011-08-03 20:47:17 UTC (rev 134450)
+++ trunk/PKGBUILD 2011-08-03 20:49:15 UTC (rev 134451)
@@ -150,6 +150,7 @@
package_cyrus-sasl() {
depends=(libsasl=${pkgver}-${pkgrel})
pkgdesc=Cyrus saslauthd SASL authentication daemon
+ backup=('etc/conf.d/saslauthd')
cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
make DESTDIR=${pkgdir} install
[arch-commits] Commit in racket/trunk (PKGBUILD)
Date: Wednesday, August 3, 2011 @ 19:25:25
Author: eric
Revision: 134452
upgpkg: racket 5.1.2-1
Upstream update, Remove libjpeg depends
Modified:
racket/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:49:15 UTC (rev 134451)
+++ PKGBUILD2011-08-03 23:25:25 UTC (rev 134452)
@@ -2,13 +2,13 @@
# Maintainer: Eric Bélanger e...@archlinux.org
pkgname=racket
-pkgver=5.1.1
+pkgver=5.1.2
pkgrel=1
pkgdesc=PLT Racket (a variant of Scheme) Environment
arch=('i686' 'x86_64')
url=http://racket-lang.org/;
license=('LGPL')
-depends=('gtk2' 'libjpeg' 'libffi' 'desktop-file-utils')
+depends=('gtk2' 'libffi' 'desktop-file-utils')
makedepends=('gsfonts')
provides=('drscheme')
conflicts=('drscheme')
@@ -17,9 +17,9 @@
install=racket.install
source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz
\
drracket.desktop)
-md5sums=('26d6b320218497dba71630b9ad4dcf59'
+md5sums=('c686e789913c40bfd78505574963c1fe'
'9223c9736ead677431542b41271c7b3c')
-sha1sums=('be339495aef3334530ea8fc63ef4014ad8a4b0b2'
+sha1sums=('f1f7e2ee1cd754d65013dab80bc1f9a3be1e3b41'
'a20808f6b250225704856f82a544681a962a299d')
build() {
[arch-commits] Commit in racket/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 19:25:30 Author: eric Revision: 134453 archrelease: remove extra-i686 Deleted: racket/repos/extra-i686/
[arch-commits] Commit in racket/repos (extra-i686)
Date: Wednesday, August 3, 2011 @ 19:25:40 Author: eric Revision: 134454 archrelease: copy trunk to extra-i686 Added: racket/repos/extra-i686/
[arch-commits] Commit in racket/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 19:25:43 Author: eric Revision: 134455 archrelease: remove extra-x86_64 Deleted: racket/repos/extra-x86_64/
[arch-commits] Commit in racket/repos (extra-x86_64)
Date: Wednesday, August 3, 2011 @ 19:25:51 Author: eric Revision: 134456 archrelease: copy trunk to extra-x86_64 Added: racket/repos/extra-x86_64/
