This commit is contained in:
parent
5e2454b8db
commit
8aeb388118
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e9c5178bd5e9c1aa4e62cd72284081f9ed7a2203626b7dfcbdc542f96ce846ba
|
||||
size 632643
|
3
avahi-0.6.17.tar.bz2
Normal file
3
avahi-0.6.17.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:592e0e37fe66e6c461719c3d3f1bedb0482c32c6fac071e92e4282c26833a6a8
|
||||
size 647055
|
47
avahi-bookmarks.init
Normal file
47
avahi-bookmarks.init
Normal file
@ -0,0 +1,47 @@
|
||||
#! /bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: avahi-bookmarks
|
||||
# Required-Start: avahi-dnsconfd
|
||||
# Default-Start: 3 5
|
||||
# Default-Stop:
|
||||
# Description: Avahi ZeroConf Bookmarks server
|
||||
### END INIT INFO
|
||||
|
||||
AVAHI_BIN=/usr/bin/avahi-bookmarks
|
||||
test -x $AVAHI_BIN || exit 5
|
||||
|
||||
. /etc/rc.status
|
||||
rc_reset
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting Avahi Bookmarks server"
|
||||
/sbin/startproc -q -u avahi $AVAHI_BIN
|
||||
rc_status -v
|
||||
;;
|
||||
stop)
|
||||
echo -n "Shutting down Avahi Bookmarks server"
|
||||
/sbin/killproc $AVAHI_BIN
|
||||
rc_status -v
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
$0 start
|
||||
rc_status
|
||||
;;
|
||||
force-reload|reload)
|
||||
echo -n "Reloading Avahi Bookmarks server"
|
||||
$AVAHI_BIN -r
|
||||
rc_status -v
|
||||
;;
|
||||
status)
|
||||
echo -n "Checking for Avahi Bookmarks server: "
|
||||
$AVAHI_BIN -c
|
||||
rc_status -v
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
16
avahi-python-compile.patch
Normal file
16
avahi-python-compile.patch
Normal file
@ -0,0 +1,16 @@
|
||||
--- avahi-python/avahi/Makefile.am
|
||||
+++ avahi-python/avahi/Makefile.am
|
||||
@@ -50,10 +50,12 @@
|
||||
chmod +x $@
|
||||
endif
|
||||
|
||||
+avahi_PYTHON = $(avahi_SCRIPTS)
|
||||
+
|
||||
if HAVE_PYGTK
|
||||
if HAVE_PYTHON_DBUS
|
||||
|
||||
-avahi_PYTHON = __init__.py SimpleGladeApp.py
|
||||
+avahi_PYTHON += __init__.py SimpleGladeApp.py
|
||||
|
||||
endif
|
||||
endif
|
@ -1,12 +0,0 @@
|
||||
dns.c: In function 'consume_labels':
|
||||
dns.c:403: warning: control reaches end of non-void function
|
||||
--- avahi-core/dns.c
|
||||
+++ avahi-core/dns.c
|
||||
@@ -400,6 +400,7 @@
|
||||
} else
|
||||
return -1;
|
||||
}
|
||||
+ return -1;
|
||||
}
|
||||
|
||||
int avahi_dns_packet_consume_name(AvahiDnsPacket *p, char *ret_name, size_t l) {
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 17:20:41 CET 2007 - sbrabec@suse.cz
|
||||
|
||||
- Updated to a bugfix release 0.6.17:
|
||||
* Don't accept "localhost" as a local mDNS host name
|
||||
* Allow running avahi-bookmarks as CGI script
|
||||
* Improve libdns_sd compatibility
|
||||
* Stability: libdns_sd mutex locking order fix
|
||||
* Publish IPv6 addresses via IPv4 and vice versa
|
||||
* IA64 fixes
|
||||
* A lot of minor cleanups and fixes
|
||||
- Fixed python dependencies (#244457).
|
||||
- Fixed howl compatibility links (#244486).
|
||||
- Fixed python byte-compilation (#244458).
|
||||
- Added avahi-bookmarks init script.
|
||||
- Added SuSEfirewall2 rule.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 13 11:50:50 CET 2007 - sbrabec@suse.cz
|
||||
|
||||
|
7
avahi.firewall
Normal file
7
avahi.firewall
Normal file
@ -0,0 +1,7 @@
|
||||
## Name: Zeroconf/Bonjour Multicast DNS
|
||||
## Description: Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service Discovery (DNS-SD)
|
||||
|
||||
# Allow broadcasting on UDP port 5353.
|
||||
# mdnsresponder (5354) port is not used by Avahi
|
||||
UDP="mdns"
|
||||
BROADCAST="mdns"
|
58
avahi.spec
58
avahi.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi (Version 0.6.16)
|
||||
# spec file for package avahi (Version 0.6.17)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -17,22 +17,29 @@ BuildRequires: libqt4-devel python-gtk-devel
|
||||
%else
|
||||
BuildRequires: python-gtk qt-devel
|
||||
%endif
|
||||
Version: 0.6.16
|
||||
Release: 7
|
||||
Version: 0.6.17
|
||||
Release: 1
|
||||
URL: http://www.avahi.org/
|
||||
Group: System/Daemons
|
||||
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gnome-nettool2.png
|
||||
Source2: avahi-bookmarks.init
|
||||
Source3: avahi.firewall
|
||||
Patch: avahi-gacdir.patch
|
||||
Patch1: avahi-random-return.patch
|
||||
Patch2: avahi-discover-icon.patch
|
||||
Requires: dbus-1 python python-gdbm python-gtk
|
||||
Patch3: avahi-python-compile.patch
|
||||
# See also http://www.avahi.org/wiki/DownloadAvahi#RequirementsTable
|
||||
Requires: dbus-1 python python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web
|
||||
# Not really required, but many tools expect nss-mdns installed:
|
||||
Requires: nss-mdns
|
||||
Autoreqprov: on
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: mDNSResponder
|
||||
Obsoletes: mDNSResponder <= 107.5
|
||||
|
||||
%py_requires
|
||||
%package glib
|
||||
Summary: D-BUS Service for Zeroconf/Bonjour
|
||||
Requires: %{name} = %{version}
|
||||
@ -336,8 +343,8 @@ Authors:
|
||||
%prep
|
||||
%setup -q
|
||||
%patch
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
|
||||
%build
|
||||
ACLOCAL="aclocal -I common" autoreconf -f -i
|
||||
@ -359,15 +366,19 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
|
||||
cd $RPM_BUILD_ROOT%{_includedir} ; ln -s avahi-compat-libdns_sd/dns_sd.h avahi-compat-howl/howl.h $RPM_BUILD_ROOT%{_includedir}/
|
||||
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT%{_includedir}/
|
||||
ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
|
||||
# Work-around qt4 bug:
|
||||
# https://bugzilla.novell.com/show_bug.cgi?id=238169
|
||||
%if %suse_version <= 1020
|
||||
sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la
|
||||
%endif
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
|
||||
ln -s /etc/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s /etc/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/SuSEfirewall2/services
|
||||
install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks
|
||||
ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
|
||||
ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install %{S:3} $RPM_BUILD_ROOT%{_datadir}/SuSEfirewall2/services/avahi
|
||||
# FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
|
||||
%suse_update_desktop_file avahi-discover GNOME Application System Utility Network Monitor Settings
|
||||
|
||||
@ -375,8 +386,8 @@ ln -s /etc/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%pre
|
||||
/usr/sbin/groupadd -r avahi 2> /dev/null || :
|
||||
/usr/sbin/useradd -r -o -s /bin/false -c "User for Avahi" -d /var/run/avahi-daemon -g avahi avahi 2> /dev/null || :
|
||||
%{_sbindir}/groupadd -r avahi 2> /dev/null || :
|
||||
%{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
|
||||
|
||||
%preun
|
||||
%{stop_on_removal avahi-daemon}
|
||||
@ -396,8 +407,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc LICENSE docs/*
|
||||
%{_bindir}/avahi-[bpr]*
|
||||
%{_bindir}/avahi-set-host-name
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/avahi
|
||||
%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%{_datadir}/SuSEfirewall2/services/*
|
||||
%{_libdir}/*avahi-client*.so.*
|
||||
%{_libdir}/*avahi-common*.so.*
|
||||
%{_libdir}/*avahi-core*.so.*
|
||||
@ -414,11 +426,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/*
|
||||
%{py_sitedir}/avahi
|
||||
%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
|
||||
%files glib
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/avahi-discover*
|
||||
%{_datadir}/applications/avahi-discover.desktop
|
||||
%{_libdir}/*avahi-glib*.so.*
|
||||
|
||||
%files mono
|
||||
@ -456,10 +468,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files compat-howl-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/avahi-compat-howl
|
||||
%{_includedir}/howl.h
|
||||
%{_libdir}/libhowl.so
|
||||
%{_libdir}/libhowl.*a
|
||||
%{_libdir}/pkgconfig/avahi-compat-howl.pc
|
||||
%{_libdir}/pkgconfig/howl.pc
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
@ -491,7 +503,21 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/pkgconfig/avahi-qt3.pc
|
||||
%{_libdir}/pkgconfig/avahi-qt4.pc
|
||||
|
||||
%changelog -n avahi
|
||||
%changelog
|
||||
* Wed Feb 21 2007 - sbrabec@suse.cz
|
||||
- Updated to a bugfix release 0.6.17:
|
||||
* Don't accept "localhost" as a local mDNS host name
|
||||
* Allow running avahi-bookmarks as CGI script
|
||||
* Improve libdns_sd compatibility
|
||||
* Stability: libdns_sd mutex locking order fix
|
||||
* Publish IPv6 addresses via IPv4 and vice versa
|
||||
* IA64 fixes
|
||||
* A lot of minor cleanups and fixes
|
||||
- Fixed python dependencies (#244457).
|
||||
- Fixed howl compatibility links (#244486).
|
||||
- Fixed python byte-compilation (#244458).
|
||||
- Added avahi-bookmarks init script.
|
||||
- Added SuSEfirewall2 rule.
|
||||
* Tue Feb 13 2007 - sbrabec@suse.cz
|
||||
- Do not build unusable static libraries (#238552#c17).
|
||||
* Wed Jan 31 2007 - ro@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user