[meego-packaging] [meego-commits] 7363: Changes to Trunk:Testing/timed

[Tapio Rantala]

I marked it now. Security concerns are being addressed but not properly
fixed yet in this upload. They will be in the next one (fix has already
been written). But heart of the BMC#6174 is not security.

--
Tapio Rantala


pe, 2010-09-10 kello 18:55 +0200, ext Zhu, Peter J kirjoitti:
> Does this fix BMC#6174? I didn't see you set it Resolved/Fixed and Auke/Arjan had some security concern.
> 
> Peter
> 
> > -----Original Message-----
> > From: meego-commits-bounces at meego.com
> > [mailto:meego-commits-bounces at meego.com] On Behalf Of Tapio Rantala
> > Sent: Tuesday, September 07, 2010 8:57 PM
> > To: meego-commits at meego.com
> > Subject: [meego-commits] 7363: Changes to Trunk:Testing/timed
> > 
> > Hi,
> > I have made the following changes to timed in project Trunk:Testing. Please
> > review and accept ASAP.
> > 
> > Thank You,
> > Tapio Rantala
> > 
> > [This message was auto-generated]
> > 
> > ---
> > 
> > Request #7363:
> > 
> >   submit:   home:tapioran/timed(r6) -> Trunk:Testing/timed
> > 
> > 
> > Message:
> >     Add desktop autostart file and d-bus service file (BMC#6174)
> > Create runtime data dir
> > Do not require state file
> > 
> > State:   new          2010-09-07T05:56:36 tapioran
> > Comment: None
> > 
> > 
> > 
> > changes files:
> > --------------
> > --- timed.changes
> > +++ timed.changes
> > @@ -0,0 +1,7 @@
> > +* Tue Sep 07 2010 Tapio Rantala <ext-tapio.rantala at nokia.com> 2.11-3
> > +- Add desktop autostart file and d-bus service file (BMC#6174)
> > +
> > +* Fri Sep 03 2010 Tapio Rantala <ext-tapio.rantala at nokia.com> 2.11-2
> > +- Create runtime data dir
> > +- Do not require state file
> > +
> > 
> > new:
> > ----
> >   timed-com.nokia.time.service
> >   timed-state-fix.patch
> >   timed.desktop
> > 
> > spec files:
> > -----------
> > --- timed.spec
> > +++ timed.spec
> > @@ -1,13 +1,16 @@
> >  Name:    timed
> >  Version: 2.11
> > -Release: 1
> > +Release: 3
> >  Summary: Time daemon
> >  Group:   System/Daemons
> >  License: LGPLv2
> >  URL:     http://meego.gitorious.org/meego-middleware/timed
> >  Source0: %{name}-%{version}.tar.bz2
> > +Source1: %{name}.desktop
> > +Source2: %{name}-com.nokia.time.service
> >  Patch0:  %{name}-libs-includes-fix.patch
> >  Patch1:  %{name}-create-pc-file.patch
> > +Patch2:  %{name}-state-fix.patch
> > 
> >  BuildRequires: pkgconfig(contextprovider-1.0)
> >  BuildRequires: pkgconfig(contextsubscriber-1.0)
> > @@ -62,6 +65,7 @@
> >  %setup -q
> >  %patch0 -p1
> >  %patch1 -p1
> > +%patch2 -p1
> > 
> >  %build
> >  mkdir -p src/h
> > @@ -81,7 +85,13 @@
> >  ln -s %{_bindir}/%{name} %{buildroot}/%{_bindir}/cute-timed
> >  install -m 644 -D src/doc/timed.8 %{buildroot}/%{_mandir}/man8/timed.8
> >  install -m 644 -D src/doc/libtimed.3 %{buildroot}/%{_mandir}/man3/libtimed.3
> > -install -m 644 -D
> > src/doc/libtimed-voland.3 %{buildroot}/%{_mandir}/man3/libtimed-voland.3
> > +install -m 644
> > src/doc/libtimed-voland.3 %{buildroot}/%{_mandir}/man3/libtimed-voland.3
> > +
> > +install -m 644
> > -D %{SOURCE1} %{buildroot}/%{_sysconfdir}/xdg/autostart/%{name}.desktop
> > +install -m 644
> > -D %{SOURCE2} %{buildroot}/%{_datadir}/dbus-1/services/com.nokia.time.servi
> > ce
> > +
> > +# create runtime data dir
> > +install -d %{buildroot}/%{_localstatedir}/cache/timed/
> > 
> >  %post -p /sbin/ldconfig
> > 
> > @@ -92,18 +102,21 @@
> >  %doc COPYING debian/changelog
> >  %{_sysconfdir}/osso-cud-scripts/timed-clear-device.sh
> >  %{_sysconfdir}/osso-rfs-scripts/timed-restore-original-settings.sh
> > +%{_sysconfdir}/xdg/autostart/%{name}.desktop
> >  %{_bindir}/cute-timed
> >  %{_bindir}/%{name}
> >  %{_libdir}/libtimed.so.*
> >  %{_libdir}/libtimed-voland.so.*
> >  %{_datadir}/backup-framework/applications/timedbackup.conf
> >  %{_datadir}/contextkit/providers/com.nokia.time.context
> > +%{_datadir}/dbus-1/services/com.nokia.time.service
> >  %{_mandir}/man3/libtimed.3.gz
> >  %{_mandir}/man3/libtimed-voland.3.gz
> >  %{_mandir}/man8/timed.8.gz
> >  %{_datadir}/%{name}/typeinfo/*.type
> >  %{_datadir}/tzdata-timed/*.data
> >  %{_datadir}/zoneinfo/Mobile/UTC*
> > +%{_localstatedir}/cache/timed/
> > 
> >  %files devel
> >  %defattr(-,root,root,-)
> > 
> > other changes:
> > --------------
> > 
> > ++++++ timed-com.nokia.time.service (new)
> > --- timed-com.nokia.time.service
> > +++ timed-com.nokia.time.service
> > +[D-BUS Service]
> > +Interface=com.nokia.time
> > +Name=com.nokia.time
> > +Exec=/usr/bin/timed
> > 
> > ++++++ timed-state-fix.patch (new)
> > --- timed-state-fix.patch
> > +++ timed-state-fix.patch
> > +diff --git a/src/server/timed.cpp b/src/server/timed.cpp
> > +index f215f1c..42b8baf 100644
> > +--- a/src/server/timed.cpp
> > ++++ b/src/server/timed.cpp
> > +@@ -79,17 +79,9 @@ Timed::Timed(int ac, char **av) : QCoreApplication(ac,
> > av)
> > +
> > +   if(act_dead_mode == user_mode)
> > +   {
> > +-    // some people are running it in scrachbox :(
> > +-    const char *path = getenv("PATH") ;
> > +-    bool scratchbox = path && strstr(path, "scratchbox") ;
> > +-
> > +-    bool p = user_mode ;
> > +-    log_critical("%s ACT_DEAD and USER %s present in /tmp, exitting...",
> > p?"both":"none of", p?"are":"is") ;
> > +-
> > +-    if(scratchbox)
> > +-      log_info("Do not exit: it seems we are in scratchbox") ;
> > +-    else
> > +-      ::exit(1) ;
> > ++    // ACT_DEAD and USER both or neither found, default to user
> > ++    user_mode = true;
> > ++    act_dead_mode = false;
> > +   }
> > +
> > +
> > 
> > ++++++ timed.desktop (new)
> > --- timed.desktop
> > +++ timed.desktop
> > +[Desktop Entry]
> > +Type=Application
> > +Name=Time daemon
> > +Exec=/usr/bin/timed
> > 
> > _______________________________________________
> > Meego-commits mailing list
> > Meego-commits at meego.com
> > http://lists.meego.com/listinfo/meego-commits