For dbus and openssl, did you test them by yourself? They are so fundmental packages we must be careful on this.
If possible, please attach changelog of upstream here. Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Fathi Boudra > Sent: Tuesday, January 04, 2011 2:49 PM > To: [email protected] > Subject: [meego-commits] 11385: Changes to Trunk:Testing/dbus > > Hi, > I have made the following changes to dbus in project Trunk:Testing. Please > review and accept ASAP. > > Thank You, > Fathi Boudra > > [This message was auto-generated] > > --- > > Request #11385: > > submit: home:boudra:branches:devel:base/dbus(r5) -> > Trunk:Testing/dbus > > > Message: > * Fri Dec 31 2010 Fathi Boudra <[email protected]> - 1.4.1 > - Update to 1.4.1 > - Fix CVE 2010-4352: Reject deeply nested variants (BMC#11884) > - Remove 00-start-message-bus.sh from the Source list (unused) > - Fix case, it should be "D-Bus" instead of "D-BUS" > - Add doxygen BuildRequires and enable doxygen documentation > - Remove useless or unused variables > - Convert the spec file to yaml file > > State: new 2011-01-03T22:49:10 boudra > Comment: None > > > > changes files: > -------------- > --- dbus.changes > +++ dbus.changes > @@ -0,0 +1,9 @@ > +* Fri Dec 31 2010 Fathi Boudra <[email protected]> - 1.4.1 > +- Update to 1.4.1 > +- Fix CVE 2010-4352: Reject deeply nested variants (BMC#11884) > +- Remove 00-start-message-bus.sh from the Source list (unused) > +- Fix case, it should be "D-Bus" instead of "D-BUS" > +- Add doxygen BuildRequires and enable doxygen documentation > +- Remove useless or unused variables > +- Convert the spec file to yaml file > + > > old: > ---- > 00-start-message-bus.sh > dbus-1.4.0.tar.gz > > new: > ---- > dbus-1.4.1.tar.gz > dbus.yaml > > spec files: > ----------- > --- dbus.spec > +++ dbus.spec > @@ -1,178 +1,233 @@ > -#specfile originally created for Fedora, modified for Moblin Linux > -%define gettext_package dbus > -%define expat_version 1.95.5 > +# > +# Do NOT Edit the Auto-generated Part! > +# Generated by: spectacle version 0.21 > +# > +# >> macros > %define dbus_user_uid 81 > +# << macros > > -Summary: D-BUS message bus > Name: dbus > -Version: 1.4.0 > -Release: 5 > -URL: http://www.freedesktop.org/software/dbus/ > -Source0: > http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz > -Source2: 00-start-message-bus.sh > -License: GPLv2+ or AFL > +Summary: D-Bus message bus > +Version: 1.4.1 > +Release: 1 > Group: System/Libraries > -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root > - > -BuildRequires: libtool > -BuildRequires: expat-devel >= %{expat_version} > -BuildRequires: libX11-devel > -BuildRequires: libcap-devel > -BuildRequires: gettext > -BuildRequires: fastinit > - > -Requires: dbus-libs = %{version}-%{release} > +License: GPLv2+ or AFL > +URL: http://www.freedesktop.org/software/dbus/ > +Source0: > http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz > +Source100: dbus.yaml > +Patch0: start-early.patch > +Patch1: dbus-1.0.1-generate-xml-docs.patch > +Requires: %{name}-libs = %{version} > Requires(pre): /usr/sbin/useradd > Requires(preun): /sbin/service > +BuildRequires: pkgconfig(x11) > +BuildRequires: doxygen > +BuildRequires: expat-devel >= 1.95.5 > +BuildRequires: fastinit > +BuildRequires: gettext > +BuildRequires: libcap-devel > +BuildRequires: libtool > > -Patch0: start-early.patch > -Patch1: dbus-1.0.1-generate-xml-docs.patch > > %description > -D-BUS is a system for sending messages between applications. It is > -used both for the systemwide message bus service, and as a > -per-user-login-session messaging facility. > +D-Bus is a system for sending messages between applications. It is used both > +for the systemwide message bus service, and as a per-user-login-session > +messaging facility. > + > + > > %package libs > -Summary: Libraries for accessing D-BUS > +Summary: Libraries for accessing D-Bus > Group: System/Libraries > -Requires: %name = %{version}-%{release} > +Requires: %{name} = %{version}-%{release} > +Requires(post): /sbin/ldconfig > +Requires(postun): /sbin/ldconfig > > %description libs > -Lowlevel libraries for accessing D-BUS > +Lowlevel libraries for accessing D-Bus. > > %package doc > -Summary: Developer documentation for D-BUS > +Summary: Developer documentation for D-Bus > Group: Documentation > -Requires: %name = %{version}-%{release} > +Requires: %{name} = %{version}-%{release} > > %description doc > This package contains DevHelp developer documentation for D-Bus along with > -other supporting documentation such as the introspect dtd file > +other supporting documentation such as the introspect dtd file. > + > > %package devel > -Summary: Libraries and headers for D-BUS > +Summary: Libraries and headers for D-Bus > Group: Development/Libraries > -Requires: %name = %{version}-%{release} > +Requires: %{name} = %{version}-%{release} > Requires: pkgconfig > > %description devel > -Headers and static libraries for D-BUS. > +Headers and static libraries for D-Bus. > > %package x11 > -Summary: X11-requiring add-ons for D-BUS > -Group: System/Tools > -Requires: %name = %{version}-%{release} > +Summary: X11-requiring add-ons for D-Bus > +Group: System/X11 > +Requires: %{name} = %{version}-%{release} > > %description x11 > +D-Bus contains some tools that require Xlib to be installed, those are in > this > +separate package so server systems need not install X. > > -D-BUS contains some tools that require Xlib to be installed, those are > -in this separate package so server systems need not install X. > > -%prep > -%setup -q > > +%prep > +%setup -q -n %{name}-%{version} > > -%patch0 -p1 -b .start-early > -%patch1 -p1 -b .generate-xml-docs > +# start-early.patch > +%patch0 -p1 > +# dbus-1.0.1-generate-xml-docs.patch > +%patch1 -p1 > +# >> setup > +# << setup > > %build > -# For some reason upstream ships these files as executable > -# Make sure they are not > -/bin/chmod 0644 COPYING ChangeLog NEWS > - > -COMMON_ARGS="--enable-libaudit=no -enable-selinux=no > --with-init-scripts=redhat > --with-system-pid-file=%{_localstatedir}/run/messagebus.pid > --with-dbus-user=dbus --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc > --exec-prefix=/ --libexecdir=/%{_lib}/dbus-1" > - > -# leave verbose mode so people can debug their apps but make sure to > -# turn it off on stable releases with --disable-verbose-mode > -%reconfigure $COMMON_ARGS --disable-tests --disable-asserts > --disable-doxygen-docs --disable-xml-docs > -make > +# >> build pre > +# << build pre > > +%reconfigure --disable-static \ > + --exec-prefix=/ \ > + --bindir=/bin \ > + --libexecdir=/%{_lib}/dbus-1 \ > + --sysconfdir=/etc \ > + --libdir=/%{_lib} \ > + --disable-tests \ > + --disable-asserts \ > + --disable-xml-docs \ > + --enable-doxygen-docs \ > + --disable-selinux \ > + --disable-libaudit \ > + --with-init-scripts=redhat \ > + --with-system-pid-file=%{_localstatedir}/run/messagebus.pid \ > + --with-dbus-user=dbus > + > +make %{?jobs:-j%jobs} > + > +# >> build post > +# << build post > %install > rm -rf %{buildroot} > +# >> install pre > +# << install pre > %make_install > -mkdir -p %{buildroot}/%{_libdir}/pkgconfig > > -#change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64] > -sed -e > 's...@-i${libdir}@-I${prefix}/%{_lib}@' > %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc > +# >> install post > +mkdir -p %{buildroot}%{_libdir}/pkgconfig > +# Change the arch-deps.h include directory to /usr/lib instead of /lib > +sed -e > 's...@-i${libdir}@-I${prefix}/%{_lib}@' > %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > > %{buildroot}%{_libdir}/pkgconfig/dbus-1.pc > rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > > -mkdir -p %{buildroot}/%{_bindir} > +mkdir -p %{buildroot}%{_bindir} > +mv -f %{buildroot}/bin/dbus-launch %{buildroot}%{_bindir} > > -mv -f %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir} > -mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/ > -mv > -f %{buildroot}/%{_lib}/dbus-1.0/include/* > %{buildroot}/%{_libdir}/dbus-1.0/inclu > de/ > +mkdir -p %{buildroot}%{_libdir}/dbus-1.0/include/ > +mv > -f %{buildroot}/%{_lib}/dbus-1.0/include/* > %{buildroot}%{_libdir}/dbus-1.0/inclu > de/ > rm -rf %{buildroot}/%{_lib}/dbus-1.0 > > mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces > - > -%clean > -rm -rf %{buildroot} > +# << install post > > %pre > +# >> pre > # Add the "dbus" user and group > [ -e /usr/sbin/groupadd ] && /usr/sbin/groupadd -r -g %{dbus_user_uid} dbus > 2>/dev/null || : > [ -e /usr/sbin/useradd ] && /usr/sbin/useradd -c 'System message bus' > -u %{dbus_user_uid} \ > - -g %{dbus_user_uid} -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : > +-g %{dbus_user_uid} -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : > +# << pre > > %preun > +# >> preun > if [ $1 -eq 0 ]; then > - [ -e /sbin/service ] && /sbin/service messagebus stop > +[ -e /sbin/service ] && /sbin/service messagebus stop > fi > +# << preun > + > + > + > + > > %post libs -p /sbin/ldconfig > > %postun libs -p /sbin/ldconfig > > + > + > + > + > + > + > + > + > + > %files > -%defattr(-,root,root) > +%defattr(-,root,root,-) > %doc COPYING > -%dir %{_sysconfdir}/dbus-1 > -%config(noreplace) %{_sysconfdir}/dbus-1/*.conf > -%{_sysconfdir}/rc.d/init.d/* > -%dir %{_sysconfdir}/dbus-1/system.d > -%dir %{_sysconfdir}/dbus-1/session.d > -%dir %{_localstatedir}/run/dbus > -%dir %{_localstatedir}/lib/dbus/ > -/bin/dbus-daemon > -/bin/dbus-send > /bin/dbus-cleanup-sockets > +/bin/dbus-daemon > /bin/dbus-monitor > +/bin/dbus-send > /bin/dbus-uuidgen > -%doc %{_mandir}/man*/dbus-cleanup-sockets.1.gz > -%doc %{_mandir}/man*/dbus-daemon.1.gz > -%doc %{_mandir}/man*/dbus-monitor.1.gz > -%doc %{_mandir}/man*/dbus-send.1.gz > -%doc %{_mandir}/man*/dbus-uuidgen.1.gz > -%doc %{_mandir}/man*/dbus-launch.1.gz > +%dir %{_sysconfdir}/dbus-1 > +%config(noreplace) %{_sysconfdir}/dbus-1/session.conf > +%dir %{_sysconfdir}/dbus-1/session.d > +%config(noreplace) %{_sysconfdir}/dbus-1/system.conf > +%dir %{_sysconfdir}/dbus-1/system.d > +%{_sysconfdir}/rc.d/init.d/messagebus > +%dir /%{_lib}/dbus-1 > +%attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper > %dir %{_datadir}/dbus-1 > +%{_datadir}/dbus-1/interfaces > %{_datadir}/dbus-1/services > %{_datadir}/dbus-1/system-services > -%{_datadir}/dbus-1/interfaces > -%dir /%{_lib}/dbus-1 > -# See doc/system-activation.txt in source tarball for the rationale > -# behind these permissions > -%attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper > +%doc %{_mandir}/man1/dbus-cleanup-sockets.1.gz > +%doc %{_mandir}/man1/dbus-daemon.1.gz > +%doc %{_mandir}/man1/dbus-monitor.1.gz > +%doc %{_mandir}/man1/dbus-send.1.gz > +%doc %{_mandir}/man1/dbus-uuidgen.1.gz > +%dir %{_localstatedir}/run/dbus > +%dir %{_localstatedir}/lib/dbus > +# >> files > +# << files > > > %files libs > %defattr(-,root,root,-) > -/%{_lib}/*dbus-1*.so.* > - > - > -%files x11 > -%defattr(-,root,root) > -%{_bindir}/dbus-launch > -%{_datadir}/man/man*/dbus-launch.1.gz > +/%{_lib}/libdbus-1.so.3* > +# >> files libs > +# << files libs > > %files doc > -%defattr(-,root,root) > -%doc doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt > +%defattr(-,root,root,-) > +%doc doc/api/html > +%doc doc/dbus-faq.html > +%doc doc/dbus-specification.html > +%doc doc/dbus-test-plan.html > +%doc doc/dbus-tutorial.html > +%doc doc/introspect.dtd > +%doc doc/introspect.xsl > +%doc doc/system-activation.txt > +# >> files doc > +# << files doc > > %files devel > -%defattr(-,root,root) > -/%{_lib}/lib*.so > +%defattr(-,root,root,-) > +/%{_lib}/libdbus-1.so > +%{_includedir}/dbus-1.0/dbus/dbus*.h > %dir %{_libdir}/dbus-1.0 > -%{_libdir}/dbus-1.0/include/ > +%{_libdir}/dbus-1.0/include/dbus/dbus-arch-deps.h > %{_libdir}/pkgconfig/dbus-1.pc > -%{_includedir}/* > +# >> files devel > +# << files devel > + > +%files x11 > +%defattr(-,root,root,-) > +%{_bindir}/dbus-launch > +%doc %{_mandir}/man1/dbus-launch.1.gz > +# >> files x11 > +# << files x11 > + > > other changes: > -------------- > > ++++++ dbus-1.4.0.tar.gz -> dbus-1.4.1.tar.gz > 38283 lines of diff (skipped) > > ++++++ dbus.yaml (new) > --- dbus.yaml > +++ dbus.yaml > +Name: dbus > +Summary: D-Bus message bus > +Version: 1.4.1 > +Release: 1 > +Group: System/Libraries > +License: GPLv2+ or AFL > +URL: http://www.freedesktop.org/software/dbus/ > +Sources: > + - > "http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz"; > +Patches: > + - start-early.patch > + - dbus-1.0.1-generate-xml-docs.patch > +Description: | > + D-Bus is a system for sending messages between applications. It is used > both > + for the systemwide message bus service, and as a per-user-login-session > + messaging facility. > +Requires: > + - "%{name}-libs = %{version}" > +RequiresPre: > + - /usr/sbin/useradd > +RequiresPreUn: > + - /sbin/service > +PkgBR: > + - doxygen > + - expat-devel >= 1.95.5 > + - fastinit > + - gettext > + - libcap-devel > + - libtool > +PkgConfigBR: > + - x11 > +Configure: reconfigure > +ConfigOptions: > + - --exec-prefix=/ > + - --bindir=/bin > + - --libexecdir=/%{_lib}/dbus-1 > + - --sysconfdir=/etc > + - --libdir=/%{_lib} > + - --disable-tests > + - --disable-asserts > + - --disable-xml-docs > + - --enable-doxygen-docs > + - --disable-selinux > + - --disable-libaudit > + - --with-init-scripts=redhat > + - --with-system-pid-file=%{_localstatedir}/run/messagebus.pid > + - --with-dbus-user=dbus > +Builder: make > +Files: > + - "%doc COPYING" > + - "/bin/dbus-cleanup-sockets" > + - "/bin/dbus-daemon" > + - "/bin/dbus-monitor" > + - "/bin/dbus-send" > + - "/bin/dbus-uuidgen" > + - "%dir %{_sysconfdir}/dbus-1" > + - "%config(noreplace) %{_sysconfdir}/dbus-1/session.conf" > + - "%dir %{_sysconfdir}/dbus-1/session.d" > + - "%config(noreplace) %{_sysconfdir}/dbus-1/system.conf" > + - "%dir %{_sysconfdir}/dbus-1/system.d" > + - "%{_sysconfdir}/rc.d/init.d/messagebus" > + - "%dir /%{_lib}/dbus-1" > +# See doc/system-activation.txt in source tarball for the rationale behind > +# these permissions > + - "%attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper" > + - "%dir %{_datadir}/dbus-1" > + - "%{_datadir}/dbus-1/interfaces" > + - "%{_datadir}/dbus-1/services" > + - "%{_datadir}/dbus-1/system-services" > + - "%doc %{_mandir}/man1/dbus-cleanup-sockets.1.gz" > + - "%doc %{_mandir}/man1/dbus-daemon.1.gz" > + - "%doc %{_mandir}/man1/dbus-monitor.1.gz" > + - "%doc %{_mandir}/man1/dbus-send.1.gz" > + - "%doc %{_mandir}/man1/dbus-uuidgen.1.gz" > + - "%dir %{_localstatedir}/run/dbus" > + - "%dir %{_localstatedir}/lib/dbus" > +SubPackages: > + - Name: libs > + Summary: Libraries for accessing D-Bus > + Group: System/Libraries > + Description: Lowlevel libraries for accessing D-Bus. > + Files: > + - "/%{_lib}/libdbus-1.so.3*" > + > + - Name: doc > + Summary: Developer documentation for D-Bus > + Group: Documentation > + Description: | > + This package contains DevHelp developer documentation for > D-Bus along with > + other supporting documentation such as the introspect dtd file. > + Files: > + - "%doc doc/api/html" > + - "%doc doc/dbus-faq.html" > + - "%doc doc/dbus-specification.html" > + - "%doc doc/dbus-test-plan.html" > + - "%doc doc/dbus-tutorial.html" > + - "%doc doc/introspect.dtd" > + - "%doc doc/introspect.xsl" > + - "%doc doc/system-activation.txt" > + > + - Name: devel > + Summary: Libraries and headers for D-Bus > + Group: Development/Libraries > + Description: Headers and static libraries for D-Bus. > + Files: > + - "/%{_lib}/libdbus-1.so" > + - "%{_includedir}/dbus-1.0/dbus/dbus*.h" > + - "%dir %{_libdir}/dbus-1.0" > + - "%{_libdir}/dbus-1.0/include/dbus/dbus-arch-deps.h" > + - "%{_libdir}/pkgconfig/dbus-1.pc" > + Requires: > + - pkgconfig > + > + - Name: x11 > + Summary: X11-requiring add-ons for D-Bus > + Group: System/X11 > + Description: | > + D-Bus contains some tools that require Xlib to be installed, those > are in this > + separate package so server systems need not install X. > + Files: > + - "%{_bindir}/dbus-launch" > + - "%doc %{_mandir}/man1/dbus-launch.1.gz" > > ++++++ deleted files: > --- 00-start-message-bus.sh > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
