Merge branch '2.3' into 2.4

This commit is contained in:
Juergen Daubert 2007-12-12 11:37:47 +01:00
commit b0e8846c12
25 changed files with 121 additions and 52 deletions

View File

@ -64,7 +64,7 @@ drwxr-xr-x root/root usr/lib/tomcat/server/lib/
-rw-r--r-- root/root usr/lib/tomcat/server/lib/catalina-optional.jar
-rw-r--r-- root/root usr/lib/tomcat/server/lib/catalina-storeconfig.jar
-rw-r--r-- root/root usr/lib/tomcat/server/lib/catalina.jar
-rw-r--r-- root/root usr/lib/tomcat/server/lib/commons-modeler-2.0.jar
-rw-r--r-- root/root usr/lib/tomcat/server/lib/commons-modeler-2.0.1.jar
-rw-r--r-- root/root usr/lib/tomcat/server/lib/servlets-cgi.renametojar
-rw-r--r-- root/root usr/lib/tomcat/server/lib/servlets-default.jar
-rw-r--r-- root/root usr/lib/tomcat/server/lib/servlets-invoker.jar

View File

@ -1,2 +1,2 @@
7a4cc2e00c7d2c9d9c4437ede337f832 apache-tomcat-5.5.23.tar.gz
f273c73979bee1342134761b0497a335 apache-tomcat-5.5.25.tar.gz
6a4fee28c02ed61727e696193569b91e tomcat

View File

@ -5,7 +5,7 @@
# Depends on: jdk
name=apache-tomcat
version=5.5.23
version=5.5.25
release=1
source=(http://www.eu.apache.org/dist/tomcat/tomcat-5/v$version/bin/$name-$version.tar.gz \
tomcat)

View File

@ -1,10 +1,11 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/centerim
-rwxr-xr-x root/root usr/bin/cicqconv
-rwxr-xr-x root/root usr/bin/cimconv
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/cicqconv.1.gz
-rw-r--r-- root/root usr/man/man1/centerim.1.gz
-rw-r--r-- root/root usr/man/man1/cimconv.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/centerim/
-rw-r--r-- root/root usr/share/centerim/email.wav

View File

@ -1,2 +1 @@
d128b54e3cc04a6ee651c51682a497a9 centerim-4.22.1.tar.gz
aba0f8064203b6bcf393742956177caf centerim-icq.patch
dcced736e2f261e08e667403c42dc78f centerim-4.22.2.tar.gz

View File

