OBS User unknown 2007-01-24 17:48:36 +00:00 committed by Git OBS Bridge
parent aa6dfacfc6
commit a014b24b42
7 changed files with 111 additions and 98 deletions

View File

@ -1,14 +0,0 @@
--- avahi-0.6.14/avahi-core/netlink.c
+++ avahi-0.6.14/avahi-core/netlink.c
@@ -61,7 +61,10 @@
}
p = (struct nlmsghdr *) nl->buffer;
-
+ if (p->nlmsg_pid != 0) {
+ avahi_log_warn(__FILE__": packet not from the kernel");
+ return -1;
+ }
assert(nl->callback);
for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc3c97fc56ccce410c5d04b919622c0bab79f9de39cfd36538216774e4575a79
size 664477

3
avahi-0.6.16.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9c5178bd5e9c1aa4e62cd72284081f9ed7a2203626b7dfcbdc542f96ce846ba
size 632643

View File

@ -1,16 +0,0 @@
--- avahi-daemon/dbus-protocol.c
+++ avahi-daemon/dbus-protocol.c
@@ -1067,10 +1067,10 @@
if (dbus_bus_request_name(
server->bus,
AVAHI_DBUS_NAME,
-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
-#else
+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
+#else
+ DBUS_NAME_FLAG_DO_NOT_QUEUE,
#endif
&error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
if (dbus_error_is_set(&error)) {

12
avahi-random-return.patch Normal file
View File

@ -0,0 +1,12 @@
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) {

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Jan 24 15:33:20 CET 2007 - sbrabec@suse.cz
- Updated to version 0.6.16 (CVE-2006-5461, CVE-2006-6870):
* Revert previous patch to check nlmsg_pid as it is bogus and
breaks in many cases, notably when using NetworkManager.
* Replace with new SO_PASSCRED-based check of the sending UID
which seems to work better.
* Handle some errors in libdns_sd more gracefully the way the real
libdns_sd does
* Apply fix for Linux 2.6.19+ where IFA_RTA / IFLA_RTA is no
longer defined
* Fix doxygen comments for avahi watch
* Make d-bus version detection work for >= 1.0
* Dont dbus_connection_close on shared dbus connections
* Fix potential endless loop in dns label unpacking code
* Fix bogus assertion in client-publish-service.c example
* Mild fix to some doxygen docs for avahi-common/address.h
* Fix passing in custom priviledged group (previously ignored
setting)
* Check that netlink messages actually originate from the kernel
and not another process.
* Fix dbus_service_browser not setting
AVAHI_LOOKUP_RESULT_OUR_OWN.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 21 19:12:18 CET 2007 - dmueller@suse.de Sun Jan 21 19:12:18 CET 2007 - dmueller@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package avahi (Version 0.6.14) # spec file for package avahi (Version 0.6.16)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -11,22 +11,24 @@
# norootforbuild # norootforbuild
Name: avahi Name: avahi
BuildRequires: dbus-1-devel dbus-1-python doxygen graphviz libdaemon-devel libglade2-devel monodoc-core python-devel python-gdbm qt3-devel BuildRequires: dbus-1-devel dbus-1-python doxygen graphviz libdaemon-devel libglade2-devel monodoc-core python-devel python-gdbm qt3-devel update-desktop-files
%if %suse_version > 1010 %if %suse_version > 1010
BuildRequires: libqt4-devel python-gtk-devel BuildRequires: libqt4-devel python-gtk-devel
%else %else
BuildRequires: python-gtk qt-devel BuildRequires: python-gtk qt-devel
%endif %endif
Version: 0.6.14 # FIXME (upstream): Needed only for desktop icon
Release: 48 BuildRequires: gnome-nettool
Recommends: gnome-nettool
Version: 0.6.16
Release: 1
URL: http://www.avahi.org/ URL: http://www.avahi.org/
Group: System/Daemons Group: System/Daemons
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch: avahi-gacdir.patch Patch: avahi-gacdir.patch
Patch1: avahi-0.6.11-security.patch Patch1: avahi-random-return.patch
Patch2: avahi-dbus-request-name-flags-fix-thoenig-02.patch
Requires: dbus-1 python python-gdbm python-gtk Requires: dbus-1 python python-gdbm python-gtk
Autoreqprov: on Autoreqprov: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -333,25 +335,15 @@ Authors:
Sebastien Estienne <sebastien.estienne@gmail.com> Sebastien Estienne <sebastien.estienne@gmail.com>
%prep %prep
%setup %setup -q
%patch %patch
%patch1 -p1 %patch1
%patch2
%build %build
export CFLAGS="$RPM_OPT_FLAGS" ACLOCAL="aclocal -I common" autoreconf -f -i
export CXXFLAGS="$RPM_OPT_FLAGS" %configure\
aclocal -I common --libexecdir=%{_prefix}/lib\
automake
autoconf
./configure\
--with-distro=suse\ --with-distro=suse\
--prefix=/usr\
--sysconfdir=/etc\
--localstatedir="%{_localstatedir}"\
--libdir=/usr/%{_lib}\
--libexecdir=/usr/lib \
--mandir=%{_mandir}\
--enable-qt3\ --enable-qt3\
--enable-qt4\ --enable-qt4\
--enable-mono\ --enable-mono\
@ -363,15 +355,18 @@ make %{?jobs:-j%jobs}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
install -d %{buildroot}/%{_localstatedir}/run/avahi-daemon install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
rm $RPM_BUILD_ROOT/usr/share/applications/*.desktop cd $RPM_BUILD_ROOT%{_includedir} ; ln -s avahi-compat-libdns_sd/dns_sd.h avahi-compat-howl/howl.h $RPM_BUILD_ROOT%{_includedir}/
( cd $RPM_BUILD_ROOT%{_includedir} ; ln -s avahi-compat-libdns_sd/dns_sd.h . ) # Work-around qt4 bug:
( cd $RPM_BUILD_ROOT%{_includedir} ; ln -s avahi-compat-howl/howl.h . ) # https://bugzilla.novell.com/show_bug.cgi?id=238169
sed -e "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la > $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la.1 %if %suse_version <= 1020
mv $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la.1 $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la
%endif
mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir}
ln -sf /etc/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon ln -s /etc/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
ln -sf /etc/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd ln -s /etc/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
# 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
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -396,52 +391,38 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE docs/* %doc LICENSE docs/*
%dir %{_sysconfdir}/avahi
%dir %{_sysconfdir}/avahi/services
%dir %{_datadir}/avahi
%dir %{_datadir}/avahi/interfaces
%dir %{_datadir}/avahi/introspection
%dir %{py_sitedir}/avahi
%{_sysconfdir}/init.d/avahi-daemon
%{_sysconfdir}/init.d/avahi-dnsconfd
%config %{_sysconfdir}/avahi/avahi-daemon.conf
%{_sysconfdir}/avahi/avahi-dnsconfd.action
%{_sysconfdir}/avahi/avahi-autoipd.action
%{_sysconfdir}/avahi/services/*.service
%{_sysconfdir}/avahi/hosts
%{_sbindir}/avahi-daemon
%{_sbindir}/avahi-dnsconfd
%{_sbindir}/avahi-autoipd
%{_sbindir}/rcavahi-daemon
%{_sbindir}/rcavahi-dnsconfd
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_bindir}/avahi-[bpr]* %{_bindir}/avahi-[bpr]*
%{_bindir}/avahi-set-host-name %{_bindir}/avahi-set-host-name
%{_datadir}/applications/*.desktop
%{_datadir}/avahi
%{_libdir}/*avahi-client*.so.* %{_libdir}/*avahi-client*.so.*
%{_libdir}/*avahi-common*.so.* %{_libdir}/*avahi-common*.so.*
%{_libdir}/*avahi-core*.so.* %{_libdir}/*avahi-core*.so.*
%{py_sitedir}/avahi/*
%{_datadir}/avahi/*.dtd
%{_datadir}/avahi/service-types.db
%{_datadir}/avahi/service-types
%{_datadir}/avahi/interfaces/*.glade
%{_datadir}/avahi/introspection/*.introspect
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_mandir}/man1/*
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon %attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
%doc %{_mandir}/man?/*.*
%{_sbindir}/*
%dir %{_sysconfdir}/avahi
%config %{_sysconfdir}/avahi/avahi-daemon.conf
%{_sysconfdir}/avahi/avahi-dnsconfd.action
%{_sysconfdir}/avahi/avahi-autoipd.action
%dir %{_sysconfdir}/avahi/services
%{_sysconfdir}/avahi/services/*.service
%{_sysconfdir}/avahi/hosts
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/*
%{py_sitedir}/avahi
%files glib %files glib
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*avahi-glib*.so.*
%{_bindir}/avahi-discover* %{_bindir}/avahi-discover*
%{_libdir}/*avahi-glib*.so.*
%files mono %files mono
%defattr(-,root,root) %defattr(-,root,root)
%{_prefix}/lib/mono/avahi-sharp
%{_prefix}/lib/mono/gac/avahi-sharp
%{_libdir}/pkgconfig/avahi-sharp.pc %{_libdir}/pkgconfig/avahi-sharp.pc
%{_prefix}/lib/monodoc/sources/*.* %{_prefix}/lib/monodoc/sources/*.*
%{_prefix}/lib/mono/avahi-sharp
%{_prefix}/lib/mono/gac/avahi-sharp
%files qt3 %files qt3
%defattr(-,root,root) %defattr(-,root,root)
@ -453,29 +434,32 @@ rm -rf $RPM_BUILD_ROOT
%files compat-mDNSResponder %files compat-mDNSResponder
%defattr(-,root,root) %defattr(-,root,root)
# mDNSResponder uses libdns_sd.so, we need .so here. # mDNSResponder uses libdns_sd.so, we need .so in the main package.
%{_libdir}/libdns_sd.so* %{_libdir}/libdns_sd.so
%{_libdir}/libdns_sd.so.*
%files compat-mDNSResponder-devel %files compat-mDNSResponder-devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libdns_sd.*a
%{_includedir}/avahi-compat-libdns_sd %{_includedir}/avahi-compat-libdns_sd
%{_includedir}/dns_sd.h %{_includedir}/dns_sd.h
%{_libdir}/libdns_sd.*a
%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
%files compat-howl %files compat-howl
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libhowl.so* %{_libdir}/libhowl.so.*
%files compat-howl-devel %files compat-howl-devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libhowl.*a
%{_includedir}/avahi-compat-howl %{_includedir}/avahi-compat-howl
%{_includedir}/howl.h %{_includedir}/howl.h
%{_libdir}/libhowl.so
%{_libdir}/libhowl.*a
%{_libdir}/pkgconfig/avahi-compat-howl.pc %{_libdir}/pkgconfig/avahi-compat-howl.pc
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
# FIXME: Maybe split to particular subpackages.
#%doc doc/api/html #%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO #%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
%{_includedir}/avahi-client %{_includedir}/avahi-client
@ -504,6 +488,28 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/avahi-qt4.pc %{_libdir}/pkgconfig/avahi-qt4.pc
%changelog -n avahi %changelog -n avahi
* Wed Jan 24 2007 - sbrabec@suse.cz
- Updated to version 0.6.16 (CVE-2006-5461, CVE-2006-6870):
* Revert previous patch to check nlmsg_pid as it is bogus and
breaks in many cases, notably when using NetworkManager.
* Replace with new SO_PASSCRED-based check of the sending UID
which seems to work better.
* Handle some errors in libdns_sd more gracefully the way the real
libdns_sd does
* Apply fix for Linux 2.6.19+ where IFA_RTA / IFLA_RTA is no
longer defined
* Fix doxygen comments for avahi watch
* Make d-bus version detection work for >= 1.0
* Dont dbus_connection_close on shared dbus connections
* Fix potential endless loop in dns label unpacking code
* Fix bogus assertion in client-publish-service.c example
* Mild fix to some doxygen docs for avahi-common/address.h
* Fix passing in custom priviledged group (previously ignored
setting)
* Check that netlink messages actually originate from the kernel
and not another process.
* Fix dbus_service_browser not setting
AVAHI_LOOKUP_RESULT_OUR_OWN.
* Sun Jan 21 2007 - dmueller@suse.de * Sun Jan 21 2007 - dmueller@suse.de
-compat-mDNSResponder-devel should require avahi-devel -compat-mDNSResponder-devel should require avahi-devel
* Sat Jan 20 2007 - aj@suse.de * Sat Jan 20 2007 - aj@suse.de