I have made the following changes intended for : CE:MW:Shared / libdsme CE:MW:Shared / dsme CE:MW:Shared / mce
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7390 Thank You, Pekka Lundstrom [This message was auto-generated] --- Request # 7390: Messages from BOSS: State: review at 2012-11-16T09:02:19 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:plundstr:branches:CE:MW:Shared / libdsme -> CE:MW:Shared / libdsme changes files: -------------- --- libdsme.changes +++ libdsme.changes @@ -0,0 +1,6 @@ +* Thu Nov 15 2012 Pekka Lundstrom <[email protected]> - 0.61.7 +- Added default location to dsme socket (/run/dsme.socket) + Fixes NEMO#571 : dsme socket should be defined in libdsme properly +- Git location moved to https://github.com/nemomobile/libdsme + Fixes NEMO#574 : git location for libdsme should be same as for dsme + old: ---- libdsme-0.61.6-move-socket-to-run.patch libdsme-0.61.6.tar.bz2 new: ---- libdsme-0.61.7.tar.bz2 spec files: ----------- --- libdsme.spec +++ libdsme.spec @@ -1,31 +1,30 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: libdsme + # >> macros # << macros -Name: libdsme Summary: DSME dsmesock dynamic library -Version: 0.61.6 +Version: 0.61.7 Release: 0 Group: System/System Control License: LGPL -URL: http://meego.gitorious.org/meego-middleware/libdsme +URL: https://github.com/nemomobile/libdsme Source0: %{name}-%{version}.tar.bz2 Source100: libdsme.yaml -Patch0: libdsme-0.61.6-move-socket-to-run.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(glib-2.0) - %description This package contains dynamic libraries for programs that communicate with the Device State Management Entity. - %package devel Summary: Development files for dsme Group: Development/Libraries @@ -40,8 +39,6 @@ %prep %setup -q -n %{name}-%{version} -# libdsme-0.61.6-move-socket-to-run.patch -%patch0 -p1 # >> setup # << setup @@ -55,6 +52,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -67,15 +65,10 @@ # << install post - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - %files %defattr(-,root,root,-) # >> files @@ -86,7 +79,6 @@ %doc COPYING # << files - %files devel %defattr(-,root,root,-) # >> files devel @@ -96,4 +88,3 @@ %{_libdir}/libthermalmanager_dbus_if.so %{_libdir}/pkgconfig/* # << files devel - other changes: -------------- ++++++ libdsme-0.61.6.tar.bz2 -> libdsme-0.61.7.tar.bz2 --- debian/control +++ debian/control @@ -1,7 +1,7 @@ Source: libdsme Section: misc Priority: optional -Maintainer: Semi Malinen <[email protected]> +Maintainer: Antti Virtanen <[email protected]> Uploaders: Ismo Laitinen <[email protected]>, David Weinehall <[email protected]>, Philippe De Swert <[email protected]> Build-Depends: debhelper (>= 4.1.0), pkg-config, --- dsme.pc +++ dsme.pc @@ -4,7 +4,7 @@ Name: dsme Description: DSME dsmesock dynamic library -Version: 0.61.6 +Version: 0.61.7 Requires: Libs: -L${libdir} -ldsme Cflags: -I${includedir} --- dsme_dbus_if.pc +++ dsme_dbus_if.pc @@ -4,7 +4,7 @@ Name: dsme_dbus_if Description: DSME D-Bus interface dynamic library -Version: 0.61.6 +Version: 0.61.7 Requires: Libs: -L${libdir} -ldsme_dbus_if Cflags: -I${includedir} --- include/dsme/protocol.h +++ include/dsme/protocol.h @@ -153,4 +153,9 @@ EXTERN_C const struct ucred* dsmesock_getucred(dsmesock_connection_t* conn); +/** + Holds path to dsme socket default location +*/ +EXTERN_C const char* dsmesock_default_location; + #endif --- protocol.c +++ protocol.c @@ -43,6 +43,7 @@ static GSList* connections = 0; +const char* dsmesock_default_location = "/run/dsme.socket"; dsmesock_connection_t* dsmesock_connect(void) { @@ -52,8 +53,8 @@ const char* dsmesock_filename = NULL; dsmesock_filename = getenv("DSME_SOCKFILE"); - if (!dsmesock_filename) { - dsmesock_filename = "/tmp/dsmesock"; + if (dsmesock_filename == 0 || *dsmesock_filename == '\0') { + dsmesock_filename = dsmesock_default_location; } if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) != -1) { --- thermalmanager_dbus_if.pc +++ thermalmanager_dbus_if.pc @@ -4,7 +4,7 @@ Name: thermalmanager_dbus_if Description: Thermal Manager D-Bus interface dynamic library -Version: 0.61.6 +Version: 0.61.7 Requires: Libs: -L${libdir} -lthermalmanager_dbus_if Cflags: -I${includedir} ++++++ libdsme.yaml --- libdsme.yaml +++ libdsme.yaml @@ -1,14 +1,12 @@ Name: libdsme Summary: DSME dsmesock dynamic library -Version: 0.61.6 +Version: 0.61.7 Release: 0 Group: System/System Control License: LGPL -URL: http://meego.gitorious.org/meego-middleware/libdsme +URL: https://github.com/nemomobile/libdsme Sources: - "%{name}-%{version}.tar.bz2" -Patches: - - libdsme-0.61.6-move-socket-to-run.patch Description: | This package contains dynamic libraries for programs that communicate with the Device State Management Entity. ++++++ deleted files: --- libdsme-0.61.6-move-socket-to-run.patch submit: home:plundstr:branches:CE:MW:Shared / dsme -> CE:MW:Shared / dsme changes files: -------------- --- dsme.changes +++ dsme.changes @@ -0,0 +1,4 @@ +* Fri Nov 16 2012 Pekka Lundstrom <[email protected]> - 0.62.7 +- Default location for dsme socket is taken from libdsme + Fixes NEMO#575 : dsme should use same default location for its socket as libdsme + old: ---- dsme-0.62.6.tar.gz new: ---- dsme-0.62.7.tar.gz spec files: ----------- --- dsme.spec +++ dsme.spec @@ -9,7 +9,7 @@ # << macros Summary: Device State Management Entity -Version: 0.62.6 +Version: 0.62.7 Release: 0 Group: System/System Control License: LGPLv2+ @@ -30,6 +30,7 @@ BuildRequires: pkgconfig(systemd) BuildRequires: python BuildRequires: libcreds2-devel +BuildRequires: libdsme-devel %description Device State Management Entity (with debug symbols). This package contains the Device State Management Entity which provides state management features such as service monitoring, process watchdog and inactivity tracking. other changes: -------------- ++++++ dsme-0.62.6.tar.gz -> dsme-0.62.7.tar.gz --- configure.ac +++ configure.ac @@ -1,5 +1,5 @@ # Package name and version -AC_INIT(dsme, 0.62.6) +AC_INIT(dsme, 0.62.7) AM_INIT_AUTOMAKE --- dsme/dsmesock.c +++ dsme/dsmesock.c @@ -77,7 +77,7 @@ dsmesock_filename = getenv("DSME_SOCKFILE"); if (dsmesock_filename == 0 || *dsmesock_filename == '\0') { - dsmesock_filename = "/tmp/dsmesock"; + dsmesock_filename = dsmesock_default_location; } memset(&laddr, 0, sizeof(laddr)); ++++++ dsme.service --- dsme.service +++ dsme.service @@ -4,7 +4,6 @@ [Service] Type=notify -Environment=DSME_SOCKFILE=/run/dsme.socket Environment=BOOTSTATE=USER ExecStart=/usr/sbin/dsme -p /usr/lib/dsme/libstartup.so --systemd Restart=always ++++++ dsme.yaml --- dsme.yaml +++ dsme.yaml @@ -1,6 +1,6 @@ Name: dsme Summary: Device State Management Entity -Version: 0.62.6 +Version: 0.62.7 Release: 0 Group: System/System Control License: LGPLv2+ @@ -35,6 +35,7 @@ PkgBR: - python - libcreds2-devel + - libdsme-devel UseAsNeeded: no submit: home:plundstr:branches:CE:MW:Shared / mce -> CE:MW:Shared / mce changes files: -------------- --- mce.changes +++ mce.changes @@ -0,0 +1,4 @@ +* Fri Nov 16 2012 Pekka Lundstrom <[email protected]> - 1.12.3 +- Removed dsme socket location from mce.service + Fixes NEMO#576 : mce should not define dsme socket location + spec files: ----------- other changes: -------------- ++++++ mce.service --- mce.service +++ mce.service @@ -5,7 +5,6 @@ After=dsme.service [Service] -Environment=DSME_SOCKFILE=/run/dsme.socket ExecStart=/sbin/mce Restart=always
