[arch-commits] Commit in nvidia-96xx-utils/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 04:43:58
Author: tpowa
Revision: 89067
upgpkg: nvidia-96xx-utils 96.43.18-2
added backup array
Modified:
nvidia-96xx-utils/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-28 09:57:29 UTC (rev 89066)
+++ PKGBUILD2010-08-29 08:43:58 UTC (rev 89067)
@@ -3,7 +3,7 @@
pkgname=nvidia-96xx-utils
pkgver=96.43.18
-pkgrel=1
+pkgrel=2
pkgdesc=NVIDIA drivers utilities and libraries, 96xx branch.
arch=('i686' 'x86_64')
[ $CARCH = i686 ] ARCH=x86
@@ -14,6 +14,7 @@
conflicts=('libgl')
provides=('libgl')
license=('custom')
+backup=('etc/X11/xorg.conf.d/20-nvidia.conf')
install=nvidia.install
options=(!strip)
source=(http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run;)
[arch-commits] Commit in nvidia-96xx-utils/repos (testing-i686)
Date: Sunday, August 29, 2010 @ 04:45:24 Author: tpowa Revision: 89068 archrelease: remove testing-i686 Deleted: nvidia-96xx-utils/repos/testing-i686/
[arch-commits] Commit in nvidia-96xx-utils/repos (testing-i686)
Date: Sunday, August 29, 2010 @ 04:45:43 Author: tpowa Revision: 89069 archrelease: copy trunk to testing-i686 Added: nvidia-96xx-utils/repos/testing-i686/
[arch-commits] Commit in nvidia-96xx-utils/repos (testing-x86_64)
Date: Sunday, August 29, 2010 @ 04:47:22 Author: tpowa Revision: 89070 archrelease: remove testing-x86_64 Deleted: nvidia-96xx-utils/repos/testing-x86_64/
[arch-commits] Commit in nvidia-96xx-utils/repos (testing-x86_64)
Date: Sunday, August 29, 2010 @ 04:47:41 Author: tpowa Revision: 89071 archrelease: copy trunk to testing-x86_64 Added: nvidia-96xx-utils/repos/testing-x86_64/
[arch-commits] Commit in kexec-tools/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 04:51:46
Author: tpowa
Revision: 89072
updated upstream url
Modified:
kexec-tools/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 08:47:41 UTC (rev 89071)
+++ PKGBUILD2010-08-29 08:51:46 UTC (rev 89072)
@@ -7,7 +7,7 @@
pkgrel=1
pkgdesc=Load another kernel from the currently executing Linux kernel
arch=(i686 x86_64)
-url=http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/;
+url=http://kernel.org/pub/linux/utils/kernel/kexec/;
source=(http://www.kernel.org/pub/linux/kernel/people/horms/kexec/kexec-tools-2.0.2.tar.bz2
kexec kexec.conf.d)
depends=('zlib' 'gawk' 'xz')
[arch-commits] Commit in kshutdown/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 05:01:10
Author: tpowa
Revision: 89073
upgpkg: kshutdown 2.0beta11-1
bump to latest version
Modified:
kshutdown/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 08:51:46 UTC (rev 89072)
+++ PKGBUILD2010-08-29 09:01:10 UTC (rev 89073)
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=kshutdown
-pkgver=2.0beta9
+pkgver=2.0beta11
pkgrel=1
pkgdesc=Shutdown Utility for KDE
arch=(i686 x86_64)
@@ -23,4 +23,4 @@
make || return 1
make DESTDIR=$pkgdir install
}
-md5sums=('4a8a8f5f5e8323cf23ff37078d182d4e')
+md5sums=('7746d2eed57e68bc677f0d725df6d71a')
[arch-commits] Commit in kshutdown/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 05:01:20 Author: tpowa Revision: 89074 archrelease: remove extra-i686 Deleted: kshutdown/repos/extra-i686/
[arch-commits] Commit in kshutdown/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 05:01:38 Author: tpowa Revision: 89075 archrelease: copy trunk to extra-i686 Added: kshutdown/repos/extra-i686/
[arch-commits] Commit in kshutdown/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 05:01:48 Author: tpowa Revision: 89076 archrelease: remove extra-x86_64 Deleted: kshutdown/repos/extra-x86_64/
[arch-commits] Commit in kshutdown/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 05:02:07 Author: tpowa Revision: 89077 archrelease: copy trunk to extra-x86_64 Added: kshutdown/repos/extra-x86_64/
[arch-commits] Commit in tdb/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 05:05:43
Author: tpowa
Revision: 89078
fix #20626
Modified:
tdb/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 09:02:07 UTC (rev 89077)
+++ PKGBUILD2010-08-29 09:05:43 UTC (rev 89078)
@@ -11,7 +11,7 @@
license=('GPL3')
url=http://tdb.samba.org/;
source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-makedepends=('python')
+makedepends=('python' 'libxslt')
optdepends=('python: for python bindings')
options=(force)
[arch-commits] Commit in ivtv-utils/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 06:28:03
Author: thomas
Revision: 89079
Clean up PKGBUILD and resolve conflict with v4l-utils
Modified:
ivtv-utils/trunk/PKGBUILD
--+
PKGBUILD | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 09:05:43 UTC (rev 89078)
+++ PKGBUILD2010-08-29 10:28:03 UTC (rev 89079)
@@ -4,7 +4,7 @@
pkgname=ivtv-utils
pkgver=1.4.1
-pkgrel=2
+pkgrel=3
pkgdesc=Userspace utilities for Hauppauge PVR cards
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,15 +17,20 @@
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ make
+}
- make || return 1
- make DESTDIR=${pkgdir} PREFIX=/usr install || return 1
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} PREFIX=/usr install
- cd ${srcdir}
+ cd ${srcdir}
for file in v4l-cx2341x-dec.fw v4l-cx2341x-enc.fw v4l-pvrusb2-24xxx-01.fw
v4l-pvrusb2-29xxx-01.fw v4l-cx2341x-init.mpg; do
-install -D -m644 $file ${pkgdir}/lib/firmware/$file || return 1
+install -D -m644 $file ${pkgdir}/lib/firmware/$file
done
# FS#15133 - files already provided by the kernel-headers package
- rm -rf ${pkgdir}/usr/include
+ rm -rf ${pkgdir}/usr/include
+ # Resolve conflict with v4l-utils
+ rm -f ${pkgdir}/usr/bin/v4l2-ctl
}
[arch-commits] Commit in v4l-utils/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 06:28:14
Author: thomas
Revision: 89080
Resolve conflict with ivtv-utils
Modified:
v4l-utils/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 10:28:03 UTC (rev 89079)
+++ PKGBUILD2010-08-29 10:28:14 UTC (rev 89080)
@@ -1,8 +1,8 @@
# $Id$
-# Maintainer: Thomas Baechler tho...@archlinux.org
+# Maintainer: Thomas Bächler tho...@archlinux.org
pkgname=v4l-utils
pkgver=0.8.0
-pkgrel=1
+pkgrel=2
pkgdesc=Userspace tools and conversion library for Video 4 Linux
arch=('i686' 'x86_64')
url=http://freshmeat.net/projects/libv4l;
@@ -26,5 +26,6 @@
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make install PREFIX=/usr DESTDIR=${pkgdir}/ || return 1
+ make install PREFIX=/usr DESTDIR=${pkgdir}/
+ rm -f ${pkgdir}/usr/bin/ivtv-ctl
}
[arch-commits] Commit in ivtv-utils/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 06:28:20 Author: thomas Revision: 89081 archrelease: remove extra-i686 Deleted: ivtv-utils/repos/extra-i686/
[arch-commits] Commit in v4l-utils/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 06:28:27 Author: thomas Revision: 89082 archrelease: remove extra-i686 Deleted: v4l-utils/repos/extra-i686/
[arch-commits] Commit in v4l-utils/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 06:28:33 Author: thomas Revision: 89083 archrelease: copy trunk to extra-i686 Added: v4l-utils/repos/extra-i686/
[arch-commits] Commit in v4l-utils/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 06:28:37 Author: thomas Revision: 89084 archrelease: remove extra-x86_64 Deleted: v4l-utils/repos/extra-x86_64/
[arch-commits] Commit in v4l-utils/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 06:28:44 Author: thomas Revision: 89085 archrelease: copy trunk to extra-x86_64 Added: v4l-utils/repos/extra-x86_64/
[arch-commits] Commit in ivtv-utils/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 06:28:52 Author: thomas Revision: 89086 archrelease: copy trunk to extra-i686 Added: ivtv-utils/repos/extra-i686/
[arch-commits] Commit in ivtv-utils/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 06:28:56 Author: thomas Revision: 89087 archrelease: remove extra-x86_64 Deleted: ivtv-utils/repos/extra-x86_64/
[arch-commits] Commit in ivtv-utils/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 06:29:03 Author: thomas Revision: 89088 archrelease: copy trunk to extra-x86_64 Added: ivtv-utils/repos/extra-x86_64/
[arch-commits] Commit in samba/trunk (PKGBUILD samba)
Date: Sunday, August 29, 2010 @ 06:43:16
Author: tpowa
Revision: 89089
upgpkg: samba 3.5.4-2
fix #18625 #20351
Modified:
samba/trunk/PKGBUILD
samba/trunk/samba
--+
PKGBUILD | 12 +++-
samba|3 +++
2 files changed, 6 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 10:29:03 UTC (rev 89088)
+++ PKGBUILD2010-08-29 10:43:16 UTC (rev 89089)
@@ -8,7 +8,7 @@
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=3.5.4
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url=http://www.samba.org;
license=('GPL3')
@@ -43,6 +43,7 @@
--disable-dnssd \
--disable-avahi \
--with-cifsumount \
+ --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \
--enable-external-libtdb
make || return 1
}
@@ -134,15 +135,8 @@
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema
${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
}
-md5sums=('7c8d2a34b649380d5df838c3e030dbec'
- 'e93533fa2296c07c1f645dfdd373657f'
- '5697da77590ec092cc8a883bae06093c'
- 'a4bbfa39fee95bba2e7ad6b535fae7e6'
- '96f82c38f3f540b53f3e5144900acf17'
- 'f2f2e348acd1ccb566e95fa8a561b828'
- 'c6a38a8c8fa24979e6217aed533358ea')
md5sums=('22c8c977eaa18be50f3878c6d0e0c2f0'
- 'e93533fa2296c07c1f645dfdd373657f'
+ '891b9be03e7adf65c9a00319c76d33e5'
'5697da77590ec092cc8a883bae06093c'
'a4bbfa39fee95bba2e7ad6b535fae7e6'
'96f82c38f3f540b53f3e5144900acf17'
Modified: samba
===
--- samba 2010-08-29 10:29:03 UTC (rev 89088)
+++ samba 2010-08-29 10:43:16 UTC (rev 89089)
@@ -10,6 +10,9 @@
start)
rc=0
stat_busy Starting Samba Server
+ if [ ! -x /var/run/samba ] ; then
+ install -m755 -g 81 -o 81 -d /var/run/samba
+ fi
for d in ${samba_daemo...@]}; do
PID=`pidof -o %PPID /usr/sbin/$d`
[ -z $PID ] /usr/sbin/$d -D
[arch-commits] Commit in samba/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 06:49:54 Author: tpowa Revision: 89090 archrelease: remove extra-i686 Deleted: samba/repos/extra-i686/
[arch-commits] Commit in samba/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 06:50:15 Author: tpowa Revision: 89091 archrelease: copy trunk to extra-i686 Added: samba/repos/extra-i686/
[arch-commits] Commit in samba/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 06:58:01 Author: tpowa Revision: 89092 archrelease: remove extra-x86_64 Deleted: samba/repos/extra-x86_64/
[arch-commits] Commit in samba/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 06:58:21 Author: tpowa Revision: 89093 archrelease: copy trunk to extra-x86_64 Added: samba/repos/extra-x86_64/
[arch-commits] Commit in pinentry/trunk (PKGBUILD gtk2-pinentry-segfault.patch)
Date: Sunday, August 29, 2010 @ 07:09:04
Author: tpowa
Revision: 89094
upgpkg: pinentry 0.8.0-2
fix #15917
Added:
pinentry/trunk/gtk2-pinentry-segfault.patch
Modified:
pinentry/trunk/PKGBUILD
--+
PKGBUILD | 19 +++
gtk2-pinentry-segfault.patch | 11 +++
2 files changed, 22 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 10:58:21 UTC (rev 89093)
+++ PKGBUILD2010-08-29 11:09:04 UTC (rev 89094)
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=pinentry
pkgver=0.8.0
-pkgrel=1
+pkgrel=2
pkgdesc=a collection of simple PIN or passphrase entry dialogs which utilize
the Assuan protocol
arch=('i686' 'x86_64')
license=('GPL')
@@ -13,7 +13,8 @@
'gtk2: for gtk2 backend'
'qt3: for qt3 backend'
'qt: for qt4 backend')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
+gtk2-pinentry-segfault.patch)
build() {
cd $startdir/src/$pkgname-$pkgver
@@ -21,6 +22,7 @@
for file in qt4/*.moc; do
/usr/bin/moc ${file/.moc/.h} ${file}
done
+ patch -Np0 -i ../gtk2-pinentry-segfault.patch
./configure --prefix=/usr \
--enable-pinentry-curses \
--enable-pinentry-gtk \
@@ -28,10 +30,11 @@
--enable-pinentry-qt \
--enable-pinentry-qt4 \
--enable-fallback-curses
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
- rm ${pkgdir}/usr/share/info/dir || return 1
- rm ${pkgdir}/usr/bin/pinentry || return 1
- ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry || return 1
+ make
+ make DESTDIR=${pkgdir} install
+ rm ${pkgdir}/usr/share/info/dir
+ rm ${pkgdir}/usr/bin/pinentry
+ ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry
}
-md5sums=('590be1b00f9ab63205843c7fed8caf35')
+md5sums=('590be1b00f9ab63205843c7fed8caf35'
+ 'bd9888fafc56464b2c4deaad5b8edb07')
Added: gtk2-pinentry-segfault.patch
===
--- gtk2-pinentry-segfault.patch(rev 0)
+++ gtk2-pinentry-segfault.patch2010-08-29 11:09:04 UTC (rev 89094)
@@ -0,0 +1,11 @@
+--- gtk+-2/pinentry-gtk-2.c.orig 2010-03-03 05:19:55.0 -0600
gtk+-2/pinentry-gtk-2.c2010-07-07 00:11:30.413572124 -0500
+@@ -145,7 +145,7 @@
+ {
+ gdk_keyboard_ungrab (gdk_event_get_time (event));
+ /* Unmake window transient for the root window. */
+- gdk_window_set_transient_for (win-window, NULL);
++ gdk_property_delete (win-window, gdk_atom_intern_static_string
(WM_TRANSIENT_FOR));
+ }
+
+
[arch-commits] Commit in pinentry/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 07:09:15 Author: tpowa Revision: 89095 archrelease: remove extra-i686 Deleted: pinentry/repos/extra-i686/
[arch-commits] Commit in pinentry/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 07:09:34 Author: tpowa Revision: 89096 archrelease: copy trunk to extra-i686 Added: pinentry/repos/extra-i686/
[arch-commits] Commit in pinentry/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 07:09:45 Author: tpowa Revision: 89097 archrelease: remove extra-x86_64 Deleted: pinentry/repos/extra-x86_64/
[arch-commits] Commit in pinentry/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 07:10:04 Author: tpowa Revision: 89098 archrelease: copy trunk to extra-x86_64 Added: pinentry/repos/extra-x86_64/
[arch-commits] Commit in tcp_wrappers/repos (testing-i686)
Date: Sunday, August 29, 2010 @ 07:15:31 Author: tpowa Revision: 89100 archrelease: copy trunk to testing-i686 Added: tcp_wrappers/repos/testing-i686/
[arch-commits] Commit in tcp_wrappers/repos (testing-x86_64)
Date: Sunday, August 29, 2010 @ 07:15:55 Author: tpowa Revision: 89101 archrelease: copy trunk to testing-x86_64 Added: tcp_wrappers/repos/testing-x86_64/
[arch-commits] Commit in udev/trunk (80-drivers.rules PKGBUILD arch-udev-rules.patch)
Date: Sunday, August 29, 2010 @ 07:34:56
Author: tpowa
Revision: 89102
upgpkg: udev 161-2
fix #20107
Added:
udev/trunk/80-drivers.rules
Modified:
udev/trunk/PKGBUILD
udev/trunk/arch-udev-rules.patch
---+
80-drivers.rules | 14 +
PKGBUILD | 25
arch-udev-rules.patch | 50
3 files changed, 27 insertions(+), 62 deletions(-)
Added: 80-drivers.rules
===
--- 80-drivers.rules(rev 0)
+++ 80-drivers.rules2010-08-29 11:34:56 UTC (rev 89102)
@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION==remove, GOTO=drivers_end
+
+DRIVER!=?*, ENV{MODALIAS}==?*, RUN+=/lib/udev/load-modules.sh
$env{MODALIAS}
+SUBSYSTEM==tifm, ENV{TIFM_CARD_TYPE}==SD, RUN+=/lib/udev/load-modules.sh
tifm_sd
+SUBSYSTEM==tifm, ENV{TIFM_CARD_TYPE}==MS, RUN+=/lib/udev/load-modules.sh
tifm_ms
+SUBSYSTEM==memstick, RUN+=/lib/udev/load-modules.sh ms_block
+SUBSYSTEM==memstick, RUN+=/lib/udev/load-modules.sh mspro_block
+SUBSYSTEM==i2o, RUN+=/lib/udev/load-modules.sh i2o_block
+SUBSYSTEM==scsi, ENV{DEVTYPE}==scsi_device, TEST!=[module/sg],
RUN+=/lib/udev/load-modules.sh sg
+SUBSYSTEM==module, KERNEL==parport_pc, RUN+=/lib/udev/load-modules.sh
ppdev
+
+LABEL=drivers_end
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 11:15:55 UTC (rev 89101)
+++ PKGBUILD2010-08-29 11:34:56 UTC (rev 89102)
@@ -6,7 +6,7 @@
pkgbase=udev
pkgname=('udev' 'udev-compat')
pkgver=161
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
license=('GPL')
@@ -15,13 +15,15 @@
options=(!makeflags !libtool)
makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26'
'gperf' 'libxslt' 'gobject-introspection')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
-81-arch.rules load-modules.sh cdsymlinks.sh
-arch-udev-rules.patch)
+80-drivers.rules
+81-arch.rules
+load-modules.sh
+cdsymlinks.sh)
md5sums=('95b6a0ffc9913f3e8021c65f51eb4f88'
+ '4427855146513a4703ab5c7eb8a0156e'
'f17c99779173ddc79f866cf3a5de5e68'
'f91fddc67609b45b244a624977c4247b'
- '2e808ee78d237c478b57af2a68d43769'
- '70198227b7bbe3852e1cd2299693af66')
+ '2e808ee78d237c478b57af2a68d43769')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -49,6 +51,8 @@
mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib
# Fix ConsoleKit path
mv $pkgdir/lib/ConsoleKit $pkgdir/usr/lib
+ # Replace original 80-drivers.rules with custom one.
+ install -D -m644 $srcdir/80-drivers.rules
$pkgdir/lib/udev/rules.d/80-drivers.rules
# Install our rule for permissions and symlinks
install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
# install our module loading subsystem
@@ -57,11 +61,6 @@
install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
# disable error logging to prevent startup failures printed to vc on boot
sed -i -e 's|udev_log=err|udev_log=0|g' $pkgdir/etc/udev/udev.conf
- # fix standard udev rules to fit to arch
- cd $pkgdir/lib/udev/rules.d/
- patch -Np1 -i $srcdir/arch-udev-rules.patch
- # remove .orig files
- rm -f $pkgdir/lib/udev/rules.d/*.orig
# disable persistent cdromsymlinks and network by default
# and move it to /etc/udev/rules.d
mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \
@@ -102,9 +101,11 @@
# /dev/ppp
mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
- # Replace dialout group in rules with uucp group
+ # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
for i in $pkgdir/lib/udev/rules.d/*.rules; do
-sed -i -e 's#GROUP=dialout#GROUP=uucp#g' $i
+sed -i -e 's#GROUP=dialout#GROUP=uucp#g;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
done
mv ${pkgdir}/lib/girepository-1.0 ${pkgdir}/usr/lib/
Modified: arch-udev-rules.patch
===
--- arch-udev-rules.patch 2010-08-29 11:15:55 UTC (rev 89101)
+++ arch-udev-rules.patch 2010-08-29 11:34:56 UTC (rev 89102)
@@ -1,50 +0,0 @@
-diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules
rules.d/50-udev-default.rules 2009-03-07 22:22:48.200242883 +0100
-+++ rules.d.arch/50-udev-default.rules 2009-03-07 22:23:26.134434516 +0100
-@@ -59,15 +59,15 @@
- KERNEL==fd[0-9], ACTION==add, ATTRS{cmos}==?*,
RUN+=create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k
-
- # cdrom
--SUBSYSTEM==block, KERNEL==sr[0-9]*, SYMLINK+=scd%n, GROUP=cdrom
--SUBSYSTEM==scsi_generic, SUBSYSTEMS==scsi, ATTRS{type}==4|5,
GROUP=cdrom
[arch-commits] Commit in udev/repos (testing-x86_64)
Date: Sunday, August 29, 2010 @ 07:41:05 Author: tpowa Revision: 89103 archrelease: copy trunk to testing-x86_64 Added: udev/repos/testing-x86_64/
[arch-commits] Commit in udev/repos (testing-i686)
Date: Sunday, August 29, 2010 @ 07:42:23 Author: tpowa Revision: 89104 archrelease: copy trunk to testing-i686 Added: udev/repos/testing-i686/
[arch-commits] Commit in feh/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 10:19:45
Author: bisson
Revision: 89105
minor upstream update
Modified:
feh/trunk/PKGBUILD
--+
PKGBUILD | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 11:42:23 UTC (rev 89104)
+++ PKGBUILD2010-08-29 14:19:45 UTC (rev 89105)
@@ -5,28 +5,27 @@
# Contributor: Tom Newsom jeeps...@gmx.co.uk
pkgname=feh
-pkgver=1.8
+pkgver=1.9
pkgrel=1
-pkgdesc=A fast, lightweight image viewer which uses imlib2
+pkgdesc='Fast, lightweight image viewer which uses imlib2'
arch=('i686' 'x86_64')
-url=https://derf.homelinux.org/~derf/projects/feh/;
+url='https://derf.homelinux.org/~derf/projects/feh/'
license=('MIT')
depends=('libxinerama' 'giblib' 'perl')
makedepends=('libxt')
source=(https://derf.homelinux.org/~derf/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('fe81334805f4da9b5f1e35b45c444a1a')
-sha1sums=('147b5608281b81be8d1f7cf944fd761e8b86ae06')
+sha1sums=('643b5ba085ed1b7f37fb6e48293779f9056fca6e')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- sed -i -e s:/usr/local:/usr:g config.mk
- make || return 1
+ sed -i -e 's:/usr/local:/usr:g' config.mk
+ make
}
package(){
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE ||
return 1
+ make DESTDIR=${pkgdir} install
+ install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in feh/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 10:20:01 Author: bisson Revision: 89106 archrelease: remove extra-i686 Deleted: feh/repos/extra-i686/
[arch-commits] Commit in feh/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 10:20:27 Author: bisson Revision: 89107 archrelease: copy trunk to extra-i686 Added: feh/repos/extra-i686/
[arch-commits] Commit in twisted/trunk (PKGBUILD twisted.install)
Date: Sunday, August 29, 2010 @ 12:19:48
Author: remy
Revision: 89108
Fix twisted.install to use new python paths.
Modified:
twisted/trunk/PKGBUILD
twisted/trunk/twisted.install
-+
PKGBUILD|2 +-
twisted.install |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 14:20:27 UTC (rev 89107)
+++ PKGBUILD2010-08-29 16:19:48 UTC (rev 89108)
@@ -5,7 +5,7 @@
pkgname=twisted
pkgver=10.0.0
-pkgrel=2
+pkgrel=3
pkgdesc=Asynchronous networking framework written in Python.
arch=('i686' 'x86_64')
url=http://twistedmatrix.com/;
Modified: twisted.install
===
--- twisted.install 2010-08-29 14:20:27 UTC (rev 89107)
+++ twisted.install 2010-08-29 16:19:48 UTC (rev 89108)
@@ -1,5 +1,5 @@
post_install() {
- python -c 'from twisted.plugin import IPlugin, getPlugins;
list(getPlugins(IPlugin))' /dev/null 21 || return 1
+ python2 -c 'from twisted.plugin import IPlugin, getPlugins;
list(getPlugins(IPlugin))' /dev/null 21 || return 1
}
post_upgrade() {
@@ -7,5 +7,5 @@
}
post_remove() {
- find /usr/lib/python2.6/site-packages/twisted/plugins -name dropin.cache |
xargs -r rm -f
+ find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache |
xargs -r rm -f
}
[arch-commits] Commit in twisted/repos (staging-i686)
Date: Sunday, August 29, 2010 @ 12:30:52 Author: remy Revision: 89109 archrelease: remove staging-i686 Deleted: twisted/repos/staging-i686/
[arch-commits] Commit in twisted/repos (staging-i686)
Date: Sunday, August 29, 2010 @ 12:31:15 Author: remy Revision: 89110 archrelease: copy trunk to staging-i686 Added: twisted/repos/staging-i686/
[arch-commits] Commit in twisted/repos (staging-x86_64)
Date: Sunday, August 29, 2010 @ 12:31:54 Author: remy Revision: 89111 archrelease: remove staging-x86_64 Deleted: twisted/repos/staging-x86_64/
[arch-commits] Commit in kernel26/repos (core-i686)
Date: Sunday, August 29, 2010 @ 12:32:07 Author: tpowa Revision: 89112 db-move: kernel26 removed by tpowa for move to [core] (i686) Deleted: kernel26/repos/core-i686/
[arch-commits] Commit in kernel26/repos (core-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:32:08 Author: tpowa Revision: 89113 db-move: moved kernel26 from [testing] to [core] (i686) Added: kernel26/repos/core-i686/ Deleted: kernel26/repos/testing-i686/
[arch-commits] Commit in kernel26/repos (core-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:09 Author: tpowa Revision: 89114 db-move: kernel26 removed by tpowa for move to [core] (x86_64) Deleted: kernel26/repos/core-x86_64/
[arch-commits] Commit in kernel26/repos (core-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:11 Author: tpowa Revision: 89115 db-move: moved kernel26 from [testing] to [core] (x86_64) Added: kernel26/repos/core-x86_64/ Deleted: kernel26/repos/testing-x86_64/
[arch-commits] Commit in ndiswrapper/repos (core-i686)
Date: Sunday, August 29, 2010 @ 12:32:13 Author: tpowa Revision: 89116 db-move: ndiswrapper removed by tpowa for move to [core] (i686) Deleted: ndiswrapper/repos/core-i686/
[arch-commits] Commit in ndiswrapper/repos (core-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:32:14 Author: tpowa Revision: 89117 db-move: moved ndiswrapper from [testing] to [core] (i686) Added: ndiswrapper/repos/core-i686/ Deleted: ndiswrapper/repos/testing-i686/
[arch-commits] Commit in ndiswrapper/repos (core-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:15 Author: tpowa Revision: 89118 db-move: ndiswrapper removed by tpowa for move to [core] (x86_64) Deleted: ndiswrapper/repos/core-x86_64/
[arch-commits] Commit in twisted/repos (staging-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:16 Author: remy Revision: 89119 archrelease: copy trunk to staging-x86_64 Added: twisted/repos/staging-x86_64/
[arch-commits] Commit in ndiswrapper/repos (core-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:16 Author: tpowa Revision: 89120 db-move: moved ndiswrapper from [testing] to [core] (x86_64) Added: ndiswrapper/repos/core-x86_64/ Deleted: ndiswrapper/repos/testing-x86_64/
[arch-commits] Commit in tiacx/repos (core-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:32:19 Author: tpowa Revision: 89122 db-move: moved tiacx from [testing] to [core] (i686) Added: tiacx/repos/core-i686/ Deleted: tiacx/repos/testing-i686/
[arch-commits] Commit in tiacx/repos (core-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:20 Author: tpowa Revision: 89123 db-move: tiacx removed by tpowa for move to [core] (x86_64) Deleted: tiacx/repos/core-x86_64/
[arch-commits] Commit in tiacx/repos (core-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:21 Author: tpowa Revision: 89124 db-move: moved tiacx from [testing] to [core] (x86_64) Added: tiacx/repos/core-x86_64/ Deleted: tiacx/repos/testing-x86_64/
[arch-commits] Commit in aufs2/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:32:34 Author: tpowa Revision: 89126 db-move: moved aufs2 from [testing] to [extra] (i686) Added: aufs2/repos/extra-i686/ Deleted: aufs2/repos/testing-i686/
[arch-commits] Commit in aufs2/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:32:33 Author: tpowa Revision: 89125 db-move: aufs2 removed by tpowa for move to [extra] (i686) Deleted: aufs2/repos/extra-i686/
[arch-commits] Commit in fcpci/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:32:40 Author: tpowa Revision: 89129 db-move: fcpci removed by tpowa for move to [extra] (i686) Deleted: fcpci/repos/extra-i686/
[arch-commits] Commit in fcpci/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:32:42 Author: tpowa Revision: 89130 db-move: moved fcpci from [testing] to [extra] (i686) Added: fcpci/repos/extra-i686/ Deleted: fcpci/repos/testing-i686/
[arch-commits] Commit in fcpci/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:44 Author: tpowa Revision: 89131 db-move: fcpci removed by tpowa for move to [extra] (x86_64) Deleted: fcpci/repos/extra-x86_64/
[arch-commits] Commit in fcpcmcia/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:32:50 Author: tpowa Revision: 89133 db-move: fcpcmcia removed by tpowa for move to [extra] (i686) Deleted: fcpcmcia/repos/extra-i686/
[arch-commits] Commit in fcpci/repos (extra-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:47 Author: tpowa Revision: 89132 db-move: moved fcpci from [testing] to [extra] (x86_64) Added: fcpci/repos/extra-x86_64/ Deleted: fcpci/repos/testing-x86_64/
[arch-commits] Commit in fcpcmcia/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:32:53 Author: tpowa Revision: 89134 db-move: moved fcpcmcia from [testing] to [extra] (i686) Added: fcpcmcia/repos/extra-i686/ Deleted: fcpcmcia/repos/testing-i686/
[arch-commits] Commit in fcpcmcia/repos (extra-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:56 Author: tpowa Revision: 89136 db-move: moved fcpcmcia from [testing] to [extra] (x86_64) Added: fcpcmcia/repos/extra-x86_64/ Deleted: fcpcmcia/repos/testing-x86_64/
[arch-commits] Commit in intel-536ep/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:00 Author: tpowa Revision: 89137 db-move: intel-536ep removed by tpowa for move to [extra] (i686) Deleted: intel-536ep/repos/extra-i686/
[arch-commits] Commit in aufs2/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:36 Author: tpowa Revision: 89127 db-move: aufs2 removed by tpowa for move to [extra] (x86_64) Deleted: aufs2/repos/extra-x86_64/
[arch-commits] Commit in intel-536ep/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:02 Author: tpowa Revision: 89138 db-move: moved intel-536ep from [testing] to [extra] (i686) Added: intel-536ep/repos/extra-i686/ Deleted: intel-536ep/repos/testing-i686/
[arch-commits] Commit in intel-537/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:04 Author: tpowa Revision: 89139 db-move: intel-537 removed by tpowa for move to [extra] (i686) Deleted: intel-537/repos/extra-i686/
[arch-commits] Commit in aufs2/repos (extra-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:37 Author: tpowa Revision: 89128 db-move: moved aufs2 from [testing] to [extra] (x86_64) Added: aufs2/repos/extra-x86_64/ Deleted: aufs2/repos/testing-x86_64/
[arch-commits] Commit in fcpcmcia/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 12:32:55 Author: tpowa Revision: 89135 db-move: fcpcmcia removed by tpowa for move to [extra] (x86_64) Deleted: fcpcmcia/repos/extra-x86_64/
[arch-commits] Commit in intel-537/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:05 Author: tpowa Revision: 89140 db-move: moved intel-537 from [testing] to [extra] (i686) Added: intel-537/repos/extra-i686/ Deleted: intel-537/repos/testing-i686/
[arch-commits] Commit in lirc/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:07 Author: tpowa Revision: 89142 db-move: moved lirc from [testing] to [extra] (i686) Added: lirc/repos/extra-i686/ Deleted: lirc/repos/testing-i686/
[arch-commits] Commit in lirc/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:08 Author: tpowa Revision: 89143 db-move: lirc removed by tpowa for move to [extra] (x86_64) Deleted: lirc/repos/extra-x86_64/
[arch-commits] Commit in lirc/repos (extra-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:10 Author: tpowa Revision: 89144 db-move: moved lirc from [testing] to [extra] (x86_64) Added: lirc/repos/extra-x86_64/ Deleted: lirc/repos/testing-x86_64/
[arch-commits] Commit in lirc/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:06 Author: tpowa Revision: 89141 db-move: lirc removed by tpowa for move to [extra] (i686) Deleted: lirc/repos/extra-i686/
[arch-commits] Commit in madwifi/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:11 Author: tpowa Revision: 89145 db-move: madwifi removed by tpowa for move to [extra] (i686) Deleted: madwifi/repos/extra-i686/
[arch-commits] Commit in madwifi/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:12 Author: tpowa Revision: 89146 db-move: moved madwifi from [testing] to [extra] (i686) Added: madwifi/repos/extra-i686/ Deleted: madwifi/repos/testing-i686/
[arch-commits] Commit in madwifi/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:13 Author: tpowa Revision: 89147 db-move: madwifi removed by tpowa for move to [extra] (x86_64) Deleted: madwifi/repos/extra-x86_64/
[arch-commits] Commit in madwifi/repos (extra-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:13 Author: tpowa Revision: 89148 db-move: moved madwifi from [testing] to [extra] (x86_64) Added: madwifi/repos/extra-x86_64/ Deleted: madwifi/repos/testing-x86_64/
[arch-commits] Commit in nvidia-173xx/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:14 Author: tpowa Revision: 89149 db-move: nvidia-173xx removed by tpowa for move to [extra] (i686) Deleted: nvidia-173xx/repos/extra-i686/
[arch-commits] Commit in nvidia-173xx/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:15 Author: tpowa Revision: 89150 db-move: moved nvidia-173xx from [testing] to [extra] (i686) Added: nvidia-173xx/repos/extra-i686/ Deleted: nvidia-173xx/repos/testing-i686/
[arch-commits] Commit in nvidia-173xx/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:17 Author: tpowa Revision: 89151 db-move: nvidia-173xx removed by tpowa for move to [extra] (x86_64) Deleted: nvidia-173xx/repos/extra-x86_64/
[arch-commits] Commit in nvidia/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:19 Author: tpowa Revision: 89153 db-move: nvidia removed by tpowa for move to [extra] (i686) Deleted: nvidia/repos/extra-i686/
[arch-commits] Commit in nvidia/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:20 Author: tpowa Revision: 89154 db-move: moved nvidia from [testing] to [extra] (i686) Added: nvidia/repos/extra-i686/ Deleted: nvidia/repos/testing-i686/
[arch-commits] Commit in nvidia-173xx/repos (extra-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:17 Author: tpowa Revision: 89152 db-move: moved nvidia-173xx from [testing] to [extra] (x86_64) Added: nvidia-173xx/repos/extra-x86_64/ Deleted: nvidia-173xx/repos/testing-x86_64/
[arch-commits] Commit in nvidia/repos (extra-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:21 Author: tpowa Revision: 89155 db-move: nvidia removed by tpowa for move to [extra] (x86_64) Deleted: nvidia/repos/extra-x86_64/
[arch-commits] Commit in nvidia/repos (extra-x86_64 testing-x86_64)
Date: Sunday, August 29, 2010 @ 12:33:22 Author: tpowa Revision: 89156 db-move: moved nvidia from [testing] to [extra] (x86_64) Added: nvidia/repos/extra-x86_64/ Deleted: nvidia/repos/testing-x86_64/
[arch-commits] Commit in slmodem/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:23 Author: tpowa Revision: 89157 db-move: slmodem removed by tpowa for move to [extra] (i686) Deleted: slmodem/repos/extra-i686/
[arch-commits] Commit in slmodem/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:24 Author: tpowa Revision: 89158 db-move: moved slmodem from [testing] to [extra] (i686) Added: slmodem/repos/extra-i686/ Deleted: slmodem/repos/testing-i686/
[arch-commits] Commit in martian/repos (extra-i686)
Date: Sunday, August 29, 2010 @ 12:33:26 Author: tpowa Revision: 89159 db-move: martian removed by tpowa for move to [extra] (i686) Deleted: martian/repos/extra-i686/
[arch-commits] Commit in martian/repos (extra-i686 testing-i686)
Date: Sunday, August 29, 2010 @ 12:33:26 Author: tpowa Revision: 89160 db-move: moved martian from [testing] to [extra] (i686) Added: martian/repos/extra-i686/ Deleted: martian/repos/testing-i686/
[arch-commits] Commit in bittorrent/trunk (PKGBUILD bttrack)
Date: Sunday, August 29, 2010 @ 12:35:30
Author: remy
Revision: 89161
upgpkg: bittorrent 5.2.2-3
Rebuild for python2.
Modified:
bittorrent/trunk/PKGBUILD
bittorrent/trunk/bttrack
--+
PKGBUILD | 16 +++-
bttrack |4 ++--
2 files changed, 13 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 16:33:26 UTC (rev 89160)
+++ PKGBUILD2010-08-29 16:35:30 UTC (rev 89161)
@@ -3,7 +3,7 @@
pkgname=bittorrent
pkgver=5.2.2
-pkgrel=2
+pkgrel=3
pkgdesc=BitTorrent is a tool for copying files from one machine to another.
arch=('i686' 'x86_64')
url=http://www.bittorrent.com;
@@ -14,16 +14,22 @@
bttrack bttrack.conf)
license=('custom')
md5sums=('d8891cfa4c6bb796c8e948eace7694bc'
-'641d7bd82a40e84a837db465e6a28e0d'
+'b05f82b3a8e7fd8e7451064a9ae84ad2'
'29b1f592615d0a0fcf6099bd619bbd9c')
-build() {
+package() {
cd $srcdir/BitTorrent-$pkgver
- python ./setup.py install --root=$pkgdir
+ # the setup script wants to write something in $HOME...
+ export HOME=$srcdir
+ python2 ./setup.py install --root=$pkgdir
+ # fix python name
+ sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+-i ${pkgdir}/usr/lib/python2.7/site-packages/*/*.py
+
# remove broken wx interface
rm $pkgdir/usr/bin/{bittorrent,maketorrent}
- rm -rf $pkgdir/usr/lib/python2.6/site-packages/BitTorrent/GUI_wx
+ rm -rf $pkgdir/usr/lib/python2.7/site-packages/BitTorrent/GUI_wx
rm -rf $pkgdir/usr/share/pixmaps
# install custom license
Modified: bttrack
===
--- bttrack 2010-08-29 16:33:26 UTC (rev 89160)
+++ bttrack 2010-08-29 16:35:30 UTC (rev 89161)
@@ -4,13 +4,13 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=`pidof -o %PPID /usr/bin/python /usr/bin/bittorrent-tracker`
+PID=`pidof -o %PPID /usr/bin/python2 /usr/bin/bittorrent-tracker`
case $1 in
start)
stat_busy Starting Bittorrent Tracker
if [ -z $PID ]; then
- /usr/bin/python /usr/bin/bittorrent-tracker `sed
's/[#].*$//' /etc/bttrack.conf` /var/log/bttrack.log
+ /usr/bin/python2 /usr/bin/bittorrent-tracker `sed
's/[#].*$//' /etc/bttrack.conf` /var/log/bttrack.log
if [ $? -gt 0 ]; then
stat_fail
else
[arch-commits] Commit in bittorrent/repos (staging-i686)
Date: Sunday, August 29, 2010 @ 12:36:04 Author: remy Revision: 89162 archrelease: copy trunk to staging-i686 Added: bittorrent/repos/staging-i686/
[arch-commits] Commit in bittorrent/repos (staging-x86_64)
Date: Sunday, August 29, 2010 @ 12:36:33 Author: remy Revision: 89163 archrelease: copy trunk to staging-x86_64 Added: bittorrent/repos/staging-x86_64/
[arch-commits] Commit in pyogg/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 12:44:28
Author: remy
Revision: 89164
upgpkg: pyogg 1.3-6
Rebuild for python2.
Modified:
pyogg/trunk/PKGBUILD
--+
PKGBUILD | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 16:36:33 UTC (rev 89163)
+++ PKGBUILD2010-08-29 16:44:28 UTC (rev 89164)
@@ -4,18 +4,22 @@
pkgname=pyogg
pkgver=1.3
-pkgrel=5
+pkgrel=6
pkgdesc=Python ogg wrapper library
arch=('i686' 'x86_64')
url=http://ekyo.nerim.net/software/pyogg/index.html;
license=('LGPL2')
-depends=('python=2.5' 'libogg' 'glibc')
+depends=('python2' 'libogg' 'glibc')
source=(http://ekyo.nerim.net/software/pyogg/$pkgname-$pkgver.tar.gz)
md5sums=('45a4ecc4d0600661199e4040a81ea3fe')
sha1sums=('2811ad401e3b5fc5025958bddab3d7b8775e5acd')
build() {
- cd $startdir/src/$pkgname-$pkgver
- ./config_unix.py --prefix=$startdir/pkg/usr
- python setup.py install --prefix=$startdir/pkg/usr
+ cd $srcdir/$pkgname-$pkgver
+ python2 ./config_unix.py --prefix=$pkgdir/usr
}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ python2 setup.py install --prefix=$pkgdir/usr
+}
[arch-commits] Commit in pyogg/repos (staging-i686)
Date: Sunday, August 29, 2010 @ 12:44:52 Author: remy Revision: 89165 archrelease: copy trunk to staging-i686 Added: pyogg/repos/staging-i686/
[arch-commits] Commit in pyogg/repos (staging-x86_64)
Date: Sunday, August 29, 2010 @ 12:45:20 Author: remy Revision: 89166 archrelease: copy trunk to staging-x86_64 Added: pyogg/repos/staging-x86_64/
[arch-commits] Commit in lighttpd/trunk (4 files)
Date: Sunday, August 29, 2010 @ 12:52:49
Author: pierre
Revision: 89167
Upstream update
* rewrote rc script
* use lighttpd-angel for graceful reload and shutdown
* use reload in logrotate config
Modified:
lighttpd/trunk/PKGBUILD
lighttpd/trunk/lighttpd.conf
lighttpd/trunk/lighttpd.logrotate.d
lighttpd/trunk/lighttpd.rc.d
--+
PKGBUILD | 14 +---
lighttpd.conf|2
lighttpd.logrotate.d |6 +-
lighttpd.rc.d| 141 +++--
4 files changed, 99 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 16:45:20 UTC (rev 89166)
+++ PKGBUILD2010-08-29 16:52:49 UTC (rev 89167)
@@ -2,7 +2,7 @@
# Maintainer: Pierre Schmitz pie...@archlinux.de
pkgname=lighttpd
-pkgver=1.4.27
+pkgver=1.4.28
pkgrel=1
pkgdesc='a secure, fast, compliant and very flexible web-server'
license=('custom')
@@ -18,10 +18,10 @@
options=('!libtool' 'emptydirs')
source=(http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2;
'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-md5sums=('afece7dc547d71cb94ea2e34ee5b3f9b'
- '789ed1b4521e72e591e09d5dfb99235a'
- '857e174643fd7761a2f0d8431a679f6c'
- 'da7b4ee2d2547d719015e54e8f2ff3d7')
+md5sums=('586eb535d31ac299652495b058dd87c4'
+ '638320101f1114a0a130d5532e7cd512'
+ '4b22edb80454cd815f076288aa117452'
+ '2803a9ee7f20409c69f1566d2d90720e')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -56,9 +56,5 @@
find . -type f ! -name 'Makefile*' -exec install -D -m644 {}
${pkgdir}/usr/share/doc/lighttpd/config/{} \;
popd /dev/null
- pushd doc /dev/null
- find . -maxdepth 1 -type f -name '*.txt' -exec install -D -m644 {}
${pkgdir}/usr/share/doc/lighttpd/{} \;
- popd /dev/null
-
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
Modified: lighttpd.conf
===
--- lighttpd.conf 2010-08-29 16:45:20 UTC (rev 89166)
+++ lighttpd.conf 2010-08-29 16:52:49 UTC (rev 89167)
@@ -6,7 +6,7 @@
server.username= http
server.groupname = http
server.document-root = /srv/http
-server.pid-file= /var/run/lighttpd.pid
+server.pid-file= /var/run/lighttpd/lighttpd.pid
server.errorlog= /var/log/lighttpd/error.log
dir-listing.activate = enable
index-file.names = ( index.html )
Modified: lighttpd.logrotate.d
===
--- lighttpd.logrotate.d2010-08-29 16:45:20 UTC (rev 89166)
+++ lighttpd.logrotate.d2010-08-29 16:52:49 UTC (rev 89167)
@@ -1,5 +1,5 @@
/var/log/lighttpd/*log {
- postrotate
- /bin/kill -HUP `cat /var/run/lighttpd/lighttpd.pid 2/dev/null` 2
/dev/null || true
- endscript
+ postrotate
+ /etc/rc.d/lighttpd reload /dev/null || true
+ endscript
}
Modified: lighttpd.rc.d
===
--- lighttpd.rc.d 2010-08-29 16:45:20 UTC (rev 89166)
+++ lighttpd.rc.d 2010-08-29 16:52:49 UTC (rev 89167)
@@ -1,67 +1,106 @@
#!/bin/bash
-daemon_name=lighttpd
-
. /etc/rc.conf
. /etc/rc.d/functions
+
+get_pid_file() {
+ /usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2/dev/null | grep
server.pid-file | cut -d= -f2
+}
+
get_pid() {
- pidof -o %PPID $daemon_name
+ local pid_file=$(get_pid_file)
+ local pid=$(pidof -o %PPID lighttpd-angel)
+ if [ -r ${pid_file} ]; then
+ cat ${pid_file}
+ elif [ -n ${pid} ]; then
+ echo ${pid}
+ else
+ echo ''
+ fi
}
-case $1 in
- start)
-stat_busy Starting $daemon_name daemon
+test_config() {
+ /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf /dev/null 21
+ if [ $? -gt 0 ]; then
+ stat_append ' (error in lighttpd.conf)'
+ stat_fail
+ exit 1
+ fi
+}
-PID=$(get_pid)
-if [ -z $PID ]; then
- [ -f /var/run/$daemon_name.pid ] rm -f /var/run/$daemon_name.pid
- # RUN
- $daemon_name -f /etc/lighttpd/lighttpd.conf
- #
- if [ $? -gt 0 ]; then
-stat_fail
-exit 1
- else
-echo $(get_pid) /var/run/$daemon_name.pid
-add_daemon $daemon_name
-stat_done
- fi
-else
- stat_fail
- exit 1
-fi
-;;
+start() {
+ stat_busy 'Starting lighttpd'
+ test_config
- stop)
-stat_busy Stopping $daemon_name daemon
-PID=$(get_pid)
-# KILL
-[ ! -z $PID ] kill $PID /dev/null
-#
-if [ $? -gt 0 ]; then
- stat_fail
- exit 1
-else
- rm -f /var/run/$daemon_name.pid /dev/null
- rm_daemon $daemon_name
- stat_done
-fi
[arch-commits] Commit in pyvorbis/trunk (PKGBUILD)
Date: Sunday, August 29, 2010 @ 13:00:16
Author: remy
Revision: 89168
upgpkg: pyvorbis 1.4-5
Rebuild for python2.
Modified:
pyvorbis/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-29 16:52:49 UTC (rev 89167)
+++ PKGBUILD2010-08-29 17:00:16 UTC (rev 89168)
@@ -4,12 +4,12 @@
pkgname=pyvorbis
pkgver=1.4
-pkgrel=4
+pkgrel=5
pkgdesc=Python vorbis wrapper library
url=http://www.andrewchatham.com/pyogg/;
arch=('i686' 'x86_64')
license=('LGPL')
-depends=('python=2.5' 'libvorbis' 'pyogg=1.3-3')
+depends=('python2' 'libvorbis' 'pyogg=1.3-3')
source=(http://ekyo.nerim.net/software/pyogg/${pkgname}-${pkgver}.tar.gz
pyvorbis-1.4-python2.5.patch
pyogg-ticket2-fix.patch)
@@ -21,10 +21,10 @@
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np0 -i ${srcdir}/pyvorbis-1.4-python2.5.patch || return 1
patch -Np0 -i ${srcdir}/pyogg-ticket2-fix.patch || return 1
- ./config_unix.py --prefix=/usr
+ python2 ./config_unix.py --prefix=/usr
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- python setup.py install --root=${pkgdir}
+ python2 setup.py install --root=${pkgdir}
}
