From f0fa42126da9e3eec6b98388b35c67929fa20dae Mon Sep 17 00:00:00 2001 From: root Date: Sun, 4 Mar 2012 00:01:47 +0000 Subject: Sun Mar 4 00:01:47 UTC 2012 --- extra/alsa-utils/PKGBUILD | 9 +- extra/cifs-utils/PKGBUILD | 7 +- extra/cvsps/PKGBUILD | 37 ++++-- extra/cvsps/call-cvs-q-option.patch | 34 ++++++ extra/cvsps/cvsps-2.2b1-bufferoverflow.patch | 65 ++++++++++ extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch | 133 +++++++++++++++++++++ extra/cvsps/cvsps-2.2b1-man.patch | 29 +++++ extra/cvsps/seperate-CPPFLAGS.patch | 29 +++++ extra/cvsps/use-INADDR_NONE-define.patch | 28 +++++ extra/cvsps/use-__linux__-define.patch | 36 ++++++ extra/cvsps/use-offsetof-macro.patch | 32 +++++ extra/gnutls/PKGBUILD | 10 +- extra/libxfont/PKGBUILD | 10 +- extra/mercurial/PKGBUILD | 16 ++- extra/samba/PKGBUILD | 28 +++-- extra/samba/samba | 4 +- extra/sane/PKGBUILD | 8 +- extra/tftp-hpa/PKGBUILD | 15 ++- .../tftp-hpa-0.49-fortify-strcpy-crash.patch | 26 ++++ extra/xorg-xfs/PKGBUILD | 22 ++-- extra/ypserv/PKGBUILD | 21 ++-- extra/ypserv/confpost.patch | 14 +++ 22 files changed, 541 insertions(+), 72 deletions(-) create mode 100644 extra/cvsps/call-cvs-q-option.patch create mode 100644 extra/cvsps/cvsps-2.2b1-bufferoverflow.patch create mode 100644 extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch create mode 100644 extra/cvsps/cvsps-2.2b1-man.patch create mode 100644 extra/cvsps/seperate-CPPFLAGS.patch create mode 100644 extra/cvsps/use-INADDR_NONE-define.patch create mode 100644 extra/cvsps/use-__linux__-define.patch create mode 100644 extra/cvsps/use-offsetof-macro.patch create mode 100644 extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch create mode 100644 extra/ypserv/confpost.patch (limited to 'extra') diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index b45dcba2c..b6e815c5e 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 # Contributor: judd pkgname=alsa-utils pkgver=1.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') 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 279bf9f78..b5043885f 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 pkgname=cifs-utils pkgver=5.3 -pkgrel=1 +pkgrel=2 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) 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 72a624c20..650259bc1 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 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') 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 +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 +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) ++ { ++ 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