aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2010-02-11 22:59:30 +0000
committerutx@penguin.cz <utx@penguin.cz>2010-02-11 22:59:30 +0000
commit6172717a9c1b542ea60c5f9af62b82cd9c63c2ee (patch)
tree3ec80576fb4c54bb858ea424df12474868aaee2f
parent90b94b1441b9c86997e38b44e26acb3d3a56b6ec (diff)
downloadopenembedded-6172717a9c1b542ea60c5f9af62b82cd9c63c2ee.tar.gz
wwwoffle: Updated to version 2.9f.
-rw-r--r--conf/checksums.ini4
-rw-r--r--recipes/wwwoffle/files/wwwoffle.if-up6
-rw-r--r--recipes/wwwoffle/files/wwwoffle.init8
-rw-r--r--recipes/wwwoffle/wwwoffle_2.9f.bb (renamed from recipes/wwwoffle/wwwoffle_2.9c.bb)1
4 files changed, 10 insertions, 9 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9abe7e3833..15b6fbf79c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -28398,6 +28398,10 @@ sha256=8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14
md5=50208b5c8d5c125accd18f9760225f9e
sha256=6b134ac08daf1186c1cdd34fea4ad8c4f1ad2f52307db98786e262dc4243256c
+[http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9f.tgz]
+md5=a5f04c190a2f27f28cfc744c478e6aaa
+sha256=14728356373c57dbafeaa8458455f1a299aee7ab395cb0de0312be5d693f7b5a
+
[http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2]
md5=cac58d215b73189e8574d1c361e771a6
sha256=1e09f6ad9dd987403f9549c2640680cf932ba00df5afa20a4531e98544b413a5
diff --git a/recipes/wwwoffle/files/wwwoffle.if-up b/recipes/wwwoffle/files/wwwoffle.if-up
index 43167a9e9c..32c2bc45ee 100644
--- a/recipes/wwwoffle/files/wwwoffle.if-up
+++ b/recipes/wwwoffle/files/wwwoffle.if-up
@@ -16,10 +16,8 @@ case "$IFACE" in
;;
esac
-# wwwoffle caches old network configuration and it may cause resolve failures
-/usr/bin/wwwoffle -kill
-/usr/sbin/wwwoffled >/dev/null 2>&1
-
+# wwwoffle caches old resolv.conf. It may cause resolve failures. -config forces its re-read.
+/usr/bin/wwwoffle -config
/usr/bin/wwwoffle -online
# Don't fetch over ppp*, which is typically expensive dial-up.
diff --git a/recipes/wwwoffle/files/wwwoffle.init b/recipes/wwwoffle/files/wwwoffle.init
index 7eac239a3e..10e03815d7 100644
--- a/recipes/wwwoffle/files/wwwoffle.init
+++ b/recipes/wwwoffle/files/wwwoffle.init
@@ -2,17 +2,17 @@
case "$1" in
start)
- /usr/sbin/wwwoffled
+ /usr/sbin/wwwoffled >/dev/null 2>&1
;;
restart)
- /usr/bin/wwwoffle -kill
+ /usr/bin/wwwoffle -kill >/dev/null 2>&1
/usr/sbin/wwwoffled >/dev/null 2>&1
;;
reload|force-reload)
- /usr/bin/wwwoffle -config
+ /usr/bin/wwwoffle -config >/dev/null 2>&1
;;
stop)
- /usr/bin/wwwoffle -kill
+ /usr/bin/wwwoffle -kill >/dev/null 2>&1
;;
*)
echo "Usage: /etc/init.d/wwwoffle {start|stop|restart|reload|force-reload}"
diff --git a/recipes/wwwoffle/wwwoffle_2.9c.bb b/recipes/wwwoffle/wwwoffle_2.9f.bb
index c280e7c8a9..3cc96b2d15 100644
--- a/recipes/wwwoffle/wwwoffle_2.9c.bb
+++ b/recipes/wwwoffle/wwwoffle_2.9f.bb
@@ -16,7 +16,6 @@ inherit autotools gettext update-rc.d
EXTRA_OEMAKE = "docdir=${datadir}/doc"
do_configure() {
- pwd
mv aclocal.m4 acinclude.m4
autotools_do_configure
}