Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

6 files changed, 7 insertions, 24 deletions

diff --git a/base/whois/.md5sum b/base/whois/.md5sum
index e7dd55e67..8a5e1e2af 100644
--- a/base/whois/.md5sum
+++ b/base/whois/.md5sum
@@ -1 +1 @@
-87319ca1e5eeae0631fc3ca249b43671  whois_5.0.4.tar.gz
+4145460e94b909a8420093a7119a299e  whois_5.0.6.tar.gz
diff --git a/base/whois/Pkgfile b/base/whois/Pkgfile
index a8643120c..505bc867f 100644
--- a/base/whois/Pkgfile
+++ b/base/whois/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=whois
-version=5.0.4
+version=5.0.6
 release=1
 source=( ftp://ftp.debian.org/debian/pool/main/w/$name/$name\_$version.tar.gz)
 
diff --git a/extra/hal/.footprint b/extra/hal/.footprint
index d4ed97b82..b21c6ecb5 100644
--- a/extra/hal/.footprint
+++ b/extra/hal/.footprint
@@ -9,7 +9,6 @@ drwxr-xr-x	root/root	etc/hal/fdi/information/
 drwxr-xr-x	root/root	etc/hal/fdi/policy/
 -rwxr-xr-x	root/root	etc/hal/fdi/policy/10-keymap.fdi
 lrwxrwxrwx	root/root	etc/hal/fdi/policy/10-x11-input.fdi -> /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
--rwxr-xr-x	root/root	etc/hal/fdi/policy/no-fixed-drives.fdi
 drwxr-xr-x	root/root	etc/hal/fdi/preprobe/
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
diff --git a/extra/hal/.md5sum b/extra/hal/.md5sum
index 6c82bef35..d36be6fec 100644
--- a/extra/hal/.md5sum
+++ b/extra/hal/.md5sum
@@ -3,5 +3,4 @@
 6fc99d15d38945c17a291ea93e664664  hal-info-20080508.tar.gz
 e96ea4d2d6e81d2a53cf63e2e93dc9e4  haldaemon
 47290dc30a6e2e05a9aa7a0d06833350  halusers.conf
-be2df8f5cf8e7decdc1551f8151b6c60  no-fixed-drives.fdi
 49ccb7f5da3c86d228d6c36a624a1509  use_udevadm_not_udevinfo.patch.gz
diff --git a/extra/hal/Pkgfile b/extra/hal/Pkgfile
index 677eb6468..a9ef0294d 100755
--- a/extra/hal/Pkgfile
+++ b/extra/hal/Pkgfile
@@ -6,10 +6,10 @@
 
 name=hal
 version=0.5.13
-release=1
+release=2
 source=(http://hal.freedesktop.org/releases/$name-$version.tar.gz\
 	http://hal.freedesktop.org/releases/hal-info-20080508.tar.gz\
-        haldaemon halusers.conf no-fixed-drives.fdi 10-keymap.fdi \
+        haldaemon halusers.conf 10-keymap.fdi \
 	use_udevadm_not_udevinfo.patch.gz)
 
 build() {
@@ -17,7 +17,6 @@ build() {
 	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
 	tar xvf $scripts-$scriptsversion.tar.bz2
 	cd $name-$version
-#	zcat ../use_udevadm_not_udevinfo.patch.gz | patch -p1 --verbose
 
 	sed -i -e   's%, 1.8.6%&, 1.8.7%' \
 	-e   's% or 1.8.6%/1.8.6 or 1.8.7%' \
@@ -38,9 +37,9 @@ build() {
 
         mkdir -p $PKG/etc/hal/fdi/policy
         mkdir -p $PKG/etc/dbus-1/system.d
-        mv ../halusers.conf $PKG/etc/dbus-1/system.d/
-        mv ../{no-fixed-drives.fdi,10-keymap.fdi} $PKG/etc/hal/fdi/policy/
-        cd ../$scripts-$scriptsversion
+        install -m755 ../halusers.conf $PKG/etc/dbus-1/system.d/halusers.conf
+        install -m755 ../10-keymap.fdi $PKG/etc/hal/fdi/policy/
+	cd ../$scripts-$scriptsversion
         make DESTDIR=$PKG install-haldaemon
         install -m755 ../haldaemon $PKG/etc/rc.d/init.d/
 	rm -rf $PKG/usr/share/gtk-doc
diff --git a/extra/hal/no-fixed-drives.fdi b/extra/hal/no-fixed-drives.fdi
deleted file mode 100755
index 6832ee2c5..000000000
--- a/extra/hal/no-fixed-drives.fdi
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<!-- Don't allow HAL methods on disks that are not
-     removable or hotpluggable -->
-
-<deviceinfo version="0.2">
-<device>
-  <match key="@block.storage_device:storage.hotpluggable" bool="false">
-    <match key="@block.storage_device:storage.removable" bool="false">
-      <merge key="volume.ignore" type="bool">true</merge>
-    </match>
-  </match>
-</device>
-</deviceinfo>