summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/alsa-utils/PKGBUILD9
-rw-r--r--extra/cifs-utils/PKGBUILD7
-rw-r--r--extra/cvsps/PKGBUILD37
-rw-r--r--extra/cvsps/call-cvs-q-option.patch34
-rw-r--r--extra/cvsps/cvsps-2.2b1-bufferoverflow.patch65
-rw-r--r--extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch133
-rw-r--r--extra/cvsps/cvsps-2.2b1-man.patch29
-rw-r--r--extra/cvsps/seperate-CPPFLAGS.patch29
-rw-r--r--extra/cvsps/use-INADDR_NONE-define.patch28
-rw-r--r--extra/cvsps/use-__linux__-define.patch36
-rw-r--r--extra/cvsps/use-offsetof-macro.patch32
-rw-r--r--extra/gnutls/PKGBUILD10
-rw-r--r--extra/libxfont/PKGBUILD10
-rw-r--r--extra/mercurial/PKGBUILD16
-rw-r--r--extra/samba/PKGBUILD28
-rwxr-xr-xextra/samba/samba4
-rw-r--r--extra/sane/PKGBUILD8
-rw-r--r--extra/tftp-hpa/PKGBUILD19
-rw-r--r--extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch26
-rw-r--r--extra/xorg-xfs/PKGBUILD22
-rw-r--r--extra/ypserv/PKGBUILD21
-rw-r--r--extra/ypserv/confpost.patch14
22 files changed, 541 insertions, 76 deletions
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index 213182d62..171dc0620 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147702 2012-01-27 07:30:51Z tpowa $
+# $Id: PKGBUILD 151749 2012-03-02 07:36:36Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=alsa-utils
pkgver=1.0.25
-pkgrel=1
+pkgrel=2
pkgdesc="An alternative implementation of Linux sound support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.alsa-project.org"
@@ -14,15 +14,13 @@ makedepends=('xmlto' 'docbook-xsl')
license=('GPL')
source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
alsa
- alsaconf.patch
alsa.conf.d
90alsa)
backup=(etc/conf.d/alsa)
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ../alsaconf.patch
- ./configure --prefix=/usr --with-systemdsystemunitdir=/lib/systemd/system
+ ./configure --prefix=/usr --disable-alsaconf --with-systemdsystemunitdir=/lib/systemd/system
make
}
@@ -37,6 +35,5 @@ package() {
}
md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9'
'2ba1a1cbf653bf1a69f8a720fd6549da'
- '7521bf20f5b3501a510ec4462ae4a934'
'4c8ae9f976c7df5e271a4cb91ccc7767'
'529216f6a46e61a546640e08ea7a0879')
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index f4fb29451..8c9b3dcf8 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 148030 2012-01-30 07:42:40Z tpowa $
+# $Id: PKGBUILD 151756 2012-03-02 08:44:51Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cifs-utils
pkgver=5.3
-pkgrel=1
+pkgrel=2
pkgdesc="CIFS filesystem user-space tools"
arch=(i686 x86_64 'mips64el')
url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
license=('GPL')
-depends=('libcap-ng' 'keyutils' 'krb5' 'talloc')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
-# deinstall smbclient first!
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD
index 70cf6825d..27d2ec122 100644
--- a/extra/cvsps/PKGBUILD
+++ b/extra/cvsps/PKGBUILD
@@ -1,24 +1,45 @@
-# $Id: PKGBUILD 149335 2012-02-06 20:45:16Z stephane $
+# $Id: PKGBUILD 151779 2012-03-02 17:28:27Z dan $
# Maintainer:
# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
pkgname=cvsps
-pkgver=2.1
-pkgrel=4
+pkgver=2.2b1
+pkgrel=1
pkgdesc="Generating 'patchset' information from a CVS repository"
url="http://www.cobite.com/cvsps/"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('zlib')
-source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe')
+source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ call-cvs-q-option.patch
+ cvsps-2.2b1-bufferoverflow.patch
+ cvsps-2.2b1-dynamic-logbuf.patch
+ cvsps-2.2b1-man.patch
+ seperate-CPPFLAGS.patch
+ use-INADDR_NONE-define.patch
+ use-__linux__-define.patch
+ use-offsetof-macro.patch)
+md5sums=('997580e8e283034995b9209076858c68'
+ '06324c5e3c321126b76dc97fc6c00b34'
+ '2910012a11a24d5e4192cf9eae7dd259'
+ '970566460e72cb159426965d6e5763b3'
+ 'f9d2ee40e52ecd5096fa9a885418eee1'
+ '6baafbd7512aa52e1b83ed0bead32a6e'
+ 'a3a81481c07dcc676f5a82ae07e8ee89'
+ '9e2763315cbda02665c47827d38df459'
+ '8f7e6f09f42f76deeefe24bbfa509150')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/$pkgname-$pkgver"
+ for file in ${source[@]}; do
+ if [[ $file == *.patch ]]; then
+ patch -Np1 < ../$file
+ fi
+ done
make prefix=/usr
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make prefix="${pkgdir}/usr" install
+ cd "$srcdir/$pkgname-$pkgver"
+ make prefix="$pkgdir/usr" install
}
diff --git a/extra/cvsps/call-cvs-q-option.patch b/extra/cvsps/call-cvs-q-option.patch
new file mode 100644
index 000000000..a754b7c60
--- /dev/null
+++ b/extra/cvsps/call-cvs-q-option.patch
@@ -0,0 +1,34 @@
+From 49d7a3e44b54f18b0e2762d8dbb087ad4c2f0276 Mon Sep 17 00:00:00 2001
+From: Yann Dirson <ydirson@altern.org>
+Date: Thu, 15 Jun 2006 09:48:08 +0200
+Subject: [PATCH] Call cvs with -q flag when fetching the log
+
+This gets rid of the neverending output polution cvs sends to stderr,
+which is mostly useless and has a strong potential to hide real problem
+reports
+---
+ cvsps.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cvsps.c b/cvsps.c
+index d94dfe0..be700ba 100644
+--- a/cvsps.c
++++ b/cvsps.c
+@@ -301,12 +301,12 @@ static void load_from_cvs()
+ * which is necessary to fill in the pre_rev stuff for a
+ * PatchSetMember
+ */
+- snprintf(cmd, BUFSIZ, "cvs %s %s %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff);
++ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff);
+ }
+ else
+ {
+ date_str[0] = 0;
+- snprintf(cmd, BUFSIZ, "cvs %s %s %s %s", compress_arg, norc, ltype, use_rep_buff);
++ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s %s", compress_arg, norc, ltype, use_rep_buff);
+ }
+
+ debug(DEBUG_STATUS, "******* USING CMD %s", cmd);
+--
+1.6.5.GIT
+
diff --git a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch
new file mode 100644
index 000000000..2a82cd4e0
--- /dev/null
+++ b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch
@@ -0,0 +1,65 @@
+--- cvsps-2.2b1/cvsps.c 2010-09-07 18:13:42.760727491 +0200
++++ cvsps-2.2b1_/cvsps.c 2010-09-07 18:05:11.083729441 +0200
+@@ -1065,17 +1065,16 @@ static CvsFile * parse_file(const char *
+ {
+ CvsFile * retval;
+ char fn[PATH_MAX];
+- int len = strlen(buff + 10);
++ size_t len = strlen(buff + 10);
+ char * p;
+
+ /* once a single file has been parsed ok we set this */
+ static int path_ok;
+-
++
+ /* chop the ",v" string and the "LF" */
+ len -= 3;
+ memcpy(fn, buff + 10, len);
+ fn[len] = 0;
+-
+ if (strncmp(fn, strip_path, strip_path_len) != 0)
+ {
+ /* if the very first file fails the strip path,
+@@ -1096,10 +1095,10 @@ static CvsFile * parse_file(const char *
+
+ while ((p = strstr(p, repository_path)))
+ lastp = p++;
+-
++
+ if (lastp)
+ {
+- int len = strlen(repository_path);
++ size_t len = strlen(repository_path);
+ memcpy(strip_path, fn, lastp - fn + len + 1);
+ strip_path_len = lastp - fn + len + 1;
+ strip_path[strip_path_len] = 0;
+@@ -1114,16 +1113,26 @@ static CvsFile * parse_file(const char *
+ *
+ * For now just ignore such files
+ */
+- debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring",
++ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring",
+ fn, strip_path);
+ return NULL;
+ }
+
+ ok:
+- path_ok = 1;
+-
++ /*
++ fix for rhbz#576076
++ ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS
++ */
++ if(len <= strip_path_len)
++ {
++ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring",
++ fn, strip_path);
++ return NULL;
++ }
+ /* remove from beginning the 'strip_path' string */
+ len -= strip_path_len;
++ path_ok = 1;
++
+ memmove(fn, fn + strip_path_len, len);
+ fn[len] = 0;
+
diff --git a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch
new file mode 100644
index 000000000..03e4e7672
--- /dev/null
+++ b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch
@@ -0,0 +1,133 @@
+# From: http://ydirson.free.fr/soft/git/cvsps.git
+
+commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50
+Author: David D. Kilzer <ddkilzer@kilzer.net>
+Date: Mon Jun 20 01:04:34 2005 +0200
+
+ Dynamically allocate the log buffer to prevent warning messages
+
+ On anoncvs.opensource.apple.com (Apple's anonymous CVS server for
+ WebKit), some very long log entries were included in CVS. I got tired
+ of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be
+ dynamically allocated.
+
+diff --git i/cache.c w/cache.c
+index 4c51cf7..01a8ed3 100644
+--- i/cache.c
++++ w/cache.c
+@@ -108,10 +108,19 @@ time_t read_cache()
+ int tag_flags = 0;
+ char branchbuff[LOG_STR_MAX] = "";
+ int branch_add = 0;
+- char logbuff[LOG_STR_MAX] = "";
++ int logbufflen = LOG_STR_MAX + 1;
++ char * logbuff = malloc(logbufflen);
+ time_t cache_date = -1;
+ int read_version;
+
++ if (logbuff == NULL)
++ {
++ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen);
++ exit(1);
++ }
++
++ logbuff[0] = 0;
++
+ if (!(fp = cache_open("r")))
+ goto out;
+
+@@ -299,8 +308,19 @@ time_t read_cache()
+ else
+ {
+ /* Make sure we have enough in the buffer */
+- if (strlen(logbuff)+strlen(buff)<LOG_STR_MAX)
+- strcat(logbuff, buff);
++ int len = strlen(buff);
++ if (strlen(logbuff) + len >= LOG_STR_MAX)
++ {
++ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
++ char * newlogbuff = realloc(logbuff, logbufflen);
++ if (newlogbuff == NULL)
++ {
++ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen);
++ exit(1);
++ }
++ logbuff = newlogbuff;
++ }
++ strcat(logbuff, buff);
+ }
+ break;
+ case CACHE_NEED_PS_MEMBERS:
+@@ -332,6 +352,7 @@ time_t read_cache()
+ out_close:
+ fclose(fp);
+ out:
++ free(logbuff);
+ return cache_date;
+ }
+
+diff --git i/cvsps.c w/cvsps.c
+index f0e7d29..db28d7c 100644
+--- i/cvsps.c
++++ w/cvsps.c
+@@ -269,7 +269,8 @@ static void load_from_cvs()
+ PatchSetMember * psm = NULL;
+ char datebuff[26];
+ char authbuff[AUTH_STR_MAX];
+- char logbuff[LOG_STR_MAX + 1];
++ int logbufflen = LOG_STR_MAX + 1;
++ char * logbuff = malloc(logbufflen);
+ int loglen = 0;
+ int have_log = 0;
+ char cmd[BUFSIZ];
+@@ -277,6 +278,12 @@ static void load_from_cvs()
+ char use_rep_buff[PATH_MAX];
+ char * ltype;
+
++ if (logbuff == NULL)
++ {
++ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen);
++ exit(1);
++ }
++
+ if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
+ {
+ ltype = "rlog";
+@@ -484,25 +491,22 @@ static void load_from_cvs()
+ */
+ if (have_log || !is_revision_metadata(buff))
+ {
+- /* if the log buffer is full, that's it.
+- *
+- * Also, read lines (fgets) always have \n in them
+- * (unless truncation happens)
+- * which we count on. So if truncation happens,
+- * be careful to put a \n on.
+- *
+- * Buffer has LOG_STR_MAX + 1 for room for \0 if
+- * necessary
+- */
+- if (loglen < LOG_STR_MAX)
++ /* If the log buffer is full, try to reallocate more. */
++ if (loglen < logbufflen)
+ {
+ int len = strlen(buff);
+
+- if (len >= LOG_STR_MAX - loglen)
++ if (len >= logbufflen - loglen)
+ {
+- debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log");
+- len = LOG_STR_MAX - loglen;
+- buff[len - 1] = '\n';
++ debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename);
++ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
++ char * newlogbuff = realloc(logbuff, logbufflen);
++ if (newlogbuff == NULL)
++ {
++ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen);
++ exit(1);
++ }
++ logbuff = newlogbuff;
+ }
+
+ debug(DEBUG_STATUS, "appending %s to log", buff);
diff --git a/extra/cvsps/cvsps-2.2b1-man.patch b/extra/cvsps/cvsps-2.2b1-man.patch
new file mode 100644
index 000000000..3e6816fd5
--- /dev/null
+++ b/extra/cvsps/cvsps-2.2b1-man.patch
@@ -0,0 +1,29 @@
+diff -up cvsps-2.2b1/cvsps.1~ cvsps-2.2b1/cvsps.1
+--- cvsps-2.2b1/cvsps.1~ 2008-04-02 04:18:44.000000000 +0300
++++ cvsps-2.2b1/cvsps.1 2010-05-18 21:10:39.000000000 +0300
+@@ -11,7 +11,7 @@ to a collection of files, and all commit
+ single 'cvs commit' command). This information is valuable to seeing the
+ big picture of the evolution of a cvs project. While cvs tracks revision
+ information, it is often difficult to see what changes were committed
+-'atomically' to the repository.
++\'atomically' to the repository.
+ .SH OPTIONS
+ .TP
+ .B \-h
+@@ -83,7 +83,7 @@ some hacks which are not generally appli
+ disable the use of rlog internally. Note: rlog is
+ required for stable PatchSet numbering. Use with care.
+ .TP
+-.B \-\-diffs\-opts <option string>
++.B \-\-diff\-opts <option string>
+ send a custom set of options to diff, for example to increase
+ the number of context lines, or change the diff format.
+ .TP
+@@ -103,6 +103,7 @@ Override the setting of CVSROOT (overrid
+ .TP
+ .B \-q
+ Be quiet about warnings.
++.TP
+ .B \-A
+ Show ancestor branch when a new branch is found.
+ .TP
diff --git a/extra/cvsps/seperate-CPPFLAGS.patch b/extra/cvsps/seperate-CPPFLAGS.patch
new file mode 100644
index 000000000..a29923b49
--- /dev/null
+++ b/extra/cvsps/seperate-CPPFLAGS.patch
@@ -0,0 +1,29 @@
+From 5991e8b0acf1dbe3487c1f246a1d215b346a61f0 Mon Sep 17 00:00:00 2001
+From: Yann Dirson <ydirson@altern.org>
+Date: Sat, 17 Jun 2006 00:03:41 +0200
+Subject: [PATCH] Separate CPPFLAGS from CFLAGS
+
+This allows to set CGLAGS on command-line without interfering with
+preprocessor options
+---
+ Makefile | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2e34ec6..05ca856 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ MAJOR=2
+ MINOR=1
+ CC?=gcc
+-CFLAGS?=-g -O2 -Wall
+-CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
++CFLAGS?=-g -O2 -Wall
++CPPFLAGS?=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
+ prefix?=/usr/local
+ OBJS=\
+ cbtcommon/debug.o\
+--
+1.6.5.GIT
+
diff --git a/extra/cvsps/use-INADDR_NONE-define.patch b/extra/cvsps/use-INADDR_NONE-define.patch
new file mode 100644
index 000000000..a1a529187
--- /dev/null
+++ b/extra/cvsps/use-INADDR_NONE-define.patch
@@ -0,0 +1,28 @@
+From c498733b4283b3987bdca6949a5e304244b64cfc Mon Sep 17 00:00:00 2001
+From: Pavel Roskin <proski@gnu.org>
+Date: Tue, 13 Jun 2006 00:32:33 -0400
+Subject: [PATCH] Use INADDR_NONE instead of -1 to check inet_addr() result
+
+INADDR_NONE is not equal to -1 on 64-bit systems.
+
+Signed-off-by: Pavel Roskin <proski@gnu.org>
+---
+ cbtcommon/tcpsocket.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
+index a174007..f31060e 100644
+--- a/cbtcommon/tcpsocket.c
++++ b/cbtcommon/tcpsocket.c
+@@ -198,7 +198,7 @@ convert_address(long *dest, const char *addr_str)
+ memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
+ }
+ #else
+- if ( (*dest = inet_addr(addr_str)) != -1)
++ if ( (*dest = inet_addr(addr_str)) != INADDR_NONE)
+ {
+ /* nothing */
+ }
+--
+1.6.5.GIT
+
diff --git a/extra/cvsps/use-__linux__-define.patch b/extra/cvsps/use-__linux__-define.patch
new file mode 100644
index 000000000..132629593
--- /dev/null
+++ b/extra/cvsps/use-__linux__-define.patch
@@ -0,0 +1,36 @@
+From 4598349e81068d4af9a893c6433958cf9b4fa835 Mon Sep 17 00:00:00 2001
+From: Pavel Roskin <proski@gnu.org>
+Date: Tue, 13 Jun 2006 00:32:31 -0400
+Subject: [PATCH] Use __linux__ conditional, not LINUX.
+
+__linux__ is defined automatically, LINUX is not.
+
+Signed-off-by: Pavel Roskin <proski@gnu.org>
+---
+ cbtcommon/tcpsocket.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
+index 27cc13a..a174007 100644
+--- a/cbtcommon/tcpsocket.c
++++ b/cbtcommon/tcpsocket.c
+@@ -185,14 +185,14 @@ tcp_connect(int sockfd, const char *rem_addr, unsigned short port)
+ int
+ convert_address(long *dest, const char *addr_str)
+ {
+-#ifdef LINUX
++#ifdef __linux__
+ struct in_addr ip;
+ #endif
+ int retval = 0;
+ char errstr[256];
+
+ /* first try converting "numbers and dots" notation */
+-#ifdef LINUX
++#ifdef __linux__
+ if ( inet_aton(addr_str, &ip) )
+ {
+ memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
+--
+1.6.5.GIT
+
diff --git a/extra/cvsps/use-offsetof-macro.patch b/extra/cvsps/use-offsetof-macro.patch
new file mode 100644
index 000000000..ff2961f07
--- /dev/null
+++ b/extra/cvsps/use-offsetof-macro.patch
@@ -0,0 +1,32 @@
+From 4fad63b82746ea571edc2ec1100ad3208cf5af08 Mon Sep 17 00:00:00 2001
+From: Eric Hopper <hopper@omnifarious.org>
+Date: Fri, 29 Jun 2007 01:30:09 -0700
+Subject: [PATCH] Use offsetof macro instead of unportable pointer arithmetic.
+
+---
+ cbtcommon/list.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/cbtcommon/list.h b/cbtcommon/list.h
+index 4ee245d..cf4b3ed 100644
+--- a/cbtcommon/list.h
++++ b/cbtcommon/list.h
+@@ -23,6 +23,7 @@
+ */
+
+ #include "inline.h"
++#include <stddef.h>
+
+ struct list_head {
+ struct list_head *next, *prev;
+@@ -107,6 +108,6 @@ static INLINE void list_splice(struct list_head *list, struct list_head *head)
+ }
+
+ #define list_entry(ptr, type, member) \
+- ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
++ ((type *)((char *)(ptr)-offsetof(type, member)))
+
+ #endif /* _COMMON_LIST_H */
+--
+1.6.5.GIT
+
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 456c20c76..1ebf9c606 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151094 2012-02-24 20:55:22Z andyrtr $
+# $Id: PKGBUILD 151785 2012-03-02 19:31:37Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnutls
-pkgver=3.0.14
+pkgver=3.0.15
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
makedepends=('strace')
[ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('0d613985c867846ccb5cbaba8fa576ef'
- '847af57e7d4702b176d1cbf157962f6e')
+md5sums=('37bdac12b5c039c7a8738b5d85eda968'
+ '594eb29cbc3147dc0b6b529ebe96bd33')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,7 +23,7 @@ build() {
--with-zlib \
--disable-static \
--disable-guile \
- --enable-valgrind-tests
+ --disable-valgrind-tests
make
}
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index 2040b2742..3a5a23418 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $
+# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libxfont
-pkgver=1.4.4
+pkgver=1.4.5
pkgrel=1
pkgdesc="X11 font rasterisation library"
arch=(i686 x86_64 'mips64el')
@@ -12,12 +12,16 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
makedepends=('xorg-util-macros' 'xtrans')
options=('!libtool')
source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
+sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e')
build() {
cd "${srcdir}/libXfont-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --disable-static
make
+}
+
+package() {
+ cd "${srcdir}/libXfont-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 0d171589d..bca7147b7 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151621 2012-02-28 20:53:00Z giovanni $
+# $Id: PKGBUILD 151766 2012-03-02 11:44:52Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=mercurial
-pkgver=2.1
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
pkgdesc="A scalable distributed SCM tool"
arch=('i686' 'x86_64' 'mips64el')
url="http://mercurial.selenic.com/"
@@ -13,15 +13,13 @@ depends=('python2')
optdepends=('tk: for the hgk GUI')
backup=('etc/mercurial/hgrc')
source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
- 'mercurial.profile'
- 'mercurial-2.1-return-code.patch')
-md5sums=('d2ca44f8d0129ab50639143af99d9363'
- '43e1d36564d4c7fbe9a091d3ea370a44'
- '025e2ec8acc18a9b2a1b4f51f7bddbe3')
+ 'mercurial.profile')
+md5sums=('368fab4705ebd4d1296fdd6bd2fe6272'
+ '43e1d36564d4c7fbe9a091d3ea370a44')
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/mercurial-2.1-return-code.patch"
+
python2 setup.py install --root="${pkgdir}/" --optimize=1
sed -i -e 's#env python#env python2#' \
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 95f039860..a45c9a0fc 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 148032 2012-01-30 07:48:01Z tpowa $
+# $Id: PKGBUILD 151755 2012-03-02 08:43:36Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=samba
-pkgname=('smbclient' 'samba')
+pkgname=('libwbclient' 'smbclient' 'samba')
pkgver=3.6.3
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=3.6.3
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64 mips64el)
url="http://www.samba.org"
license=('GPL3')
@@ -17,8 +17,7 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
samba samba.logrotate
swat.xinetd
samba.pam
- samba.conf.d
- fix-ipv6-mount.patch)
+ samba.conf.d)
### UNINSTALL dmapi package before building!!!
build() {
@@ -48,13 +47,23 @@ build() {
make
}
+package_libwbclient () {
+pkgdesc="Samba winbind client library"
+depends=('glibc')
+ cd ${srcdir}/${pkgbase}-${_realver}/source3
+ mkdir -p ${pkgdir}/usr/lib
+ for i in libwbclient*; do
+ cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
+ done
+}
+
package_smbclient () {
pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
cd ${srcdir}/${pkgbase}-${_realver}/source3
mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
- for i in libnetapi* libwbclient* libsmbclient*;do
+ for i in libnetapi* libsmbclient*;do
cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
done
install -m755 script/smbtar ${pkgdir}/usr/bin/
@@ -137,9 +146,8 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
}
md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1'
- 'a3da19515a234c703876cf850c44e996'
+ 'dfc6f9018c556b9783c7140de183727f'
'5697da77590ec092cc8a883bae06093c'
'a4bbfa39fee95bba2e7ad6b535fae7e6'
'96f82c38f3f540b53f3e5144900acf17'
- 'f2f2e348acd1ccb566e95fa8a561b828'
- 'c6a38a8c8fa24979e6217aed533358ea')
+ 'f2f2e348acd1ccb566e95fa8a561b828')
diff --git a/extra/samba/samba b/extra/samba/samba
index 458eb8e2b..2a04bfec4 100755
--- a/extra/samba/samba
+++ b/extra/samba/samba
@@ -11,10 +11,10 @@ case "$1" in
rc=0
stat_busy "Starting Samba Server"
if [ ! -x /var/run/samba ] ; then
- install -m755 -g 81 -o 81 -d /var/run/samba
+ install -m755 -d /var/run/samba
fi
if [ ! -x /var/log/samba ] ; then
- install -m755 -g 81 -o 81 -d /var/log/samba
+ install -m755 -d /var/log/samba
fi
for d in ${SAMBA_DAEMONS[@]}; do
PID=`pidof -o %PPID /usr/sbin/$d`
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 7c5002ba5..95e3f78e8 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148914 2012-02-05 11:55:45Z ibiru $
+# $Id: PKGBUILD 151751 2012-03-02 07:58:39Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
pkgname=sane
pkgver=1.0.22
-pkgrel=5
+pkgrel=6
pkgdesc="Scanner Access Now Easy"
url="http://www.sane-project.org/"
arch=('i686' 'x86_64' 'mips64el')
@@ -54,4 +54,8 @@ package () {
# install xinetd file
install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
+
+ # Install the pkg-config file
+ install -D -m644 tools/sane-backends.pc \
+ "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc "
}
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 93031c2d9..64bba79c6 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146535 2012-01-12 16:40:12Z tpowa $
+# $Id: PKGBUILD 151760 2012-03-02 09:20:56Z tpowa $
# Maintainer: dorphell <dorphell@archlinux.org>
# Contributor: Jose Javier <jojapa@terra.es>
pkgname=tftp-hpa
pkgver=5.2
-pkgrel=1
+pkgrel=2
pkgdesc="Official tftp server"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.kernel.org/pub/software/network/tftp/"
@@ -11,10 +11,16 @@ license=('BSD')
depends=('readline>=6.0.00')
conflicts=('netkit-tftp')
backup=('etc/conf.d/tftpd')
-source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf LICENSE)
+source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz
+ tftpd.rc
+ tftpd.conf
+ LICENSE
+ tftp-hpa-0.49-fortify-strcpy-crash.patch)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # fix #28103
+ patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers
make
}
@@ -32,8 +38,5 @@ package() {
md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
'83fbb6f52205d95951a3c059e5351ca2'
'414a79dc891bced056d99a9bb790fc9e'
- '6ce21e27b6fdc1a1adf85c81e42aeecf')
-md5sums=('281eab4f4f628c910369ec231e4cae24'
- '83fbb6f52205d95951a3c059e5351ca2'
- '414a79dc891bced056d99a9bb790fc9e'
- '6ce21e27b6fdc1a1adf85c81e42aeecf')
+ '6ce21e27b6fdc1a1adf85c81e42aeecf'
+ '22e8629ef19bc276a102c5d4d284c1bd')
diff --git a/extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch b/extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch
new file mode 100644
index 000000000..e9b70d471
--- /dev/null
+++ b/extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch
@@ -0,0 +1,26 @@
+diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
+--- tftp-hpa-0.49.orig/tftp/tftp.c 2008-10-20 18:08:31.000000000 -0400
++++ tftp-hpa-0.49/tftp/tftp.c 2009-08-05 09:47:18.072585848 -0400
+@@ -279,15 +279,16 @@
+ struct tftphdr *tp, const char *mode)
+ {
+ char *cp;
++ size_t len;
+
+ tp->th_opcode = htons((u_short) request);
+ cp = (char *)&(tp->th_stuff);
+- strcpy(cp, name);
+- cp += strlen(name);
+- *cp++ = '\0';
+- strcpy(cp, mode);
+- cp += strlen(mode);
+- *cp++ = '\0';
++ len = strlen(name) + 1;
++ memcpy(cp, name, len);
++ cp += len;
++ len = strlen(mode) + 1;
++ memcpy(cp, mode, len);
++ cp += len;
+ return (cp - (char *)tp);
+ }
+
diff --git a/extra/xorg-xfs/PKGBUILD b/extra/xorg-xfs/PKGBUILD
index 232ebdc94..a2c0b319e 100644
--- a/extra/xorg-xfs/PKGBUILD
+++ b/extra/xorg-xfs/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 151037 2012-02-24 13:49:47Z allan $
+# $Id: PKGBUILD 151783 2012-03-02 19:10:39Z andyrtr $
# Maintainer: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-xfs
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.1.2
+pkgrel=1
pkgdesc="X.Org X11 xfs font server"
arch=('i686' 'x86_64' 'mips64el')
url="http://xorg.freedesktop.org/"
license=('custom')
backup=('etc/X11/fs/config')
-depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2')
-makedepends=('pkgconfig' 'xtrans')
+depends=('xorg-font-utils' 'libxfont>=1.4.5' 'libfs>=1.0.2' 'libx11>=1.2.2')
+makedepends=('pkgconfig' 'xtrans' 'xorg-util-macros')
source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
${url}/releases/individual/app/showfont-1.0.3.tar.bz2
xfs.rc)
-md5sums=('e02c6cae689c082b8c98a421df8f8670'
- 'aae6fa48b5c2ce9186a5ff4ccc14a1d4'
- '9b50d967ac6d4bae9bffb62a5e527a50'
- 'fc1f42aac16d6b76c79a1a3a0fb6a53b'
- '50b466ab6ed4a5b8df5abf1ef844309a'
- '251f5447f64151e9bb096ebc9f999c3f')
+sha1sums=('d4a64e12f8a773bd0120977191586ca12baf1ace'
+ '21c5f544f34d9164797575da85727558f5e09d33'
+ '00177564597ac629207ca597f663b689902817df'
+ '5310493f53277fd196f93bbb7f2a204cad8997b7'
+ '161bf5f037db70dd75cb327648fbba559e821e76'
+ '21277375814e358ec16e8f8330f420e3d4df63e5')
build() {
cd "${srcdir}"
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 134c34643..148a126c5 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 143826 2011-11-29 13:33:57Z stephane $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# $Id: PKGBUILD 151791 2012-03-03 01:11:12Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=ypserv
-pkgver=2.26
-pkgrel=3
+pkgver=2.27
+pkgrel=1
pkgdesc='Linux NIS Server'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.linux-nis.org/nis/ypserv/'
license=('GPL2')
depends=('gdbm' 'openslp' 'inetutils')
+optdepends=('gawk: for printcap support')
backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ confpost.patch
'yppasswd'
'ypserv')
-sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743'
- '96192b628afe36709496e4801d016c4bff343f0e'
- 'b625381bfa6cf62345377a7df30b8f45935206c5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../confpost.patch
./configure --prefix=/usr
make
}
@@ -35,3 +36,7 @@ package() {
install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
}
+md5sums=('fd9c43aec932a92be07b723c647b02a4'
+ '8acb314f30d6e531ac9efa8655f68ccb'
+ '4bc84c48ed1bb9659698853acb5cfd76'
+ 'c40befe5932f1b42efaced6b46809303')
diff --git a/extra/ypserv/confpost.patch b/extra/ypserv/confpost.patch
new file mode 100644
index 000000000..489e4368a
--- /dev/null
+++ b/extra/ypserv/confpost.patch
@@ -0,0 +1,14 @@
+diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
+--- ypserv-2.27/conf_post.h.qdbm 2012-02-01 14:18:01.780846425 +0100
++++ ypserv-2.27/conf_post.h 2012-02-01 14:18:01.780846425 +0100
+@@ -0,0 +1,10 @@
++/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
++ * libraries gdbm and qdbm have same symbol names. */
++#undef HAVE_COMPAT_LIBGDBM
++#ifdef HAVE_LIBGDBM
++#define HAVE_COMPAT_LIBGDBM
++#endif
++#ifdef HAVE_LIBQDBM
++#define HAVE_COMPAT_LIBGDBM
++#endif
++
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 07:51:19 +0000