diff options
| author | Eugene V. Lyubimkin <jackyf@debian.org> | 2012-07-30 19:12:16 +0300 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:31 +0200 |
| commit | a3ff14ad00cd9d4082fec909920ec4a0651e36e0 (patch) | |
| tree | 2ba05c4ae454bde7046342fd9c2f2259d056d0a2 | |
| parent | 283008ba7667dcbd771707c7245e6d42acd72478 (diff) | |
| download | debian_htop-a3ff14ad00cd9d4082fec909920ec4a0651e36e0.tar.gz debian_htop-a3ff14ad00cd9d4082fec909920ec4a0651e36e0.tar.bz2 debian_htop-a3ff14ad00cd9d4082fec909920ec4a0651e36e0.zip | |
Imported Debian patch 1.0.1-2debian/1.0.1-2
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/200-dont-delete-htoprc-if-symlink.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8fee630..c601794 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +htop (1.0.1-2) unstable; urgency=low + + * debian/patches: + - New patch 200-dont-delete-htoprc-if-symlink.patch from upstream VCS. + (Closes: #662087) + + -- Eugene V. Lyubimkin <jackyf@debian.org> Mon, 30 Jul 2012 19:12:16 +0300 + htop (1.0.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/200-dont-delete-htoprc-if-symlink.patch b/debian/patches/200-dont-delete-htoprc-if-symlink.patch new file mode 100644 index 0000000..982d87b --- /dev/null +++ b/debian/patches/200-dont-delete-htoprc-if-symlink.patch @@ -0,0 +1,17 @@ +Taken from upstream: http://htop.svn.sourceforge.net/viewvc/htop/trunk/Settings.c?view=patch&r1=286&r2=285&pathrev=286 + +Don't delete an old .htoprc if it's a symlink. + +--- trunk/Settings.c 2012/02/17 13:45:58 285 ++++ trunk/Settings.c 2012/03/05 11:12:58 286 +@@ -239,7 +239,9 @@ + mkdir(htopDir, 0700); + free(htopDir); + free(configDir); +- if (access(legacyDotfile, R_OK) != 0) { ++ struct stat st; ++ lstat(legacyDotfile, &st); ++ if (access(legacyDotfile, R_OK) != 0 || S_ISLNK(st.st_mode)) { + free(legacyDotfile); + legacyDotfile = NULL; + } diff --git a/debian/patches/series b/debian/patches/series index c8aa567..6c4f8a8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +200-dont-delete-htoprc-if-symlink.patch 600-openvz-veid-on-kernels-gt-2.6.18.patch 700-ltrace-support.patch |