@ -5,16 +5,13 @@
# Depends on: ncurses
name=centerim
version=4.22.1
version=4.22.2
release=1
source=(http://www.centerim.org/download/releases/$name-$version.tar.gz \
centerim-icq.patch)
source=(http://www.centerim.org/download/releases/$name-$version.tar.gz)
build() {
cd $name-$version
patch -p1 < $SRC/centerim-icq.patch
./configure \
--prefix=/usr \
--mandir=/usr/man \

View File

@ -1,12 +0,0 @@
diff -Nru centerim-4.22.1/libicq2000/src/Client.cpp centerim-4.22.1-new/libicq2000/src/Client.cpp
--- centerim-4.22.1/libicq2000/src/Client.cpp 2007-06-14 00:44:04.000000000 +0200
+++ centerim-4.22.1-new/libicq2000/src/Client.cpp 2007-11-30 17:26:06.000000000 +0100
@@ -1524,7 +1524,7 @@
SignalLog(LogEvent::INFO, "Received server-based list from server\n");
SBLListSNAC *sbs = static_cast<SBLListSNAC*>(snac);
mergeSBL( sbs->getContactTree() );
-// SendSBLReceivedACK();
+ SendSBLReceivedACK();
break;
}

View File

@ -1,3 +1,3 @@
1c37d911bc42fb40f0ef5a3f5822b170 dovecot
f6aaa996d000e4af41ce0d7604106dea dovecot-1.0.8.tar.gz
fdd490b72fee9b99da972ddb69f4b58d dovecot-1.0.9.tar.gz
9678a18c4fb67618e263fc6ce8a4e95c dovecot-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: openssl
name=dovecot
version=1.0.8
version=1.0.9
release=1
source=(http://dovecot.org/releases/1.0/$name-$version.tar.gz \
dovecot-config.patch dovecot)

View File

@ -2,5 +2,4 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/firefox/
drwxr-xr-x root/root usr/lib/firefox/plugins/
-r--r--r-- root/root usr/lib/firefox/plugins/flashplayer.xpt
-rwxr-xr-x root/root usr/lib/firefox/plugins/libflashplayer.so

View File

@ -1 +1 @@
821cc72359a937caef85bb4cc74ef5cd install_flash_player_9_linux.tar.gz
93b7c48eaa492237b807a3ae1de65cf9 install_flash_player_9_linux.tar.gz

View File

@ -1,16 +1,16 @@
# Description: Macromedia Flash Plugin for Firefox
# URL: http://www.macromedia.com/shockwave/download/
# Maintainer: Matt Housh, jaeger at morpheus dot net
# Maintainer: Matt Housh, jaeger at crux dot nu
# Depends on: firefox
name=firefox-flash-plugin
version=9.0.48.0
version=9.0.115.0
release=1
source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz)
build() {
mkdir -p $PKG/usr/lib/firefox/plugins
cp install_flash_player_9_linux/{libflashplayer.so,flashplayer.xpt} \
cp install_flash_player_9_linux/libflashplayer.so \
$PKG/usr/lib/firefox/plugins
chown -R root:root $PKG
}

50
hal-info/.footprint Normal file
View File

@ -0,0 +1,50 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/hal/
drwxr-xr-x root/root usr/share/hal/fdi/
drwxr-xr-x root/root usr/share/hal/fdi/information/
drwxr-xr-x root/root usr/share/hal/fdi/information/10freedesktop/
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-usb-pda.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
-rw-r--r-- root/root usr/share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
drwxr-xr-x root/root usr/share/hal/fdi/information/20thirdparty/
drwxr-xr-x root/root usr/share/hal/fdi/preprobe/
drwxr-xr-x root/root usr/share/hal/fdi/preprobe/10osvendor/
-rw-r--r-- root/root usr/share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
-rw-r--r-- root/root usr/share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
drwxr-xr-x root/root usr/share/hal/fdi/preprobe/20thirdparty/

1
hal-info/.md5sum Normal file
View File

@ -0,0 +1 @@
d0bc671a56477bac28a18b8bcf80c2be hal-info-20071030.tar.gz

15
hal-info/Pkgfile Normal file
View File

