From 6b87f8519dc037f4fd4c19d8f36b7d7565559bd3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Jul 2012 00:01:52 +0000 Subject: Thu Jul 19 00:01:52 UTC 2012 --- ...each-symlink-to-relative-name-in-properly.patch | 135 +++++++++++++++++++++ core/coreutils/PKGBUILD | 17 +-- core/gpm/PKGBUILD | 6 +- core/gpm/gpm.service | 7 +- core/grep/PKGBUILD | 7 +- core/kbd/PKGBUILD | 10 +- 6 files changed, 157 insertions(+), 25 deletions(-) create mode 100644 core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch (limited to 'core') diff --git a/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch b/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch new file mode 100644 index 000000000..087b87cdb --- /dev/null +++ b/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch @@ -0,0 +1,135 @@ +From 6124a3842dfa8484b52e067a8ab8105c3875a4f7 Mon Sep 17 00:00:00 2001 +From: Jim Meyering +Date: Thu, 10 May 2012 19:43:00 +0200 +Subject: [PATCH] ls: color each symlink-to-relative-name in / properly + +In order for ls --color to color each symlink, it must form the name +of each referent and then stat it to see if the link is dangling, to +a directory, to a file, etc. When the symlink is to a relative name, +ls must concatenate the starting directory name and that relative name. +When, in addition, the starting directory was "/" or "/some-name", +the result was ill-formed, and the subsequent stat would usually fail, +making the caller color it as a dangling symlink. +* src/ls.c (make_link_name): Don't botch the case in which +dir_name(NAME) == "/" and LINKNAME is relative. +* tests/ls/root-rel-symlink-color: New file. Test for the above. +* tests/Makefile.am (TESTS): Add it. +* NEWS (Bug fixes): Mention it. +Reported by Mike Frysinger in http://bugs.gnu.org/11453 +Bug introduced by commit v8.16-23-gbcb9078. +--- + NEWS | 5 ++++ + src/ls.c | 9 +++++++- + tests/Makefile.am | 1 + + tests/ls/root-rel-symlink-color | 51 +++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 65 insertions(+), 1 deletion(-) + create mode 100755 tests/ls/root-rel-symlink-color + +diff --git a/NEWS b/NEWS +index 6c620b3..f9e9c70 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU coreutils NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ ls --color would mis-color relative-named symlinks in / ++ [bug introduced in coreutils-8.17] ++ + + * Noteworthy changes in release 8.17 (2012-05-10) [stable] + +diff --git a/src/ls.c b/src/ls.c +index 397e4ea..9494ae9 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -3213,7 +3213,14 @@ make_link_name (char const *name, char const *linkname) + return xstrdup (linkname); + + char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1); +- stpcpy (stpncpy (p, name, prefix_len + 1), linkname); ++ ++ /* PREFIX_LEN usually specifies a string not ending in slash. ++ In that case, extend it by one, since the next byte *is* a slash. ++ Otherwise, the prefix is "/", so leave the length unchanged. */ ++ if ( ! ISSLASH (name[prefix_len - 1])) ++ ++prefix_len; ++ ++ stpcpy (stpncpy (p, name, prefix_len), linkname); + return p; + } + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index a4370a6..0bafc5f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -449,6 +449,7 @@ TESTS = \ + ls/proc-selinux-segfault \ + ls/readdir-mountpoint-inode \ + ls/recursive \ ++ ls/root-rel-symlink-color \ + ls/rt-1 \ + ls/slink-acl \ + ls/stat-dtype \ +diff --git a/tests/ls/root-rel-symlink-color b/tests/ls/root-rel-symlink-color +new file mode 100755 +index 0000000..d795432 +--- /dev/null ++++ b/tests/ls/root-rel-symlink-color +@@ -0,0 +1,51 @@ ++#!/bin/sh ++# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/". ++ ++# Copyright (C) 2012 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++. "${srcdir=.}/init.sh"; path_prepend_ ../src ++print_ver_ ls ++ ++symlink_to_rel= ++for i in /*; do ++ # Skip non-symlinks: ++ env test -h "$i" || continue ++ ++ # Skip dangling symlinks: ++ env test -e "$i" || continue ++ ++ # Skip any symlink-to-absolute-name: ++ case $(readlink "$i") in /*) continue ;; esac ++ ++ symlink_to_rel=$i ++ break ++done ++ ++test -z "$symlink_to_rel" \ ++ && skip_ no relative symlink in / ++ ++e='\33' ++color_code='01;36' ++c_pre="$e[0m$e[${color_code}m" ++c_post="$e[0m" ++printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_ ++ ++env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \ ++ ls -d --color=always "$symlink_to_rel" > out || fail=1 ++ ++compare exp out || fail=1 ++ ++Exit $fail +-- +1.7.11.2 + diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 8c1bd135b..f83225f9f 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158980 2012-05-14 04:41:15Z allan $ +# $Id: PKGBUILD 163714 2012-07-18 02:16:52Z dreisner $ # Maintainer: Allan McRae # Contributor: judd pkgname=coreutils pkgver=8.17 -pkgrel=1 +pkgrel=3 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -17,10 +17,12 @@ install=${pkgname}.install options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} coreutils-pam.patch + 0001-ls-color-each-symlink-to-relative-name-in-properly.patch su.pam) md5sums=('bbda656ce8ca2c6903948f9faa204ba3' 'ebecd29b095aa21b0b2f833f1ec20d70' 'aad79a2aa6d566c375d7bdd1b0767278' + 'd7c691898a695a6284a927e6a9426fe4' 'fa85e5cce5d723275b14365ba71a8aad') build() { @@ -29,6 +31,10 @@ build() { # added su wheel group pam patch (from fedora git) patch -Np1 -i ${srcdir}/coreutils-pam.patch + # fix coloring for symlinks in / + # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7 + patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch + autoreconf -v ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ --enable-install-program=su \ @@ -45,18 +51,15 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - + cd ${pkgdir}/usr/bin install -dm755 ${pkgdir}/{bin,usr/sbin} - + # binaries required by FHS _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' 'true' 'uname') mv ${_fhs[@]} ${pkgdir}/bin - - # makepkg uses the full path to this... - ln -s /usr/bin/du ${pkgdir}/bin/du mv chroot ${pkgdir}/usr/sbin install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 26f471584..eae4b2a23 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160239 2012-05-31 14:53:52Z eric $ +# $Id: PKGBUILD 163618 2012-07-17 05:32:49Z eric $ # Maintainer: Eric Bélanger pkgname=gpm pkgver=1.20.6 -pkgrel=8 +pkgrel=10 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64') url="http://www.nico.schottelius.org/software/gpm/" @@ -18,7 +18,7 @@ sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c' '19e1feb1493373512a77801699df012d186336ea' '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' '88fe5ff10916c68a87abc8418a56eb0073f69fa9' - '2db35b5f587b8dd21f9943610e7dd70469f888c7') + '20b92360f0ad38a2032fcae37bdbd01b31e43f77') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service index 3e52af729..59e837d80 100644 --- a/core/gpm/gpm.service +++ b/core/gpm/gpm.service @@ -1,6 +1,9 @@ [Unit] -Description=GPM daemon +Description=Virtual console mouse server [Service] Type=forking -ExecStart=/usr/sbin/gpm +ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index ee30e4262..b878e71d8 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163012 2012-07-05 13:49:01Z allan $ +# $Id: PKGBUILD 163715 2012-07-18 02:16:59Z dreisner $ # Maintainer: Allan McRae # Contributor: judd pkgname=grep pkgver=2.13 -pkgrel=1 +pkgrel=2 pkgdesc="A string search utility" arch=('i686' 'x86_64') license=('GPL3') @@ -31,7 +31,4 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - install -dm755 ${pkgdir}/bin - ln -s /usr/bin/grep ${pkgdir}/bin/grep } diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index efe8d3ede..cfb6b3dbf 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141105 2011-10-24 06:35:43Z tpowa $ +# $Id: PKGBUILD 163716 2012-07-18 02:17:05Z dreisner $ # Maintainer: Tobias Powalowski pkgname=kbd pkgver=1.15.3 -pkgrel=2 +pkgrel=3 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64') url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" @@ -35,10 +35,4 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install - - # this is needed because initscripts call /bin/loadkeys - # remove this when next versions of kbd - # and initscripts with /usr/bin/loadkeys usage will be released - mkdir ${pkgdir}/bin - ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys } -- cgit v1.2.3-54-g00ecf