summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/dnsmasq/PKGBUILD6
-rwxr-xr-xextra/dnsmasq/rc.dnsmasq13
-rw-r--r--extra/htop/ChangeLog5
-rw-r--r--extra/htop/PKGBUILD32
-rw-r--r--extra/htop/fix-segfault-small-terminal.patch24
-rw-r--r--extra/htop/fix-sort-key-bug.patch15
-rw-r--r--extra/mono/PKGBUILD6
-rw-r--r--extra/openjdk6/PKGBUILD13
-rw-r--r--extra/pth/PKGBUILD41
-rw-r--r--extra/x11-ssh-askpass/PKGBUILD44
-rw-r--r--extra/x11-ssh-askpass/profile.d4
11 files changed, 170 insertions, 33 deletions
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 8594df43b..65e802c7f 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 140772 2011-10-19 01:14:39Z dreisner $
+# $Id: PKGBUILD 140810 2011-10-19 16:21:22Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=dnsmasq
pkgver=2.59
-pkgrel=1
+pkgrel=2
pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
'dnsmasq.service')
md5sums=('29d43f182ecad06d64b3598c02380a80'
'66479e99123faeab83ebaed709ef95b5'
- '818c122ea4d81868a75afad109411170'
+ '9f180cc236808bbd02ca8652fd2e8217'
'f329d86f8ba1cd85f9b6ee59e0ce3791')
build() {
diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq
index 2ded33695..0ce736ba9 100755
--- a/extra/dnsmasq/rc.dnsmasq
+++ b/extra/dnsmasq/rc.dnsmasq
@@ -4,6 +4,17 @@
. /etc/rc.d/functions
. /etc/conf.d/dnsmasq
+checkconfig() {
+ local testout
+
+ if ! testout=$(/usr/sbin/dnsmasq --test 2>&1); then
+ echo "$testout"
+ return 1
+ fi
+
+ return 0
+}
+
pidfile=/run/dnsmasq.pid
if [[ -r $pidfile ]]; then
read -r PID < "$pidfile"
@@ -17,7 +28,7 @@ fi
case $1 in
start)
stat_busy "Starting DNS/DHCP daemon"
- if [[ -z $PID ]] && /usr/sbin/dnsmasq --test &&
+ if [[ -z $PID ]] && checkconfig &&
/usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
"--pid-file=$pidfile" \
"${DNSMASQ_OPTS[@]}"; then
diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog
index ea5776244..df71cf644 100644
--- a/extra/htop/ChangeLog
+++ b/extra/htop/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19 Andrea Scarpino <andrea@archlinux.org>
+ * Enable cgroup support (FS#26155)
+ * Add lsof and strace optional depends (FS#25778)
+ * Fix crash when column is less than 40 (closes FS#25823)
+
2011-05-17 Angel Velasquez <angvp@archlinux.org>
* Added patch to fix --sort-key (closes FS#23224)
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 75e357adf..11ec58bf5 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -1,35 +1,45 @@
-# $Id: PKGBUILD 124246 2011-05-18 04:38:36Z angvp $
+# $Id: PKGBUILD 140790 2011-10-19 10:00:03Z andrea $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=htop
pkgver=0.9
-pkgrel=2
+pkgrel=3
pkgdesc="Interactive process viewer"
arch=('i686' 'x86_64')
url="http://htop.sourceforge.net/"
license=('GPL')
depends=('ncurses')
makedepends=('python2')
+optdepends=('lsof' 'strace')
options=('!emptydirs')
changelog=ChangeLog
-source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz
- htop.c.patch)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ 'fix-sort-key-bug.patch'
+ 'fix-segfault-small-terminal.patch')
md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
- '750e8ad8476c5d9738da2a2bc7a7c2b6')
+ '750e8ad8476c5d9738da2a2bc7a7c2b6'
+ 'd93e39c9662522367dc3a73cc3057039')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure
sed -i 's|python|python2|' scripts/MakeHeader.py
- patch -Np0 -i $srcdir/htop.c.patch
- ./configure --prefix=/usr --enable-unicode --enable-openvz \
- --enable-vserver
+
+ patch -Np0 -i "${srcdir}/fix-sort-key-bug.patch"
+ patch -p1 -i "${srcdir}/fix-segfault-small-terminal.patch"
+
+ ./configure --prefix=/usr \
+ --enable-unicode \
+ --enable-openvz \
+ --enable-vserver \
+ --enable-cgroup
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/htop/fix-segfault-small-terminal.patch b/extra/htop/fix-segfault-small-terminal.patch
new file mode 100644
index 000000000..c55146492
--- /dev/null
+++ b/extra/htop/fix-segfault-small-terminal.patch
@@ -0,0 +1,24 @@
+--- trunk/Meter.c 2011/08/26 20:52:35 229
++++ trunk/Meter.c 2011/08/26 20:55:09 230
+@@ -264,13 +264,19 @@
+
+ w--;
+ x++;
+- char bar[w];
++
++ if (w < 1) {
++ attrset(CRT_colors[RESET_COLOR]);
++ return;
++ }
++ char bar[w + 1];
+
+ int blockSizes[10];
+ for (int i = 0; i < w; i++)
+ bar[i] = ' ';
+
+- sprintf(bar + (w-strlen(buffer)), "%s", buffer);
++ const size_t barOffset = w - MIN(strlen(buffer), w);
++ snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer);
+
+ // First draw in the bar[] buffer...
+ double total = 0.0;
diff --git a/extra/htop/fix-sort-key-bug.patch b/extra/htop/fix-sort-key-bug.patch
new file mode 100644
index 000000000..41a2dd377
--- /dev/null
+++ b/extra/htop/fix-sort-key-bug.patch
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madkite@gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old 2010-11-24 20:45:38.000000000 +0200
++++ htop.c 2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+ printVersionFlag();
+ break;
+ case 's':
+- if (strcmp(optarg, "help")) {
++ if (!strcmp(optarg, "help")) {
+ for (int j = 1; j < LAST_PROCESSFIELD; j++)
+ printf ("%s\n", Process_fieldNames[j]);
+ exit(0);
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index c25f2f01e..7bcbef6c2 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137542 2011-09-09 07:16:56Z daniel $
+# $Id: PKGBUILD 140778 2011-10-19 07:11:57Z daniel $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: Brice Carpentier <brice@dlfp.org>
pkgname=mono
-pkgver=2.10.5
+pkgver=2.10.6
pkgrel=1
pkgdesc="Free implementation of the .NET platform including runtime and compiler"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ provides=('monodoc')
conflicts=('monodoc')
source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
mono.rc.d)
-md5sums=('1954f11932e82b2ae3b64b2ae9344d90'
+md5sums=('c442cef4cd6668b0a1391a661f6815a9'
'8315e46c6a6e9625502521fc0ad1a322')
build() {
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 32ce42ce0..df1688ad1 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 132227 2011-07-21 17:20:32Z andyrtr $
+# $Id: PKGBUILD 140782 2011-10-19 08:19:12Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,7 +6,7 @@ pkgname=('openjdk6' 'openjdk6-src')
pkgbase="openjdk6"
#_date=20100715
_javaver=6
-_icedteaver=1.10.3
+_icedteaver=1.10.4
_openjdk_version=b22
_openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -31,8 +31,11 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar
nonreparenting-wm.diff
openjdk6.profile
openjdk6.profile.csh)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('0a1301785e9826d7c87ed7e8b10a6985'
+noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
+ jaxp144_01.zip
+ jdk6-jaxws-b20.zip
+ jdk6-jaf-b20.zip)
+md5sums=('c381d987f8d2facece8c54e98fd547f8'
'2d2bbbb0f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -168,7 +171,7 @@ package_openjdk6() {
install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh
# install license
- install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
package_openjdk6-src() {
diff --git a/extra/pth/PKGBUILD b/extra/pth/PKGBUILD
index 3075d939b..7e2e6e5ee 100644
--- a/extra/pth/PKGBUILD
+++ b/extra/pth/PKGBUILD
@@ -1,22 +1,43 @@
-# $Id: PKGBUILD 78043 2010-04-19 08:33:13Z dgriffiths $
+# $Id: PKGBUILD 140804 2011-10-19 15:35:55Z dreisner $
# Maintainer: damir <damir@archlinux.org>
pkgname=pth
pkgver=2.0.7
-pkgrel=3
+pkgrel=4
pkgdesc="The GNU Portable Threads."
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/pth/"
license=('LGPL')
-depends=('glibc')
+depends=('glibc' 'awk')
options=('!libtool' '!makeflags')
-source=(ftp://ftp.gnu.org/gnu/pth/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9cb4a25331a4c4db866a31cbe507c793')
+source=(ftp://ftp.gnu.org/gnu/pth/$pkgname-$pkgver.tar.gz{,.sig})
+sha1sums=('9a71915c89ff2414de69fe104ae1016d513afeee'
+ '8cb16dffbf15ba92bda8d08918eaf5995642fc38')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --mandir=/usr/share/man || return 1
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --disable-static \
+ --enable-shared \
+ --with-pic
+
+ sed -i "s|awk=''|awk=/bin/awk|g" shtool # "Cannot find a reasonable Awk"
+
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR=${pkgdir} install
}
diff --git a/extra/x11-ssh-askpass/PKGBUILD b/extra/x11-ssh-askpass/PKGBUILD
new file mode 100644
index 000000000..37b84c4d0
--- /dev/null
+++ b/extra/x11-ssh-askpass/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 140828 2011-10-19 22:29:39Z bisson $
+
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Mike Sampson <mike at sambodata dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Charles Mauch <cmauch@gmail.com>
+
+pkgname=x11-ssh-askpass
+pkgver=1.2.4.1
+pkgrel=3
+pkgdesc='Lightweight passphrase dialog for SSH'
+url='http://www.jmknoble.net/software/x11-ssh-askpass/'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('libxt')
+makedepends=('imake')
+#source=("${url}${pkgname}-${pkgver}.tar.gz" # httpd only sends half the bits
+source=("http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"
+ 'profile.d')
+sha1sums=('78c992951685d4dbffb77536f37b83ae2a6eafc7'
+ '28be56290d07e2625bc8e81ae8c7ea741d329c51')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure \
+ --mandir=/usr/share/man \
+ --libexecdir=/usr/lib/ssh \
+ --with-app-defaults-dir=/usr/share/X11/app-defaults \
+
+ xmkmf
+ make includes
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install install.man
+ install -Dm755 ../profile.d "${pkgdir}/etc/profile.d/${pkgname}.sh"
+
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ sed '109,174p;d' README > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/x11-ssh-askpass/profile.d b/extra/x11-ssh-askpass/profile.d
new file mode 100644
index 000000000..955d6ad96
--- /dev/null
+++ b/extra/x11-ssh-askpass/profile.d
@@ -0,0 +1,4 @@
+if [ -f "/usr/lib/ssh/x11-ssh-askpass" ] ; then
+ SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass"
+ export SSH_ASKPASS
+fi
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-25 15:05:11 +0000