From 55f2d1ab0ab1bd2f7c8c7c5cefeb45f7c457a5d9 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 1 Jul 2012 00:03:50 +0000 Subject: Sun Jul 1 00:03:50 UTC 2012 --- core/cryptsetup/PKGBUILD | 12 +- core/libnl/PKGBUILD | 9 +- core/libpcap/PKGBUILD | 12 +- core/libusbx/PKGBUILD | 6 +- core/psmisc/PKGBUILD | 12 +- core/systemd/PKGBUILD | 6 +- core/sysvinit/0001-simplify-writelog.patch | 126 +++++++++++++++++++++ ...02-remove-ansi-escape-codes-from-log-file.patch | 80 +++++++++++++ core/sysvinit/PKGBUILD | 21 ++-- 9 files changed, 247 insertions(+), 37 deletions(-) create mode 100644 core/sysvinit/0001-simplify-writelog.patch create mode 100644 core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch (limited to 'core') diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index aa12376ec..4ec999746 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 160396 2012-06-01 13:21:45Z dreisner $ +# $Id: PKGBUILD 162744 2012-06-29 11:46:09Z thomas $ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.4.2 -pkgrel=2 +pkgver=1.4.3 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') -depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux') conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' - '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' +sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a' + 'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a' 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index 6c9211830..da91aedcb 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 159173 2012-05-17 10:12:14Z thomas $ -# Maintainer: Jan de Groot -# Contributor: William Rea +# $Id: PKGBUILD 162745 2012-06-29 11:46:12Z thomas $ +# Maintainer: Thomas Bächler pkgname=libnl -pkgver=3.2.9 +pkgver=3.2.11 pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets" arch=(i686 x86_64) @@ -13,7 +12,7 @@ depends=(glibc) backup=(etc/libnl/classid etc/libnl/pktloc) options=(!libtool) source=("$url/files/$pkgname-$pkgver.tar.gz") -sha256sums=('9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63') +sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index a528954b0..1974ff4c0 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 150894 2012-02-23 13:54:08Z allan $ +# $Id: PKGBUILD 162746 2012-06-29 11:46:18Z thomas $ # Maintainer: Thomas Bächler pkgname=libpcap -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64') url="http://www.tcpdump.org/" license=('BSD') -depends=('glibc' 'libnl' 'sh') +depends=('glibc' 'libnl' 'sh' 'libusbx') makedepends=('flex') source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} libnl32.patch) -sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' - 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4' +sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9' + '8004a6655fb98acd89f3dea7ce95f182f4874298ce692f5b8f4a7dae65d7993f' '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') build() { diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD index fb184b219..2c2795fbb 100644 --- a/core/libusbx/PKGBUILD +++ b/core/libusbx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162327 2012-06-25 07:06:06Z tpowa $ +# $Id: PKGBUILD 162758 2012-06-29 16:50:44Z tpowa $ # Maintainer: Tobias Powalowski pkgname=libusbx pkgver=1.0.12 -pkgrel=1 +pkgrel=2 depends=('glibc') pkgdesc="Library that provides generic access to USB device" arch=(i686 x86_64) @@ -17,7 +17,7 @@ md5sums=('c41352ac755c7992edfcbb2ea4ad1349') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index ab17fcc8e..28e7909ec 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 162110 2012-06-20 09:21:46Z eric $ +# $Id: PKGBUILD 162759 2012-06-29 18:27:42Z eric $ # Maintainer: Eric Bélanger pkgname=psmisc -pkgver=22.18 -pkgrel=2 +pkgver=22.19 +pkgrel=1 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64') url="http://psmisc.sourceforge.net/index.html" license=('GPL') groups=('base') depends=('ncurses') -source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz psmisc22.18-usage.patch) -sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c' - '5cd326dd969b07c46d10c7d1172b91d65cbc6e10') +source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) +sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/psmisc22.18-usage.patch" ./configure --prefix=/usr make } diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 2d9323250..2ddf56cb0 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=185 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -64,7 +64,7 @@ package_systemd() { "systemd-tools=$pkgver" 'util-linux' 'xz') optdepends=('python2-dbus: systemd-analyze' 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' + 'initscripts-systemd: legacy generator for initialization scripts' 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') @@ -181,7 +181,7 @@ package_libsystemd() { package_systemd-tools() { pkgdesc='standalone tools from systemd' url='http://www.freedesktop.org/wiki/Software/systemd' - depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd') + depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') optdepends=('cryptsetup: required for encrypted block devices') provides=("udev=$pkgver") conflicts=('udev') diff --git a/core/sysvinit/0001-simplify-writelog.patch b/core/sysvinit/0001-simplify-writelog.patch new file mode 100644 index 000000000..cc28f14bc --- /dev/null +++ b/core/sysvinit/0001-simplify-writelog.patch @@ -0,0 +1,126 @@ +From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001 +From: Florian Pritz +Date: Fri, 15 Jun 2012 16:41:52 +0200 +Subject: [PATCH 1/2] simplify writelog() + +All we do is prepend the date and remove \r. We don't handle color +codes, but the user can just cat the log file in a terminal and it will +interpret the codes correctly. + +Signed-off-by: Florian Pritz +--- + bootlogd.c | 76 +++++++++++++++++------------------------------------------- + 1 file changed, 21 insertions(+), 55 deletions(-) + +diff --git a/bootlogd.c b/bootlogd.c +index 570d382..e36e261 100644 +--- a/bootlogd.c ++++ b/bootlogd.c +@@ -68,11 +68,6 @@ int didnl = 1; + int createlogfile = 0; + int syncalot = 0; + +-struct line { +- char buf[256]; +- int pos; +-} line; +- + /* + * Console devices as listed on the kernel command line and + * the mapping to actual devices in /dev +@@ -351,63 +346,34 @@ int consolename(char *res, int rlen) + */ + void writelog(FILE *fp, unsigned char *ptr, int len) + { +- time_t t; +- char *s; +- char tmp[8]; +- int olen = len; +- int dosync = 0; +- int tlen; +- +- while (len > 0) { +- tmp[0] = 0; +- if (didnl) { ++ int dosync = 0; ++ int i; ++ static int first_run = 1; ++ ++ for (i = 0; i < len; i++) { ++ int ignore = 0; ++ ++ /* prepend date to every line */ ++ if (*(ptr-1) == '\n' || first_run) { ++ time_t t; ++ char *s; + time(&t); + s = ctime(&t); + fprintf(fp, "%.24s: ", s); +- didnl = 0; ++ dosync = 1; ++ first_run = 0; + } +- switch (*ptr) { +- case 27: /* ESC */ +- strcpy(tmp, "^["); +- break; +- case '\r': +- line.pos = 0; +- break; +- case 8: /* ^H */ +- if (line.pos > 0) line.pos--; +- break; +- case '\n': +- didnl = 1; +- dosync = 1; +- break; +- case '\t': +- line.pos += (line.pos / 8 + 1) * 8; +- if (line.pos >= (int)sizeof(line.buf)) +- line.pos = sizeof(line.buf) - 1; +- break; +- case 32 ... 127: +- case 161 ... 255: +- tmp[0] = *ptr; +- tmp[1] = 0; +- break; +- default: +- sprintf(tmp, "\\%03o", *ptr); +- break; +- } +- ptr++; +- len--; + +- tlen = strlen(tmp); +- if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) { +- memcpy(line.buf + line.pos, tmp, tlen); +- line.pos += tlen; ++ if (*ptr == '\r') { ++ ignore = 1; + } +- if (didnl) { +- fprintf(fp, "%s\n", line.buf); +- memset(&line, 0, sizeof(line)); ++ ++ if (!ignore) { ++ fwrite(ptr, sizeof(char), 1, fp); + } +- } + ++ ptr++; ++ } + if (dosync) { + fflush(fp); + if (syncalot) { +@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + } + } + +- outptr += olen; ++ outptr += len; + if (outptr >= endptr) + outptr = ringbuf; + +-- +1.7.10.4 + diff --git a/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch new file mode 100644 index 000000000..89b3280df --- /dev/null +++ b/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch @@ -0,0 +1,80 @@ +From 8d0022d9540112a92ce8d88c91c4ac10bad8c9ef Mon Sep 17 00:00:00 2001 +From: Florian Pritz +Date: Sun, 24 Jun 2012 15:49:51 +0200 +Subject: [PATCH 2/2] remove ansi escape codes from log file + +References: https://en.wikipedia.org/wiki/ANSI_escape_code + +Signed-off-by: Florian Pritz +--- + bootlogd.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 43 insertions(+), 2 deletions(-) + +diff --git a/bootlogd.c b/bootlogd.c +index e36e261..88e610d 100644 +--- a/bootlogd.c ++++ b/bootlogd.c +@@ -349,6 +349,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + int dosync = 0; + int i; + static int first_run = 1; ++ static int inside_esc = 0; + + for (i = 0; i < len; i++) { + int ignore = 0; +@@ -364,10 +365,50 @@ void writelog(FILE *fp, unsigned char *ptr, int len) + first_run = 0; + } + +- if (*ptr == '\r') { +- ignore = 1; ++ /* remove escape sequences, but do it in a way that allows us to stop ++ * in the middle in case the string was cut off */ ++ if (inside_esc == 1) { ++ /* first '[' is special because if we encounter it again, it should be considered the final byte */ ++ if (*ptr == '[') { ++ /* multi char sequence */ ++ ignore = 1; ++ inside_esc = 2; ++ } else { ++ /* single char sequence */ ++ if (*ptr >= 64 && *ptr <= 95) { ++ ignore = 1; ++ } ++ inside_esc = 0; ++ } ++ } else if (inside_esc == 2) { ++ switch (*ptr) { ++ case '0' ... '9': /* intermediate chars of escape sequence */ ++ case ';': ++ case 32 ... 47: ++ if (inside_esc) { ++ ignore = 1; ++ } ++ break; ++ case 64 ... 126: /* final char of escape sequence */ ++ if (inside_esc) { ++ ignore = 1; ++ inside_esc = 0; ++ } ++ break; ++ } ++ } else { ++ switch (*ptr) { ++ case '\r': ++ ignore = 1; ++ break; ++ case 27: /* ESC */ ++ ignore = 1; ++ inside_esc = 1; ++ break; ++ } + } + ++ + if (!ignore) { + fwrite(ptr, sizeof(char), 1, fp); + } +-- +1.7.10.4 + diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index 27045eca0..b8eef133e 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 137779 2011-09-10 22:03:10Z tomegun $ +# $Id: PKGBUILD 162726 2012-06-29 06:27:09Z bluewind $ # Maintainer: Eric Belanger -# Contributor: judd pkgname=sysvinit pkgver=2.88 -pkgrel=3 +pkgrel=6 pkgdesc="Linux System V Init" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') groups=('base') -depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk') +depends=('util-linux' 'coreutils' 'glibc' 'awk') install=sysvinit.install -source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2) -md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f') -sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26') +source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 + "0001-simplify-writelog.patch" + "0002-remove-ansi-escape-codes-from-log-file.patch") +sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' + '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d' + 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32') build() { cd "${srcdir}/${pkgname}-${pkgver}dsf" + + # FS#30005 + patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" + patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch" + make } -- cgit v1.2.3-54-g00ecf