Hello community, here is the log from the commit of package icecream for openSUSE:Factory checked in at 2013-07-16 18:37:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icecream (Old) and /work/SRC/openSUSE:Factory/.icecream.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icecream" Changes: -------- --- /work/SRC/openSUSE:Factory/icecream/icecream.changes 2013-07-05 15:04:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icecream.new/icecream.changes 2013-07-16 18:37:09.000000000 +0200 @@ -1,0 +2,30 @@ +Tue Jul 16 13:50:09 UTC 2013 - [email protected] + +- handle $HOME not being set: + 0001-handle-HOME-not-being-set.patch + +------------------------------------------------------------------- +Sat Jun 29 08:10:09 UTC 2013 - [email protected] + +- update to 1.0.1 + - use su option for logrotate + - require logrotate for suse package + - Remove filenames from md5sum output + - Fix off-by-one error + - add missing cap-ng.m4 + - uninstall also SUSE-specific files when uninstalling + - install COPYING, README.md and NEWS as useful user documentation + - use m4/ and ship cap-ng.m4 there + - if -lcap-ng is needed for icecc.a, add it to .pc file (for icemon) + - libicecream-devel may require libcap-ng-devel + - fix icecc-create-env with clang 3.3+ + - fix /var/run/icecc handling + - make sure to not hide e.g. SEGV from a tool with exit code 0 + - detect bad_alloc as out-of-memory + - add "[Cc]annot allocate memory" to the list of OOM error messages + - Detect gcc "out of memory allocating" as EXIT_OUT_OF_MEMORY. Closes #49 + - Avoid symlinks in the absolute paths + - swap arguments for kill() call, since pid is the first argument +- remove fix-startup.patch, cap-ng-link.patch + +------------------------------------------------------------------- Old: ---- cap-ng-link.patch fix-startup.patch icecc-1.0.0.tar.bz2 New: ---- 0001-handle-HOME-not-being-set.patch icecc-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecream.spec ++++++ --- /var/tmp/diff_new_pack.27bOvn/_old 2013-07-16 18:37:10.000000000 +0200 +++ /var/tmp/diff_new_pack.27bOvn/_new 2013-07-16 18:37:10.000000000 +0200 @@ -35,14 +35,13 @@ PreReq: /usr/sbin/useradd PreReq: /usr/sbin/groupadd Requires: gcc-c++ -Version: 1.0.0 +Requires: logrotate +Version: 1.0.1 Release: 0 Source0: ftp://ftp.suse.com/pub/projects/icecream/icecc-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -# PATCH-FIX-UPSTREAM 5aa24f5ea8aa855717d66cdab930bc787fbf355c -Patch1: cap-ng-link.patch -# PATCH-FIX-UPSTREAM 714e64160f2002693d760b1144f7ece8b74fd203 -Patch2: fix-startup.patch +# PATCH-FIX-UPSTREAM 0db4080dccd62209002c3a51cbdd350a2951ad82 +Patch1: 0001-handle-HOME-not-being-set.patch %description icecream is the next generation distcc. @@ -72,7 +71,6 @@ %setup -q -n icecc-%{version} # DO NOT ADD PATCHES without github reference %patch1 -p1 -%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ 0001-handle-HOME-not-being-set.patch ++++++ >From 6f79da339b3fd946b46932d61f30a117918de7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <[email protected]> Date: Tue, 16 Jul 2013 15:46:06 +0200 Subject: [PATCH] handle $HOME not being set --- client/main.cpp | 2 +- daemon/main.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/main.cpp b/client/main.cpp index d72ce9d..638dbda 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -335,7 +335,7 @@ int main(int argc, char **argv) if (!local_daemon) local_daemon = Service::createChannel( "/var/run/iceccd.socket" ); - if (!local_daemon) { + if (!local_daemon && getenv("HOME")) { string path = getenv("HOME"); path += "/.iceccd.socket"; local_daemon = Service::createChannel( path ); diff --git a/daemon/main.cpp b/daemon/main.cpp index 28ec158..5d7e430 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -553,9 +553,14 @@ bool Daemon::setup_listen_fds() unlink(myaddr.sun_path); old_umask = umask(0); } else { // Started by user. - strncpy(myaddr.sun_path, getenv("HOME"), sizeof(myaddr.sun_path)-1); - strncat(myaddr.sun_path, "/.iceccd.socket", sizeof(myaddr.sun_path)-1-strlen(myaddr.sun_path)); - unlink(myaddr.sun_path); + if( getenv( "HOME" )) { + strncpy(myaddr.sun_path, getenv("HOME"), sizeof(myaddr.sun_path)-1); + strncat(myaddr.sun_path, "/.iceccd.socket", sizeof(myaddr.sun_path)-1-strlen(myaddr.sun_path)); + unlink(myaddr.sun_path); + } else { + log_error() << "launched by user, but $HOME not set" << endl; + return false; + } } if (bind(unix_listen_fd, (struct sockaddr*)&myaddr, sizeof(myaddr)) < 0) { -- 1.8.1.4 ++++++ icecc-1.0.0.tar.bz2 -> icecc-1.0.1.tar.bz2 ++++++ ++++ 18228 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
