summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/cronie/PKGBUILD67
-rw-r--r--core/cronie/cron.deny1
-rw-r--r--core/cronie/crontab1
-rw-r--r--core/cronie/pam.d7
-rwxr-xr-xcore/cronie/rc.d38
-rw-r--r--core/dcron/PKGBUILD50
-rw-r--r--core/dcron/dcron-logname.patch25
-rw-r--r--core/dcron/dcron.conf.d4
-rw-r--r--core/dcron/dcron.install10
-rw-r--r--core/dcron/dcron.rc.d47
-rw-r--r--core/nilfs-utils/PKGBUILD6
-rw-r--r--core/openssh/PKGBUILD9
-rw-r--r--core/pciutils/PKGBUILD17
-rw-r--r--core/rp-pppoe/PKGBUILD11
-rw-r--r--core/run-parts/PKGBUILD8
-rw-r--r--core/sudo/PKGBUILD6
-rw-r--r--core/usbutils/PKGBUILD14
-rw-r--r--core/usbutils/fix-python2.patch17
18 files changed, 169 insertions, 169 deletions
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
new file mode 100644
index 000000000..15d70051a
--- /dev/null
+++ b/core/cronie/PKGBUILD
@@ -0,0 +1,67 @@
+# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname='cronie'
+pkgver=1.4.7
+pkgrel=7
+pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
+url='https://fedorahosted.org/cronie/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+depends=('pam' 'bash' 'run-parts')
+
+source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'cron.deny'
+ 'crontab'
+ 'pam.d'
+ 'rc.d')
+sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f'
+ '0f279b8fb820340267d578dc85511c980715f91e'
+ '4059bc4ccb75f08b0d4970940799e5d9722b339f'
+ '6d8aef6880935b3dcc3e28481111d036544eeae5'
+ 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
+
+backup=('etc/crontab'
+ 'etc/anacrontab'
+ 'etc/conf.d/crond'
+ 'etc/pam.d/crond'
+ 'etc/cron.deny')
+
+conflicts=('cron')
+provides=('cron')
+groups=('base')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-anacron \
+ --with-inotify \
+ --with-pam \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
+ install -d "${pkgdir}"/var/spool/{ana,}cron
+ chmod u+s "${pkgdir}"/usr/bin/crontab
+
+ install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
+ install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
+ install -Dm644 ../crontab "${pkgdir}"/etc/crontab
+ install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
+ install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond
+ install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
+ install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
+ install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
+
+ install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING
+}
diff --git a/core/cronie/cron.deny b/core/cronie/cron.deny
new file mode 100644
index 000000000..06e685cc8
--- /dev/null
+++ b/core/cronie/cron.deny
@@ -0,0 +1 @@
+# without this file, only users listed in /etc/cron.allow can use crontab
diff --git a/core/cronie/crontab b/core/cronie/crontab
new file mode 100644
index 000000000..f2ce71030
--- /dev/null
+++ b/core/cronie/crontab
@@ -0,0 +1 @@
+# without this file, crond disables inotify support at startup
diff --git a/core/cronie/pam.d b/core/cronie/pam.d
new file mode 100644
index 000000000..094051b5e
--- /dev/null
+++ b/core/cronie/pam.d
@@ -0,0 +1,7 @@
+account required pam_access.so
+account required pam_time.so
+account required pam_unix.so
+
+session required pam_limits.so
+session required pam_env.so
+session required pam_unix.so
diff --git a/core/cronie/rc.d b/core/cronie/rc.d
new file mode 100755
index 000000000..d0659685c
--- /dev/null
+++ b/core/cronie/rc.d
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+name=crond
+. /etc/conf.d/crond
+PID=$(pidof -o %PPID /usr/sbin/crond)
+
+case "$1" in
+start)
+ stat_busy "Starting $name daemon"
+ [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
+ && { add_daemon $name; stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+stop)
+ stat_busy "Stopping $name daemon"
+ [[ -n "$PID" ]] && kill $PID &>/dev/null \
+ && { rm_daemon $name; stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+reload)
+ stat_busy "Reloading $name daemon"
+ [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
+ && { stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+*)
+ echo "usage: $0 {start|stop|restart|reload}"
+ ;;
+esac
+exit 0
diff --git a/core/dcron/PKGBUILD b/core/dcron/PKGBUILD
deleted file mode 100644
index 77003d83d..000000000
--- a/core/dcron/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Paul Mattal <paul.archlinux.org>
-
-pkgname=dcron
-pkgver=4.4
-pkgrel=2
-pkgdesc="dillon's lightweight cron daemon"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://www.jimpryor.net/linux/dcron"
-backup=(var/spool/cron/root etc/conf.d/crond)
-depends=('glibc')
-provides=('cron')
-groups=('base')
-source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz"
- 'dcron-logname.patch'
- 'dcron.rc.d'
- 'dcron.conf.d')
-md5sums=('02d848ba043a9df5bf2102a9f4bc04bd'
- 'c6054421b48100f7a2a7a36e2d33c92a'
- '73693cdd59df526e729cdec99c5ed8fb'
- '5bfa07beb54d0beaf3f38225e4d5a9fa')
-optdepends=('smtp-server: sending cron job output via email')
-install=$pkgname.install
-
-build() {
- cd "$srcdir/${pkgname}-${pkgver}" || return 1
-
- # patch to add LOGNAME environment variable
- patch -p1 -i $srcdir/dcron-logname.patch || return 1
-
- # by default, any member of group "users" can edit their own crontab
- make \
- PREFIX=/usr \
- CRONTAB_GROUP=users \
- CRONTABS=/var/spool/cron \
- CRONSTAMPS=/var/spool/cronstamps \
- || return 1
- make DESTDIR="$pkgdir" install || return 1
-
- # install standard configuration and scripts
- install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} \
- || return 1
- install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron" || return 1
- install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" \
- || return 1
-
- # install Arch configuration and launch scripts
- install -D -m755 "$srcdir/dcron.rc.d" "$pkgdir/etc/rc.d/crond" || return 1
- install -D -m0644 "$srcdir/dcron.conf.d" "$pkgdir/etc/conf.d/crond" || return 1
-}
diff --git a/core/dcron/dcron-logname.patch b/core/dcron/dcron-logname.patch
deleted file mode 100644
index c37c5f45f..000000000
--- a/core/dcron/dcron-logname.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur dcron-4.4/chuser.c dcron-4.4.logname/chuser.c
---- dcron-4.4/chuser.c 2010-02-15 11:18:13.111967483 +0100
-+++ dcron-4.4.logname/chuser.c 2010-02-15 11:18:29.615531204 +0100
-@@ -25,6 +25,7 @@
- return(-1);
- }
- setenv("USER", pas->pw_name, 1);
-+ setenv("LOGNAME", pas->pw_name, 1);
- setenv("HOME", pas->pw_dir, 1);
- setenv("SHELL", "/bin/sh", 1);
-
-diff -aur dcron-4.4/crontab.1 dcron-4.4.logname/crontab.1
---- dcron-4.4/crontab.1 2010-02-15 11:18:13.111967483 +0100
-+++ dcron-4.4.logname/crontab.1 2010-02-15 11:19:48.295707950 +0100
-@@ -57,8 +57,8 @@
- .PP
- Nor does it do any special environment handling.
- A shell script is better-suited to doing that than a cron daemon.
--This cron daemon sets up only three environment variables: USER,
--HOME, and SHELL.
-+This cron daemon sets up only four environment variables: USER,
-+LOGNAME, HOME, and SHELL.
- .PP
- Our crontab format is roughly similar to that used by vixiecron.
- Individual fields may contain a time, a time range, a time range
diff --git a/core/dcron/dcron.conf.d b/core/dcron/dcron.conf.d
deleted file mode 100644
index 763c71263..000000000
--- a/core/dcron/dcron.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to crond
-#
-CROND_ARGS="-S -l info"
diff --git a/core/dcron/dcron.install b/core/dcron/dcron.install
deleted file mode 100644
index ba08b3af1..000000000
--- a/core/dcron/dcron.install
+++ /dev/null
@@ -1,10 +0,0 @@
-## arg 1: the new package version
-## arg 2: the old package version
-post_upgrade() {
- if [ "`vercmp $2 4.0`" -lt 0 ]
- then
- echo "Restart crond, since you're upgrading to the dcron 4.x series."
- fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/core/dcron/dcron.rc.d b/core/dcron/dcron.rc.d
deleted file mode 100644
index b1a5770e6..000000000
--- a/core/dcron/dcron.rc.d
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/crond
-
-PID=$(pidof -o %PPID /usr/sbin/crond)
-case $1 in
-start)
- stat_busy "Starting Cron Daemon"
-
- # defaults to using syslog, and sendmail-ing cron output to local user
- # to mail output to remote address instead, add "-m user@host"
- # to CROND_ARGS in /etc/conf.d/crond
- if [[ -z $PID ]] && /usr/sbin/crond $CROND_ARGS; then
-
- PID=$(pidof -o %PPID /usr/sbin/crond)
- echo "$PID" > /var/run/crond.pid
- add_daemon crond
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
-stop)
- stat_busy "Stopping Cron Daemon"
- if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then
- rm_daemon crond
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
-restart)
- $0 stop
- $0 start
- ;;
-
-*)
- echo "Usage: $0 {start|stop|restart}" >&2
- exit 1
-
-esac
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 077c40cd5..75f0f8f89 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120135 2011-04-20 11:43:51Z ibiru $
+# $Id: PKGBUILD 122457 2011-05-04 07:52:42Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=nilfs-utils
-pkgver=2.0.22
+pkgver=2.0.23
pkgrel=1
pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ backup=('etc/nilfs_cleanerd.conf')
depends=('util-linux-ng')
options=(!libtool)
source=(http://www.nilfs.org/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d7650e53fbd4a73ef56e07a354fdd2b0')
+md5sums=('7f7e835d02e14642e8b7b32a36b7fab0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 43e69d149..af2520525 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 108830 2011-02-04 07:33:09Z bisson $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 122202 2011-05-03 02:17:44Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
-pkgver=5.8p1
+pkgver=5.8p2
pkgrel=1
pkgdesc='Free version of the SSH connectivity tools'
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +16,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
'sshd.confd'
'sshd.pam'
'sshd')
-sha1sums=('adebb2faa9aba2a3a3c8b401b2b19677ab53f0de'
+sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
'660092c57bde28bed82078f74011f95fc51c2293'
'6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 90710ebb6..0ee60d462 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 107583 2011-01-26 21:07:38Z tpowa $
+# $Id: PKGBUILD 115045 2011-03-16 15:19:12Z jgc $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=pciutils
pkgver=3.1.7
-pkgrel=3
+pkgrel=4
pkgdesc="PCI bus configuration space access library and tools"
arch=(i686 x86_64 'mips64el')
license=('GPL2')
@@ -17,15 +17,14 @@ md5sums=('35222edb86b50a6641352c66fe829b2e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./update-pciids.sh
- make OPT="$CFLAGS -fPIC -DPIC" ZLIB=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+ make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+ cp lib/libpci.a "${srcdir}/"
+ make clean
+ make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make PREFIX=${pkgdir}/usr SHAREDIR=${pkgdir}/usr/share/hwdata MANDIR=${pkgdir}/usr/share/man install
- install -d ${pkgdir}/usr/lib
- install -m644 lib/libpci.a ${pkgdir}/usr/lib
- for i in config.h header.h pci.h types.h; do
- install -D -m 644 lib/${i} ${pkgdir}/usr/include/pci/${i}
- done
+ make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+ install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
}
diff --git a/core/rp-pppoe/PKGBUILD b/core/rp-pppoe/PKGBUILD
index c47683f19..7e2e268ca 100644
--- a/core/rp-pppoe/PKGBUILD
+++ b/core/rp-pppoe/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 77813 2010-04-18 07:47:31Z allan $
+# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: orelien <aurelien.foret@wanadoo.fr>
-# Maintainer:
pkgname=rp-pppoe
pkgver=3.10
-pkgrel=5
+pkgrel=6
pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.roaringpenguin.com/pppoe/"
license=('GPL')
-groups=('base')
depends=('ppp>=2.4.5' 'sh')
options=('!makeflags')
backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
@@ -20,8 +19,8 @@ md5sums=('d58a13cc4185bca6121a606ff456dec0'
build() {
cd $srcdir/$pkgname-$pkgver/src
- ./configure --prefix=/usr --enable-plugin=/ppp-2.4.4
- make || return 1
+ ./configure --prefix=/usr --enable-plugin
+ make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1
}
package() {
diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD
index 3085643ae..c57b7cdac 100644
--- a/core/run-parts/PKGBUILD
+++ b/core/run-parts/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100361 2010-11-23 00:00:38Z pierre $
+# $Id: PKGBUILD 120288 2011-04-22 06:59:00Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=run-parts
-pkgver=3.4.1
+pkgver=3.4.4
pkgrel=1
pkgdesc='run scripts or programs in a directory'
arch=('i686' 'x86_64' 'mips64el')
url='http://packages.qa.debian.org/d/debianutils.html'
license=('GPL')
depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz")
-md5sums=('d488563ad7ea356d83f848becb1a3a4a')
+source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz")
+sha256sums=('f5d6f6116bb2b474399c07f519c3a30bcda5c85994b43195fdf09508031c72fe')
build() {
cd $srcdir/debianutils-$pkgver
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 45059d023..06cc39661 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118993 2011-04-09 21:57:35Z allan $
+# $Id: PKGBUILD 120368 2011-04-22 22:01:28Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
-_ver=1.8.1
+_ver=1.8.1p1
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,7 +15,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz
sudo.pam)
options=('!libtool' '!makeflags')
-md5sums=('e4402f24cccc3c6697b1eeab496053dd'
+md5sums=('318337804d976c9419cf3004b707945c'
'4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
build() {
diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD
index 466292f14..31c83a9e9 100644
--- a/core/usbutils/PKGBUILD
+++ b/core/usbutils/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 116702 2011-03-25 08:26:34Z tpowa $
+# $Id: PKGBUILD 118970 2011-04-09 20:52:11Z tpowa $
# Maintainer: Judd Vinet <jvinet@zeroflux.org>
# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
pkgname=usbutils
pkgver=002
-pkgrel=1
+pkgrel=2
pkgdesc="USB Device Utilities"
arch=(i686 x86_64 'mips64el')
license=('GPL')
groups=('base')
makedepends=('wget')
depends=('glibc' 'libusb')
+optdepends=('python2: for lsusb.py usage'
+ 'coreutils: for lsusb.py usage')
url="http://linux-usb.sourceforge.net/"
-source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('05610d15c3c8c8ada3d691c320ca784a')
+source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+ fix-python2.patch)
+md5sums=('05610d15c3c8c8ada3d691c320ca784a'
+ '45766196895b4cc50b53cd56e1bbf3d1')
build() {
cd $srcdir/$pkgname-$pkgver
rm usb.ids
wget http://www.linux-usb.org/usb.ids
+ # patch lsusb.py to use correct usb.ids file and python2 interpreter
+ patch -Np1 -i ../fix-python2.patch
./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
make
}
diff --git a/core/usbutils/fix-python2.patch b/core/usbutils/fix-python2.patch
new file mode 100644
index 000000000..7e2875e99
--- /dev/null
+++ b/core/usbutils/fix-python2.patch
@@ -0,0 +1,17 @@
+--- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100
++++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # lsusb.py
+ # Displays your USB devices in reasonable form.
+ # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
+@@ -16,7 +16,7 @@
+ warnsort = False
+
+ prefix = "/sys/bus/usb/devices/"
+-usbids = "/usr/share/usb.ids"
++usbids = "/usr/share/hwdata/usb.ids"
+
+ esc = chr(27)
+ norm = esc + "[0;0m"