diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-26 16:55:25 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-26 16:55:25 -0200 |
| commit | 29a90785f8d906760c9f959b7efe5d107c0b37e1 (patch) | |
| tree | d4843a8ed3ff14e6b30fb7b39f73aee4a857fb53 | |
| parent | d34a474a6ca40be79b5ea0a97db2b55c1ea709cc (diff) | |
| download | pfsense-packages-29a90785f8d906760c9f959b7efe5d107c0b37e1.tar.gz pfsense-packages-29a90785f8d906760c9f959b7efe5d107c0b37e1.tar.bz2 pfsense-packages-29a90785f8d906760c9f959b7efe5d107c0b37e1.zip | |
Remove old hack from 1.x times, also make sure gnome.subr is available, otherwise dbus won't work
| -rw-r--r-- | config/avahi/avahi.inc | 23 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 8 insertions, 21 deletions
diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc index ecef6f33..58d3ade4 100644 --- a/config/avahi/avahi.inc +++ b/config/avahi/avahi.inc @@ -48,26 +48,10 @@ function avahi_stop() { } function avahi_install() { - global $g, $config, $pfs_version; + global $g, $config; conf_mount_rw(); - // This old hacky install code should only happen on 1.x - if (php_uname("m") == "i386") - $archive = (substr(trim(file_get_contents("/etc/version")),0,1) == "1") ? "avahi.tar.gz" : ""; - // Extract out libraries and avahi-daemon - if(!empty($archive) && file_exists("/root/{$archive}")) { - exec("mkdir -p " . AVAHI_BASE . "/etc/avahi/services/"); - exec("mv " . AVAHI_BASE . "/etc/avahi/*.service " . AVAHI_BASE . "/etc/avahi/services/"); - exec("/usr/bin/tar xzPUf /root/{$archive} -C /"); - unlink("/root/{$archive}"); - // Make sure everthing was extracted - if(!file_exists(AVAHI_BASE . "/sbin/avahi-daemon")) { - log_error("Sorry, something went wrong while extract avahi binaries. Please try the operation again"); - return; - } - } - - if ($pfs_version >= 2.2 && !file_exists('/usr/local/etc/gnome.subr')) { + if (!file_exists('/usr/local/etc/gnome.subr')) { @symlink(AVAHI_BASE . '/etc/gnome.subr', '/usr/local/etc/gnome.subr'); } @@ -172,6 +156,9 @@ EOF; $start .= " mkdir -p /proc\n"; $start .= " mount -t procfs procfs /proc\n"; $start .= "fi\n"; + $start .= "if [ ! -f /usr/local/etc/gnome.subr ]; then\n"; + $start .= " ln -sf " . AVAHI_BASE . "/etc/gnome.subr /usr/local/etc/gnome.subr"; + $start .= "fi\n"; $start .= "/usr/bin/killall avahi-daemon >/dev/null 2>&1\n"; if (file_exists(AVAHI_BASE . "/etc/rc.d/dbus")) { $start .= AVAHI_BASE . "/etc/rc.d/dbus onestop\n"; diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 74ae3106..5a262d9c 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -222,7 +222,7 @@ <ports_after>net/avahi-app devel/dbus</ports_after> </build_pbi> <depends_on_package_pbi>avahi-0.6.31-##ARCH##.pbi</depends_on_package_pbi> - <version>0.6.31 pkg v1.07</version> + <version>0.6.31 pkg v1.08</version> <status>ALPHA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 64775b8a..4fb6b001 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -313,7 +313,7 @@ </build_pbi> <depends_on_package>avahi-app-0.6.29_1.tbz</depends_on_package> <depends_on_package_pbi>avahi-0.6.31-i386.pbi</depends_on_package_pbi> - <version>0.6.31 pkg v1.07</version> + <version>0.6.31 pkg v1.08</version> <status>ALPHA</status> <required_version>1.2.3</required_version> <config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index e78a5dfa..f392eb55 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -300,7 +300,7 @@ </build_pbi> <depends_on_package>avahi-0.6.29.tbz</depends_on_package> <depends_on_package_pbi>avahi-0.6.31-amd64.pbi</depends_on_package_pbi> - <version>0.6.31 pkg v1.07</version> + <version>0.6.31 pkg v1.08</version> <status>ALPHA</status> <required_version>1.2.3</required_version> <config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file> |