@ -0,0 +1,15 @@
# Description: Device information for HAL
# URL: http://www.freedesktop.org/wiki/Software/hal
# Maintainer: Matt Housh, jaeger at crux dot nu
name=hal-info
version=20071030
release=1
source=(http://hal.freedesktop.org/releases/$name-$version.tar.gz)
build() {
cd $name-$version
./configure --prefix=/usr
make
make DESTDIR=$PKG install
}

View File

@ -30,6 +30,7 @@ drwxr-xr-x root/root usr/include/hal/
-rw-r--r-- root/root usr/include/hal/libhal.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/hal/
-rwxr-xr-x root/root usr/lib/hal/hal-ipw-killswitch-linux
-rwxr-xr-x root/root usr/lib/hal/hal-storage-cleanup-all-mountpoints
-rwxr-xr-x root/root usr/lib/hal/hal-storage-cleanup-mountpoint
-rwxr-xr-x root/root usr/lib/hal/hal-storage-closetray
@ -42,7 +43,7 @@ drwxr-xr-x root/root usr/lib/hal/
-rwxr-xr-x root/root usr/lib/hal/hald-addon-acpi
-rwxr-xr-x root/root usr/lib/hal/hald-addon-cpufreq
-rwxr-xr-x root/root usr/lib/hal/hald-addon-hid-ups
-rwxr-xr-x root/root usr/lib/hal/hald-addon-keyboard
-rwxr-xr-x root/root usr/lib/hal/hald-addon-input
-rwxr-xr-x root/root usr/lib/hal/hald-addon-macbook-backlight
-rwxr-xr-x root/root usr/lib/hal/hald-addon-macbookpro-backlight
-rwxr-xr-x root/root usr/lib/hal/hald-addon-pmu
@ -52,6 +53,7 @@ drwxr-xr-x root/root usr/lib/hal/
-rwxr-xr-x root/root usr/lib/hal/hald-probe-hiddev
-rwxr-xr-x root/root usr/lib/hal/hald-probe-ieee1394-unit
-rwxr-xr-x root/root usr/lib/hal/hald-probe-input
-rwxr-xr-x root/root usr/lib/hal/hald-probe-net-bluetooth
-rwxr-xr-x root/root usr/lib/hal/hald-probe-pc-floppy
-rwxr-xr-x root/root usr/lib/hal/hald-probe-printer
-rwxr-xr-x root/root usr/lib/hal/hald-probe-serial
@ -60,6 +62,7 @@ drwxr-xr-x root/root usr/lib/hal/
-rwxr-xr-x root/root usr/lib/hal/hald-probe-volume
-rwxr-xr-x root/root usr/lib/hal/hald-runner
drwxr-xr-x root/root usr/lib/hal/scripts/
-rwxr-xr-x root/root usr/lib/hal/scripts/hal-functions
-rwxr-xr-x root/root usr/lib/hal/scripts/hal-luks-remove
-rwxr-xr-x root/root usr/lib/hal/scripts/hal-luks-setup
-rwxr-xr-x root/root usr/lib/hal/scripts/hal-luks-teardown
@ -73,6 +76,20 @@ drwxr-xr-x root/root usr/lib/hal/scripts/
-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-shutdown
-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-suspend
-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-suspend-hybrid
drwxr-xr-x root/root usr/lib/hal/scripts/linux/
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-luks-remove-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-luks-setup-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-luks-teardown-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-killswitch-get-power-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-killswitch-set-power-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-lcd-get-brightness-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-lcd-set-brightness-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-hibernate-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-reboot-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-set-power-save-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-shutdown-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-suspend-hybrid-linux
-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-suspend-linux
-rw-r--r-- root/root usr/lib/libhal-storage.a
-rwxr-xr-x root/root usr/lib/libhal-storage.la
lrwxrwxrwx root/root usr/lib/libhal-storage.so -> libhal-storage.so.1.0.0
@ -110,13 +127,14 @@ drwxr-xr-x root/root usr/share/hal/fdi/information/20thirdparty/
drwxr-xr-x root/root usr/share/hal/fdi/policy/
drwxr-xr-x root/root usr/share/hal/fdi/policy/10osvendor/
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-cpufreq.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-keyboard-policy.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-macbook-backlight.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-macbookpro-utils.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-rfkill-switch.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-usbcsr-mice.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi
drwxr-xr-x root/root usr/share/hal/fdi/policy/20thirdparty/

View File

@ -1,2 +1,2 @@
a6f532770cf9286e1de38d6570cbc6bc hal-0.5.9.tar.gz
fce852c428e7cda0b937087c79eec63f hal-0.5.10.tar.gz
cc3d04e7ac09e15f33c530725f43e641 rc.hald

View File

@ -1,12 +1,12 @@
# Description: Hardware Abstraction Layer
# URL: http://freedesktop.org/wiki/Software_2fhal
# URL: http://www.freedesktop.org/wiki/Software/hal
# Maintainer: Matt Housh, jaeger at crux dot nu
# Depends on: dbus, dbus-glib
# Depends on: dbus, dbus-glib, hal-info
name=hal
version=0.5.9
version=0.5.10
release=1
source=(http://freedesktop.org/~david/dist/$name-$version.tar.gz \
source=(http://hal.freedesktop.org/releases/$name-$version.tar.gz \
rc.hald)
build() {
@ -27,9 +27,10 @@ build() {
install -D -o root -g root -m 0755 $SRC/rc.hald \
$PKG/etc/rc.d/hald
rm -rf $PKG/usr/share/{doc,locale}
install -D -m 0644 -o root -g root tools/linux/90-hal.rules \
$PKG/etc/udev/rules.d/90-hal.rules
sed -i -e '36,43d' -e 's/user="0"/group="plugdev"/' \
# delete pam_console stuff, enable plugdev group
# policies in place of uid 0
sed -i -e '48,55d' -e 's/user="0"/group="plugdev"/' \
$PKG/usr/etc/dbus-1/system.d/hal.conf
rm -rf $PKG/usr/share/gtk-doc
mv $PKG/usr/etc/udev $PKG/etc/
}

View File

@ -1 +1 @@
bb19dac3cd3f1b43b3074bfd2ca9785b lftp-3.6.0.tar.bz2
29e9e44474aa381029d6ae0fb79b2f2b lftp-3.6.1.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: openssl
name=lftp
version=3.6.0
version=3.6.1
release=1
source=(http://tactical.wiretapped.net/mirrors/$name/$name-$version.tar.bz2)

View File

@ -170,9 +170,9 @@ lrwxrwxrwx root/root usr/lib/libgnt.so -> libgnt.so.0.0.0
lrwxrwxrwx root/root usr/lib/libgnt.so.0 -> libgnt.so.0.0.0
-rwxr-xr-x root/root usr/lib/libgnt.so.0.0.0
-rwxr-xr-x root/root usr/lib/libpurple.la
lrwxrwxrwx root/root usr/lib/libpurple.so -> libpurple.so.0.3.0
lrwxrwxrwx root/root usr/lib/libpurple.so.0 -> libpurple.so.0.3.0
-rwxr-xr-x root/root usr/lib/libpurple.so.0.3.0
lrwxrwxrwx root/root usr/lib/libpurple.so -> libpurple.so.0.3.1
lrwxrwxrwx root/root usr/lib/libpurple.so.0 -> libpurple.so.0.3.1
-rwxr-xr-x root/root usr/lib/libpurple.so.0.3.1
drwxr-xr-x root/root usr/lib/pidgin/
-rwxr-xr-x root/root usr/lib/pidgin/convcolors.la
-rwxr-xr-x root/root usr/lib/pidgin/convcolors.so

View File

@ -1 +1 @@
0456e63358c8be7a905f9a8ca6494088 pidgin-2.3.0.tar.bz2
0a593c2c343d5b854bd2cd2be7542f40 pidgin-2.3.1.tar.bz2

View File

@ -1,10 +1,10 @@
# Description: A multi-protocol instant messaging client
# Maintainer: Matt Housh, jaeger at morpheus dot net
# URL: http://pidgin.im/
# Maintainer: Matt Housh, jaeger at crux dot nu
# Depends on: nss, startup-notification
name=pidgin
version=2.3.0
version=2.3.1
release=1
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)

View File

@ -1,3 +1,3 @@
448caca4745aef1a842f4fdb1aa62e1e samba
57aedd342cafddbb28e2936c15dde96b samba-3.0.27a.tar.gz
8761cd7c02833d959fbebd4f69895075 samba-3.0.28.tar.gz
fbaccda19afc8f75f6f0123cab82c87e samba-config.patch

View File

@ -4,8 +4,8 @@
# Depends on: ncurses, readline
name=samba
version=3.0.27a
release=2
version=3.0.28
release=1
source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
samba-config.patch samba)